coopgo-apps/parcoursmob
6
0
Fork 0
Code Issues Pull Requests Actions Projects Releases Wiki Activity

evol: mise à jour renderers bénéficiaires et covoiturage

Browse Source
This commit is contained in:
Arnaud Delcasse
2026-02-25 17:51:53 +01:00
parent 549ea35a8c
commit 8d89306a90
3 changed files with 20 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
renderer/beneficiaries.go
View File

@@ -97,7 +97,7 @@ func (renderer *Renderer) BeneficiaryDisplay(w http.ResponseWriter, r *http.Requ
renderer.Render("beneficiaries_display", w, r, files, state) renderer.Render("beneficiaries_display", w, r, files, state)
} }
func (renderer *Renderer) BeneficiaryUpdate(w http.ResponseWriter, r *http.Request, beneficiary any) { func (renderer *Renderer) BeneficiaryUpdate(w http.ResponseWriter, r *http.Request, beneficiary mobilityaccountsstorage.Account) {
files := renderer.ThemeConfig.GetStringSlice("views.beneficiaries.update.files") files := renderer.ThemeConfig.GetStringSlice("views.beneficiaries.update.files")
profileFields := renderer.GlobalConfig.Get("modules.beneficiaries.profile_optional_fields") profileFields := renderer.GlobalConfig.Get("modules.beneficiaries.profile_optional_fields")
@@ -106,6 +106,7 @@ func (renderer *Renderer) BeneficiaryUpdate(w http.ResponseWriter, r *http.Reque
"beneficiary": beneficiary, "beneficiary": beneficiary,
"profile_optional_fields": profileFields, "profile_optional_fields": profileFields,
} }
state.DynamicData = beneficiary.Data
renderer.Render("beneficiaries_update", w, r, files, state) renderer.Render("beneficiaries_update", w, r, files, state)
} }

22
renderer/organized-carpool.go
View File

@@ -56,22 +56,24 @@ func (renderer *Renderer) OrganizedCarpoolUpdateDriver(w http.ResponseWriter, r
func (renderer *Renderer) OrganizedCarpoolDriverDisplay(w http.ResponseWriter, r *http.Request, driver mobilityaccountsstorage.Account, trips any, documents any, bookings any, beneficiariesMap any, stats map[string]any, walletBalance float64, tab string) { func (renderer *Renderer) OrganizedCarpoolDriverDisplay(w http.ResponseWriter, r *http.Request, driver mobilityaccountsstorage.Account, trips any, documents any, bookings any, beneficiariesMap any, stats map[string]any, walletBalance float64, tab string) {
files := renderer.ThemeConfig.GetStringSlice("views.organized_carpool.driver_display.files") files := renderer.ThemeConfig.GetStringSlice("views.organized_carpool.driver_display.files")
profileFields := renderer.GlobalConfig.Get("modules.organized_carpool.drivers.profile_optional_fields")
state := NewState(r, renderer.ThemeConfig, organizedCarpoolMenu) state := NewState(r, renderer.ThemeConfig, organizedCarpoolMenu)
drivers_file_types := renderer.GlobalConfig.GetStringSlice("modules.organized_carpool.drivers.documents_types") drivers_file_types := renderer.GlobalConfig.GetStringSlice("modules.organized_carpool.drivers.documents_types")
file_types_map := renderer.GlobalConfig.GetStringMapString("storage.files.file_types") file_types_map := renderer.GlobalConfig.GetStringMapString("storage.files.file_types")
state.ViewState = map[string]any{ state.ViewState = map[string]any{
"driver": driver, "driver": driver,
"trips": trips, "trips": trips,
"documents": documents, "documents": documents,
"bookings": bookings, "bookings": bookings,
"beneficiaries_map": beneficiariesMap, "beneficiaries_map": beneficiariesMap,
"stats": stats, "stats": stats,
"drivers_file_types": drivers_file_types, "drivers_file_types": drivers_file_types,
"file_types_map": file_types_map, "file_types_map": file_types_map,
"wallet_balance": walletBalance, "profile_optional_fields": profileFields,
"tab": tab, "wallet_balance": walletBalance,
"tab": tab,
} }
renderer.Render("organized carpool driver display", w, r, files, state) renderer.Render("organized carpool driver display", w, r, files, state)

11
renderer/renderer.go
View File

@@ -105,11 +105,12 @@ func (r *Renderer) templateFile(file string) string {
type RenderState struct { type RenderState struct {
icons.IconSet icons.IconSet
LayoutState LayoutState
UserID string UserID string
UserClaims map[string]any UserClaims map[string]any
Group storage.Group Group storage.Group
Roles any Roles any
ViewState any // This is a state specific to a given view ViewState any // This is a state specific to a given view
DynamicData any // Data to be serialized as JSON in a <script> tag for safe JS consumption
} }
func NewState(r *http.Request, themeConfig *viper.Viper, menuState string) RenderState { func NewState(r *http.Request, themeConfig *viper.Viper, menuState string) RenderState {