edit dockerfile

Dockerfile

@@ -19,8 +19,8 @@ COPY . .
 
 RUN go mod download && CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -o /server
 
-RUN rm -r themes/*
-RUN git clone --depth 1 https://git.coopgo.io/coopgo-apps/parcoursmob-default-theme themes/default
+# RUN rm -r themes/*
+RUN git clone -b dev --depth 1 https://git.coopgo.io/coopgo-apps/parcoursmob-default-theme themes/default
 RUN git clone -b spie06 --depth 1 https://git.coopgo.io/coopgo-apps/parcoursmob-default-theme themes/spie06
 
 FROM scratch

README.md

@@ -10,3 +10,5 @@ This new version of PARCOURSMOB brings :
 - A configurable and themeable approach of rendering web pages : the default theme is located in the folder [themes/default/](themes/default/)
 - A modular architecture based on groups and access rights, using [COOPGO Groups Management](https://git.coopgo.io/coopgo-groups-management)
 - A distributed cache system through [etcd](https://etcd.io/) to handle distributed state management like pagination in a cloud native way
+
+

go.mod

@@ -23,25 +23,30 @@ require (
 	github.com/spf13/viper v1.13.0
 	gitlab.scity.coop/maas/navitia-golang v0.0.0-20220429110621-5c22d6efdd0c
 	go.etcd.io/etcd/client/v3 v3.5.4
-	golang.org/x/image v0.0.0-20220722155232-062f8c9fd539
+	golang.org/x/image v0.5.0
 	golang.org/x/oauth2 v0.0.0-20220411215720-9780585627b5
 	google.golang.org/grpc v1.48.0
 	google.golang.org/protobuf v1.28.1
 )
 
 require (
-	git.coopgo.io/coopgo-platform/agenda v0.0.0-20221017030035-4a26fc791c5b
+	git.coopgo.io/coopgo-platform/agenda v0.0.0-20230222135722-e55cf41e203b
 	git.coopgo.io/coopgo-platform/emailing v0.0.0-20221017030337-c71888d90c15
-	git.coopgo.io/coopgo-platform/fleets v0.0.0-20221101232521-da16c90fc3ba
-	git.coopgo.io/coopgo-platform/groups-management v0.0.0-20221017025751-671dc9a2c544
-	git.coopgo.io/coopgo-platform/mobility-accounts v0.0.0-20220906130339-b9a32e41bffe
+	git.coopgo.io/coopgo-platform/fleets v0.0.0-20230519092636-41bf03682ca9
+	git.coopgo.io/coopgo-platform/groups-management v0.0.0-20230117140716-312200e21063
+	git.coopgo.io/coopgo-platform/mobility-accounts v0.0.0-20221107003506-e2ff98094b81
 	github.com/gorilla/securecookie v1.1.1
 	github.com/minio/minio-go/v7 v7.0.43
+	github.com/ory/viper v1.7.5
+	github.com/xuri/excelize/v2 v2.7.1
 )
 
 require (
+	github.com/asaskevich/govalidator v0.0.0-20200428143746-21a406dcc535 // indirect
+	github.com/cespare/xxhash v1.1.0 // indirect
 	github.com/coreos/go-semver v0.3.0 // indirect
 	github.com/coreos/go-systemd/v22 v22.3.2 // indirect
+	github.com/dgraph-io/ristretto v0.0.3 // indirect
 	github.com/dustin/go-humanize v1.0.0 // indirect
 	github.com/fsnotify/fsnotify v1.5.4 // indirect
 	github.com/go-playground/locales v0.14.0 // indirect
@@ -50,35 +55,51 @@ require (
 	github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0 // indirect
 	github.com/golang/protobuf v1.5.2 // indirect
 	github.com/golang/snappy v0.0.1 // indirect
+	github.com/gorilla/csrf v1.7.1 // indirect
+	github.com/gorilla/websocket v1.4.2 // indirect
 	github.com/hashicorp/hcl v1.0.0 // indirect
+	github.com/inconshreveable/mousetrap v1.0.0 // indirect
 	github.com/json-iterator/go v1.1.12 // indirect
 	github.com/klauspost/compress v1.15.9 // indirect
 	github.com/klauspost/cpuid/v2 v2.1.0 // indirect
 	github.com/leodido/go-urn v1.2.1 // indirect
 	github.com/magiconair/properties v1.8.6 // indirect
+	github.com/mattn/goveralls v0.0.6 // indirect
 	github.com/mb0/wkt v0.0.0-20170420051526-a30afd545ee1 // indirect
 	github.com/minio/md5-simd v1.1.2 // indirect
 	github.com/minio/sha256-simd v1.0.0 // indirect
 	github.com/mitchellh/mapstructure v1.5.0 // indirect
 	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
 	github.com/modern-go/reflect2 v1.0.2 // indirect
+	github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826 // indirect
 	github.com/montanaflynn/stats v0.0.0-20171201202039-1bf9dbcd8cbe // indirect
+	github.com/ory/fosite v0.42.2 // indirect
+	github.com/ory/go-acc v0.2.6 // indirect
+	github.com/ory/go-convenience v0.1.0 // indirect
+	github.com/ory/x v0.0.214 // indirect
+	github.com/pborman/uuid v1.2.0 // indirect
 	github.com/pelletier/go-toml v1.9.5 // indirect
 	github.com/pelletier/go-toml/v2 v2.0.5 // indirect
 	github.com/pkg/errors v0.9.1 // indirect
 	github.com/pquerna/cachecontrol v0.1.0 // indirect
+	github.com/richardlehane/mscfb v1.0.4 // indirect
+	github.com/richardlehane/msoleps v1.0.3 // indirect
 	github.com/rs/xid v1.4.0 // indirect
 	github.com/santhosh-tekuri/jsonschema/v5 v5.0.0 // indirect
 	github.com/sirupsen/logrus v1.9.0 // indirect
 	github.com/spf13/afero v1.8.2 // indirect
 	github.com/spf13/cast v1.5.0 // indirect
+	github.com/spf13/cobra v1.0.0 // indirect
 	github.com/spf13/jwalterweatherman v1.1.0 // indirect
 	github.com/spf13/pflag v1.0.5 // indirect
 	github.com/subosito/gotenv v1.4.1 // indirect
+	github.com/tidwall/pretty v1.1.0 // indirect
 	github.com/twpayne/go-geom v1.3.6 // indirect
 	github.com/xdg-go/pbkdf2 v1.0.0 // indirect
 	github.com/xdg-go/scram v1.1.1 // indirect
 	github.com/xdg-go/stringprep v1.0.3 // indirect
+	github.com/xuri/efp v0.0.0-20220603152613-6918739fd470 // indirect
+	github.com/xuri/nfp v0.0.0-20220409054826-5e722a1d9e22 // indirect
 	github.com/youmark/pkcs8 v0.0.0-20181117223130-1be2e3e5546d // indirect
 	go.etcd.io/etcd/api/v3 v3.5.4 // indirect
 	go.etcd.io/etcd/client/pkg/v3 v3.5.4 // indirect
@@ -86,11 +107,12 @@ require (
 	go.uber.org/atomic v1.7.0 // indirect
 	go.uber.org/multierr v1.6.0 // indirect
 	go.uber.org/zap v1.17.0 // indirect
-	golang.org/x/crypto v0.0.0-20221012134737-56aed061732a // indirect
-	golang.org/x/net v0.0.0-20221014081412-f15817d10f9b // indirect
-	golang.org/x/sync v0.0.0-20210220032951-036812b2e83c // indirect
-	golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10 // indirect
-	golang.org/x/text v0.3.7 // indirect
+	golang.org/x/crypto v0.8.0 // indirect
+	golang.org/x/net v0.9.0 // indirect
+	golang.org/x/sync v0.1.0 // indirect
+	golang.org/x/sys v0.7.0 // indirect
+	golang.org/x/text v0.9.0 // indirect
+	golang.org/x/tools v0.6.0 // indirect
 	google.golang.org/appengine v1.6.7 // indirect
 	google.golang.org/genproto v0.0.0-20220519153652-3a47de7e79bd // indirect
 	gopkg.in/alexcesaro/quotedprintable.v3 v3.0.0-20150716171945-2caba252f4dc // indirect

handlers/application/administration.go

@@ -10,8 +10,14 @@ import (
 	"sort"
 	"time"
 
+	"git.coopgo.io/coopgo-apps/parcoursmob/utils/identification"
 	"git.coopgo.io/coopgo-apps/parcoursmob/utils/sorting"
+	agenda "git.coopgo.io/coopgo-platform/agenda/grpcapi"
+	agendastorage "git.coopgo.io/coopgo-platform/agenda/storage"
+	fleets "git.coopgo.io/coopgo-platform/fleets/grpcapi"
+	fleetsstorage "git.coopgo.io/coopgo-platform/fleets/storage"
 	groupsmanagement "git.coopgo.io/coopgo-platform/groups-management/grpcapi"
+	"git.coopgo.io/coopgo-platform/groups-management/storage"
 	groupstorage "git.coopgo.io/coopgo-platform/groups-management/storage"
 	accounts "git.coopgo.io/coopgo-platform/mobility-accounts/grpcapi"
 	mobilityaccountsstorage "git.coopgo.io/coopgo-platform/mobility-accounts/storage"
@@ -22,6 +28,27 @@ import (
 
 func (h *ApplicationHandler) Administration(w http.ResponseWriter, r *http.Request) {
 
+	accounts, err := h.services.GetAccounts()
+	if err != nil {
+		fmt.Println(err)
+		w.WriteHeader(http.StatusInternalServerError)
+		return
+	}
+
+	beneficiaries, err := h.services.GetBeneficiaries()
+	if err != nil {
+		fmt.Println(err)
+		w.WriteHeader(http.StatusInternalServerError)
+		return
+	}
+
+	bookings, err := h.services.GetBookings()
+	if err != nil {
+		fmt.Println(err)
+		w.WriteHeader(http.StatusInternalServerError)
+		return
+	}
+
 	request := &groupsmanagement.GetGroupsRequest{
 		Namespaces: []string{"parcoursmob_organizations"},
 	}
@@ -41,8 +68,39 @@ func (h *ApplicationHandler) Administration(w http.ResponseWriter, r *http.Reque
 	}
 
 	sort.Sort(sorting.GroupsByName(groups))
+	////////////////////////////////////add event////////////////////////////////////////////
+	rresp, err := h.services.GRPC.Agenda.GetEvents(context.TODO(), &agenda.GetEventsRequest{
+		Namespaces: []string{"parcoursmob_dispositifs"},
+	})
 
-	h.Renderer.Administration(w, r, groups)
+	if err != nil {
+		fmt.Println(err)
+		w.WriteHeader(http.StatusInternalServerError)
+		return
+	}
+
+	responses := []agendastorage.Event{}
+
+	groupids := []string{}
+	for _, e := range rresp.Events {
+		groupids = append(groupids, e.Owners...)
+		responses = append(responses, e.ToStorageType())
+	}
+
+	sort.Sort(sorting.EventsByStartdate(responses))
+
+	groupsresp, err := h.services.GRPC.GroupsManagement.GetGroupsBatch(context.TODO(), &groupsmanagement.GetGroupsBatchRequest{
+		Groupids: groupids,
+	})
+	groupps := map[string]any{}
+
+	if err == nil {
+		for _, g := range groupsresp.Groups {
+			groupps[g.Id] = g.ToStorageType()
+		}
+	}
+
+	h.Renderer.Administration(w, r, accounts, beneficiaries, groups, bookings, responses)
 }
 
 func (h *ApplicationHandler) AdministrationCreateGroup(w http.ResponseWriter, r *http.Request) {
@@ -62,7 +120,11 @@ func (h *ApplicationHandler) AdministrationCreateGroup(w http.ResponseWriter, r
 			"vehicles":            r.FormValue("modules.vehicles") == "on",
 			"vehicles_management": r.FormValue("modules.vehicles_management") == "on",
 			"events":              r.FormValue("modules.events") == "on",
+			"agenda":              r.FormValue("modules.agenda") == "on",
+			"groups":              r.FormValue("modules.groups") == "on",
 			"administration":      r.FormValue("modules.administration") == "on",
+			"support":             r.FormValue("modules.support") == "on",
+			"group_module":        r.FormValue("modules.group_module") == "on",
 		}
 
 		groupid := uuid.NewString()
@@ -130,30 +192,6 @@ func (h *ApplicationHandler) AdministrationGroupDisplay(w http.ResponseWriter, r
 		return
 	}
 
-	// members, err := h.members()
-	// if err != nil {
-	// 	if err != nil {
-	// 		fmt.Println(err)
-	// 		w.WriteHeader(http.StatusInternalServerError)
-	// 		return
-	// 	}
-	// }
-
-	// groupmembers := []any{}
-	// admins := []any{}
-
-	// for _, m := range members {
-	// 	mm := m.ToStorageType()
-	// 	for _, g := range mm.Data["groups"].([]any) {
-	// 		if g.(string) == groupid {
-	// 			groupmembers = append(groupmembers, mm)
-	// 		}
-	// 		if g.(string) == groupid+":admin" {
-	// 			admins = append(admins, mm)
-	// 		}
-	// 	}
-	// }
-
 	groupmembers, admins, err := h.groupmembers(groupid)
 	if err != nil {
 		fmt.Println(err)
@@ -330,6 +368,148 @@ func (h *ApplicationHandler) AdministrationGroupInviteMember(w http.ResponseWrit
 	return
 }
 
+func filteVehicle(r *http.Request, v *fleets.Vehicle) bool {
+	g := r.Context().Value(identification.GroupKey)
+	if g == nil {
+		return false
+	}
+
+	group := g.(storage.Group)
+
+	for _, n := range v.Administrators {
+		if n == group.ID {
+			return true
+		}
+	}
+
+	return false
+}
+
+func (h ApplicationHandler) AdminStatVehicles(w http.ResponseWriter, r *http.Request) {
+
+	bookings := []fleetsstorage.Booking{}
+	administrators := []string{}
+	reequest := &fleets.GetVehiclesRequest{
+		Namespaces: []string{"parcoursmob"},
+	}
+	reesp, err := h.services.GRPC.Fleets.GetVehicles(context.TODO(), reequest)
+	if err != nil {
+		fmt.Println(err)
+		w.WriteHeader(http.StatusInternalServerError)
+	}
+
+	vehicles := []fleetsstorage.Vehicle{}
+	for _, vehiicle := range reesp.Vehicles {
+
+		v := vehiicle.ToStorageType()
+		adminfound := false
+		for _, a := range administrators {
+			if a == v.Administrators[0] {
+				adminfound = true
+				break
+			}
+		}
+		if !adminfound {
+			administrators = append(administrators, v.Administrators[0])
+		}
+
+		vehicleBookings := []fleetsstorage.Booking{}
+		for _, b := range v.Bookings {
+			if b.Unavailableto.After(time.Now()) {
+				vehicleBookings = append(vehicleBookings, b)
+			}
+		}
+
+		v.Bookings = vehicleBookings
+
+		vehicles = append(vehicles, v)
+
+	}
+	groups := map[string]any{}
+
+	if len(administrators) > 0 {
+		admingroups, err := h.services.GRPC.GroupsManagement.GetGroupsBatch(context.TODO(), &groupsmanagement.GetGroupsBatchRequest{
+			Groupids: administrators,
+		})
+		if err != nil {
+			fmt.Println(err)
+			w.WriteHeader(http.StatusInternalServerError)
+			return
+		}
+
+		for _, g := range admingroups.Groups {
+			groups[g.Id] = g.ToStorageType()
+		}
+
+	}
+	sort.Sort(sorting.VehiclesByLicencePlate(vehicles))
+	sort.Sort(sorting.BookingsByStartdate(bookings))
+	h.Renderer.AdminStatVehicles(w, r, vehicles, bookings, groups)
+}
+
+func (h ApplicationHandler) AdminStatBookings(w http.ResponseWriter, r *http.Request) {
+
+	vehicles := map[string]fleetsstorage.Vehicle{}
+	bookings := []fleetsstorage.Booking{}
+
+	reequest := &fleets.GetVehiclesRequest{
+		Namespaces: []string{"parcoursmob"},
+	}
+	reesp, err := h.services.GRPC.Fleets.GetVehicles(context.TODO(), reequest)
+	if err != nil {
+		fmt.Println(err)
+		w.WriteHeader(http.StatusInternalServerError)
+		return
+	}
+
+	beneficiaries_ids := []string{}
+
+	for _, vehicle := range reesp.Vehicles {
+
+		v := vehicle.ToStorageType()
+
+		for _, b := range v.Bookings {
+			bookings = append(bookings, b)
+			beneficiaries_ids = append(beneficiaries_ids, b.Driver)
+		}
+
+		vehicles[v.ID] = v
+
+	}
+
+	groups := map[string]any{}
+
+	admingroups, err := h.services.GRPC.GroupsManagement.GetGroups(context.TODO(), &groupsmanagement.GetGroupsRequest{
+		Namespaces: []string{"parcoursmob_organizations"},
+	})
+	if err != nil {
+		fmt.Println(err)
+		w.WriteHeader(http.StatusInternalServerError)
+		return
+	}
+
+	for _, g := range admingroups.Groups {
+		groups[g.Id] = g.ToStorageType()
+	}
+
+	beneficiaries, err := h.services.GRPC.MobilityAccounts.GetAccountsBatch(context.TODO(), &accounts.GetAccountsBatchRequest{
+		Accountids: beneficiaries_ids,
+	})
+	if err != nil {
+		fmt.Println(err)
+		w.WriteHeader(http.StatusInternalServerError)
+		return
+	}
+
+	beneficiaries_map := map[string]any{}
+	for _, ben := range beneficiaries.Accounts {
+		beneficiaries_map[ben.Id] = ben.ToStorageType()
+	}
+
+	sort.Sort(sorting.BookingsByStartdate(bookings))
+	h.Renderer.AdminStatBookings(w, r, vehicles, bookings, groups, beneficiaries_map)
+}
+
 func (h *ApplicationHandler) members() ([]*accounts.Account, error) {
 	resp, err := h.services.GRPC.MobilityAccounts.GetAccounts(context.TODO(), &accounts.GetAccountsRequest{
 		Namespaces: []string{"parcoursmob"},
@@ -367,3 +547,49 @@ func (h *ApplicationHandler) groupmembers(groupid string) (groupmembers []mobili
 
 	return groupmembers, admins, err
 }
+
+func (h ApplicationHandler) AdminStatBeneficaires(w http.ResponseWriter, r *http.Request) {
+	beneficiaries, err := h.services.GetBeneficiaries()
+	if err != nil {
+		fmt.Println(err)
+		w.WriteHeader(http.StatusInternalServerError)
+		return
+	}
+	cacheid := uuid.NewString()
+	h.cache.PutWithTTL(cacheid, beneficiaries, 1*time.Hour)
+	h.Renderer.AdminStatBeneficaires(w, r, beneficiaries, cacheid)
+}
+
+func (h ApplicationHandler) AdminStatEvents(w http.ResponseWriter, r *http.Request) {
+	resp, err := h.services.GRPC.Agenda.GetEvents(context.TODO(), &agenda.GetEventsRequest{
+		Namespaces: []string{"parcoursmob_dispositifs"},
+	})
+
+	if err != nil {
+		fmt.Println(err)
+		w.WriteHeader(http.StatusInternalServerError)
+		return
+	}
+
+	responses := []agendastorage.Event{}
+
+	groupids := []string{}
+	for _, e := range resp.Events {
+		groupids = append(groupids, e.Owners...)
+		responses = append(responses, e.ToStorageType())
+	}
+
+	sort.Sort(sorting.EventsByStartdate(responses))
+
+	groupsresp, err := h.services.GRPC.GroupsManagement.GetGroupsBatch(context.TODO(), &groupsmanagement.GetGroupsBatchRequest{
+		Groupids: groupids,
+	})
+	groups := map[string]any{}
+
+	if err == nil {
+		for _, g := range groupsresp.Groups {
+			groups[g.Id] = g.ToStorageType()
+		}
+	}
+	h.Renderer.AdminStatEvents(w, r, responses, groups)
+}

handlers/application/agenda.go

@@ -7,6 +7,7 @@ import (
 	"net/http"
 	"sort"
 	"strconv"
+	"strings"
 	"time"
 
 	formvalidators "git.coopgo.io/coopgo-apps/parcoursmob/utils/form-validators"
@@ -67,10 +68,44 @@ func (h *ApplicationHandler) AgendaHome(w http.ResponseWriter, r *http.Request)
 			groups[g.Id] = g.ToStorageType()
 		}
 	}
-
 	h.Renderer.AgendaHome(w, r, responses, groups)
 }
 
+func (h *ApplicationHandler) AgendaHistory(w http.ResponseWriter, r *http.Request) {
+	resp, err := h.services.GRPC.Agenda.GetEvents(context.TODO(), &agenda.GetEventsRequest{
+		Namespaces: []string{"parcoursmob_dispositifs"},
+		//Maxdate:    timestamppb.New(time.Now().Add(24 * time.Hour)),
+	})
+
+	if err != nil {
+		fmt.Println(err)
+		w.WriteHeader(http.StatusInternalServerError)
+		return
+	}
+
+	responses := []agendastorage.Event{}
+
+	groupids := []string{}
+	for _, e := range resp.Events {
+		groupids = append(groupids, e.Owners...)
+		responses = append(responses, e.ToStorageType())
+	}
+
+	sort.Sort(sorting.EventsByStartdate(responses))
+
+	groupsresp, err := h.services.GRPC.GroupsManagement.GetGroupsBatch(context.TODO(), &groupsmanagement.GetGroupsBatchRequest{
+		Groupids: groupids,
+	})
+	groups := map[string]any{}
+
+	if err == nil {
+		for _, g := range groupsresp.Groups {
+			groups[g.Id] = g.ToStorageType()
+		}
+	}
+	h.Renderer.AgendaHistory(w, r, responses, groups)
+}
+
 func (h *ApplicationHandler) AgendaCreateEvent(w http.ResponseWriter, r *http.Request) {
 	if r.Method == "POST" {
 		// Get current group
@@ -107,6 +142,7 @@ func (h *ApplicationHandler) AgendaCreateEvent(w http.ResponseWriter, r *http.Re
 				Allday:         eventForm.Allday,
 				MaxSubscribers: int64(eventForm.MaxSubscribers),
 				Data:           data,
+				Deleted:        false,
 			},
 		}
 
@@ -119,7 +155,7 @@ func (h *ApplicationHandler) AgendaCreateEvent(w http.ResponseWriter, r *http.Re
 		}
 
 		http.Redirect(w, r, fmt.Sprintf("/app/agenda/%s", resp.Event.Id), http.StatusFound)
-
+		return
 	}
 	h.Renderer.AgendaCreateEvent(w, r)
 }
@@ -205,6 +241,18 @@ func (h *ApplicationHandler) AgendaDisplayEvent(w http.ResponseWriter, r *http.R
 }
 
 func (h *ApplicationHandler) AgendaSubscribeEvent(w http.ResponseWriter, r *http.Request) {
+	current_group, err := h.currentGroup(r)
+	if err != nil {
+		fmt.Println(err)
+		w.WriteHeader(http.StatusInternalServerError)
+		return
+	}
+	current_user_token, current_user_claims, err := h.currentUser(r)
+	if err != nil {
+		fmt.Println(err)
+		w.WriteHeader(http.StatusInternalServerError)
+		return
+	}
 	vars := mux.Vars(r)
 	eventid := vars["eventid"]
 
@@ -213,15 +261,34 @@ func (h *ApplicationHandler) AgendaSubscribeEvent(w http.ResponseWriter, r *http
 		w.WriteHeader(http.StatusBadRequest)
 		return
 	}
-
 	subscriber := r.FormValue("subscriber")
+	data := map[string]any{
+		"subscribed_by": map[string]any{
+			"user": map[string]any{
+				"id":           current_user_token.Subject,
+				"display_name": current_user_claims["first_name"].(string) + " " + current_user_claims["last_name"].(string),
+				"email":        current_user_claims["email"].(string),
+			},
+			"group": map[string]any{
+				"id":   current_group.ID,
+				"name": current_group.Data["name"],
+			},
+		},
+	}
+	datapb, err := structpb.NewStruct(data)
+	if err != nil {
+		fmt.Println(err)
+		w.WriteHeader(http.StatusInternalServerError)
+		return
+	}
 
 	request := &agenda.SubscribeEventRequest{
 		Eventid:    eventid,
 		Subscriber: subscriber,
+		Data:       datapb,
 	}
 
-	_, err := h.services.GRPC.Agenda.SubscribeEvent(context.TODO(), request)
+	_, err = h.services.GRPC.Agenda.SubscribeEvent(context.TODO(), request)
 	if err != nil {
 		fmt.Println(err)
 		w.WriteHeader(http.StatusInternalServerError)
@@ -299,11 +366,322 @@ func contains(s []*agenda.Subscription, e string) bool {
 	return false
 }
 
-// func contains[V string](s []V, e V) bool {
-// 	for _, a := range s {
-// 		if a == e {
-// 			return true
-// 		}
-// 	}
-// 	return false
-// }
+///////////////////////////////Update Event/////////////////////////////////////////
+func (h *ApplicationHandler) AgendaUpdateEvent(w http.ResponseWriter, r *http.Request) {
+	adm := strings.Split(r.URL.Path, "/")
+	eventID := adm[3]
+	request := &agenda.GetEventRequest{
+		Id: eventID,
+	}
+
+	resp, err := h.services.GRPC.Agenda.GetEvent(context.TODO(), request)
+	if err != nil {
+		fmt.Println(err)
+		w.WriteHeader(http.StatusInternalServerError)
+		return
+	}
+	if r.Method == "POST" {
+		g := r.Context().Value(identification.GroupKey)
+		if g == nil {
+			w.WriteHeader(http.StatusBadRequest)
+			return
+		}
+
+		group := g.(storage.Group)
+
+		eventForm, err := parseEventsForm(r)
+		if err != nil {
+			fmt.Println(err)
+			w.WriteHeader(http.StatusBadRequest)
+			return
+		}
+
+		data, _ := structpb.NewStruct(map[string]any{
+			"address": eventForm.Address,
+		})
+
+		request := &agenda.UpdateEventRequest{
+			Event: &agenda.Event{
+				Namespace:      "parcoursmob_dispositifs",
+				Id:             eventID,
+				Owners:         []string{group.ID},
+				Type:           eventForm.Type,
+				Name:           eventForm.Name,
+				Description:    eventForm.Description,
+				Startdate:      timestamppb.New(*eventForm.Startdate),
+				Enddate:        timestamppb.New(*eventForm.Enddate),
+				Starttime:      eventForm.Starttime,
+				Endtime:        eventForm.Endtime,
+				Allday:         eventForm.Allday,
+				MaxSubscribers: int64(eventForm.MaxSubscribers),
+				Data:           data,
+				Subscriptions:  resp.Event.Subscriptions,
+			},
+		}
+
+		resp, err := h.services.GRPC.Agenda.UpdateEvent(context.TODO(), request)
+
+		if err != nil {
+			fmt.Println(err)
+			w.WriteHeader(http.StatusInternalServerError)
+			return
+		}
+
+		http.Redirect(w, r, fmt.Sprintf("/app/agenda/%s", resp.Event.Id), http.StatusFound)
+		return
+	}
+	h.Renderer.AgendaUpdateEvent(w, r, resp.Event.ToStorageType())
+}
+
+func (h *ApplicationHandler) AgendaDeleteEvent(w http.ResponseWriter, r *http.Request) {
+
+	vars := mux.Vars(r)
+	eventID := vars["eventid"]
+	request := &agenda.GetEventRequest{
+		Id: eventID,
+	}
+
+	resp, err := h.services.GRPC.Agenda.GetEvent(context.TODO(), request)
+	if err != nil {
+		fmt.Println(err)
+		w.WriteHeader(http.StatusInternalServerError)
+		return
+	}
+
+	if r.Method == "POST" {
+
+		request := &agenda.UpdateEventRequest{
+			Event: &agenda.Event{
+				Namespace:      resp.Event.Namespace,
+				Id:             resp.Event.Id,
+				Owners:         resp.Event.Owners,
+				Type:           resp.Event.Type,
+				Name:           resp.Event.Name,
+				Description:    resp.Event.Description,
+				Startdate:      resp.Event.Startdate,
+				Enddate:        resp.Event.Enddate,
+				Starttime:      resp.Event.Starttime,
+				Endtime:        resp.Event.Endtime,
+				Allday:         resp.Event.Allday,
+				MaxSubscribers: int64(resp.Event.MaxSubscribers),
+				Data:           resp.Event.Data,
+				Subscriptions:  resp.Event.Subscriptions,
+				Deleted:        true,
+			},
+		}
+
+		_, err := h.services.GRPC.Agenda.UpdateEvent(context.TODO(), request)
+
+		if err != nil {
+			fmt.Println(err)
+			w.WriteHeader(http.StatusInternalServerError)
+			return
+		}
+
+		http.Redirect(w, r, "/app/agenda/", http.StatusFound)
+		return
+	}
+	h.Renderer.AgendaDeleteEvent(w, r, resp.Event.ToStorageType())
+}
+
+///////////////////////////Delete subscriber///////////////////////////////
+func (h *ApplicationHandler) AgendaDeleteSubscribeEvent(w http.ResponseWriter, r *http.Request) {
+	vars := mux.Vars(r)
+	eventId := vars["eventid"]
+	subscribeid := vars["subscribeid"]
+	s_b_id := ""
+	s_b_name := ""
+	s_b_email := ""
+	s_b_group_id := ""
+	s_b_group_name := ""
+	request := &agenda.GetEventRequest{
+		Id: eventId,
+	}
+
+	resp, err := h.services.GRPC.Agenda.GetEvent(context.TODO(), request)
+	if err != nil {
+		fmt.Println(err)
+		w.WriteHeader(http.StatusInternalServerError)
+		return
+	}
+
+	for i := range resp.Event.Subscriptions {
+		if resp.Event.Subscriptions[i].Subscriber == subscribeid {
+			subscribed_by_id := resp.Event.Subscriptions[i].Data.Fields["subscribed_by"].GetStructValue().Fields["user"].GetStructValue().Fields["id"].GetStringValue()
+			subscribed_by_name := resp.Event.Subscriptions[i].Data.Fields["subscribed_by"].GetStructValue().Fields["user"].GetStructValue().Fields["display_name"].GetStringValue()
+			subscribed_by_email := resp.Event.Subscriptions[i].Data.Fields["subscribed_by"].GetStructValue().Fields["user"].GetStructValue().Fields["email"].GetStringValue()
+			subscribed_by_group_id := resp.Event.Subscriptions[i].Data.Fields["subscribed_by"].GetStructValue().Fields["group"].GetStructValue().Fields["id"].GetStringValue()
+			subscribed_by_group_name := resp.Event.Subscriptions[i].Data.Fields["subscribed_by"].GetStructValue().Fields["group"].GetStructValue().Fields["name"].GetStringValue()
+			s_b_id = subscribed_by_id
+			s_b_name = subscribed_by_name
+			s_b_email = subscribed_by_email
+			s_b_group_id = subscribed_by_group_id
+			s_b_group_name = subscribed_by_group_name
+		}
+	}
+
+	current_group, err := h.currentGroup(r)
+	if err != nil {
+		fmt.Println(err)
+		w.WriteHeader(http.StatusInternalServerError)
+		return
+	}
+
+	current_user_token, current_user_claims, err := h.currentUser(r)
+	if err != nil {
+		fmt.Println(err)
+		w.WriteHeader(http.StatusInternalServerError)
+		return
+	}
+
+	data := map[string]any{
+		"subscribed_by": map[string]any{
+			"user": map[string]any{
+				"id":           s_b_id,
+				"display_name": s_b_name,
+				"email":        s_b_email,
+			},
+			"group": map[string]any{
+				"id":   s_b_group_id,
+				"name": s_b_group_name,
+			},
+		},
+		"unsubscribed_by": map[string]any{
+			"user": map[string]any{
+				"id":           current_user_token.Subject,
+				"display_name": current_user_claims["first_name"].(string) + " " + current_user_claims["last_name"].(string),
+				"email":        current_user_claims["email"],
+			},
+			"group": map[string]any{
+				"id":   current_group.ID,
+				"name": current_group.Data["name"],
+			},
+		},
+		"motif": r.FormValue("motif"),
+	}
+
+	datapb, err := structpb.NewStruct(data)
+	if err != nil {
+		fmt.Println(err)
+		w.WriteHeader(http.StatusInternalServerError)
+		return
+	}
+
+	if r.Method == "POST" {
+		request := &agenda.DeleteSubscriptionRequest{
+			Subscriber: subscribeid,
+			Eventid:    eventId,
+			Data:       datapb,
+		}
+
+		data := map[string]any{
+			"motif":      r.FormValue("motif"),
+			"user":       current_user_claims["first_name"].(string) + " " + current_user_claims["last_name"].(string),
+			"subscriber": fmt.Sprintf("http://localhost:9000/app/beneficiaries/%s", subscribeid),
+			"link":       fmt.Sprintf("http://localhost:9000/app/agenda/%s", eventId),
+		}
+
+		// récupérer l'adresse mail de l'utilisateur qui a créé l'événement
+		mail := s_b_email
+		fmt.Println(mail)
+
+		_, err := h.services.GRPC.Agenda.DeleteSubscription(context.TODO(), request)
+
+		if err != nil {
+			fmt.Println(err)
+			w.WriteHeader(http.StatusInternalServerError)
+			return
+		}
+
+		if err := h.emailing.Send("delete_subscriber.request", mail, data); err != nil {
+			fmt.Println(err)
+			w.WriteHeader(http.StatusInternalServerError)
+			return
+		}
+
+		http.Redirect(w, r, fmt.Sprintf("/app/agenda/%s", eventId), http.StatusFound)
+		return
+	}
+	h.Renderer.AgendaDeleteSubscribeEvent(w, r, eventId)
+}
+
+////////////////////////////////////////////////////////
+// /////////////////////History Event////////////////////////
+func (h *ApplicationHandler) AgendaHistoryEvent(w http.ResponseWriter, r *http.Request) {
+	vars := mux.Vars(r)
+	eventId := vars["eventid"]
+	request := &agenda.GetEventRequest{
+		Id: eventId,
+	}
+
+	resp, err := h.services.GRPC.Agenda.GetEvent(context.TODO(), request)
+	if err != nil {
+		fmt.Println(err)
+		w.WriteHeader(http.StatusInternalServerError)
+		return
+	}
+
+	grouprequest := &groupsmanagement.GetGroupRequest{
+		Id: resp.Event.Owners[0],
+	}
+
+	groupresp, err := h.services.GRPC.GroupsManagement.GetGroup(context.TODO(), grouprequest)
+	if err != nil {
+		fmt.Println(err)
+		w.WriteHeader(http.StatusInternalServerError)
+		return
+	}
+
+	subscribers := map[string]any{}
+
+	accids := []string{}
+	for _, v := range resp.Event.DeletedSubscription {
+		accids = append(accids, v.Subscriber)
+	}
+
+	subscriberresp, err := h.services.GRPC.MobilityAccounts.GetAccountsBatch(
+		context.TODO(),
+		&mobilityaccounts.GetAccountsBatchRequest{
+			Accountids: accids,
+		},
+	)
+
+	if err == nil {
+		for _, sub := range subscriberresp.Accounts {
+			subscribers[sub.Id] = sub.ToStorageType()
+		}
+	}
+
+	g := r.Context().Value(identification.GroupKey)
+	if g == nil {
+		fmt.Println(err)
+		w.WriteHeader(http.StatusInternalServerError)
+		return
+	}
+
+	group := g.(storage.Group)
+
+	accountids := []string{}
+	for _, m := range group.Members {
+		if !contains(resp.Event.DeletedSubscription, m) {
+			accountids = append(accountids, m)
+		}
+	}
+
+	accountresp, err := h.services.GRPC.MobilityAccounts.GetAccountsBatch(
+		context.TODO(),
+		&mobilityaccounts.GetAccountsBatchRequest{
+			Accountids: accountids,
+		},
+	)
+
+	accounts := []any{}
+
+	if err == nil {
+		for _, acc := range accountresp.Accounts {
+			accounts = append(accounts, acc)
+		}
+	}
+
+	h.Renderer.AgendaHistoryEvent(w, r, resp.Event.ToStorageType(), groupresp.Group.ToStorageType(), subscribers, accounts)
+}

handlers/application/application.go

@@ -1,12 +1,16 @@
 package application
 
 import (
+	"errors"
 	"net/http"
 
 	"git.coopgo.io/coopgo-apps/parcoursmob/renderer"
 	"git.coopgo.io/coopgo-apps/parcoursmob/services"
+	"git.coopgo.io/coopgo-apps/parcoursmob/utils/identification"
 	cache "git.coopgo.io/coopgo-apps/parcoursmob/utils/storage"
 	"git.coopgo.io/coopgo-platform/emailing"
+	"git.coopgo.io/coopgo-platform/groups-management/storage"
+	"github.com/coreos/go-oidc"
 	"github.com/spf13/viper"
 )
 
@@ -39,3 +43,31 @@ func (h *ApplicationHandler) NotFound(w http.ResponseWriter, r *http.Request) {
 func (h *ApplicationHandler) templateFile(file string) string {
 	return h.config.GetString("templates.root") + file
 }
+
+func (h *ApplicationHandler) currentGroup(r *http.Request) (current_group storage.Group, err error) {
+	g := r.Context().Value(identification.GroupKey)
+	if g == nil {
+		return storage.Group{}, errors.New("current group not found")
+	}
+	current_group = g.(storage.Group)
+
+	return current_group, nil
+}
+
+func (h *ApplicationHandler) currentUser(r *http.Request) (current_user_token *oidc.IDToken, current_user_claims map[string]any, err error) {
+	// Get current user ID
+	u := r.Context().Value(identification.IdtokenKey)
+	if u == nil {
+		return nil, nil, errors.New("current user not found")
+	}
+	current_user_token = u.(*oidc.IDToken)
+
+	// Get current user claims
+	c := r.Context().Value(identification.ClaimsKey)
+	if c == nil {
+		return current_user_token, nil, errors.New("current user claims not found")
+	}
+	current_user_claims = c.(map[string]any)
+
+	return current_user_token, current_user_claims, nil
+}

handlers/application/beneficiaries.go

@@ -54,13 +54,13 @@ func (h *ApplicationHandler) BeneficiariesList(w http.ResponseWriter, r *http.Re
 
 	cacheid := uuid.NewString()
 	h.cache.PutWithTTL(cacheid, accounts, 1*time.Hour)
-
 	h.Renderer.BeneficiariesList(w, r, accounts, cacheid)
 }
 
 func (h *ApplicationHandler) BeneficiaryCreate(w http.ResponseWriter, r *http.Request) {
 	g := r.Context().Value(identification.GroupKey)
 	if g == nil {
+		fmt.Println("Create beneficiary : could not find group")
 		w.WriteHeader(http.StatusBadRequest)
 		return
 	}
@@ -135,9 +135,6 @@ func (h *ApplicationHandler) BeneficiaryDisplay(w http.ResponseWriter, r *http.R
 		return
 	}
 
-	//TODO filter namespaces
-	//TODO filter groups
-
 	bookingsrequest := &fleets.GetDriverBookingsRequest{
 		Driver: beneficiaryID,
 	}
@@ -154,10 +151,25 @@ func (h *ApplicationHandler) BeneficiaryDisplay(w http.ResponseWriter, r *http.R
 		bookings = append(bookings, b.ToStorageType())
 	}
 
+	groupsrequest := &groupsmanagement.GetGroupsRequest{
+		Namespaces: []string{"parcoursmob_organizations"},
+		Member:     beneficiaryID,
+	}
+
+	groupsresp, err := h.services.GRPC.GroupsManagement.GetGroups(context.TODO(), groupsrequest)
+	if err != nil {
+		fmt.Println(err)
+	}
+
+	organizations := []any{}
+	for _, o := range groupsresp.Groups {
+		organizations = append(organizations, o.ToStorageType())
+	}
+
 	beneficiaries_file_types := h.config.GetStringSlice("modules.beneficiaries.documents_types")
 	file_types_map := h.config.GetStringMapString("storage.files.file_types")
 
-	h.Renderer.BeneficiaryDisplay(w, r, resp.Account.ToStorageType(), bookings, beneficiaries_file_types, file_types_map, documents)
+	h.Renderer.BeneficiaryDisplay(w, r, resp.Account.ToStorageType(), bookings, organizations, beneficiaries_file_types, file_types_map, documents)
 }
 
 func (h *ApplicationHandler) BeneficiaryUpdate(w http.ResponseWriter, r *http.Request) {
@@ -256,7 +268,7 @@ func (h *ApplicationHandler) BeneficiaryDocuments(w http.ResponseWriter, r *http
 	beneficiaryID := vars["beneficiaryid"]
 
 	//r.ParseForm()
-	r.ParseMultipartForm(10 * 1024 * 1024)
+	r.ParseMultipartForm(100 * 1024 * 1024)
 
 	document_type := r.FormValue("type")
 	document_name := r.FormValue("name")

handlers/application/dashboard.go

@@ -12,6 +12,7 @@ import (
 	agendastorage "git.coopgo.io/coopgo-platform/agenda/storage"
 	"git.coopgo.io/coopgo-platform/groups-management/storage"
 	mobilityaccounts "git.coopgo.io/coopgo-platform/mobility-accounts/grpcapi"
+	"google.golang.org/protobuf/types/known/timestamppb"
 )
 
 func (h *ApplicationHandler) Dashboard(w http.ResponseWriter, r *http.Request) {
@@ -51,7 +52,7 @@ func (h *ApplicationHandler) Dashboard(w http.ResponseWriter, r *http.Request) {
 		}
 	}
 
-	members, err := h.members()
+	members, _, err := h.groupmembers(group.ID)
 	if err != nil {
 		fmt.Println(err)
 		w.WriteHeader(http.StatusInternalServerError)
@@ -64,6 +65,7 @@ func (h *ApplicationHandler) Dashboard(w http.ResponseWriter, r *http.Request) {
 
 	eventsresp, err := h.services.GRPC.Agenda.GetEvents(context.TODO(), &agenda.GetEventsRequest{
 		Namespaces: []string{"parcoursmob_dispositifs"},
+		Mindate:    timestamppb.Now(),
 	})
 
 	for _, e := range eventsresp.Events {

handlers/application/group_module.go

@@ -2,6 +2,7 @@ package application
 
 import (
 	"context"
+	"encoding/json"
 	"fmt"
 	"net/http"
 	"sort"
@@ -16,6 +17,8 @@ import (
 	"google.golang.org/protobuf/types/known/structpb"
 )
 
+var Addres any
+
 type BeneficiariesGroupForm struct {
 	FirstName   string     `json:"first_name" validate:"required"`
 	LastName    string     `json:"last_name" validate:"required"`
@@ -61,6 +64,12 @@ func (h *ApplicationHandler) Groups(w http.ResponseWriter, r *http.Request) {
 
 func (h *ApplicationHandler) CreateGroupModule(w http.ResponseWriter, r *http.Request) {
 	if r.Method == "POST" {
+		if r.PostFormValue("address") != "" {
+			var a any
+			json.Unmarshal([]byte(r.PostFormValue("address")), &a)
+
+			Addres = a
+		}
 		r.ParseForm()
 
 		if r.FormValue("name") == "" {
@@ -79,8 +88,10 @@ func (h *ApplicationHandler) CreateGroupModule(w http.ResponseWriter, r *http.Re
 		groupid := uuid.NewString()
 
 		dataMap := map[string]any{
-			"name": r.FormValue("name"),
-			"type": r.FormValue("type"),
+			"name":        r.FormValue("name"),
+			"type":        r.FormValue("type"),
+			"description": r.FormValue("description"),
+			"address":     Addres,
 		}
 
 		data, err := structpb.NewValue(dataMap)
@@ -138,7 +149,6 @@ func (h *ApplicationHandler) DisplayGroupModule(w http.ResponseWriter, r *http.R
 		w.WriteHeader(http.StatusInternalServerError)
 		return
 	}
-	fmt.Println(resp.Group.Members)
 
 	var accounts = []any{}
 
@@ -150,14 +160,12 @@ func (h *ApplicationHandler) DisplayGroupModule(w http.ResponseWriter, r *http.R
 	// if err != nil {
 	// 	return err
 	// }
-
 	for _, account := range ressp.Accounts {
 		if filterAcccount(r, account) {
 			a := account.ToStorageType()
 			accounts = append(accounts, a)
 		}
 	}
-	fmt.Println(accounts)
 
 	cacheid := uuid.NewString()
 	h.cache.PutWithTTL(cacheid, accounts, 1*time.Hour)
@@ -198,22 +206,16 @@ func (h *ApplicationHandler) DisplayGroupModule(w http.ResponseWriter, r *http.R
 			return
 		}
 
-		fmt.Println("yeesssssssssssssssssssssssss")
-		fmt.Println(respbeneficiary.Account.Id)
-		fmt.Println("===================yeesssssssssssssssssssssssss")
-		fmt.Println(r.FormValue("beneficiaryid"))
-		fmt.Println("=====================yeesssssssssssssssssssssssss")
-		// }
 		http.Redirect(w, r, fmt.Sprintf("/app/group_module/groups/%s", resp.Group.ToStorageType().ID), http.StatusFound)
 		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)
 }

handlers/application/journeys.go

@@ -5,14 +5,26 @@ import (
 	"encoding/json"
 	"fmt"
 	"net/http"
+	"sort"
+	"strconv"
+	"strings"
 	"time"
 
 	fleets "git.coopgo.io/coopgo-platform/fleets/grpcapi"
+	groupsmanagement "git.coopgo.io/coopgo-platform/groups-management/grpcapi"
+	groupstorage "git.coopgo.io/coopgo-platform/groups-management/storage"
+	mobilityaccounts "git.coopgo.io/coopgo-platform/mobility-accounts/grpcapi"
+	"github.com/google/uuid"
+	"github.com/gorilla/mux"
 	geojson "github.com/paulmach/go.geojson"
 	"gitlab.scity.coop/maas/navitia-golang"
 	"gitlab.scity.coop/maas/navitia-golang/types"
+	"google.golang.org/protobuf/types/known/structpb"
 )
 
+var Depart any
+var Arrive any
+
 func (h *ApplicationHandler) JourneysSearch(w http.ResponseWriter, r *http.Request) {
 	r.ParseForm()
 
@@ -144,3 +156,413 @@ func (h *ApplicationHandler) JourneysSearch(w http.ResponseWriter, r *http.Reque
 
 	h.Renderer.JourneysSearch(w, r, carpoolresults, journeys, vehicles, searched, departuregeo, destinationgeo, departuredate, departuretime)
 }
+
+type GroupsModule []groupstorage.Group
+
+func (a GroupsModule) Len() int { return len(a) }
+func (a GroupsModule) Less(i, j int) bool {
+	return strings.Compare(a[i].Data["name"].(string), a[j].Data["name"].(string)) < 0
+}
+func (a GroupsModule) Swap(i, j int) { a[i], a[j] = a[j], a[i] }
+
+func (h *ApplicationHandler) GroupsGestion(w http.ResponseWriter, r *http.Request) {
+
+	request := &groupsmanagement.GetGroupsRequest{
+		Namespaces: []string{"parcoursmob_groups_covoiturage"},
+	}
+
+	resp, err := h.services.GRPC.GroupsManagement.GetGroups(context.TODO(), request)
+	if err != nil {
+		fmt.Println(err)
+		w.WriteHeader(http.StatusInternalServerError)
+		return
+	}
+
+	var groups = []groupstorage.Group{}
+
+	for _, group := range resp.Groups {
+		g := group.ToStorageType()
+		groups = append(groups, g)
+	}
+
+	cacheid := uuid.NewString()
+
+	sort.Sort(GroupsModule(groups))
+	h.cache.PutWithTTL(cacheid, groups, 1*time.Hour)
+
+	h.Renderer.GroupsGestion(w, r, groups, cacheid)
+}
+func filterAcc(r *http.Request, a *mobilityaccounts.Account) bool {
+	searchFilter, ok := r.URL.Query()["search"]
+
+	if ok && len(searchFilter[0]) > 0 {
+		name := a.Data.AsMap()["first_name"].(string) + " " + a.Data.AsMap()["last_name"].(string)
+		if !strings.Contains(strings.ToLower(name), strings.ToLower(searchFilter[0])) {
+			return false
+		}
+	}
+
+	return true
+}
+
+func (h *ApplicationHandler) CreateGroup(w http.ResponseWriter, r *http.Request) {
+
+	var beneficiary any
+	var (
+		departurgeo   *geojson.Feature
+		dstinationgeo *geojson.Feature
+	)
+	searched := false
+
+	if r.FormValue("beneficiaryid") != "" {
+
+		searched = true
+
+		requestbeneficiary := &mobilityaccounts.GetAccountRequest{
+			Id: r.FormValue("beneficiaryid"),
+		}
+
+		respbeneficiary, err := h.services.GRPC.MobilityAccounts.GetAccount(context.TODO(), requestbeneficiary)
+		if err != nil {
+			fmt.Println(err)
+			w.WriteHeader(http.StatusInternalServerError)
+			return
+		}
+
+		beneficiary = respbeneficiary.Account.ToStorageType()
+
+		if r.Method == "POST" {
+			departure := r.FormValue("departure")
+			destination := r.FormValue("destination")
+
+			if departure != "" && destination != "" {
+
+				var err error
+
+				departurgeo, err = geojson.UnmarshalFeature([]byte(departure))
+				if err != nil {
+					fmt.Println(err)
+					w.WriteHeader(http.StatusBadRequest)
+					return
+				}
+
+				dstinationgeo, err = geojson.UnmarshalFeature([]byte(destination))
+				if err != nil {
+					fmt.Println(err)
+					w.WriteHeader(http.StatusBadRequest)
+					return
+				}
+			}
+			if r.FormValue("departure") != "" {
+				var a any
+				json.Unmarshal([]byte(r.FormValue("departure")), &a)
+
+				Depart = a
+			}
+			if r.FormValue("destination") != "" {
+				var a any
+				json.Unmarshal([]byte(r.FormValue("destination")), &a)
+
+				Arrive = a
+			}
+			r.ParseForm()
+
+			if r.FormValue("name") == "" {
+
+				fmt.Println("invalid name")
+				w.WriteHeader(http.StatusBadRequest)
+				return
+			}
+
+			if r.FormValue("number") == "" {
+
+				fmt.Println("invalid number of personne")
+				w.WriteHeader(http.StatusBadRequest)
+				return
+			}
+
+			planDays := map[string]any{
+				"lundi":    r.FormValue("lundi") == "on",
+				"mardi":    r.FormValue("mardi") == "on",
+				"mercredi": r.FormValue("mercredi") == "on",
+				"jeudi":    r.FormValue("jeudi") == "on",
+				"vendredi": r.FormValue("vendredi") == "on",
+				"samedi":   r.FormValue("samedi") == "on",
+				"dimanche": r.FormValue("dimanche") == "on",
+			}
+
+			groupidd := uuid.NewString()
+
+			dataMap := map[string]any{
+				"name":              r.FormValue("name"),
+				"number":            r.FormValue("number"),
+				"driver_first_name": respbeneficiary.Account.ToStorageType().Data["first_name"],
+				"driver_last_name":  respbeneficiary.Account.ToStorageType().Data["last_name"],
+				"depart":            Depart,
+				"arrive":            Arrive,
+				"departdate":        r.FormValue("departdate"),
+				"date":              r.FormValue("date"),
+				"enddate":           r.FormValue("enddate"),
+				"departtime":        r.FormValue("departtime"),
+				"time":              r.FormValue("time"),
+
+				"planDays":  planDays,
+				"recurrent": r.FormValue("recurrent"),
+				"pontuelle": r.FormValue("ponctuelle"),
+			}
+
+			data, err := structpb.NewValue(dataMap)
+			if err != nil {
+				fmt.Println(err)
+				w.WriteHeader(http.StatusInternalServerError)
+				return
+			}
+
+			request_organization := &groupsmanagement.AddGroupRequest{
+				Group: &groupsmanagement.Group{
+					Id:        groupidd,
+					Namespace: "parcoursmob_groups_covoiturage",
+					Data:      data.GetStructValue(),
+				},
+			}
+
+			_, err = h.services.GRPC.GroupsManagement.AddGroup(context.TODO(), request_organization)
+			if err != nil {
+				fmt.Println(err)
+				w.WriteHeader(http.StatusInternalServerError)
+				return
+			}
+
+			http.Redirect(w, r, fmt.Sprintf("/app/journeys/groups_covoiturage/create/%s", request_organization.Group.ToStorageType().ID), http.StatusFound)
+
+			return
+		}
+	}
+	accountsBeneficaire, err := h.beneficiaries(r)
+	if err != nil {
+		fmt.Println(err)
+		w.WriteHeader(http.StatusBadRequest)
+		return
+	}
+
+	h.Renderer.CreateGroup(w, r, Depart, Arrive, searched, beneficiary, accountsBeneficaire, departurgeo, dstinationgeo)
+
+}
+
+func (h *ApplicationHandler) DisplayGroupCovoiturage(w http.ResponseWriter, r *http.Request) {
+	vars := mux.Vars(r)
+	groupid := vars["groupid"]
+
+	request := &groupsmanagement.GetGroupRequest{
+		Id: groupid,
+	}
+
+	resp, err := h.services.GRPC.GroupsManagement.GetGroup(context.TODO(), request)
+	if err != nil {
+		fmt.Println(err)
+		w.WriteHeader(http.StatusInternalServerError)
+		return
+	}
+
+	var accounts = []any{}
+
+	requesst := &mobilityaccounts.GetAccountsBatchRequest{
+		Accountids: resp.Group.Members,
+	}
+
+	ressp, _ := h.services.GRPC.MobilityAccounts.GetAccountsBatch(context.TODO(), requesst)
+
+	for _, account := range ressp.Accounts {
+		if filterAcc(r, account) {
+			a := account.ToStorageType()
+			accounts = append(accounts, a)
+		}
+	}
+
+	cacheid := uuid.NewString()
+	h.cache.PutWithTTL(cacheid, accounts, 1*time.Hour)
+	r.ParseForm()
+
+	var beneficiary any
+	searched := false
+
+	if r.FormValue("beneficiaryid") != "" {
+
+		searched = true
+
+		requestbeneficiary := &mobilityaccounts.GetAccountRequest{
+			Id: r.FormValue("beneficiaryid"),
+		}
+
+		respbeneficiary, err := h.services.GRPC.MobilityAccounts.GetAccount(context.TODO(), requestbeneficiary)
+		if err != nil {
+			fmt.Println(err)
+			w.WriteHeader(http.StatusInternalServerError)
+			return
+		}
+
+		beneficiary = respbeneficiary.Account.ToStorageType()
+
+		subscribe := &groupsmanagement.SubscribeRequest{
+			Groupid:  resp.Group.ToStorageType().ID,
+			Memberid: respbeneficiary.Account.Id,
+		}
+
+		_, err = h.services.GRPC.GroupsManagement.Subscribe(context.TODO(), subscribe)
+
+		if err != nil {
+			fmt.Println(err)
+			w.WriteHeader(http.StatusInternalServerError)
+			return
+		}
+		/*******************Code to store more information about mermbers groupscovoiturage**************/
+		if r.FormValue("departure") != "" {
+			var a any
+			json.Unmarshal([]byte(r.FormValue("departure")), &a)
+
+			Depart = a
+		}
+		if r.FormValue("destination") != "" {
+			var a any
+			json.Unmarshal([]byte(r.FormValue("destination")), &a)
+
+			Arrive = a
+		}
+		r.ParseForm()
+		dataMap := map[string]any{
+
+			"depart": Depart,
+			"arrive": Arrive,
+		}
+		id := uuid.NewString()
+		data, err := structpb.NewValue(dataMap)
+		if err != nil {
+			fmt.Println(err)
+			w.WriteHeader(http.StatusInternalServerError)
+			return
+		}
+
+		request_organizatio := &groupsmanagement.AddGroupMemberRequest{
+			Group: &groupsmanagement.GroupMember{
+				Id:       id,
+				Memberid: respbeneficiary.Account.Id,
+				Groupid:  resp.Group.ToStorageType().ID,
+				Data:     data.GetStructValue(),
+			},
+		}
+
+		_, err = h.services.GRPC.GroupsManagement.AddGroupMember(context.TODO(), request_organizatio)
+		if err != nil {
+			fmt.Println(err)
+			w.WriteHeader(http.StatusInternalServerError)
+			return
+		}
+
+		http.Redirect(w, r, fmt.Sprintf("/app/journeys/groups_covoiturage/create/%s", resp.Group.ToStorageType().ID), http.StatusFound)
+		return
+	}
+	//////////find all groups to store the adresse passenger///////
+	// grp := &groupsmanagement.GetGroupsBatchMemberRequest{
+
+	// 	Groupids: []string{resp.Group.ToStorageType().ID},
+	// }
+	// s, err := h.services.GRPC.GroupsManagement.GetGroupsBatchMember(context.TODO(), grp)
+	// if err != nil {
+	// 	fmt.Println(err)
+	// 	w.WriteHeader(http.StatusInternalServerError)
+	// 	return
+	// }
+	// groups := map[string]any{}
+
+	// if err == nil {
+	// 	for _, g := range s.Groups {
+	// 		groups[g.Memberid] = g.ToStorageType()
+	// 	}
+	// }
+	//////////find all groups to store the adresse passenger///////
+	///////////try to optimise the code ////////////////////////////
+	groups, _ := h.services.GetGroupsMemberMap(resp.Group.ToStorageType().ID)
+	//fmt.Println(groups)
+	var number string = strconv.Itoa(len(resp.Group.Members))
+	/////////////////////
+	accountsBeneficaire, err := h.beneficiaries(r)
+	if err != nil {
+		fmt.Println(err)
+		w.WriteHeader(http.StatusBadRequest)
+		return
+	}
+
+	h.Renderer.DisplayGroupCovoiturage(w, r, number, resp.Group.ToStorageType().ID, Depart, Arrive, accounts, cacheid, searched, beneficiary, resp.Group.ToStorageType(), accountsBeneficaire, groups)
+}
+
+func (h *ApplicationHandler) UpdateGroupCovoiturage(w http.ResponseWriter, r *http.Request) {
+	vars := mux.Vars(r)
+	id := vars["id"]
+	groupid := vars["groupid"]
+	memberid := vars["memberid"]
+
+	if r.Method == "POST" {
+
+		//////////get groupid covoiturage//////////
+		request := &groupsmanagement.GetGroupRequest{
+			Id: groupid,
+		}
+
+		resp, err := h.services.GRPC.GroupsManagement.GetGroup(context.TODO(), request)
+		if err != nil {
+			fmt.Println(err)
+			w.WriteHeader(http.StatusInternalServerError)
+			return
+		}
+
+		//////////////////////////get group member////////////////////////////////
+
+		reequest := &groupsmanagement.GetGroupMemberRequest{
+			Id: id,
+		}
+
+		ressp, err := h.services.GRPC.GroupsManagement.GetGroupMember(context.TODO(), reequest)
+		if err != nil {
+			fmt.Println(err)
+			w.WriteHeader(http.StatusInternalServerError)
+			return
+		}
+		req := &groupsmanagement.UnsubscribeMemberRequest{
+			Id: ressp.Group.Id,
+		}
+
+		_, errr := h.services.GRPC.GroupsManagement.UnsubscribeMember(context.TODO(), req)
+		if errr != nil {
+			fmt.Println(errr)
+			w.WriteHeader(http.StatusInternalServerError)
+			return
+		}
+
+		members := resp.Group.Members
+		for i := 0; i < len(members); i++ {
+			if members[i] == memberid {
+				members = append(members[:i], members[(i+1):]...)
+				resp.Group.Members = members
+				reequest := &groupsmanagement.UnsubscribeRequest{
+					Groupid:  resp.Group.ToStorageType().ID,
+					Memberid: memberid,
+				}
+
+				_, err := h.services.GRPC.GroupsManagement.Unsubscribe(context.TODO(), reequest)
+				if err != nil {
+					fmt.Println(err)
+					w.WriteHeader(http.StatusInternalServerError)
+					return
+				}
+			}
+
+		}
+		http.Redirect(w, r, fmt.Sprintf("/app/journeys/groups_covoiturage/create/%s", groupid), http.StatusFound)
+		/*
+		 I must add "return" to resolve the err
+		 http: superfluous response.WriteHeader call from git.coopgo.io/coopgo-apps/parcoursmob/renderer.(*Renderer).Render (renderer.go:50)
+		*/
+		return
+	}
+	h.Renderer.UpdateGroupCovoiturage(w, r, groupid, memberid)
+}

