refactorings

Author: nandooliveira

experiments/admin.py

@@ -8,7 +8,7 @@
 
 class TaskInline(admin.TabularInline):
     model = Task
-    extra = 1
+    extra = 0
 
 
 class ExperimentInline(admin.TabularInline):

experiments/management/commands/areas_of_interest_analysis.py

@@ -0,0 +1,34 @@
+# -*- coding: utf-8 -*-
+
+from django.core.management.base import BaseCommand
+from experiments.models import Execution, Pause, Point, Task
+
+
+class Command(BaseCommand):
+    help = 'Analyse data for areas of interest'
+
+    def handle(self, *args, **kwargs):
+        tasks = Task.objects.filter(experiment__id=4)
+
+        for task in tasks:
+            print "\n\n>> Analysing task %s" % task.description
+
+            executions = Execution.objects.filter(task__id=task.id)
+            total_points = 0
+
+            for execution in executions:
+                # print "Load points for execution %d" % execution.id
+
+                points = Point.objects.filter(
+                    datetime__range=(execution.start, execution.end),
+                    y__gte=task.area_of_interest_points[0],
+                    y__lte=task.area_of_interest_points[1]
+                )
+
+                # exclude pause points
+                for pause in execution.pause_set.all():
+                    points = points.exclude(datetime__range=(pause.start_time, pause.end_time))
+
+                total_points += len(points)
+
+            print total_points

experiments/migrations/0034_auto_20200211_0011.py

@@ -0,0 +1,26 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.26 on 2020-02-11 03:11
+from __future__ import unicode_literals
+
+import django.contrib.postgres.fields
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('experiments', '0033_difficultlinesfeedback'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='task',
+            name='area_of_interest_image',
+            field=models.ImageField(blank=True, null=True, upload_to=b'uploads/tasks/areas_of_interest'),
+        ),
+        migrations.AddField(
+            model_name='task',
+            name='area_of_interest_points',
+            field=django.contrib.postgres.fields.ArrayField(base_field=models.IntegerField(), blank=True, null=True, size=None),
+        ),
+    ]

experiments/models.py

@@ -1,6 +1,4 @@
 # -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
 from datetime import datetime
 
 from django.contrib.postgres.fields import ArrayField
@@ -73,6 +71,9 @@ class Task(BaseModel):
     )
     frame = models.IntegerField(choices=FRAME_CHOICES, blank=True, null=True)
     correct_answer = models.CharField(max_length=500, default='')
+    area_of_interest_image = models.ImageField(upload_to='uploads/tasks/areas_of_interest', blank=True, null=True)
+    area_of_interest_points = ArrayField(models.IntegerField(), blank=True, null=True)
+
 
     def __unicode__(self):
         return self.description