lot of new functionalities

This commit is contained in:
Arnaud Delcasse
2025-10-14 18:11:13 +02:00
parent a6f70a6e85
commit d992a7984f
164 changed files with 15113 additions and 9442 deletions

View File

@@ -36,7 +36,7 @@ func (s BeneficiariesCovoiturage) JSONWithLimits(a int, b int) template.JS {
return s.JSON()
}
func (renderer *Renderer) JourneysSearch(w http.ResponseWriter, r *http.Request, carpools []*geojson.FeatureCollection, transitjourneys any, vehicles any, searched bool, departure any, destination any, departuredate string, departuretime string, driverJourneys any, solidarityDrivers any, organizedCarpools any, beneficiaries any, kbData any, passengerid string) {
func (renderer *Renderer) JourneysSearch(w http.ResponseWriter, r *http.Request, carpools []*geojson.FeatureCollection, transitjourneys any, vehicles any, searched bool, departure any, destination any, departuredate string, departuretime string, driverJourneys any, solidarityDrivers any, organizedCarpools any, beneficiaries any, kbData any, passengerid string, savedSearches any, beneficiariesMap any) {
files := renderer.ThemeConfig.GetStringSlice("views.journeys.search.files")
state := NewState(r, renderer.ThemeConfig, journeysMenu)
journeyTabs := renderer.ThemeConfig.Get("journey_tabs")
@@ -53,10 +53,13 @@ func (renderer *Renderer) JourneysSearch(w http.ResponseWriter, r *http.Request,
"driver_journeys": driverJourneys,
"solidarity_drivers": solidarityDrivers,
"querystring": r.URL.RawQuery,
"beneficiaries": beneficiaries,
"beneficiaries": beneficiariesMap,
"beneficiaries_list": beneficiaries,
"kb_data": kbData,
"passengerid": passengerid,
"journey_tabs": journeyTabs,
"saved_searches": savedSearches,
"search_view": renderer.GlobalConfig.GetString("modules.journeys.search_view"),
}
renderer.Render("journeys", w, r, files, state)
@@ -156,3 +159,28 @@ func (renderer *Renderer) UpdateGroupCovoiturage(w http.ResponseWriter, r *http.
}
renderer.Render("journeys", w, r, files, state)
}
func (renderer *Renderer) JourneysSearchCompact(w http.ResponseWriter, r *http.Request, carpools []*geojson.FeatureCollection, transitjourneys any, vehicles any, searched bool, departure any, destination any, departuredate string, departuretime string, driverJourneys any, solidarityDrivers any, organizedCarpools any, kbData any, passengerid string) {
files := renderer.ThemeConfig.GetStringSlice("views.journeys.search_compact.files")
vehicleOptionalFields := renderer.GlobalConfig.Get("modules.fleets.vehicle_optional_fields")
state := NewState(r, renderer.ThemeConfig, journeysMenu)
state.ViewState = map[string]any{
"searched": searched,
"departuredate": departuredate,
"departuretime": departuretime,
"departure": departure,
"destination": destination,
"journeys": transitjourneys,
"carpools": carpools,
"organized_carpools": organizedCarpools,
"vehicles": vehicles,
"vehicle_optional_fields": vehicleOptionalFields,
"driver_journeys": driverJourneys,
"solidarity_drivers": solidarityDrivers,
"kb_data": kbData,
"passengerid": passengerid,
}
renderer.Render("journeys", w, r, files, state)
}