Fix fields override for related table of context layer (#303)

* Fix fields override for related table of context layer * Keep value is none for wide excel * Revert migrations * Fix filter icons style
unicef-drp · Sep 18, 2024 · 882650f · 882650f
1 parent aa8e6fe
commit 882650f
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 8 deletions.
diff --git a/django_project/_version.txt b/django_project/_version.txt
@@ -1 +1 @@
-1.42.12
+1.42.13
diff --git a/django_project/frontend/src/app/variables.scss b/django_project/frontend/src/app/variables.scss
@@ -65,6 +65,7 @@ $black: #000 !default;
 $navbar-background-color: $primary-color;
 $navbar-font-color: $anti-primary-color;
 $tab-inactive-color: #CDCDCD;
+$tab-active-color: #333;
 $black: #000 !default;
 $error: #d32f2f !default;
 $warning: #fd7e14 !default;

diff --git a/django_project/frontend/src/pages/Admin/ContextLayer/StyleConfig/index.jsx b/django_project/frontend/src/pages/Admin/ContextLayer/StyleConfig/index.jsx
@@ -208,7 +208,7 @@ export default function StyleConfig(
                 <RelatedTableConfig
                   originalData={data} setData={setData}
                   setError={setError}
-                  RelatedTableData={layerData} useOverride={useOverride}
+                  RelatedTableData={layerData} useOverride={true}
                   useOverrideLabel={useOverrideLabel}
                 /> :
                 <Fragment>

diff --git a/django_project/frontend/src/pages/Dashboard/LeftPanel/Filters/style.scss b/django_project/frontend/src/pages/Dashboard/LeftPanel/Filters/style.scss
@@ -181,13 +181,13 @@
         }
 
         .FilterEdit {
-          color: $tab-inactive-color;
+          color: $tab-active-color;
           width: 12px;
           margin-right: 5px;
         }
 
         .FilterDelete {
-          color: $tab-inactive-color;
+          color: $tab-active-color;
           width: 9px;
         }
       }
@@ -250,7 +250,7 @@
         .FilterGroupAdd,
         .FilterGroupDelete {
           background-color: rgba(0, 0, 0, 0);
-          color: #ADE0FF;
+          color: $primary-color;
         }
 
         div.MuiInputBase-root {

diff --git a/django_project/geosight/importer/importers/base/indicator_value_wide_format.py b/django_project/geosight/importer/importers/base/indicator_value_wide_format.py
@@ -72,9 +72,6 @@ def process_data_from_records(self):
 
             # we check the values per indicator
             for key, value in record.items():
-                if value is None:
-                    continue
-
                 if 'indicator-' in key:
                     note = {}
                     date_time, date_time_error = self.get_date_time(record)