Fix up the shitty amount of date related variables being set in the template context. User friendly dates on load view

2 files changed, 13 insertions, 13 deletions

diff --git a/app/dispatch/templates/dispatch/drivers/detail.html b/app/dispatch/templates/dispatch/drivers/detail.html
index bc674b9..80779c4 100644
--- a/app/dispatch/templates/dispatch/drivers/detail.html
+++ b/app/dispatch/templates/dispatch/drivers/detail.html
@@ -6,16 +6,16 @@
 <div class="row">
     <div class="col s12">
         <h1>Driver Summary for {{ object.first_name }} {{ object.last_name }}</h1>
-        <h2>Loads for {{start_date|date:"l, F, d"}} to {{end_date|date:"l, F, d"}}</h2>
+        <h2>Loads for {{week_dates.start_date|date:"l, F, d"}} to {{week_dates.end_date|date:"l, F, d"}}</h2>
     </div>
 </div>
 
 <div class="row">
     <div class="col s6 left-align">
-        <a href="{% url 'driver_detail' object.id %}?date={{previous_week|date:"m/d/Y"}}" class="btn blue"><i class="material-icons left">arrow_back</i> Prev</a>
+        <a href="{% url 'driver_detail' object.id %}?date={{week_dates.previous_week|date:"m/d/Y"}}" class="btn blue"><i class="material-icons left">arrow_back</i> Prev</a>
     </div>
     <div class="col s6 right-align">
-        <a href="{% url 'driver_detail' object.id %}?date={{next_week|date:"m/d/Y"}}" class="btn blue"><i class="material-icons right">arrow_forward</i>  Next</a>
+        <a href="{% url 'driver_detail' object.id %}?date={{week_dates.next_week|date:"m/d/Y"}}" class="btn blue"><i class="material-icons right">arrow_forward</i>  Next</a>
     </div>
 </div>
 
@@ -54,10 +54,10 @@
 
 <div class="row">
     <div class="col s6 left-align">
-        <a href="{% url 'driver_detail' object.id %}?date={{previous_week}}" class="btn blue"><i class="material-icons left">arrow_back</i> Prev</a>
+        <a href="{% url 'driver_detail' object.id %}?date={{week_dates.previous_week|date:"m/d/Y"}}" class="btn blue"><i class="material-icons left">arrow_back</i> Prev</a>
     </div>
     <div class="col s6 right-align">
-        <a href="{% url 'driver_detail' object.id %}?date={{next_week}}" class="btn blue"><i class="material-icons right">arrow_forward</i>  Next</a>
+        <a href="{% url 'driver_detail' object.id %}?date={{week_dates.next_week|date:"m/d/Y"}}" class="btn blue"><i class="material-icons right">arrow_forward</i>  Next</a>
     </div>
 </div>
 
diff --git a/app/dispatch/templates/dispatch/loads/list.html b/app/dispatch/templates/dispatch/loads/list.html
index 6141e75..b6f7008 100644
--- a/app/dispatch/templates/dispatch/loads/list.html
+++ b/app/dispatch/templates/dispatch/loads/list.html
@@ -6,19 +6,19 @@
 {% block content %}
 
 <div class="row">
-    <div class="col s12 m6">
-        <h1>Loads for {{start_date}} - {{end_date}}</h1>
+    <div class="col s12 m9">
+        <h1>Loads for {{week_dates.start_date|date:"l, F, d"}} to {{week_dates.end_date|date:"l, F, d"}}</h1>
     </div>
-    <div class="col s12 m6 right-align">
+    <div class="col s12 m3 right-align">
         <a href="{% url 'load_new' %}" class="btn green">Add Load</a>
     </div>
 </div>
 <div class="row">
     <div class="col s6 left-align">
-        <a href="{% url 'load_list' %}?date={{previous_week}}" class="btn blue"><i class="material-icons left">arrow_back</i> Prev</a>
+        <a href="{% url 'load_list' %}?date={{week_dates.previous_week|date:"m/d/Y"}}" class="btn blue"><i class="material-icons left">arrow_back</i> Prev</a>
     </div>
     <div class="col s6 right-align">
-        <a href="{% url 'load_list' %}?date={{next_week}}" class="btn blue"><i class="material-icons right">arrow_forward</i>  Next</a>
+        <a href="{% url 'load_list' %}?date={{week_dates.next_week|date:"m/d/Y"}}" class="btn blue"><i class="material-icons right">arrow_forward</i>  Next</a>
     </div>
 </div>
 {% load dynamic_key %}
@@ -26,7 +26,7 @@
     <div class="row">
         <div class="col s12 card">
             <div class="card-content">
-                <span class="card-title">{{date}}</span>
+                <span class="card-title">{{date|date:"l F d"}}</span>
                 <table class="striped bordered">
                     <thead>
                         <tr>
@@ -59,10 +59,10 @@
 {% endfor %}
 <div class="row">
     <div class="col s6 left-align">
-        <a href="{% url 'load_list' %}?date={{previous_week}}" class="btn blue"><i class="material-icons left">arrow_back</i> Prev</a>
+        <a href="{% url 'load_list' %}?date={{week_dates.previous_week|date:"m/d/Y"}}" class="btn blue"><i class="material-icons left">arrow_back</i> Prev</a>
     </div>
     <div class="col s6 right-align">
-        <a href="{% url 'load_list' %}?date={{next_week}}" class="btn blue"><i class="material-icons right">arrow_forward</i>  Next</a>
+        <a href="{% url 'load_list' %}?date={{week_dates.next_week|date:"m/d/Y"}}" class="btn blue"><i class="material-icons right">arrow_forward</i>  Next</a>
     </div>
 </div>
 {% endblock %}