Merge pull request #555 from Esmat-Farjad/feat/SafeSpace_for_womenGirls

safe spaces added to project monthly report for ESNFI

Author: aleemcahn

src/project_reports/migrations/0025_targetlocationreport_safe_space.py

@@ -0,0 +1,18 @@
+# Generated by Django 5.1.4 on 2025-01-26 07:31
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('project_reports', '0024_remove_targetlocationreport_seasonal_retargeting'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='targetlocationreport',
+            name='safe_space',
+            field=models.BooleanField(default=False),
+        ),
+    ]

src/project_reports/models.py

@@ -111,6 +111,7 @@ class TargetLocationReport(models.Model):
     location_type = models.ForeignKey(LocationType, on_delete=models.SET_NULL, null=True, blank=True)
 
     prev_assisted_by = models.ForeignKey(Indicator, null=True, blank=True, on_delete=models.SET_NULL)
+    safe_space = models.BooleanField(default=False)
     beneficiary_status = models.CharField(
         max_length=25,
         choices=[

src/project_reports/templates/project_reports/report_target_locations/report_target_location_form.html

@@ -146,9 +146,23 @@ <h4 class="text-white"><u>Description</u></h4>
                                                 </div>
                                             </div>
                                         </div>
+                                        {% if safe_space %}
+                                        <div class="multiple-fields-row two-items py-2">
+                                            <div class="field-col">
+                                                {{ location_report_form.safe_space }}
+                                                <label for="{{ location_report_form.safe_space.id_for_label }}">
+                                                    Distribution Undertaken with safe spaces
+                                                </label>
+                                                <p class="help-text ml-4">
+                                                    Was the distribution undertaken with safe spaces for women, girls and people with disabilities?
+                                                </p>
+                                                <div class="sign-up-field-error">{{ location_report_form.safe_space.errors }}</div>
+                                            </div>
+                                        </div>
+                                        {% endif %}
                                     </div>
                                 </div>
-
+                                
                                 {% comment %} the TL info and Tabular Disaggregation Here {% endcomment %}
                                 <div id="target-location-info">
                                     {% if location_report %}

src/project_reports/utils.py

@@ -90,6 +90,7 @@ def write_projects_reports_to_csv(monthly_progress_report, response):
         "currency",
         "updated_at",
         "created_at",
+        "safe_spaces_for_women-girls",
     ]
     disaggregation_cols = []
     disaggregations = Disaggregation.objects.all()
@@ -248,6 +249,7 @@ def write_projects_reports_to_csv(monthly_progress_report, response):
                         plan_report.currency.name if plan_report.currency else None,
                         project_reports.created_at.astimezone(datetime.timezone.utc).replace(tzinfo=None),
                         project_reports.updated_at.astimezone(datetime.timezone.utc).replace(tzinfo=None),
+                        "Yes" if location_report.safe_space else None,
                     ]
 
                     # Iterate through disaggregation locations and get disaggregation values
@@ -311,6 +313,7 @@ def write_import_report_template_sheet(workbook, monthly_report):
         {"header": "facility_long", "type": "string", "width": 30},
         {"header": "non_hrp_beneficiary", "type": "string", "width": 30},
         {"header": "hrp_beneficiary", "type": "string", "width": 30},
+        {"header": "with_safe_spaces", "type": "string", "width": 30},
     ]
 
     disaggregation_cols = []
@@ -344,6 +347,8 @@ def write_import_report_template_sheet(workbook, monthly_report):
         "transfer_mc_type": ["N"],
         "transfer_category": ["L"],
         "currency": ["M"],
