From 86e84a94a6b1e5e86e78459b06a9d618f76dcbb0 Mon Sep 17 00:00:00 2001 From: Nishanth Amuluru Date: Thu, 6 Jan 2011 10:05:58 +0530 Subject: added a form in the template, for users to submit work --- taskapp/views/task.py | 5 +++-- templates/task/report.html | 7 ++++++- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/taskapp/views/task.py b/taskapp/views/task.py index e0749ca..c5e7b04 100644 --- a/taskapp/views/task.py +++ b/taskapp/views/task.py @@ -3,7 +3,7 @@ from datetime import datetime from django.http import HttpResponse, Http404 from django.shortcuts import render_to_response, redirect -from pytask.taskapp.models import User, Task, Comment, Request, Notification +from pytask.taskapp.models import User, Task, Comment, Request, Notification, WorkReport from pytask.taskapp.utilities.task import getTask from pytask.taskapp.forms.task import TaskCreateForm, AddReviewerForm, AddTaskForm, ChoiceForm, AssignPyntForm, RemoveUserForm, EditTaskForm, ClaimTaskForm, WorkReportForm from pytask.taskapp.events.task import createTask, reqReviewer, publishTask, addSubTask, addDep, addClaim, assignTask, updateTask, removeTask, removeUser, assignPynts, completeTask, closeTask, addReviewer, deleteTask @@ -53,12 +53,13 @@ def upload_work(request, tid): can_upload = True if user in task.assigned_users.all() else False - old_reports = WorkReport.workreport_report.all() + old_reports = task.workreport_report.all() context = { 'user': user, 'task': task, 'old_reports': old_reports, + 'can_upload': can_upload, } if request.method == "POST": diff --git a/templates/task/report.html b/templates/task/report.html index 8890d1f..4e18f32 100644 --- a/templates/task/report.html +++ b/templates/task/report.html @@ -10,6 +10,11 @@ There are no reports submitted as of now {{rep.submitted_by}} | {{rep.attachment}}
{% endfor %} {% endif %} -some data
+{% if can_upload %} +Submit a report:
+
+{{ form.as_p }} +
+{% endif %} {% endblock %} -- cgit