diff --git a/handlers/application/group_module.go b/handlers/application/group_module.go index 61b8665..b8832f5 100644 --- a/handlers/application/group_module.go +++ b/handlers/application/group_module.go @@ -208,12 +208,12 @@ func (h *ApplicationHandler) DisplayGroupModule(w http.ResponseWriter, r *http.R return } - accountsB, err := h.beneficiaries(r) + accountsBeneficaire, err := h.beneficiaries(r) if err != nil { fmt.Println(err) w.WriteHeader(http.StatusBadRequest) return } //h.Renderer.BeneficaireSearch(w, r, accounts, searched, beneficiary, resp.Group.ToStorageType()) - h.Renderer.DisplayGroupModule(w, r, resp.Group.ToStorageType().ID, accounts, cacheid, searched, beneficiary, resp.Group.ToStorageType(), accountsB) + h.Renderer.DisplayGroupModule(w, r, resp.Group.ToStorageType().ID, accounts, cacheid, searched, beneficiary, resp.Group.ToStorageType(), accountsBeneficaire) } diff --git a/renderer/group_module.go b/renderer/group_module.go index 40dff27..24e7ec1 100644 --- a/renderer/group_module.go +++ b/renderer/group_module.go @@ -5,6 +5,8 @@ import ( "fmt" "html/template" "net/http" + + mobilityaccountsstorage "git.coopgo.io/coopgo-platform/mobility-accounts/storage" ) const groupMenu = "group_module" @@ -47,7 +49,7 @@ func (renderer *Renderer) CreateGroupModule(w http.ResponseWriter, r *http.Reque renderer.Render("group_module", w, r, files, state) } -func (renderer *Renderer) DisplayGroupModule(w http.ResponseWriter, r *http.Request, groupid string, accounts []any, cacheid string, searched bool, beneficiary any, group any, beneficiaries []any) { +func (renderer *Renderer) DisplayGroupModule(w http.ResponseWriter, r *http.Request, groupid string, accounts []any, cacheid string, searched bool, beneficiary any, group any, beneficiaries []mobilityaccountsstorage.Account) { files := renderer.ThemeConfig.GetStringSlice("views.group_module.display_group.files") state := NewState(r, renderer.ThemeConfig, groupMenu) diff --git a/themes/default/config.yaml b/themes/default/config.yaml deleted file mode 100644 index dc61b64..0000000 --- a/themes/default/config.yaml +++ /dev/null @@ -1,191 +0,0 @@ -name: PARCOURSMOB - -views: - generic: - files: - - web/layouts/layout.html - - web/layouts/_partials/mainmenu.html - dashboard: - files: - - web/layouts/dashboard/_partials/agenda-widget.html - - web/layouts/dashboard/_partials/beneficiaries-widget.html - - web/layouts/dashboard/dashboard.html - beneficiaries: - list: - files: - - web/layouts/beneficiaries/list.html - create: - files: - - web/layouts/_partials/address_autocomplete.html - - web/layouts/beneficiaries/create.html - display: - files: - - web/layouts/_partials/address_autocomplete.html - - web/layouts/vehicles_management/_partials/vehicle-type-select.html - - web/layouts/beneficiaries/_partials/beneficiary-vehicles.html - - web/layouts/beneficiaries/_partials/beneficiary-notes.html - - web/layouts/beneficiaries/_partials/beneficiary-journeys.html - - web/layouts/beneficiaries/_partials/beneficiary-events.html - - web/layouts/beneficiaries/_partials/beneficiary-files.html - - web/layouts/beneficiaries/display.html - update: - files: - - web/layouts/_partials/address_autocomplete.html - - web/layouts/beneficiaries/update.html - - vehicles: - search: - files: - - web/layouts/_partials/address_autocomplete.html - - web/layouts/vehicles_management/_partials/vehicle-type-select.html - - web/layouts/vehicles/search.html - booking_display: - files: - - web/layouts/vehicles/booking-display.html - bookings_list: - files: - - web/layouts/vehicles_management/_partials/bookings-list.html - - web/layouts/vehicles/bookings-list.html - vehicles_management: - overview: - files: - - web/layouts/vehicles_management/_partials/bookings-list.html - - web/layouts/vehicles_management/_partials/vehicles-list.html - - web/layouts/vehicles_management/overview.html - fleet_add: - files: - - web/layouts/_partials/address_autocomplete.html - - web/layouts/vehicles_management/_partials/vehicle-type-select.html - - web/layouts/vehicles_management/fleet-add.html - fleet_display: - files: - - web/layouts/vehicles_management/_partials/calendar.html - - web/layouts/vehicles_management/fleet-display.html - fleet_update: - files: - - web/layouts/_partials/address_autocomplete.html - - web/layouts/vehicles_management/_partials/vehicle-type-select.html - - web/layouts/vehicles_management/fleet-update.html - booking_display: - files: - - web/layouts/vehicles_management/booking-display.html - agenda: - list: - files: - - web/layouts/agenda/home.html - display_event: - files: - - web/layouts/agenda/display-event.html - create_event: - files: - - web/layouts/_partials/address_autocomplete.html - - web/layouts/agenda/create-event.html - directory: - home: - files: - - web/layouts/directory/home.html - journeys: - search: - files: - - web/layouts/_partials/address_autocomplete.html - - web/layouts/journeys/_partials/journeys-all.html - - web/layouts/journeys/_partials/journeys-others.html - - web/layouts/journeys/_partials/journeys-carpool.html - - web/layouts/journeys/_partials/journeys-public-transit.html - - web/layouts/journeys/search.html - support: - search: - files: - - web/layouts/support/support.html - group_module: - home: - files: - - web/layouts/group_module/home.html - create_group: - files: - - web/layouts/group_module/create_group.html - - display_group: - files: - - web/layouts/group_module/display_group.html - - administration: - home: - files: - - web/layouts/administration/home.html - create_group: - files: - - web/layouts/administration/create_group.html - display_group: - files: - - web/layouts/administration/_partials/groups_admins.html - - web/layouts/administration/_partials/group_members.html - - web/layouts/administration/display_group.html - group: - settings: - files: - - web/layouts/administration/_partials/groups_admins.html - - web/layouts/administration/_partials/group_members.html - - web/layouts/group/settings.html - auth: - groups: - files: - - web/layouts/auth/groups.html - onboarding: - files: - - web/layouts/auth/onboarding.html - -icons: - svg: - coopgo:parcoursmob/monogram: - hero:outline/briefcase: - hero:outline/support: - hero:outline/group_module: - hero:outline/calendar: - hero:outline/chevron-right: - hero:outline/cog: - hero:outline/document-text: - hero:outline/home: - hero:outline/map: - hero:outline/office-building: - hero:outline/plus-circle: - hero:outline/shield-check: - hero:outline/user-group: - hero:outline/x: - hero:solid/chevron-right: - hero:solid/question-mark-icon: - hero:solid/search: - hero:solid/selector: - img:profile-picture-placeholder: - tabler-icons:car: - tabler-icons:walk: - tabler-icons:bus: - -emails: - onboarding: - new_administrator: - subject: PARCOURSMOB - Vous avez été invité comme administrateur - files: - - emails/layout.html - - emails/onboarding/new-administrator.html - existing_administrator: - subject: PARCOURSMOB - Vous avez été invité comme administrateur - files: - - emails/layout.html - - emails/onboarding/existing-administrator.html - new_member: - subject: PARCOURSMOB - Vous avez été invité à rejoindre une organisation - files: - - emails/layout.html - - emails/onboarding/new-member.html - existing_member: - subject: PARCOURSMOB - Vous avez été invité à rejoindre une organisation - files: - - emails/layout.html - - emails/onboarding/existing-member.html - support_email: - subject: PARCOURMOB - Vous avez reçu un commentaire - files: - - emails/layout.html - - emails/onboarding/support_emailing.html - \ No newline at end of file diff --git a/themes/default/web/layouts/group_module/create_group.html b/themes/default/web/layouts/group_module/create_group.html deleted file mode 100644 index 4936a2a..0000000 --- a/themes/default/web/layouts/group_module/create_group.html +++ /dev/null @@ -1,86 +0,0 @@ -{{define "content"}} - - -
-

