Merge branch '157-date-added-is-not-valid' into 'master'

date added is not valid

Closes #157

See merge request NCER-PD/scheduling-system!145

smash/web/migrations/0116_auto_20180611_1346.py

+# -*- coding: utf-8 -*-
+# Generated by Django 1.10.7 on 2018-06-11 13:46
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('web', '0115_auto_20180611_0950'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='studysubject',
+            name='date_added',
+            field=models.DateField(auto_now_add=True, verbose_name=b'Added on'),
+        ),
+    ]

smash/web/models/study_subject.py

@@ -84,7 +84,7 @@ class StudySubject(models.Model):
                                 verbose_name='Comments'
                                 )
     date_added = models.DateField(verbose_name='Added on',
-                                  auto_now=True
+                                  auto_now_add=True
                                   )
     referral = models.CharField(max_length=128,
                                 null=True,

smash/web/templates/includes/subject_vouchers_box.html

@@ -41,7 +41,8 @@
                     {% endfor %}
                     </tbody>
                 </table>
-                <a href="#" data-url="{% url "web.views.mail_template_generate_for_vouchers" %}" onclick='
+                {% if subject.vouchers.all.count > 0 %}
+                    <a href="#" data-url="{% url "web.views.mail_template_generate_for_vouchers" %}" onclick='
                 var checkboxes = $(".voucher_checkbox");
                 var url = $(this).data("url")+"?voucher_id=";
 
@@ -52,6 +53,7 @@
                 }
                 this.href = url;
                 '>Print vouchers</a>
+                {% endif %}
 
             </div>
         </div>