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

add more information about beneficaire in groupCovoiturage

Browse Source
This commit is contained in:
soukainna
2023-01-04 11:55:18 +01:00
parent 4c42d3efd3
commit a2b644d548
2 changed files with 57 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
renderer/journeys.go
View File

@@ -18,7 +18,6 @@ type BeneficiariesCovoiturage struct {
Beneficiaries []any `json:"beneficiaries"`
}
type BeneficiariesCovoiturageA struct {
//Group string `json:"group"`
Count int `json:"count"`
CacheId string `json:"cache_id"`
Beneficiaries []any `json:"beneficiaries"`
@@ -73,11 +72,7 @@ func (s BeneficiariesListstate) JSONWithLimits(a int, b int) template.JS {
func (renderer *Renderer) GroupsGestion(w http.ResponseWriter, r *http.Request, groups []groupstorage.Group, cacheid string) {
files := renderer.ThemeConfig.GetStringSlice("views.journeys.list.files")
state := NewState(r, renderer.ThemeConfig, journeysMenu)
// state.ViewState = map[string]any{
// "groups": groups,
// }
//state := NewState(r, renderer.ThemeConfig, beneficiariesMenu)
state.ViewState = BeneficiariesListstate{
Count: len(groups),
CacheId: cacheid,
@@ -90,14 +85,6 @@ func (renderer *Renderer) GroupsGestion(w http.ResponseWriter, r *http.Request,
func (renderer *Renderer) CreateGroup(w http.ResponseWriter, r *http.Request, depart any, arrive any, searched bool, beneficiary any, beneficiaries []mobilityaccountsstorage.Account, departure any, destination any) {
files := renderer.ThemeConfig.GetStringSlice("views.journeys.create.files")
state := NewState(r, renderer.ThemeConfig, journeysMenu)
// state.ViewState = map[string]any{
// "departure": depart,
// "destination": arrive,
// //"beneficiary": beneficiary,
// //"accounts": accounts,
// // "cacheid": cacheid,
// // "searched": searched,
// }
viewstate := map[string]any{
"deeparture": depart,
"deestination": arrive,
@@ -105,8 +92,6 @@ func (renderer *Renderer) CreateGroup(w http.ResponseWriter, r *http.Request, de
"searched": searched,
"departure": departure,
"destination": destination,
// "departuredate": departuredate,
// "departuretime": departuretime,
}
if searched {
@@ -120,7 +105,7 @@ func (renderer *Renderer) CreateGroup(w http.ResponseWriter, r *http.Request, de
renderer.Render("journeys", w, r, files, state)
}
func (renderer *Renderer) DisplayGroupCovoiturage(w http.ResponseWriter, r *http.Request, groupid string, accounts []any, cacheid string, searched bool, beneficiary any, group any, beneficiaries []mobilityaccountsstorage.Account) {
func (renderer *Renderer) DisplayGroupCovoiturage(w http.ResponseWriter, r *http.Request, groupid string, depart any, arrive any, accounts []any, cacheid string, searched bool, beneficiary any, group any, beneficiaries []mobilityaccountsstorage.Account) {
files := renderer.ThemeConfig.GetStringSlice("views.journeys.display.files")
state := NewState(r, renderer.ThemeConfig, journeysMenu)
@@ -128,6 +113,8 @@ func (renderer *Renderer) DisplayGroupCovoiturage(w http.ResponseWriter, r *http
"beneficiaries": beneficiaries,
"searched": searched,
"group": group,
"deeparture": depart,
"deestination": arrive,
"list": BeneficiariesCovoiturage{
Group: groupid,
Count: len(accounts),