added saving of attachments

3 files changed, 21 insertions, 3 deletions

diff --git a/taskapp/forms/task.py b/taskapp/forms/task.py
index 44773e2..ef294a2 100644
--- a/taskapp/forms/task.py
+++ b/taskapp/forms/task.py
@@ -104,3 +104,4 @@ class WorkReportForm(forms.ModelForm):
     class Meta:
         model = WorkReport
         fields = ['remarks', 'attachment']
+
diff --git a/taskapp/models.py b/taskapp/models.py
index f618279..7e7e70b 100644
--- a/taskapp/models.py
+++ b/taskapp/models.py
@@ -171,11 +171,11 @@ class Notification(models.Model):
     
 class WorkReport(models.Model):
 
-    attachment = models.FileField(upload_to = UPLOADS_DIR, blank = False)
+    attachment = models.FileField(upload_to=UPLOADS_DIR)
     remarks = models.TextField()
     revision = models.PositiveIntegerField(default=0)
     task = models.ForeignKey(Task, related_name = "%(class)s_report")
-    submitted_by = models.ForeignKey(Task, related_name = "%(class)s_submitted_by")
+    submitted_by = models.ForeignKey(User, related_name = "%(class)s_submitted_by")
 
     created_at = models.DateTimeField()
 
diff --git a/taskapp/views/task.py b/taskapp/views/task.py
index c5e7b04..1bb0453 100644
--- a/taskapp/views/task.py
+++ b/taskapp/views/task.py
@@ -66,7 +66,24 @@ def upload_work(request, tid):
         if not can_upload:
             return show_msg(user, "You are not authorised to upload data to this task", task_url, "view the task")
 
-        pass
+        form = WorkReportForm(request.POST, request.FILES)
+
+        if form.is_valid():
+            r = WorkReport(attachment = form.cleaned_data['remarks'],
+                           remarks = form.cleaned_data['remarks'],
+                           revision = old_reports.count(),
+                           task = task,
+                           submitted_by = user,
+                           created_at = datetime.now(),
+                          )
+
+            r.save()
+            return redirect(task_url)
+
+        else:
+            context.update({"form":form})
+            return render_to_response('task/report.html', context)
+
     else:
         form = WorkReportForm()
         context.update({"form":form})