coopgo-apps
/
parcoursmob
7
0
Fork 0
Code Issues Pull Requests Actions Projects Releases Wiki Activity

fix err merge

This commit is contained in:
soukainna 2023-05-19 10:50:15 +02:00
parent b5154bf9be
commit 3bfd2e1bfe
1 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
handlers/application/vehicles-management.go
View File

@ -59,10 +59,7 @@ func (h *ApplicationHandler) VehiclesManagementOverview(w http.ResponseWriter, r
} }
} }
<<<<<<< HEAD
=======
>>>>>>> modifyVehicle
sort.Sort(sorting.VehiclesByLicencePlate(vehicles)) sort.Sort(sorting.VehiclesByLicencePlate(vehicles))
sort.Sort(sorting.BookingsByStartdate(bookings)) sort.Sort(sorting.BookingsByStartdate(bookings))
h.Renderer.VehiclesManagementOverview(w, r, vehicles, vehicles_map, bookings) h.Renderer.VehiclesManagementOverview(w, r, vehicles, vehicles_map, bookings)
@ -532,7 +529,7 @@ func (h *ApplicationHandler) UnbookingVehicle(w http.ResponseWriter, r *http.Req
}, },
}, },
"Deleted": true, "Deleted": true,
"motif": r.FormValue("motif"), "motif": r.FormValue("motif"),
} }
datapb, err := structpb.NewStruct(data) datapb, err := structpb.NewStruct(data)
@ -653,4 +650,3 @@ func (h *ApplicationHandler) VehiclesFleetUpdate(w http.ResponseWriter, r *http.
vehicles_types := h.config.GetStringSlice("modules.fleets.vehicle_types") vehicles_types := h.config.GetStringSlice("modules.fleets.vehicle_types")
h.Renderer.VehiclesFleetUpdate(w, r, resp.Vehicle.ToStorageType(), vehicles_types) h.Renderer.VehiclesFleetUpdate(w, r, resp.Vehicle.ToStorageType(), vehicles_types)
} }