From 418b03ada1a54381fbf67a023419a93971ec42b3 Mon Sep 17 00:00:00 2001 From: Mateusz Konieczny Date: Tue, 24 Jan 2023 10:43:21 +0100 Subject: [PATCH] new Withdrawn styling --- app/map_styles/polygon.xml | 17 ++++++----------- app/src/frontend/config/category-maps-config.ts | 6 +++--- 2 files changed, 9 insertions(+), 14 deletions(-) diff --git a/app/map_styles/polygon.xml b/app/map_styles/polygon.xml index 525b0436..bb44ad10 100644 --- a/app/map_styles/polygon.xml +++ b/app/map_styles/polygon.xml @@ -389,13 +389,8 @@ [status] = "Withdrawn" - - - - - [status] = "Withdrawn" - - + + [status] != "Submitted" and [status] != "Approved" and [status] != "Appeal In Progress" and [status] != "Rejected" and [status] != "Withdrawn" @@ -426,8 +421,8 @@ [status] = "Withdrawn" and [days_since_registered_with_local_authority_date] < 366 - - + + [status] != "Submitted" and [status] != "Approved" and [status] != "Appeal In Progress" and [status] != "Rejected" and [status] != "Withdrawn" and [days_since_registered_with_local_authority_date] < 366 @@ -458,8 +453,8 @@ [status] = "Withdrawn" and [days_since_registered_with_local_authority_date] <= 30 - - + + [status] != "Submitted" and [status] != "Approved" and [status] != "Appeal In Progress" and [status] != "Rejected" and [status] != "Withdrawn" and [days_since_registered_with_local_authority_date] <= 30 diff --git a/app/src/frontend/config/category-maps-config.ts b/app/src/frontend/config/category-maps-config.ts index 89c040f7..2cfba648 100644 --- a/app/src/frontend/config/category-maps-config.ts +++ b/app/src/frontend/config/category-maps-config.ts @@ -181,7 +181,7 @@ export const categoryMapsConfig: {[key in Category]: CategoryMapDefinition[]} = { color: '#fff200', text: 'Appeal In Progress' }, { color: '#16cf15', text: 'Approved' }, { color: '#e31d23', text: 'Rejected' }, - { color: '#999999', text: 'Withdrawn' }, + { color: '#546083', text: 'Withdrawn' }, { color: '#eacad0', text: 'Other' }, ] } @@ -196,7 +196,7 @@ export const categoryMapsConfig: {[key in Category]: CategoryMapDefinition[]} = { color: '#fff200', text: 'Appeal In Progress' }, { color: '#16cf15', text: 'Approved' }, { color: '#e31d23', text: 'Rejected' }, - { color: '#999999', text: 'Withdrawn' }, + { color: '#546083', text: 'Withdrawn' }, { color: '#eacad0', text: 'Other' }, ] } @@ -211,7 +211,7 @@ export const categoryMapsConfig: {[key in Category]: CategoryMapDefinition[]} = { color: '#fff200', text: 'Appeal In Progress' }, { color: '#16cf15', text: 'Approved' }, { color: '#e31d23', text: 'Rejected' }, - { color: '#999999', text: 'Withdrawn' }, + { color: '#546083', text: 'Withdrawn' }, { color: '#eacad0', text: 'Other' }, ] }