Fix ending pauses

Author: nandooliveira

datasetatoms.csv

@@ -0,0 +1,33 @@
+,Replica,Id,Student,SetOfTasks,Tasks,Technique,Trials,Time,Minutes
+1,41,1,paulo,ST1,AV1.2:CO1.2:DE1.2,Without Atom,1,14.0,14.0
+1,41,1,paulo,ST2,AV2.1:CO2.1:DE2.1,With Atom,1,19.0,19.0
+1,41,2,Romário,ST1,AV1.1:CO1.1:DE1.1,With Atom,1,27.0,27.0
+1,41,2,Romário,ST2,AV2.2:CO2.2:DE2.2,Without Atom,1,22.0,22.0
+2,42,1,Igor,ST1,AV1.2:CO1.2:DE1.2,Without Atom,1,18.0,18.0
+2,42,1,Igor,ST2,AV2.1:CO2.1:DE2.1,With Atom,1,40.0,40.0
+2,42,2,Hyago,ST1,AV1.1:CO1.1:DE1.1,With Atom,1,20.0,20.0
+2,42,2,Hyago,ST2,AV2.2:CO2.2:DE2.2,Without Atom,1,32.0,32.0
+3,43,1,,ST1,AV1.2:CO1.2:DE1.2,Without Atom,1,19.0,19.0
+3,43,1,,ST2,AV2.1:CO2.1:DE2.1,With Atom,1,53.0,53.0
+3,43,2,,ST1,AV1.1:CO1.1:DE1.1,With Atom,1,21.0,21.0
+3,43,2,,ST2,AV2.2:CO2.2:DE2.2,Without Atom,1,20.0,20.0
+4,44,1,,ST1,AV1.2:CO1.2:DE1.2,Without Atom,1,9.0,9.0
+4,44,1,,ST2,AV2.1:CO2.1:DE2.1,With Atom,1,25.0,25.0
+4,44,2,,ST1,AV1.1:CO1.1:DE1.1,With Atom,1,17.0,17.0
+4,44,2,,ST2,AV2.2:CO2.2:DE2.2,Without Atom,1,30.0,30.0
+5,45,1,Matheus Costa,ST1,AV1.1:CO1.1:DE1.1,With Atom,1,27.0,27.0
+5,45,1,Matheus Costa,ST2,AV2.2:CO2.2:DE2.2,Without Atom,1,39.0,39.0
+5,45,2,Davi Jose,ST1,AV1.2:CO1.2:DE1.2,Without Atom,1,8.0,8.0
+5,45,2,Davi Jose,ST2,AV2.1:CO2.1:DE2.1,With Atom,1,18.0,18.0
+6,46,1,Marlon Lúcio,ST1,AV1.1:CO1.1:DE1.1,With Atom,1,35.0,35.0
+6,46,1,Marlon Lúcio,ST2,AV2.2:CO2.2:DE2.2,Without Atom,1,36.0,36.0
+6,46,2,Jackson Barbosa da Silva,ST1,AV1.2:CO1.2:DE1.2,Without Atom,1,13.0,13.0
+6,46,2,Jackson Barbosa da Silva,ST2,AV2.1:CO2.1:DE2.1,With Atom,1,40.0,40.0
+7,47,1,Allan,ST1,AV1.2:CO1.2:DE1.2,Without Atom,1,19.0,19.0
+7,47,1,Allan,ST2,AV2.1:CO2.1:DE2.1,With Atom,1,55.0,55.0
+7,47,2,Dielson Sales de Carvalho,ST1,AV1.1:CO1.1:DE1.1,With Atom,1,22.0,22.0
+7,47,2,Dielson Sales de Carvalho,ST2,AV2.2:CO2.2:DE2.2,Without Atom,1,25.0,25.0
+8,48,1,Thiago,ST1,AV1.1:CO1.1:DE1.1,With Atom,1,16.0,16.0
+8,48,1,Thiago,ST2,AV2.2:CO2.2:DE2.2,Without Atom,1,15.0,15.0
+8,48,2,,ST1,AV1.2:CO1.2:DE1.2,Without Atom,1,27.0,27.0
+8,48,2,,ST2,AV2.1:CO2.1:DE2.1,With Atom,1,78.0,78.0

