fix: add visite_details field + fix pdf issues

ledouxm · ledouxm · commit 5b80c785833a · 2026-04-22T10:09:34.000+02:00
diff --git a/packages/backend/src/db/schema.ts b/packages/backend/src/db/schema.ts
@@ -649,8 +649,8 @@ export const stateReport = pgTable(
     titre_edifice: text("titre_edifice"),
     // contexte de la visite
     natureVisite: text("nature_visite"),
-    visite_partielle_parties: text("visite_partielle_parties"),
     visite_partielle_details: text("visite_partielle_details"),
+    visite_details: text("visite_details"),
     bilanQuinquennal: boolean("bilan_quinquennal").default(true),
     dateVisite: timestamp("date_visite", { mode: "string" }),
     redactedBy: text("redacted_by"),
diff --git a/packages/backend/src/features/mail/dsfrMailWrapper.ts b/packages/backend/src/features/mail/dsfrMailWrapper.ts
@@ -113,6 +113,7 @@ const DSFR_CSS = `
     [data-ogsc] .link { color: #7C7CFF !important; }
   }
   body {
+    font-family:'Marianne',Arial,Helvetica,sans-serif !important;
     width: 100%;
     background-color: #ffffff;
     margin: 0;
@@ -173,7 +174,7 @@ export function wrapWithDsfrMail({
     <tr><td align="center" class="darkmode">
       <table style="min-width:600px; margin:0 auto; width:600px;" class="wlkm-mw darkmode" width="600" cellspacing="0" cellpadding="0" role="presentation" border="0" bgcolor="#ffffff" align="center">
         <tr><td class="darkmode">
-          <table style="margin:0 auto; width:496px;" class="wlkm-cl darkmode" width="496" cellspacing="0" cellpadding="0" role="presentation" border="0" bgcolor="#ffffff" align="center">
+          <table style="padding-left:10px;padding-right:10px;width:496px;" class="wlkm-cl darkmode" width="496" cellspacing="0" cellpadding="0" role="presentation" border="0" bgcolor="#ffffff" align="center">
             <tr><td class="darkmode-1" width="496" align="left" valign="top" style="padding:4px 0px 8px 0px; line-height:18px; font-size:12px; color:#6b6b6b; font-family:'Marianne',Arial,Helvetica,sans-serif;">
               <span style="font-family:'Marianne',Arial,Helvetica,sans-serif !important;">${escapeHtml(preheader)}</span>
             </td></tr>
@@ -192,8 +193,8 @@ export function wrapWithDsfrMail({
         <tr><td align="center">
           <table style="min-width:600px; margin:0 auto; width:600px; border-left:1px #e5e5e5 solid; border-right:1px #e5e5e5 solid; border-top:1px #e5e5e5 solid;" class="wlkm-mw darkmode" width="600" cellspacing="0" cellpadding="0" role="presentation" border="0" bgcolor="#ffffff" align="center">
             <tr><td>
-              <table style="margin:0 auto; width:496px;" class="wlkm-cl darkmode" width="496" cellspacing="0" cellpadding="0" role="presentation" border="0" bgcolor="#ffffff" align="center">
-                <tr><td style="width:100%;" width="100%" valign="top" align="center">
+              <table style="width:100%;" class="wlkm-cl darkmode" width="496" cellspacing="0" cellpadding="0" role="presentation" border="0" bgcolor="#ffffff" align="center">
+                <tr ><td style="width:100%; padding-left:10px; padding-right:10px;" width="100%" valign="top" align="center">
                   <!-- Marianne logo left -->
                   <table style="border-collapse:collapse;" width="76" cellspacing="0" cellpadding="0" role="presentation" border="0" align="left" bgcolor="#ffffff" class="darkmode">
                     <tr><td align="center">
@@ -237,7 +238,7 @@ export function wrapWithDsfrMail({
         <tr><td align="center">
           <table style="min-width:600px; margin:0 auto; width:600px; border-left:1px #e5e5e5 solid; border-right:1px #e5e5e5 solid;" class="wlkm-mw darkmode-4" width="600" cellspacing="0" cellpadding="0" role="presentation" border="0" bgcolor="#ECECFE" align="center">
             <tr><td>
-              <table style="margin:0 auto; width:496px;" class="wlkm-cl darkmode" width="496" cellspacing="0" cellpadding="0" role="presentation" border="0" bgcolor="#ECECFE" align="center">
+              <table style="width:100%;" class="wlkm-cl darkmode" width="496" cellspacing="0" cellpadding="0" role="presentation" border="0" bgcolor="#ECECFE" align="center">
                 <tr><td class="darkmode-4" width="496" align="left" valign="top" style="padding:20px 10px 20px 10px; line-height:32px; font-size:24px; color:#161616; font-family:'Marianne',Arial,Helvetica,sans-serif;">
                   <span style="font-family:'Marianne',Arial,Helvetica,sans-serif !important;"><strong>${escapeHtml(title)}</strong></span>
                 </td></tr>
diff --git a/packages/backend/src/services/uploadService.ts b/packages/backend/src/services/uploadService.ts
@@ -18,7 +18,6 @@ const client = new S3Client({
 
 export const upload = async () => {};
 const bucketUrl = `${ENV.MINIO_URL}/${ENV.MINIO_BUCKET}`;
-console.log(bucketUrl);
 const addAttachmentPrefix = (filePath: string) => "attachment/" + filePath;
 
 export class UploadService {
@@ -69,7 +68,6 @@ export class UploadService {
       .where("attachment_id", "like", "%.pdf")
       .selectAll()
       .executeTakeFirst();
-    console.log(attachment);
     if (!attachment) throw new AppError(404, "PDF not found");
 
     const command = new GetObjectCommand({ Bucket: bucketUrl, Key: addAttachmentPrefix(attachment.attachment_id) });
diff --git a/packages/frontend/src/db/AppSchema.ts b/packages/frontend/src/db/AppSchema.ts
@@ -227,6 +227,7 @@ const state_report = new Table({
 
   nature_visite: column.text,
   visite_partielle_details: column.text,
+  visite_details: column.text,
   date_visite: column.text,
   personnes_presentes: column.text,
   redacted_by: column.text,
diff --git a/packages/frontend/src/features/state-report/WithReferencePop.tsx b/packages/frontend/src/features/state-report/WithReferencePop.tsx
@@ -260,7 +260,6 @@ const CreateButton = () => {
       })
       .map(([key]) => key);
 
-    console.log(alertsQuery.data);
     const alertErrors = alertsQuery.data
       ?.map((alert) => {
         const errors = checkAlertErrors(alert);
diff --git a/packages/frontend/src/features/state-report/alerts/StateReportAlertsMenu.tsx b/packages/frontend/src/features/state-report/alerts/StateReportAlertsMenu.tsx
@@ -45,7 +45,6 @@ export const StateReportAlertsMenu = ({ onClose }: StateReportAlertModalContentP
 
   const { constatId } = routeApi.useParams();
   const existingSectionsQuery = useQuery(constatPdfQueries.alerts({ constatId }));
-  console.log("existingSectionsQuery", existingSectionsQuery.data);
   const existingSections = existingSectionsQuery.data ?? [];
 
   return (
@@ -188,8 +187,6 @@ const AlertSectionsList = ({
         .returningAll()
         .execute();
 
-      console.log("Created new alert", newAlert);
-
       fieldArray.append({ ...newAlert[0], attachments: [] });
     },
   });
@@ -262,7 +259,6 @@ const AlertSectionsList = ({
   }
 
   const chunked = chunk(alertSectionStaticData, isDesktop ? 2 : 1);
-  console.log({ alertSectionStaticData, alertSections });
   return (
     <>
       {chunked.map((chunk, index) => (
diff --git a/packages/frontend/src/features/state-report/pdf/ConstatPdf.queries.tsx b/packages/frontend/src/features/state-report/pdf/ConstatPdf.queries.tsx
@@ -143,7 +143,6 @@ export const constatPdfQueries = {
     queryOptions({
       queryKey: ["state-report-alerts", constatId],
       queryFn: async () => {
-        console.log("fetching alerts for constatId", constatId);
         const alerts = await db
           .selectFrom("state_report_alert")
           .selectAll()
diff --git a/packages/frontend/src/features/state-report/pdf/ConstatPdf.send.tsx b/packages/frontend/src/features/state-report/pdf/ConstatPdf.send.tsx
@@ -31,7 +31,6 @@ export const SendConstatPdf = () => {
 };
 
 const BlobViewer = ({ blob }: BlobProviderParams) => {
-  console.log("blob");
   if (!blob) return null;
   return <PDFViewerPaginated blob={blob} />;
 };
diff --git a/packages/frontend/src/features/state-report/steps/ConstatDetaille.tsx b/packages/frontend/src/features/state-report/steps/ConstatDetaille.tsx
@@ -6,7 +6,7 @@ import { RadioButtons } from "@codegouvfr/react-dsfr/RadioButtons";
 import { Box, Dialog, DialogTitle, Grid, Stack, Typography } from "@mui/material";
 import { useMutation } from "@tanstack/react-query";
 import { getRouteApi } from "@tanstack/react-router";
-import { useState } from "react";
+import { useEffect, useRef, useState } from "react";
 import useDebounce from "react-use/lib/useDebounce";
 import { v4 } from "uuid";
 import { useUser } from "../../../contexts/AuthContext";
@@ -24,6 +24,7 @@ import { fr } from "@codegouvfr/react-dsfr";
 import { ButtonsSwitch } from "../WithReferencePop";
 import { chunk } from "pastable";
 import { getIsSectionVisited } from "@patrinotes/pdf/utils";
+import { useClickAway } from "react-use";
 
 const routeApi = getRouteApi("/constat/$constatId");
 export const ConstatDetaille = () => {
@@ -192,6 +193,11 @@ const SectionModal = ({
 }) => {
   const isCustom = selectedSection && !defaultSections.includes(selectedSection.section!);
 
+  const ref = useRef<HTMLDivElement>(null);
+  useClickAway(ref, () => {
+    onClose();
+  });
+
   return (
     <Dialog
       open={selectedSection !== null}
@@ -206,7 +212,7 @@ const SectionModal = ({
         },
       }}
     >
-      <Box p={{ xs: "16px" }}>
+      <Box p={{ xs: "16px" }} ref={ref}>
         <ModalCloseButton onClose={onClose} />
 
         <DialogTitle
@@ -249,6 +255,13 @@ const SectionForm = ({
     },
   });
 
+  // sync form values when modal is closed
+  useEffect(() => {
+    return () => {
+      syncMutation.mutate();
+    };
+  }, []);
+
   const syncMutation = useMutation({
     mutationFn: async () => {
       if (Object.keys(diff).length === 0) {
@@ -316,6 +329,7 @@ const SectionForm = ({
             sx={{ mb: "16px !important" }}
             textArea
             disabled={isDisabled || isRecording}
+            hintText="Cause(s) probable(s) des désordres, incidences sur d’autres éléments…"
             label="Commentaires"
             nativeTextAreaProps={{
               rows: 6,
diff --git a/packages/frontend/src/features/state-report/steps/ContexteVisite.tsx b/packages/frontend/src/features/state-report/steps/ContexteVisite.tsx
@@ -27,7 +27,7 @@ export const ContexteVisite = () => {
       pt={{ xs: "16px", lg: "14px" }}
       mb="40px"
       sx={{
-        input: {
+        "input, textarea": {
           maxWidth: "588px",
         },
       }}
@@ -47,8 +47,18 @@ export const ContexteVisite = () => {
         Contexte de la visite
       </Typography>
       <MandatoryFieldReminder />
+
       <NatureVisiteRadioButtons isDisabled={isDisabled} />
+      <Input
+        textArea
+        hintText="Déclenchement de la visite, durée, conditions..."
+        nativeTextAreaProps={{
+          rows: 4,
+        }}
+        label="Détails de la visite"
+      />
       <BilanQuinquennalRadioButtons isDisabled={isDisabled} />
+
       <Divider mb="16px" />
       <DateInput
         isDisabled={isDisabled}
@@ -224,7 +234,7 @@ const NatureVisiteRadioButtons = ({ isDisabled }: { isDisabled: boolean }) => {
   }));
 
   return (
-    <Stack gap={0} mb="16px">
+    <Stack gap={0} mb="1.5rem">
       <RadioButtons
         disabled={isDisabled}
         orientation={isDesktop ? "horizontal" : "vertical"}
diff --git a/packages/frontend/src/features/state-report/steps/MonumentHistorique.tsx b/packages/frontend/src/features/state-report/steps/MonumentHistorique.tsx
@@ -79,7 +79,7 @@ export const MonumentHistorique = () => {
           <Box flex="1" mt={{ xs: isEditing ? "16px" : "0", lg: "0" }}>
             {!isCustom ? (
               <EditableField
-                label="Référence POP"
+                label="Référence Mérimée"
                 field="reference_pop"
                 isEditing={isEditing}
                 isDisabled
diff --git a/packages/frontend/src/features/upload/hooks/useAttachmentImages.ts b/packages/frontend/src/features/upload/hooks/useAttachmentImages.ts
@@ -167,7 +167,6 @@ export function useAttachmentImages(config: AttachmentTableConfig, parentId: str
   };
 
   const onLabelChange = async (attachmentId: string, label: string) => {
-    console.log("Updating label for", attachmentId, "to", label);
     await db.updateTable(config.table).set({ label }).where("id", "=", attachmentId).execute();
   };
 
diff --git a/packages/frontend/src/routes/stats.lazy.tsx b/packages/frontend/src/routes/stats.lazy.tsx
@@ -114,7 +114,6 @@ const StatsPage = () => {
   const totalDocuments = (data?.totalConstats ?? 0) + (data?.totalReports ?? 0);
   const deployedUdapCount = data?.deployedUdapCount ?? 0;
   const deployedCrmhCount = data?.deployedCrmhCount ?? 0;
-  console.log(adminQuery.data?.totalUsers);
   const usersShare = adminQuery.isSuccess ? formatPercent(adminQuery.data.totalUsers, 1102) : null;
   const abandonmentRate = adminQuery.isSuccess
     ? formatPercent(adminQuery.data.abandonedConstats, adminQuery.data.totalConstats)
diff --git a/packages/pdf/src/stateReport.tsx b/packages/pdf/src/stateReport.tsx
@@ -248,7 +248,6 @@ export const transformHeaderText = (text: string | null | undefined) => {
   }
 
   if (uppercaseString.startsWith("UNITÉ DÉPARTEMENTALE DE")) {
-    console.log("matched");
     return addBreaksAfterWords(cleanString, ["DÉPARTEMENTALE DE", "PATRIMOINE"]);
   }
 
