From 5b2f6041e739be4810709ca49d0538279d3f549d Mon Sep 17 00:00:00 2001 From: Mitch Riedstra Date: Wed, 18 Oct 2017 15:55:23 -0400 Subject: Added a delivered to field. File uploads work. Load detail view works properly now. File upload names are properly set. You can now delete uploaded files --- app/dispatch/views.py | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) (limited to 'app/dispatch/views.py') diff --git a/app/dispatch/views.py b/app/dispatch/views.py index c436b7d..ef17666 100644 --- a/app/dispatch/views.py +++ b/app/dispatch/views.py @@ -188,7 +188,7 @@ class LoadCreate(CreateView): template_name = "dispatch/loads/create.html" model = Load success_url = reverse_lazy('load_list') - fields = ['date', 'company', 'load_number', 'description','amount'] + fields = ['date', 'company', 'load_number', 'description', 'delivered_to', 'amount'] def get(self,request): if request.user.is_superuser: @@ -207,13 +207,16 @@ class LoadDetail(DetailView): def get_context_data(self, **kwargs): context = super(LoadDetail, self).get_context_data(**kwargs) + + context['paperwork_list'] = Paperwork.objects.filter(load=context['object']) + return context class LoadUpdate(FilteredUpdateView): template_name = "dispatch/loads/edit.html" model = Load success_url = reverse_lazy('load_list') - fields = ['date', 'company','load_number','description','amount'] + fields = ['date', 'company','load_number','description', 'delivered_to', 'amount'] def get(self,request,pk): if request.user.is_superuser: @@ -242,10 +245,19 @@ def PaperworkUpload(request, load_id): pw = form.save(commit=False) pw.load = l pw.save() - return redirect(reverse('load_edit', kwargs={'pk': load_id})) + return redirect(reverse('load_detail', kwargs={'pk': load_id})) else: form = AddPaperworkForm() ctx = { 'form': form, 'load': l } return render(request, 'dispatch/paperwork/add.html', ctx) +def PaperworkDelete(request, load_id, pk): + # TODO: Someday we should return the errors deleting the file, if any + try: + p = Paperwork.objects.get(pk=pk) + p.delete() + except Exception as e: + print(e) + + return redirect(reverse('load_detail', kwargs={'pk': load_id})) -- cgit v1.2.3