Skip to content

Commit

Permalink
merge dev into master (#1038)
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 <[email protected]>

* [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 <byakter@gmail,com>

* fix the text in info button (make bigger) (#1020) (#1026)

Co-authored-by: Barak Yakter <byakter@gmail,com>

* Fix location qualification api use (#1022) (#1023)

* Update generalConst.ts (#1027)

* Add n12 org logo (#1031) (#1032)

* Adjust titles for 2 widgets (#1036)

Co-authored-by: Barak Yakter <byakter@gmail,com>

* [Feat-1031] Add different color themes (for N12) (#1034)

* Add n12 org logo (#1031)

* Add Color Themes - N12 theme

* Change the way patch request work (#1030)

---------

Co-authored-by: shaked-hayek <[email protected]>
Co-authored-by: danielsh28 <[email protected]>
Co-authored-by: carmelp16 <[email protected]>
Co-authored-by: EyalIlan <[email protected]>
Co-authored-by: EyalIlan <[email protected]>
Co-authored-by: Shai2022 <[email protected]>
Co-authored-by: BarVolunteering <[email protected]>
Co-authored-by: byakter <[email protected]>
Co-authored-by: Barak Yakter <byakter@gmail,com>
  • Loading branch information
10 people authored Feb 21, 2024
1 parent a861f13 commit 4213e28
Showing 1 changed file with 14 additions and 9 deletions.
23 changes: 14 additions & 9 deletions src/services/news.data.service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -59,19 +59,24 @@ function onErrorFetchNewsFlash() {
}

export function updateNews(newsId: number, newLocationQualification: any,
streetLocation: IStreetData | null, gpsLocation: IGpsData | null) {
const data = [];
data.push(`newsflash_location_qualification=${newLocationQualification}`)
streetLocation: IStreetData | null, gpsLocation: IGpsData | null) {
const data : Record<string, string | undefined> = {}; // object to hold request data
data['newsflash_location_qualification'] = newLocationQualification;

if (gpsLocation) {
data.push(`road_segment_name=${gpsLocation.road_segment_name}`)
data.push(`road1=${gpsLocation.road1}`)
data['road_segment_name'] = gpsLocation.road_segment_name;
data['road1'] = gpsLocation.road1;
} else if (streetLocation) {
data.push(`yishuv_name=${streetLocation.city.yishuv_name}`)
data.push(`street1_hebrew=${streetLocation.street.street_hebrew}`)
data['yishuv_name'] = streetLocation.city.yishuv_name;
data['street1_hebrew'] = streetLocation.street.street_hebrew;
}
const url = `${NEWS_FLASH_API}/${newsId}?${data.join('&')}`;
const url = `${NEWS_FLASH_API}/${newsId}`;
axios
.patch(url)
.patch(url, data, {
headers: {
'Content-Type': 'application/json',
},
})
.then((res) => res.data)
.catch(onErrorFetchNewsFlash)
}

0 comments on commit 4213e28

Please sign in to comment.