From c62d92585b72725168d2c6b6b6f6027e2fe103ce Mon Sep 17 00:00:00 2001
From: Mitch Riedstra <Mitch@riedstra.us>
Date: Tue, 10 Oct 2017 23:54:59 -0400
Subject: Updated Load listing page with increased information and red amount
 text if zero

---
 .../templates/dispatch/drivers/detail.html         |  4 +-
 app/dispatch/templates/dispatch/loads/list.html    | 75 ++++++++++++----------
 2 files changed, 44 insertions(+), 35 deletions(-)

(limited to 'app/dispatch')

diff --git a/app/dispatch/templates/dispatch/drivers/detail.html b/app/dispatch/templates/dispatch/drivers/detail.html
index 2c28064..48e6e58 100644
--- a/app/dispatch/templates/dispatch/drivers/detail.html
+++ b/app/dispatch/templates/dispatch/drivers/detail.html
@@ -22,8 +22,8 @@
       </thead>
       <tr>
         <td>{{stats.count}}</td>
-        <td>{{stats.sum}}</td>
-        <td>{{stats.average|stringformat:".3f"}}</td>
+        <td>${{stats.sum}}</td>
+        <td>${{stats.average|stringformat:".3f"}}</td>
       </tr>
     </table>
   </div>
diff --git a/app/dispatch/templates/dispatch/loads/list.html b/app/dispatch/templates/dispatch/loads/list.html
index b6f7008..fec2371 100644
--- a/app/dispatch/templates/dispatch/loads/list.html
+++ b/app/dispatch/templates/dispatch/loads/list.html
@@ -21,42 +21,50 @@
         <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 %}
 {% for date in loads %}
-    <div class="row">
-        <div class="col s12 card">
-            <div class="card-content">
-                <span class="card-title">{{date|date:"l F d"}}</span>
-                <table class="striped bordered">
-                    <thead>
-                        <tr>
-                            <th>Driver</th>
-                            <th>Company</th>
-                            <th>Load Number</th>
-                            <th>Amount</th>
-                        </tr>
-                    </thead>
-                    <tbody>
-                        {% for load in loads|keyvalue:date %}
-                            <tr class="green lighten-4">
-                                <td><a href="{% url 'driver_detail' load.user.id %}">{{ load.user.first_name }} {{ load.user.last_name }}</a></td>
-                                <td><a href="{% url 'company_detail' load.company.id %}">{{ load.company.name }}</a></td>
-                                <td>{{ load.load_number }}</td>
-                                <td>{{ load.amount }}</td>
-                                <td class="right-align">
-                                    <a href="{% url 'load_edit' load.id %}" class="btn orange">Edit</a>
-                                    <a href="{% url 'load_detail' load.id %}" class="btn blue">View</a>
-                                </td>
-                            </tr>
-                        {% empty %}
-                            <tr class="yellow lighten-4"><td colspan="4">No load.</td></tr>
-                        {% endfor %}
-                    </tbody>
-                </table>
-            </div>
-        </div>
-    </div>
+	<div class="row">
+		<div class="col s12 card">
+			<div class="card-content">
+				<span class="card-title">{{date|date:"l F d"}}</span>
+				<table class="striped bordered">
+				    <thead>
+				        <tr>
+				            <th>Company</th>
+				            <th>Driver</th>
+				            <th>Amount</th>
+				            <th>Load Number</th>
+				            <th>Description</th>
+				        </tr>
+				    </thead>
+				    <tbody>
+					    {% for load in loads|keyvalue:date %}
+				            <tr class="green lighten-4">
+				                <td><a href="{% url 'company_detail' load.company.id %}">{{ load.company.name }}</a></td>
+                        <td><a href="{% url 'driver_detail' load.user.id %}">{{ load.user.first_name }} {{ load.user.last_name }}</a></td>
+                        {% if load.amount == 0 %}
+                        <td><span class="red-text">{{ load.amount }}</span></td>
+                        {% else %}
+				                <td>{{ load.amount }}</td>
+                        {% endif %}
+                        <td>{{ load.load_number }}</td>
+                        <td>{{ load.description }}</td>
+				                <td class="right-align">
+				                    <a href="{% url 'load_edit' load.id %}" class="btn orange">Edit</a>
+				                    <a href="{% url 'load_detail' load.id %}" class="btn blue">View</a>
+				                </td>
+				            </tr>
+				        {% empty %}
+				            <tr class="yellow lighten-4"><td colspan="5">No load.</td></tr>
+				        {% endfor %}
+				    </tbody>
+				</table>
+			</div>
+		</div>
+	</div>
 {% endfor %}
+
 <div class="row">
     <div class="col s6 left-align">
         <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>
@@ -65,4 +73,5 @@
         <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 %}
-- 
cgit v1.2.3