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

Merge

Browse Source
This commit is contained in:
Arnaud Delcasse
2023-03-10 13:18:31 +01:00
parent 59c6ce9da6 850633eac7
commit 5476ea1c99
14 changed files with 873 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

62
renderer/administration.go
View File

@@ -1,14 +1,18 @@
package renderer
import (
"encoding/json"
"html/template"
"net/http"
agendastorage "git.coopgo.io/coopgo-platform/agenda/storage"
fleetsstorage "git.coopgo.io/coopgo-platform/fleets/storage"
mobilityaccountsstorage "git.coopgo.io/coopgo-platform/mobility-accounts/storage"
)
const administrationMenu = "administration"
func (renderer *Renderer) Administration(w http.ResponseWriter, r *http.Request, accounts any, beneficiaries any, groups any, bookings any) {
func (renderer *Renderer) Administration(w http.ResponseWriter, r *http.Request, accounts any, beneficiaries any, groups any, bookings any, events []agendastorage.Event) {
files := renderer.ThemeConfig.GetStringSlice("views.administration.home.files")
state := NewState(r, renderer.ThemeConfig, administrationMenu)
state.ViewState = map[string]any{
@@ -16,6 +20,7 @@ func (renderer *Renderer) Administration(w http.ResponseWriter, r *http.Request,
"beneficiaries": beneficiaries,
"bookings": bookings,
"groups": groups,
"events": events,
}
renderer.Render("administration", w, r, files, state)
@@ -39,3 +44,58 @@ func (renderer *Renderer) AdministrationGroupDisplay(w http.ResponseWriter, r *h
renderer.Render("administration", w, r, files, state)
}
type BeneficiariesState struct {
Count int `json:"count"`
CacheId string `json:"cache_id"`
Beneficiaries []mobilityaccountsstorage.Account `json:"beneficiaries"`
}
func (s BeneficiariesState) JSON() template.JS {
result, _ := json.Marshal(s)
return template.JS(result)
}
func (s BeneficiariesState) JSONWithLimits(a int, b int) template.JS {
if b < len(s.Beneficiaries) {
s.Beneficiaries = s.Beneficiaries[a:b]
}
return s.JSON()
}
func (renderer *Renderer) AdminStatBeneficaires(w http.ResponseWriter, r *http.Request, Beneficiaries []mobilityaccountsstorage.Account, cacheid string) {
files := renderer.ThemeConfig.GetStringSlice("views.administration.beneficaires_list.files")
state := NewState(r, renderer.ThemeConfig, administrationMenu)
state.ViewState = BeneficiariesState{
Count: len(Beneficiaries),
CacheId: cacheid,
Beneficiaries: Beneficiaries,
}
renderer.Render("beneficiaries_State", w, r, files, state)
}
func (renderer *Renderer) AdminStatEvents(w http.ResponseWriter, r *http.Request, events []agendastorage.Event, groups map[string]any) {
files := renderer.ThemeConfig.GetStringSlice("views.administration.events_list.files")
state := NewState(r, renderer.ThemeConfig, administrationMenu)
state.ViewState = map[string]any{
"events": events,
"groups": groups,
}
renderer.Render("beneficiaries_State", w, r, files, state)
}
func (renderer *Renderer) AdminStatVehicles(w http.ResponseWriter, r *http.Request, vehicles []fleetsstorage.Vehicle, bookings []fleetsstorage.Booking, admingroups map[string]any) {
files := renderer.ThemeConfig.GetStringSlice("views.administration.vehicles_list.files")
state := NewState(r, renderer.ThemeConfig, administrationMenu)
state.ViewState = map[string]any{
"vehicles": vehicles,
"bookings": bookings,
"admingroups": admingroups,
}
renderer.Render("vehicles_state", w, r, files, state)
}

62
renderer/agenda.go
View File

@@ -19,6 +19,17 @@ func (renderer *Renderer) AgendaHome(w http.ResponseWriter, r *http.Request, eve
renderer.Render("agenda home", w, r, files, state)
}
func (renderer *Renderer) AgendaHistory(w http.ResponseWriter, r *http.Request, events []agendastorage.Event, groups map[string]any) {
files := renderer.ThemeConfig.GetStringSlice("views.agenda.history.files")
state := NewState(r, renderer.ThemeConfig, agendaMenu)
state.ViewState = map[string]any{
"events": events,
"groups": groups,
}
renderer.Render("agenda history", w, r, files, state)
}
func (renderer *Renderer) AgendaCreateEvent(w http.ResponseWriter, r *http.Request) {
files := renderer.ThemeConfig.GetStringSlice("views.agenda.create_event.files")
state := NewState(r, renderer.ThemeConfig, agendaMenu)
@@ -29,6 +40,7 @@ func (renderer *Renderer) AgendaCreateEvent(w http.ResponseWriter, r *http.Reque
func (renderer *Renderer) AgendaDisplayEvent(w http.ResponseWriter, r *http.Request, event any, group any, subscribers map[string]any, beneficiaries any) {
files := renderer.ThemeConfig.GetStringSlice("views.agenda.display_event.files")
state := NewState(r, renderer.ThemeConfig, agendaMenu)
state.ViewState = map[string]any{
"event": event,
"group": group,
@@ -38,3 +50,53 @@ func (renderer *Renderer) AgendaDisplayEvent(w http.ResponseWriter, r *http.Requ
renderer.Render("agenda create event", w, r, files, state)
}
//////////////////////////DElete subscriber//////////////////////////////////
func (renderer *Renderer) AgendaDeleteSubscribeEvent(w http.ResponseWriter, r *http.Request, eventid string) {
files := renderer.ThemeConfig.GetStringSlice("views.agenda.delete_subscriber.files")
state := NewState(r, renderer.ThemeConfig, agendaMenu)
state.ViewState = map[string]any{
"eventid": eventid,
}
renderer.Render("agenda delete subscriber", w, r, files, state)
}
//////////////////////////////////////////////////////////
//////////////////////////History Event//////////////////////////////////
func (renderer *Renderer) AgendaHistoryEvent(w http.ResponseWriter, r *http.Request, event any, group any, subscribers map[string]any, beneficiaries any) {
files := renderer.ThemeConfig.GetStringSlice("views.agenda.history_event.files")
state := NewState(r, renderer.ThemeConfig, agendaMenu)
state.ViewState = map[string]any{
"event": event,
"group": group,
"subscribers": subscribers,
"beneficiaries": beneficiaries,
}
renderer.Render("agenda history event", w, r, files, state)
}
////////////////////////////////////////////////////////////////////////
func (renderer *Renderer) AgendaUpdateEvent(w http.ResponseWriter, r *http.Request, event any) {
files := renderer.ThemeConfig.GetStringSlice("views.agenda.update.files")
state := NewState(r, renderer.ThemeConfig, agendaMenu)
state.ViewState = map[string]any{
"event": event,
}
renderer.Render("event_update", w, r, files, state)
}
func (renderer *Renderer) AgendaDeleteEvent(w http.ResponseWriter, r *http.Request, event any) {
files := renderer.ThemeConfig.GetStringSlice("views.agenda.delete.files")
state := NewState(r, renderer.ThemeConfig, agendaMenu)
state.ViewState = map[string]any{
"event": event,
}
renderer.Render("event_deleteEvent", w, r, files, state)
}

45
renderer/members.go
View File

@@ -1,17 +1,22 @@
package renderer
import (
"encoding/json"
"html/template"
"net/http"
mobilityaccountsstorage "git.coopgo.io/coopgo-platform/mobility-accounts/storage"
)
const membersMenu = "members"
func (renderer *Renderer) MemberDisplay(w http.ResponseWriter, r *http.Request, admins any) {
func (renderer *Renderer) MemberDisplay(w http.ResponseWriter, r *http.Request, admins any, groups []string) {
files := renderer.ThemeConfig.GetStringSlice("views.members.display.files")
state := NewState(r, renderer.ThemeConfig, membersMenu)
state.ViewState = map[string]any{
"admins": admins,
"groups": groups,
}
renderer.Render("members_list", w, r, files, state)
}
@@ -22,3 +27,41 @@ func (renderer *Renderer) MemberUpdate(w http.ResponseWriter, r *http.Request, u
state.ViewState = user
renderer.Render("members_update", w, r, files, state)
}
type MembersListState struct {
Count int `json:"count"`
CacheId string `json:"cache_id"`
Members []mobilityaccountsstorage.Account `json:"members"`
Groups []string `json:"groups"`
}
func (s MembersListState) JSON() template.JS {
result, _ := json.Marshal(s)
return template.JS(result)
}
func (s MembersListState) JSONWithLimits(a int, b int) template.JS {
if b < len(s.Members) {
s.Members = s.Members[a:b]
}
return s.JSON()
}
func (renderer *Renderer) MembersList(w http.ResponseWriter, r *http.Request, accounts []mobilityaccountsstorage.Account, cacheid string, groups []string) {
files := renderer.ThemeConfig.GetStringSlice("views.members.list.files")
state := NewState(r, renderer.ThemeConfig, membersMenu)
state.ViewState = map[string]any{
"list": MembersListState{
Count: len(accounts),
CacheId: cacheid,
Members: accounts,
Groups: groups,
},
"groups": groups,
}
renderer.Render("members_list", w, r, files, state)
}

12
renderer/vehicles.go
View File

@@ -78,3 +78,15 @@ func (renderer *Renderer) VehicleBookingsList(w http.ResponseWriter, r *http.Req
renderer.Render("vehicles search", w, r, files, state)
}
// func (renderer *Renderer) VehicleUnbookingsList(w http.ResponseWriter, r *http.Request, bookings []storage.Booking, vehiclesMap any, groupsMap any) {
// files := renderer.ThemeConfig.GetStringSlice("views.vehicles.bookings_list.files")
// state := NewState(r, renderer.ThemeConfig, vehiclesMenu)
// state.ViewState = map[string]any{
// "bookings": bookings,
// "vehicles_map": vehiclesMap,
// "groups_map": groupsMap,
// }
// renderer.Render("vehicles search", w, r, files, state)
// }