CC

app/main.py

@@ -50,4 +50,9 @@ async def root(request: Request):
 # Health check endpoint
 @app.get("/health")
 async def health_check():
-    return {"status": "healthy"}
+    return {"status": "healthy"}
+
+@app.get("/history")
+async def history_page(request: Request):
+    return templates.TemplateResponse("history.html", {"request": request})
+    

app/routes/invoices.py

@@ -1,6 +1,6 @@
 from fastapi import APIRouter, Depends, HTTPException, Request
 from sqlalchemy.ext.asyncio import AsyncSession
-from sqlalchemy import select, func, Sequence
+from sqlalchemy import select, func, Sequence, delete
 from typing import List, Optional
 from sqlalchemy.orm import selectinload, joinedload, Session
 from fastapi.responses import StreamingResponse
@@ -11,7 +11,6 @@ from app.db.database import get_db
 from app.schemas.invoice import InvoiceCreate, InvoiceResponse
 from app.db.models import Invoice, InvoiceItem
 from app.services.invoice_service import InvoiceService
-from app.services.excel_service import ExcelService
 
 # Set up logging
 logger = logging.getLogger(__name__)
@@ -45,7 +44,6 @@ async def create_new_invoice(
             client_name=invoice.client_name,
             client_phone=invoice.client_phone,
             address=invoice.address,
-            ville=invoice.ville,  # Add ville field
             total_ht=invoice.total_ht,
             tax=invoice.tax,
             total_ttc=invoice.total_ttc,
@@ -143,48 +141,6 @@ async def generate_invoice_pdf(
         logger.error(f"Error generating PDF: {str(e)}", exc_info=True)
         raise HTTPException(status_code=500, detail=str(e))
 
-@router.post("/{invoice_id}/generate-excel")
-async def generate_invoice_excel(
-    invoice_id: int,
-    request: Request,
-    db: AsyncSession = Depends(get_db)
-):
-    try:
-        logger.info(f"Starting Excel generation for invoice ID: {invoice_id}")
-        logger.info(f"Request from IP: {request.client.host}")
-        
-        result = await db.execute(
-            select(Invoice)
-            .options(selectinload(Invoice.items))
-            .filter(Invoice.id == invoice_id)
-        )
-        invoice = result.scalar_one_or_none()
-        
-        if not invoice:
-            logger.error(f"Invoice not found: {invoice_id}")
-            raise HTTPException(status_code=404, detail="Invoice not found")
-        
-        logger.info(f"Found invoice: {invoice.invoice_number}")
-        logger.info(f"Client: {invoice.client_name}")
-        logger.info(f"Number of items: {len(invoice.items)}")
-            
-        logger.info("Starting Excel file generation")
-        excel_bytes = ExcelService.generate_excel(invoice)
-        logger.info("Excel file generated successfully")
-        
-        filename = f"devis_{invoice.invoice_number}.xlsx"
-        logger.info(f"Sending Excel file: {filename}")
-        
-        return StreamingResponse(
-            iter([excel_bytes]),
-            media_type="application/vnd.openxmlformats-officedocument.spreadsheetml.sheet",
-            headers={"Content-Disposition": f"attachment; filename={filename}"}
-        )
-    except Exception as e:
-        logger.error(f"Error generating Excel for invoice {invoice_id}: {str(e)}", exc_info=True)
-        logger.error("Stack trace:", exc_info=True)
-        raise HTTPException(status_code=500, detail=str(e))
-
 @router.get("/last-number/{client_type}", response_model=dict)
 async def get_last_invoice_number(
     client_type: str,
@@ -219,4 +175,71 @@ def reset_invoice_sequence(db: Session = Depends(get_db)):
         return {"message": "Sequence reset successfully"}
     except Exception as e:
         db.rollback()
-        raise HTTPException(status_code=500, detail=str(e))
+        raise HTTPException(status_code=500, detail=str(e))
+
+@router.put("/{invoice_id}", response_model=InvoiceResponse)
+async def update_invoice(
+    invoice_id: int,
+    invoice_update: InvoiceCreate,
+    db: AsyncSession = Depends(get_db)
+):
+    try:
+        # Get existing invoice
+        result = await db.execute(
+            select(Invoice)
+            .options(selectinload(Invoice.items))
+            .filter(Invoice.id == invoice_id)
+        )
+        invoice = result.scalar_one_or_none()
+        
+        if not invoice:
+            raise HTTPException(status_code=404, detail="Invoice not found")
+        
+        # Update invoice fields
+        for field, value in invoice_update.dict(exclude={'items'}).items():
+            setattr(invoice, field, value)
+        
+        # Delete existing items
+        await db.execute(delete(InvoiceItem).where(InvoiceItem.invoice_id == invoice_id))
+        
+        # Create new items
+        for item_data in invoice_update.items:
+            db_item = InvoiceItem(
+                invoice_id=invoice_id,
+                **item_data.dict()
+            )
+            db.add(db_item)
+        
+        await db.commit()
+        await db.refresh(invoice)
+        
+        return invoice
+    except Exception as e:
+        await db.rollback()
+        raise HTTPException(status_code=500, detail=str(e))
+
+@router.put("/{invoice_id}/status")
+async def update_invoice_status(
+    invoice_id: int,
+    status_update: dict,
+    db: AsyncSession = Depends(get_db)
+):
+    try:
+        # Get existing invoice
+        result = await db.execute(
+            select(Invoice)
+            .filter(Invoice.id == invoice_id)
+        )
+        invoice = result.scalar_one_or_none()
+        
+        if not invoice:
+            raise HTTPException(status_code=404, detail="Invoice not found")
+        
+        # Update status
+        invoice.status = status_update.get("status")
+        await db.commit()
+        
+        return {"message": "Status updated successfully"}
+    except Exception as e:
+        await db.rollback()
+        raise HTTPException(status_code=500, detail=str(e)) 

app/schemas/invoice.py

@@ -20,14 +20,15 @@ class InvoiceCreate(BaseModel):
     client_name: str
     client_phone: str
     address: str
-    ville: str  # Add ville field
+    ville: Optional[str] = None
     total_ht: float
     tax: float
     total_ttc: float
     frame_number: Optional[str] = None
     items: List[InvoiceItemCreate]
     commercial: Optional[str] = "divers"
-    
+    status: Optional[str] = "pending"
+
     @computed_field
     def customer_name(self) -> str:
         return self.client_name

app/templates/history.html

@@ -0,0 +1,167 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <title>Historique des Devis</title>
+    <link href="https://cdn.jsdelivr.net/npm/[email protected]/dist/css/bootstrap.min.css" rel="stylesheet">
+    <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.0.0/css/all.min.css">
+</head>
+<body class="bg-light">
+    <header class="bg-primary py-4 mb-4 shadow-sm">
+        <div class="container">
+            <div class="row align-items-center">
+                <div class="col-md-6">
+                    <h1 class="text-white mb-0">Historique des Devis</h1>
+                </div>
+                <div class="col-md-6 text-end">
+                    <a href="/" class="btn btn-light me-2">
+                        <i class="fas fa-plus"></i> Nouveau Devis
+                    </a>
+                </div>
+            </div>
+        </div>
+    </header>
+
+    <div class="container">
+        <div class="card shadow-sm">
+            <div class="card-header bg-white py-3">
+                <div class="row align-items-center">
+                    <div class="col-md-4">
+                        <input type="text" id="searchInput" class="form-control" placeholder="Rechercher...">
+                    </div>
+                    <div class="col-md-3">
+                        <select id="statusFilter" class="form-select">
+                            <option value="">Tous les statuts</option>
+                            <option value="pending">En attente</option>
+                            <option value="completed">Complété</option>
+                        </select>
+                    </div>
+                </div>
+            </div>
+            <div class="card-body">
+                <div class="table-responsive">
+                    <table class="table table-hover">
+                        <thead>
+                            <tr>
+                                <th>N° Devis</th>
+                                <th>Date</th>
+                                <th>Client</th>
+                                <th>Projet</th>
+                                <th>Total TTC</th>
+                                <th>Status</th>
+                                <th>Actions</th>
+                            </tr>
+                        </thead>
+                        <tbody id="invoicesTableBody"></tbody>
+                    </table>
+                </div>
+            </div>
+        </div>
+    </div>
+
+    <script src="https://cdn.jsdelivr.net/npm/[email protected]/dist/js/bootstrap.bundle.min.js"></script>
+    <script>
+        document.addEventListener('DOMContentLoaded', async () => {
+            const tableBody = document.getElementById('invoicesTableBody');
+            const searchInput = document.getElementById('searchInput');
+            const statusFilter = document.getElementById('statusFilter');
+
+            async function loadInvoices() {
+                try {
+                    const response = await fetch('/api/invoices/');
+                    if (!response.ok) throw new Error('Failed to load invoices');
+                    return await response.json();
+                } catch (error) {
+                    console.error('Error:', error);
+                    return [];
+                }
+            }
+
+            function formatDate(dateString) {
+                return new Date(dateString).toLocaleDateString('fr-FR');
+            }
+
+            function renderInvoices(invoices) {
+                const searchTerm = searchInput.value.toLowerCase();
+                const statusValue = statusFilter.value;
+
+                const filteredInvoices = invoices.filter(invoice => {
+                    const matchesSearch = (
+                        invoice.invoice_number.toLowerCase().includes(searchTerm) ||
+                        invoice.client_name.toLowerCase().includes(searchTerm) ||
+                        invoice.project.toLowerCase().includes(searchTerm)
+                    );
+                    const matchesStatus = !statusValue || invoice.status === statusValue;
+                    return matchesSearch && matchesStatus;
+                });
+
+                tableBody.innerHTML = filteredInvoices.map(invoice => `
+                    <tr>
+                        <td>${invoice.invoice_number}</td>
+                        <td>${formatDate(invoice.date)}</td>
+                        <td>${invoice.client_name}</td>
+                        <td>${invoice.project}</td>
+                        <td>${invoice.total_ttc.toFixed(2)} DH</td>
+                        <td>
+                            <span class="badge ${invoice.status === 'pending' ? 'bg-warning' : 'bg-success'}">
+                                ${invoice.status === 'pending' ? 'En attente' : 'Complété'}
+                            </span>
+                        </td>
+                        <td>
+                            <div class="btn-group">
+                                <button onclick="editInvoice(${invoice.id})" class="btn btn-sm btn-warning">
+                                    <i class="fas fa-edit"></i>
+                                </button>
+                                <button onclick="previewPDF(${invoice.id})" class="btn btn-sm btn-primary">
+                                    <i class="fas fa-eye"></i>
+                                </button>
+                                <button onclick="downloadPDF(${invoice.id})" class="btn btn-sm btn-success">
+                                    <i class="fas fa-download"></i>
+                                </button>
+                            </div>
+                        </td>
+                    </tr>
+                `).join('');
+            }
+
+            // Load initial data
+            const invoices = await loadInvoices();
+            renderInvoices(invoices);
+
+            // Set up event listeners
+            searchInput.addEventListener('input', () => renderInvoices(invoices));
+            statusFilter.addEventListener('change', () => renderInvoices(invoices));
+
+            // Global functions for actions
+            window.editInvoice = (id) => {
+                window.location.href = `/?edit=${id}`;
+            };
+
+            window.previewPDF = async (id) => {
+                const response = await fetch(`/api/invoices/${id}/generate-pdf`, {
+                    method: 'POST'
+                });
+                const blob = await response.blob();
+                const url = URL.createObjectURL(blob);
+                window.open(url, '_blank');
+            };
+
+            window.downloadPDF = async (id) => {
+                const response = await fetch(`/api/invoices/${id}/generate-pdf`, {
+                    method: 'POST'
+                });
+                const blob = await response.blob();
+                const url = URL.createObjectURL(blob);
+                const a = document.createElement('a');
+                a.href = url;
+                a.download = `devis_${id}.pdf`;
+                document.body.appendChild(a);
+                a.click();
+                document.body.removeChild(a);
+                URL.revokeObjectURL(url);
+            };
+        });
+    </script>
+</body>
+</html>

app/templates/index.html

@@ -6,6 +6,7 @@
     <title>Invoice Generator</title>
     <!-- Bootstrap CSS -->
     <link href="https://cdn.jsdelivr.net/npm/[email protected]/dist/css/bootstrap.min.css" rel="stylesheet">
+    <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.0.0/css/all.min.css">
     <style>
         :root {
             --primary-color: #2c3e50;
@@ -177,6 +178,12 @@
                 padding: 0.5rem 1rem;
             }
         }
+
+        .preview-modal .modal-dialog {
+            max-width: 80%;
+        }
+        .status-pending { color: #ffc107; }
+        .status-completed { color: #28a745; }
     </style>
 </head>
 <body class="bg-light">
@@ -187,7 +194,10 @@
                 <div class="col-md-6">
                     <h1 class="text-white mb-0">Générateur de Devis</h1>
                 </div>
-                <div class="col-md-6 text-end">
+                <div class="col-md-6 text-end d-flex justify-content-end align-items-center gap-3">
+                    <a href="/history" class="btn btn-light">
+                        <i class="fas fa-history"></i> Historique
+                    </a>
                     <img src="/static/logo.png" alt="Logo" height="50" class="img-fluid">
                 </div>
             </div>
@@ -607,62 +617,76 @@
             };
 
             // Function to add a new item row
-            function addItemRow(item, tableBody) {
-                // Vérifier si l'article existe déjà
-                const existingRow = Array.from(tableBody.querySelectorAll('tr')).find(row => {
-                    const description = row.querySelector('input[name="description"]').value;
-                    return description === item.description;
-                });
+            function addItemRow(item, table) {
+                console.log('Adding item to table:', item);
+                
+                // Check for existing item
+                const existingRow = Array.from(table.querySelectorAll('tr')).find(row => 
+                    row.querySelector('input[name="description"]').value === item.description
+                );
 
                 if (existingRow) {
-                    // Afficher la modal de confirmation
-                    const confirmationModal = new bootstrap.Modal(document.getElementById('confirmationModal'));
-                    confirmationModal.show();
-
-                    // Gérer la confirmation de remplacement
-                    document.getElementById('confirmReplace').onclick = function() {
-                        existingRow.remove();
-                        creerNouvelleRow();
-                        confirmationModal.hide();
-                    };
+                    console.log('Found existing item:', existingRow);
+                    const replace = confirm("Article Existant\n\nCet article existe déjà dans le tableau. Voulez-vous le remplacer ?");
+                    if (replace) {
+                        console.log('Replacing existing item');
+                        table.removeChild(existingRow);
+                        insertNewRow(item, table);
+                    } else {
+                        console.log('User chose not to replace item');
+                    }
                 } else {
-                    creerNouvelleRow();
+                    console.log('Adding new item');
+                    insertNewRow(item, table);
                 }
+            }
 
-                function creerNouvelleRow() {
-                    const row = document.createElement("tr");
-                    const total = (item.quantity * item.length * item.unit_price).toFixed(2);
-                    
-                    row.innerHTML = `
-                        <td><input type="text" class="form-control" name="description" value="${item.description}" readonly></td>
-                        <td><input type="text" class="form-control" name="unit" value="${item.unit}" readonly></td>
-                        <td><input type="number" class="form-control" name="quantity" value="${item.quantity}" required></td>
-                        <td><input type="number" class="form-control" name="length" value="${item.length}" step="0.01" required></td>
-                        <td><input type="number" class="form-control" name="unitPrice" value="${item.unit_price}" step="0.01" required></td>
-                        <td><input type="number" class="form-control" name="totalHT" value="${total}" readonly></td>
-                        <td><button type="button" class="btn btn-danger btn-sm remove-item">×</button></td>
-                    `;
-
-                    row.querySelector(".remove-item").addEventListener("click", () => {
-                        row.remove();
-                        updateTotals();
-                    });
-
-                    // Ajouter les écouteurs d'événements pour mettre à jour le total
-                    ['quantity', 'length', 'unitPrice'].forEach(field => {
-                        row.querySelector(`input[name='${field}']`).addEventListener('input', () => {
-                            const quantite = parseFloat(row.querySelector('input[name="quantity"]').value) || 0;
-                            const longueur = parseFloat(row.querySelector('input[name="length"]').value) || 0;
-                            const prix = parseFloat(row.querySelector('input[name="unitPrice"]').value) || 0;
-                            const totalLigne = (quantite * longueur * prix).toFixed(2);
-                            row.querySelector('input[name="totalHT"]').value = totalLigne;
-                            updateTotals();
-                        });
-                    });
+            function updateGrandTotal() {
+                const totalHT = Array.from(document.querySelectorAll('input[name="totalHT"]'))
+                    .reduce((sum, input) => sum + (parseFloat(input.value) || 0), 0);
+                
+                const formattedTotalHT = totalHT.toFixed(2);
+                const tax = (totalHT * 0.20).toFixed(2);
+                const totalTTC = (totalHT * 1.20).toFixed(2);
+                
+                document.querySelector("#totalHT").value = formattedTotalHT;
+                document.querySelector("#tax").value = tax;
+                document.querySelector("#totalTTC").value = totalTTC;
+            }
 
-                    tableBody.appendChild(row);
-                    updateTotals();
-                }
+            function insertNewRow(item, table) {
+                console.log('Inserting new row with item:', item);
+                const row = document.createElement('tr');
+                const total = ((item.quantity || 0) * (item.length || 0) * (item.unit_price || 0)).toFixed(2);
+                
+                row.innerHTML = `
+                    <td>
+                        <input type="text" class="form-control" name="description" value="${item.description || ''}" readonly>
+                    </td>
+                    <td>
+                        <input type="text" class="form-control" name="unit" value="${item.unit || ''}" readonly>
+                    </td>
+                    <td>
+                        <input type="number" class="form-control" name="quantity" value="${item.quantity || 0}" onchange="updateTotal(this)">
+                    </td>
+                    <td>
+                        <input type="number" class="form-control" name="length" value="${item.length || 0}" onchange="updateTotal(this)">
+                    </td>
+                    <td>
+                        <input type="number" class="form-control" name="unitPrice" value="${item.unit_price || 0}" onchange="updateTotal(this)">
+                    </td>
+                    <td>
+                        <input type="number" class="form-control" name="totalHT" value="${total}" readonly>
+                    </td>
+                    <td>
+                        <button type="button" class="btn btn-danger btn-sm" onclick="this.closest('tr').remove(); updateGrandTotal();">
+                            <i class="fas fa-trash"></i>
+                        </button>
+                    </td>
+                `;
+                table.appendChild(row);
+                console.log('Row inserted successfully');
+                updateGrandTotal();
             }
 
             // Function to update totals
@@ -786,6 +810,9 @@
             invoiceForm.addEventListener("submit", async (event) => {
                 event.preventDefault();
 
+                const urlParams = new URLSearchParams(window.location.search);
+                const editId = urlParams.get('edit');
+
                 const getAllItems = () => {
                     const items = [];
                     [poutrellesTable, hourdisTable, panneauTable, agglosTable].forEach(table => {
@@ -822,28 +849,29 @@
                 console.log("Sending invoice data:", data);
 
                 try {
-                    // First create the invoice
-                    const createResponse = await fetch("/api/invoices/", {
-                        method: "POST",
+                    // Determine if we're creating or updating
+                    const url = editId ? `/api/invoices/${editId}` : "/api/invoices/";
+                    const method = editId ? "PUT" : "POST";
+
+                    const response = await fetch(url, {
+                        method: method,
                         headers: { "Content-Type": "application/json" },
                         body: JSON.stringify(data)
                     });
 
-                    if (!createResponse.ok) {
-                        const errorData = await createResponse.json();
+                    if (!response.ok) {
+                        const errorData = await response.json();
                         console.error("Server error:", errorData);
-                        throw new Error(`Failed to create invoice: ${JSON.stringify(errorData)}`);
+                        throw new Error(`Failed to ${editId ? 'update' : 'create'} invoice: ${JSON.stringify(errorData)}`);
                     }
 
-                    const invoice = await createResponse.json();
-                    console.log("Created invoice:", invoice);
+                    const invoice = await response.json();
+                    console.log(editId ? "Updated invoice:" : "Created invoice:", invoice);
 
-                    // Then generate the PDF
+                    // Generate PDF
                     const pdfResponse = await fetch(`/api/invoices/${invoice.id}/generate-pdf`, {
                         method: "POST",
-                        headers: { 
-                            "Content-Type": "application/json"
-                        },
+                        headers: { "Content-Type": "application/json" },
                         body: JSON.stringify(invoice)
                     });
 
@@ -855,25 +883,41 @@
 
                     // Handle PDF download
                     const blob = await pdfResponse.blob();
-                    const url = window.URL.createObjectURL(blob);
+                    const downloadUrl = window.URL.createObjectURL(blob);
                     const a = document.createElement("a");
-                    a.href = url;
+                    a.href = downloadUrl;
                     a.download = `devis_${invoice.invoice_number}.pdf`;
                     document.body.appendChild(a);
                     a.click();
                     document.body.removeChild(a);
-                    window.URL.revokeObjectURL(url);
+                    window.URL.revokeObjectURL(downloadUrl);
+
+                    // Update status to success after PDF generation
+                    try {
+                        const updateStatusResponse = await fetch(`/api/invoices/${invoice.id}/status`, {
+                            method: "PUT",
+                            headers: { "Content-Type": "application/json" },
+                            body: JSON.stringify({ status: "completed" })
+                        });
+
+                        if (!updateStatusResponse.ok) {
+                            console.error("Failed to update status:", await updateStatusResponse.text());
+                        } else {
+                            console.log("Status updated successfully");
+                        }
+                    } catch (error) {
+                        console.error("Error updating status:", error);
+                    }
+
+                    // Redirect to history page after successful update
+                    if (editId) {
+                        window.location.href = '/history';
+                    }
 
                 } catch (error) {
                     console.error("Error:", error);
                     alert(`Error: ${error.message}`);
                 }
-
-                // After successful submission, update the invoice number for the current type
-                const selectedType = document.querySelector('input[name="clientType"]:checked')?.value;
-                if (selectedType) {
-                    await updateInvoiceNumber(selectedType);
-                }
             });
 
             // Set today's date automatically
@@ -1020,6 +1064,62 @@
                     alert('Error generating Excel file: ' + error.message);
                 }
             });
+
+            // Check for edit mode
+            const urlParams = new URLSearchParams(window.location.search);
+            const editId = urlParams.get('edit');
+
+            if (editId) {
+                console.log('Loading invoice for editing, ID:', editId);
+                fetch(`/api/invoices/${editId}`)
+                    .then(response => response.json())
+                    .then(invoice => {
+                        console.log('Loaded invoice data:', invoice);
+                        
+                        // Populate form fields
+                        document.querySelector("#clientName").value = invoice.client_name;
+                        document.querySelector("#clientPhone").value = invoice.client_phone;
+                        document.querySelector("#clientAddress").value = invoice.address;
+                        document.querySelector("#ville").value = invoice.ville || '';
+                        document.querySelector("#project").value = invoice.project;
+                        document.querySelector("#invoiceNumber").value = invoice.invoice_number;
+                        document.querySelector("#date").value = invoice.date.split('T')[0];
+                        document.querySelector("#plancher").value = invoice.frame_number || 'PH RDC';
+                        document.querySelector("#commercial").value = invoice.commercial || 'divers';
+                        document.querySelector("#totalHT").value = invoice.total_ht;
+                        document.querySelector("#tax").value = invoice.tax;
+                        document.querySelector("#totalTTC").value = invoice.total_ttc;
+
+                        // Clear existing tables first
+                        console.log('Clearing existing tables');
+                        [poutrellesTable, hourdisTable, panneauTable, agglosTable].forEach(table => {
+                            table.innerHTML = '';
+                        });
+
+                        // Populate items
+                        console.log('Populating items:', invoice.items);
+                        invoice.items.forEach(item => {
+                            console.log('Processing item:', item);
+                            if (item.description.includes('PCP')) {
+                                console.log('Adding to poutrelles table');
+                                addItemRow(item, poutrellesTable);
+                            } else if (item.description.includes('HOURDIS')) {
+                                console.log('Adding to hourdis table');
+                                addItemRow(item, hourdisTable);
+                            } else if (item.description.includes('PTS')) {
+                                console.log('Adding to panneau table');
+                                addItemRow(item, panneauTable);
+                            } else {
+                                console.log('Adding to agglos table');
+                                addItemRow(item, agglosTable);
+                            }
+                        });
+                    })
+                    .catch(error => {
+                        console.error("Error loading invoice:", error);
+                        alert("Error loading invoice data");
+                    });
+            }
         });
     </script>
 </body>