From 9d71f1e34ad0b7c3048a61250495cb991cd41c1a Mon Sep 17 00:00:00 2001
From: Manus <dev-agent@manus.ai>
Date: Sun, 12 Apr 2026 10:05:02 -0400
Subject: [PATCH] =?UTF-8?q?Checkpoint:=20Ajout=20du=20bouton=20de=20t?=
 =?UTF-8?q?=C3=A9l=C3=A9chargement=20direct=20du=20PDF=20annot=C3=A9=20BAP?=
 =?UTF-8?q?=20:=20route=20Express=20/api/download-bap/:filename=20avec=20C?=
 =?UTF-8?q?ontent-Disposition=20attachment,=20bouton=20T=C3=A9l=C3=A9charg?=
 =?UTF-8?q?er=20dans=20InvoicesBAP=20(appara=C3=AEt=20apr=C3=A8s=20validat?=
 =?UTF-8?q?ion),=20boutons=20Voir=20+=20T=C3=A9l=C3=A9charger=20dans=20l'H?=
 =?UTF-8?q?istorique=20BAP.=20Correction=20du=20layout=20PDF=20(2=20colonn?=
 =?UTF-8?q?es)=20=C3=A9galement=20incluse.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 client/src/pages/BapHistory.tsx  | 43 +++++++++++++++++++++++++-------
 client/src/pages/InvoicesBAP.tsx | 43 +++++++++++++++++++++++++++-----
 server/_core/index.ts            | 15 +++++++++++
 server/routers.ts                |  1 +
 4 files changed, 87 insertions(+), 15 deletions(-)

diff --git a/client/src/pages/BapHistory.tsx b/client/src/pages/BapHistory.tsx
index 9556686..28d663d 100644
--- a/client/src/pages/BapHistory.tsx
+++ b/client/src/pages/BapHistory.tsx
@@ -19,8 +19,21 @@ import {
   Building2,
   User,
   FileText,
+  Download,
 } from "lucide-react";
 
