Cleanup the question color choices, no longer used

Author: norkans7

templates/public/index.html

@@ -12,7 +12,7 @@
                         {% edit_content 'polls.poll_update' latest_poll.pk "#id_title" "-m-8" "dark" %}
                         {{ latest_poll.title }}
                     </div>
-                    <div class="{% if latest_poll.get_first_question.get_border_color_choice %} border-{{ latest_poll.get_first_question.get_border_color_choice }} {% else %}border-{{ border_color }}{% endif %} font-alt font-bold italic left-border mt-8 hover-parent">
+                    <div class="border-{{ border_color }} font-alt font-bold italic left-border mt-8 hover-parent">
                         {% edit_content 'polls.poll_questions' latest_poll.pk "#id_ruleset_"|add:latest_poll.get_first_question.flow_result.result_uuid|add:"_title"  "-m-8" "dark" %}
                         {{ latest_poll.get_first_question.title }}
                     </div>

templates/public/polls.html

@@ -248,7 +248,7 @@
                             <div data-html2canvas-ignore
                                  class="flex-none bg-circle bg-black text-white font-bold">{{ forloop.counter }}</div>
                             <div class="flex-1 flex-center-y">
-                                <div class="{% if is_rtl_org %}{% cycle 'mr-4' 'ml-4' as margin %}{% else %}{% cycle 'ml-4' 'mr-4' as margin %}{% endif %} {% cycle 'white' 'black' 'white' 'white' as border_color silent %}{% if question.get_border_color_choice %} border-{{ question.get_border_color_choice }} {% else %}border-{{ border_color }}{% endif %} h-1 border-t">
+                                <div class="{% if is_rtl_org %}{% cycle 'mr-4' 'ml-4' as margin %}{% else %}{% cycle 'ml-4' 'mr-4' as margin %}{% endif %} {% cycle 'white' 'black' 'white' 'white' as border_color silent %} border-{{ border_color }} h-1 border-t">
                                 </div>
                             </div>
                         </div>

ureport/polls/models.py

@@ -867,27 +867,6 @@ class PollQuestion(SmartModel):
         ("D3", _("Dark 3 background and Black text")),
     )
 
