diff options
| -rwxr-xr-x | pytask/taskapp/views/task.py | 2 | ||||
| -rw-r--r-- | pytask/templates/task/view.html | 22 |
2 files changed, 24 insertions, 0 deletions
diff --git a/pytask/taskapp/views/task.py b/pytask/taskapp/views/task.py index 4b08543..5ecd551 100755 --- a/pytask/taskapp/views/task.py +++ b/pytask/taskapp/views/task.py @@ -208,10 +208,12 @@ def view_task(request, task_id, **kwargs): is_reviewer = True if user in task.reviewers.all() else False comments = task.comments.filter( is_deleted=False).order_by('comment_datetime') + reports = task.reports.order_by('submitted_at') context.update({'is_reviewer':is_reviewer, 'comments':comments, 'reviewers':reviewers, + 'reports': reports, }) selected_users = task.selected_users.all() diff --git a/pytask/templates/task/view.html b/pytask/templates/task/view.html index d0cafcf..bee0abf 100644 --- a/pytask/templates/task/view.html +++ b/pytask/templates/task/view.html @@ -115,6 +115,28 @@ along with PyTask. If not, see <http://www.gnu.org/licenses/>. {% as_div_form comment_form "Comment Form" csrf_token "Submit" %} {% endif %} + {% if reports %} + + Work submissions:<br /><br /> + {% for report in reports %} + <a href="{% url view_user_profile report.submitted_by.id %}"> + {{ report.submitted_by.username }} + </a> + on {{ report.submitted_at|date:"D d M Y"}} at + {{comment.submitted_at|time:"H:i"}} wrote: + <br /> + {{ report.data|linebreaksbr }}<br /> + {% if report.attachment %} + {% pygment cssclass="codehilite" %} + <pre lang="python"> + {% ssi report.attachment.url|safe %} + </pre> + {% endpygment %}<br/><br/><br/><br/> + {% endif %} + {% endfor %} + + {% endif %} + {% if can_report and work_report_form %} Submit work:<br /> {% as_div_form work_report_form "Work Submission Form" csrf_token "Submit" "" "True" %} |