+// Helper : télécharge un PDF annoté BAP depuis son URL de stockage
+function downloadBapPdf(pdfUrl: string, supplierName?: string | null) {
+  const filename = pdfUrl.split('/').pop() || 'BAP.pdf';
+  const downloadUrl = `/api/download-bap/${filename}`;
+  const a = document.createElement('a');
+  a.href = downloadUrl;
+  a.download = supplierName ? `BAP_${supplierName.replace(/[^a-zA-Z0-9]/g, '_')}.pdf` : filename;
+  document.body.appendChild(a);
+  a.click();
+  document.body.removeChild(a);
+}
+
 export default function BapHistory() {
   const { data: entries, isLoading, refetch } = trpc.bapHistory.getAll.useQuery();
   const deleteMutation = trpc.bapHistory.delete.useMutation();
@@ -236,15 +249,27 @@ export default function BapHistory() {
                         </TableCell>
                         <TableCell>
                           {entry.exportMode === "browser" && entry.pdfUrl ? (
-                            <Button
-                              variant="ghost"
-                              size="sm"
-                              className="h-7 px-2 text-blue-600 hover:text-blue-700"
-                              onClick={() => window.open(entry.pdfUrl!, "_blank")}
-                            >
-                              <Monitor className="h-3.5 w-3.5 mr-1" />
-                              <span className="text-xs">Voir PDF</span>
-                            </Button>
+                            <div className="flex items-center gap-1">
+                              <Button
+                                variant="ghost"
+                                size="sm"
+                                className="h-7 px-2 text-blue-600 hover:text-blue-700"
+                                onClick={() => window.open(entry.pdfUrl!, "_blank")}
+                                title="Ouvrir dans le navigateur"
+                              >
+                                <Monitor className="h-3.5 w-3.5 mr-1" />
+                                <span className="text-xs">Voir</span>
+                              </Button>
+                              <Button
+                                variant="ghost"
+                                size="sm"
+                                className="h-7 px-2 text-emerald-600 hover:text-emerald-700 hover:bg-emerald-50"
+                                onClick={() => downloadBapPdf(entry.pdfUrl!, entry.supplierName)}
+                                title="Télécharger le PDF annoté"
+                              >
+                                <Download className="h-3.5 w-3.5" />
+                              </Button>
+                            </div>
                           ) : entry.exportMode === "folder" && entry.exportPath ? (
                             <div className="flex items-center gap-1 text-orange-600">
                               <FolderOpen className="h-3.5 w-3.5" />
diff --git a/client/src/pages/InvoicesBAP.tsx b/client/src/pages/InvoicesBAP.tsx
index 2370756..8038ade 100644
--- a/client/src/pages/InvoicesBAP.tsx
+++ b/client/src/pages/InvoicesBAP.tsx
@@ -33,6 +33,18 @@ import {
 } from "@/components/ui/table";
 import { trpc } from "@/lib/trpc";
 import { Search, FileText, Download, FileSpreadsheet, Trash2, Edit, Trash, CheckCircle, CheckCircle2, ShieldCheck } from "lucide-react";
+
+// Helper : télécharge un PDF annoté BAP depuis son URL de stockage
+function downloadBapPdf(pdfUrl: string, supplierName?: string) {
+  const filename = pdfUrl.split('/').pop() || 'BAP.pdf';
+  const downloadUrl = `/api/download-bap/${filename}`;
+  const a = document.createElement('a');
+  a.href = downloadUrl;
+  a.download = supplierName ? `BAP_${supplierName.replace(/[^a-zA-Z0-9]/g, '_')}.pdf` : filename;
+  document.body.appendChild(a);
+  a.click();
+  document.body.removeChild(a);
+}
 import * as XLSX from 'xlsx';
 import { toast } from "sonner";
 import { useLocation } from "wouter";
@@ -65,6 +77,8 @@ export default function InvoicesBAP() {
   const [addDialogType, setAddDialogType] = useState<"service" | "ventilation" | null>(null);
   const [newItemName, setNewItemName] = useState("");
   const [pendingInvoiceId, setPendingInvoiceId] = useState<number | null>(null);
+  // Map invoiceId -> pdfUrl après validation BAP (pour bouton téléchargement)
+  const [bapPdfUrls, setBapPdfUrls] = useState<Record<number, string>>({});
   const [textDialogOpen, setTextDialogOpen] = useState(false);
   const [selectedInvoiceText, setSelectedInvoiceText] = useState<string | null>(null);
   const { data: allInvoices, isLoading } = trpc.invoices.list.useQuery();
@@ -151,6 +165,10 @@ export default function InvoicesBAP() {
 
   const validateBAPMutation = trpc.invoices.validateBAP.useMutation({
     onSuccess: (data) => {
+      // Stocker le pdfUrl pour le bouton téléchargement
+      if (data.invoiceId && data.pdfUrl) {
+        setBapPdfUrls(prev => ({ ...prev, [data.invoiceId as number]: data.pdfUrl as string }));
+      }
       if (data.exportMode === 'browser' && data.pdfUrl) {
         toast.success("Facture validée BAP ! Ouverture du PDF annoté...", { duration: 3000 });
         window.open(data.pdfUrl, '_blank');
@@ -679,12 +697,25 @@ export default function InvoicesBAP() {
                                 <Trash className="h-4 w-4" />
                               </Button>
                               {invoice.bapValidated === 1 ? (
-                                <div
-                                  className="h-8 px-2 flex items-center justify-center rounded border border-green-300 bg-green-50 text-green-700 text-xs font-semibold gap-1"
-                                  title={`Validé BAP le ${invoice.bapValidatedAt ? new Date(invoice.bapValidatedAt).toLocaleDateString('fr-FR') : ''}`}
-                                >
-                                  <CheckCircle2 className="h-4 w-4" />
-                                  <span>Validé</span>
+                                <div className="flex gap-1 items-center">
+                                  <div
+                                    className="h-8 px-2 flex items-center justify-center rounded border border-green-300 bg-green-50 text-green-700 text-xs font-semibold gap-1"
+                                    title={`Validé BAP le ${invoice.bapValidatedAt ? new Date(invoice.bapValidatedAt).toLocaleDateString('fr-FR') : ''}`}
+                                  >
+                                    <CheckCircle2 className="h-4 w-4" />
+                                    <span>Validé</span>
+                                  </div>
+                                  {bapPdfUrls[invoice.id] && (
+                                    <Button
+                                      size="sm"
+                                      variant="outline"
+                                      className="h-8 px-2 text-blue-600 border-blue-300 hover:bg-blue-50"
+                                      title="Télécharger le PDF annoté BAP"
+                                      onClick={() => downloadBapPdf(bapPdfUrls[invoice.id], invoice.supplierName || undefined)}
+                                    >
+                                      <Download className="h-4 w-4" />
+                                    </Button>
+                                  )}
                                 </div>
                               ) : (
                                 <Button
diff --git a/server/_core/index.ts b/server/_core/index.ts
index 6704b67..e1c12a4 100644
--- a/server/_core/index.ts
+++ b/server/_core/index.ts
@@ -2,6 +2,8 @@ import "dotenv/config";
 import express from "express";
 import { createServer } from "http";
 import net from "net";
+import path from "path";
+import fs from "fs";
 import { createExpressMiddleware } from "@trpc/server/adapters/express";
 import { registerOAuthRoutes } from "./oauth";
 import { appRouter } from "../routers";
@@ -38,6 +40,19 @@ async function startServer() {
   // Serve local storage files
   app.use("/storage", express.static("storage"));
 
+  // Route de téléchargement forcé du PDF annoté BAP
+  app.get("/api/download-bap/:filename", (req, res) => {
+    const filename = path.basename(req.params.filename); // sécurité : pas de path traversal
+    const storagePath = path.resolve("storage", filename);
+    if (!fs.existsSync(storagePath)) {
+      res.status(404).json({ error: "Fichier introuvable" });
+      return;
+    }
+    res.setHeader("Content-Disposition", `attachment; filename="${filename}"`);
+    res.setHeader("Content-Type", "application/pdf");
+    res.sendFile(storagePath);
+  });
+
   // tRPC API
   app.use(
     "/api/trpc",
diff --git a/server/routers.ts b/server/routers.ts
index 048c88d..cbe48c1 100644
--- a/server/routers.ts
+++ b/server/routers.ts
@@ -656,6 +656,7 @@ export const appRouter = router({
 
         return {
           success: true,
+          invoiceId: input.id,
           validatedAt,
           pdfUrl,
           exportPath,