6 files changed, 61 insertions, 26 deletions
diff --git a/app/dispatch/migrations/0002_auto_20171010_0140.py b/app/dispatch/migrations/0002_auto_20171010_0140.py
new file mode 100644
index 0000000..499153b
--- /dev/null
+++ b/app/dispatch/migrations/0002_auto_20171010_0140.py
@@ -0,0 +1,20 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.5 on 2017-10-10 01:40
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('dispatch', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='load',
+            name='amount',
+            field=models.DecimalField(decimal_places=2, default='0', max_digits=10),
+        ),
+    ]
diff --git a/app/dispatch/models.py b/app/dispatch/models.py
index 440804e..dfb5273 100644
--- a/app/dispatch/models.py
+++ b/app/dispatch/models.py
@@ -20,7 +20,7 @@ class Load(models.Model):
     user            = models.ForeignKey(settings.AUTH_USER_MODEL)
     company         = models.ForeignKey(Company)
     description     = models.CharField(max_length=256)
-    amount          = models.DecimalField(max_digits=10,decimal_places=2)
+    amount          = models.DecimalField(max_digits=10,decimal_places=2, default="0")
 
     def __str__(self):
         return "{c}, {d} ( {a} )".format(c=self.company, d=self.description, a=self.amount)
diff --git a/app/dispatch/static/base.js b/app/dispatch/static/base.js
new file mode 100644
index 0000000..5f57441
--- /dev/null
+++ b/app/dispatch/static/base.js
@@ -0,0 +1,20 @@
+$( document ).ready(function(){
+  all_date_fields = document.querySelectorAll("[name='date']");
+
+  for ( i = 0 ; i < all_date_fields.length ; i++ ) {
+    console.log(all_date_fields[0])
+    $(all_date_fields[0]).pickadate({
+      selectMonths: true, // Creates a dropdown to control month
+      selectYears: 15, // Creates a dropdown of 15 years to control year,
+      // format: 'dd/mm/yyyy',
+      format: 'yyyy-mm-dd',
+      today: 'Today',
+      clear: 'Clear',
+      close: 'Ok',
+      closeOnSelect: false // Close upon selecting a date,
+    });
+
+  }
+
+
+});
diff --git a/app/dispatch/templates/dispatch/base.html b/app/dispatch/templates/dispatch/base.html
index 693208f..00116e3 100644
--- a/app/dispatch/templates/dispatch/base.html
+++ b/app/dispatch/templates/dispatch/base.html
@@ -31,14 +31,13 @@
 </head>
 <body>
 
-  <nav class="light-blue lighten-1" role="navigation">
+  <nav class="brown darken-3" role="navigation">
     <div class="nav-wrapper container"><a id="logo-container" href="{% url 'home' %}" class="brand-logo">Dispatch Tracker</a>
       <ul class="right hide-on-med-and-down">
         {% if user.is_authenticated %}
           <li><a href="{% url 'load_list' %}">Loads</a></li>
           <li><a href="{% url 'driver_list' %}">Drivers</a></li>
           <li><a href="{% url 'company_list' %}">Companies</a></li>
-          <li><a href="#">Contacts</a></li>
           <li><a href="{% url 'logout' %}">Logout</a></li>
         {% else %}
           <li><a href="{% url 'login' %}">Login</a></li>
@@ -50,7 +49,6 @@
           <li><a href="{% url 'load_list' %}">Loads</a></li>
           <li><a href="#">Drivers</a></li>
           <li><a href="#">Companies</a></li>
-          <li><a href="#">Contacts</a></li>
           <li><a href="{% url 'logout' %}">Logout</a></li>
         {% else %}
           <li><a href="{% url 'login' %}">Login</a></li>
@@ -68,28 +66,23 @@
    </div>
  </main>
 
-  <footer class="page-footer orange">
+  <footer class="page-footer grey darken-4">
     <div class="container">
-      <div class="row">
-        <div class="col l6 s12">
-          <h5 class="white-text">Company Bio</h5>
-          <p class="grey-text text-lighten-4">We are a team of college students working on this project like it's our full time job. Any amount would help support and continue development on this project and is greatly appreciated.</p>
-
-
-        </div>
-      </div>
+      <p>
+        Made by <a class="blue-text text-lighten-3" href="https://www.stridet.com">Stridet LLC</a>
+      </p>
     </div>
+    <!--
     <div class="footer-copyright">
-      <div class="container">
-        Made by <a class="orange-text text-lighten-3" href="http://materializecss.com">Materialize</a>
-      </div>
     </div>
+    -->
   </footer>
 
   
   <!--Import jQuery before materialize.js-->
   <script type="text/javascript" src="https://code.jquery.com/jquery-2.1.1.min.js"></script>
   <script type="text/javascript" src="{% static 'materialize/js/materialize.min.js' %}"></script>
+  <script type="text/javascript" src="{% static 'base.js' %}"></script>
 
   <script>
     $('select').material_select();
diff --git a/app/dispatch/templates/dispatch/drivers/detail.html b/app/dispatch/templates/dispatch/drivers/detail.html
index 69c1f3a..bc674b9 100644
--- a/app/dispatch/templates/dispatch/drivers/detail.html
+++ b/app/dispatch/templates/dispatch/drivers/detail.html
@@ -4,18 +4,18 @@
 
 {% block content %}
 <div class="row">
-    <div class="col s12 m6">
-        <h1>Driver: {{ object.first_name }} {{ object.last_name }}</h1>
-        <h2>Loads for {{start_date}} - {{end_date}}</h2>
+    <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>
     </div>
 </div>
 
 <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={{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={{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/views.py b/app/dispatch/views.py
index 2e5093e..9dd60af 100644
--- a/app/dispatch/views.py
+++ b/app/dispatch/views.py
@@ -49,10 +49,12 @@ class LoadDateSort(DetailView):
         start_date, end_date, next_week, previous_week = get_week_dates(self.request.GET.get('date',None))
         loads = self.get_object().load_set.filter(date__range=(start_date, end_date)).prefetch_related('company')
         context['loads'] = split_loads_by_day(loads,start_date,end_date)
-        context['start_date'] = formats.date_format(start_date, "SHORT_DATE_FORMAT")
-        context['end_date'] = formats.date_format(end_date, "SHORT_DATE_FORMAT")
-        context['next_week'] = formats.date_format(next_week, "SHORT_DATE_FORMAT")
-        context['previous_week'] = formats.date_format(previous_week, "SHORT_DATE_FORMAT")
+
+        # Holy fucking shit this wasn't really necessary
+        context['start_date'] = start_date
+        context['end_date'] = end_date
+        context['next_week'] = next_week
+        context['previous_week'] = previous_week
         return context
 
 class FilteredListView(ListView):
@@ -157,7 +159,7 @@ class LoadCreate(CreateView):
     template_name = "dispatch/loads/create.html"
     model = Load
     success_url = reverse_lazy('load_list')
-    fields = ['date', 'company','description','amount']
+    fields = ['date', 'company', 'load_number', 'description','amount']
 
     def get(self,request):
         if request.user.is_superuser: