go.mod

@@ -6,7 +6,7 @@ go 1.18
 
 // replace git.coopgo.io/coopgo-platform/groups-management => ../../coopgo-platform/groups-management/
 
-replace git.coopgo.io/coopgo-platform/fleets => ../../coopgo-platform/fleets/
+// replace git.coopgo.io/coopgo-platform/fleets => ../../coopgo-platform/fleets/
 
 // replace git.coopgo.io/coopgo-platform/agenda => ../../coopgo-platform/agenda/
 

handlers/application/vehicles-management.go

@@ -45,9 +45,7 @@ func (h *ApplicationHandler) VehiclesManagementOverview(w http.ResponseWriter, r
 			vehicleBookings := []fleetsstorage.Booking{}
 			for _, b := range v.Bookings {
 				if b.Status() != fleetsstorage.StatusOld {
-					if deleted, ok := b.Data["Deleted"].(bool); !ok && !deleted {
-						bookings = append(bookings, b)
-					}
+					bookings = append(bookings, b)
 				}
 				if b.Unavailableto.After(time.Now()) {
 					vehicleBookings = append(vehicleBookings, b)
@@ -469,127 +467,27 @@ 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())
-}
+// 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)
+// }

main.go

@@ -106,9 +106,6 @@ func main() {
 	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)
@@ -160,8 +157,6 @@ func main() {
 	application.HandleFunc("/agenda/{eventid}/{subscribeid}/delete", applicationHandler.AgendaDeleteSubscribeEvent)
 	application.HandleFunc("/agenda/{eventid}/history", applicationHandler.AgendaHistoryEvent)
 	/////////////////////////////////////////////////////////////////////////////////////////////////////
-
-
 	fmt.Println("-> HTTP server listening on", address)
 
 	srv := &http.Server{

renderer/vehicle-management.go

@@ -78,14 +78,3 @@ func (renderer *Renderer) VehicleManagementBookingDisplay(w http.ResponseWriter,
 
 	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)
-
-}