Skip to content

Commit

Permalink
merge dev into master (#1002)
Browse files Browse the repository at this point in the history
* [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 <eyalilan8@gmail.com>

* [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)

---------

Co-authored-by: shaked-hayek <85109951+shaked-hayek@users.noreply.github.com>
Co-authored-by: danielsh28 <danielshely1@gmail.com>
Co-authored-by: carmelp16 <46032304+carmelp16@users.noreply.github.com>
Co-authored-by: EyalIlan <55767736+EyalIlan@users.noreply.github.com>
Co-authored-by: EyalIlan <eyalilan8@gmail.com>
Co-authored-by: Shai2022 <106345640+Shai2022@users.noreply.github.com>
Co-authored-by: BarVolunteering <58947331+BarVolunteering@users.noreply.github.com>
  • Loading branch information
8 people authored Dec 26, 2023
1 parent 46bf35d commit 24023b7
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion src/components/molecules/GenericBarChart.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ const BarChartContainer: FC<IBarChartBaseProps> = ({ data, textLabel, subtitle,
return (
<>
<ResponsiveContainer>
<BarChart data={data} margin={{ bottom: 20 }}>
<BarChart data={data}>
<XAxis
angle={0}
interval={0}
Expand Down

0 comments on commit 24023b7

Please sign in to comment.