From 2261bac39a67225587b3fd40fd5d2dcc26680381 Mon Sep 17 00:00:00 2001
From: barshathakuri <barshathakuri708@gmail.com>
Date: Tue, 23 Jul 2024 13:49:38 +0545
Subject: [PATCH 1/2] hide start and end date

---
 backend                                   |  2 +-
 src/views/Home/AlertFilters/i18n.json     |  6 +++---
 src/views/Home/AlertFilters/index.tsx     | 12 +++++++-----
 src/views/RootLayout/translations/ar.json |  6 +++---
 src/views/RootLayout/translations/es.json |  6 +++---
 src/views/RootLayout/translations/fr.json |  6 +++---
 6 files changed, 20 insertions(+), 18 deletions(-)

diff --git a/backend b/backend
index 21397ab0..731dd7e7 160000
--- a/backend
+++ b/backend
@@ -1 +1 @@
-Subproject commit 21397ab026b5b0b7ccb115a8b50feea89a3f8f91
+Subproject commit 731dd7e7389233e56597eaf9f14727bf1aaf8afb
diff --git a/src/views/Home/AlertFilters/i18n.json b/src/views/Home/AlertFilters/i18n.json
index 2510e5f7..79556a8a 100644
--- a/src/views/Home/AlertFilters/i18n.json
+++ b/src/views/Home/AlertFilters/i18n.json
@@ -8,9 +8,9 @@
         "filterCertaintyPlaceholder": "All Certainty Types",
         "filterCountriesLabel": "Country",
         "filterAdmin1Label": "Admin1",
-        "filterUrgencyLabel": "Urgency",
-        "filterSeverityLabel": "Severity",
-        "filterCertaintyLabel": "Certainty",
+        "filterUrgencyLabel": "Urgency Level",
+        "filterSeverityLabel": "Severity Level",
+        "filterCertaintyLabel": "Certainty Level",
         "filterRegionsLabel": "Regions",
         "filterRegionsPlaceholder": "All Regions",
         "filterCategoriesLabel": "Event Categories",
diff --git a/src/views/Home/AlertFilters/index.tsx b/src/views/Home/AlertFilters/index.tsx
index 80b22cb7..c4dc0b02 100644
--- a/src/views/Home/AlertFilters/index.tsx
+++ b/src/views/Home/AlertFilters/index.tsx
@@ -7,7 +7,6 @@ import {
     useQuery,
 } from '@apollo/client';
 import {
-    DateInput,
     MultiSelectInput,
     SelectInput,
 } from '@ifrc-go/ui';
@@ -132,16 +131,16 @@ function AlertFilters(props: Props) {
         selectedUrgencyTypes,
         selectedCertaintyTypes,
         activeRegionId,
-        startDateFrom,
-        startDateTo,
+        // startDateFrom,
+        // startDateTo,
         setActiveCountryId,
         setActiveAdmin1Id,
         setSelectedSeverityTypes,
         setSelectedUrgencyTypes,
         setSelectedCertaintyTypes,
         setActiveRegionId,
-        setStartDateFrom,
-        setStartDateTo,
+        // setStartDateFrom,
+        // setStartDateTo,
         selectedCategoryTypes,
         setSelectedCategoryTypes,
     } = useContext(AlertDataContext);
@@ -232,6 +231,8 @@ function AlertFilters(props: Props) {
                 value={selectedCertaintyTypes}
                 onChange={setSelectedCertaintyTypes}
             />
+            {/*
+            Add these filter after adding Historical alerts
             <DateInput
                 name="startDateFrom"
                 label={strings.filterStartDateFrom}
@@ -244,6 +245,7 @@ function AlertFilters(props: Props) {
                 value={startDateTo}
                 onChange={setStartDateTo}
             />
+            */}
             {variant === 'table' && (
                 <MultiSelectInput
                     label={strings.filterCategoriesLabel}
diff --git a/src/views/RootLayout/translations/ar.json b/src/views/RootLayout/translations/ar.json
index 3bb624ac..bb79e61d 100644
--- a/src/views/RootLayout/translations/ar.json
+++ b/src/views/RootLayout/translations/ar.json
@@ -167,7 +167,7 @@
     {
         "key": "filterCertaintyLabel",
         "namespace": "alertFilters",
-        "value": "درجة التأكد"
+        "value": "مستوى التأكد"
     },
     {
         "key": "filterCertaintyPlaceholder",
@@ -197,7 +197,7 @@
     {
         "key": "filterSeverityLabel",
         "namespace": "alertFilters",
-        "value": "الخطورة"
+        "value": "مستوى الخطورة"
     },
     {
         "key": "filterSeverityPlaceholder",
@@ -217,7 +217,7 @@
     {
         "key": "filterUrgencyLabel",
         "namespace": "alertFilters",
-        "value": "الإلحاح"
+        "value": "مستوى الإلحاح"
     },
     {
         "key": "filterUrgencyPlaceholder",
diff --git a/src/views/RootLayout/translations/es.json b/src/views/RootLayout/translations/es.json
index 8c340b75..4bcff57a 100644
--- a/src/views/RootLayout/translations/es.json
+++ b/src/views/RootLayout/translations/es.json
@@ -167,7 +167,7 @@
     {
         "key": "filterCertaintyLabel",
         "namespace": "alertFilters",
-        "value": "Certeza"
+        "value": "Nivel de Certidumbre"
     },
     {
         "key": "filterCertaintyPlaceholder",
@@ -197,7 +197,7 @@
     {
         "key": "filterSeverityLabel",
         "namespace": "alertFilters",
-        "value": "Gravedad"
+        "value": " Nivel de Severidad"
     },
     {
         "key": "filterSeverityPlaceholder",
@@ -217,7 +217,7 @@
     {
         "key": "filterUrgencyLabel",
         "namespace": "alertFilters",
-        "value": "Urgencia"
+        "value": "Nivel de Urgencia"
     },
     {
         "key": "filterUrgencyPlaceholder",
diff --git a/src/views/RootLayout/translations/fr.json b/src/views/RootLayout/translations/fr.json
index 15f3bd5a..aa49b731 100644
--- a/src/views/RootLayout/translations/fr.json
+++ b/src/views/RootLayout/translations/fr.json
@@ -167,7 +167,7 @@
     {
         "key": "filterCertaintyLabel",
         "namespace": "alertFilters",
-        "value": "Certitude"
+        "value": "Niveau de Certitude"
     },
     {
         "key": "filterCertaintyPlaceholder",
@@ -197,7 +197,7 @@
     {
         "key": "filterSeverityLabel",
         "namespace": "alertFilters",
-        "value": "Gravité"
+        "value": "Niveau de Gravité"
     },
     {
         "key": "filterSeverityPlaceholder",
@@ -217,7 +217,7 @@
     {
         "key": "filterUrgencyLabel",
         "namespace": "alertFilters",
-        "value": "Urgence"
+        "value": "Niveau d'Urgence"
     },
     {
         "key": "filterUrgencyPlaceholder",

From 3e885116ade1aae94750ab500f335dbe6f418ea7 Mon Sep 17 00:00:00 2001
From: barshathakuri <barshathakuri708@gmail.com>
Date: Tue, 23 Jul 2024 15:58:33 +0545
Subject: [PATCH 2/2] Update backend

---
 backend | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/backend b/backend
index 731dd7e7..69450f82 160000
--- a/backend
+++ b/backend
@@ -1 +1 @@
-Subproject commit 731dd7e7389233e56597eaf9f14727bf1aaf8afb
+Subproject commit 69450f82253f675cf923779396f46cb2e809dcf8