handlers/application/members.go

@@ -0,0 +1,213 @@
+package application
+
+import (
+	"context"
+	"encoding/json"
+	"fmt"
+	"net/http"
+	"strings"
+	"time"
+
+	formvalidators "git.coopgo.io/coopgo-apps/parcoursmob/utils/form-validators"
+	groupsmanagement "git.coopgo.io/coopgo-platform/groups-management/grpcapi"
+	mobilityaccounts "git.coopgo.io/coopgo-platform/mobility-accounts/grpcapi"
+	"github.com/google/uuid"
+	"google.golang.org/protobuf/types/known/structpb"
+)
+
+type UserForm struct {
+	FirstName   string `json:"first_name" validate:"required"`
+	LastName    string `json:"last_name" validate:"required"`
+	Email       string `json:"email" validate:"required,email"`
+	PhoneNumber string `json:"phone_number" `
+	Address     any    `json:"address,omitempty"`
+	Gender      string `json:"gender"`
+}
+
+func (h *ApplicationHandler) MemberDisplay(w http.ResponseWriter, r *http.Request) {
+
+	adm := strings.Split(r.URL.Path, "/")
+	adminid := adm[3]
+
+	request := &mobilityaccounts.GetAccountRequest{
+		Id: adminid,
+	}
+
+	resp, err := h.services.GRPC.MobilityAccounts.GetAccount(context.TODO(), request)
+	if err != nil {
+		fmt.Println(err)
+		w.WriteHeader(http.StatusInternalServerError)
+		return
+	}
+	//////////////////////////////////add organisations/////////////////////////////////////////////////
+
+	var allIds []string
+	for _, v := range resp.Account.ToStorageType().Data["groups"].([]any) {
+		s := fmt.Sprintf("%v", v)
+		if !(strings.Contains(s, "admin")) {
+			allIds = append(allIds, s)
+		}
+	}
+	reques := &groupsmanagement.GetGroupsBatchRequest{
+		Groupids: allIds,
+	}
+
+	res, err := h.services.GRPC.GroupsManagement.GetGroupsBatch(context.TODO(), reques)
+	if err != nil {
+		fmt.Println(err)
+		w.WriteHeader(http.StatusInternalServerError)
+		return
+	}
+
+	var groupsName []string
+
+	for _, group := range res.Groups {
+		g := fmt.Sprintf("%v", group.ToStorageType().Data["name"])
+		groupsName = append(groupsName, g)
+	}
+
+	h.Renderer.MemberDisplay(w, r, resp.Account.ToStorageType(), groupsName)
+}
+
+func (h *ApplicationHandler) MemberUpdate(w http.ResponseWriter, r *http.Request) {
+	adm := strings.Split(r.URL.Path, "/")
+	userID := adm[3]
+
+	if r.Method == "POST" {
+
+		dataMap, err := parseUserForm(r)
+		if err != nil {
+			fmt.Println(err)
+			w.WriteHeader(http.StatusBadRequest)
+			return
+		}
+
+		data, err := structpb.NewValue(dataMap)
+		if err != nil {
+			fmt.Println(err)
+			w.WriteHeader(http.StatusInternalServerError)
+			return
+		}
+
+		request := &mobilityaccounts.UpdateDataRequest{
+			Account: &mobilityaccounts.Account{
+				Id:        userID,
+				Namespace: "parcoursmob",
+				Data:      data.GetStructValue(),
+			},
+		}
+
+		resp, err := h.services.GRPC.MobilityAccounts.UpdateData(context.TODO(), request)
+
+		if err != nil {
+			fmt.Println(err)
+			w.WriteHeader(http.StatusInternalServerError)
+			return
+		}
+
+		http.Redirect(w, r, fmt.Sprintf("/app/members/%s", resp.Account.Id), http.StatusFound)
+
+		return
+	}
+
+	request := &mobilityaccounts.GetAccountRequest{
+		Id: userID,
+	}
+
+	resp, err := h.services.GRPC.MobilityAccounts.GetAccount(context.TODO(), request)
+	if err != nil {
+		fmt.Println(err)
+		w.WriteHeader(http.StatusInternalServerError)
+		return
+	}
+
+	h.Renderer.MemberUpdate(w, r, resp.Account.ToStorageType())
+}
+
+func parseUserForm(r *http.Request) (map[string]any, error) {
+	if err := r.ParseForm(); err != nil {
+		return nil, err
+	}
+
+	formData := UserForm{
+		FirstName:   r.PostFormValue("first_name"),
+		LastName:    r.PostFormValue("last_name"),
+		Email:       r.PostFormValue("email"),
+		PhoneNumber: r.PostFormValue("phone_number"),
+		Gender:      r.PostFormValue("gender"),
+	}
+
+	validate := formvalidators.New()
+	if err := validate.Struct(formData); err != nil {
+		return nil, err
+	}
+
+	d, err := json.Marshal(formData)
+	if err != nil {
+		return nil, err
+	}
+
+	var dataMap map[string]any
+	err = json.Unmarshal(d, &dataMap)
+	if err != nil {
+		return nil, err
+	}
+
+	return dataMap, nil
+}
+
+func (h *ApplicationHandler) MembersList(w http.ResponseWriter, r *http.Request) {
+
+	accounts, err := h.services.GetAccounts()
+	if err != nil {
+		fmt.Println(err)
+		w.WriteHeader(http.StatusInternalServerError)
+		return
+	}
+	var groupsName []string
+
+	for _, v := range accounts {
+		adminid := v.ID
+		request := &mobilityaccounts.GetAccountRequest{
+			Id: adminid,
+		}
+
+		resp, err := h.services.GRPC.MobilityAccounts.GetAccount(context.TODO(), request)
+		if err != nil {
+			fmt.Println(err)
+			w.WriteHeader(http.StatusInternalServerError)
+			return
+		}
+		//////////////////////////////////add organisations/////////////////////////////////////////////////
+
+		var allIds []string
+		for _, v := range resp.Account.ToStorageType().Data["groups"].([]any) {
+			s := fmt.Sprintf("%v", v)
+			if !(strings.Contains(s, "admin")) {
+				allIds = append(allIds, s)
+			}
+
+		}
+
+		reques := &groupsmanagement.GetGroupsBatchRequest{
+			Groupids: allIds,
+		}
+
+		res, err := h.services.GRPC.GroupsManagement.GetGroupsBatch(context.TODO(), reques)
+		if err != nil {
+			fmt.Println(err)
+			w.WriteHeader(http.StatusInternalServerError)
+			return
+		}
+		g := ""
+		for _, group := range res.Groups {
+			g += fmt.Sprintf("%v", group.ToStorageType().Data["name"]) + " "
+		}
+		groupsName = append(groupsName, g)
+
+	}
+	cacheid := uuid.NewString()
+	h.cache.PutWithTTL(cacheid, accounts, 1*time.Hour)
+
+	h.Renderer.MembersList(w, r, accounts, cacheid, groupsName)
+}

