Skip to content

Commit 882650f

Browse files
authored
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
1 parent aa8e6fe commit 882650f

File tree

5 files changed

+6
-8
lines changed

5 files changed

+6
-8
lines changed

django_project/_version.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.42.12
1+
1.42.13

django_project/frontend/src/app/variables.scss

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,7 @@ $black: #000 !default;
6565
$navbar-background-color: $primary-color;
6666
$navbar-font-color: $anti-primary-color;
6767
$tab-inactive-color: #CDCDCD;
68+
$tab-active-color: #333;
6869
$black: #000 !default;
6970
$error: #d32f2f !default;
7071
$warning: #fd7e14 !default;

django_project/frontend/src/pages/Admin/ContextLayer/StyleConfig/index.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -208,7 +208,7 @@ export default function StyleConfig(
208208
<RelatedTableConfig
209209
originalData={data} setData={setData}
210210
setError={setError}
211-
RelatedTableData={layerData} useOverride={useOverride}
211+
RelatedTableData={layerData} useOverride={true}
212212
useOverrideLabel={useOverrideLabel}
213213
/> :
214214
<Fragment>

django_project/frontend/src/pages/Dashboard/LeftPanel/Filters/style.scss

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -181,13 +181,13 @@
181181
}
182182

183183
.FilterEdit {
184-
color: $tab-inactive-color;
184+
color: $tab-active-color;
185185
width: 12px;
186186
margin-right: 5px;
187187
}
188188

189189
.FilterDelete {
190-
color: $tab-inactive-color;
190+
color: $tab-active-color;
191191
width: 9px;
192192
}
193193
}
@@ -250,7 +250,7 @@
250250
.FilterGroupAdd,
251251
.FilterGroupDelete {
252252
background-color: rgba(0, 0, 0, 0);
253-
color: #ADE0FF;
253+
color: $primary-color;
254254
}
255255

256256
div.MuiInputBase-root {

django_project/geosight/importer/importers/base/indicator_value_wide_format.py

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -72,9 +72,6 @@ def process_data_from_records(self):
7272

7373
# we check the values per indicator
7474
for key, value in record.items():
75-
if value is None:
76-
continue
77-
7875
if 'indicator-' in key:
7976
note = {}
8077
date_time, date_time_error = self.get_date_time(record)

0 commit comments

Comments
 (0)