Many improvements

renderer/beneficiaries.go

@@ -44,7 +44,12 @@ func (renderer *Renderer) BeneficiariesList(w http.ResponseWriter, r *http.Reque
 
 func (renderer *Renderer) BeneficiaryCreate(w http.ResponseWriter, r *http.Request) {
 	files := renderer.ThemeConfig.GetStringSlice("views.beneficiaries.create.files")
+	profileFields := renderer.GlobalConfig.Get("modules.beneficiaries.profile_optional_fields")
+
 	state := NewState(r, renderer.ThemeConfig, beneficiariesMenu)
+	state.ViewState = map[string]any{
+		"profile_optional_fields": profileFields,
+	}
 
 	renderer.Render("beneficiaries_create", w, r, files, state)
 }
@@ -55,6 +60,8 @@ type BeneficiariesDisplayState struct {
 
 func (renderer *Renderer) BeneficiaryDisplay(w http.ResponseWriter, r *http.Request, beneficiary any, bookings []fleetsstorage.Booking, organizations []any, beneficiaries_file_types []string, file_types_map map[string]string, documents any, event interface{}, diags []any, solidarityTransportStats any) {
 	files := renderer.ThemeConfig.GetStringSlice("views.beneficiaries.display.files")
+	profileFields := renderer.GlobalConfig.Get("modules.beneficiaries.profile_optional_fields")
+
 	state := NewState(r, renderer.ThemeConfig, beneficiariesMenu)
 	state.ViewState = map[string]any{
 		"beneficiary":                beneficiary,
@@ -66,14 +73,20 @@ func (renderer *Renderer) BeneficiaryDisplay(w http.ResponseWriter, r *http.Requ
 		"event":                      event,
 		"diags":                      diags,
 		"solidarity_transport_stats": solidarityTransportStats,
+		"profile_optional_fields":    profileFields,
 	}
 	renderer.Render("beneficiaries_display", w, r, files, state)
 }
 
 func (renderer *Renderer) BeneficiaryUpdate(w http.ResponseWriter, r *http.Request, beneficiary any) {
 	files := renderer.ThemeConfig.GetStringSlice("views.beneficiaries.update.files")
+	profileFields := renderer.GlobalConfig.Get("modules.beneficiaries.profile_optional_fields")
+
 	state := NewState(r, renderer.ThemeConfig, beneficiariesMenu)
-	state.ViewState = beneficiary
+	state.ViewState = map[string]any{
+		"beneficiary":             beneficiary,
+		"profile_optional_fields": profileFields,
+	}
 
 	renderer.Render("beneficiaries_update", w, r, files, state)
 }

renderer/journeys.go

@@ -36,9 +36,10 @@ 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) {
+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) {
 	files := renderer.ThemeConfig.GetStringSlice("views.journeys.search.files")
 	state := NewState(r, renderer.ThemeConfig, journeysMenu)
+	journeyTabs := renderer.ThemeConfig.Get("journey_tabs")
 	state.ViewState = map[string]any{
 		"searched":           searched,
 		"departuredate":      departuredate,
@@ -54,6 +55,8 @@ func (renderer *Renderer) JourneysSearch(w http.ResponseWriter, r *http.Request,
 		"querystring":        r.URL.RawQuery,
 		"beneficiaries":      beneficiaries,
 		"kb_data":            kbData,
+		"passengerid":        passengerid,
+		"journey_tabs":       journeyTabs,
 	}
 
 	renderer.Render("journeys", w, r, files, state)

renderer/members.go

@@ -12,19 +12,26 @@ const membersMenu = "members"
 
 func (renderer *Renderer) MemberDisplay(w http.ResponseWriter, r *http.Request, admins any, groups []string) {
 	files := renderer.ThemeConfig.GetStringSlice("views.members.display.files")
+	profileFields := renderer.GlobalConfig.Get("modules.members.profile_optional_fields")
 
 	state := NewState(r, renderer.ThemeConfig, membersMenu)
 	state.ViewState = map[string]any{
-		"admins": admins,
-		"groups": groups,
+		"admins":                  admins,
+		"groups":                  groups,
+		"profile_optional_fields": profileFields,
 	}
 	renderer.Render("members_list", w, r, files, state)
 }
 
 func (renderer *Renderer) MemberUpdate(w http.ResponseWriter, r *http.Request, user any) {
 	files := renderer.ThemeConfig.GetStringSlice("views.members.update.files")
+	profileFields := renderer.GlobalConfig.Get("modules.members.profile_optional_fields")
+
 	state := NewState(r, renderer.ThemeConfig, membersMenu)
-	state.ViewState = user
+	state.ViewState = map[string]any{
+		"user":                    user,
+		"profile_optional_fields": profileFields,
+	}
 	renderer.Render("members_update", w, r, files, state)
 }
 
@@ -53,7 +60,6 @@ func (renderer *Renderer) MembersList(w http.ResponseWriter, r *http.Request, ac
 	state := NewState(r, renderer.ThemeConfig, membersMenu)
 
 	state.ViewState = map[string]any{
-
 		"list": MembersListState{
 			Count:   len(accounts),
 			CacheId: cacheid,

renderer/organized-carpool.go

@@ -29,6 +29,16 @@ func (renderer *Renderer) OrganizedCarpoolCreateDriver(w http.ResponseWriter, r
 	renderer.Render("organized carpool driver creation", w, r, files, state)
 }
 
+func (renderer *Renderer) OrganizedCarpoolUpdateDriver(w http.ResponseWriter, r *http.Request, driver any) {
+	files := renderer.ThemeConfig.GetStringSlice("views.organized_carpool.driver_update.files")
+	state := NewState(r, renderer.ThemeConfig, organizedCarpoolMenu)
+	state.ViewState = map[string]any{
+		"driver": driver,
+	}
+
+	renderer.Render("organized carpool driver update", w, r, files, state)
+}
+
 func (renderer *Renderer) OrganizedCarpoolDriverDisplay(w http.ResponseWriter, r *http.Request, driver mobilityaccountsstorage.Account, trips any, documents any) {
 	files := renderer.ThemeConfig.GetStringSlice("views.organized_carpool.driver_display.files")
 	state := NewState(r, renderer.ThemeConfig, organizedCarpoolMenu)

renderer/solidarity-transport.go

@@ -8,7 +8,7 @@ import (
 
 const solidarityTransportMenu = "solidarity_transport"
 
-func (renderer *Renderer) SolidarityTransportOverview(w http.ResponseWriter, r *http.Request, drivers any, driversMap any, passengersMap any, bookings any, bookingsHistory any) {
+func (renderer *Renderer) SolidarityTransportOverview(w http.ResponseWriter, r *http.Request, drivers any, driversMap any, passengersMap any, bookings any, bookingsHistory any, filters any, hist_filters any, tab string) {
 	files := renderer.ThemeConfig.GetStringSlice("views.solidarity_transport.overview.files")
 	state := NewState(r, renderer.ThemeConfig, solidarityTransportMenu)
 	state.ViewState = map[string]any{
@@ -17,6 +17,9 @@ func (renderer *Renderer) SolidarityTransportOverview(w http.ResponseWriter, r *
 		"passengers_map":   passengersMap,
 		"bookings":         bookings,
 		"bookings_history": bookingsHistory,
+		"filters":          filters,
+		"hist_filters":     hist_filters,
+		"tab":              tab,
 	}
 
 	renderer.Render("solidarity transport overview", w, r, files, state)