-    QUESTION_COLOR_CHOICE_BLOCK_CSS_CLASSES = {
-        "D1": "bg-dark1 text-white",
-        "L1": "bg-light1 text-black",
-        "D2": "bg-dark2 text-white",
-        "D3": "bg-dark3 text-black",
-    }
-
-    QUESTION_COLOR_CHOICE_BG_COLORS = {
-        "D1": ("dark1_color", "#98DFF9"),
-        "L1": ("light1_color", "#143E49"),
-        "D2": ("dark2_color", "#FFC20E"),
-        "D3": ("dark3_color", "#FF7100"),
-    }
-
-    QUESTION_COLOR_CHOICE_BORDER_COLORS = {
-        "D1": "white",
-        "L1": "black",
-        "D2": "white",
-        "D3": "white",
-    }
-
     QUESTION_HIDDEN_CHARTS_CHOICES = (
         (None, _("Show Age, Gender and Location charts")),
         ("A", _("Hide Age chart ONLY")),
@@ -946,17 +925,6 @@ def get_last_pill(self):
             return "age"
         return "all"
 
-    def get_color_choice_css(self):
-        return self.QUESTION_COLOR_CHOICE_BLOCK_CSS_CLASSES.get(self.color_choice, "")
-
-    def get_border_color_choice(self):
-        return self.QUESTION_COLOR_CHOICE_BORDER_COLORS.get(self.color_choice, "")
-
-    def get_bg_color_choice(self):
-        org = self.poll.org
-        color_tuple = self.QUESTION_COLOR_CHOICE_BG_COLORS.get(self.color_choice, ("", ""))
-        return org.get_config(color_tuple[0]) or color_tuple[1]
-
     @classmethod
     def update_or_create(cls, user, poll, ruleset_label, uuid, ruleset_type):
         flow_result = FlowResult.update_or_create(poll.org, poll.flow_uuid, uuid, ruleset_label)

ureport/polls/tests.py

@@ -869,15 +869,13 @@ def test_questions_poll(self):
         response = self.client.get(uganda_questions_url, SERVER_NAME="uganda.ureport.io")
         self.assertEqual(response.status_code, 200)
         self.assertTrue("form" in response.context)
-        self.assertEqual(len(response.context["form"].fields), 6)
+        self.assertEqual(len(response.context["form"].fields), 5)
         self.assertTrue("ruleset_uuid-101_include" in response.context["form"].fields)
         self.assertTrue("ruleset_uuid-101_priority" in response.context["form"].fields)
         self.assertTrue("ruleset_uuid-101_label" in response.context["form"].fields)
         self.assertTrue("ruleset_uuid-101_title" in response.context["form"].fields)
-        self.assertTrue("ruleset_uuid-101_color" in response.context["form"].fields)
         self.assertTrue("ruleset_uuid-101_hidden_charts" in response.context["form"].fields)
         self.assertEqual(response.context["form"].fields["ruleset_uuid-101_priority"].initial, 0)
-        self.assertIsNone(response.context["form"].fields["ruleset_uuid-101_color"].initial)
         self.assertIsNone(response.context["form"].fields["ruleset_uuid-101_hidden_charts"].initial)
         self.assertEqual(response.context["form"].fields["ruleset_uuid-101_label"].initial, "question poll 1")
         self.assertEqual(response.context["form"].fields["ruleset_uuid-101_title"].initial, "question poll 1")
@@ -923,7 +921,6 @@ def test_questions_poll(self):
         post_data["ruleset_uuid-101_include"] = True
         post_data["ruleset_uuid-101_title"] = "electricity network coverage"
         post_data["ruleset_uuid-101_priority"] = 5
-        post_data["ruleset_uuid-101_color"] = "D1"
         post_data["ruleset_uuid-101_hidden_charts"] = "GL"
         response = self.client.post(uganda_questions_url, post_data, follow=True, SERVER_NAME="uganda.ureport.io")
 
@@ -933,7 +930,6 @@ def test_questions_poll(self):
         self.assertEqual(poll_question.title, "electricity network coverage")
         self.assertEqual(poll_question.ruleset_label, "question poll 1")
         self.assertEqual(poll_question.priority, 5)
-        self.assertEqual(poll_question.color_choice, "D1")
         self.assertTrue(poll_question.show_age())
         self.assertFalse(poll_question.show_gender())
         self.assertFalse(poll_question.show_locations())

ureport/polls/views.py

@@ -428,8 +428,6 @@ def derive_fields(self):
                 fields.append("ruleset_%s_include" % result_uuid)
                 fields.append("ruleset_%s_label" % result_uuid)
 
-                fields.append("ruleset_%s_color" % result_uuid)
-
                 fields.append("ruleset_%s_hidden_charts" % result_uuid)
 
                 fields.append("ruleset_%s_title" % result_uuid)
@@ -500,16 +498,6 @@ def get_form(self):
                     help_text=_("The question posed to your audience, will be displayed publicly"),
                 )
 
-                color_field_name = f"ruleset_{result_uuid}_color"
-                color_field_initial = initial.get(color_field_name, "")
-                color_field = forms.ChoiceField(
-                    label=_("Color Choice"),
-                    choices=PollQuestion.QUESTION_COLOR_CHOICES,
-                    required=False,
-                    initial=color_field_initial,
-                    help_text=_("The color to use for the question block will be displayed publicly"),
-                )
-
                 hidden_charts_field_name = f"ruleset_{result_uuid}_hidden_charts"
                 hidden_charts_field_initial = initial.get(hidden_charts_field_name, "")
                 hidden_charts_field = forms.ChoiceField(
@@ -524,7 +512,6 @@ def get_form(self):
                 self.form.fields[priority_field_name] = priority_field
                 self.form.fields[label_field_name] = label_field
                 self.form.fields[title_field_name] = title_field
-                self.form.fields[color_field_name] = color_field
                 self.form.fields[hidden_charts_field_name] = hidden_charts_field
 
                 categories = question.get_public_categories()
@@ -569,15 +556,12 @@ def save(self, obj):
 
                 title = data[f"ruleset_{result_uuid}_title"]
 
-                color_choice = data[f"ruleset_{result_uuid}_color"]
-
                 hidden_charts_choice = data[f"ruleset_{result_uuid}_hidden_charts"]
 
                 PollQuestion.objects.filter(poll=poll, flow_result__result_uuid=result_uuid).update(
                     is_active=included,
                     title=title,
                     priority=priority,
-                    color_choice=color_choice,
                     hidden_charts=hidden_charts_choice,
                 )
 
@@ -620,7 +604,6 @@ def derive_initial(self):
                 initial["ruleset_%s_priority" % result_uuid] = question.priority
                 initial["ruleset_%s_label" % result_uuid] = result_name
                 initial["ruleset_%s_title" % result_uuid] = question.title
-                initial["ruleset_%s_color" % result_uuid] = question.color_choice
                 initial["ruleset_%s_hidden_charts" % result_uuid] = question.hidden_charts
 
                 categories = question.get_public_categories()