handlers/application/vehicles-management.go

@@ -42,20 +42,26 @@ func (h *ApplicationHandler) VehiclesManagementOverview(w http.ResponseWriter, r
 	for _, vehicle := range resp.Vehicles {
 		if filterVehicle(r, vehicle) {
 			v := vehicle.ToStorageType()
-			vehicles = append(vehicles, v)
-			vehicles_map[v.ID] = v
+			vehicleBookings := []fleetsstorage.Booking{}
 			for _, b := range v.Bookings {
 				if b.Status() != fleetsstorage.StatusOld {
-					bookings = append(bookings, b)
+					if deleted, ok := b.Data["Deleted"].(bool); !ok && !deleted {
+						bookings = append(bookings, b)
+					}
+				}
+				if b.Unavailableto.After(time.Now()) {
+					vehicleBookings = append(vehicleBookings, b)
 				}
 			}
+			v.Bookings = vehicleBookings
+			vehicles = append(vehicles, v)
+			vehicles_map[v.ID] = v
 
 		}
 	}
 
 	sort.Sort(sorting.VehiclesByLicencePlate(vehicles))
 	sort.Sort(sorting.BookingsByStartdate(bookings))
-
 	h.Renderer.VehiclesManagementOverview(w, r, vehicles, vehicles_map, bookings)
 }
 
