go.mod

@@ -51,7 +51,7 @@ require (
 
 require (
 	ariga.io/atlas v0.12.0 // indirect
-	git.coopgo.io/coopgo-platform/diags v0.0.0-20250210110754-726bb4643c63
+	git.coopgo.io/coopgo-platform/diags v0.0.0-20241120133550-917ed8705c73
 	github.com/agext/levenshtein v1.2.1 // indirect
 	github.com/apparentlymart/go-textseg/v13 v13.0.0 // indirect
 	github.com/coreos/go-semver v0.3.0 // indirect

go.sum

@@ -4,8 +4,6 @@ git.coopgo.io/coopgo-platform/agenda v1.0.0 h1:rTHgva1JKKO0wAPlINegifMkHm+xOg3IW
 git.coopgo.io/coopgo-platform/agenda v1.0.0/go.mod h1:/hToSla0p6SeWn1zo1MDrfxdmo7RBdZDkbLqCVituIM=
 git.coopgo.io/coopgo-platform/diags v0.0.0-20241120133550-917ed8705c73 h1:Xyc2Xuf7VnaOVD7sro2GPD1gzwo+R9lyfkWjyrTYlqY=
 git.coopgo.io/coopgo-platform/diags v0.0.0-20241120133550-917ed8705c73/go.mod h1:diyq11WNkgJ0kYHdT7SphXPMQUyoq4lRk7T6IgM5yPA=
-git.coopgo.io/coopgo-platform/diags v0.0.0-20250210110754-726bb4643c63 h1:BvNTshj4TToGptaheeAzEmaNeuqPCR/NIH6TGePd54A=
-git.coopgo.io/coopgo-platform/diags v0.0.0-20250210110754-726bb4643c63/go.mod h1:diyq11WNkgJ0kYHdT7SphXPMQUyoq4lRk7T6IgM5yPA=
 git.coopgo.io/coopgo-platform/emailing v0.0.0-20241119141913-9836b30191c1 h1:gAhJ9wwlitMiETmnD4U2L6xLnVd5xE4hPX72IJ5s7+I=
 git.coopgo.io/coopgo-platform/emailing v0.0.0-20241119141913-9836b30191c1/go.mod h1:EXy6NRvFfpW6yIHoZUixldkXrj1qzjCbTHpumDvzaKI=
 git.coopgo.io/coopgo-platform/fleets v0.0.0-20230310144446-feb935f8bf4e h1:eHahRTKlC8aBWYCd6LbXNcX8HoQhuZj31OFWrw0EL0U=

handlers/application/diags.go

@@ -5,18 +5,15 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
-	"io"
 
 	// "io"
 	"net/http"
 	// "strconv"
 	"strings"
-	"time"
+	// "time"
 
 	"git.coopgo.io/coopgo-apps/parcoursmob/services"
 	"git.coopgo.io/coopgo-apps/parcoursmob/utils/identification"
-	filestorage "git.coopgo.io/coopgo-apps/parcoursmob/utils/storage"
-
 	// filestorage "git.coopgo.io/coopgo-apps/parcoursmob/utils/storage"
 	diags "git.coopgo.io/coopgo-platform/diags/grpcapi"
 	diagsstorage "git.coopgo.io/coopgo-platform/diags/storage"
@@ -25,11 +22,10 @@ import (
 	// "git.coopgo.io/coopgo-platform/groups-management/storage"
 	// mobilityaccounts "git.coopgo.io/coopgo-platform/mobility-accounts/grpcapi"
 	// "github.com/google/uuid"
-	"github.com/google/uuid"
 	"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,12 +35,12 @@ type DiagsForm struct {
 	UiSchema        string          `json:"ui_schema"`
 	Data            map[string]any  `json:"data"`
 	Deleted         bool            `json:"deleted"`
-	Diagdate		*time.Time      `json:"diagdate"`
 }
 
 func (h *ApplicationHandler) DiagsHome(w http.ResponseWriter, r *http.Request) {
 	resp, err := h.services.GRPC.Diags.GetDiags(context.TODO(), &diags.GetDiagsRequest{
 		Namespaces: []string{"parcoursmob_beneficiaries", "parcoursmob_diagnostiques", "parcoursmob_vehicles", "parcoursmob_bookings"},
+		// Mindate:    timestamppb.New(time.Now().Add(-24 * time.Hour)),
 	})
 
 	if err != nil {
@@ -65,6 +61,7 @@ func (h *ApplicationHandler) DiagsHome(w http.ResponseWriter, r *http.Request) {
 func (h *ApplicationHandler) DiagsHistory(w http.ResponseWriter, r *http.Request) {
 	resp, err := h.services.GRPC.Diags.GetDiags(context.TODO(), &diags.GetDiagsRequest{
 		Namespaces: []string{"parcoursmob_beneficiaries", "parcoursmob_diagnostiques", "parcoursmob_vehicles", "parcoursmob_bookings"},
+		//Maxdate:    timestamppb.New(time.Now().Add(24 * time.Hour)),
 	})
 
 	if err != nil {
@@ -128,7 +125,6 @@ func (h *ApplicationHandler) BeneficiariesCreateDiag(w http.ResponseWriter, r *h
 				UiSchema:   diagForm.UiSchema,
 				Data:       data,
 				Deleted:    diagForm.Deleted,
-				Diagdate:   timestamppb.New(time.Now()),
 			},
 		}
 
@@ -139,46 +135,11 @@ func (h *ApplicationHandler) BeneficiariesCreateDiag(w http.ResponseWriter, r *h
 			return
 		}
 
-		contentType := r.Header.Get("Content-Type")
-		if strings.HasPrefix(contentType, "multipart/form-data") {
-			err = r.ParseMultipartForm(100 * 1024 * 1024) // 100 MB limit
-			if err != nil {
-				log.Error().Err(err).Msg("Error parsing multipart form")
-				w.WriteHeader(http.StatusBadRequest)
-				return
-			}
-
-			file, header, err := r.FormFile("file-upload")
-			if err == nil {
-				defer file.Close()
-
-				document_type := r.FormValue("file_type")
-				document_name := r.FormValue("file_name")
-
-				fileid := uuid.NewString()
-
-				metadata := map[string]string{
-					"file_type": document_type,
-					"file_name": document_name,
-				}
-
-				if err := h.filestorage.Put(file, filestorage.PREFIX_DIAGS, fmt.Sprintf("%s/%s_%s", resp.Diag.Id, fileid, header.Filename), header.Size, metadata); err != nil {
-					log.Error().Err(err).Msg("Error uploading file")
-					w.WriteHeader(http.StatusInternalServerError)
-					return
-				}
-			} else if err != http.ErrMissingFile {
-				log.Error().Err(err).Msg("Error retrieving file")
-				w.WriteHeader(http.StatusInternalServerError)
-				return
-			}
-		}
-
 		http.Redirect(w, r, fmt.Sprintf("/app/diags/%s", resp.Diag.Id), http.StatusFound)
 		return
 	}
 
-	h.Renderer.BeneficiariesCreateDiag(w, r, beneficiaryID, h.config.GetStringSlice("modules.diags.documents_types"), h.config.GetStringMapString("storage.files.file_types"), nil)
+	h.Renderer.BeneficiariesCreateDiag(w, r, beneficiaryID)
 }
 
 func (h *ApplicationHandler) VehiclesCreateDiag(w http.ResponseWriter, r *http.Request) {
@@ -225,7 +186,6 @@ func (h *ApplicationHandler) VehiclesCreateDiag(w http.ResponseWriter, r *http.R
 				UiSchema:   diagForm.UiSchema,
 				Data:       data,
 				Deleted:    diagForm.Deleted,
-				Diagdate:   timestamppb.New(time.Now()),
 			},
 		}
 
@@ -287,7 +247,6 @@ func (h *ApplicationHandler) BookingsCreateDiag(w http.ResponseWriter, r *http.R
 				UiSchema:   diagForm.UiSchema,
 				Data:       data,
 				Deleted:    diagForm.Deleted,
-				Diagdate:   timestamppb.New(time.Now()),
 			},
 		}
 
@@ -349,7 +308,6 @@ func (h *ApplicationHandler) VehicleBookingsCreateDiag(w http.ResponseWriter, r
 				UiSchema:   diagForm.UiSchema,
 				Data:       data,
 				Deleted:    diagForm.Deleted,
-				Diagdate:   timestamppb.New(time.Now()),
 			},
 		}
 
@@ -390,12 +348,7 @@ func (h *ApplicationHandler) DiagsDisplayDiag(w http.ResponseWriter, r *http.Req
 	}
 
 
-	documents := h.filestorage.List(filestorage.PREFIX_DIAGS + "/" + diagid)
+	h.Renderer.DiagsDisplayDiag(w, r, resp.Diag.ToStorageType())
-
-	events_file_types := h.config.GetStringSlice("modules.diags.documents_types")
-	file_types_map := h.config.GetStringMapString("storage.files.file_types")
-
-	h.Renderer.DiagsDisplayDiag(w, r, resp.Diag.ToStorageType(), events_file_types, file_types_map, documents)
 }
 
 func parseDiagsForm(r *http.Request) (*DiagsForm, error) {
@@ -464,7 +417,7 @@ func (h *ApplicationHandler) DiagUpdate(w http.ResponseWriter, r *http.Request)
 				JsonSchema:     diagForm.JsonSchema,
 				UiSchema: 	 	diagForm.UiSchema,
 				Data:           data,
-				Diagdate: 	 	timestamppb.New(time.Now()),
+
 			},
 		}
 
