From db49e45bfff66b20598a89cc787e61a4200bc4b2 Mon Sep 17 00:00:00 2001
From: Jacek Lebioda <jacek.lebioda.001@student.uni.lu>
Date: Tue, 7 Feb 2017 09:46:57 +0100
Subject: [PATCH] Corrections in marking as rejected or dead, small refactor
---
smash/web/models.py | 15 ++++++++++-----
smash/web/templates/_base.html | 2 +-
smash/web/templates/subjects/edit.html | 4 ++--
smash/web/urls.py | 2 +-
smash/web/views.py | 4 ++--
5 files changed, 16 insertions(+), 11 deletions(-)
diff --git a/smash/web/models.py b/smash/web/models.py
index 52ee25f3..ee07ad6b 100644
--- a/smash/web/models.py
+++ b/smash/web/models.py
@@ -53,11 +53,11 @@ class Subject(models.Model):
)
def mark_as_dead(self):
- self.status = STATUS_CHOICES_DEAD
+ self.status = self.STATUS_CHOICES_DEAD
self.save()
def mark_as_rejected(self):
- self.status = 'REJ'
+ self.status = self.STATUS_CHOICES_REJECTED
self.save()
sex = models.CharField(max_length=1,
@@ -150,10 +150,15 @@ class Visit(models.Model):
datetime_end = models.DateTimeField(
verbose_name='Visit ends at'
) # Deadline before which all appointments need to be scheduled
+
+ TYPE_CHOICES_LEVEL_A_VISIT = 'A'
+ TYPE_CHOICES_LEVEL_B_VISIT = 'B'
+ TYPE_CHOICES_OTHER = 'O'
+
TYPE_CHOICES = (
- ('A', 'Level A visit'),
- ('B', 'Level B visit'),
- ('O', 'Other')
+ (TYPE_CHOICES_LEVEL_A_VISIT, 'Level A visit'),
+ (TYPE_CHOICES_LEVEL_B_VISIT, 'Level B visit'),
+ (TYPE_CHOICES_OTHER, 'Other')
)
visit_type = models.CharField(max_length=1, choices=TYPE_CHOICES,
verbose_name='Visit type',
diff --git a/smash/web/templates/_base.html b/smash/web/templates/_base.html
index 197e7717..1262ad83 100644
--- a/smash/web/templates/_base.html
+++ b/smash/web/templates/_base.html
@@ -445,7 +445,7 @@ desired effect
<script src="{% static 'AdminLTE/plugins/jQuery/jquery-2.2.3.min.js' %}"></script>
<!-- Bootstrap 3.3.6 -->
<script src="{% static 'AdminLTE/js/bootstrap.min.js' %}"></script>
- <!-- AdminLTE App -->
+ <!-- AdminLTE Template Helpers (for example- left side bar) -->
<script src="{% static 'AdminLTE/js/app.min.js' %}"></script>
<script>
diff --git a/smash/web/templates/subjects/edit.html b/smash/web/templates/subjects/edit.html
index eb705a01..0824827e 100644
--- a/smash/web/templates/subjects/edit.html
+++ b/smash/web/templates/subjects/edit.html
@@ -54,8 +54,8 @@
{% endfor %}
<div class="col-md-6">
- <a href="{% url 'web.views.subject_mark' id 0 %}" class="btn btn-warning btn-block">Mark as rejected</a>
- <a href="{% url 'web.views.subject_mark' id 1 %}" class="btn btn-danger btn-block">Mark as dead</a><br />
+ <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 />
</div>
</div>
diff --git a/smash/web/urls.py b/smash/web/urls.py
index a5ba2717..4a71af8d 100644
--- a/smash/web/urls.py
+++ b/smash/web/urls.py
@@ -33,7 +33,7 @@ urlpatterns = [
url(r'subjects/subject_visit_details/(?P<id>\d+)$', views.subject_visit_details, name='web.views.subject_visit_details'),
url(r'subjects/edit/(?P<id>\d+)$', views.subject_edit, name='web.views.subject_edit'),
url(r'subjects/delete/(?P<id>\d+)$', views.subject_delete, name='web.views.subject_delete'),
- url(r'subjects/mark/(?P<id>\d+)/(?P<as_what>\d+)$', views.subject_mark, name='web.views.subject_mark'),
+ url(r'subjects/mark/(?P<id>\d+)/(?P<as_what>[A-z]+)$', views.subject_mark, name='web.views.subject_mark'),
url(r'doctors$', views.doctors, name='web.views.doctors'),
url(r'doctors/add$', views.doctor_add, name='web.views.doctor_add'),
diff --git a/smash/web/views.py b/smash/web/views.py
index bb88a1d4..0b280f55 100644
--- a/smash/web/views.py
+++ b/smash/web/views.py
@@ -139,9 +139,9 @@ def subject_delete(request, id):
def subject_mark(request, id, as_what):
who = Subject.objects.get(id=id)
- if as_what == '1':
+ if as_what == 'dead':
who.mark_as_dead()
- elif as_what == '0':
+ elif as_what == 'rejected':
who.mark_as_rejected()
return redirect(subject_edit, id=id)
--
GitLab