diff options
Diffstat (limited to 'app')
| -rw-r--r-- | app/.gitignore | 3 | ||||
| -rw-r--r-- | app/dispatch/forms.py | 29 | ||||
| -rw-r--r-- | app/dispatch/templates/dispatch/paperwork/add.html | 9 | ||||
| -rw-r--r-- | app/dispatch/views.py | 56 |
4 files changed, 75 insertions, 22 deletions
diff --git a/app/.gitignore b/app/.gitignore index 49ef255..3e4485f 100644 --- a/app/.gitignore +++ b/app/.gitignore @@ -1 +1,2 @@ -db.sqlite3 +db.sqlite3* +media diff --git a/app/dispatch/forms.py b/app/dispatch/forms.py index 32d64dc..53bd5df 100644 --- a/app/dispatch/forms.py +++ b/app/dispatch/forms.py @@ -1,3 +1,32 @@ from django import forms +from dispatch.models import Paperwork +from django.conf import settings +# class PaperworkForm(forms.ModelForm): +# class Meta: +# model = Paperwork +# fields = ('load', 'description', 'document') + +# class AddPaperworkForm(forms.Form): +# # load_number = forms.CharField(max_length=64,default="") +# date = forms.DateField() +# user = forms.ForeignKey(settings.AUTH_USER_MODEL) +# company = forms.ForeignKey(Company) +# description = forms.CharField(max_length=256) +# amount = forms.DecimalField(max_digits=10,decimal_places=2, default="0") +# +# document_description = forms.CharField(max_length=256) +# document = forms.FileField(upload_to='paperwork/') +# +# class Meta: +# model = Paperwork +# fields = ('load', 'description', 'document') + + + +class AddPaperworkForm(forms.ModelForm): + class Meta: + model = Paperwork + fields = ('load', 'description', 'document') + # exclude = ('load',) diff --git a/app/dispatch/templates/dispatch/paperwork/add.html b/app/dispatch/templates/dispatch/paperwork/add.html index 98c51cf..107c905 100644 --- a/app/dispatch/templates/dispatch/paperwork/add.html +++ b/app/dispatch/templates/dispatch/paperwork/add.html @@ -11,10 +11,13 @@ fuck -{{load}} -{{form}} -<form action="" method="post">{% csrf_token %} +{% if form.errors %} +{{form.errors}} +{% endif %} + + +<form action="" method="post" enctype="multipart/form-data">{% csrf_token %} {{ form.as_p }} <input type="submit" class="btn blue" value="Update" /> </form> diff --git a/app/dispatch/views.py b/app/dispatch/views.py index 97756e3..758b010 100644 --- a/app/dispatch/views.py +++ b/app/dispatch/views.py @@ -10,6 +10,7 @@ from django.views.generic.detail import DetailView from django.views.generic.edit import CreateView, UpdateView, DeleteView from django.core.urlresolvers import reverse_lazy from dispatch.models import Company, Load, Paperwork +from dispatch.forms import AddPaperworkForm from django.contrib.auth.models import User from django.contrib.auth.mixins import UserPassesTestMixin from django.http import HttpResponseRedirect @@ -234,28 +235,47 @@ class LoadDelete(FilteredDeleteView): # Paperwork Uploads def PaperworkUpload(request, load_id): - print(request, load_id) - - ctx = {} - l = Load.objects.get(pk=load_id) - - ctx['load'] = l - - print(l) - if request.method == 'POST': - form = Paperwork(request.POST, request.FILES) + form = AddPaperworkForm(request.POST, request.FILES, initial={'load_id': load_id}) + print(request.POST) + print(request.FILES) + print("Form is: {}".format(form.is_valid())); if form.is_valid(): - # file is saved - form.save() - return HttpResponseRedirect('/success/url/') + print(form.save()) + return redirect(reverse('load_edit', kwargs={'pk': load_id})) + # elif not form.is_valid(): + # print(form.errors()) else: - form = Paperwork() + form = AddPaperworkForm() + ctx = { 'form': form, 'load': l } + return render(request, 'dispatch/paperwork/add.html', ctx) - ctx['form'] = form - # return redirect(reverse('load_edit', kwargs={'pk': load_id})) - # return render(request, 'dispatch/paperwork/add.html', {'form': form}) - return render(request, 'dispatch/paperwork/add.html', ctx) +# def PaperworkUpload(request, load_id): +# print(request, load_id) +# +# ctx = {} +# +# l = Load.objects.get(pk=load_id) +# +# ctx['load'] = l +# +# print(l) +# +# if request.method == 'POST': +# form = Paperwork(request.POST, request.FILES) +# if form.is_valid(): +# # file is saved +# form.save() +# return HttpResponseRedirect('/success/url/') +# else: +# form = Paperwork() +# +# +# ctx['form'] = form +# +# # return redirect(reverse('load_edit', kwargs={'pk': load_id})) +# # return render(request, 'dispatch/paperwork/add.html', {'form': form}) +# return render(request, 'dispatch/paperwork/add.html', ctx) |