Add module diags in menu

handlers/application/diags.go

@@ -10,7 +10,7 @@ import (
 	"net/http"
 	// "strconv"
 	"strings"
-	"time"
+	// "time"
 
 	"git.coopgo.io/coopgo-apps/parcoursmob/services"
 	"git.coopgo.io/coopgo-apps/parcoursmob/utils/identification"
@@ -25,7 +25,7 @@ import (
 	"github.com/gorilla/mux"
 	"github.com/rs/zerolog/log"
 	"google.golang.org/protobuf/types/known/structpb"
-	"google.golang.org/protobuf/types/known/timestamppb"
+	// "google.golang.org/protobuf/types/known/timestamppb"
 )
 
 type DiagsForm struct {
@@ -39,8 +39,8 @@ type DiagsForm struct {
 
 func (h *ApplicationHandler) DiagsHome(w http.ResponseWriter, r *http.Request) {
 	resp, err := h.services.GRPC.Diags.GetDiags(context.TODO(), &diags.GetDiagsRequest{
-		Namespaces: []string{"parcoursmob_diagnostiques"},
+		Namespaces: []string{"parcoursmob_beneficiaries", "parcoursmob_diagnostiques", "parcoursmob_vehicle"},
-		Mindate:    timestamppb.New(time.Now().Add(-24 * time.Hour)),
+		// Mindate:    timestamppb.New(time.Now().Add(-24 * time.Hour)),
 	})
 
 	if err != nil {
@@ -201,7 +201,7 @@ func parseDiagsForm(r *http.Request) (*DiagsForm, error) {
 	return formData, nil
 }
 
-func (h *ApplicationHandler) DiagsUpdateDiag(w http.ResponseWriter, r *http.Request) {
+func (h *ApplicationHandler) DiagUpdate(w http.ResponseWriter, r *http.Request) {
 	adm := strings.Split(r.URL.Path, "/")
 	diagID := adm[3]
 	request := &diags.GetDiagRequest{
@@ -253,10 +253,10 @@ func (h *ApplicationHandler) DiagsUpdateDiag(w http.ResponseWriter, r *http.Requ
 		http.Redirect(w, r, fmt.Sprintf("/app/diags/%s", resp.Diag.Id), http.StatusFound)
 		return
 	}
-	h.Renderer.DiagsUpdateDiag(w, r, resp.Diag.ToStorageType())
+	h.Renderer.DiagUpdate(w, r, resp.Diag.ToStorageType())
 }
 
-func (h *ApplicationHandler) DiagsDeleteDiag(w http.ResponseWriter, r *http.Request) {
+func (h *ApplicationHandler) DiagDelete(w http.ResponseWriter, r *http.Request) {
 
 	vars := mux.Vars(r)
 	diagID := vars["diagid"]
@@ -296,7 +296,7 @@ func (h *ApplicationHandler) DiagsDeleteDiag(w http.ResponseWriter, r *http.Requ
 		http.Redirect(w, r, "/app/diags/", http.StatusFound)
 		return
 	}
-	h.Renderer.DiagsDeleteDiag(w, r, resp.Diag.ToStorageType())
+	h.Renderer.DiagDelete(w, r, resp.Diag.ToStorageType())
 }
 
 func (h *ApplicationHandler) DiagsHistoryDiag(w http.ResponseWriter, r *http.Request) {

main.go

@@ -182,8 +182,6 @@ func main() {
 	// application.HandleFunc("/agenda/{eventid}/create-diag", applicationHandler.DiagsCreateDiag)
 	application.HandleFunc("/agenda/{eventid}/diags", applicationHandler.DiagsHome)
 	application.HandleFunc("/agenda/{eventid}/diags/{diagid}", applicationHandler.DiagsDisplayDiag)
-	application.HandleFunc("/agenda/{eventid}/diags/{diagid}/update", applicationHandler.DiagsUpdateDiag)
-	application.HandleFunc("/agenda/{eventid}/diags/{diagid}/delete", applicationHandler.DiagsDeleteDiag)
 	application.HandleFunc("/agenda/{eventid}/diags/history", applicationHandler.DiagsHistory)
 	application.HandleFunc("/agenda/{eventid}/diags/{diagid}/history", applicationHandler.DiagsHistoryDiag)
 	////////////////////////////////////////////////////////////////
@@ -191,18 +189,19 @@ func main() {
 	application.HandleFunc("/beneficiaries/{beneficiaryid}/create-diag", applicationHandler.BeneficiariesCreateDiag)
 	application.HandleFunc("/beneficiaries/{beneficiaryid}/diags", applicationHandler.DiagsHome)
 	application.HandleFunc("/beneficiaries/{beneficiaryid}/diags/{diagid}", applicationHandler.DiagsDisplayDiag)
-	application.HandleFunc("/beneficiaries/{beneficiaryid}/diags/{diagid}/update", applicationHandler.DiagsUpdateDiag)
-	application.HandleFunc("/beneficiaries/{beneficiaryid}/diags/{diagid}/delete", applicationHandler.DiagsDeleteDiag)
 	application.HandleFunc("/beneficiaries/{beneficiaryid}/diags/history", applicationHandler.DiagsHistory)
 	////////////////////////////////////////////////////////////////
 	//////////////////Diag in vehicules////////////////////////
 	// application.HandleFunc("/vehicles-management/fleet/{vehicleid}/create-diag", applicationHandler.DiagsCreateDiag)
 	application.HandleFunc("/vehicles-management/fleet/{vehicleid}/diags", applicationHandler.DiagsHome)
 	application.HandleFunc("/vehicles-management/fleet/{vehicleid}/diags/{diagid}", applicationHandler.DiagsDisplayDiag)
-	application.HandleFunc("/vehicles-management/fleet/{vehicleid}/diags/{diagid}/update", applicationHandler.DiagsUpdateDiag)
-	application.HandleFunc("/vehicles-management/fleet/{vehicleid}/diags/{diagid}/delete", applicationHandler.DiagsDeleteDiag)
 	application.HandleFunc("/vehicles-management/fleet/{vehicleid}/diags/history", applicationHandler.DiagsHistory)
 	////////////////////////////////////////////////////////////////
+	//////////////////Diags////////////////////////
+	application.HandleFunc("/diags/", applicationHandler.DiagsHome)
+	application.HandleFunc("/diags/{diagid}", applicationHandler.DiagsDisplayDiag)
+	application.HandleFunc("/diags/{diagid}/update", applicationHandler.DiagUpdate)
+	application.HandleFunc("/diags/{diagid}/delete", applicationHandler.DiagDelete)
 
 	export := r.PathPrefix("/exports").Subrouter()
 	export.HandleFunc("/fleets/bookings", exportsHandler.Bookings)

renderer/diags.go

@@ -58,7 +58,7 @@ func (renderer *Renderer) DiagsHistoryDiag(w http.ResponseWriter, r *http.Reques
 	renderer.Render("diags history diag", w, r, files, state)
 }
 
-func (renderer *Renderer) DiagsUpdateDiag(w http.ResponseWriter, r *http.Request, diag any) {
+func (renderer *Renderer) DiagUpdate(w http.ResponseWriter, r *http.Request, diag any) {
 	files := renderer.ThemeConfig.GetStringSlice("views.diags.update.files")
 	state := NewState(r, renderer.ThemeConfig, diagsMenu)
 
@@ -69,7 +69,7 @@ func (renderer *Renderer) DiagsUpdateDiag(w http.ResponseWriter, r *http.Request
 	renderer.Render("diag_update", w, r, files, state)
 }
 
-func (renderer *Renderer) DiagsDeleteDiag(w http.ResponseWriter, r *http.Request, diag any) {
+func (renderer *Renderer) DiagDelete(w http.ResponseWriter, r *http.Request, diag any) {
 	files := renderer.ThemeConfig.GetStringSlice("views.diags.delete.files")
 	state := NewState(r, renderer.ThemeConfig, diagsMenu)
 

renderer/renderer.go

@@ -252,6 +252,14 @@ func NewState(r *http.Request, themeConfig *viper.Viper, menuState string) Rende
 			Icon:   "hero:outline/user-group",
 		})
 	}
+	if modules["diags"] != nil && modules["diags"].(bool) {
+		ls.MenuItems = append(ls.MenuItems, MenuItem{
+			Title:  "Diagnostiques",
+			Link:   "/app/diags/",
+			Active: menuState == diagsMenu,
+			Icon:   "hero:outline/document-text",
+		})
+	}
 	return RenderState{
 		IconSet:     icons.NewIconSet(iconset),
 		Group:       group,