Groups > Créer un group

-
- -
-
-
-
-
-

Nouveau groupe

-

Informations de base sur le groupe à créer

-
-
-
-
- - -
-
- - -
-
-
- -
- -
-
- - - - -
-
- -
-{{end}} \ No newline at end of file diff --git a/themes/default/web/layouts/group_module/display_group.html b/themes/default/web/layouts/group_module/display_group.html deleted file mode 100644 index 462f844..0000000 --- a/themes/default/web/layouts/group_module/display_group.html +++ /dev/null @@ -1,254 +0,0 @@ -{{define "content"}} -
-

Gestion du groupe

- -
-
-

-
-
- -
-
-
-

Info du groupe

-
-
-
-
-
-
Nom
-
- {{.ViewState.group.Data.name}}
-
-
-
Type
-
- {{.ViewState.group.Data.type}}
-
-
-
-
-
-
-
- - - - - -
-
-
-
-
- - - - - - - - - - - - - -
- Nom du bénéficiaire - - Téléphone - - Email -
-
- - -
-
-
-
-
-
- -
-
-
-
-

Ajouter un bénéficiaire

-
-
-
- - -
- - - - -
    - - - - -
-
-
- - - -
-
-
- -
-
-
- -{{end}} \ No newline at end of file diff --git a/themes/default/web/layouts/group_module/home.html b/themes/default/web/layouts/group_module/home.html deleted file mode 100644 index 6d29350..0000000 --- a/themes/default/web/layouts/group_module/home.html +++ /dev/null @@ -1,60 +0,0 @@ - - {{define "content"}} -
-

Gestion des groupes

- -
-
-

-
- -
- -
- -
-
-{{end}} \ No newline at end of file