Update Experiment

Author: nandooliveira

experiments/forms.py

@@ -3,7 +3,7 @@
 from django import forms
 
 from experiments.models import Execution, Experiment, HeatMapFeedback,\
-    LatinSquare, Participant
+    LatinSquare, Participant, SocialRepresentation, DifficultLinesFeedback
 from experiments.services.search_available_latin_square_row import \
     SearchAvailableLatinSquareRow
 
@@ -28,7 +28,7 @@ def save_participant(self):
         experiment_id = self.cleaned_data['experiment_id']
         experiment = self.__experiment(experiment_id)
 
-        participant = Participant.objects.create(name=name, email=email)
+        participant = Participant.objects.create(name=name, email=email, experiment=experiment)
 
         latin_square_row = SearchAvailableLatinSquareRow(experiment).call()
 
@@ -77,3 +77,49 @@ def save_heat_map_feedback(self):
 
     def __execution(self, execution_id):
         return Execution.objects.get(pk=execution_id)
+
+
+class DifficultLinesFeedbackForm(forms.ModelForm):
+    def __init__(self, *args, **kwargs):
+        super(DifficultLinesFeedbackForm, self).__init__(*args, **kwargs)
+        self.fields['hard_lines'].widget.attrs['class'] = 'form-control'
+
+    def save_difficult_lines_feedback(self):
+        hard_lines = self.cleaned_data['hard_lines']
+        execution_id = self.data['execution_id']
+        return DifficultLinesFeedback.objects.create(
+            hard_lines=hard_lines,
+            execution_id=execution_id
+        )
+
+    class Meta:
+        model = DifficultLinesFeedback
+        fields = ['hard_lines']
+
+
+
+class SocialRepresentationForm(forms.ModelForm):
+    def __init__(self, *args, **kwargs):
+        super(SocialRepresentationForm, self).__init__(*args, **kwargs)
+        self.fields['words'].widget.attrs['class'] = 'form-control'
+        self.fields['most_relevant'].widget.attrs['class'] = 'form-control'
+
+
+    class Meta:
+        model = SocialRepresentation
+        fields = ['words', 'most_relevant']
+
+    def save_social_representation(self):
+        words = self.cleaned_data['words']
+        most_relevant = self.cleaned_data['most_relevant']
+        participant_id = self.data['participant_id']
+        participant = self.__participant(participant_id)
+
+        return SocialRepresentation.objects.create(
+            words = words,
+            most_relevant = most_relevant,
+            participant = participant
+        )
+
+    def __participant(self, participant_id):
+        return Participant.objects.get(pk=participant_id)

experiments/migrations/0031_experiment_hidden.py

@@ -0,0 +1,20 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.26 on 2020-01-22 05:36
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('experiments', '0030_auto_20191202_0411'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='experiment',
+            name='hidden',
+            field=models.BooleanField(default=False),
+        ),
+    ]

experiments/migrations/0032_auto_20200122_0312.py

@@ -0,0 +1,39 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.26 on 2020-01-22 06:12
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('experiments', '0031_experiment_hidden'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='SocialRepresentation',
+            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)),
+                ('words', models.TextField(blank=True, null=True)),
+                ('most_relevant', models.TextField(blank=True, null=True)),
+            ],
+            options={
+                'abstract': False,
+            },
+        ),
+        migrations.AddField(
+            model_name='participant',
+            name='experiment',
+            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='experiments.Experiment'),
+        ),
+        migrations.AddField(
+            model_name='socialrepresentation',
+            name='participant',
+            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='experiments.Participant'),
+        ),
+    ]

experiments/migrations/0033_difficultlinesfeedback.py

@@ -0,0 +1,29 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.26 on 2020-01-22 05:12
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('experiments', '0032_auto_20200122_0312'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='DifficultLinesFeedback',
+            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)),
+                ('hard_lines', models.CharField(blank=True, max_length=500, null=True)),
+                ('execution', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='experiments.Execution')),
+            ],
+            options={
+                'abstract': False,
+            },
+        ),
+    ]

experiments/models.py

@@ -23,12 +23,14 @@ class Experiment(BaseModel):
     tasks_quantity_by_cell = models.IntegerField(
         default=1, blank=True, null=True
     )
+    hidden = models.BooleanField(default=False)
 
     def __unicode__(self):
         return self.description
 
 
 class Participant(BaseModel):
+    experiment = models.ForeignKey('Experiment', on_delete=models.CASCADE, blank=True, null=True)
     name = models.CharField(max_length=200)
     email = models.CharField(max_length=200)
 