experiments/management/__init__.py

@@ -0,0 +1,65 @@
+# -*- coding: utf-8 -*-
+
+import csv
+from django.core.management.base import BaseCommand, CommandError
+from django.db.models import Q
+from experiments.models import LatinSquare, Execution
+
+
+class Command(BaseCommand):
+    help = 'Generate a new CSV file to be used as dataset on rstudio script'
+
+    def handle(self, *args, **options):
+        latin_squares = LatinSquare.objects.filter(experiment_id=2) \
+                                           .exclude(Q(row1__participant_id__isnull=True) | Q(row2__participant_id__isnull=True))
+
+        with open('datasetatoms.csv', 'wb') as csvfile:
+            filewriter = csv.writer(csvfile, delimiter=',', quotechar='|', quoting=csv.QUOTE_MINIMAL)
+            filewriter.writerow(["","Replica","Id","Student","SetOfTasks","Tasks","Technique","Trials","Time","Minutes"])
+
+            for index, latin_square in enumerate(latin_squares, start=1):
+                descriptions_row1_cell1 = [task.description for task in latin_square.row1.cell1.tasks.all()]
+                tasks_row1_cell1 = ':'.join(descriptions_row1_cell1)
+                descriptions_row1_cell2 = [task.description for task in latin_square.row1.cell2.tasks.all()]
+                tasks_row1_cell2 = ':'.join(descriptions_row1_cell2)
+
+                descriptions_row2_cell1 = [task.description for task in latin_square.row2.cell1.tasks.all()]
+                tasks_row2_cell1 = ':'.join(descriptions_row2_cell1)
+                descriptions_row2_cell2 = [task.description for task in latin_square.row2.cell2.tasks.all()]
+                tasks_row2_cell2 = ':'.join(descriptions_row2_cell2)
+
+                row1_cell1_type = ""
+                row1_cell2_type = ""
+                row2_cell1_type = ""
+                row2_cell2_type = ""
+
+                if latin_square.frame_sequence[:2] == [1,2]:
+                    row1_cell1_type = "With Atom"
+                    row1_cell2_type = "Without Atom"
+                    row2_cell1_type = "Without Atom"
+                    row2_cell2_type = "With Atom"
+                else:
+                    row1_cell1_type = "Without Atom"
+                    row1_cell2_type = "With Atom"
+                    row2_cell1_type = "With Atom"
+                    row2_cell2_type = "Without Atom"
+
+                duration_row1_cell_1 = self.duration_for_cell(latin_square.row1.cell1, latin_square.row1.participant)
+                duration_row1_cell_2 = self.duration_for_cell(latin_square.row1.cell2, latin_square.row1.participant)
+                duration_row2_cell_1 = self.duration_for_cell(latin_square.row2.cell1, latin_square.row2.participant)
+                duration_row2_cell_2 = self.duration_for_cell(latin_square.row2.cell2, latin_square.row2.participant)
+
+                # write lines to csv        
+                filewriter.writerow([index, latin_square.id, 1, latin_square.row1.participant.name.encode('utf-8'), "ST1", tasks_row1_cell1, row1_cell1_type, 1, duration_row1_cell_1, duration_row1_cell_1])
+                filewriter.writerow([index, latin_square.id, 1, latin_square.row1.participant.name.encode('utf-8'), "ST2", tasks_row1_cell2, row1_cell2_type, 1, duration_row1_cell_2, duration_row1_cell_2])
+                filewriter.writerow([index, latin_square.id, 2, latin_square.row2.participant.name.encode('utf-8'), "ST1", tasks_row2_cell1, row2_cell1_type, 1, duration_row2_cell_1, duration_row2_cell_1])
+                filewriter.writerow([index, latin_square.id, 2, latin_square.row2.participant.name.encode('utf-8'), "ST2", tasks_row2_cell2, row2_cell2_type, 1, duration_row2_cell_2, duration_row2_cell_2])
+
+    def duration_for_cell(self, cell, participant):
+        total_duration = 0
+
+        for task in cell.tasks.all():
+            execution = Execution.objects.get(task=task, participant=participant)
+            total_duration += execution.duration_in_seconds()
+        
+        return total_duration

