Merge pull request #314 from jeffreykirchner/dev

add period_on_modulus to barriers.

Author: jeffreykirchner

main/forms/parameter_set_barrier_form.py

@@ -77,8 +77,21 @@ class ParameterSetBarrierForm(forms.ModelForm):
                                     widget=forms.NumberInput(attrs={"v-model":"current_parameter_set_barrier.period_off",
                                                                     "step":"1",
                                                                     "min":"2"}))
+    
+    period_on_modulus = forms.IntegerField(label='Period On Modulus',
+                                           min_value=1,
+                                           widget=forms.NumberInput(attrs={"v-model":"current_parameter_set_barrier.period_on_modulus",
+                                                                           "step":"1",
+                                                                           "min":"1"}))
+
+    period_on_modulus_answer = forms.IntegerField(label='Period On Modulus Answer',
+                                                    min_value=0,
+                                                    widget=forms.NumberInput(attrs={"v-model":"current_parameter_set_barrier.period_on_modulus_answer",
+                                                                                    "step":"1",
+                                                                                    "min":"0"}))
 
     class Meta:
         model=ParameterSetBarrier
-        fields =['info', 'text', 'rotation', 'parameter_set_groups', 'parameter_set_players', 'start_x', 'start_y', 'width', 'height', 'period_on', 'period_off']
+        fields =['info', 'text', 'rotation', 'parameter_set_groups', 'parameter_set_players', 'start_x', 'start_y', 
+                 'width', 'height', 'period_on', 'period_off', 'period_on_modulus', 'period_on_modulus_answer']
 

main/migrations/0131_alter_session_options_and_more.py

@@ -0,0 +1,22 @@
+# Generated by Django 4.2.13 on 2024-06-25 17:03
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('main', '0130_session_replay_data'),
+    ]
+
+    operations = [
+        migrations.AlterModelOptions(
+            name='session',
+            options={'base_manager_name': 'objects', 'ordering': ['-start_date'], 'verbose_name': 'Session', 'verbose_name_plural': 'Sessions'},
+        ),
+        migrations.AddField(
+            model_name='parametersetbarrier',
+            name='period_on_modulus',
+            field=models.IntegerField(default=100, verbose_name='Period On Modulus'),
+        ),
+    ]

main/migrations/0132_parametersetbarrier_period_on_modulus_answer.py

@@ -0,0 +1,18 @@
+# Generated by Django 4.2.13 on 2024-06-25 18:15
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('main', '0131_alter_session_options_and_more'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='parametersetbarrier',
+            name='period_on_modulus_answer',
+            field=models.IntegerField(default=0, verbose_name='Period On Modulus Answer'),
+        ),
+    ]

main/migrations/0133_alter_parametersetbarrier_period_on_modulus.py

@@ -0,0 +1,18 @@
+# Generated by Django 4.2.13 on 2024-06-25 18:18
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('main', '0132_parametersetbarrier_period_on_modulus_answer'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='parametersetbarrier',
+            name='period_on_modulus',
+            field=models.IntegerField(default=100, verbose_name='Period On Modulus'),
+        ),
+    ]

main/models/parameter_set_barrier.py

@@ -34,6 +34,9 @@ class ParameterSetBarrier(models.Model):
     period_on = models.IntegerField(verbose_name='Period On', default=1)                #period when barrier is on
     period_off = models.IntegerField(verbose_name='Period Off', default=14)             #period when barrier is off
 
+    period_on_modulus = models.IntegerField(verbose_name='Period On Modulus', default=100)               #if current period mod period_on_modulus == period_on_modulus_answer, barrier is on
+    period_on_modulus_answer = models.IntegerField(verbose_name='Period On Modulus Answer', default=0)   #if current period mod period_on_modulus == period_on_modulus_answer, barrier is on
+
     timestamp = models.DateTimeField(auto_now_add=True)
     updated= models.DateTimeField(auto_now=True)
 
@@ -64,6 +67,9 @@ def from_dict(self, new_ps):
         self.period_on = new_ps.get("period_on", 1)
         self.period_off = new_ps.get("period_off", 14)
 
+        self.period_on_modulus = new_ps.get("period_on_modulus", 1)
+        self.period_on_modulus_answer = new_ps.get("period_on_modulus_answer", 0)
+
         self.save()
 
         message = "Parameters loaded successfully."
@@ -105,6 +111,8 @@ def json(self):
             "parameter_set_players" : [player.id for player in self.parameter_set_players.all()],
             "period_on" : self.period_on,
             "period_off" : self.period_off,
+            "period_on_modulus" : self.period_on_modulus,
+            "period_on_modulus_answer" : self.period_on_modulus_answer,
         }
 
     def get_json_for_subject(self, update_required=False):

main/templates/staff/staff_session_parameters/barriers/barriers_card.html

@@ -43,7 +43,10 @@
                                 </th> 
                                 <th scope="col" class = "m-1 p-1">
                                     Period On/Off
-                                </th>                
+                                </th>            
+                                <th scope="col" class = "m-1 p-1">
+                                    Period On Mod/Answer
+                                </th> 
                             </tr>
                         </thead>
                         <tbody id="barrier_list">
@@ -91,9 +94,12 @@
                                 </td>
                                 <td v-on:click="show_edit_parameter_set_barrier(p)" 
                                     class="player_table_cell">
-                                    [[temp_p.period_on]], [[temp_p.period_off]]
+                                    [[temp_p.period_on]], [[temp_p.period_off]], [[temp_p.period_on_modulus]]
+                                </td>
+                                <td v-on:click="show_edit_parameter_set_barrier(p)" 
+                                    class="player_table_cell">
+                                    [[temp_p.period_on_modulus]], [[temp_p.period_on_modulus_answer]]
                                 </td>
-                               
                             </tr>
                         </tbody>
 

main/templates/subject/subject_home/the_stage/barriers.js

@@ -98,15 +98,16 @@ check_barriers_intersection: function check_barriers_intersection(rect1, paramet
 /**
  * update barriers
  */
-update_barriers: function()
+update_barriers: function update_barriers()
 {
     for(let i in app.session.parameter_set.parameter_set_barriers)
     {
         let barrier = app.session.parameter_set.parameter_set_barriers[i];
         let barrier_container = pixi_barriers[i].barrier_container;
 
-        if(app.session.world_state.current_period >= barrier.period_on &&
-           app.session.world_state.current_period < barrier.period_off)
+        if((app.session.world_state.current_period >= barrier.period_on &&
+           app.session.world_state.current_period < barrier.period_off) ||
+           app.session.world_state.current_period % barrier.period_on_modulus == barrier.period_on_modulus_answer)
         {
             barrier_container.visible = true;
         }