Merge pull request #142 from IFRCGo/feature/resource-page

hide start and end date
IFRCGo · Jul 23, 2024 · 8e3610b · 8e3610b
2 parents ee6bb0e + 3e88511
commit 8e3610b
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 18 deletions.
diff --git a/backend b/backend
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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",
+6 −0		README.md
+15 −9		apps/cap_feed/admin.py
+72 −15		apps/cap_feed/data_injector/geo.py
+6 −2		apps/cap_feed/formats/atom.py
+9 −2		apps/cap_feed/formats/nws_us.py
+6 −2		apps/cap_feed/formats/rss.py
+67 −67		apps/cap_feed/locale/ar/LC_MESSAGES/django.po
+55 −55		apps/cap_feed/locale/fr/LC_MESSAGES/django.po
+10 −0		apps/cap_feed/management/commands/add_feeds.py
+12 −2		apps/cap_feed/management/commands/update_geo_data.py
+53 −0		apps/cap_feed/migrations/0007_country_name_ar_country_name_en_country_name_es_and_more.py
+2 −0		apps/cap_feed/models.py
+13 −0		apps/cap_feed/translation.py
+15 −0		main/settings.py
+15 −1		poetry.lock
+10 −0		pyproject.toml
+4 −0		utils/strawberry/mutations.py
+3 −0		utils/strawberry/types.py