From 3720150ff16f7dbae338d72c74ad067380cfb94b Mon Sep 17 00:00:00 2001
From: ariannedee <ariannedee@gmail.com>
Date: Wed, 23 Sep 2020 13:05:06 -0700
Subject: [PATCH] DIV-1142: Don't ask for email if already given in step 10

---
 edivorce/apps/core/static/js/ajax.js                   |  2 +-
 edivorce/apps/core/static/js/functions.js              |  2 +-
 edivorce/apps/core/static/js/signing-filing.js         | 10 +++++++---
 .../core/templates/dashboard/sign_file_options.html    |  2 ++
 .../core/templates/question/10_other_questions.html    |  4 ++--
 5 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/edivorce/apps/core/static/js/ajax.js b/edivorce/apps/core/static/js/ajax.js
index 24732eb4..0ba06d65 100644
--- a/edivorce/apps/core/static/js/ajax.js
+++ b/edivorce/apps/core/static/js/ajax.js
@@ -14,7 +14,7 @@ var ajaxOnChange = function () {
         isValid = validateDate(el);
     }
 
-    if (el.is("#email_textbox")){
+    if (el.is(".email-textbox")){
         isValid = validateEmail(el);
     }
 
diff --git a/edivorce/apps/core/static/js/functions.js b/edivorce/apps/core/static/js/functions.js
index 795c2a56..09f09c56 100644
--- a/edivorce/apps/core/static/js/functions.js
+++ b/edivorce/apps/core/static/js/functions.js
@@ -351,7 +351,7 @@ var validateEmail = function(el){
         .find('span.help-block')
         .remove();
 
-    if (isEmailValid(el)) {
+    if (!el.val() || isEmailValid(el)) {
         return true;
     } else {
         el.closest('.form-group')
diff --git a/edivorce/apps/core/static/js/signing-filing.js b/edivorce/apps/core/static/js/signing-filing.js
index 279629c0..db8b1920 100644
--- a/edivorce/apps/core/static/js/signing-filing.js
+++ b/edivorce/apps/core/static/js/signing-filing.js
@@ -43,18 +43,22 @@ $(window).load(function () {
         var signVirtuallyBoth = $("#sign-virtual-both").prop('checked');
         var signVirtuallyYou = $("#sign-virtual-you").prop('checked');
         var signVirtuallySpouse = $("#sign-virtual-spouse").prop('checked');
-        if (signVirtuallyBoth || signVirtuallyYou || signVirtuallySpouse) {
+
+        var needEmailYou = (signVirtuallyBoth || signVirtuallyYou) && $("#existing-email-you").val() === '';
+        var needEmailSpouse = signVirtuallySpouse && $("#existing-email-spouse").val() === '';
+
+        if (needEmailYou || needEmailSpouse) {
             $("#sign-virtually").show();
         } else {
             $("#sign-virtually").hide();
         }
-        if (signVirtuallyBoth || signVirtuallyYou) {
+        if (needEmailYou) {
             $("#email-you").show();
         } else {
             $("#email-you").hide();
             $("#email-you-input").removeClass('error');
         }
-        if (signVirtuallySpouse) {
+        if (needEmailSpouse) {
             $("#email-spouse").show();
         } else {
             $("#email-spouse").hide();
diff --git a/edivorce/apps/core/templates/dashboard/sign_file_options.html b/edivorce/apps/core/templates/dashboard/sign_file_options.html
index e7cbb23f..f649a70a 100644
--- a/edivorce/apps/core/templates/dashboard/sign_file_options.html
+++ b/edivorce/apps/core/templates/dashboard/sign_file_options.html
@@ -135,6 +135,8 @@
     <h3>Signing Contact(s)</h3>
     <p>An e-mail address is required to setup a {% include "partials/tooltips/virtual_session.html" %}. What is the best e-mail address to contact you at in order to setup the virtual
         session?</p>
+    <input type="text" id="existing-email-you" value="{{ address_to_send_official_document_email_you }}" hidden>
+    <input type="text" id="existing-email-spouse" value="{{ address_to_send_official_document_email_spouse }}" hidden>
     <div id="email-you" class="form-inline">
         <label>E-mail Address for You: </label>{% input_field type="text" name="email_you" id="email-you-input" class="input-inline form-control" %}
     </div>
diff --git a/edivorce/apps/core/templates/question/10_other_questions.html b/edivorce/apps/core/templates/question/10_other_questions.html
index 9dbee4f0..c7f8e67a 100644
--- a/edivorce/apps/core/templates/question/10_other_questions.html
+++ b/edivorce/apps/core/templates/question/10_other_questions.html
@@ -41,7 +41,7 @@
         {% input_field type="text" name="address_to_send_official_document_fax_you" class="form-block input-wide response-textbox" %}
         <div class="form-group">
         <p>Email Address {% include 'partials/optional.html' with inline=True %}</p>
-        {% input_field type="text" id="email_textbox" name="address_to_send_official_document_email_you" class="form-block input-wide response-textbox form-control" %}
+        {% input_field type="text" name="address_to_send_official_document_email_you" class="form-block input-wide response-textbox form-control email-textbox" %}
         </div>
     </div>
 </div>
@@ -76,7 +76,7 @@
         {% input_field type="text" name="address_to_send_official_document_fax_spouse" class="form-block input-wide response-textbox" %}
         <div class="form-group">
         <p>Email Address {% include 'partials/optional.html' with inline=True %}</p>
-        {% input_field type="text" id="email_textbox" name="address_to_send_official_document_email_spouse" class="form-block input-wide response-textbox form-control" %}
+        {% input_field type="text" name="address_to_send_official_document_email_spouse" class="form-block input-wide response-textbox form-control email-textbox" %}
         </div>
     </div>
 </div>