@@ -508,7 +461,6 @@ func (h *ApplicationHandler) DiagDelete(w http.ResponseWriter, r *http.Request)
 				UiSchema:	 	resp.Diag.UiSchema,
 				Data:           resp.Diag.Data,
 				Deleted:        true,
-				Diagdate: 	 	resp.Diag.Diagdate,
 			},
 		}
 
@@ -542,61 +494,3 @@ func (h *ApplicationHandler) DiagsHistoryDiag(w http.ResponseWriter, r *http.Req
 
 	h.Renderer.DiagsHistoryDiag(w, r, resp.Diag.ToStorageType())
 }
-
-// //// ADD DOCUMENTS //////
-func (h *ApplicationHandler) DiagsDocuments(w http.ResponseWriter, r *http.Request) {
-	vars := mux.Vars(r)
-	diagID := vars["diagid"]
-
-	//r.ParseForm()
-	r.ParseMultipartForm(100 * 1024 * 1024)
-
-	document_type := r.FormValue("type")
-	document_name := r.FormValue("name")
-
-	file, header, err := r.FormFile("file-upload")
-	if err != nil {
-		log.Error().Err(err).Msg("")
-		return
-	}
-	defer file.Close()
-
-	fileid := uuid.NewString()
-
-	metadata := map[string]string{
-		"type": document_type,
-		"name": document_name,
-	}
-
-	if err := h.filestorage.Put(file, filestorage.PREFIX_DIAGS, fmt.Sprintf("%s/%s_%s", diagID, fileid, header.Filename), header.Size, metadata); err != nil {
-		log.Error().Err(err).Msg("")
-		w.WriteHeader(http.StatusInternalServerError)
-		return
-	}
-
-	http.Redirect(w, r, fmt.Sprintf("/app/diags/%s", diagID), http.StatusFound)
-
-}
-
-func (h *ApplicationHandler) DiagsDocumentDownload(w http.ResponseWriter, r *http.Request) {
-	vars := mux.Vars(r)
-	diagID := vars["diagid"]
-	document := vars["document"]
-
-	file, info, err := h.filestorage.Get(filestorage.PREFIX_DIAGS, fmt.Sprintf("%s/%s", diagID, document))
-	if err != nil {
-		log.Error().Err(err).Msg("")
-		w.WriteHeader(http.StatusInternalServerError)
-		return
-	}
-
-	w.Header().Set("Content-Type", info.ContentType)
-	if _, err = io.Copy(w, file); err != nil {
-		log.Error().Err(err).Msg("")
-		w.WriteHeader(http.StatusInternalServerError)
-		return
-	}
-
-	http.Redirect(w, r, fmt.Sprintf("/app/diags/%s", diagID), http.StatusFound)
-
-}