+        "safe_space": ["AG", "True", "False"],
+        "facilitySiteTypeList": ["Z"],
     }
     plain_dictionary_lists = {
         "indicatorList": ["B"],
@@ -355,7 +360,6 @@ def write_import_report_template_sheet(workbook, monthly_report):
         "admin1nameList": ["U"],
         "admin2pcodeList": ["V"],
         "admin2nameList": ["W"],
-        "facilitySiteTypeList": ["Z"],
         "implementing_partner_list": ["F"],
         "non_hrp_beneficiary": ["AE"],
         "hrp_beneficiary": ["AF"],
@@ -370,11 +374,14 @@ def write_import_report_template_sheet(workbook, monthly_report):
     container_dictionary["transfer_mc_type"].extend(list(TransferMechanismType.objects.values_list("name", flat=True)))
     container_dictionary["transfer_category"].extend(list(TransferCategory.objects.values_list("name", flat=True)))
     container_dictionary["currency"].extend(list(Currency.objects.values_list("name", flat=True)))
-    facility = list(FacilitySiteType.objects.values_list("name", flat=True))
+    facility = list(FacilitySiteType.objects.filter(cluster__code="health").values_list("name", flat=True))
     responseType = list(ResponseType.objects.values_list("name", flat=True))
     num_rows = 2
+
+    cluster_code = []
     project_code = project.code
     for plan in project.activityplan_set.all():
+        cluster_code.extend(plan.activity_domain.clusters.values_list("code", flat=True))
         for location in plan.targetlocation_set.all():
             plain_dictionary_lists["indicatorList"].append(str(plan.indicator.name))
             plain_dictionary_lists["activityDomainList"].append(str(plan.activity_domain.name))
@@ -389,8 +396,10 @@ def write_import_report_template_sheet(workbook, monthly_report):
             plain_dictionary_lists["non_hrp_beneficiary"].append(str(plan.beneficiary))
             plain_dictionary_lists["hrp_beneficiary"].append(str(plan.hrp_beneficiary))
             num_rows += 1
-    plain_dictionary_lists["facilitySiteTypeList"].extend(facility)
+
     container_dictionary["reponseTypeList"].extend(responseType)
+    if "health" in cluster_code:
+        container_dictionary["facilitySiteTypeList"].extend(facility)
 
     for key, value in container_dictionary.items():
         column = value[0]

src/project_reports/views/report_target_locations.py

@@ -153,7 +153,10 @@ def create_report_target_location(request, plan):
     plan_report = get_object_or_404(
         ActivityPlanReport.objects.select_related("monthly_report", "activity_plan"), pk=plan
     )
-
+    safe_space = False
+    cluster_codes = plan_report.activity_plan.activity_domain.clusters.values_list("code", flat=True)
+    if "esnfi" in cluster_codes:
+        safe_space = True
     if request.method == "POST":
         target_location_id = request.POST.get("target_location", None)
         target_location = get_object_or_404(TargetLocation, pk=target_location_id)
@@ -222,6 +225,7 @@ def create_report_target_location(request, plan):
         "report_plan": plan_report,
         "monthly_report": plan_report.monthly_report,
         "project": plan_report.monthly_report.project,
+        "safe_space": safe_space,
     }
 
     return render(request, "project_reports/report_target_locations/report_target_location_form.html", context)
@@ -235,6 +239,7 @@ def update_report_target_locations(request, project, plan, location):
 
     # Get the existing location report to be updated
     location_report = get_object_or_404(TargetLocationReport.objects.select_related("target_location"), pk=location)
+    safe_space = location_report.safe_space
 
     DisaggregationReportFormSet = inlineformset_factory(
         parent_model=TargetLocationReport,
@@ -316,6 +321,7 @@ def update_report_target_locations(request, project, plan, location):
             "report_plan": plan_report,
             "monthly_report": monthly_report,
             "project": monthly_report.project,
+            "safe_space": safe_space,
         },
     )
 

src/project_reports/views/views.py

@@ -252,12 +252,14 @@ def import_report_activities(request, pk):
                         district=district,
                         zone=zone,
                     ).first()
+                    safe_space = row.get("with_safe_spaces").strip().upper() == "TRUE"
 
                     target_location = TargetLocationReport(
                         activity_plan_report=activity_plan_report,
                         target_location=project_target_location,
                         location_type=location_type,
                         beneficiary_status=beneficiary_status,
+                        safe_space=safe_space,
                         # add previously_targeted_by and
                     )
                     report_target_locations.append(target_location)

src/rh/views/target_locations.py

@@ -123,9 +123,10 @@ def create_target_location(request, activity_plan):
     related_disaggregations = Disaggregation.objects.filter(indicators=activity_plan.indicator)
 
     cluster_code = activity_plan.activity_domain.clusters.values_list("code", flat=True)
-    cluster_facility = True
-    if "fsac" in cluster_code:
-        cluster_facility = False
+    cluster_facility = False
+
+    if "health" in cluster_code:
+        cluster_facility = True
 
     DisaggregationFormSet = inlineformset_factory(
         parent_model=TargetLocation,