matching figma designs

dm_regional_app/charts.py

@@ -90,9 +90,9 @@ def prediction_chart(historic_data: PopulationStats, prediction: Prediction, **k
  width=0,
  ),
  label=dict(
- text="Reference period", textposition="top center", font=dict(size=15)
+ text="Reference period", textposition="top center", font=dict(size=14)
  ),
- fillcolor="rgba(0,0,255,0.1)",
+ fillcolor="rgba(105,105,105,0.1)",
  layer="above",
  )
 

dm_regional_app/forms.py

@@ -10,6 +10,7 @@ class PredictFilter(forms.Form):
  widget=DatePickerInput(),
  label="Reference Start Date",
  required=True,
+ help_text="Select the period you would like the model to reference",
  )
  reference_end_date = forms.DateField(
  widget=DatePickerInput(),
@@ -20,6 +21,7 @@ class PredictFilter(forms.Form):
  widget=DatePickerInput(),
  label="Prediction Start Date",
  required=False,
+ help_text="Select the future date-range you want to apply your forecast to",
  )
  prediction_end_date = forms.DateField(
  widget=DatePickerInput(),

dm_regional_app/templates/dm_regional_app/includes/navbar-item.html

@@ -1,5 +1,5 @@
 <li class="nav-item">
  <a href="{% url url %}{% if query %}?{{query}}{% endif %}"
- class="nav-link {% if request.resolver_match.url_name in url_names %}active{% endif %}"
+ class="nav-link px-2.5 {% if request.resolver_match.url_name in url_names %}active{% endif %}"
  aria-current="page">{{ name }}</a>
 </li>

dm_regional_app/templates/dm_regional_app/includes/navbar.html

@@ -11,12 +11,12 @@
  <span class="navbar-toggler-icon"></span>
  </button>
  <div class="collapse navbar-collapse" id="navbarSupportedContent">
- <ul class="navbar-nav me-auto mb-2 mb-lg-0">
+ <ul class="navbar-nav me-auto mb-0 mb-lg-0">
  {% if user.is_authenticated %}
  {% include 'dm_regional_app/includes/navbar-item.html' with url='home' name='Home' url_names="['home']" %}
- {% include 'dm_regional_app/includes/navbar-item.html' with url='router_handler' query="next_url_name=historic_data" name='Historic' url_names="['historic_data']" %}
- {% include 'dm_regional_app/includes/navbar-item.html' with url='router_handler' query="next_url_name=prediction" name='Prediction' url_names="['prediction']" %}
- {% include 'dm_regional_app/includes/navbar-item.html' with url='scenarios' name='Scenarios' url_names="['scenarios', 'scenario_detail']" %}
+ {% include 'dm_regional_app/includes/navbar-item.html' with url='scenarios' name='Saved Scenarios' url_names="['scenarios', 'scenario_detail']" %}
+ {% include 'dm_regional_app/includes/navbar-item.html' with url='router_handler' query="next_url_name=historic_data" name='Historic Data' url_names="['historic_data']" %}
+ {% include 'dm_regional_app/includes/navbar-item.html' with url='router_handler' query="next_url_name=prediction" name='Start Modelling' url_names="['prediction']" %}
  {% else %}
  {% include 'dm_regional_app/includes/navbar-item.html' with url='home' name='Home' url_names="['home']" %}
  {% endif %}