diff options
Diffstat (limited to 'app/dispatch')
| -rw-r--r-- | app/dispatch/views.py | 27 |
1 files changed, 13 insertions, 14 deletions
diff --git a/app/dispatch/views.py b/app/dispatch/views.py index f487ef7..904639e 100644 --- a/app/dispatch/views.py +++ b/app/dispatch/views.py @@ -38,12 +38,23 @@ def get_week_dates(date=None): 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): - print(date) str_date = formats.date_format(date, "SHORT_DATE_FORMAT") if str_date not in split_loads: split_loads[str_date] = loads.filter(date=date) return split_loads +class LoadDateSort(DetailView): + def get_context_data(self, **kwargs): + context = super(DetailView, self).get_context_data(**kwargs) + 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") + return context + class FilteredListView(ListView): def get_queryset(self): base_qs = super(FilteredListView, self).get_queryset() @@ -75,18 +86,6 @@ class DriverList(UserPassesTestMixin, ListView): def test_func(self): return self.request.user.is_superuser -class LoadDateSort(DetailView): - def get_context_data(self, **kwargs): - context = super(DetailView, self).get_context_data(**kwargs) - 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") - return context - class DriverDetail(LoadDateSort): template_name = "dispatch/drivers/detail.html" model = User @@ -189,7 +188,7 @@ class LoadUpdate(FilteredUpdateView): template_name = "dispatch/loads/edit.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,pk): if request.user.is_superuser: |