experiments/management/commands/__init__.py

@@ -25,9 +25,19 @@ class Participant(models.Model):
     created_at = models.DateTimeField(auto_now_add=True)
     updated_at = models.DateTimeField(auto_now=True)
 
-    def finish_all_pauses(self):
+    def finish_last_pause_for_each_execution(self):
         for execution in self.execution_set.all():
-            execution.pause_set.all().update(end_time=datetime.now())
+            last_pause = Pause.objects.filter(execution=execution).order_by('-pk')
+    
+            if len(last_pause) > 0:
+                last_pause = last_pause[0]
+                if last_pause.end_time is None:
+                    last_pause.end_time = datetime.now()
+                    last_pause.save()
+
+    #def finish_all_pauses(self):
+    #    for execution in self.execution_set.all():
+    #        execution.pause_set.all().update(end_time=datetime.now())
 
     def __unicode__(self):
         return self.name
@@ -68,13 +78,15 @@ class Execution(models.Model):
     number_of_errors = models.IntegerField(default=0)
 
     def duration_in_seconds(self):
-        pauses_duration = 0
-        for pause in self.pause_set.all():
-            pauses_duration += pause.duration_in_seconds()
+        # pauses_duration = 0
+        # for pause in self.pause_set.all():
+        #    pauses_duration += pause.duration_in_seconds()
 
-        execution_total_duration = self.end - self.start
+        # execution_total_duration = self.end - self.start
+        # return execution_total_duration.total_seconds() - pauses_duration
 
-        return execution_total_duration.total_seconds() - pauses_duration
+        duration_in_s = (self.end - self.start).total_seconds()
+        return divmod(duration_in_s, 60)[0] # return in minutes
 
 
 class Point(models.Model):

experiments/management/commands/generate_csv_to_rscript.py

@@ -15,7 +15,7 @@ def get(self, request, *args, **kwargs):
         experiment = self.__get_experiment(kwargs['experiment_id'])
         participant = self.__get_participant(kwargs['participant_id'])
 
-        participant.finish_all_pauses()
+        participant.finish_last_pause_for_each_execution()
 
         if 'previous_execution_id' in self.request.GET:
             execution = Execution.objects.get(pk=self.request.GET.get('previous_execution_id'))

experiments/models.py

@@ -19,7 +19,7 @@ class PauseExecution(TemplateView):
     def get(self, request, *args, **kwargs):
         # finish previous pauses, this is needed in case of user refresh the screen
         execution = Execution.objects.get(pk=kwargs['execution_id'])
-        execution.participant.finish_all_pauses()
+        execution.participant.finish_last_pause_for_each_execution()
 
         return super(PauseExecution, self).get(request, args, kwargs)
 

experiments/views/next_task.py

@@ -15,7 +15,7 @@ def __init__(self, **kwargs):
     def get(self, request, *args, **kwargs):
         participant = self.__get_participant(kwargs['participant_id'])
 
-        participant.finish_all_pauses()
+        participant.finish_last_pause_for_each_execution()
 
         self.execution = participant.execution_set.all().latest('created_at')
 

experiments/views/pause_execution.py

@@ -13,7 +13,7 @@ def date_handler(obj):
         raise TypeError
 
 class ResumeExecution(View):
-    template_name= None
+    template_name = None
     def post(self, request, *args, **kwargs):
         pause = self.get_last_pause_for_execution(int(kwargs['execution_id']))
         pause.end_time = datetime.now()