diff --git a/edivorce/apps/core/static/css/main.scss b/edivorce/apps/core/static/css/main.scss index 300168e1..8ee206e9 100644 --- a/edivorce/apps/core/static/css/main.scss +++ b/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 { diff --git a/edivorce/apps/core/static/js/main.js b/edivorce/apps/core/static/js/main.js index 30b49ca8..41518223 100755 --- a/edivorce/apps/core/static/js/main.js +++ b/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 diff --git a/edivorce/apps/core/templates/dashboard/print_form.html b/edivorce/apps/core/templates/dashboard/print_form.html index 54a8eba6..402943da 100644 --- a/edivorce/apps/core/templates/dashboard/print_form.html +++ b/edivorce/apps/core/templates/dashboard/print_form.html @@ -17,7 +17,7 @@

 

Print These Forms

-

Get help opening and saving PDF forms

+

Get help opening and saving PDF forms | Changing my forms

+ + {% endblock %} {% block backToDashboard %} diff --git a/edivorce/apps/core/templates/overview.html b/edivorce/apps/core/templates/overview.html index 09012b3e..32febfb8 100644 --- a/edivorce/apps/core/templates/overview.html +++ b/edivorce/apps/core/templates/overview.html @@ -93,6 +93,32 @@
+ +{% if not request.session.FIRST_LOGIN and request.COOKIES.VIEWED_DASHBOARD_DURING_THIS_SESSION != 'True' %} + + +{% endif %} + {% endblock %} {% block backToDashboard %} diff --git a/edivorce/apps/core/views/main.py b/edivorce/apps/core/views/main.py index 8d8d58a8..b87c1fa8 100644 --- a/edivorce/apps/core/views/main.py +++ b/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