Add heatmap page

easy-software-ufal · Dec 2, 2019 · 9ef7cef · 9ef7cef
1 parent 21ae1cc
commit 9ef7cef
Show file tree

Hide file tree

Showing 20 changed files with 812 additions and 123 deletions.
diff --git a/Pipfile b/Pipfile
@@ -14,6 +14,9 @@ psycopg2 = "==2.7.6.1"
 psycopg2-binary = "==2.8.1"
 pytz = "==2018.7"
 django-suit = "*"
+django-widget-tweaks = "*"
+numpy = "*"
+matplotlib = "*"
 
 [requires]
 python_version = "2.7"
diff --git a/Pipfile.lock b/Pipfile.lock
diff --git a/easy/settings.py b/easy/settings.py
@@ -38,6 +38,7 @@
     'django.contrib.messages',
     'django.contrib.staticfiles',
     'experiments',
+    'widget_tweaks',
 ]
 
 MIDDLEWARE = [

diff --git a/experiments/forms.py b/experiments/forms.py
@@ -2,15 +2,25 @@
 
 from django import forms
 
-from experiments.models import Experiment, LatinSquare, Participant
-from experiments.services.generate_latin_square_rows import GenerateLatinSquareRows
-from experiments.services.search_available_latin_square_row import SearchAvailableLatinSquareRow
+from experiments.models import Execution, Experiment, HeatMapFeedback,\
+    LatinSquare, Participant
+from experiments.services.search_available_latin_square_row import \
+    SearchAvailableLatinSquareRow
 
 
 class ParticipantForm(forms.Form):
     name = forms.CharField(required=False)
-    email = forms.EmailField(help_text='A valid email address, please.', required=False)
-    experiment_id = forms.IntegerField(widget=forms.HiddenInput(), required=True)
+    email = forms.EmailField(
+        help_text='A valid email address, please.', required=False
+    )
+    experiment_id = forms.IntegerField(
+        widget=forms.HiddenInput(), required=True
+    )
+
+    def __init__(self, *args, **kwargs):
+        super(ParticipantForm, self).__init__(*args, **kwargs)
+        self.fields['name'].widget.attrs['class'] = 'form-control'
+        self.fields['email'].widget.attrs['class'] = 'form-control'
 
     def save_participant(self):
         name = self.cleaned_data['name']
@@ -26,11 +36,40 @@ def save_participant(self):
             latin_square_row.participant = participant
             latin_square_row.save()
         else:
-            latin_square = LatinSquare.objects.create_with_rows(experiment=experiment)
+            latin_square = LatinSquare.objects.create_with_rows(
+                experiment=experiment)
             latin_square.row1.participant = participant
             latin_square.row1.save()
 
         return participant
 
     def __experiment(self, experiment_id):
         return Experiment.objects.get(pk=experiment_id)
+
+
+class HeatMapFeedbackForm(forms.Form):
+    execution_id = forms.IntegerField(
+        widget=forms.HiddenInput(), required=True)
+    corresponds_to_perception = forms.BooleanField(
+        label='Na sua percepção o gráfico ao lado corresponde a realidade?',
+        initial=True, required=False)
+    notes = forms.CharField(
+        label='Gostaria de deixar algum comentário?',
+        max_length=500, widget=forms.Textarea, required=False)
+
+    def save_heat_map_feedback(self):
+        corresponds_to_perception = self.cleaned_data[
+            'corresponds_to_perception'
+        ]
+        notes = self.cleaned_data['notes']
+        execution_id = self.cleaned_data['execution_id']
+        execution = self.__execution(execution_id)
+
+        return HeatMapFeedback.objects.create(
+            corresponds_to_perception=corresponds_to_perception,
+            notes=notes,
+            execution=execution
+        )
+
+    def __execution(self, execution_id):
+        return Execution.objects.get(pk=execution_id)
diff --git a/experiments/migrations/0026_auto_20191126_0800.py b/experiments/migrations/0026_auto_20191126_0800.py
@@ -0,0 +1,119 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.21 on 2019-11-26 08:00
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('experiments', '0025_auto_20190625_0425'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='HeatMapFeedback',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('corresponds_to_perception', models.BooleanField(default=True)),
+                ('notes', models.CharField(max_length=500)),
+            ],
+        ),
+        migrations.AddField(
+            model_name='latinsquare',
+            name='created_at',
+            field=models.DateTimeField(auto_now_add=True, null=True),
+        ),
+        migrations.AddField(
+            model_name='latinsquare',
+            name='updated_at',
+            field=models.DateTimeField(auto_now=True, null=True),
+        ),
+        migrations.AddField(
+            model_name='latinsquarecell',
+            name='created_at',
+            field=models.DateTimeField(auto_now_add=True, null=True),
+        ),
+        migrations.AddField(
+            model_name='latinsquarecell',
+            name='updated_at',
+            field=models.DateTimeField(auto_now=True, null=True),
+        ),
+        migrations.AddField(
+            model_name='latinsquarerow',
+            name='created_at',
+            field=models.DateTimeField(auto_now_add=True, null=True),
+        ),
+        migrations.AddField(
+            model_name='latinsquarerow',
+            name='updated_at',
+            field=models.DateTimeField(auto_now=True, null=True),
+        ),
+        migrations.AddField(
+            model_name='pause',
+            name='created_at',
+            field=models.DateTimeField(auto_now_add=True, null=True),
+        ),
+        migrations.AddField(
+            model_name='pause',
+            name='updated_at',
+            field=models.DateTimeField(auto_now=True, null=True),
+        ),
+        migrations.AddField(
+            model_name='point',
+            name='created_at',
+            field=models.DateTimeField(auto_now_add=True, null=True),
+        ),
+        migrations.AddField(
+            model_name='point',
+            name='updated_at',
+            field=models.DateTimeField(auto_now=True, null=True),
+        ),
+        migrations.AlterField(
+            model_name='execution',
+            name='created_at',
+            field=models.DateTimeField(auto_now_add=True, null=True),
+        ),
+        migrations.AlterField(
+            model_name='execution',
+            name='updated_at',
+            field=models.DateTimeField(auto_now=True, null=True),
+        ),
+        migrations.AlterField(
+            model_name='experiment',
+            name='created_at',
+            field=models.DateTimeField(auto_now_add=True, null=True),
+        ),
+        migrations.AlterField(
+            model_name='experiment',
+            name='updated_at',
+            field=models.DateTimeField(auto_now=True, null=True),
+        ),
+        migrations.AlterField(
+            model_name='participant',
+            name='created_at',
+            field=models.DateTimeField(auto_now_add=True, null=True),
+        ),
+        migrations.AlterField(
+            model_name='participant',
+            name='updated_at',
+            field=models.DateTimeField(auto_now=True, null=True),
+        ),
+        migrations.AlterField(
+            model_name='task',
+            name='created_at',
+            field=models.DateTimeField(auto_now_add=True, null=True),
+        ),
+        migrations.AlterField(
+            model_name='task',
+            name='updated_at',
+            field=models.DateTimeField(auto_now=True, null=True),
+        ),
+        migrations.AddField(
+            model_name='heatmapfeedback',
+            name='execution',
+            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='experiments.Execution'),
+        ),
+    ]
diff --git a/experiments/migrations/0027_auto_20191126_0802.py b/experiments/migrations/0027_auto_20191126_0802.py
@@ -0,0 +1,35 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.21 on 2019-11-26 08:02
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('experiments', '0026_auto_20191126_0800'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='answer',
+            name='created_at',
+            field=models.DateTimeField(auto_now_add=True, null=True),
+        ),
+        migrations.AddField(
+            model_name='answer',
+            name='updated_at',
+            field=models.DateTimeField(auto_now=True, null=True),
+        ),
+        migrations.AddField(
+            model_name='heatmapfeedback',
+            name='created_at',
+            field=models.DateTimeField(auto_now_add=True, null=True),
+        ),
+        migrations.AddField(
+            model_name='heatmapfeedback',
+            name='updated_at',
+            field=models.DateTimeField(auto_now=True, null=True),
+        ),
+    ]
diff --git a/experiments/migrations/0028_auto_20191128_0205.py b/experiments/migrations/0028_auto_20191128_0205.py
@@ -0,0 +1,61 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.26 on 2019-11-28 02:05
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('experiments', '0027_auto_20191126_0802'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='Survey',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('created_at', models.DateTimeField(auto_now_add=True, null=True)),
+                ('updated_at', models.DateTimeField(auto_now=True, null=True)),
+                ('description', models.CharField(max_length=200)),
+                ('experiment', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='experiments.Experiment')),
+            ],
+            options={
+                'abstract': False,
+            },
+        ),
+        migrations.CreateModel(
+            name='SurveyAnswer',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('created_at', models.DateTimeField(auto_now_add=True, null=True)),
+                ('updated_at', models.DateTimeField(auto_now=True, null=True)),
+                ('answer', models.CharField(max_length=500)),
+                ('execution', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='experiments.Execution')),
+            ],
+            options={
+                'abstract': False,
+            },
+        ),
+        migrations.CreateModel(
+            name='SurveyQuestion',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('created_at', models.DateTimeField(auto_now_add=True, null=True)),
+                ('updated_at', models.DateTimeField(auto_now=True, null=True)),
+                ('question', models.CharField(max_length=200)),
+                ('input_type', models.CharField(choices=[('text', 'Text'), ('textarea', 'Text Area')], max_length=20)),
+                ('survey', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='experiments.Survey')),
+            ],
+            options={
+                'abstract': False,
+            },
+        ),
+        migrations.AddField(
+            model_name='surveyanswer',
+            name='question',
+            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='experiments.SurveyQuestion'),
+        ),
+    ]
diff --git a/experiments/migrations/0029_execution_heatmap.py b/experiments/migrations/0029_execution_heatmap.py
@@ -0,0 +1,21 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.26 on 2019-12-02 04:05
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+import experiments.models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('experiments', '0028_auto_20191128_0205'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='execution',
+            name='heatmap',
+            field=models.ImageField(blank=True, null=True, upload_to=experiments.models.execution_plot_directory_path),
+        ),
+    ]
diff --git a/experiments/migrations/0030_auto_20191202_0411.py b/experiments/migrations/0030_auto_20191202_0411.py
@@ -0,0 +1,21 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.26 on 2019-12-02 04:11
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+import experiments.models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('experiments', '0029_execution_heatmap'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='execution',
+            name='heatmap',
+            field=models.ImageField(blank=True, max_length=500, null=True, upload_to=experiments.models.execution_plot_directory_path),
+        ),
+    ]