From 08d3f0da09e68fe26241aeb048350bb23f064f6e Mon Sep 17 00:00:00 2001
From: Piotr Gawron <piotr.gawron@uni.lu>
Date: Thu, 9 Mar 2017 12:09:54 +0100
Subject: [PATCH] when editing subject status of dead, resigned is shown when
applicable
---
smash/web/templates/subjects/edit.html | 18 +++++++++++++++---
smash/web/views.py | 5 ++++-
2 files changed, 19 insertions(+), 4 deletions(-)
diff --git a/smash/web/templates/subjects/edit.html b/smash/web/templates/subjects/edit.html
index 6b74afe2..124a4d53 100644
--- a/smash/web/templates/subjects/edit.html
+++ b/smash/web/templates/subjects/edit.html
@@ -26,7 +26,7 @@
<div class="box box-info">
<div class="box-header with-border">
<a href="{% url 'web.views.subjects' %}" class="btn btn-block btn-default" onclick="history.back()">Go back (without changes)</a>
- <a href="{% url 'web.views.subject_visit_details' id %}" type = "button" class="btn btn-block btn-default">Subject's visits</a>
+ <a href="{% url 'web.views.subject_visit_details' subject.id %}" type = "button" class="btn btn-block btn-default">Subject's visits</a>
</div>
{% comment %} <div class="box-header with-border">
@@ -57,8 +57,20 @@
{% endfor %}
<div class="col-md-6">
- <a href="{% url 'web.views.subject_mark' id 'rejected' %}" class="btn btn-warning btn-block">Mark as rejected</a>
- <a href="{% url 'web.views.subject_mark' id 'dead' %}" class="btn btn-danger btn-block">Mark as dead</a><br />
+ {% if not subject.resigned %}
+ <a href="{% url 'web.views.subject_mark' subject.id 'rejected' %}" class="btn btn-warning btn-block">Mark as rejected</a>
+ {% else %}
+ <label for="{# TODO #}" class="col-sm-4 control-label">REJECTED</label>
+ <div class="col-sm-8">{{subject.resigned}}</div>
+ {% endif %}
+ </div>
+ <div class="col-md-6">
+ {% if not subject.dead %}
+ <a href="{% url 'web.views.subject_mark' subject.id 'dead' %}" class="btn btn-danger btn-block">Mark as dead</a><br />
+ {% else %}
+ <label for="{# TODO #}" class="col-sm-4 control-label">DEAD</label>
+ <div class="col-sm-8">{{subject.dead}}</div>
+ {% endif %}
</div>
</div>
diff --git a/smash/web/views.py b/smash/web/views.py
index 0af808bf..de0d8730 100644
--- a/smash/web/views.py
+++ b/smash/web/views.py
@@ -328,7 +328,10 @@ def subject_edit(request, id):
return redirect(subjects)
else:
form = SubjectEditForm(instance=the_subject)
- return wrap_response(request, 'subjects/edit.html', {'form': form, 'id':id})
+ return wrap_response(request, 'subjects/edit.html', {
+ 'form': form,
+ 'subject': the_subject
+ })
def subject_delete(request, id):
--
GitLab