@@ -226,6 +228,29 @@ class SurveyAnswer(BaseModel):
     answer = models.CharField(max_length=500)
 
 
+class SocialRepresentation(BaseModel):
+    participant = models.ForeignKey('Participant', on_delete=models.CASCADE)
+    words = models.TextField(blank=True, null=True)
+    most_relevant = models.TextField(blank=True, null=True)
+
+
+# class ParticipantCharacterization(BaseModel):
+#     HIGHER_DEGREE_CHOICES = (
+#         ('graduation', 'Graduação'),
+#         ('master', 'Mestrado'),
+#         ('doctor', 'Doutorado')
+#     )
+#     participant = models.ForeignKey('Participant', on_delete=models.CASCADE)
+#     higher_degree = models.CharField(max_length=20, choices=HIGHER_DEGREE_CHOICES, null=True, blank=True)
+#     work_for_industry = models.TextField(blank=True, null=True)
+#     development_background_summary = models.TextField(blank=True, null=True)
+
+
+class DifficultLinesFeedback(BaseModel):
+    execution = models.ForeignKey('Execution', on_delete=models.CASCADE)
+    hard_lines = models.CharField(max_length=500, blank=True, null=True)
+
+
 # from django.db.models.signals import post_save
 #
 # post_save.connect(handlers.my_handler, sender=LatinSquare)

experiments/services/next_task_service.py

