Moved functions to a 'misc' file. Added a settings model. Added initial version of an 'Invoice' model

1 files changed, 1 insertions, 27 deletions

diff --git a/app/dispatch/views.py b/app/dispatch/views.py
index 4a8a18b..65d2811 100644
--- a/app/dispatch/views.py
+++ b/app/dispatch/views.py
@@ -15,38 +15,12 @@ from dispatch.forms import AddPaperworkForm
 from django.contrib.auth.models import User
 from django.contrib.auth.mixins import UserPassesTestMixin
 # from django.http import HttpResponseRedirect
-from datetime import datetime, timedelta
-from django.utils import formats
-from dateutil import rrule
+from .misc import get_week_dates, split_loads_by_day
 import re, os
 
 def home(request):
     return redirect(reverse('load_list'))
 
-def get_week_dates(date=None):
-    week_dates = {}
-    if date == None:
-        date = formats.date_format(datetime.now(), "SHORT_DATE_FORMAT")
-    dt = datetime.strptime(date, '%m/%d/%Y')
-    weekday = dt.weekday()
-    if weekday == 6:
-        week_dates['start_date'] = dt
-    else:
-        weekday = weekday + 1
-        week_dates['start_date'] = dt - timedelta(days=weekday)
-    week_dates['end_date'] = week_dates['start_date'] + timedelta(days=6)
-    week_dates['next_week'] = week_dates['end_date'] + timedelta(days=1)
-    week_dates['previous_week'] = week_dates['start_date'] - timedelta(days=1)
-    return week_dates
-
-def split_loads_by_day(loads,start_date,end_date):
-    split_loads = {}
-
-    for date in rrule.rrule(rrule.DAILY,dtstart=start_date, until=end_date):
-        if date not in split_loads:
-            split_loads[date] = loads.filter(date=date)
-
-    return split_loads
 
 class LoadDateSort(DetailView):
     def get_context_data(self, **kwargs):