Merge pull request #110 from jeffreykirchner/dev

switch to color names.
jeffreykirchner · Sep 12, 2023 · 7371f7d · 7371f7d
2 parents 7c9eeb4 + 300b748
commit 7371f7d
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 5 deletions.
diff --git a/main/consumers/staff/session_parameters_consumer_mixins/get_parameter_set.py b/main/consumers/staff/session_parameters_consumer_mixins/get_parameter_set.py
@@ -81,7 +81,9 @@ def take_update_parameter_set(data):
         form.save()    
 
         if session.parameter_set.good_mode == GoodModes.TWO:
-            session.parameter_set.parameter_set_players.update(good_three=None)           
+            session.parameter_set.parameter_set_players.filter(good_one=Goods.PINEAPPLE).update(good_one=Goods.CHERRY)
+            session.parameter_set.parameter_set_players.filter(good_two=Goods.PINEAPPLE).update(good_two=Goods.CHERRY)
+            session.parameter_set.parameter_set_players.update(good_three=None)                       
 
             session.parameter_set.parameter_set_field_types.filter(good_one_ft=Goods.PINEAPPLE).update(good_one_ft=Goods.CHERRY)
             session.parameter_set.parameter_set_field_types.filter(good_two_ft=Goods.PINEAPPLE).update(good_two_ft=Goods.CHERRY)

diff --git a/main/migrations/0106_alter_parametersetplayer_id_label.py b/main/migrations/0106_alter_parametersetplayer_id_label.py
@@ -0,0 +1,18 @@
+# Generated by Django 4.2.3 on 2023-09-12 21:49
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('main', '0105_alter_parametersetpatch_shock_levels'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='parametersetplayer',
+            name='id_label',
+            field=models.CharField(default='Color', max_length=20, verbose_name='ID Label'),
+        ),
+    ]
diff --git a/main/models/parameter_set_player.py b/main/models/parameter_set_player.py
@@ -20,8 +20,8 @@ class ParameterSetPlayer(models.Model):
     parameter_set = models.ForeignKey(ParameterSet, on_delete=models.CASCADE, related_name="parameter_set_players")
     parameter_set_group = models.ForeignKey(ParameterSetGroup, on_delete=models.SET_NULL, related_name="parameter_set_players_b", blank=True, null=True)
 
-    id_label = models.CharField(verbose_name='ID Label', max_length=2, default="1")      #id label shown on screen to subjects
-    player_number = models.IntegerField(verbose_name='Player number', default=0)         #player number, from 1 to N 
+    id_label = models.CharField(verbose_name='ID Label', max_length=20, default="Color")      #id label shown on screen to subjects
+    player_number = models.IntegerField(verbose_name='Player number', default=0)              #player number, from 1 to N 
 
     start_x = models.IntegerField(verbose_name='Start Location X', default=50)                #starting location x and y
     start_y = models.IntegerField(verbose_name='Start Location Y', default=50)

diff --git a/main/templates/subject/subject_home/the_stage/avatars.js b/main/templates/subject/subject_home/the_stage/avatars.js
@@ -48,7 +48,7 @@ setup_pixi_subjects(){
             fill: 'black',
             // align: 'left',
             // stroke: 'black',
-            strokeThickness: 2,
+            strokeThickness: 1,
         };
 
         let text_style_2 = {
@@ -160,7 +160,7 @@ setup_pixi_subjects(){
 
         //position in container
         face_sprite.position.set(0, -gear_sprite.height * 0.03);
-        id_label.position.set(0, -gear_sprite.height * 0.2);
+        id_label.position.set(0, gear_sprite.height * 0.15);
         status_label.position.set(0, +gear_sprite.height/2-30);
 
         if(app.session.parameter_set.good_mode == "Three")