fix latin square

Author: nandooliveira

.idea/inspectionProfiles/Project_Default.xml

@@ -26,8 +26,7 @@ def save_participant(self):
             latin_square_row.participant = participant
             latin_square_row.save()
         else:
-            latin_square = LatinSquare.objects.create(experiment=experiment)
-            GenerateLatinSquareRows(latin_square).call()
+            latin_square = LatinSquare.objects.create_with_rows(experiment=experiment)
             latin_square.row1.participant = participant
             latin_square.row1.save()
 

.idea/workspace.xml

@@ -0,0 +1,24 @@
+# -*- coding: utf-8 -*-
+
+import random
+
+from django.db import models
+
+
+class LatinSquareManager(models.Manager):
+
+    def create_with_rows(self, experiment):
+        from experiments.models import LatinSquare
+        latin_square = LatinSquare.objects.create(
+            experiment=experiment,
+            frame_sequence=self.__generate_frame_sequence()
+        )
+        from experiments.services.generate_latin_square_rows import GenerateLatinSquareRows
+        GenerateLatinSquareRows(latin_square).call()
+
+        return latin_square
+
+    def __generate_frame_sequence(self):
+        shuffled = [[1, 2], [3, 4]]
+        random.shuffle(shuffled)
+        return shuffled[0] + shuffled[1]

experiments/forms.py

@@ -0,0 +1,30 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.16 on 2019-04-08 05:05
+from __future__ import unicode_literals
+
+import django.contrib.postgres.fields
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('experiments', '0021_task_correct_answer'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='task',
+            name='kind',
+        ),
+        migrations.AddField(
+            model_name='latinsquare',
+            name='quadrant_sequence',
+            field=django.contrib.postgres.fields.ArrayField(base_field=models.IntegerField(), blank=True, default=[1, 2, 3, 4], null=True, size=None),
+        ),
+        migrations.AddField(
+            model_name='task',
+            name='frame',
+            field=models.IntegerField(blank=True, choices=[(1, 'Primeiro Quadrante'), (2, 'Segundo Quadrante'), (3, 'Terceiro Quadrante'), (4, 'Quarto Quadrante')], null=True),
+        ),
+    ]

experiments/managers/__init__.py

@@ -0,0 +1,20 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.16 on 2019-04-08 06:17
+from __future__ import unicode_literals
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('experiments', '0022_auto_20190408_0505'),
+    ]
+
+    operations = [
+        migrations.RenameField(
+            model_name='latinsquare',
+            old_name='quadrant_sequence',
+            new_name='frame_sequence',
+        ),
+    ]

experiments/managers/latin_square_manager.py

@@ -3,8 +3,11 @@
 
 from datetime import datetime
 
+from django.contrib.postgres.fields import ArrayField
 from django.db import models
 
+from experiments.managers.latin_square_manager import LatinSquareManager
+
 
 class Experiment(models.Model):
     description = models.CharField(max_length=200)
@@ -31,17 +34,22 @@ def __unicode__(self):
 
 
 class Task(models.Model):
-    COMMON = 1
-    SPECIAL = 2
-    KIND_CHOICES = (
-        (COMMON, 'Common'),
-        (SPECIAL, 'Special'),
+    FIRST_FRAME = 1
+    SECOND_FRAME = 2
+    THIRD_FRAME = 3
+    FOURTH_FRAME = 4
+
+    FRAME_CHOICES = (
+        (FIRST_FRAME, 'Primeiro Quadrante'),
+        (SECOND_FRAME, 'Segundo Quadrante'),
+        (THIRD_FRAME, 'Terceiro Quadrante'),
+        (FOURTH_FRAME, 'Quarto Quadrante'),
     )
 
     description = models.CharField(max_length=200)
     image = models.ImageField(upload_to='uploads/tasks')
     experiment = models.ForeignKey(Experiment, on_delete=models.CASCADE, blank=True, null=True)
-    kind = models.IntegerField(choices=KIND_CHOICES, blank=True, null=True)
+    frame = models.IntegerField(choices=FRAME_CHOICES, blank=True, null=True)
     correct_answer = models.CharField(max_length=500, default='')
     created_at = models.DateTimeField(auto_now_add=True)
     updated_at = models.DateTimeField(auto_now=True)
@@ -100,6 +108,9 @@ class LatinSquare(models.Model):
                              related_name='row1_latin_square')
     row2 = models.ForeignKey(LatinSquareRow, on_delete=models.CASCADE, blank=True, null=True,
                              related_name='row2_latin_square')
+    frame_sequence = ArrayField(models.IntegerField(), null=True, blank=True, default=[1, 2, 3, 4])
+
+    objects = LatinSquareManager()
 
     def __unicode__(self):
         return "%d" % self.id
@@ -115,13 +126,15 @@ def duration_in_seconds(self):
 
         return duration.total_seconds()
 
