Merge pull request #3759 from unicef/develop

Staging
unicef · Sep 11, 2024 · 7e94308 · 7e94308
2 parents bab66ec + 588137b
commit 7e94308
Show file tree

Hide file tree

Showing 9 changed files with 49 additions and 7 deletions.
diff --git a/src/etools/applications/field_monitoring/data_collection/offline/blueprint.py b/src/etools/applications/field_monitoring/data_collection/offline/blueprint.py
@@ -103,7 +103,9 @@ def get_blueprint_for_activity_and_method(activity: 'MonitoringActivity', method
                         help_text=question.specific_details,
                         required=False,
                         # For HACT questions, a warning that is mandatory to fill in is needed in the frontend
-                        styling=['mandatory_warning'] if question.question.category.name == 'HACT' else []
+                        styling=['mandatory_warning']
+                        if 'olc' in question.question.other and
+                           question.question.other["olc"].get("mandatory_warning", False) else []
                     )
                 )
             level_block.add(target_block)

diff --git a/src/etools/applications/field_monitoring/fm_settings/locale/ar/LC_MESSAGES/django.po b/src/etools/applications/field_monitoring/fm_settings/locale/ar/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-03-26 09:09+0000\n"
+"POT-Creation-Date: 2024-09-09 20:08+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -136,6 +136,9 @@ msgstr "مخصص"
 msgid "Is Active"
 msgstr "فعال"
 
+msgid "Other details"
+msgstr ""
+
 msgid "Question"
 msgstr "السؤال"
 

diff --git a/src/etools/applications/field_monitoring/fm_settings/locale/es/LC_MESSAGES/django.po b/src/etools/applications/field_monitoring/fm_settings/locale/es/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-03-26 09:09+0000\n"
+"POT-Creation-Date: 2024-09-09 20:08+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -135,6 +135,9 @@ msgstr "Es personalizada"
 msgid "Is Active"
 msgstr "Está Activo"
 
+msgid "Other details"
+msgstr ""
+
 msgid "Question"
 msgstr "Pregunta"
 

diff --git a/src/etools/applications/field_monitoring/fm_settings/locale/fr/LC_MESSAGES/django.po b/src/etools/applications/field_monitoring/fm_settings/locale/fr/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-03-24 08:39+0000\n"
+"POT-Creation-Date: 2024-09-09 20:08+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -135,6 +135,9 @@ msgstr "Est personnalisé"
 msgid "Is Active"
 msgstr "Est actif"
 
+msgid "Other details"
+msgstr ""
+
 msgid "Question"
 msgstr "Question"
 

diff --git a/src/etools/applications/field_monitoring/fm_settings/locale/pt/LC_MESSAGES/django.po b/src/etools/applications/field_monitoring/fm_settings/locale/pt/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-03-24 08:39+0000\n"
+"POT-Creation-Date: 2024-09-09 20:08+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -135,6 +135,9 @@ msgstr "É Personalizado"
 msgid "Is Active"
 msgstr "Está activo"
 
+msgid "Other details"
+msgstr ""
+
 msgid "Question"
 msgstr "Pergunta"
 

diff --git a/src/etools/applications/field_monitoring/fm_settings/locale/ru/LC_MESSAGES/django.po b/src/etools/applications/field_monitoring/fm_settings/locale/ru/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-03-24 08:39+0000\n"
+"POT-Creation-Date: 2024-09-09 20:08+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -137,6 +137,9 @@ msgstr "Пользовательский"
 msgid "Is Active"
 msgstr "Активен"
 
+msgid "Other details"
+msgstr ""
+
 msgid "Question"
 msgstr "Вопрос"
 

diff --git a/src/etools/applications/field_monitoring/fm_settings/migrations/0004_question_other.py b/src/etools/applications/field_monitoring/fm_settings/migrations/0004_question_other.py
@@ -0,0 +1,18 @@
+# Generated by Django 4.2.3 on 2024-09-09 15:37
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('field_monitoring_settings', '0003_initial'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='question',
+            name='other',
+            field=models.JSONField(blank=True, default=dict, verbose_name='Other details'),
+        ),
+    ]
diff --git a/src/etools/applications/field_monitoring/fm_settings/models.py b/src/etools/applications/field_monitoring/fm_settings/models.py
@@ -108,6 +108,8 @@ class Question(models.Model):
     is_custom = models.BooleanField(default=False, verbose_name=_('Is Custom'))
     is_active = models.BooleanField(default=True, verbose_name=_('Is Active'))
 
+    other = models.JSONField(verbose_name=_('Other details'), blank=True, default=dict)
+
     order = models.PositiveIntegerField(db_index=True, default=1)
 
     objects = models.Manager.from_queryset(QuestionsQuerySet)()

diff --git a/src/etools/applications/field_monitoring/fm_settings/serializers.py b/src/etools/applications/field_monitoring/fm_settings/serializers.py
@@ -60,12 +60,17 @@ class Meta:
 
 
 class QuestionLightSerializer(serializers.ModelSerializer):
+    show_mandatory_warning = serializers.SerializerMethodField()
+
+    def get_show_mandatory_warning(self, obj):
+        return obj.other['olc'].get("mandatory_warning", False) if obj.other.get("olc") else False
+
     class Meta:
         model = Question
         fields = (
             'id', 'answer_type', 'choices_size', 'level',
             'methods', 'category', 'sections', 'text',
-            'is_hact', 'is_active', 'is_custom', 'order'
+            'is_hact', 'is_active', 'is_custom', 'order', 'show_mandatory_warning'
         )