From 3319f8e3c10b7f82043761ec70e4a7d8d9ed1dc7 Mon Sep 17 00:00:00 2001 From: Yi Heng Joshua Wu Date: Wed, 1 Jun 2022 18:25:48 -0700 Subject: [PATCH 1/3] Remove duplicate color for waterwaste --- server/dash/design.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/server/dash/design.py b/server/dash/design.py index 5d3d25974..11f793e47 100644 --- a/server/dash/design.py +++ b/server/dash/design.py @@ -47,7 +47,6 @@ } -# TODO: Fixing multiple streetlights and waterwaste color # Request Type Color Hex Code Reference: https://github.com/hackforla/311-data/blob/b0717ad25eab4ef25a2f26da187d9d8905ab5f77/server/api/alembic/seeds/types.csv # Need to add another discrete color DISCRETE_COLORS_MAP = { @@ -60,7 +59,7 @@ "Metal/Appliances": "#8B508B", "Single Streetlight": "#79B74E", "Multiple Streetlights": "#EDAD08", - "Water Waste": "#EDAD08", + "Water Waste": "#DCED08", "Other": "#1D6996", "Feedback": "#E17C05" } From 8542aca2861fe7cfa05112818ab67c7a3ef75285 Mon Sep 17 00:00:00 2001 From: Yi Heng Joshua Wu Date: Wed, 1 Jun 2022 18:35:31 -0700 Subject: [PATCH 2/3] Update color mapping in seed file --- server/api/alembic/seeds/types.csv | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/api/alembic/seeds/types.csv b/server/api/alembic/seeds/types.csv index 16523fb9b..de795531e 100644 --- a/server/api/alembic/seeds/types.csv +++ b/server/api/alembic/seeds/types.csv @@ -8,6 +8,6 @@ type_id,type_name,agency_id,color,description,data_code 7,Metal/Appliances,2,#8B508B,"Air conditioners, dryers, refrigerator and more...",Metal/Household Appliances 8,Single Streetlight,1,#79B74E,"Pole knocked down, streetlight outage on a wooden power pole, or malfunctioning traffic signal",Single Streetlight Issue 9,Multiple Streetlights,1,#EDAD08,"Multiple poles knocked down, streetlight outages on wooden power poles, or malfunctioning traffic signals",Multiple Streetlight Issue -10,Water Waste,1,#EDAD08,"Water runoff, over-watering, incorrect water days, or any other water waste ",Report Water Waste +10,Water Waste,1,#DCED08,"Water runoff, over-watering, incorrect water days, or any other water waste ",Report Water Waste 11,Other,0,#1D6996,Issues that do not fit into any of the other available types,Other 12,Feedback,0,#E17C05,Either follow up on other issues or something that doesn't fit into the other types,Feedback \ No newline at end of file From 54473ae58013b312620aed4c7753646da329a6f5 Mon Sep 17 00:00:00 2001 From: joshuayhwu <77765986+joshuayhwu@users.noreply.github.com> Date: Thu, 2 Jun 2022 08:21:30 -0700 Subject: [PATCH 3/3] Remove outdated comment --- server/dash/design.py | 1 - 1 file changed, 1 deletion(-) diff --git a/server/dash/design.py b/server/dash/design.py index 11f793e47..a40871bbe 100644 --- a/server/dash/design.py +++ b/server/dash/design.py @@ -48,7 +48,6 @@ # Request Type Color Hex Code Reference: https://github.com/hackforla/311-data/blob/b0717ad25eab4ef25a2f26da187d9d8905ab5f77/server/api/alembic/seeds/types.csv -# Need to add another discrete color DISCRETE_COLORS_MAP = { "Graffiti":"#BF82BA", "Homeless Encampment":"#11975F",