+    def __unicode__(self):
+        return "%d %d" % (self.id, self.duration_in_seconds())
+
 
 class Answer(models.Model):
     execution = models.ForeignKey(Execution, on_delete=models.CASCADE)
     answer = models.CharField(max_length=500)
     correct = models.BooleanField()
 
-
 # from django.db.models.signals import post_save
 #
 # post_save.connect(handlers.my_handler, sender=LatinSquare)

experiments/migrations/0022_auto_20190408_0505.py

@@ -7,52 +7,49 @@
 
 class GenerateLatinSquareRows(object):
     """Generate Latin Square Rows"""
+
     def __init__(self, latin_square):
         self.latin_square = latin_square
 
     def call(self):
-        """Contructor"""
+        """Constructor"""
         if not self.latin_square.row1 or not self.latin_square.row2:
             self.__create_rows()
 
     # PRIVATE METHODS
-    def __random_tasks_by_kind(self, kind):
-        """Get tasks randomly based on task lind"""
-        return Task.objects\
-            .filter(kind=kind, experiment_id=self.latin_square.experiment.id)\
-            .exclude(id__in=self.__tasks_to_exclude())\
-            .order_by('?')[:self.latin_square.experiment.tasks_quantity_by_cell]
+    def __random_tasks_for_frame(self, frame):
+        """Get tasks randomly based on frame"""
+        return Task.objects \
+            .filter(frame=frame, experiment_id=self.latin_square.experiment.id) \
+            .exclude(id__in=self.__tasks_to_exclude())
 
     def __create_rows(self):
         """Create rows for current latin square"""
-        first_row_cells = self.__create_cells()
-        self.latin_square.row1 = LatinSquareRow.objects\
-            .create(cell1=first_row_cells['common_cell'],
-                    cell2=first_row_cells['special_cell'])
+        cells = self.__create_cells()
+
+        self.latin_square.row1 = LatinSquareRow.objects.create(
+            cell1=cells[:2][0],
+            cell2=cells[:2][1]
+        )
 
-        second_row_cells = self.__create_cells()
-        self.latin_square.row2 = LatinSquareRow.objects\
-            .create(cell1=second_row_cells['special_cell'],
-                    cell2=second_row_cells['common_cell'])
+        self.latin_square.row2 = LatinSquareRow.objects.create(
+            cell1=cells[2:][0],
+            cell2=cells[2:][1]
+        )
 
         self.latin_square.save()
 
     def __create_cells(self):
         """create cells to latin square"""
-        common_cell = LatinSquareCell.objects.create()
-        common_cell.tasks = self.__random_tasks_by_kind(Task.COMMON)
-        common_cell.save()
-
-        special_cell = LatinSquareCell.objects.create()
+        cells = []
 
-        # tasks_to_exclude = list(map(lambda x: x.id, common_cell.tasks.all()))
-        special_cell.tasks = self.__random_tasks_by_kind(Task.SPECIAL)
-        special_cell.save()
+        for frame in self.latin_square.frame_sequence:
+            cell = LatinSquareCell.objects.create()
+            cell.tasks = self.__random_tasks_for_frame(frame)
+            cell.save()
+            cells.append(cell)
 
-        return {
-            'common_cell': common_cell,
-            'special_cell': special_cell
-        }
+        return cells
 
     def __tasks_to_exclude(self):
         """get all tasks already at the current latin square to not repeat then"""

experiments/migrations/0023_auto_20190408_0617.py

@@ -5,9 +5,12 @@
 {% block content %}
     <h1>Tarefa Pausada</h1>
     <div>
-        <a id="navigationButton" href="{% url 'experiments:previous_task' pause.execution.participant.id pause.execution.task.experiment.id %}"
+        <a id="navigationButton"
+           href="{% url 'experiments:previous_task' pause.execution.participant.id pause.execution.task.experiment.id %}"
            class="btn btn-primary">Voltar para a tarefa</a>
-        <button id="responseButton" href="#" class="btn btn-default" data-toggle="modal" data-target="#answerModal">Responder</button>
+        <button id="responseButton" href="#" class="btn btn-default" data-toggle="modal" data-target="#answerModal">
+            Responder
+        </button>
     </div>
 
     <!-- Modal -->
@@ -53,7 +56,7 @@ <h5 class="modal-title" id="exampleModalLabel">Qual a sua resposta?</h5>
                 "{% url 'experiments:submit_answer' pause.execution.id %}",
                 'csrfmiddlewaretoken={{ csrf_token }}&answer=' + userAnswer,
                 function (data) {
-                    $("#submit_response").val('');
+                    $("#task_response").val('');
                     $("#answerModal").modal('hide');
 
                     var result = JSON.parse(data);
@@ -64,7 +67,7 @@ <h5 class="modal-title" id="exampleModalLabel">Qual a sua resposta?</h5>
                         hideResponseButton();
                     } else {
                         alert('Resposta incorreta!')
-                        $("#responseButton").html("Tentar Novamente");
+                        $("#responseButton").html("Digite outra Resposta");
                     }
                 }
             );