From 677f90d8f619016241c7a30b31ee594a45bf8542 Mon Sep 17 00:00:00 2001 From: Atalya Alon <20992625+atalyaalon@users.noreply.github.com> Date: Wed, 27 Dec 2023 23:26:21 +0200 Subject: [PATCH 1/3] Merge dev (#1017) * [Feat-885] Add selection for stack bar graphs (#935) * Added stacked bar widgets a checkbox option * Add option to choose colors when changing displayed bars * Changed any to proper type, make number of bar generic and add function createBarWidget * Fix bug of changed values when closing card editor * PR review changes * Remove redundent imports * add conditional label, refactor utils (#938) Co-authored-by: Daniel Shely <> * Update .env.staging (#947) * Add critical indication (#948) * Added image * Added critical icon based on field value * Added critical option to the filter panel * Added enum value * Had to increase width * Added local critical filter * Added field to model * add alt attrinbte on image tag (#951) * Update .env.staging (#952) * Make critical filter non local (#958) * sufficient condition * Use object for fetch args * Send params in object format * Make fields optional * don't use "any" type hint * Update News.tsx (#961) * Update news-flash-store.ts (#962) * Update News.tsx * Update thank-you-names.csv * transaction dialog box (#966) Co-authored-by: EyalIlan * [Feat-925] Add location approval feature (#969) * initial feature commit with icon and new field * Added icon choice and display * Move critical icon * Add location change button * Make critical icon transperent * replace critical.gif with svg * Window open pressing button, seperated newsFlash comp to new file * Added user info * Status icon and buttons * Added map choice (need to finish with saving data) * Saving location and qualificaion data * Added manual option for location qualification and added user change * Fix responsibilty issue between the two files * Split Search city to 2 files * Spacing and page look * Changed initialLocation to be a function, and improved onClose location window * Split radio buttons to seperate file * updated put function for news flash --------- Co-authored-by: Daniel Shely <> * Feature add transcrption 4 widgets 957 (#968) * transaction dialog box * show transaction icon only widgets that has transaction * add copy image to transaction box * add widget vision_10_30_90 (#972) * Feature widget vision zero 10 50 90 (#975) * add widget vision_10_30_90 * change widget 10_30_90 to 10_50_90 * change the location of the start command in package.json (#977) * change the location of the start command in package.json change the location of the start command after receive this error: /usr/local/bin/node: bad option: --openssl-legacy-provider * add npx browserslist@latest --update-db before start the docker * add logo (#979) * add natun square logo (#982) * add widget lower bar (#981) * update logo (#980) * Update Footer.tsx (#986) * add data-for-change (#988) * Delete src/assets/hasadna.png (#989) * Bug click twice to change news backround (#984) * add widget lower bar * fix news menu bar bug you need to click twice to make the news backround active * Add dev-to-prod auth server change (#950) * Spliting title and subtitle, making title bold (#995) * Change design in bar widgets (#996) * Remove margin from bottom of bar charts (#1001) * Add check for user authentication in NewsFlash (#990) (#1003) * Fix subtitle param in CardEditor (#1005) (#1006) * Remove padding from bottom of stack bars (#1008) (#1009) * Open new widgets to production (#1012) (#1013) * Remove accident_count_by_driver_type from prod (#1016) * Update cards.const.ts --------- Co-authored-by: shaked-hayek <85109951+shaked-hayek@users.noreply.github.com> Co-authored-by: danielsh28 Co-authored-by: carmelp16 <46032304+carmelp16@users.noreply.github.com> Co-authored-by: EyalIlan <55767736+EyalIlan@users.noreply.github.com> Co-authored-by: EyalIlan Co-authored-by: Shai2022 <106345640+Shai2022@users.noreply.github.com> Co-authored-by: BarVolunteering <58947331+BarVolunteering@users.noreply.github.com> --- src/const/cards.const.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/const/cards.const.ts b/src/const/cards.const.ts index d3ef915c..96d9760d 100644 --- a/src/const/cards.const.ts +++ b/src/const/cards.const.ts @@ -12,7 +12,7 @@ export const operationalCards: WidgetName[] = [ WidgetName.accidents_heat_map, WidgetName.accident_count_by_accident_year, WidgetName.injured_count_by_accident_year, - WidgetName.accident_count_by_driver_type, + // WidgetName.accident_count_by_driver_type, WidgetName.accident_count_by_day_night ]; From dc13cccc9b9f56e4b9b1eddbf03bc2fa5f22945b Mon Sep 17 00:00:00 2001 From: Atalya Alon <20992625+atalyaalon@users.noreply.github.com> Date: Wed, 27 Dec 2023 23:29:22 +0200 Subject: [PATCH 2/3] merge dev (#1018) * [Feat-885] Add selection for stack bar graphs (#935) * Added stacked bar widgets a checkbox option * Add option to choose colors when changing displayed bars * Changed any to proper type, make number of bar generic and add function createBarWidget * Fix bug of changed values when closing card editor * PR review changes * Remove redundent imports * add conditional label, refactor utils (#938) Co-authored-by: Daniel Shely <> * Update .env.staging (#947) * Add critical indication (#948) * Added image * Added critical icon based on field value * Added critical option to the filter panel * Added enum value * Had to increase width * Added local critical filter * Added field to model * add alt attrinbte on image tag (#951) * Update .env.staging (#952) * Make critical filter non local (#958) * sufficient condition * Use object for fetch args * Send params in object format * Make fields optional * don't use "any" type hint * Update News.tsx (#961) * Update news-flash-store.ts (#962) * Update News.tsx * Update thank-you-names.csv * transaction dialog box (#966) Co-authored-by: EyalIlan * [Feat-925] Add location approval feature (#969) * initial feature commit with icon and new field * Added icon choice and display * Move critical icon * Add location change button * Make critical icon transperent * replace critical.gif with svg * Window open pressing button, seperated newsFlash comp to new file * Added user info * Status icon and buttons * Added map choice (need to finish with saving data) * Saving location and qualificaion data * Added manual option for location qualification and added user change * Fix responsibilty issue between the two files * Split Search city to 2 files * Spacing and page look * Changed initialLocation to be a function, and improved onClose location window * Split radio buttons to seperate file * updated put function for news flash --------- Co-authored-by: Daniel Shely <> * Feature add transcrption 4 widgets 957 (#968) * transaction dialog box * show transaction icon only widgets that has transaction * add copy image to transaction box * add widget vision_10_30_90 (#972) * Feature widget vision zero 10 50 90 (#975) * add widget vision_10_30_90 * change widget 10_30_90 to 10_50_90 * change the location of the start command in package.json (#977) * change the location of the start command in package.json change the location of the start command after receive this error: /usr/local/bin/node: bad option: --openssl-legacy-provider * add npx browserslist@latest --update-db before start the docker * add logo (#979) * add natun square logo (#982) * add widget lower bar (#981) * update logo (#980) * Update Footer.tsx (#986) * add data-for-change (#988) * Delete src/assets/hasadna.png (#989) * Bug click twice to change news backround (#984) * add widget lower bar * fix news menu bar bug you need to click twice to make the news backround active * Add dev-to-prod auth server change (#950) * Spliting title and subtitle, making title bold (#995) * Change design in bar widgets (#996) * Remove margin from bottom of bar charts (#1001) * Add check for user authentication in NewsFlash (#990) (#1003) * Fix subtitle param in CardEditor (#1005) (#1006) * Remove padding from bottom of stack bars (#1008) (#1009) * Open new widgets to production (#1012) (#1013) * Remove accident_count_by_driver_type from prod (#1016) * Update cards.const.ts * Add title and subtitle to heatmap widget (#1015) --------- Co-authored-by: shaked-hayek <85109951+shaked-hayek@users.noreply.github.com> Co-authored-by: danielsh28 Co-authored-by: carmelp16 <46032304+carmelp16@users.noreply.github.com> Co-authored-by: EyalIlan <55767736+EyalIlan@users.noreply.github.com> Co-authored-by: EyalIlan Co-authored-by: Shai2022 <106345640+Shai2022@users.noreply.github.com> Co-authored-by: BarVolunteering <58947331+BarVolunteering@users.noreply.github.com> --- src/services/widgets.style.service.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/src/services/widgets.style.service.ts b/src/services/widgets.style.service.ts index 05bad081..0ec33d35 100644 --- a/src/services/widgets.style.service.ts +++ b/src/services/widgets.style.service.ts @@ -58,6 +58,7 @@ const widgetVariants: { [index: string]: CardVariant } = { header: HeaderVariant.Centered, footer: FooterVariant.LogoWithRange, }, + [WidgetName.accidents_heat_map]: { header: HeaderVariant.Centered, footer: FooterVariant.LogoWithRange }, }; export function getWidgetVariant(widgetName: string) { From f97c40e430c74334b5138092bca1d9db6786a4fc Mon Sep 17 00:00:00 2001 From: Atalya Alon <20992625+atalyaalon@users.noreply.github.com> Date: Wed, 10 Jan 2024 19:30:03 +0200 Subject: [PATCH 3/3] merge dev into master (#1025) * [Feat-885] Add selection for stack bar graphs (#935) * Added stacked bar widgets a checkbox option * Add option to choose colors when changing displayed bars * Changed any to proper type, make number of bar generic and add function createBarWidget * Fix bug of changed values when closing card editor * PR review changes * Remove redundent imports * add conditional label, refactor utils (#938) Co-authored-by: Daniel Shely <> * Update .env.staging (#947) * Add critical indication (#948) * Added image * Added critical icon based on field value * Added critical option to the filter panel * Added enum value * Had to increase width * Added local critical filter * Added field to model * add alt attrinbte on image tag (#951) * Update .env.staging (#952) * Make critical filter non local (#958) * sufficient condition * Use object for fetch args * Send params in object format * Make fields optional * don't use "any" type hint * Update News.tsx (#961) * Update news-flash-store.ts (#962) * Update News.tsx * Update thank-you-names.csv * transaction dialog box (#966) Co-authored-by: EyalIlan * [Feat-925] Add location approval feature (#969) * initial feature commit with icon and new field * Added icon choice and display * Move critical icon * Add location change button * Make critical icon transperent * replace critical.gif with svg * Window open pressing button, seperated newsFlash comp to new file * Added user info * Status icon and buttons * Added map choice (need to finish with saving data) * Saving location and qualificaion data * Added manual option for location qualification and added user change * Fix responsibilty issue between the two files * Split Search city to 2 files * Spacing and page look * Changed initialLocation to be a function, and improved onClose location window * Split radio buttons to seperate file * updated put function for news flash --------- Co-authored-by: Daniel Shely <> * Feature add transcrption 4 widgets 957 (#968) * transaction dialog box * show transaction icon only widgets that has transaction * add copy image to transaction box * add widget vision_10_30_90 (#972) * Feature widget vision zero 10 50 90 (#975) * add widget vision_10_30_90 * change widget 10_30_90 to 10_50_90 * change the location of the start command in package.json (#977) * change the location of the start command in package.json change the location of the start command after receive this error: /usr/local/bin/node: bad option: --openssl-legacy-provider * add npx browserslist@latest --update-db before start the docker * add logo (#979) * add natun square logo (#982) * add widget lower bar (#981) * update logo (#980) * Update Footer.tsx (#986) * add data-for-change (#988) * Delete src/assets/hasadna.png (#989) * Bug click twice to change news backround (#984) * add widget lower bar * fix news menu bar bug you need to click twice to make the news backround active * Add dev-to-prod auth server change (#950) * Spliting title and subtitle, making title bold (#995) * Change design in bar widgets (#996) * Remove margin from bottom of bar charts (#1001) * Add check for user authentication in NewsFlash (#990) (#1003) * Fix subtitle param in CardEditor (#1005) (#1006) * Remove padding from bottom of stack bars (#1008) (#1009) * Open new widgets to production (#1012) (#1013) * Remove accident_count_by_driver_type from prod (#1016) * Update cards.const.ts * Add title and subtitle to heatmap widget (#1015) * fix the text in info button (make bigger) (#1020) (#1024) Co-authored-by: Barak Yakter --------- Co-authored-by: shaked-hayek <85109951+shaked-hayek@users.noreply.github.com> Co-authored-by: danielsh28 Co-authored-by: carmelp16 <46032304+carmelp16@users.noreply.github.com> Co-authored-by: EyalIlan <55767736+EyalIlan@users.noreply.github.com> Co-authored-by: EyalIlan Co-authored-by: Shai2022 <106345640+Shai2022@users.noreply.github.com> Co-authored-by: BarVolunteering <58947331+BarVolunteering@users.noreply.github.com> Co-authored-by: byakter <109795934+byakter@users.noreply.github.com> Co-authored-by: Barak Yakter --- src/components/molecules/card/AnyWayCard.tsx | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/src/components/molecules/card/AnyWayCard.tsx b/src/components/molecules/card/AnyWayCard.tsx index aedabc5b..8a1d5292 100644 --- a/src/components/molecules/card/AnyWayCard.tsx +++ b/src/components/molecules/card/AnyWayCard.tsx @@ -65,6 +65,9 @@ const useStyles = makeStyles((theme) => ({ lineHeight: '0.75', cursor: 'pointer', }, + tooltip: { + fontSize: '13px', + }, })); const AnyWayCard: FC = ({ @@ -118,22 +121,22 @@ const AnyWayCard: FC = ({ - {handleCardEditorOpen('CardEditor')}}> + { handleCardEditorOpen('CardEditor') }}> {information && ( - + )} - {transcription?( - {handleCardEditorOpen('TextBox')}}> - - ):null} + {transcription ? ( + { handleCardEditorOpen('TextBox') }}> + + ) : null} ); const refFn = (element: HTMLDivElement) => {