Merged in r2-2826-followups-insight (pull request #6748)

R2-2826: Fixing missing i18n strings, using followup_date for indicator, changed css to wrap insight fitlers

Author: jtoliver-quoin

app/javascript/components/insights-filters/components/styles.css

@@ -3,13 +3,17 @@
 .filter {
   display: flex;
 
+  & > div {
+    display: contents;
+  }
+
   & > div:first-of-type {
     font-weight: 600;
-    margin: 0 var(--sp-1) 0 0;
     flex: 0 0;
 
     &:after {
       content: ':';
+      margin: 0 var(--sp-1) 0 0;
     }
   }
 }
@@ -33,6 +37,8 @@
 
 .container {
   display: flex;
+  gap: var(--sp-1);
+  flex-wrap: wrap;
 
   & > div {
     margin: 0 var(--sp-1) 0 0;

app/javascript/components/insights/constants.js

@@ -46,6 +46,7 @@ const VIOLATION_TYPE = "violation_type";
 const REGISTRATION_DATE = "registration_date";
 const SERVICE_IMPLEMENTED_DAY_TIME = "service_implemented_day_time";
 const CREATED_AT = "created_at";
+const FOLLOWUP_DATE = "followup_date";
 
 const GBV_STATISTICS = "gbv_statistics";
 const VIOLATIONS = "violations";
@@ -493,7 +494,7 @@ export const INSIGHTS_CONFIG = {
         [GROUPED_BY]: WEEK,
         [DATE_RANGE]: LAST_WEEK,
         [STATUS]: [STATUS_OPEN],
-        [DATE]: REGISTRATION_DATE,
+        [DATE]: FOLLOWUP_DATE,
         [BY]: OWNED_BY_GROUPS
       },
       filters: [

app/models/managed_report.rb

@@ -49,7 +49,7 @@ def self.list
         subreports: %w[followups],
         permitted_filters: [
           :grouped_by, :by, :created_by_groups, :owned_by_groups,
-          :created_organization, :owned_by_agency_id, { status: {}, registration_date: {}, followup_type: {} }
+          :created_organization, :owned_by_agency_id, { status: {}, followup_date: {}, followup_type: {} }
         ],
         module_id: PrimeroModule::CP
       ),

app/models/managed_reports/indicators/followups.rb

@@ -17,6 +17,10 @@ def subform_section
       'followup_subform_section'
     end
 
+    def date_filter_nested?
+      true
+    end
+
     def multiple_field_values
       true
     end

config/locales/en.yml

@@ -2011,6 +2011,7 @@ en:
       referral_transfer_status: Referral / Transfer Status
       protection_concerns: Protection Concerns
       location_current: Reporting Locations
+      followup_type: Type of Follow Up
     status_options:
       open: Open
       closed: Closed
@@ -2084,10 +2085,10 @@ en:
       description: 'Cases with the selected Reporting Location, broken down by age and sex.'
     reporting_locations_report:
       reports:
-        protection_concerns: Reporting Location
+        reporting_locations: Reporting Location
         description: ''
       sub_reports:
-        protection_concerns: Reporting Location
+        reporting_location_by_sex_and_age: Reporting Location
     ghn_report:
       name: Global Horizontal Note
       description: ''
@@ -3383,16 +3384,16 @@ en:
       managed_report:
         actions:
           reporting_locations_report:
-            label: Reporting Location
+            label: Reporting Location (Cases)
             explanation: Ability to view statistics on the number of Cases registered within a given date range, filtered by Reporting Location, and broken down by age and sex. This permission also allows the user to export data from an Insight.
           followups_report:
-            label: Followups
+            label: Followups (Cases)
             explanation: Ability to view statistics on the number of Follow Ups performed within a given date range, filtered by Type of Follow Up, and broken down by age and sex. This permission also allows the user to export data from an Insight.
           services_report:
-            label: Services
+            label: Services (Cases)
             explanation: Ability to view statistics on the number of Services performed within a given date range, filtered by service type, and broken down by age and sex. This permission also allows the user to export data from an Insight.
           protection_concerns_report:
-            label: Protection Concerns
+            label: Protection Concerns (Cases)
             explanation: Ability to view statistics on the Protection Concerns of Cases registered within a given date range. This permission also allows the user to export data from an Insight.
           managed_report_scope:
             label: What records should this role be able to see in Insights?