@@ -77,7 +83,12 @@ func (h *ApplicationHandler) VehiclesManagementBookingsList(w http.ResponseWrite
 		if filterVehicle(r, vehicle) {
 			v := vehicle.ToStorageType()
 			vehicles_map[v.ID] = v
-			bookings = append(bookings, v.Bookings...)
+			// bookings = append(bookings, v.Bookings...)
+			for _, b := range v.Bookings {
+				if v, ok := b.Data["administrator_unavailability"].(bool); !ok || !v {
+					bookings = append(bookings, b)
+				}
+			}
 		}
 	}
 
@@ -183,29 +194,6 @@ func (h *ApplicationHandler) VehiclesFleetDisplay(w http.ResponseWriter, r *http
 	h.Renderer.VehiclesFleetDisplay(w, r, resp.Vehicle.ToStorageType())
 }
 
-func (h *ApplicationHandler) VehiclesFleetUpdate(w http.ResponseWriter, r *http.Request) {
-	vars := mux.Vars(r)
-	vehicleid := vars["vehicleid"]
-
-	if r.Method == "POST" {
-		w.WriteHeader(http.StatusNotFound)
-		return
-	}
-
-	request := &fleets.GetVehicleRequest{
-		Vehicleid: vehicleid,
-	}
-
-	resp, err := h.services.GRPC.Fleets.GetVehicle(context.TODO(), request)
-	if err != nil {
-		fmt.Println(err)
-		w.WriteHeader(http.StatusInternalServerError)
-		return
-	}
-
-	h.Renderer.VehiclesFleetUpdate(w, r, resp.Vehicle.ToStorageType())
-}
-
 func filterVehicle(r *http.Request, v *fleets.Vehicle) bool {
 	g := r.Context().Value(identification.GroupKey)
 	if g == nil {
@@ -227,22 +215,17 @@ func (h ApplicationHandler) VehicleManagementBookingDisplay(w http.ResponseWrite
 	vars := mux.Vars(r)
 	bookingid := vars["bookingid"]
 
-	request := &fleets.GetBookingRequest{
-		Bookingid: bookingid,
-	}
-	resp, err := h.services.GRPC.Fleets.GetBooking(context.TODO(), request)
+	booking, err := h.services.GetBooking(bookingid)
 	if err != nil {
 		fmt.Println(err)
 		w.WriteHeader(http.StatusInternalServerError)
 		return
 	}
 
-	booking := resp.Booking.ToStorageType()
-
 	if r.Method == "POST" {
 		r.ParseForm()
 
-		newbooking := resp.Booking
+		newbooking, _ := fleets.BookingFromStorageType(&booking)
 
 		startdate := r.FormValue("startdate")
 		if startdate != "" {
@@ -318,10 +301,63 @@ func (h ApplicationHandler) VehicleManagementBookingDisplay(w http.ResponseWrite
 		return
 	}
 
+	alternativerequest := &fleets.GetVehiclesRequest{
+		Namespaces:       []string{"parcoursmob"},
+		Types:            []string{booking.Vehicle.Type},
+		Administrators:   booking.Vehicle.Administrators,
+		AvailabilityFrom: timestamppb.New(booking.Startdate),
+		AvailabilityTo:   timestamppb.New(booking.Enddate.Add(24 * time.Hour)),
+	}
+
+	alternativeresp, err := h.services.GRPC.Fleets.GetVehicles(context.TODO(), alternativerequest)
+	if err != nil {
+		fmt.Println(err)
+	}
+
+	alternatives := []any{}
+
+	for _, a := range alternativeresp.Vehicles {
+		alternatives = append(alternatives, a.ToStorageType())
+	}
+
 	documents := h.filestorage.List(filestorage.PREFIX_BOOKINGS + "/" + bookingid)
 	file_types_map := h.config.GetStringMapString("storage.files.file_types")
 
-	h.Renderer.VehicleManagementBookingDisplay(w, r, booking, booking.Vehicle, beneficiary, groupresp.Group.ToStorageType(), documents, file_types_map)
+	h.Renderer.VehicleManagementBookingDisplay(w, r, booking, booking.Vehicle, beneficiary, groupresp.Group.ToStorageType(), documents, file_types_map, alternatives)
+}
+
+func (h ApplicationHandler) VehicleManagementBookingChangeVehicle(w http.ResponseWriter, r *http.Request) {
+	vars := mux.Vars(r)
+	bookingid := vars["bookingid"]
+
+	r.ParseForm()
+
+	newvehicle := r.FormValue("vehicle")
+
+	booking, err := h.services.GetBooking(bookingid)
+	if err != nil {
+		fmt.Println(err)
+		w.WriteHeader(http.StatusInternalServerError)
+		return
+	}
+
+	booking.Vehicleid = newvehicle
+
+	b, _ := fleets.BookingFromStorageType(&booking)
+
+	request := &fleets.UpdateBookingRequest{
+		Booking: b,
+	}
+
+	_, err = h.services.GRPC.Fleets.UpdateBooking(context.TODO(), request)
+	if err != nil {
+		fmt.Println(err)
+		w.WriteHeader(http.StatusInternalServerError)
+		return
+	}
+
+	http.Redirect(w, r, fmt.Sprintf("/app/vehicles-management/bookings/%s", bookingid), http.StatusFound)
+
 }
 
 func (h ApplicationHandler) VehiclesFleetMakeUnavailable(w http.ResponseWriter, r *http.Request) { // Get Group
@@ -406,3 +442,211 @@ func (h ApplicationHandler) VehiclesFleetMakeUnavailable(w http.ResponseWriter,
 
 	http.Redirect(w, r, fmt.Sprintf("/app/vehicles-management/fleet/%s", vehicleid), http.StatusFound)
 }
+
+//	func (h *ApplicationHandler) UnbookingVehicles(w http.ResponseWriter, r *http.Request) {
+//		request := &fleets.GetVehiclesRequest{
+//			Namespaces: []string{"parcoursmob"},
+//		}
+//		resp, err := h.services.GRPC.Fleets.GetVehicles(context.TODO(), request)
+//		if err != nil {
+//			fmt.Println(err)
+//			w.WriteHeader(http.StatusInternalServerError)
+//		}
+//		vehicles := []fleetsstorage.Vehicle{}
+//		fmt.Println(resp.Vehicles[0].Bookings)
+//		for i, vehicle := range resp.Vehicles {
+//			if len(resp.Vehicles[i].Bookings) == 0 {
+//				v := vehicle.ToStorageType()
+//				vehicles = append(vehicles, v)
+//			}
+//		}
+//		// if len(resp.Vehicle.ToStorageType().Bookings) == 0 {
+//		// 	h.Renderer.UnbookingVehicles(w, r, resp.Vehicle.ToStorageType())
+//		// }
+//		// fmt.Println(resp.Vehicle.ToStorageType().Bookings)
+//		fmt.Println(vehicles)
+//		h.Renderer.UnbookingVehicles(w, r, vehicles)
+//	}
+func (h *ApplicationHandler) UnbookingVehicle(w http.ResponseWriter, r *http.Request) {
+	vars := mux.Vars(r)
+	bookingid := vars["bookingid"]
+
+	request := &fleets.GetBookingRequest{
+		Bookingid: bookingid,
+	}
+
+	resp, err := h.services.GRPC.Fleets.GetBooking(context.TODO(), request)
+	if err != nil {
+		fmt.Println(err)
+		w.WriteHeader(http.StatusInternalServerError)
+		return
+	}
+	now := time.Now()
+	date := now.Format("2006-01-02")
+	unavailableto, _ := time.Parse("2006-01-02", date)
+
+	current_group, err := h.currentGroup(r)
+	if err != nil {
+		fmt.Println(err)
+		w.WriteHeader(http.StatusInternalServerError)
+		return
+	}
+
+	current_user_token, current_user_claims, err := h.currentUser(r)
+	if err != nil {
+		fmt.Println(err)
+		w.WriteHeader(http.StatusInternalServerError)
+		return
+	}
+
+	booked_by_id := resp.Booking.Data.Fields["booked_by"].GetStructValue().Fields["user"].GetStructValue().Fields["id"].GetStringValue()
+	booked_by_name := resp.Booking.Data.Fields["booked_by"].GetStructValue().Fields["user"].GetStructValue().Fields["display_name"].GetStringValue()
+	booked_by_email := resp.Booking.Data.Fields["booked_by"].GetStructValue().Fields["user"].GetStructValue().Fields["email"].GetStringValue()
+	booked_by_group_id := resp.Booking.Data.Fields["booked_by"].GetStructValue().Fields["group"].GetStructValue().Fields["id"].GetStringValue()
+	booked_by_group_name := resp.Booking.Data.Fields["booked_by"].GetStructValue().Fields["group"].GetStructValue().Fields["name"].GetStringValue()
+
+	data := map[string]any{
+		"booked_by": map[string]any{
+			"user": map[string]any{
+				"id":           booked_by_id,
+				"display_name": booked_by_name,
+				"email":        booked_by_email,
+			},
+			"group": map[string]any{
+				"id":   booked_by_group_id,
+				"name": booked_by_group_name,
+			},
+		},
+		"unbooked_by": map[string]any{
+			"user": map[string]any{
+				"id":           current_user_token.Subject,
+				"display_name": current_user_claims["first_name"].(string) + " " + current_user_claims["last_name"].(string),
+				"email":        current_user_claims["email"],
+			},
+			"group": map[string]any{
+				"id":   current_group.ID,
+				"name": current_group.Data["name"],
+			},
+		},
+		"Deleted": true,
+		"motif":   r.FormValue("motif"),
+	}
+
+	datapb, err := structpb.NewStruct(data)
+	if err != nil {
+		fmt.Println(err)
+		w.WriteHeader(http.StatusInternalServerError)
+		return
+	}
+
+	if r.Method == "POST" {
+
+		request := &fleets.UpdateBookingRequest{
+			Booking: &fleets.Booking{
+				Id:              resp.Booking.Id,
+				Vehicleid:       resp.Booking.Vehicleid,
+				Driver:          resp.Booking.Driver,
+				Startdate:       resp.Booking.Startdate,
+				Enddate:         resp.Booking.Enddate,
+				Unavailablefrom: resp.Booking.Unavailablefrom,
+				Unavailableto:   timestamppb.New(unavailableto),
+				Data:            datapb,
+			},
+		}
+
+		_, err := h.services.GRPC.Fleets.UpdateBooking(context.TODO(), request)
+
+		if err != nil {
+			fmt.Println(err)
+			w.WriteHeader(http.StatusInternalServerError)
+			return
+		}
+
+		http.Redirect(w, r, "/app/vehicles-management/", http.StatusFound)
+		return
+	}
+	h.Renderer.UnbookingVehicle(w, r, resp.Booking.ToStorageType())
+}
+
+////////////////////////UpdateVehicle///////////////////////
+
+func (h *ApplicationHandler) VehiclesFleetUpdate(w http.ResponseWriter, r *http.Request) {
+	vars := mux.Vars(r)
+	vehicleID := vars["vehicleid"]
+	request := &fleets.GetVehicleRequest{
+		Vehicleid: vehicleID,
+	}
+
+	resp, err := h.services.GRPC.Fleets.GetVehicle(context.TODO(), request)
+	if err != nil {
+		fmt.Println(err)
+		w.WriteHeader(http.StatusInternalServerError)
+		return
+	}
+	namespaceV := resp.Vehicle.Namespace
+	//typeV := resp.Vehicle.Type
+	administratorsV := resp.Vehicle.Administrators
+
+	if r.Method == "POST" {
+		fmt.Print(r.FormValue("vehicle_type"))
+		if err := r.ParseForm(); err != nil {
+			fmt.Println(err)
+			w.WriteHeader(http.StatusBadRequest)
+			return
+		}
+		dataMap := map[string]any{}
+		if v := r.FormValue("name"); v != "" {
+			dataMap["name"] = v
+		}
+		if v := r.FormValue("address"); v != "" {
+			var address map[string]any
+			err := json.Unmarshal([]byte(v), &address)
+			if err != nil {
+				fmt.Println(err)
+				w.WriteHeader(http.StatusInternalServerError)
+				return
+			}
+			dataMap["address"] = address
+		}
+		if v := r.FormValue("informations"); v != "" {
+			dataMap["informations"] = v
+		}
+		if v := r.FormValue("licence_plate"); v != "" {
+			dataMap["licence_plate"] = v
+		}
+		if v := r.FormValue("automatic"); v != "" {
+			fmt.Println(v)
+			dataMap["automatic"] = (v == "on")
+		}
+
+		data, err := structpb.NewValue(dataMap)
+		if err != nil {
+			fmt.Println(err)
+			w.WriteHeader(http.StatusInternalServerError)
+			return
+		}
+
+		request := &fleets.UpdateVehicleRequest{
+			Vehicle: &fleets.Vehicle{
+				Id:             vehicleID,
+				Namespace:      namespaceV,
+				Type:           r.FormValue("type"),
+				Administrators: administratorsV,
+				Data:           data.GetStructValue(),
+			},
+		}
+
+		resp, err := h.services.GRPC.Fleets.UpdateVehicle(context.TODO(), request)
+
+		if err != nil {
+			fmt.Println(err)
+			w.WriteHeader(http.StatusInternalServerError)
+			return
+		}
+
+		http.Redirect(w, r, fmt.Sprintf("/app/vehicles-management/fleet/%s", resp.Vehicle.Id), http.StatusFound)
+		return
+	}
+	vehicles_types := h.config.GetStringSlice("modules.fleets.vehicle_types")
+	h.Renderer.VehiclesFleetUpdate(w, r, resp.Vehicle.ToStorageType(), vehicles_types)
+}

handlers/application/vehicles.go

@@ -13,11 +13,11 @@ import (
 	"git.coopgo.io/coopgo-apps/parcoursmob/utils/sorting"
 	filestorage "git.coopgo.io/coopgo-apps/parcoursmob/utils/storage"
 	fleets "git.coopgo.io/coopgo-platform/fleets/grpcapi"
+	"git.coopgo.io/coopgo-platform/fleets/storage"
 	groupsmanagement "git.coopgo.io/coopgo-platform/groups-management/grpcapi"
-	"git.coopgo.io/coopgo-platform/groups-management/storage"
+	groupsmanagementstorage "git.coopgo.io/coopgo-platform/groups-management/storage"
 	mobilityaccounts "git.coopgo.io/coopgo-platform/mobility-accounts/grpcapi"
 	mobilityaccountsstorage "git.coopgo.io/coopgo-platform/mobility-accounts/storage"
-	"github.com/coreos/go-oidc"
 	"github.com/google/uuid"
 	"github.com/gorilla/mux"
 	"google.golang.org/protobuf/types/known/structpb"
@@ -136,32 +136,20 @@ func (h ApplicationHandler) VehiclesSearch(w http.ResponseWriter, r *http.Reques
 }
 
 func (h ApplicationHandler) Book(w http.ResponseWriter, r *http.Request) {
-	// Get Group
-	g := r.Context().Value(identification.GroupKey)
-	if g == nil {
-		fmt.Println("no current group")
+	fmt.Println("Book")
+	current_group, err := h.currentGroup(r)
+	if err != nil {
+		fmt.Println(err)
 		w.WriteHeader(http.StatusInternalServerError)
 		return
 	}
-	current_group := g.(storage.Group)
 
-	// Get current user ID
-	u := r.Context().Value(identification.IdtokenKey)
-	if u == nil {
-		fmt.Println("no current user")
+	current_user_token, current_user_claims, err := h.currentUser(r)
+	if err != nil {
+		fmt.Println(err)
 		w.WriteHeader(http.StatusInternalServerError)
 		return
 	}
-	current_user_token := u.(*oidc.IDToken)
-
-	// Get current user claims
-	c := r.Context().Value(identification.ClaimsKey)
-	if c == nil {
-		fmt.Println("no current user claims")
-		w.WriteHeader(http.StatusInternalServerError)
-		return
-	}
-	current_user_claims := c.(map[string]any)
 
 	vars := mux.Vars(r)
 	vehicleid := vars["vehicleid"]
@@ -178,7 +166,7 @@ func (h ApplicationHandler) Book(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	r.ParseMultipartForm(10 * 1024 * 1024)
+	r.ParseMultipartForm(100 * 1024 * 1024)
 
 	start := r.FormValue("startdate")
 	end := r.FormValue("enddate")
@@ -190,7 +178,7 @@ func (h ApplicationHandler) Book(w http.ResponseWriter, r *http.Request) {
 		"booked_by": map[string]any{
 			"user": map[string]any{
 				"id":           current_user_token.Subject,
-				"display_name": current_user_claims["display_name"],
+				"display_name": fmt.Sprintf("%s %s", current_user_claims["first_name"], current_user_claims["last_name"]),
 			},
 			"group": map[string]any{
 				"id":   current_group.ID,
@@ -220,7 +208,6 @@ func (h ApplicationHandler) Book(w http.ResponseWriter, r *http.Request) {
 		Booking: booking,
 	}
 
-	fmt.Println(r.FormFile("doc-identity_proof"))
 	for _, v := range h.config.GetStringSlice("modules.fleets.booking_documents.mandatory") {
 		existing_file := r.FormValue("type-" + v)
 		if existing_file == "" {
@@ -269,9 +256,11 @@ func (h ApplicationHandler) Book(w http.ResponseWriter, r *http.Request) {
 		fmt.Println(err)
 	} else {
 		for _, m := range members {
-			h.emailing.Send("fleets.bookings.creation_admin_alert", m.Data["email"].(string), map[string]string{
-				"bookingid": booking.Id,
-			})
+			if email, ok := m.Data["email"].(string); ok {
+				h.emailing.Send("fleets.bookings.creation_admin_alert", email, map[string]string{
+					"bookingid": booking.Id,
+				})
+			}
 		}
 	}
 
@@ -301,9 +290,9 @@ func (h ApplicationHandler) VehicleBookingDisplay(w http.ResponseWriter, r *http
 
 	beneficiaryresp, err := h.services.GRPC.MobilityAccounts.GetAccount(context.TODO(), beneficiaryrequest)
 	if err != nil {
-		fmt.Println(err)
-		w.WriteHeader(http.StatusInternalServerError)
-		return
+		beneficiaryresp = &mobilityaccounts.GetAccountResponse{
+			Account: &mobilityaccounts.Account{},
+		}
 	}
 
 	grouprequest := &groupsmanagement.GetGroupRequest{
@@ -324,6 +313,15 @@ func (h ApplicationHandler) VehicleBookingDisplay(w http.ResponseWriter, r *http
 }
 
 func (h ApplicationHandler) VehiclesBookingsList(w http.ResponseWriter, r *http.Request) {
+
+	g := r.Context().Value(identification.GroupKey)
+	if g == nil {
+		w.WriteHeader(http.StatusBadRequest)
+		return
+	}
+
+	group := g.(groupsmanagementstorage.Group)
+
 	request := &fleets.GetBookingsRequest{}
 	resp, err := h.services.GRPC.Fleets.GetBookings(context.TODO(), request)
 	if err != nil {
@@ -332,13 +330,26 @@ func (h ApplicationHandler) VehiclesBookingsList(w http.ResponseWriter, r *http.
 		return
 	}
 
-	bookings := []any{}
+	bookings := []storage.Booking{}
 
 	for _, b := range resp.Bookings {
-		bookings = append(bookings, b.ToStorageType())
+		booking := b.ToStorageType()
+		if b1, ok := booking.Data["booked_by"].(map[string]any); ok {
+			if b2, ok := b1["group"].(map[string]any); ok {
+				if b2["id"] == group.ID {
+					bookings = append(bookings, booking)
+				}
+			}
+		}
+
 	}
 
-	h.Renderer.VehicleBookingsList(w, r, bookings)
+	sort.Sort(sorting.BookingsByStartdate(bookings))
+
+	vehicles, _ := h.services.GetVehiclesMap()
+	groups, _ := h.services.GetGroupsMap()
+
+	h.Renderer.VehicleBookingsList(w, r, bookings, vehicles, groups)
 }
 
 func (h *ApplicationHandler) BookingDocumentDownload(w http.ResponseWriter, r *http.Request) {

handlers/auth/disconnect.go

@@ -0,0 +1,13 @@
+package auth
+
+import "net/http"
+
+func (h *AuthHandler) Disconnect(w http.ResponseWriter, r *http.Request) {
+	session, err := h.idp.SessionsStore.Get(r, "parcoursmob_session")
+	if err == nil {
+		session.Options.MaxAge = -1
+		session.Save(r, w)
+	}
+
+	http.Redirect(w, r, "/", http.StatusOK)
+}

handlers/auth/onboarding.go

@@ -37,7 +37,7 @@ func (h *AuthHandler) Onboarding(w http.ResponseWriter, r *http.Request) {
 		if onboardingmap["admin"].(bool) {
 			groups = append(groups, onboardingmap["group"].(string)+":admin")
 		}
-
+		display_name := fmt.Sprint(r.FormValue("first_name")) + " " + fmt.Sprint(r.FormValue("last_name"))
 		account := &ma.Account{
 			Authentication: ma.AccountAuth{
 				Local: ma.LocalAuth{
@@ -46,11 +46,13 @@ func (h *AuthHandler) Onboarding(w http.ResponseWriter, r *http.Request) {
 				},
 			},
 			Namespace: "parcoursmob",
+
 			Data: map[string]any{
-				"first_name": r.FormValue("first_name"),
-				"last_name":  r.FormValue("last_name"),
-				"email":      onboardingmap["username"],
-				"groups":     groups,
+				"display_name": display_name,
+				"first_name":   r.FormValue("first_name"),
+				"last_name":    r.FormValue("last_name"),
+				"email":        onboardingmap["username"],
+				"groups":       groups,
 			},
 		}
 

handlers/exports/agenda.go

@@ -0,0 +1,196 @@
+package exports
+
+import (
+	"context"
+	"fmt"
+	"git.coopgo.io/coopgo-apps/parcoursmob/utils/sorting"
+	agenda "git.coopgo.io/coopgo-platform/agenda/grpcapi"
+	agendastorage "git.coopgo.io/coopgo-platform/agenda/storage"
+	groupsmanagement "git.coopgo.io/coopgo-platform/groups-management/grpcapi"
+	groupsstorage "git.coopgo.io/coopgo-platform/groups-management/storage"
+	accounts "git.coopgo.io/coopgo-platform/mobility-accounts/grpcapi"
+	accountsstorage "git.coopgo.io/coopgo-platform/mobility-accounts/storage"
+	"github.com/gorilla/mux"
+	"github.com/xuri/excelize/v2"
+	"net/http"
+	"sort"
+)
+
+func (h *ExportsHandler) Agenda(filter string) func(w http.ResponseWriter, r *http.Request) {
+	switch filter {
+	case "allEvents":
+		return func(w http.ResponseWriter, r *http.Request) {
+			resp, err := h.services.GRPC.Agenda.GetEvents(context.TODO(), &agenda.GetEventsRequest{
+				Namespaces: []string{"parcoursmob_dispositifs"},
+			})
+			if err != nil {
+				fmt.Println(err)
+				w.WriteHeader(http.StatusInternalServerError)
+				return
+			}
+
+			events := []agendastorage.Event{}
+
+			groupids := []string{}
+			beneficiaries_ids := []string{}
+			for _, e := range resp.Events {
+				groupids = append(groupids, e.Owners...)
+				events = append(events, e.ToStorageType())
+
+				for _, subscriptions := range e.Subscriptions {
+					beneficiaries_ids = append(beneficiaries_ids, subscriptions.Subscriber)
+				}
+			}
+
+			sort.Sort(sorting.EventsByStartdate(events))
+
+			groupsresp, err := h.services.GRPC.GroupsManagement.GetGroupsBatch(context.TODO(), &groupsmanagement.GetGroupsBatchRequest{
+				Groupids: groupids,
+			})
+			groups := map[string]groupsstorage.Group{}
+
+			if err == nil {
+				for _, g := range groupsresp.Groups {
+					groups[g.Id] = g.ToStorageType()
+				}
+			}
+
+			beneficiaries, err := h.services.GRPC.MobilityAccounts.GetAccountsBatch(context.TODO(), &accounts.GetAccountsBatchRequest{
+				Accountids: beneficiaries_ids,
+			})
+			if err != nil {
+				fmt.Println(err)
+				w.WriteHeader(http.StatusInternalServerError)
+				return
+			}
+
+			beneficiaries_map := map[string]accountsstorage.Account{}
+			for _, ben := range beneficiaries.Accounts {
+				beneficiaries_map[ben.Id] = ben.ToStorageType()
+			}
+
+			f := h.generateExcel(events, groups, beneficiaries_map)
+
+			h.writeFileResponse(f, w)
+		}
+
+	case "oneEvent":
+		return func(w http.ResponseWriter, r *http.Request) {
+			vars := mux.Vars(r)
+			eventId := vars["eventid"]
+			resp, err := h.services.GRPC.Agenda.GetEvent(context.TODO(), &agenda.GetEventRequest{
+				Id: eventId,
+			})
+			if err != nil {
+				fmt.Println(err)
+				w.WriteHeader(http.StatusInternalServerError)
+				return
+			}
+			groupids := []string{}
+			beneficiaries_ids := []string{}
+			groupids = append(groupids, resp.Event.Owners...)
+			for _, subscriptions := range resp.Event.Subscriptions {
+				beneficiaries_ids = append(beneficiaries_ids, subscriptions.Subscriber)
+			}
+			groupsresp, err := h.services.GRPC.GroupsManagement.GetGroupsBatch(context.TODO(), &groupsmanagement.GetGroupsBatchRequest{
+				Groupids: groupids,
+			})
+			groups := map[string]groupsstorage.Group{}
+
+			if err == nil {
+				for _, g := range groupsresp.Groups {
+					groups[g.Id] = g.ToStorageType()
+				}
+			}
+
+			beneficiaries, err := h.services.GRPC.MobilityAccounts.GetAccountsBatch(context.TODO(), &accounts.GetAccountsBatchRequest{
+				Accountids: beneficiaries_ids,
+			})
+			if err != nil {
+				fmt.Println(err)
+				w.WriteHeader(http.StatusInternalServerError)
+				return
+			}
+
+			beneficiaries_map := map[string]accountsstorage.Account{}
+			for _, ben := range beneficiaries.Accounts {
+				beneficiaries_map[ben.Id] = ben.ToStorageType()
+			}
+
+			f := h.generateExcel([]agendastorage.Event{resp.Event.ToStorageType()}, groups, beneficiaries_map)
+			h.writeFileResponse(f, w)
+
+		}
+	}
+	return nil
+}
+
+func (h *ExportsHandler) generateExcel(events []agendastorage.Event, groups map[string]groupsstorage.Group,
+	beneficiaries_map map[string]accountsstorage.Account) *excelize.File {
+	f := excelize.NewFile()
+	defer func() {
+		if err := f.Close(); err != nil {
+			fmt.Println(err)
+		}
+	}()
+	f.SetCellValue("Sheet1", "A1", "Evénement")
+	f.SetCellValue("Sheet1", "B1", "Date de début")
+	f.SetCellValue("Sheet1", "C1", "Date de fin")
+	f.SetCellValue("Sheet1", "D1", "Nom bénéficiaire")
+	f.SetCellValue("Sheet1", "E1", "Prenom bénéficiaire")
+	f.SetCellValue("Sheet1", "F1", "Numéro allocataire / Pole emploi")
+	f.SetCellValue("Sheet1", "G1", "Prescipteur")
+	f.SetCellValue("Sheet1", "H1", "Prescipteur Nom")
+	f.SetCellValue("Sheet1", "I1", "Gestionnaire événement")
+	i := 2
+	for _, e := range events {
+		if len(e.Owners) == 0 {
+			continue
+		}
+		admin := groups[e.Owners[0]]
+
+		subscribedbygroup := ""
+		subscribedbyuser := ""
+		if v, ok := e.Data["subscribed_by"].(map[string]any); ok {
+			if v2, ok := v["group"].(map[string]any); ok {
+				if v3, ok := v2["id"].(string); ok {
+					subscribedbygroup = v3
+				}
+
+			}
+			if v4, ok := v["user"].(map[string]any); ok {
+				if v5, ok := v4["display_name"].(string); ok {
+					subscribedbyuser = v5
+				}
+
+			}
+		}
+
+		for _, s := range e.Subscriptions {
+
+			beneficiary := beneficiaries_map[s.Subscriber]
+
+			f.SetCellValue("Sheet1", fmt.Sprintf("A%d", i), e.Name)
+			f.SetCellValue("Sheet1", fmt.Sprintf("B%d", i), e.Startdate.Format("2006-01-02"))
+			f.SetCellValue("Sheet1", fmt.Sprintf("C%d", i), e.Enddate.Format("2006-01-02"))
+			f.SetCellValue("Sheet1", fmt.Sprintf("D%d", i), beneficiary.Data["last_name"])
+			f.SetCellValue("Sheet1", fmt.Sprintf("E%d", i), beneficiary.Data["first_name"])
+			f.SetCellValue("Sheet1", fmt.Sprintf("F%d", i), beneficiary.Data["file_number"])
+			f.SetCellValue("Sheet1", fmt.Sprintf("G%d", i), groups[subscribedbygroup].Data["name"])
+			f.SetCellValue("Sheet1", fmt.Sprintf("H%d", i), subscribedbyuser)
+			f.SetCellValue("Sheet1", fmt.Sprintf("I%d", i), admin.Data["name"])
+			i = i + 1
+		}
+
+	}
+	return f
+
+}
+
+func (h *ExportsHandler) writeFileResponse(file *excelize.File, w http.ResponseWriter) {
+	w.Header().Set("Content-Type", "application/octet-stream")
+	w.Header().Set("Content-Disposition", "attachment; filename="+"Workbook.xlsx")
+	w.Header().Set("Content-Transfer-Encoding", "binary")
+	w.Header().Set("Expires", "0")
+	file.Write(w)
+}

handlers/exports/exports.go

@@ -0,0 +1,21 @@
+package exports
+
+import (
+	"git.coopgo.io/coopgo-apps/parcoursmob/services"
+	"git.coopgo.io/coopgo-platform/emailing"
+	"github.com/spf13/viper"
+)
+
+type ExportsHandler struct {
+	config   *viper.Viper
+	services *services.ServicesHandler
+	emailing *emailing.Mailer
+}
+
+func NewExportsHandler(cfg *viper.Viper, svc *services.ServicesHandler, emailing *emailing.Mailer) (*ExportsHandler, error) {
+	return &ExportsHandler{
+		config:   cfg,
+		services: svc,
+		emailing: emailing,
+	}, nil
+}

handlers/exports/fleets.go

@@ -0,0 +1,163 @@
+package exports
+
+import (
+	"context"
+	"fmt"
+	"net/http"
+
+	"git.coopgo.io/coopgo-apps/parcoursmob/utils/identification"
+	fleets "git.coopgo.io/coopgo-platform/fleets/grpcapi"
+	fleetsstorage "git.coopgo.io/coopgo-platform/fleets/storage"
+	groupsmanagement "git.coopgo.io/coopgo-platform/groups-management/grpcapi"
+	groupsstorage "git.coopgo.io/coopgo-platform/groups-management/storage"
+	accounts "git.coopgo.io/coopgo-platform/mobility-accounts/grpcapi"
+	accountsstorage "git.coopgo.io/coopgo-platform/mobility-accounts/storage"
+	"github.com/xuri/excelize/v2"
+)
+
+func (h *ExportsHandler) Bookings(w http.ResponseWriter, r *http.Request) {
+
+	vehicles := map[string]fleetsstorage.Vehicle{}
+	bookings := []fleetsstorage.Booking{}
+	reequest := &fleets.GetVehiclesRequest{
+		Namespaces: []string{"parcoursmob"},
+	}
+	reesp, err := h.services.GRPC.Fleets.GetVehicles(context.TODO(), reequest)
+	if err != nil {
+		fmt.Println(err)
+		w.WriteHeader(http.StatusInternalServerError)
+		return
+	}
+
+	beneficiaries_ids := []string{}
+
+	for _, vehicle := range reesp.Vehicles {
+
+		v := vehicle.ToStorageType()
+		fmt.Println(v)
+
+		for _, b := range v.Bookings {
+			bookings = append(bookings, b)
+			beneficiaries_ids = append(beneficiaries_ids, b.Driver)
+		}
+
+		vehicles[vehicle.Id] = v
+
+	}
+
+
+	groups := map[string]groupsstorage.Group{}
+
+	admingroups, err := h.services.GRPC.GroupsManagement.GetGroups(context.TODO(), &groupsmanagement.GetGroupsRequest{
+		Namespaces: []string{"parcoursmob_organizations"},
+	})
+	if err != nil {
+		fmt.Println(err)
+		w.WriteHeader(http.StatusInternalServerError)
+		return
+	}
+
+	for _, g := range admingroups.Groups {
+		groups[g.Id] = g.ToStorageType()
+	}
+
+	beneficiaries, err := h.services.GRPC.MobilityAccounts.GetAccountsBatch(context.TODO(), &accounts.GetAccountsBatchRequest{
+		Accountids: beneficiaries_ids,
+	})
+	if err != nil {
+		fmt.Println(err)
+		w.WriteHeader(http.StatusInternalServerError)
+		return
+	}
+
+	beneficiaries_map := map[string]accountsstorage.Account{}
+	for _, ben := range beneficiaries.Accounts {
+		beneficiaries_map[ben.Id] = ben.ToStorageType()
+	}
+
+	/////////////// Generate file
+
+	f := excelize.NewFile()
+	defer func() {
+		if err := f.Close(); err != nil {
+			fmt.Println(err)
+		}
+	}()
+
+	f.SetCellValue("Sheet1", "A1", "Numéro")
+	f.SetCellValue("Sheet1", "B1", "Type")
+	f.SetCellValue("Sheet1", "C1", "Gestionnaire")
+	f.SetCellValue("Sheet1", "D1", "Prescripteur")
+	f.SetCellValue("Sheet1", "E1", "Bénéficiaire")
+	f.SetCellValue("Sheet1", "F1", "Numéro allocataire / Pole emploi")
+	f.SetCellValue("Sheet1", "G1", "Début de Mise à disposition")
+	f.SetCellValue("Sheet1", "H1", "Fin de mise à disposition")
+	f.SetCellValue("Sheet1", "I1", "Début indisponibilité")
+	f.SetCellValue("Sheet1", "J1", "Fin indisponibilité")
+	f.SetCellValue("Sheet1", "K1", "Retrait par le gestionnaire")
+	f.SetCellValue("Sheet1", "L1", "Commentaire")
+
+	i := 2
+	for _, b := range bookings {
+		vehicle := vehicles[b.Vehicleid]
+		if len(vehicle.Administrators) == 0 {
+			continue
+		}
+		admin := groups[vehicle.Administrators[0]]
+
+		bookedby := ""
+		if v, ok := b.Data["booked_by"].(map[string]any); ok {
+			if v2, ok := v["user"].(map[string]any); ok {
+				if v3, ok := v2["display_name"].(string); ok {
+					bookedby = v3
+				}
+
+			}
+		}
+
+		bookedbygroup := ""
+		if v4, ok := b.Data["booked_by"].(map[string]any); ok {
+			if v5, ok := v4["group"].(map[string]any); ok {
+				if v6, ok := v5["id"].(string); ok {
+					bookedbygroup = v6
+				}
+			}
+		}
+
+		// filter by group
+		g := r.Context().Value(identification.GroupKey)
+		group := g.(groupsstorage.Group)
+		
+		if bookedbygroup != group.ID {
+			continue
+		}
+
+		beneficiary := beneficiaries_map[b.Driver]
+		adminunavailability := false
+
+		if av, ok := b.Data["administrator_unavailability"].(bool); ok && av {
+			adminunavailability = true
+		}
+
+		f.SetCellValue("Sheet1", fmt.Sprintf("A%d", i), vehicle.Data["licence_plate"])
+		f.SetCellValue("Sheet1", fmt.Sprintf("B%d", i), vehicle.Type)
+		f.SetCellValue("Sheet1", fmt.Sprintf("C%d", i), admin.Data["name"])
+		f.SetCellValue("Sheet1", fmt.Sprintf("D%d", i), bookedby)
+		f.SetCellValue("Sheet1", fmt.Sprintf("E%d", i), fmt.Sprintf("%v %v", beneficiary.Data["first_name"], beneficiary.Data["last_name"]))
+		f.SetCellValue("Sheet1", fmt.Sprintf("F%d", i), beneficiary.Data["file_number"])
+		f.SetCellValue("Sheet1", fmt.Sprintf("G%d", i), b.Startdate.Format("2006-01-02"))
+		f.SetCellValue("Sheet1", fmt.Sprintf("H%d", i), b.Enddate.Format("2006-01-02"))
+		f.SetCellValue("Sheet1", fmt.Sprintf("I%d", i), b.Unavailablefrom.Format("2006-01-02"))
+		f.SetCellValue("Sheet1", fmt.Sprintf("J%d", i), b.Unavailableto.Format("2006-01-02"))
+		f.SetCellValue("Sheet1", fmt.Sprintf("K%d", i), adminunavailability)
+		f.SetCellValue("Sheet1", fmt.Sprintf("L%d", i), b.Data["comment"])
+		i = i + 1
+	}
+
+	w.Header().Set("Content-Type", "application/octet-stream")
+	w.Header().Set("Content-Disposition", "attachment; filename="+"Workbook.xlsx")
+	w.Header().Set("Content-Transfer-Encoding", "binary")
+	w.Header().Set("Expires", "0")
+	f.Write(w)
+
+}

main.go

@@ -9,6 +9,7 @@ import (
 	"git.coopgo.io/coopgo-apps/parcoursmob/handlers/api"
 	"git.coopgo.io/coopgo-apps/parcoursmob/handlers/application"
 	"git.coopgo.io/coopgo-apps/parcoursmob/handlers/auth"
+	"git.coopgo.io/coopgo-apps/parcoursmob/handlers/exports"
 	"git.coopgo.io/coopgo-apps/parcoursmob/renderer"
 	"git.coopgo.io/coopgo-apps/parcoursmob/services"
 	"git.coopgo.io/coopgo-apps/parcoursmob/utils/identification"
@@ -26,6 +27,7 @@ func main() {
 		address              = cfg.GetString("server.listen")
 		service_name         = cfg.GetString("service_name")
 		templates_public_dir = cfg.GetString("templates.public_dir")
+		dev_env              = cfg.GetBool("dev_env")
 	)
 
 	svc, err := services.NewServicesHandler(cfg)
@@ -52,15 +54,20 @@ func main() {
 
 	apiHandler, _ := api.NewAPIHandler(cfg, idp, svc, kv)
 	applicationHandler, _ := application.NewApplicationHandler(cfg, svc, kv, filestorage, emailing)
+	exportsHandler, _ := exports.NewExportsHandler(cfg, svc, emailing)
 	authHandler, _ := auth.NewAuthHandler(cfg, idp, svc, kv, emailing)
 
 	fmt.Println("Running", service_name, ":")
+	if dev_env {
+		fmt.Printf("\033]0;%s\007", service_name)
+	}
 
 	r := mux.NewRouter()
 
 	r.PathPrefix("/public/").Handler(http.StripPrefix("/public/", http.FileServer(http.Dir(templates_public_dir))))
 
 	r.HandleFunc("/auth/onboarding", authHandler.Onboarding)
+	r.HandleFunc("/auth/disconnect", authHandler.Disconnect)
 	r.HandleFunc("/auth/lost-password", authHandler.LostPasswordInit)
 	r.HandleFunc("/auth/lost-password/recover", authHandler.LostPasswordRecover)
 	r.HandleFunc("/auth/groups/", authHandler.Groups)
@@ -84,6 +91,9 @@ func main() {
 	application.HandleFunc("/beneficiaries/{beneficiaryid}/documents/{document}", applicationHandler.BeneficiaryDocumentDownload)
 	application.HandleFunc("/beneficiaries/{beneficiaryid}/picture", applicationHandler.BeneficiaryPicture)
 	application.HandleFunc("/members/{beneficiaryid}/picture", applicationHandler.BeneficiaryPicture)
+	application.HandleFunc("/members/{adminid}", applicationHandler.MemberDisplay)
+	application.HandleFunc("/members/{adminid}/update", applicationHandler.MemberUpdate)
+	application.HandleFunc("/members/", applicationHandler.MembersList)
 	application.HandleFunc("/journeys/", applicationHandler.JourneysSearch)
 	application.HandleFunc("/vehicles/", applicationHandler.VehiclesSearch)
 	application.HandleFunc("/vehicles/bookings/", applicationHandler.VehiclesBookingsList)
@@ -97,30 +107,41 @@ func main() {
 	application.HandleFunc("/vehicles-management/fleet/{vehicleid}/update", applicationHandler.VehiclesFleetUpdate)
 	application.HandleFunc("/vehicles-management/bookings/", applicationHandler.VehiclesManagementBookingsList)
 	application.HandleFunc("/vehicles-management/bookings/{bookingid}", applicationHandler.VehicleManagementBookingDisplay)
+	application.HandleFunc("/vehicles-management/bookings/{bookingid}/change-vehicle", applicationHandler.VehicleManagementBookingChangeVehicle)
+	/////////////////////////////////////Remove booking vehicle/////////////////////////////////////////
+	application.HandleFunc("/vehicles-management/bookings/{bookingid}/delete", applicationHandler.UnbookingVehicle)
+	////////////////////////////////////////////////////////////////////////////////////////////////////
 	application.HandleFunc("/vehicles-management/bookings/{bookingid}/documents/{document}", applicationHandler.BookingDocumentDownload)
 	application.HandleFunc("/agenda/", applicationHandler.AgendaHome)
+	application.HandleFunc("/agenda/history", applicationHandler.AgendaHistory)
 	application.HandleFunc("/agenda/create-event", applicationHandler.AgendaCreateEvent)
 	application.HandleFunc("/agenda/{eventid}", applicationHandler.AgendaDisplayEvent)
+	///////////////////////////////Code to modify event///////////////////////
+	application.HandleFunc("/agenda/{eventid}/update", applicationHandler.AgendaUpdateEvent)
+	application.HandleFunc("/agenda/{eventid}/delete", applicationHandler.AgendaDeleteEvent)
+
+	/////////////////////////////////////////////////////
 	application.HandleFunc("/agenda/{eventid}/subscribe", applicationHandler.AgendaSubscribeEvent)
 	application.HandleFunc("/directory/", applicationHandler.DirectoryHome)
 
 	application.HandleFunc("/group/settings", applicationHandler.GroupSettingsDisplay)
 	application.HandleFunc("/group/settings/invite-member", applicationHandler.GroupSettingsInviteMember)
 
+	/****************************Groupe Déplacement ************************************/
+	application.HandleFunc("/journeys/groups_covoiturage", applicationHandler.GroupsGestion)
+	application.HandleFunc("/journeys/groups_covoiturage/create", applicationHandler.CreateGroup)
+	application.HandleFunc("/journeys/groups_covoiturage/create/{groupid}", applicationHandler.DisplayGroupCovoiturage)
+	application.HandleFunc("/journeys/groups_covoiturage/create/{id}/{groupid}/{memberid}", applicationHandler.UpdateGroupCovoiturage)
+	/****************************************************************/
+
 	/********************Code Supprt Emailing************************/
 	application.HandleFunc("/support/", applicationHandler.SupportSend)
-	// application.HandleFunc("/group_module/", applicationHandler.GroupModule)
-	// application.HandleFunc("/group_module/create", applicationHandler.GroupModuleCreate)
 	/*********************** CODE GROUP **************************/
+
 	appGroup := application.PathPrefix("/group_module").Subrouter()
 	appGroup.HandleFunc("/", applicationHandler.Groups)
 	appGroup.HandleFunc("/groups", applicationHandler.CreateGroupModule)
-	//appGroup.HandleFunc("/createBeneficaire", applicationHandler.CreateGroupBeneficaire)
-	//appGroup.HandleFunc("/groups/{groupid}/createBeneficaire", applicationHandler.BeneficaireSearch)
-	//appGroup.HandleFunc("/groups/{groupid}/{beneficiaryid}", applicationHandler.DisplayGroupBeneficaire)
 	appGroup.HandleFunc("/groups/{groupid}", applicationHandler.DisplayGroupModule)
-	//appGroup.HandleFunc("/groups/{groupid}/invite-admin", applicationHandler.AdministrationGroupInviteAdmin)
-	/****************************************************************/
 
 	//TODO Subrouters with middlewares checking security for each module ?
 	application.Use(idp.Middleware)
@@ -132,7 +153,24 @@ func main() {
 	appAdmin.HandleFunc("/groups/{groupid}", applicationHandler.AdministrationGroupDisplay)
 	appAdmin.HandleFunc("/groups/{groupid}/invite-admin", applicationHandler.AdministrationGroupInviteAdmin)
 	appAdmin.HandleFunc("/groups/{groupid}/invite-member", applicationHandler.AdministrationGroupInviteMember)
-	//TODO Secure with Middleware checking for modules
+	//add statistiques
+	appAdmin.HandleFunc("/stats/vehicles", applicationHandler.AdminStatVehicles)
+	appAdmin.HandleFunc("/stats/bookings", applicationHandler.AdminStatBookings)
+	appAdmin.HandleFunc("/stats/beneficaires", applicationHandler.AdminStatBeneficaires)
+	appAdmin.HandleFunc("/stats/events", applicationHandler.AdminStatEvents)
+
+	/////////////////////////////////////Delete subscriber///////////////////////////////////////////////
+	application.HandleFunc("/agenda/{eventid}/{subscribeid}/delete", applicationHandler.AgendaDeleteSubscribeEvent)
+	application.HandleFunc("/agenda/{eventid}/history", applicationHandler.AgendaHistoryEvent)
+	/////////////////////////////////////////////////////////////////////////////////////////////////////
+
+	export := r.PathPrefix("/exports").Subrouter()
+	export.HandleFunc("/fleets/bookings", exportsHandler.Bookings)
+	export.HandleFunc("/fleets/bookings/{groupid}", exportsHandler.Bookings)
+	export.HandleFunc("/agenda/subscriptions", exportsHandler.Agenda("allEvents"))
+	export.HandleFunc("/agenda/{eventid}", exportsHandler.Agenda("oneEvent"))
+	export.Use(idp.Middleware)
+	export.Use(idp.GroupsMiddleware)
 
 	fmt.Println("-> HTTP server listening on", address)
 

renderer/administration.go

@@ -1,18 +1,26 @@
 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, groups 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{
-		"groups": groups,
+		"accounts":      accounts,
+		"beneficiaries": beneficiaries,
+		"bookings":      bookings,
+		"groups":        groups,
+		"events":        events,
 	}
 
 	renderer.Render("administration", w, r, files, state)
@@ -36,3 +44,71 @@ 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)
+}
+
+func (renderer *Renderer) AdminStatBookings(w http.ResponseWriter, r *http.Request, vehicles map[string]fleetsstorage.Vehicle, bookings []fleetsstorage.Booking, admingroups map[string]any, beneficiaries map[string]any) {
+	files := renderer.ThemeConfig.GetStringSlice("views.administration.bookings_list.files")
+	state := NewState(r, renderer.ThemeConfig, administrationMenu)
+	state.ViewState = map[string]any{
+		"vehicles_map":      vehicles,
+		"bookings":          bookings,
+		"admingroups":       admingroups,
+		"beneficiaries_map": beneficiaries,
+	}
+
+	renderer.Render("bookings_stats", w, r, files, state)
+}

renderer/agenda.go

@@ -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)
+}

renderer/beneficiaries.go

@@ -52,7 +52,7 @@ type BeneficiariesDisplayState struct {
 	Beneficiary any
 }
 
-func (renderer *Renderer) BeneficiaryDisplay(w http.ResponseWriter, r *http.Request, beneficiary any, bookings []any, beneficiaries_file_types []string, file_types_map map[string]string, documents any) {
+func (renderer *Renderer) BeneficiaryDisplay(w http.ResponseWriter, r *http.Request, beneficiary any, bookings []any, organizations []any, beneficiaries_file_types []string, file_types_map map[string]string, documents any) {
 	files := renderer.ThemeConfig.GetStringSlice("views.beneficiaries.display.files")
 	state := NewState(r, renderer.ThemeConfig, beneficiariesMenu)
 	state.ViewState = map[string]any{
@@ -61,6 +61,7 @@ func (renderer *Renderer) BeneficiaryDisplay(w http.ResponseWriter, r *http.Requ
 		"beneficiaries_file_types": beneficiaries_file_types,
 		"file_types_map":           file_types_map,
 		"documents":                documents,
+		"organizations":            organizations,
 	}
 
 	renderer.Render("beneficiaries_display", w, r, files, state)

renderer/func-maps.go

@@ -1,9 +1,11 @@
 package renderer
 
 import (
+	"bytes"
 	"encoding/json"
 	"fmt"
 	"html/template"
+	"strings"
 	"time"
 
 	"gitlab.scity.coop/maas/navitia-golang/types"
@@ -23,6 +25,17 @@ func TimeFrom(d any) *time.Time {
 	return nil
 }
 
+func TimeFormat(d any, f string) string {
+	date := TimeFrom(d)
+	if date == nil {
+		return ""
+	}
+	if date.Before(time.Now().Add(-24 * 365 * 30 * time.Hour)) {
+		return ""
+	}
+	return date.Format(f)
+}
+
 func GenderISO5218(d any) string {
 	if date, ok := d.(string); ok {
 		switch date {
@@ -56,6 +69,22 @@ func JSON(v any) template.JS {
 	return template.JS(result)
 }
 
+func RawJSON(v any) string {
+	buf := new(bytes.Buffer)
+	enc := json.NewEncoder(buf)
+	enc.SetEscapeHTML(false)
+	err := enc.Encode(&v)
+	if err != nil {
+		return ""
+	}
+	return strings.TrimSuffix(buf.String(), "\n")
+
+}
+
+func UnescapeHTML(s string) template.HTML {
+	return template.HTML(s)
+}
+
 func Dict(v ...interface{}) map[string]interface{} {
 	dict := map[string]interface{}{}
 	lenv := len(v)

renderer/group_module.go

@@ -2,9 +2,10 @@ package renderer
 
 import (
 	"encoding/json"
-	"fmt"
 	"html/template"
 	"net/http"
+
+	mobilityaccountsstorage "git.coopgo.io/coopgo-platform/mobility-accounts/storage"
 )
 
 const groupMenu = "group_module"
@@ -47,7 +48,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)
 
@@ -70,12 +71,7 @@ func (renderer *Renderer) DisplayGroupModule(w http.ResponseWriter, r *http.Requ
 
 	}
 
-	fmt.Println(beneficiary)
-
 	state.ViewState = viewstate
-	fmt.Println("èèèèèèèèèèèèèèèèèèèèèèèèèè")
-	fmt.Println(state.ViewState)
-	fmt.Println(group)
 
 	renderer.Render("beneficiaries_list", w, r, files, state)
 }

renderer/journeys.go

@@ -1,9 +1,40 @@
 package renderer
 
-import "net/http"
+import (
+	"encoding/json"
+	"html/template"
+	"net/http"
+
+	groupstorage "git.coopgo.io/coopgo-platform/groups-management/storage"
+	mobilityaccountsstorage "git.coopgo.io/coopgo-platform/mobility-accounts/storage"
+)
 
 const journeysMenu = "journeys"
 
+type BeneficiariesCovoiturage struct {
+	Group         string `json:"group"`
+	Count         int    `json:"count"`
+	CacheId       string `json:"cache_id"`
+	Beneficiaries []any  `json:"beneficiaries"`
+}
+type BeneficiariesCovoiturageA struct {
+	Count         int    `json:"count"`
+	CacheId       string `json:"cache_id"`
+	Beneficiaries []any  `json:"beneficiaries"`
+}
+
+func (s BeneficiariesCovoiturage) JSON() template.JS {
+	result, _ := json.Marshal(s)
+	return template.JS(result)
+}
+
+func (s BeneficiariesCovoiturage) JSONWithLimits(a int, b int) template.JS {
+	if b < len(s.Beneficiaries) {
+		s.Beneficiaries = s.Beneficiaries[a:b]
+	}
+	return s.JSON()
+}
+
 func (renderer *Renderer) JourneysSearch(w http.ResponseWriter, r *http.Request, carpools any, transitjourneys any, vehicles []any, searched bool, departure any, destination any, departuredate string, departuretime string) {
 	files := renderer.ThemeConfig.GetStringSlice("views.journeys.search.files")
 	state := NewState(r, renderer.ThemeConfig, journeysMenu)
@@ -20,3 +51,100 @@ func (renderer *Renderer) JourneysSearch(w http.ResponseWriter, r *http.Request,
 
 	renderer.Render("journeys", w, r, files, state)
 }
+
+type BeneficiariesListstate struct {
+	Count         int                  `json:"count"`
+	CacheId       string               `json:"cache_id"`
+	Beneficiaries []groupstorage.Group `json:"beneficiaries"`
+}
+
+func (s BeneficiariesListstate) JSON() template.JS {
+	result, _ := json.Marshal(s)
+	return template.JS(result)
+}
+
+func (s BeneficiariesListstate) JSONWithLimits(a int, b int) template.JS {
+	if b < len(s.Beneficiaries) {
+		s.Beneficiaries = s.Beneficiaries[a:b]
+	}
+	return s.JSON()
+}
+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 = BeneficiariesListstate{
+		Count:         len(groups),
+		CacheId:       cacheid,
+		Beneficiaries: groups,
+	}
+
+	renderer.Render("journeys", w, r, files, state)
+}
+
+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)
+	viewstate := map[string]any{
+		"deeparture":    depart,
+		"deestination":  arrive,
+		"beneficiaries": beneficiaries,
+		"searched":      searched,
+		"departure":     departure,
+		"destination":   destination,
+	}
+
+	if searched {
+		viewstate["search"] = map[string]any{
+			"beneficiary": beneficiary,
+		}
+
+	}
+
+	state.ViewState = viewstate
+	renderer.Render("journeys", w, r, files, state)
+}
+
+func (renderer *Renderer) DisplayGroupCovoiturage(w http.ResponseWriter, r *http.Request, number string, groupid string, depart any, arrive any, accounts []any, cacheid string, searched bool, beneficiary any, group any, beneficiaries []mobilityaccountsstorage.Account, groups map[string]any) {
+	files := renderer.ThemeConfig.GetStringSlice("views.journeys.display.files")
+	state := NewState(r, renderer.ThemeConfig, journeysMenu)
+
+	viewstate := map[string]any{
+		"beneficiaries": beneficiaries,
+		"searched":      searched,
+		"group":         group,
+		"deeparture":    depart,
+		"deestination":  arrive,
+		"groups":        groups,
+		"ben":           accounts,
+		"number":        number,
+		"list": BeneficiariesCovoiturage{
+			Group:         groupid,
+			Count:         len(accounts),
+			CacheId:       cacheid,
+			Beneficiaries: accounts,
+		},
+	}
+
+	if searched {
+		viewstate["search"] = map[string]any{
+			"beneficiary": beneficiary,
+		}
+
+	}
+	state.ViewState = viewstate
+
+	renderer.Render("journeys", w, r, files, state)
+}
+
+func (renderer *Renderer) UpdateGroupCovoiturage(w http.ResponseWriter, r *http.Request, groupid string, memberid string) {
+	files := renderer.ThemeConfig.GetStringSlice("views.journeys.update.files")
+	state := NewState(r, renderer.ThemeConfig, journeysMenu)
+
+	state.ViewState = map[string]any{
+		"groupid":  groupid,
+		"memberid": memberid,
+	}
+	renderer.Render("journeys", w, r, files, state)
+
+}

renderer/members.go

@@ -0,0 +1,67 @@
+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, 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)
+}
+
+func (renderer *Renderer) MemberUpdate(w http.ResponseWriter, r *http.Request, user any) {
+	files := renderer.ThemeConfig.GetStringSlice("views.members.update.files")
+	state := NewState(r, renderer.ThemeConfig, membersMenu)
+	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)
+}

renderer/renderer.go

@@ -9,6 +9,7 @@ import (
 	"git.coopgo.io/coopgo-apps/parcoursmob/utils/identification"
 	"git.coopgo.io/coopgo-platform/emailing"
 	"git.coopgo.io/coopgo-platform/groups-management/storage"
+	"github.com/coreos/go-oidc"
 	"github.com/spf13/viper"
 )
 
@@ -35,6 +36,7 @@ func NewRenderer(global *viper.Viper, templates_dir string) *Renderer {
 }
 
 func (renderer *Renderer) Render(name string, w http.ResponseWriter, r *http.Request, files []string, state RenderState) {
+
 	genericFiles := renderer.ThemeConfig.GetStringSlice("views.generic.files")
 
 	prefixed_files := []string{}
@@ -49,9 +51,12 @@ func (renderer *Renderer) Render(name string, w http.ResponseWriter, r *http.Req
 	t := template.New(name).Funcs(
 		template.FuncMap{
 			"timeFrom":      TimeFrom,
+			"timeFormat":    TimeFormat,
 			"genderISO5218": GenderISO5218,
 			"dict":          Dict,
 			"json":          JSON,
+			"rawjson":       RawJSON,
+			"unescapeHTML":  UnescapeHTML,
 			"walkingLength": WalkingLength,
 			"divideFloat64": Divide[float64],
 			"divideInt":     Divide[int],
@@ -66,6 +71,7 @@ func (renderer *Renderer) Render(name string, w http.ResponseWriter, r *http.Req
 }
 
 func (renderer *Renderer) RenderNoLayout(name string, w http.ResponseWriter, r *http.Request, files []string, state RenderState) {
+
 	prefixed_files := []string{}
 	for _, f := range files {
 		prefixed_files = append(prefixed_files, renderer.templateFile(f))
@@ -75,9 +81,12 @@ func (renderer *Renderer) RenderNoLayout(name string, w http.ResponseWriter, r *
 	t := template.New(name).Funcs(
 		template.FuncMap{
 			"timeFrom":      TimeFrom,
+			"timeFormat":    TimeFormat,
 			"genderISO5218": GenderISO5218,
 			"dict":          Dict,
 			"json":          JSON,
+			"rawjson":       RawJSON,
+			"unsescapeHTML": UnescapeHTML,
 			"divideFloat64": Divide[float64],
 			"divideInt":     Divide[int],
 		},
@@ -97,14 +106,34 @@ func (r *Renderer) templateFile(file string) string {
 type RenderState struct {
 	icons.IconSet
 	LayoutState
-	Group     any
-	Roles     any
-	ViewState any // This is a state specific to a given view
+	UserID     string
+	UserClaims map[string]any
+	Group      storage.Group
+	Roles      any
+	ViewState  any // This is a state specific to a given view
 }
 
 func NewState(r *http.Request, themeConfig *viper.Viper, menuState string) RenderState {
 	iconset := themeConfig.GetStringMapString("icons.svg")
+
 	// Get State elements from Request
+	var userid string
+	var claims map[string]any
+
+	u := r.Context().Value(identification.IdtokenKey)
+	if u != nil {
+		if current_user_token, ok := u.(*oidc.IDToken); ok {
+			userid = current_user_token.Subject
+		}
+
+		c := r.Context().Value(identification.ClaimsKey)
+		if c != nil {
+			if current_user_claims, ok := c.(map[string]any); ok {
+				claims = current_user_claims
+			}
+		}
+
+	}
 
 	g := r.Context().Value(identification.GroupKey)
 	if g == nil {
@@ -131,7 +160,6 @@ func NewState(r *http.Request, themeConfig *viper.Viper, menuState string) Rende
 			Active:  menuState == administrationMenu,
 		},
 
-		//TODO from configuration for icons at least
 		MenuItems: []MenuItem{
 			{
 				Title:  "Tableau de bord",
@@ -187,17 +215,6 @@ func NewState(r *http.Request, themeConfig *viper.Viper, menuState string) Rende
 		})
 	}
 
-	/*************************** my code ******************************/
-	if modules["support"] != nil && modules["support"].(bool) {
-		ls.MenuItems = append(ls.MenuItems, MenuItem{
-			Title:  "Support",
-			Link:   "/app/support/",
-			Active: menuState == commentMenu,
-			Icon:   "hero:outline/support",
-		})
-
-	}
-	/******************************************************************/
 	if modules["group_module"] != nil && modules["group_module"].(bool) {
 		ls.MenuItems = append(ls.MenuItems, MenuItem{
 			Title:  "Groupes / Communautés",
@@ -207,7 +224,16 @@ func NewState(r *http.Request, themeConfig *viper.Viper, menuState string) Rende
 		})
 
 	}
-	/*************************** my code ******************************/
+
+	if modules["support"] != nil && modules["support"].(bool) {
+		ls.MenuItems = append(ls.MenuItems, MenuItem{
+			Title:  "Support",
+			Link:   "/app/support/",
+			Active: menuState == commentMenu,
+			Icon:   "hero:outline/support",
+		})
+
+	}
 
 	if modules["directory"] != nil && modules["directory"].(bool) {
 		ls.MenuItems = append(ls.MenuItems, MenuItem{
@@ -217,11 +243,20 @@ func NewState(r *http.Request, themeConfig *viper.Viper, menuState string) Rende
 			Icon:   "hero:outline/document-text",
 		})
 	}
-
+	if modules["conseillers"] != nil && modules["conseillers"].(bool) {
+		ls.MenuItems = append(ls.MenuItems, MenuItem{
+			Title:  "Conseillers",
+			Link:   "/app/conseillers/",
+			Active: menuState == membersMenu,
+			Icon:   "hero:outline/user-group",
+		})
+	}
 	return RenderState{
 		IconSet:     icons.NewIconSet(iconset),
 		Group:       group,
 		Roles:       roles,
+		UserID:      userid,
+		UserClaims:  claims,
 		LayoutState: ls,
 	}
 }

renderer/vehicle-management.go

@@ -53,27 +53,40 @@ func (renderer *Renderer) VehiclesFleetDisplay(w http.ResponseWriter, r *http.Re
 	renderer.Render("fleet display vehicle", w, r, files, state)
 }
 
-func (renderer *Renderer) VehiclesFleetUpdate(w http.ResponseWriter, r *http.Request, vehicle any) {
+func (renderer *Renderer) VehiclesFleetUpdate(w http.ResponseWriter, r *http.Request, vehicle any, vehicle_types []string) {
 	files := renderer.ThemeConfig.GetStringSlice("views.vehicles_management.fleet_update.files")
 	state := NewState(r, renderer.ThemeConfig, vehiclesmanagementMenu)
 	state.ViewState = map[string]any{
-		"vehicle": vehicle,
+		"vehicle":       vehicle,
+		"vehicle_types": vehicle_types,
 	}
 
 	renderer.Render("fleet display vehicle", w, r, files, state)
 }
 
-func (renderer *Renderer) VehicleManagementBookingDisplay(w http.ResponseWriter, r *http.Request, booking any, vehicle any, beneficiary any, group any, documents []filestorage.FileInfo, file_types_map map[string]string) {
+func (renderer *Renderer) VehicleManagementBookingDisplay(w http.ResponseWriter, r *http.Request, booking any, vehicle any, beneficiary any, group any, documents []filestorage.FileInfo, file_types_map map[string]string, alternative_vehicles []any) {
 	files := renderer.ThemeConfig.GetStringSlice("views.vehicles_management.booking_display.files")
 	state := NewState(r, renderer.ThemeConfig, vehiclesmanagementMenu)
 	state.ViewState = map[string]any{
-		"booking":        booking,
-		"vehicle":        vehicle,
-		"beneficiary":    beneficiary,
-		"group":          group,
-		"documents":      documents,
-		"file_types_map": file_types_map,
+		"booking":              booking,
+		"vehicle":              vehicle,
+		"beneficiary":          beneficiary,
+		"group":                group,
+		"documents":            documents,
+		"file_types_map":       file_types_map,
+		"alternative_vehicles": alternative_vehicles,
 	}
 
 	renderer.Render("vehicles search", w, r, files, state)
 }
+
+func (renderer *Renderer) UnbookingVehicle(w http.ResponseWriter, r *http.Request, booking any) {
+	files := renderer.ThemeConfig.GetStringSlice("views.vehicles_management.delete_booking.files")
+	state := NewState(r, renderer.ThemeConfig, vehiclesmanagementMenu)
+	state.ViewState = map[string]any{
+		"booking":              booking,
+	}
+
+	renderer.Render("vehicule unbooking", w, r, files, state)
+
+}

renderer/vehicles.go

@@ -4,6 +4,7 @@ import (
 	"net/http"
 
 	filestorage "git.coopgo.io/coopgo-apps/parcoursmob/utils/storage"
+	"git.coopgo.io/coopgo-platform/fleets/storage"
 	mobilityaccountsstorage "git.coopgo.io/coopgo-platform/mobility-accounts/storage"
 )
 
@@ -66,12 +67,26 @@ func (renderer *Renderer) VehicleBookingDisplay(w http.ResponseWriter, r *http.R
 	renderer.Render("vehicles search", w, r, files, state)
 }
 
-func (renderer *Renderer) VehicleBookingsList(w http.ResponseWriter, r *http.Request, bookings []any) {
+func (renderer *Renderer) VehicleBookingsList(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,
+		"bookings":     bookings,
+		"vehicles_map": vehiclesMap,
+		"groups_map":   groupsMap,
 	}
 
 	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)
+// }

services/fleets.go

@@ -1,7 +1,12 @@
 package services
 
 import (
+	"context"
+	"sort"
+
+	"git.coopgo.io/coopgo-apps/parcoursmob/utils/sorting"
 	fleets "git.coopgo.io/coopgo-platform/fleets/grpcapi"
+	"git.coopgo.io/coopgo-platform/fleets/storage"
 	"google.golang.org/grpc"
 )
 
@@ -21,3 +26,43 @@ func NewFleetsService(dial string) (*FleetsService, error) {
 		FleetsClient: client,
 	}, nil
 }
+
+func (s *ServicesHandler) GetBooking(bookingid string) (booking storage.Booking, err error) {
+	request := &fleets.GetBookingRequest{
+		Bookingid: bookingid,
+	}
+	resp, err := s.GRPC.Fleets.GetBooking(context.TODO(), request)
+	if err == nil {
+		booking = resp.Booking.ToStorageType()
+	}
+	return
+}
+
+func (s *ServicesHandler) GetBookings() (bookings []storage.Booking, err error) {
+	bookings = []storage.Booking{}
+
+	request := &fleets.GetBookingsRequest{}
+	resp, err := s.GRPC.Fleets.GetBookings(context.TODO(), request)
+	if err == nil {
+		for _, booking := range resp.Bookings {
+			bookings = append(bookings, booking.ToStorageType())
+		}
+		sort.Sort(sorting.BookingsByStartdate(bookings))
+	}
+
+	return
+}
+
+func (s *ServicesHandler) GetVehiclesMap() (vehicles map[string]storage.Vehicle, err error) {
+	vehicles = map[string]storage.Vehicle{}
+
+	request := &fleets.GetVehiclesRequest{}
+	resp, err := s.GRPC.Fleets.GetVehicles(context.TODO(), request)
+	if err == nil {
+		for _, vehicle := range resp.Vehicles {
+			vehicles[vehicle.Id] = vehicle.ToStorageType()
+		}
+	}
+
+	return
+}

services/groupsmanagement.go

@@ -1,7 +1,10 @@
 package services
 
 import (
+	"context"
+
 	groupsmanagement "git.coopgo.io/coopgo-platform/groups-management/grpcapi"
+	"git.coopgo.io/coopgo-platform/groups-management/storage"
 	"google.golang.org/grpc"
 )
 
@@ -21,3 +24,35 @@ func NewGroupsManagementService(groupsManagementDial string) (*GroupsManagementS
 		GroupsManagementClient: client,
 	}, nil
 }
+
+func (s *ServicesHandler) GetGroupsMap() (groups map[string]storage.Group, err error) {
+	groups = map[string]storage.Group{}
+
+	request := &groupsmanagement.GetGroupsRequest{
+		Namespaces: []string{"parcoursmob_organizations"},
+	}
+	resp, err := s.GRPC.GroupsManagement.GetGroups(context.TODO(), request)
+	if err == nil {
+		for _, group := range resp.Groups {
+			groups[group.Id] = group.ToStorageType()
+		}
+	}
+
+	return
+}
+
+////////////////////////////////optimize the code//////////////////////////////////////
+func (s *ServicesHandler) GetGroupsMemberMap(id string) (groups map[string]any, err error) {
+	groups = map[string]any{}
+
+	request := &groupsmanagement.GetGroupsBatchMemberRequest{
+		Groupids: []string{id},
+	}
+	resp, err := s.GRPC.GroupsManagement.GetGroupsBatchMember(context.TODO(), request)
+	if err == nil {
+		for _, group := range resp.Groups {
+			groups[group.Memberid] = group.ToStorageType()
+		}
+	}
+	return
+}

services/mobilityaccounts.go

@@ -1,7 +1,10 @@
 package services
 
 import (
+	"context"
+
 	mobilityaccounts "git.coopgo.io/coopgo-platform/mobility-accounts/grpcapi"
+	"git.coopgo.io/coopgo-platform/mobility-accounts/storage"
 	"google.golang.org/grpc"
 )
 
@@ -21,3 +24,37 @@ func NewMobilityAccountService(mobilityAccountsDial string) (*MobilityAccountSer
 		MobilityAccountsClient: client,
 	}, nil
 }
+
+func (s *ServicesHandler) GetBeneficiaries() (accounts []storage.Account, err error) {
+	accounts = []storage.Account{}
+	request := &mobilityaccounts.GetAccountsRequest{
+		Namespaces: []string{"parcoursmob_beneficiaries"},
+	}
+	resp, err := s.GRPC.MobilityAccounts.GetAccounts(context.TODO(), request)
+
+	if err == nil {
+		for _, v := range resp.Accounts {
+			a := v.ToStorageType()
+			accounts = append(accounts, a)
+		}
+	}
+
+	return
+}
+
+func (s *ServicesHandler) GetAccounts() (accounts []storage.Account, err error) {
+	accounts = []storage.Account{}
+	request := &mobilityaccounts.GetAccountsRequest{
+		Namespaces: []string{"parcoursmob"},
+	}
+	resp, err := s.GRPC.MobilityAccounts.GetAccounts(context.TODO(), request)
+
+	if err == nil {
+		for _, v := range resp.Accounts {
+			a := v.ToStorageType()
+			accounts = append(accounts, a)
+		}
+	}
+
+	return
+}

themes/default/config.yaml

@@ -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: <svg xmlns="http://www.w3.org/2000/svg" class="%s" viewBox="0 0 61.85 33.58"><defs><style>.cls-1{fill:#ff1300;}.cls-2{fill:#243887;}</style></defs><g id="Calque_2" data-name="Calque 2"><g id="Calque_1-2" data-name="Calque 1"><path class="cls-1" d="M44.978,0C31.337,0,28.1,6.824,27.875,15.505H39.536V9.434a.727.727,0,0,1,1.123-.607L52.6,16.453,40.659,24.08a.729.729,0,0,1-1.123-.608v-6.1H27.865c.075,8.427,1.527,16.213,17.113,16.213,14.867,0,16.872-7.764,16.872-17.032C61.85,7.91,59.894,0,44.978,0Z"/><polygon class="cls-1" points="41.412 21.385 49.133 16.453 41.412 11.521 41.412 21.385"/><path class="cls-2" d="M14.175,11.4l-.019,4.151H26.311a14.781,14.781,0,0,0,.819-5.141C27.046,3.767,22.545,0,14.764,0H1.052A1.147,1.147,0,0,0,0,1.24V31.87a1.149,1.149,0,0,0,1.094,1.239H11.525a1.145,1.145,0,0,0,1.051-1.239V10.41h.758C13.88,10.41,14.175,10.756,14.175,11.4Z"/><path class="cls-2" d="M14.148,17.3l-.015,3.514H18.97A7.521,7.521,0,0,0,25.458,17.3Z"/></g></g></svg>
-    hero:outline/briefcase: <svg xmlns="http://www.w3.org/2000/svg" class="%s" fill="none" viewBox="0 0 24 24" stroke="currentColor" stroke-width="2"><path stroke-linecap="round" stroke-linejoin="round" d="M21 13.255A23.931 23.931 0 0112 15c-3.183 0-6.22-.62-9-1.745M16 6V4a2 2 0 00-2-2h-4a2 2 0 00-2 2v2m4 6h.01M5 20h14a2 2 0 002-2V8a2 2 0 00-2-2H5a2 2 0 00-2 2v10a2 2 0 002 2z" /></svg>
-    hero:outline/support: <svg xmlns="http://www.w3.org/2000/svg" class="%s" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="w-6 h-6"><path stroke-linecap="round" stroke-linejoin="round" d="M7.5 8.25h9m-9 3H12m-9.75 1.51c0 1.6 1.123 2.994 2.707 3.227 1.129.166 2.27.293 3.423.379.35.026.67.21.865.501L12 21l2.755-4.133a1.14 1.14 0 01.865-.501 48.172 48.172 0 003.423-.379c1.584-.233 2.707-1.626 2.707-3.228V6.741c0-1.602-1.123-2.995-2.707-3.228A48.394 48.394 0 0012 3c-2.392 0-4.744.175-7.043.513C3.373 3.746 2.25 5.14 2.25 6.741v6.018z" /></svg>
-    hero:outline/group_module: <svg xmlns="http://www.w3.org/2000/svg" class="%s" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="w-6 h-6"><path stroke-linecap="round" stroke-linejoin="round" d="M18 18.72a9.094 9.094 0 003.741-.479 3 3 0 00-4.682-2.72m.94 3.198l.001.031c0 .225-.012.447-.037.666A11.944 11.944 0 0112 21c-2.17 0-4.207-.576-5.963-1.584A6.062 6.062 0 016 18.719m12 0a5.971 5.971 0 00-.941-3.197m0 0A5.995 5.995 0 0012 12.75a5.995 5.995 0 00-5.058 2.772m0 0a3 3 0 00-4.681 2.72 8.986 8.986 0 003.74.477m.94-3.197a5.971 5.971 0 00-.94 3.197M15 6.75a3 3 0 11-6 0 3 3 0 016 0zm6 3a2.25 2.25 0 11-4.5 0 2.25 2.25 0 014.5 0zm-13.5 0a2.25 2.25 0 11-4.5 0 2.25 2.25 0 014.5 0z" /></svg>
-    hero:outline/calendar: <svg xmlns="http://www.w3.org/2000/svg" class="%s" fill="none" viewBox="0 0 24 24" stroke="currentColor" stroke-width="2"><path stroke-linecap="round" stroke-linejoin="round" d="M8 7V3m8 4V3m-9 8h10M5 21h14a2 2 0 002-2V7a2 2 0 00-2-2H5a2 2 0 00-2 2v12a2 2 0 002 2z" /></svg>
-    hero:outline/chevron-right: <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="%s"><path stroke-linecap="round" stroke-linejoin="round" d="M8.25 4.5l7.5 7.5-7.5 7.5" /></svg>
-    hero:outline/cog: <svg xmlns="http://www.w3.org/2000/svg" class="%s" fill="none" viewBox="0 0 24 24" stroke="currentColor" stroke-width="2"><path stroke-linecap="round" stroke-linejoin="round" d="M10.325 4.317c.426-1.756 2.924-1.756 3.35 0a1.724 1.724 0 002.573 1.066c1.543-.94 3.31.826 2.37 2.37a1.724 1.724 0 001.065 2.572c1.756.426 1.756 2.924 0 3.35a1.724 1.724 0 00-1.066 2.573c.94 1.543-.826 3.31-2.37 2.37a1.724 1.724 0 00-2.572 1.065c-.426 1.756-2.924 1.756-3.35 0a1.724 1.724 0 00-2.573-1.066c-1.543.94-3.31-.826-2.37-2.37a1.724 1.724 0 00-1.065-2.572c-1.756-.426-1.756-2.924 0-3.35a1.724 1.724 0 001.066-2.573c-.94-1.543.826-3.31 2.37-2.37.996.608 2.296.07 2.572-1.065z" /><path stroke-linecap="round" stroke-linejoin="round" d="M15 12a3 3 0 11-6 0 3 3 0 016 0z" /></svg>
-    hero:outline/document-text: <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="%s"><path stroke-linecap="round" stroke-linejoin="round" d="M19.5 14.25v-2.625a3.375 3.375 0 00-3.375-3.375h-1.5A1.125 1.125 0 0113.5 7.125v-1.5a3.375 3.375 0 00-3.375-3.375H8.25m0 12.75h7.5m-7.5 3H12M10.5 2.25H5.625c-.621 0-1.125.504-1.125 1.125v17.25c0 .621.504 1.125 1.125 1.125h12.75c.621 0 1.125-.504 1.125-1.125V11.25a9 9 0 00-9-9z" /></svg>
-    hero:outline/home: <svg xmlns="http://www.w3.org/2000/svg" class="%s" fill="none" viewBox="0 0 24 24" stroke="currentColor" stroke-width="2"><path stroke-linecap="round" stroke-linejoin="round" d="M3 12l2-2m0 0l7-7 7 7M5 10v10a1 1 0 001 1h3m10-11l2 2m-2-2v10a1 1 0 01-1 1h-3m-6 0a1 1 0 001-1v-4a1 1 0 011-1h2a1 1 0 011 1v4a1 1 0 001 1m-6 0h6" /></svg>
-    hero:outline/map: <svg xmlns="http://www.w3.org/2000/svg" class="%s" fill="none" viewBox="0 0 24 24" stroke="currentColor" stroke-width="2"><path stroke-linecap="round" stroke-linejoin="round" d="M9 20l-5.447-2.724A1 1 0 013 16.382V5.618a1 1 0 011.447-.894L9 7m0 13l6-3m-6 3V7m6 10l4.553 2.276A1 1 0 0021 18.382V7.618a1 1 0 00-.553-.894L15 4m0 13V4m0 0L9 7" /></svg>
-    hero:outline/office-building: <svg xmlns="http://www.w3.org/2000/svg" class="%s" fill="none" viewBox="0 0 24 24" stroke="currentColor" stroke-width="2"><path stroke-linecap="round" stroke-linejoin="round" d="M19 21V5a2 2 0 00-2-2H7a2 2 0 00-2 2v16m14 0h2m-2 0h-5m-9 0H3m2 0h5M9 7h1m-1 4h1m4-4h1m-1 4h1m-5 10v-5a1 1 0 011-1h2a1 1 0 011 1v5m-4 0h4" /></svg>
-    hero:outline/plus-circle: <svg xmlns="http://www.w3.org/2000/svg" class="%s" fill="none" viewBox="0 0 24 24" stroke="currentColor" stroke-width="2"><path stroke-linecap="round" stroke-linejoin="round" d="M12 9v3m0 0v3m0-3h3m-3 0H9m12 0a9 9 0 11-18 0 9 9 0 0118 0z" /></svg>
-    hero:outline/shield-check: <svg xmlns="http://www.w3.org/2000/svg" class="%s" fill="none" viewBox="0 0 24 24" stroke="currentColor" stroke-width="2"><path stroke-linecap="round" stroke-linejoin="round" d="M9 12l2 2 4-4m5.618-4.016A11.955 11.955 0 0112 2.944a11.955 11.955 0 01-8.618 3.04A12.02 12.02 0 003 9c0 5.591 3.824 10.29 9 11.622 5.176-1.332 9-6.03 9-11.622 0-1.042-.133-2.052-.382-3.016z" /></svg>
-    hero:outline/user-group: <svg xmlns="http://www.w3.org/2000/svg" class="%s" fill="none" viewBox="0 0 24 24" stroke="currentColor" stroke-width="2"><path stroke-linecap="round" stroke-linejoin="round" d="M17 20h5v-2a3 3 0 00-5.356-1.857M17 20H7m10 0v-2c0-.656-.126-1.283-.356-1.857M7 20H2v-2a3 3 0 015.356-1.857M7 20v-2c0-.656.126-1.283.356-1.857m0 0a5.002 5.002 0 019.288 0M15 7a3 3 0 11-6 0 3 3 0 016 0zm6 3a2 2 0 11-4 0 2 2 0 014 0zM7 10a2 2 0 11-4 0 2 2 0 014 0z" /></svg>
-    hero:outline/x: <svg class="%s text-white" xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="2" stroke="currentColor" aria-hidden="true"><path stroke-linecap="round" stroke-linejoin="round" d="M6 18L18 6M6 6l12 12" /></svg>
-    hero:solid/chevron-right: <svg class="%s text-gray-400" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20" fill="currentColor" aria-hidden="true"><path fill-rule="evenodd" d="M7.293 14.707a1 1 0 010-1.414L10.586 10 7.293 6.707a1 1 0 011.414-1.414l4 4a1 1 0 010 1.414l-4 4a1 1 0 01-1.414 0z" clip-rule="evenodd" /></svg>
-    hero:solid/question-mark-icon: <svg class="%s" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20" fill="currentColor" aria-hidden="true"><path fill-rule="evenodd"  d="M18 10a8 8 0 11-16 0 8 8 0 0116 0zm-8-3a1 1 0 00-.867.5 1 1 0 11-1.731-1A3 3 0 0113 8a3.001 3.001 0 01-2 2.83V11a1 1 0 11-2 0v-1a1 1 0 011-1 1 1 0 100-2zm0 8a1 1 0 100-2 1 1 0 000 2z" clip-rule="evenodd" /></svg>
-    hero:solid/search: <svg class="%s" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20" fill="currentColor" aria-hidden="true"><path fill-rule="evenodd" d="M8 4a4 4 0 100 8 4 4 0 000-8zM2 8a6 6 0 1110.89 3.476l4.817 4.817a1 1 0 01-1.414 1.414l-4.816-4.816A6 6 0 012 8z" clip-rule="evenodd" /></svg>
-    hero:solid/selector: <svg class="%s" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20" fill="currentColor" aria-hidden="true"><path fill-rule="evenodd" d="M10 3a1 1 0 01.707.293l3 3a1 1 0 01-1.414 1.414L10 5.414 7.707 7.707a1 1 0 01-1.414-1.414l3-3A1 1 0 0110 3zm-3.707 9.293a1 1 0 011.414 0L10 14.586l2.293-2.293a1 1 0 011.414 1.414l-3 3a1 1 0 01-1.414 0l-3-3a1 1 0 010-1.414z" clip-rule="evenodd" /></svg>
-    img:profile-picture-placeholder: <svg class="%s" fill="currentColor" viewBox="0 0 24 24"><path d="M24 20.993V24H0v-2.996A14.977 14.977 0 0112.004 15c4.904 0 9.26 2.354 11.996 5.993zM16.002 8.999a4 4 0 11-8 0 4 4 0 018 0z" /></svg>
-    tabler-icons:car: <svg xmlns="http://www.w3.org/2000/svg" class="icon icon-tabler icon-tabler-car %s" viewBox="0 0 24 24" stroke-width="2" stroke="currentColor" fill="none" stroke-linecap="round" stroke-linejoin="round"><path stroke="none" d="M0 0h24v24H0z" fill="none"></path><circle cx="7" cy="17" r="2"></circle><circle cx="17" cy="17" r="2"></circle><path d="M5 17h-2v-6l2 -5h9l4 5h1a2 2 0 0 1 2 2v4h-2m-4 0h-6m-6 -6h15m-6 0v-5"></path></svg>
-    tabler-icons:walk: <svg xmlns="http://www.w3.org/2000/svg" class="icon icon-tabler icon-tabler-walk %s" width="44" height="44" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" fill="none" stroke-linecap="round" stroke-linejoin="round"><path stroke="none" d="M0 0h24v24H0z" fill="none"/><circle cx="13" cy="4" r="1" /><line x1="7" y1="21" x2="10" y2="17" /><path d="M16 21l-2 -4l-3 -3l1 -6" /><path d="M6 12l2 -3l4 -1l3 3l3 1" /></svg>
-    tabler-icons:bus: <svg xmlns="http://www.w3.org/2000/svg" class="icon icon-tabler icon-tabler-bus %s" width="44" height="44" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" fill="none" stroke-linecap="round" stroke-linejoin="round"><path stroke="none" d="M0 0h24v24H0z" fill="none"/><circle cx="6" cy="17" r="2" /><circle cx="18" cy="17" r="2" /><path d="M4 17h-2v-11a1 1 0 0 1 1 -1h14a5 7 0 0 1 5 7v5h-2m-4 0h-8" /><polyline points="16 5 17.5 12 22 12" /><line x1="2" y1="10" x2="17" y2="10" /><line x1="7" y1="5" x2="7" y2="10" /><line x1="12" y1="5" x2="12" y2="10" /></svg>
-
-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
-      

themes/default/web/layouts/group_module/create_group.html

@@ -1,86 +0,0 @@
-{{define "content"}}
-
-
-<div class="max-w-7xl mx-auto px-4 sm:px-6 md:px-8">
-    <h1 class="text-2xl font-semibold text-gray-900">Groups > Créer un group</h1>
-</div>
-
-<div class="max-w-7xl mx-auto px-4 sm:px-6 md:px-8 mt-8" x-data="{
-        fields: {
-            name: null,
-            type: null,
-        },
-        rules: {
-            name: ['required'],
-            type: ['required'],
-        },
-        formValidation: {
-            valid: false,
-            fields: {
-                name: {valid: null},
-                type: {valid: null},
-            }
-        },
-        isFormValid: true,
-        validate() {
-            this.formValidation = Iodine.assert(this.fields, this.rules)
-        },
-        validateField(field) {
-            this.formValidation.fields[field] = Iodine.assert(this.fields[field], this.rules[field])
-        },
-        submit(event) {
-            this.validate()
-            if(!this.formValidation.valid) {
-                this.isFormValid = false
-                event.preventDefault()
-            }
-            return this.formValidation.valid
-        }
-        
-    }">
-    <form class="space-y-6" method="POST" @submit="submit">
-        <div class="bg-white shadow px-4 py-5 sm:rounded-lg sm:p-6">
-            <div class="md:grid md:grid-cols-3 md:gap-6">
-                <div class="md:col-span-1">
-                    <h3 class="text-lg font-medium leading-6 text-gray-900">Nouveau groupe</h3>
-                    <p class="mt-1 text-sm text-gray-500">Informations de base sur le groupe à créer</p>
-                </div>
-                <div class="mt-5 md:mt-0 md:col-span-2">
-                    <div class="grid grid-cols-6 gap-6">
-                        <div class="col-span-5">
-                            <label for="name" class="block text-sm font-medium text-gray-700">Nom de groupe</label>
-                            <input type="text" name="name" id="name"
-                                class="mt-1 focus:ring-co-blue focus:border-co-blue block w-full shadow-sm sm:text-sm  rounded-2xl"
-                                x-model="fields.name" @blur="validateField('name')"
-                                :class="formValidation.fields.name.valid == false ? 'border-co-red border-2' : 'border-gray-300'">
-                        </div>
-                        <div class="col-span-3">
-                            <label for="type" class="block text-sm font-medium text-gray-700">Type de groupe</label>
-                            <select id="type" name="type" 
-                                x-model="fields.type" @blur="validateField('type')"
-                                class="max-w-lg mt-1 block focus:ring-co-blue focus:border-co-blue w-full shadow-sm sm:max-w-xs sm:text-sm rounded-2xl"
-                                :class="formValidation.fields.type.valid == false ? 'border-co-red border-2' : 'border-gray-300'">
-                                <option value="" selected></option>
-                                {{range .ViewState.group_types}}
-                                <option value="{{.}}">{{.}}</option>
-                                {{end}}
-                            </select>
-                        </div>
-                    </div>
-                </div>
-               
-            </div>
-            
-        </div>
-        <div class="flex justify-end">
-            <a href="/app/group_module/">
-                <button type="button"
-                    class="bg-white py-2 px-4 border border-gray-300 rounded-2xl shadow-sm text-sm font-medium text-gray-700 hover:bg-gray-50 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-co-blue">Annuler</button>
-            </a>
-            <button type="submit"
-                class="ml-3 inline-flex justify-center py-2 px-4 border border-transparent shadow-sm text-sm font-medium rounded-2xl text-white bg-co-blue hover:bg-co-blue focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-co-blue">Créer le groupe</button>
-        </div>
-    </form>
-   
-</div>
-{{end}}

themes/default/web/layouts/group_module/display_group.html

@@ -1,254 +0,0 @@
-{{define "content"}}
-<div class="max-w-7xl mx-auto px-4 sm:px-6 md:px-8">
-    <h1 class="text-2xl font-semibold text-gray-900">Gestion du groupe</h1>
-
-    <div class="sm:flex sm:items-center">
-        <div class="sm:flex-auto">
-            <p class="mt-2 text-sm text-gray-700"></p>
-        </div>
-    </div>
-    <!-- ****************************** -->
-    <div class="mt-8 max-w-3xl mx-auto grid grid-cols-1 gap-6 lg:max-w-7xl lg:grid-flow-col-dense lg:grid-cols-3">
-        <div class="space-y-6 lg:col-start-1 lg:col-span-1 ">
-            <div class="bg-white shadow sm:rounded-2xl">
-                <h2 id="timeline-title" class="text-lg font-medium text-gray-900 p-4 sm:px-6">Info du groupe</h2>
-                <div class="border-t border-gray-200 px-4 py-5 sm:px-6">
-                    <div>
-                        <div class="mt-5 border-gray-200">
-                            <dl class="sm:divide-y sm:divide-gray-200">
-                                <div class="sm:pb-5 sm:grid sm:grid-cols-3 sm:gap-4">
-                                    <dt class="text-sm font-medium text-gray-500">Nom</dt>
-                                    <dd class="mt-1 text-sm text-gray-900 sm:mt-0 sm:col-span-2">
-                                        {{.ViewState.group.Data.name}}</dd>
-                                </div>
-                                <div class="py-4 sm:py-5 sm:grid sm:grid-cols-3 sm:gap-4">
-                                    <dt class="text-sm font-medium text-gray-500">Type</dt>
-                                    <dd class="mt-1 text-sm text-gray-900 sm:mt-0 sm:col-span-2">
-                                        {{.ViewState.group.Data.type}}</dd>
-                                </div>
-                            </dl>
-                        </div>
-                    </div>
-                </div>
-            </div>
-        </div>
-        
-   
-    <!-- *********************************** -->
-
-
-<div class="lg:col-start-2 lg:col-span-2" x-data="{
-    state: {{.ViewState.list.JSONWithLimits 0 10}},
-    current: 0,
-    nb_pages() {
-        let nbEl = this.state.count 
-        return Math.ceil(nbEl/10)
-    },
-    async paginate(page) {
-        let start = (page-1)*10
-        if(start < 0|| start > this.state.count) {
-            return
-        }
-        let resp = await fetch('/api/cache/' + this.state.cache_id + '?limits.min=' + start + '&limits.max=' + (start+10))
-        let data = await resp.json()
-        this.state.beneficiaries = data
-        this.current=page-1
-        this.state.group = data
-    }
-}">
-<div >
-<div class="-my-2 -mx-4 overflow-x-auto sm:-mx-6 lg:-mx-8">
-    <div class="inline-block min-w-full py-2 align-middle md:px-6 lg:px-8">
-        <div class="overflow-hidden shadow ring-1 ring-black ring-opacity-5 md:rounded-lg">
-            <table class="min-w-full divide-y divide-gray-300">
-                <thead class="bg-gray-50">
-                    <tr>
-                        <th scope="col"
-                            class="py-3.5 pl-4 pr-3 text-left text-sm font-semibold text-gray-900 sm:pl-6">
-                            Nom du bénéficiaire
-                        </th>
-                        <th scope="col" class="px-3 py-3.5 text-left text-sm font-semibold text-gray-900">
-                            Téléphone
-                        </th>
-                        <th scope="col" class="px-3 py-3.5 text-left text-sm font-semibold text-gray-900">
-                            Email
-                        </th>
-                    </tr>
-                </thead>
-                <tbody class="divide-y divide-gray-200 bg-white">
-                    <template x-for="beneficiary in state.beneficiaries">
-                        <tr>
-                            <td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm sm:pl-6">
-                                <div class="flex items-center">
-                                    <!-- <div class="h-10 w-10 flex-shrink-0">
-                                        <img class="h-10 w-10 rounded-co"
-                                            :src="'/app/beneficiaries/' + beneficiary.id + '/picture'" alt="">
-                                    </div> -->
-                                    <div class="ml-4">
-                                        <div class="font-medium text-gray-900"><span
-                                                x-text="beneficiary.data.first_name"></span> <span
-                                                x-text="beneficiary.data.last_name"></span></div>
-                                        <!-- <div class="text-gray-500" x-text="beneficiary.data.email"></div> -->
-                                    </div>
-                                </div>
-                            </td>
-                            <td class="whitespace-nowrap px-3 py-4 text-sm text-gray-500">
-                                <div class="text-gray-900" x-text="beneficiary.data.phone_number"></div>
-                            </td>
-                            <td class="whitespace-nowrap px-3 py-4 text-sm text-gray-500"
-                                x-text="beneficiary.data.email">
-                            </td>
-                            <td class="whitespace-nowrap px-3 py-4 text-sm text-gray-500">
-                                <template x-for="tag in beneficiary.data.tags">
-                                    <span
-                                        class="inline-flex rounded-full bg-green-100 px-2 text-xs font-semibold leading-5 text-green-800"
-                                        x-text="tag"></span>
-                                </template>
-                            </td>
-                            <td
-                                class="relative whitespace-nowrap py-4 pl-3 pr-4 text-right text-sm font-medium sm:pr-6">
-                                <a :href="'/app/beneficiaries/' + beneficiary.id"
-                                    class="text-co-blue hover:text-co-blue">Voir<span class="sr-only">, <span
-                                            x-text="beneficiary.data.first_name"></span> <span
-                                            x-text="beneficiary.data.last_name"></span></a>
-                            </td>
-                        </tr>
-                    </template>
-
-                    <!-- More people... -->
-                </tbody>
-            </table>
-            <div class="bg-white px-4 py-3 flex items-center justify-between border-t border-gray-200 sm:px-6">
-                <div class="flex-1 flex justify-between sm:hidden">
-                  <a href="#" class="relative inline-flex items-center px-4 py-2 border border-gray-300 text-sm font-medium rounded-md text-gray-700 bg-white hover:bg-gray-50"
-                  @click="paginate(current)"> Previous </a>
-                  <a href="#" class="ml-3 relative inline-flex items-center px-4 py-2 border border-gray-300 text-sm font-medium rounded-md text-gray-700 bg-white hover:bg-gray-50"
-                  @click="paginate(current+2)"> Next </a>
-                </div>
-                <div class="hidden sm:flex-1 sm:flex sm:items-center sm:justify-between">
-                  <div>
-                    <p class="text-sm text-gray-700">
-                      Résultats
-                      <span class="font-medium" x-text="Math.min((current * 10)+1, state.count)"></span>
-                      à
-                      <span class="font-medium" x-text="Math.min((current * 10)+10, state.count)"></span>
-                      sur
-                      <span class="font-medium" x-text="state.count"></span>
-                    </p>
-                  </div>
-                  <div>
-                    <nav class="relative z-0 inline-flex rounded-md shadow-sm -space-x-px" aria-label="Pagination">
-                      <a href="#" class="relative inline-flex items-center px-2 py-2 rounded-l-md border border-gray-300 bg-white text-sm font-medium text-gray-500 hover:bg-gray-50"
-                        @click="paginate(current)">
-                        <span class="sr-only">Previous</span>
-                        <!-- Heroicon name: solid/chevron-left -->
-                        <svg class="h-5 w-5" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20" fill="currentColor" aria-hidden="true">
-                          <path fill-rule="evenodd" d="M12.707 5.293a1 1 0 010 1.414L9.414 10l3.293 3.293a1 1 0 01-1.414 1.414l-4-4a1 1 0 010-1.414l4-4a1 1 0 011.414 0z" clip-rule="evenodd" />
-                        </svg>
-                      </a>
-                      <template x-for="i in nb_pages">
-                        <a href="#" @click="paginate(i)"
-                         class="relative inline-flex items-center px-4 py-2 border text-sm font-medium"
-                         :class="i == current+1 ? 'z-10 bg-indigo-50 border-co-blue text-co-blue' : 'bg-white border-gray-300 text-gray-500 hover:bg-gray-50'"
-                         x-text="i"></a>
-                      </template>
-                      <!-- Current: "z-10 bg-indigo-50 border-indigo-500 text-indigo-600", Default: "bg-white border-gray-300 text-gray-500 hover:bg-gray-50" -->
-                    <a href="#" class="relative inline-flex items-center px-2 py-2 rounded-r-md border border-gray-300 bg-white text-sm font-medium text-gray-500 hover:bg-gray-50"
-                        @click="paginate(current+2)">
-                        <span class="sr-only">Next</span>
-                        <!-- Heroicon name: solid/chevron-right -->
-                        <svg class="h-5 w-5" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20" fill="currentColor" aria-hidden="true">
-                          <path fill-rule="evenodd" d="M7.293 14.707a1 1 0 010-1.414L10.586 10 7.293 6.707a1 1 0 011.414-1.414l4 4a1 1 0 010 1.414l-4 4a1 1 0 01-1.414 0z" clip-rule="evenodd" />
-                        </svg>
-                      </a>
-                    </nav>
-                  </div>
-                </div>
-              </div>
-        </div>
-    </div>
-</div>
-</div>
-</div>
-
-</div>
-<div class="mt-8 max-w-3xl mx-auto grid grid-cols-1 gap-6 lg:max-w-7xl lg:grid-flow-col-dense lg:grid-cols-3">
-    <div class="space-y-6 lg:col-start-1 lg:col-span-1">
-        <div class="bg-white shadow sm:rounded-2xl">
-            <h2 id="timeline-title" class="text-lg font-medium text-gray-900 p-4 sm:px-6">Ajouter un bénéficiaire</h2>
-            <div class="border-t border-gray-200 px-4 py-5 sm:px-6">
-                <form method="GET" >
-                <div x-data="{
-                    text: '{{if .ViewState.search}}{{.ViewState.search.beneficiary.Data.first_name}} {{.ViewState.search.beneficiary.Data.last_name}}{{end}}',
-                    beneficiariesListOpen: false,
-                    beneficiaries: {{json .ViewState.beneficiaries}},
-                    filteredBeneficiaries: (text) => {
-                        if(text=='') return beneficiaries
-                        return this.beneficiaries.filter(b => b['data']['first_name'].includes(text) || b['data']['last_name'].includes(text))
-                    },
-                    fields: {
-                        beneficiaryid: {{if .ViewState.search}}'{{.ViewState.search.beneficiary.ID}}'{{else}}null{{end}},
-                    },
-                    selectbeneficiary(beneficiary) {
-                        console.log(beneficiary)
-                        this.fields.beneficiaryid = beneficiary.id 
-                        this.text = beneficiary.data.first_name + ' ' + beneficiary.data.last_name
-                        this.beneficiariesListOpen = false
-                    }
-                }">
-                    <input type="hidden" name="beneficiaryid" x-model="fields.beneficiaryid">
-                    <label for="combobox" class="block text-sm font-medium text-gray-700">Bénéficiaire</label>
-                    <div class="relative mt-1 mb-4">
-                      <input @focus="beneficiariesListOpen = true" x-model="text" id="combobox" type="text" class="w-full rounded-2xl border border-gray-300 bg-white py-2 pl-3 pr-12 shadow-sm focus:border-co-blue focus:outline-none focus:ring-1 focus:ring-co-blue sm:text-sm" role="combobox" aria-controls="options" aria-expanded="false">
-                      
-                      <button @click="beneficiariesListOpen = ! beneficiariesListOpen" type="button" class="absolute inset-y-0 right-0 flex items-center rounded-r-2xl px-2 focus:outline-none">
-                        <!-- Heroicon name: solid/selector -->
-                        <svg class="h-5 w-5 text-gray-400" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20" fill="currentColor" aria-hidden="true">
-                          <path fill-rule="evenodd" d="M10 3a1 1 0 01.707.293l3 3a1 1 0 01-1.414 1.414L10 5.414 7.707 7.707a1 1 0 01-1.414-1.414l3-3A1 1 0 0110 3zm-3.707 9.293a1 1 0 011.414 0L10 14.586l2.293-2.293a1 1 0 011.414 1.414l-3 3a1 1 0 01-1.414 0l-3-3a1 1 0 010-1.414z" clip-rule="evenodd" />
-                        </svg>
-                      </button>
-                  
-                      <ul x-show="beneficiariesListOpen" class="absolute z-10 mt-1 max-h-60 w-full overflow-auto rounded-xl bg-white py-1 text-base shadow-lg ring-1 ring-black ring-opacity-5 focus:outline-none sm:text-sm" id="options" role="listbox">
-                        <!--
-                          Combobox option, manage highlight styles based on mouseenter/mouseleave and keyboard navigation.
-                  
-                          Active: "text-white bg-indigo-600", Not Active: "text-gray-900"
-                        -->
-                        <template x-for="beneficiary in beneficiaries">
-                            <li @click="selectbeneficiary(beneficiary)" class="relative cursor-default hover:bg-gray-100 select-none py-2 pl-3 pr-9 text-gray-900" id="option-0" role="option" tabindex="-1">
-                            <!-- Selected: "font-semibold" -->
-                            <span class="truncate" x-text="beneficiary.data.first_name"></span> <span class="truncate" x-text="beneficiary.data.last_name"></span>
-                    
-                            <!--
-                                Checkmark, only display for selected option.
-                    
-                                Active: "text-white", Not Active: "text-indigo-600"
-                            -->
-                            <span class="absolute inset-y-0 right-0 flex items-center pr-4 text-co-blue">
-                                <!-- Heroicon name: solid/check -->
-                                <!-- <svg class="h-5 w-5" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20" fill="currentColor" aria-hidden="true">
-                                <path fill-rule="evenodd" d="M16.707 5.293a1 1 0 010 1.414l-8 8a1 1 0 01-1.414 0l-4-4a1 1 0 011.414-1.414L8 12.586l7.293-7.293a1 1 0 011.414 0z" clip-rule="evenodd" />
-                                </svg> -->
-                            </span>
-                            </li>
-                        </template>
-                  
-                        <!-- More items... -->
-                      </ul>
-                    </div>
-                  </div>
-                  <!-- <a href="/app/group_module/groups/{{.ViewState.group.ID}}"> -->
-                    <button type="submit"
-                        class="rounded-2xl border border-transparent bg-co-blue px-4 py-2 my-4 mt-8 w-full text-sm font-medium text-white shadow-sm focus:outline-none focus:ring-2 focus:ring-co-blue focus:ring-offset-2 sm:w-auto">
-                        Ajouter
-                    </button>
-                <!-- </a> -->
-                </form>
-            </div>
-        </div>
-        
-    </div>
-</div>
-</div>
-
-{{end}}

themes/default/web/layouts/group_module/home.html

@@ -1,60 +0,0 @@
-
- {{define "content"}}
- <div class="max-w-7xl mt-10 mx-auto px-4 sm:px-6 md:px-8">
-    <h2 class="text-xl font-semibold text-gray-500">Gestion des groupes</h2>
-  
-    <div class="sm:flex sm:items-center">
-      <div class="sm:flex-auto">
-        <p class="mt-2 text-sm text-gray-700"></p>
-      </div>
-      <div class="mt-4 sm:mt-0 sm:ml-16 sm:flex-none">
-        <a href="/app/group_module/groups">
-          <button type="button"
-            class="inline-flex items-center justify-center rounded-2xl border border-transparent bg-co-blue px-4 py-2 text-sm font-medium text-white shadow-sm focus:outline-none focus:ring-2 focus:ring-co-blue focus:ring-offset-2 sm:w-auto">
-            {{$.IconSet.Icon "hero:outline/plus-circle" "h-5 w-5 mr-3"}}
-            Ajouter un groupe
-          </button>
-        </a>
-      </div>
-    </div>
-  
-    <div class="bg-white shadow overflow-hidden sm:rounded-3xl mt-4">
-      <ul role="list" class="divide-y divide-gray-200">
-        {{range .ViewState.groups}}
-        <li>
-          <a href="/app/group_module/groups/{{.ID}}" class="block hover:bg-gray-50">
-            <div class="px-4 py-4 flex items-center sm:px-6">
-              <div class="min-w-0 flex-1 sm:flex sm:items-center sm:justify-between">
-                <div class="truncate">
-                  <div class="flex text-sm">
-                    <p class="font-medium text-lg text-co-blue truncate">{{.Data.name}}</p>
-                    <p class="ml-1 flex-shrink-0 font-normal text-gray-500"></p>
-                  </div>
-                  <div class="mt-2 flex">
-                    <div class="flex items-center text-sm text-gray-500">
-                      {{$.IconSet.Icon "hero:outline/user-group" "flex-shrink-0 mr-1.5 h-5 w-5"}}
-                      <p>
-                        {{ len .Members }} bénéficiaires
-                      </p>
-                    </div>
-                  </div>
-                </div>
-                <div class="mt-4 flex-shrink-0 sm:mt-0 sm:ml-5">
-                  <div class="flex overflow-hidden -space-x-1">
-                    <!-- <img class="inline-block h-6 w-6 rounded-full ring-2 ring-white"
-                      src="http://localhost:9000/app/beneficiaries/e7616eac-4a87-4396-a505-23e0421b9c4c/picture"
-                      alt="Dries Vincent"> -->
-                  </div>
-                </div>
-              </div>
-              <div class="ml-5 flex-shrink-0">
-                {{$.IconSet.Icon "hero:solid/chevron-right" "h-5 w-5 text-gray-400"}}
-              </div>
-            </div>
-          </a>
-        </li>
-        {{end}}
-      </ul>
-    </div>
-  </div>
-{{end}}