1 files changed, 38 insertions, 18 deletions
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)