@@ -38,10 +38,10 @@ class NextTaskService(object):
         LIMIT 1;
     """
 
-    def __init__(self, experiment, participant):
+    def __init__(self, participant):
         """Contructor"""
-        self.experiment = experiment
         self.participant = participant
+        self.experiment = participant.experiment
 
     def call(self):
         return self.__task()

experiments/templates/base.html

@@ -6,10 +6,12 @@
     <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css">
 </head>
 <body>
-    <div class="container">
+    <div class="container-fluid">
         {% block content %}{% endblock %}
     </div>
 
+    {% block body_content %}{% endblock %}
+
     <script
       src="https://code.jquery.com/jquery-3.3.1.min.js"
       integrity="sha256-FgpCb/KJQlLNfOu91ta32o/NMZxltwRo8QtmkMRdAu8="

experiments/templates/difficult_lines.html

@@ -0,0 +1,30 @@
+{% extends "base.html" %}
+
+{% block title %}Trechos Difíceis{% endblock %}
+
+{% block content %}
+    <h2 class="display-3">Trechos de difícil compreensão</h2>
+    <hr>
+    <form method="post">{% csrf_token %}
+        <input type="hidden" id="execution_id" name="execution_id" value="{{ execution.id }}" />
+
+        <div class="form-group row">
+            <div class="col-sm-10">
+                <img src="{{ execution.task.image.url }}" style="height: 90%; object-fit: contain; top: 0;" />
+            </div>
+            <div class="col-sm-2">
+                <label for="{{ form.hard_lines.id_for_label }}">Por favor, informe abaixo que linha(s) de código você acha mais complexa(s).</label>
+
+                {{ form.hard_lines }}
+
+                <hr>
+
+                <input type="submit" class="btn btn-primary" value="Enviar">
+            </div>
+        </div>
+    </form>
+{% endblock %}
+
+{% block javascript %}
+
+{% endblock %}

experiments/templates/next_task.html

@@ -21,7 +21,7 @@
     <body>
         <img class="center-fit" src="{{ execution.task.image.url }}" alt="Image not found" />
 
-        <form action="/experiments/next-task/{{participant_id}}/{{experiment_id}}/" method="get">
+        <form action="/experiments/next-task/{{participant_id}}/" method="get">
             <input type="hidden" value="{{execution.id}}" name="previous_execution_id" />
             <button class="hide" id="next_task_button">
         </form>

experiments/templates/pause_execution.html

@@ -90,7 +90,8 @@ <h5 class="modal-title" id="exampleModalLabel">Qual a sua resposta?</h5>
                     if (result.correct) {
                         alert('Resposta correta!');
                         showLoader();
-                        gotoHeatMap();
+                        hideResponseButton();
+                        gotoNextTask();
                     } else {
                         alert('Resposta incorreta!')
                         $("#responseButton").html("Digite outra Resposta");
@@ -114,10 +115,15 @@ <h5 class="modal-title" id="exampleModalLabel">Qual a sua resposta?</h5>
             window.location.replace("{% url 'experiments:heat_map' pause.execution.id %}");
         }
 
+        function gotoNextTask() {
+            window.location.replace("{% url 'experiments:next_task' pause.execution.participant.id %}?previous_execution_id={{ pause.execution.id }}");
+
+        }
+
         function changeNavigationButtonToNextTask() {
             var navigationButton = $("#navigationButton");
             $(navigationButton).html('Ir para a próxima tarefa');
-            $(navigationButton).attr('href', "{% url 'experiments:next_task' pause.execution.participant.id pause.execution.task.experiment.id %}?previous_execution_id={{ pause.execution.id }}");
+            $(navigationButton).attr('href', "{% url 'experiments:next_task' pause.execution.participant.id %}?previous_execution_id={{ pause.execution.id }}");
         }
 
         function hideResponseButton() {

experiments/templates/social_representation.html

@@ -0,0 +1,28 @@
+{% extends "base.html" %}
+
+{% block title %}Compreensão de Código{% endblock %}
+
+{% block content %}
+<div class="jumbotron">
+    <h2 class="display-3">Compreensão de Código</h2>
+    <hr>
+    <form method="post">{% csrf_token %}
+        <input type="hidden" id="participant_id" name="participant_id" value="{{ participant_id }}" />
+
+        <div class="form-group">
+            <label for="{{ form.words.id_for_label }}">O que vem &lt;&lt;imediatamente&gt;&gt; à sua mente quando você pensa &lt;&lt;código fonte confuso&gt;&gt;? Por favor, informar até cinco palavras na ordem que elas vierem à sua mente.</label>
+            {{ form.words }}
+        </div>
+
+        <div class="form-group">
+            <label for="{{ form.most_relevant.id_for_label }}">Considerando as palavras que você informou, qual delas você considera a mais relevante para expressar sua percepção sobre o código-fonte confuso? Por quê?</label>
+            {{ form.most_relevant }}
+        </div>
+        <input type="submit" class="btn btn-primary" value="Iniciar">
+    </form>
+</div>
+{% endblock %}
+
+{% block javascript %}
+
+{% endblock %}

experiments/urls.py

@@ -13,17 +13,21 @@
 from experiments.views.next_task import NextTask
 from experiments.views.start_flow import StartFlow
 from experiments.views.submit_answer import SubmitAnswer
+from experiments.views.social_representation import SocialRepresentationView
+from experiments.views.difficult_lines import DifficultLinesView
 
 
 urlpatterns = [
     url(r'^$', ExperimentList.as_view(), name='choose_experiment'),
     url(r'^start-flow/(?P<experiment_id>[0-9]+)/$', StartFlow.as_view(), name='start_flow'),
-    url(r'^next-task/(?P<participant_id>[0-9]+)/(?P<experiment_id>[0-9]+)/$', NextTask.as_view(), name='next_task'),
+    url(r'^next-task/(?P<participant_id>[0-9]+)/$', NextTask.as_view(), name='next_task'),
     url(r'^previous-task/(?P<participant_id>[0-9]+)/(?P<experiment_id>[0-9]+)/$', PreviousTask.as_view(), name='previous_task'),
     url(r'^finish-execution/$', FinishExecution.as_view(), name='finish_execution'),
     url(r'^pause-execution/(?P<execution_id>[0-9]+)/$', PauseExecution.as_view(), name='pause_execution'),
     url(r'^resume-execution/(?P<execution_id>[0-9]+)/$', ResumeExecution.as_view(), name='resume_execution'),
     url(r'^increment-number-of-errors/(?P<execution_id>[0-9]+)/$', IncrementNumberOfErrors.as_view(), name='increment_number_of_errors'),
     url(r'^submit-answer/(?P<execution_id>[0-9]+)/$', SubmitAnswer.as_view(), name='submit_answer'),
     url(r'^heat-map/(?P<execution_id>[0-9]+)/$', HeatMap.as_view(), name='heat_map'),
+    url(r'^social-representation/(?P<participant_id>[0-9]+)/$', SocialRepresentationView.as_view(), name='social_representation'),
+    url(r'^difficult-lines/(?P<execution_id>[0-9]+)/?', DifficultLinesView.as_view(), name='difficult_lines'),
 ]

experiments/views/choose_experiment.py

@@ -5,3 +5,6 @@
 class ExperimentList(ListView):
     model = Experiment
     paginate_by = 100
+
+    def get_queryset(self):
+        return Experiment.objects.filter(hidden=False)