main.go

@@ -200,8 +200,6 @@ func main() {
 	application.HandleFunc("/vehicles/bookings/{bookingid}/create-diag", applicationHandler.VehicleBookingsCreateDiag)
 	//////////////////Diags////////////////////////
 	application.HandleFunc("/diags/", applicationHandler.DiagsHome)
-	application.HandleFunc("/diags/{diagid}/documents", applicationHandler.DiagsDocuments)
-	application.HandleFunc("/diags/{diagid}/documents/{document}", applicationHandler.DiagsDocumentDownload)
 	application.HandleFunc("/diags/{diagid}", applicationHandler.DiagsDisplayDiag)
 	application.HandleFunc("/diags/{diagid}/update", applicationHandler.DiagUpdate)
 	application.HandleFunc("/diags/{diagid}/delete", applicationHandler.DiagDelete)

renderer/diags.go

@@ -28,14 +28,11 @@ func (renderer *Renderer) DiagsHistory(w http.ResponseWriter, r *http.Request, d
 	renderer.Render("diags history", w, r, files, state)
 }
 
-func (renderer *Renderer) BeneficiariesCreateDiag(w http.ResponseWriter, r *http.Request, beneficiary string, diags_file_types []string, file_types_map map[string]string, documents any) {
+func (renderer *Renderer) BeneficiariesCreateDiag(w http.ResponseWriter, r *http.Request, beneficiary string) {
 	state := NewState(r, renderer.ThemeConfig, diagsMenu)
 	files := renderer.ThemeConfig.GetStringSlice("views.beneficiaries.create_diag.files")
 	state.ViewState = map[string]any{
 		"beneficiary": beneficiary,
-		"diags_file_types": diags_file_types,
-		"file_types_map": file_types_map,
-		"documents": documents,
 	}
 	renderer.Render("diag create for beneficiary", w, r, files, state)
 }
@@ -67,15 +64,12 @@ func (renderer *Renderer) VehicleBookingsCreateDiag(w http.ResponseWriter, r *ht
 	renderer.Render("diag create for booking", w, r, files, state)
 }
 
-func (renderer *Renderer) DiagsDisplayDiag(w http.ResponseWriter, r *http.Request, diag any, diags_file_types []string, file_types_map map[string]string, documents any) {
+func (renderer *Renderer) DiagsDisplayDiag(w http.ResponseWriter, r *http.Request, diag any) {
 	files := renderer.ThemeConfig.GetStringSlice("views.diags.display_diag.files")
 	state := NewState(r, renderer.ThemeConfig, diagsMenu)
 
 	state.ViewState = map[string]any{
 		"diag":         	 diag,
-		"diags_file_types": diags_file_types,
-		"file_types_map":	 file_types_map,
-		"documents":     	 documents,
 	}
 
 	renderer.Render("diags create diag", w, r, files, state)

utils/storage/files.go

@@ -11,7 +11,6 @@ const (
 	PREFIX_BENEFICIARIES = "beneficiaries"
 	PREFIX_BOOKINGS      = "fleets_bookings"
 	PREFIX_AGENDA		 = "event_files"
-	PREFIX_DIAGS		 = "diags"
 )
 
 type FileInfo struct {