Response stores score not FK on available_response

I'm changing the available responses for the questionnaires because I'm finding them difficult to answer consistently. I'm therefore updating their labels. In order to maintain the previous data, I'm modifying the way responses get stored. Instead of recording the ID of the response (as a FK), I'm going to simply store the score of the response. This is done as a simple `IntegerField()` instead of a FK.

Author: ConstantinoSchillebeeckx

oolong_app/forms.py

@@ -41,6 +41,10 @@ class QuestionnaireForm(forms.Form):
     questionnaire have the same questions; so we need a dynamic way
     of generatic a Form.
 
+    Each question in the questionnaire will get a select generate
+    for it, the id of that select will be in the form qid_XX, where
+    XX is the ID (in the DB) of the question.
+
     https://jacobian.org/writing/dynamic-form-generation/
     '''
 
@@ -84,14 +88,20 @@ def clean(self):
             hr_diff = diff.total_seconds() / 3600.0
             min_diff = 12 # minumum 12 hrs between submits
 
-            if hr_diff < min_diff:
+            if False and hr_diff < min_diff:
                     raise forms.ValidationError('You cannot submit this questionnaire more than once per day; you last submitted it %.3f hours ago.' %hr_diff)
 
         return form_data
 
 
     def get_answers(self):
-        # returns the tuple (question_id, response_id)
+        '''
+        Iterates over self.cleaned_data and parses the question
+        answers into a tuple (qid, score) where score is
+        the score given to a particular response, and qid is the
+        ID (in the DB) of the question.
+        '''
+        # returns the tuple (question_id, score)
         for name, value in self.cleaned_data.items():
             if name.startswith('qid_'):
                 qid = int(name.replace('qid_',''))
@@ -102,10 +112,10 @@ def save(self, commit=True, *args, **kwargs):
         super(QuestionnaireForm, self).__init__(*args, **kwargs)
         user = self.cleaned_data.get('user',None)
 
-        for (question_id, response_id) in self.get_answers():
+        for (question_id, score) in self.get_answers():
             r = Response(
                     question_id = question_id,
-                    response_id = response_id,
+                    score = score,
                     user_id = user
                 )
             r.save()

oolong_app/migrations/0018_response_score.py

@@ -0,0 +1,21 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.10 on 2018-03-31 13:43
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('oolong_app', '0017_questionnaire_default_response'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='response',
+            name='score',
+            field=models.IntegerField(db_index=True, default=0, help_text='Score for given response; e.g. 4.'),
+            preserve_default=False,
+        ),
+    ]

oolong_app/migrations/0019_auto_20180331_1358.py

@@ -0,0 +1,21 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.10 on 2018-03-31 13:58
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('oolong_app', '0018_response_score'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='response',
+            name='response',
+            field=models.ForeignKey(db_index=False, help_text='Response to given question.', on_delete=django.db.models.deletion.CASCADE, to='oolong_app.AvailableResponse'),
+        ),
+    ]

oolong_app/migrations/0020_auto_20180331_1359.py

@@ -0,0 +1,20 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.10 on 2018-03-31 13:59
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('oolong_app', '0019_auto_20180331_1358'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='response',
+            name='response',
+            field=models.IntegerField(help_text='Response to given question.'),
+        ),
+    ]

oolong_app/migrations/0021_auto_20180331_1400.py

@@ -0,0 +1,20 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.10 on 2018-03-31 14:00
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('oolong_app', '0020_auto_20180331_1359'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='response',
+            name='response',
+            field=models.IntegerField(help_text='Response to given question.', null=True),
+        ),
+    ]

oolong_app/models.py

@@ -727,11 +727,17 @@ class Response(models.Model):
             "Question being answered/scored."
         )
     )   
-    response = models.ForeignKey(
-        AvailableResponse,
+    score = models.IntegerField(
         blank=False,
-        null=False,
         db_index=True,
+        null=False,
+        help_text=(
+            "Score for given response; e.g. 4."
+        )
+    )
+    response = models.IntegerField(
+        db_index=False,
+        null=True,
         help_text=(
             "Response to given question."
         )

oolong_app/templates/plot.html

@@ -15,7 +15,7 @@
                     {% if plotdat %}
                         <div id="chart"></div>
                     {% else %}
-                        <p class="lead">No data found for {{ user.get_username }}; please fill out the <a href='/submit_questionnaire/'>questionnaire</a> first.</p>
+                        <p class="lead" style="padding-left:15px;">No data found for {{ user.get_username }}; please fill out the <a href='/submit_questionnaire/'>questionnaire</a> first.</p>
                     {% endif %}
                 {% endcolumn %}
             {% endrow %}
@@ -25,7 +25,9 @@
 
     <script>
         jQuery(function () {
-            render_response_plot({{plotdat|safe}}, 'avg')
+            if (typeof {{plotdat|safe}} !== 'undefined') {
+                render_response_plot({{plotdat|safe}}, 'avg')
+            }
         })
     </script>
 

oolong_app/views.py

@@ -38,7 +38,7 @@ def index(request):
 @login_required 
 def plot(request):
 
-    dat = PlotResponse.objects.filter(user=request.user)
+    dat = PlotResponse.objects.filter(user=1)
     plotdat = None if not dat.count() else json.dumps(list(dat.values()))
     context = {
         'plotdat': plotdat
@@ -164,9 +164,10 @@ def submit_questionnaire(request):
 
     # get the available responses for the questions
     # [(response_id, response_label),()]
-    responses = [(None,'----')]
-    tmp = AvailableResponse.objects.filter(questionnaire_id=qid).values_list('id','label')
-    responses.extend(list(tmp))
+    responses = list(AvailableResponse.objects
+                                      .filter(questionnaire_id=qid)
+                                      .order_by('score')
+                                      .values_list('score','label'))
     responses_dict = {k:v for k,v in responses if k}
 
     form = QuestionnaireForm(