Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

merge dev into master #976

Merged
merged 19 commits into from
Aug 2, 2023
Merged

merge dev into master #976

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
9b7b9fb
[Feat-885] Add selection for stack bar graphs (#935)
shaked-hayek Nov 26, 2022
15ff26a
add conditional label, refactor utils (#938)
danielsh28 Nov 26, 2022
57e0788
Update .env.staging (#947)
atalyaalon Feb 8, 2023
1a372a2
Add critical indication (#948)
carmelp16 Mar 1, 2023
dcdb07d
add alt attrinbte on image tag (#951)
EyalIlan Mar 3, 2023
a3833ea
Update .env.staging (#952)
atalyaalon Mar 5, 2023
8c0fd68
Make critical filter non local (#958)
carmelp16 Mar 22, 2023
4e536ab
Update News.tsx (#961)
atalyaalon Apr 25, 2023
dd9febf
Update news-flash-store.ts (#962)
atalyaalon Apr 25, 2023
7b67d07
Update News.tsx
atalyaalon Apr 25, 2023
a06502e
Update thank-you-names.csv
atalyaalon May 29, 2023
61a492e
transaction dialog box (#966)
atalyaalon Jun 24, 2023
78a9b5d
Merge branch 'master' into dev
atalyaalon Jun 24, 2023
c0132b1
[Feat-925] Add location approval feature (#969)
shaked-hayek Jul 12, 2023
63826f0
Feature add transcrption 4 widgets 957 (#968)
EyalIlan Jul 13, 2023
54922d7
Merge branch 'master' into dev
atalyaalon Jul 13, 2023
f6e4673
add widget vision_10_30_90 (#972)
EyalIlan Aug 2, 2023
0eeb69a
Feature widget vision zero 10 50 90 (#975)
EyalIlan Aug 2, 2023
6cc8984
Merge branch 'master' into dev
atalyaalon Aug 2, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file added src/assets/vision_zero_10_50_90.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
8 changes: 4 additions & 4 deletions src/components/molecules/widgets/WidgetWrapper.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import {
IWidgetKilledAndInjuredCountPerAgeGroup,
} from 'models/WidgetData';
import visionZeroImage from 'assets/vision_zero_2_plus_1.jpg';
import vision_10_30_90 from 'assets/vision_10_30_90.png';
import vision_zero_10_50_90 from 'assets/vision_zero_10_50_90.png';
import AccidentsCountByHourBarWidget from './AccidentsCountByHourBarWidget';
import MostSevereAccidentsMapWidget from './MostSevereAccidentsMapWidget';
import MostSevereAccidentsTableWidget from './MostSevereAccidentsTableWidget';
Expand Down Expand Up @@ -175,11 +175,11 @@ const WidgetWrapper: FC<IProps> = ({ widget, locationText, sizeOptions, editorBa
widgetComponent = <StaticImageViewWidget data={{items:{image_src:visionZeroImage},text:{}} as IWidgetVisionZeroImageData} />;
break;
}
case WidgetName.vision_zero_10_30_90: {
widgetComponent = <StaticImageViewWidget data={{items:{image_src:vision_10_30_90},text:{}} as IWidgetVisionZeroImageData} />;
case WidgetName.vision_zero_10_50_90: {
widgetComponent = <StaticImageViewWidget data={{items:{image_src:vision_zero_10_50_90},text:{}} as IWidgetVisionZeroImageData} />;

break;
}

case WidgetName.top_road_segments_accidents_per_km: {
widgetComponent = (
<TopRoadSegmentsAccidentsPerKm data={data as IWidgetTopRoadSegmentsAccidentsPerKm} segmentText={locationText} />
Expand Down
2 changes: 1 addition & 1 deletion src/models/WidgetName.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ export enum WidgetName {
head_on_collisions_comparison = 'head_on_collisions_comparison',
head_on_collisions_comparison_percentage = 'head_on_collisions_comparison_percentage',
vision_zero_2_plus_1 = 'vision_zero_2_plus_1',
vision_zero_10_30_90 = 'vision_zero_10_30_90',
vision_zero_10_50_90 = 'vision_zero_10_50_90',
top_road_segments_accidents_per_km = 'top_road_segments_accidents_per_km',
accident_count_by_road_light = 'accident_count_by_road_light',
accident_count_by_driver_type = 'accident_count_by_driver_type',
Expand Down