Release v0.1.2, merge branch 'develop'

wjdp · Jul 5, 2016 · 41fd764 · 41fd764
2 parents d2a7830 + d84624f
commit 41fd764
Show file tree

Hide file tree

Showing 10 changed files with 32 additions and 18 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,6 +3,18 @@
 All notable changes to this project will be documented in this file. Notes should be geared towards the managers of
 xSACdb instances. This project will soon adhere to [Semantic Versioning](http://semver.org/).
 
+
+## [0.1.2] - 2016-07-05
+
+### Changed
+- Display qualification list on training dash for users without any qualifications or training_for, #144
+
+### Fixed
+- Updating planned SDC dates and notes fails.
+- Upcoming SDC sorted by date.
+- Server error when generating pool sheet, #223
+
+
 ## [0.1.1] - 2016-05-24
 
 ### Fixed

diff --git a/src/templates_global/print_template.html b/src/templates_global/print_template.html
@@ -1,3 +1,4 @@
+{% load staticfiles %}
 <!doctype html>
 <html>
 <head>

diff --git a/src/xSACdb/settings/common.py b/src/xSACdb/settings/common.py
@@ -249,3 +249,6 @@
     ('xsd_training', 'TraineeGroup'),
     ('xsd_sites', 'Site'),
 ]
+
+## TODO HACK, disable email sending to prevent #173 on servers without email provision
+EMAIL_BACKEND = 'django.core.mail.backends.dummy.EmailBackend'
diff --git a/src/xSACdb/version.py b/src/xSACdb/version.py
@@ -1,6 +1,6 @@
 # Version file, currently manually updated
 
 VERSION = {
-    'tag': '0.1.1',
-    'released': '2016-05-24',
+    'tag': '0.1.2',
+    'released': '2016-07-05',
 }
diff --git a/src/xsd_training/forms.py b/src/xsd_training/forms.py
@@ -15,7 +15,7 @@ class Meta:
 class PerformedSDCUpdateForm(forms.ModelForm):
     class Meta:
         model=PerformedSDC
-        fields= ('sdc', 'datetime', 'notes')
+        fields= ('datetime', 'notes')
 
 class QualificationSelectForm(forms.Form):
     qualification=forms.ModelChoiceField(queryset=Qualification.objects.all())

diff --git a/src/xsd_training/templates/overview.html b/src/xsd_training/templates/overview.html
@@ -4,11 +4,7 @@
 
 <div class="span4">
 	<p>Welcome to your club training logbook. From here you can lookup all your upcoming and past lessons including lesson feedback.</p>
-	{% if profile.top_qual == None and profile.training_for == None %}
-		<div class="alert alert-info">
-			<i class="fa fa-info-circle"></i> No data
-		</div>
-	{% else %}
+
 	<table class="table">
 		<tr><td><i class="indicator fa fa-chevron-circle-right"></i></td><td>Training For</td><td><i class="indicator fa fa-star"></td><td>Current Qualification</td></tr>
 	</table>
@@ -19,9 +15,6 @@
 		{{qual.title}}
 	</div>
 	{% endfor %}
-	{% endif %}
-
-
 
 </div>
 

diff --git a/src/xsd_training/templates/performedsdc_update.html b/src/xsd_training/templates/performedsdc_update.html
@@ -1,14 +1,15 @@
 {% extends 'training_template.html' %}
 {% load staticfiles %}
+{% load bootstrap_toolkit %}
 
 {% block training_content %}
 <div class="span3">
     <form action="." method="POST">
     {% csrf_token %}
     <input type="hidden" name="action" value="detail" />
-    <h2>{{psdc.sdc}}</h2>
-    <p>This skill development course is planned for {{form.datetime}}</p>
-    <p>{{form.notes}}</p>
+    <h2>{{ psdc.sdc }}</h2>
+    <p>This skill development course is planned for {{ form.datetime|as_bootstrap }}</p>
+    <p>{{ form.notes|as_bootstrap }}</p>
 
     <input type="submit" class="btn btn-primary" value="Save Changes" />
     </form>

diff --git a/src/xsd_training/templates/pool_sheet_generate.html b/src/xsd_training/templates/pool_sheet_generate.html
@@ -41,5 +41,4 @@
 {% endfor %}
 </table>
 
-
-{% endblock %}
+{% endblock %}
diff --git a/src/xsd_training/tests.py b/src/xsd_training/tests.py
@@ -109,7 +109,12 @@ def test_200(self):
     def test_content(self):
         c = self.get_client()
         r = c.get(self.URL)
-        self.assertIn('No data', r.content)
+
+        self.assertIn('Ocean Diver', r.content)
+        self.assertIn('Sports Diver', r.content)
+        self.assertIn('Dive Leader', r.content)
+        self.assertIn('Advanced Diver', r.content)
+        self.assertIn('First Class Diver', r.content)
 
     def test_content_with_tf(self):
         # Set training_for so list appears

diff --git a/src/xsd_training/views/sdc.py b/src/xsd_training/views/sdc.py
@@ -73,7 +73,7 @@ class PerformedSDCList(RequireVerified, ListView):
 
     def get_queryset(self):
         queryset=super(PerformedSDCList, self).get_queryset()
-        queryset=queryset.filter(completed=False)
+        queryset=queryset.filter(completed=False).order_by('datetime')
         return queryset
 
 class PerformedSDCDetail(RequireVerified, DetailView):