diff --git a/smash/web/models.py b/smash/web/models.py
index ced3fffd9a5c13c8870f261576ff4d4b0c2df5a9..0b93aea2f8189777eb52ad407184f00bb182ce07 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 17b58ca0f95ed302442f5509c89ab4247c4ab2c0..abfb6b4d233f790f557b2f267e783a3e4d848da1 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 d4d50c450a8eddb59813cb277cc1728f7894ced0..1c647eb7d340c25f61166f64f1a9286b89bdb1e0 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 31d518dfbd1428b25ad248bb05e7a296e27cfead..b50324016133a19f1b40bd14a5d7cd90829e1a7c 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 e945f5a78ee136af674b62602bdd50c4974159e1..93699e20a8cb205d09d62e2366f207af4da0f9f2 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 387edb65e195e083a214d2ece8d70cc63bcf4d20..973d1af1c726690471427930fad381f81c17f373 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 1c6ed6bf14f7152abbc5455b508bebc26633f0dc..23bb63697e63f10bab5c70615b2bc45f5e3da296 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"),
diff --git a/smash/web/templatetags/__init__.py b/smash/web/templatetags/__init__.py
new file mode 100644
index 0000000000000000000000000000000000000000..792d6005489ebee62cde02066f19c5521e620451
--- /dev/null
+++ b/smash/web/templatetags/__init__.py
@@ -0,0 +1 @@
+#
diff --git a/smash/web/templatetags/filters.py b/smash/web/templatetags/filters.py
new file mode 100644
index 0000000000000000000000000000000000000000..5641adbcf83c39afc4f24e28e17f1cc595745719
--- /dev/null
+++ b/smash/web/templatetags/filters.py
@@ -0,0 +1,16 @@
+# See: http://stackoverflow.com/a/18962481
+from django import template
+
+register = template.Library()
+
+@register.filter(name='add_class')
+def add_class(value, arg):
+ css_classes = value.field.widget.attrs.get('class', ' ').split(' ')
+ if css_classes and arg not in css_classes:
+ css_classes = '%s %s' % (css_classes, arg)
+ return value.as_widget(attrs={'class': css_classes})
+
+@register.filter(name='disable')
+def disable(value):
+ value.field.widget.attrs['disabled']='disabled'
+ return value