Checkpoint: Ajout du bouton de téléchargement direct du PDF annoté BAP : route Express /api/download-bap/:filename avec Content-Disposition attachment, bouton Télécharger dans InvoicesBAP (apparaît après validation), boutons Voir + Télécharger dans l'Historique BAP. Correction du layout PDF (2 colonnes) également incluse.
This commit is contained in:
@@ -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" />
|
||||
|
||||
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user