From 6a8283f4fc05095946d36a86b328d66b918d8565 Mon Sep 17 00:00:00 2001
From: Jacek Lebioda <jacek.lebioda.001@student.uni.lu>
Date: Wed, 1 Feb 2017 09:46:58 +0100
Subject: [PATCH] Added diagnosis entries to the patient model
---
smash/web/models.py | 14 ++++++++++++--
smash/web/templates/_base.html | 8 ++++----
smash/web/templates/doctors/add.html | 2 +-
smash/web/templates/doctors/edit.html | 2 +-
smash/web/templates/subjects/delete.html | 2 +-
smash/web/templates/subjects/edit.html | 2 +-
smash/web/templates/subjects/index.html | 12 +++++++-----
7 files changed, 27 insertions(+), 15 deletions(-)
diff --git a/smash/web/models.py b/smash/web/models.py
index ced3fffd..0b93aea2 100644
--- a/smash/web/models.py
+++ b/smash/web/models.py
@@ -6,6 +6,9 @@ from django.contrib.auth.models import User, AnonymousUser
import datetime
+def get_current_year():
+ return datetime.datetime.now().year
+
class Language (models.Model):
name = models.CharField(max_length=20)
image = models.ImageField()
@@ -91,15 +94,22 @@ class Subject(models.Model):
comments = models.CharField(max_length=2000,
verbose_name='Comments'
)
-
dateAdded = models.DateField(verbose_name='Added on',
auto_now=True
)
-
referral = models.CharField(max_length=128,
null=True,
verbose_name='Referred by'
)
+ diagnosis = models.CharField(max_length=128,
+ null=True,
+ verbose_name='Diagnosis'
+ )
+ year_of_diagnosis = models.IntegerField(
+ default=0,
+ null=True,
+ verbose_name='Year of diagnosis'
+ )
def __str__(self):
return "%s %s" % (self.firstName, self.lastName)
diff --git a/smash/web/templates/_base.html b/smash/web/templates/_base.html
index 17b58ca0..abfb6b4d 100644
--- a/smash/web/templates/_base.html
+++ b/smash/web/templates/_base.html
@@ -64,7 +64,7 @@ desired effect
<!-- mini logo for sidebar mini 50x50 pixels -->
<span class="logo-mini"><i class="fa fa-calendar-check-o fa-2x"></i></span>
<!-- logo for regular state and mobile devices -->
- <span class="logo-lg"><b>Smart</b>Scheduling</span>
+ <span class="logo-lg"><b>Smart</b>Scheduling <small>alpha</small></span>
</a>
<!-- Header Navbar -->
@@ -343,9 +343,9 @@ desired effect
<footer class="main-footer">
{% block footer %}
<!-- To the right -->
- <!--<div class="pull-right hidden-xs">
- -
- </div>-->
+ <div class="pull-right hidden-xs">
+ Version: <strong>preview 0.1</strong> (31st Jan 2017)
+ </div>
<!-- Default to the left -->
2017, Parkinson Research Clinic <!--(eg. <small>
diff --git a/smash/web/templates/doctors/add.html b/smash/web/templates/doctors/add.html
index d4d50c45..1c647eb7 100644
--- a/smash/web/templates/doctors/add.html
+++ b/smash/web/templates/doctors/add.html
@@ -23,7 +23,7 @@
{% block content %}
<div class="box box-info">
<div class="box-header with-border">
- <a href="{% url 'web.views.doctors' %}" class="btn btn-block btn-default">Go back (without change)</a>
+ <a href="{% url 'web.views.doctors' %}" class="btn btn-block btn-default">Go back (without changes)</a>
</div>
{% comment %} <div class="box-header with-border">
diff --git a/smash/web/templates/doctors/edit.html b/smash/web/templates/doctors/edit.html
index 31d518df..b5032401 100644
--- a/smash/web/templates/doctors/edit.html
+++ b/smash/web/templates/doctors/edit.html
@@ -23,7 +23,7 @@
{% block content %}
<div class="box box-info">
<div class="box-header with-border">
- <a href="{% url 'web.views.doctors' %}" class="btn btn-block btn-default" onclick="history.back()">Go back (without change)</a>
+ <a href="{% url 'web.views.doctors' %}" class="btn btn-block btn-default" onclick="history.back()">Go back (without changes)</a>
</div>
{% comment %} <div class="box-header with-border">
diff --git a/smash/web/templates/subjects/delete.html b/smash/web/templates/subjects/delete.html
index e945f5a7..93699e20 100644
--- a/smash/web/templates/subjects/delete.html
+++ b/smash/web/templates/subjects/delete.html
@@ -24,7 +24,7 @@
{% block content %}
<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 change)</a>
+ <a href="{% url 'web.views.subjects' %}" class="btn btn-block btn-default" onclick="history.back()">Go back (without changes)</a>
</div>
{% comment %} <div class="box-header with-border">
diff --git a/smash/web/templates/subjects/edit.html b/smash/web/templates/subjects/edit.html
index 387edb65..973d1af1 100644
--- a/smash/web/templates/subjects/edit.html
+++ b/smash/web/templates/subjects/edit.html
@@ -23,7 +23,7 @@
{% block content %}
<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 change)</a>
+ <a href="{% url 'web.views.subjects' %}" class="btn btn-block btn-default" onclick="history.back()">Go back (without changes)</a>
</div>
{% comment %} <div class="box-header with-border">
diff --git a/smash/web/templates/subjects/index.html b/smash/web/templates/subjects/index.html
index 1c6ed6bf..23bb6369 100644
--- a/smash/web/templates/subjects/index.html
+++ b/smash/web/templates/subjects/index.html
@@ -30,7 +30,8 @@
<table id="table" class="table table-bordered table-striped tablesorter">
<thead>
<tr>
- <th>No.</th>
+ <th>ND</th>
+ <th>Screening</th>
<th>First name</th>
<th>Last name</th>
<th>Country</th>
@@ -48,7 +49,8 @@
<tbody>
{% for subject in subjects_list %}
<tr>
- <td>{{ forloop.counter }}</td>
+ <td>{{ subject.ndno }}</td>
+ <td>{{ subject.screeningNo }}</td>
<td>{{ subject.firstName }}</td>
<td>{{ subject.lastName }}</td>
<td>{{ subject.country }}</td>
@@ -94,10 +96,10 @@
filter_cssFilter: "form-control",
},
headers: {
- 4: { sorter: false},
- 7: { sorter: false},
+ 5: { sorter: false},
8: { sorter: false},
- 9: { sorter: false}
+ 9: { sorter: false},
+ 10: { sorter: false}
}
}).tablesorterPager({
container: $(".ts-pager"),
--
GitLab