use flask flash for notifications

templates/requests/_new.html

@@ -6,9 +6,7 @@
 
   {% include 'requests/menu.html' %}
 
-  {% if review_comment %}
-    {% include 'requests/comment.html' %}
-  {% endif %}
+  {% include "fragments/flash.html" %}
 
   {% block form_action %}
     {% if request_id %}

templates/requests/approval.html

@@ -1,7 +1,6 @@
 {% extends "base.html" %}
 
 {% from "components/icon.html" import Icon %}
-{% from "components/alert.html" import Alert %}
 {% from "components/text_input.html" import TextInput %}
 {% from "components/phone_input.html" import PhoneInput %}
 
@@ -9,12 +8,7 @@
 
 <article class='col col--grow request-approval'>
 
-{% if review_form.errors or internal_comment_form.errors %}
-  {{ Alert('There were some errors',
-    message="<p>Please see below.</p>",
-    level='error'
-  ) }}
-{% endif %}
+{% include "fragments/flash.html" %}
 
     <section class='panel'>
       <header class='panel__heading panel__heading--divider request-approval__heading'>

templates/requests/comment.html

@@ -1,9 +0,0 @@
-{% from "components/alert.html" import Alert %}
-
-{% call Alert('Changes Requested', level='warning') %}
-    <p>CCPO has requested changes to your submission with the following notes:
-    <br>
-    {{ review_comment }}
-    <br>
-    Please contact info@jedi.cloud or 123-123-4567 for further discussion.</p>
-{% endcall %}

templates/requests/financial_verification.html

@@ -9,6 +9,8 @@
 
 {% include 'requests/review_menu.html' %}
 
+{% include "fragments/flash.html" %}
+
 {% if saved_draft %}
   {% call Alert('Draft saved', level='success') %}
   {% endcall %}
@@ -19,10 +21,6 @@
   {{ Alert('Pending Financial Verification', fragment="fragments/pending_financial_verification.html") }}
 {% endif %}
 
-{% if review_comment %}
-  {% include 'requests/comment.html' %}
-{% endif %}
-
 <financial inline-template v-bind:initial-data='{{ f.data|mixedContentToJson }}'>
 <div class="col">
   {% if extended %}

templates/requests/index.html

@@ -1,6 +1,5 @@
 {% extends "base.html" %}
 
-{% from "components/alert.html" import Alert %}
 {% from "components/modal.html" import Modal %}
 {% from "components/empty_state.html" import EmptyState %}
 {% from "components/icon.html" import Icon %}
@@ -46,13 +45,7 @@
   >
     <div>
 
-{% if num_action_required %}
-  {% set title -%}
-    Action required on {{ num_action_required }} requests.
-  {%- endset %}
-
-  {{ Alert (title)}}
-{% endif %}
+{% include "fragments/flash.html" %}
 
 {% if not requests %}
 

templates/requests/screen-1.html

@@ -1,6 +1,5 @@
 {% extends 'requests/_new.html' %}
 
-{% from "components/alert.html" import Alert %}
 {% from "components/text_input.html" import TextInput %}
 {% from "components/options_input.html" import OptionsInput %}
 {% from "components/date_input.html" import DateInput %}
@@ -11,12 +10,7 @@
 
 {% block form %}
 
-{% if f.errors %}
-  {{ Alert('There were some errors',
-    message="<p>Please see below.</p>",
-    level='error'
-  ) }}
-{% endif %}
+{% include "fragments/flash.html" %}
 
 <details-of-use inline-template v-bind:initial-data='{{ f.data|tojson }}'>
   <div>

templates/requests/screen-2.html

@@ -1,6 +1,5 @@
 {% extends 'requests/_new.html' %}
 
-{% from "components/alert.html" import Alert %}
 {% from "components/text_input.html" import TextInput %}
 {% from "components/options_input.html" import OptionsInput %}
 {% from "components/date_input.html" import DateInput %}
@@ -12,12 +11,7 @@
 
 {% block form %}
 
-{% if f.errors %}
-  {{ Alert('There were some errors',
-    message="<p>Please see below.</p>",
-    level='error'
-  ) }}
-{% endif %}
+{% include "fragments/flash.html" %}
 
 <p>Please tell us more about you.</p>
 

templates/requests/screen-3.html

@@ -1,6 +1,5 @@
 {% extends 'requests/_new.html' %}
 
-{% from "components/alert.html" import Alert %}
 {% from "components/text_input.html" import TextInput %}
 {% from "components/checkbox_input.html" import CheckboxInput %}
 
@@ -10,12 +9,7 @@
 
 {% block form %}
 
-{% if f.errors %}
-  {{ Alert('There were some errors',
-    message="<p>Please see below.</p>",
-    level='error'
-  ) }}
-{% endif %}
+{% include "fragments/flash.html" %}
 
 <poc inline-template v-bind:initial-data='{{ f.data|tojson }}'>
   <div>

templates/requests/screen-4.html

@@ -4,7 +4,6 @@
 
 {% extends 'requests/_new.html' %}
 
-{% from "components/alert.html" import Alert %}
 {% from "components/text_input.html" import TextInput %}
 {% from "components/icon.html" import Icon %}
 
@@ -21,12 +20,7 @@
 
   <p>Before you can submit your request, please take a moment to review the information entered in the form. You may make changes by clicking the edit link on each section. When all information looks right, go ahead and submit.</p>
 
-  {% if f.errors or not can_submit %}
-    {{ Alert('Please complete all sections',
-      message="<p>In order to submit your JEDI Cloud request, you'll need to complete all required sections of this form without error. Missing or invalid fields are noted below.</p>",
-      level='error'
-    ) }}
-  {% endif %}
+  {% include "fragments/flash.html" %}
 
   {% with editable=True %}
     {% include "requests/_review.html" %}