Improve vehicles management

renderer/administration.go

@@ -1,6 +1,10 @@
 package renderer
 
-import "net/http"
+import (
+	"net/http"
+
+	mobilityaccountsstorage "git.coopgo.io/coopgo-platform/mobility-accounts/storage"
+)
 
 const administrationMenu = "administration"
 
@@ -21,7 +25,7 @@ func (renderer *Renderer) AdministrationCreateGroup(w http.ResponseWriter, r *ht
 	renderer.Render("administration", w, r, files, state)
 }
 
-func (renderer *Renderer) AdministrationGroupDisplay(w http.ResponseWriter, r *http.Request, group any, groupmembers []any, admins []any) {
+func (renderer *Renderer) AdministrationGroupDisplay(w http.ResponseWriter, r *http.Request, group any, groupmembers []mobilityaccountsstorage.Account, admins []mobilityaccountsstorage.Account) {
 	files := renderer.ThemeConfig.GetStringSlice("views.administration.display_group.files")
 	state := NewState(r, renderer.ThemeConfig, administrationMenu)
 	state.ViewState = map[string]any{

renderer/vehicle-management.go

@@ -33,9 +33,12 @@ func (renderer *Renderer) VehiclesManagementBookingsList(w http.ResponseWriter,
 	renderer.Render("fleet overview", w, r, files, state)
 }
 
-func (renderer *Renderer) VehiclesFleetAdd(w http.ResponseWriter, r *http.Request) {
+func (renderer *Renderer) VehiclesFleetAdd(w http.ResponseWriter, r *http.Request, vehicle_types []string) {
 	files := renderer.ThemeConfig.GetStringSlice("views.vehicles_management.fleet_add.files")
 	state := NewState(r, renderer.ThemeConfig, vehiclesmanagementMenu)
+	state.ViewState = map[string]any{
+		"vehicle_types": vehicle_types,
+	}
 
 	renderer.Render("fleet add vehicle", w, r, files, state)
 }

renderer/vehicles.go

@@ -1,7 +1,6 @@
 package renderer
 
 import (
-	"fmt"
 	"net/http"
 
 	filestorage "git.coopgo.io/coopgo-apps/parcoursmob/utils/storage"
@@ -22,16 +21,15 @@ func selectDocumentsDefaults(beneficiarydocuments []filestorage.FileInfo, mandat
 	return res
 }
 
-func (renderer *Renderer) VehiclesSearch(w http.ResponseWriter, r *http.Request, beneficiaries []mobilityaccountsstorage.Account, searched bool, vehicles []any, beneficiary any, startdate any, enddate any, mandatory_documents []string, file_types_map map[string]string, beneficiarydocuments []filestorage.FileInfo) {
+func (renderer *Renderer) VehiclesSearch(w http.ResponseWriter, r *http.Request, beneficiaries []mobilityaccountsstorage.Account, searched bool, vehicles []any, beneficiary any, startdate any, enddate any, mandatory_documents []string, file_types_map map[string]string, beneficiarydocuments []filestorage.FileInfo, selected_type string, automatic bool, vehicles_types []string, admingroups map[string]any) {
 	files := renderer.ThemeConfig.GetStringSlice("views.vehicles.search.files")
 	state := NewState(r, renderer.ThemeConfig, vehiclesMenu)
 	viewstate := map[string]any{
-		"beneficiaries": beneficiaries,
-		"searched":      searched,
+		"beneficiaries":  beneficiaries,
+		"searched":       searched,
+		"vehicles_types": vehicles_types,
 	}
 
-	fmt.Println(mandatory_documents)
-
 	if searched {
 		viewstate["search"] = map[string]any{
 			"startdate":             startdate,
@@ -41,6 +39,9 @@ func (renderer *Renderer) VehiclesSearch(w http.ResponseWriter, r *http.Request,
 			"mandatory_documents":   mandatory_documents,
 			"file_types_map":        file_types_map,
 			"beneficiary_documents": beneficiarydocuments,
+			"selected_type":         selected_type,
+			"automatic":             automatic,
+			"admingroups":           admingroups,
 			"documents_defaults":    selectDocumentsDefaults(beneficiarydocuments, mandatory_documents),
 		}
 	}