DIV-356 - Add content about what to do if forms are rejected

edivorce/apps/core/static/css/main.scss

@@ -1322,7 +1322,7 @@ textarea {
 	border-bottom-right-radius: 10px;
 }
 
-#questions_modal {
+#questions_modal, #info_modal {
 	margin-top: 112px;
 	font-size: 18px;
 	.modal-header {

edivorce/apps/core/static/js/main.js

@@ -122,6 +122,12 @@ $(function () {
         $('div#progress-overlay').hide();
         $('div#progress-overlay-spinner').spin(false);
     });
+
+    $('.info-modal').on('click', function (e) {
+        e.preventDefault();
+        $('#info_modal').modal('show');
+    })
+
 });
 
 // delete and added field and save the change

edivorce/apps/core/templates/dashboard/print_form.html

@@ -17,7 +17,7 @@
 </p>
 <p>&nbsp;</p>
 <h3>Print These Forms</h3>
-<p><a href="{% url 'dashboard_nav' 'help_saving_pdf' %}">Get help opening and saving PDF forms</a></p>
+<p><a href="{% url 'dashboard_nav' 'help_saving_pdf' %}">Get help opening and saving PDF forms</a> | <a href="#" class="info-modal">Changing my forms</a></p>
 
 <div class="review-well clearfix">
     <div class="collapse-trigger collapsed" data-toggle="collapse" aria-expanded="false" data-target="#collapseF1" aria-controls="collapseF1">
@@ -242,6 +242,26 @@
     </p>
 </div>
 
+<div id="info_modal" class="modal fade" tabindex="-1" role="dialog">
+    <div class="modal-dialog" role="document">
+        <div class="modal-content">
+            <div class="modal-header">
+                <i class="fa fa-file" aria-hidden="true"></i>
+                <h1 class="modal-title">Changing your forms</h1>
+            </div>
+            <div class="modal-body">
+                <p>
+                    If you need to make changes to your forms, you can return to the Divorce Questionnaire section to
+                    review and update your answers. You will then need to Review and Print your forms again.
+                </p>
+            </div>
+            <div class="modal-footer">
+                <a type="button" class="btn btn-primary btn-lg" data-dismiss="modal">Continue</a>
+            </div>
+        </div>
+    </div>
+</div>
+
 {% endblock %}
 
 {% block backToDashboard %}

edivorce/apps/core/templates/overview.html

@@ -93,6 +93,32 @@
     </a>
 </div>
 
+
+{% if not request.session.FIRST_LOGIN and request.COOKIES.VIEWED_DASHBOARD_DURING_THIS_SESSION != 'True' %}
+<div id="questions_modal" class="modal fade" tabindex="-1" role="dialog">
+    <div class="modal-dialog" role="document">
+        <div class="modal-content">
+            <div class="modal-header">
+                <i class="fa fa-file" aria-hidden="true"></i>
+                <h1 class="modal-title">Changing your forms</h1>
+            </div>
+            <div class="modal-body">
+                <p>
+                    If you need to make changes to your forms, you can return to the Divorce Questionnaire section to
+                    review and update your answers. You will then need to Review and Print your forms again.
+                </p>
+            </div>
+            <div class="modal-footer">
+                <a type="button" class="btn btn-primary btn-lg" data-dismiss="modal">Continue</a>
+            </div>
+        </div>
+    </div>
+</div>
+<script type="text/javascript">
+    document.cookie = 'VIEWED_DASHBOARD_DURING_THIS_SESSION=True';
+</script>
+{% endif %}
+
 {% endblock %}
 
 {% block backToDashboard %}

edivorce/apps/core/views/main.py

@@ -34,7 +34,7 @@ def prequalification(request, step):
     if not request.bceid_user.is_authenticated:
         responses_dict = get_responses_from_session(request)
     else:
-        user = __get_bceid_user(request)
+        user, _ = __get_bceid_user(request)
 
         responses_dict = get_responses_from_db(user)
         responses_dict['active_page'] = 'prequalification'
@@ -98,7 +98,14 @@ def login(request):
         if guid is None:
             return render(request, 'localdev/debug.html')
 
-        user = __get_bceid_user(request)
+        user, created = __get_bceid_user(request)
+
+        # some later messaging needs to be shown or hidden based on whether
+        # or not this is a returning user
+        print('CREATED=' + str(created))
+
+
+        request.session["FIRST_LOGIN"] = created
 
         if timezone.now() - user.last_login > datetime.timedelta(minutes=1):
             user.last_login = timezone.now()
@@ -115,10 +122,13 @@ def logout(request):
     """
     request.session.flush()
 
+    response = redirect(settings.LOGOUT_URL)
+
     if settings.DEPLOYMENT_TYPE == 'localdev':
-        return redirect('/')
-    else:
-        return redirect(settings.LOGOUT_URL)
+        response = redirect('/')
+
+    response.delete_cookie('VIEWED_DASHBOARD_DURING_THIS_SESSION')
+    return response
 
 
 @bceid_required
@@ -126,7 +136,7 @@ def overview(request):
     """
     Dashboard: Process overview page.
     """
-    user = __get_bceid_user(request)
+    user, _ = __get_bceid_user(request)
     responses_dict_by_step = get_responses_from_db_grouped_by_steps(user)
 
     # Add step status dictionary
@@ -141,7 +151,7 @@ def dashboard_nav(request, nav_step):
     """
     Dashboard: All other pages
     """
-    user = __get_bceid_user(request)
+    user, _ = __get_bceid_user(request)
     responses_dict = get_responses_from_db(user)
     responses_dict['active_page'] = nav_step
     template_name = 'dashboard/%s.html' % nav_step
@@ -155,7 +165,7 @@ def question(request, step):
     """
     template = 'question/%02d_%s.html' % (template_step_order[step], step)
 
-    user = __get_bceid_user(request)
+    user, _ = __get_bceid_user(request)
     responses_dict_by_step = get_responses_from_db_grouped_by_steps(user)
 
     if step == "review":
@@ -210,4 +220,4 @@ def __get_bceid_user(request):
         user.last_login = timezone.now()
         user.save()
 
-    return user
+    return user, created