Agenda improvements

handlers/application/administration.go

@@ -6,6 +6,7 @@ import (
 	"net/http"
 
 	groupsmanagement "git.coopgo.io/coopgo-platform/groups-management/grpcapi"
+	accounts "git.coopgo.io/coopgo-platform/mobility-accounts/grpcapi"
 	"github.com/google/uuid"
 	"github.com/gorilla/mux"
 	"google.golang.org/protobuf/types/known/structpb"
@@ -119,5 +120,88 @@ func (h *ApplicationHandler) AdministrationGroupDisplay(w http.ResponseWriter, r
 		return
 	}
 
-	h.Renderer.AdministrationGroupDisplay(w, r, resp.Group.ToStorageType())
+	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)
+			}
+		}
+	}
+
+	h.Renderer.AdministrationGroupDisplay(w, r, resp.Group.ToStorageType(), groupmembers, admins)
+}
+
+func (h *ApplicationHandler) AdministrationGroupInviteAdmin(w http.ResponseWriter, r *http.Request) {
+	vars := mux.Vars(r)
+	groupid := vars["groupid"]
+
+	// groupresp, err := h.services.GRPC.GroupsManagement.GetGroup(&groupsmanagement.GetGroupRequest{
+	// 	Id:        groupid,
+	// 	Namespace: "parcoursmob_organizations",
+	// })
+
+	// if err != nil {
+	// 	fmt.Println(err)
+	// 	w.WriteHeader(http.StatusInternalServerError)
+	// 	return
+	// }
+
+	r.ParseForm()
+
+	accountresp, err := h.services.GRPC.MobilityAccounts.GetAccountUsername(context.TODO(), &accounts.GetAccountUsernameRequest{
+		Username:  r.FormValue("username"),
+		Namespace: "parcoursmob",
+	})
+
+	fmt.Println(err)
+
+	if err == nil {
+		account := accountresp.Account.ToStorageType()
+		account.Data["groups"] = append(account.Data["groups"].([]any), groupid, groupid)
+		account.Data["groups"] = append(account.Data["groups"].([]any), groupid, groupid+":admin")
+
+		as, _ := accounts.AccountFromStorageType(&account)
+
+		_, err = h.services.GRPC.MobilityAccounts.UpdateData(
+			context.TODO(),
+			&accounts.UpdateDataRequest{
+				Account: as,
+			},
+		)
+
+		fmt.Println(err)
+
+		http.Redirect(w, r, fmt.Sprintf("/app/administration/groups/%s", groupid), http.StatusFound)
+		return
+	}
+
+	http.Redirect(w, r, fmt.Sprintf("/app/administration/groups/%s", groupid), http.StatusFound)
+	return
+}
+
+func (h *ApplicationHandler) members() ([]*accounts.Account, error) {
+	resp, err := h.services.GRPC.MobilityAccounts.GetAccounts(context.TODO(), &accounts.GetAccountsRequest{
+		Namespaces: []string{"parcoursmob"},
+	})
+	if err != nil {
+		return nil, err
+	}
+
+	return resp.Accounts, nil
 }

handlers/application/agenda.go

@@ -58,8 +58,6 @@ func (h *ApplicationHandler) AgendaHome(w http.ResponseWriter, r *http.Request)
 	for _, e := range resp.Events {
 		groupids = append(groupids, e.Owners...)
 		responses = append(responses, e.ToStorageType())
-		// fmt.Println(e)
-		// fmt.Println(e.ToStorageType())
 	}
 
 	sort.Sort(EventsByStartdate(responses))
@@ -294,7 +292,7 @@ func parseEventsForm(r *http.Request) (*EventsForm, error) {
 	return formData, nil
 }
 
-func contains(s []string, e string) bool {
+func contains[V string](s []V, e V) bool {
 	for _, a := range s {
 		if a == e {
 			return true

handlers/application/dashboard.go

@@ -4,8 +4,11 @@ import (
 	"context"
 	"fmt"
 	"net/http"
+	"sort"
 
 	"git.coopgo.io/coopgo-apps/parcoursmob/utils/identification"
+	agenda "git.coopgo.io/coopgo-platform/agenda/grpcapi"
+	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"
 )
@@ -47,6 +50,27 @@ func (h *ApplicationHandler) Dashboard(w http.ResponseWriter, r *http.Request) {
 		}
 	}
 
-	h.Renderer.Dashboard(w, r, accounts, count)
+	members, err := h.members()
+	if err != nil {
+		fmt.Println(err)
+		w.WriteHeader(http.StatusInternalServerError)
+		return
+	}
+
+	count_members := len(members)
+
+	events := []agendastorage.Event{}
+
+	eventsresp, err := h.services.GRPC.Agenda.GetEvents(context.TODO(), &agenda.GetEventsRequest{
+		Namespaces: []string{"parcoursmob_dispositifs"},
+	})
+
+	for _, e := range eventsresp.Events {
+		events = append(events, e.ToStorageType())
+	}
+
+	sort.Sort(EventsByStartdate(events))
+
+	h.Renderer.Dashboard(w, r, accounts, count, count_members, events)
 
 }