c

.env

@@ -0,0 +1,2 @@
+DATABASE_URL=sqlite+aiosqlite:///./app.db
+ENVIRONMENT=production 

Dockerfile

@@ -0,0 +1,24 @@
+# Use Python 3.11 slim image
+FROM python:3.11-slim
+
+# Set working directory
+WORKDIR /app
+
+# Copy requirements first to leverage Docker cache
+COPY requirements.txt .
+
+# Install dependencies
+RUN pip install --no-cache-dir -r requirements.txt
+
+# Copy the rest of the application
+COPY . .
+
+# Create a non-root user
+RUN useradd -m myuser
+USER myuser
+
+# Expose port
+EXPOSE 8000
+
+# Command to run the application
+CMD ["gunicorn", "app.main:app", "-w", "4", "-k", "uvicorn.workers.UvicornWorker", "-b", "0.0.0.0:8000"] 

alembic.ini

@@ -0,0 +1,100 @@
+# A generic, single database configuration.
+
+[alembic]
+# path to migration scripts
+script_location = alembic
+
+# template used to generate migration files
+# file_template = %%(rev)s_%%(slug)s
+
+# sys.path path, will be prepended to sys.path if present.
+# defaults to the current working directory.
+prepend_sys_path = .
+
+# timezone to use when rendering the date within the migration file
+# as well as the filename.
+# If specified, requires the python-dateutil library that can be
+# installed by adding `alembic[tz]` to the pip requirements
+# timezone =
+
+# max length of characters to apply to the
+# "slug" field
+# truncate_slug_length = 40
+
+# set to 'true' to run the environment during
+# the 'revision' command, regardless of autogenerate
+# revision_environment = false
+
+# set to 'true' to allow .pyc and .pyo files without
+# a source .py file to be detected as revisions in the
+# versions/ directory
+# sourceless = false
+
+# version location specification; This defaults
+# to alembic/versions.  When using multiple version
+# directories, initial revisions must be specified with --version-path.
+# The path separator used here should be the separator specified by "version_path_separator" below.
+# version_locations = %(here)s/bar:%(here)s/bat:alembic/versions
+
+# version path separator; As mentioned above, this is the character used to split
+# version_locations. The default within new alembic.ini files is "os", which uses os.pathsep.
+# If this key is omitted entirely, it falls back to the legacy behavior of splitting on spaces and/or colons.
+# Valid values for version_path_separator are:
+#
+# version_path_separator = :
+# version_path_separator = ;
+# version_path_separator = space
+version_path_separator = os  # Use os.pathsep. Default configuration used for new projects.
+
+# the output encoding used when revision files
+# are written from script.py.mako
+# output_encoding = utf-8
+
+sqlalchemy.url = sqlite+aiosqlite:///./sql_app.db
+
+
+[post_write_hooks]
+# post_write_hooks defines scripts or Python functions that are run
+# on newly generated revision scripts.  See the documentation for further
+# detail and examples
+
+# format using "black" - use the console_scripts runner, against the "black" entrypoint
+# hooks = black
+# black.type = console_scripts
+# black.entrypoint = black
+# black.options = -l 79 REVISION_SCRIPT_FILENAME
+
+# Logging configuration
+[loggers]
+keys = root,sqlalchemy,alembic
+
+[handlers]
+keys = console
+
+[formatters]
+keys = generic
+
+[logger_root]
+level = WARN
+handlers = console
+qualname =
+
+[logger_sqlalchemy]
+level = WARN
+handlers =
+qualname = sqlalchemy.engine
+
+[logger_alembic]
+level = INFO
+handlers =
+qualname = alembic
+
+[handler_console]
+class = StreamHandler
+args = (sys.stderr,)
+level = NOTSET
+formatter = generic
+
+[formatter_generic]
+format = %(levelname)-5.5s [%(name)s] %(message)s
+datefmt = %H:%M:%S 

alembic/env.py

@@ -0,0 +1,66 @@
+import asyncio
+from logging.config import fileConfig
+
+from sqlalchemy import pool
+from sqlalchemy.engine import Connection
+from sqlalchemy.ext.asyncio import async_engine_from_config
+
+from alembic import context
+
+# this is the Alembic Config object, which provides
+# access to the values within the .ini file in use.
+config = context.config
+
+# Interpret the config file for Python logging.
+# This line sets up loggers basically.
+if config.config_file_name is not None:
+    fileConfig(config.config_file_name)
+
+# add your model's MetaData object here
+# for 'autogenerate' support
+from app.db.models import Base
+target_metadata = Base.metadata
+
+def run_migrations_offline() -> None:
+    """Run migrations in 'offline' mode."""
+    url = config.get_main_option("sqlalchemy.url")
+    context.configure(
+        url=url,
+        target_metadata=target_metadata,
+        literal_binds=True,
+        dialect_opts={"paramstyle": "named"},
+    )
+
+    with context.begin_transaction():
+        context.run_migrations()
+
+def do_run_migrations(connection: Connection) -> None:
+    context.configure(connection=connection, target_metadata=target_metadata)
+
+    with context.begin_transaction():
+        context.run_migrations()
+
+async def run_async_migrations() -> None:
+    """In this scenario we need to create an Engine
+    and associate a connection with the context."""
+
+    connectable = async_engine_from_config(
+        config.get_section(config.config_ini_section, {}),
+        prefix="sqlalchemy.",
+        poolclass=pool.NullPool,
+    )
+
+    async with connectable.connect() as connection:
+        await connection.run_sync(do_run_migrations)
+
+    await connectable.dispose()
+
+def run_migrations_online() -> None:
+    """Run migrations in 'online' mode."""
+
+    asyncio.run(run_async_migrations())
+
+if context.is_offline_mode():
+    run_migrations_offline()
+else:
+    run_migrations_online() 

alembic/script.py.mako

@@ -0,0 +1,26 @@
+"""${message}
+
+Revision ID: ${up_revision}
+Revises: ${down_revision | comma,n}
+Create Date: ${create_date}
+
+"""
+from typing import Sequence, Union
+
+from alembic import op
+import sqlalchemy as sa
+${imports if imports else ""}
+
+# revision identifiers, used by Alembic.
+revision: str = ${repr(up_revision)}
+down_revision: Union[str, None] = ${repr(down_revision)}
+branch_labels: Union[str, Sequence[str], None] = ${repr(branch_labels)}
+depends_on: Union[str, Sequence[str], None] = ${repr(depends_on)}
+
+
+def upgrade() -> None:
+    ${upgrades if upgrades else "pass"}
+
+
+def downgrade() -> None:
+    ${downgrades if downgrades else "pass"} 

alembic/versions/3ac87142c0f1_add_invoice_sequence.py

@@ -0,0 +1,28 @@
+"""add invoice sequence and client type
+
+Revision ID: xxxx
+Revises: previous_revision_id
+Create Date: 2024-xx-xx
+"""
+from alembic import op
+import sqlalchemy as sa
+
+def upgrade():
+    # Create sequence for invoice IDs
+    op.execute('CREATE SEQUENCE IF NOT EXISTS invoice_id_seq START 1')
+    
+    # Add client_type column if not exists
+    op.add_column('invoices', sa.Column('client_type', sa.String(10), nullable=True))
+    
+    # Make invoice_number unique
+    op.create_unique_constraint('uq_invoice_number', 'invoices', ['invoice_number'])
+
+def downgrade():
+    # Remove unique constraint
+    op.drop_constraint('uq_invoice_number', 'invoices')
+    
+    # Drop client_type column
+    op.drop_column('invoices', 'client_type')
+    
+    # Drop sequence
+    op.execute('DROP SEQUENCE IF EXISTS invoice_id_seq') 

alembic/versions/59c6283aeb7f_add_invoice_sequence.py

@@ -0,0 +1,30 @@
+"""add invoice sequence
+
+Revision ID: 59c6283aeb7f
+Revises: f8ee2909b4a1
+Create Date: 2025-01-28 23:00:46.031532
+
+"""
+from typing import Sequence, Union
+
+from alembic import op
+import sqlalchemy as sa
+
+
+# revision identifiers, used by Alembic.
+revision: str = '59c6283aeb7f'
+down_revision: Union[str, None] = 'f8ee2909b4a1'
+branch_labels: Union[str, Sequence[str], None] = None
+depends_on: Union[str, Sequence[str], None] = None
+
+
+def upgrade() -> None:
+    # ### commands auto generated by Alembic - please adjust! ###
+    pass
+    # ### end Alembic commands ###
+
+
+def downgrade() -> None:
+    # ### commands auto generated by Alembic - please adjust! ###
+    pass
+    # ### end Alembic commands ### 

alembic/versions/f8ee2909b4a1_add_client_type.py

@@ -0,0 +1,30 @@
+"""add client type
+
+Revision ID: f8ee2909b4a1
+Revises: 
+Create Date: 2025-01-28 22:54:07.661020
+
+"""
+from typing import Sequence, Union
+
+from alembic import op
+import sqlalchemy as sa
+
+
+# revision identifiers, used by Alembic.
+revision: str = 'f8ee2909b4a1'
+down_revision: Union[str, None] = None
+branch_labels: Union[str, Sequence[str], None] = None
+depends_on: Union[str, Sequence[str], None] = None
+
+
+def upgrade() -> None:
+    # ### commands auto generated by Alembic - please adjust! ###
+    pass
+    # ### end Alembic commands ###
+
+
+def downgrade() -> None:
+    # ### commands auto generated by Alembic - please adjust! ###
+    pass
+    # ### end Alembic commands ### 

app/db/database.py

@@ -0,0 +1,28 @@
+from sqlalchemy.ext.asyncio import AsyncSession, create_async_engine
+from sqlalchemy.orm import sessionmaker
+from app.db.models import Base
+
+# Use SQLite with aiosqlite
+DATABASE_URL = "sqlite+aiosqlite:///./sql_app.db"
+
+engine = create_async_engine(DATABASE_URL, echo=True)
+AsyncSessionLocal = sessionmaker(
+    engine, class_=AsyncSession, expire_on_commit=False
+)
+
+async def init_db():
+    async with engine.begin() as conn:
+        # Drop all tables and recreate them
+        await conn.run_sync(Base.metadata.drop_all)
+        await conn.run_sync(Base.metadata.create_all)
+
+async def get_db() -> AsyncSession:
+    async with AsyncSessionLocal() as session:
+        try:
+            yield session
+            await session.commit()
+        except Exception:
+            await session.rollback()
+            raise
+        finally:
+            await session.close()

app/db/models.py

@@ -0,0 +1,42 @@
+from sqlalchemy.orm import DeclarativeBase, relationship
+from sqlalchemy import Column, Integer, String, Float, DateTime, ForeignKey
+from sqlalchemy.ext.declarative import declarative_base
+from datetime import datetime
+from sqlalchemy.sql import func
+
+Base = declarative_base()
+
+class Invoice(Base):
+    __tablename__ = "invoices"
+
+    id = Column(Integer, primary_key=True, index=True)
+    invoice_number = Column(String)
+    date = Column(DateTime, default=func.now())
+    project = Column(String)
+    client_name = Column(String)
+    client_phone = Column(String)
+    address = Column(String)
+    total_ht = Column(Float)
+    tax = Column(Float)
+    total_ttc = Column(Float)
+    frame_number = Column(String, nullable=True)
+    customer_name = Column(String)
+    amount = Column(Float)
+    status = Column(String, default="pending")
+    created_at = Column(DateTime, default=datetime.utcnow)
+
+    items = relationship("InvoiceItem", back_populates="invoice")
+
+class InvoiceItem(Base):
+    __tablename__ = "invoice_items"
+
+    id = Column(Integer, primary_key=True, index=True)
+    invoice_id = Column(Integer, ForeignKey("invoices.id"))
+    description = Column(String)
+    unit = Column(String)
+    quantity = Column(Integer)
+    length = Column(Float)
+    unit_price = Column(Float)
+    total_price = Column(Float)
+
+    invoice = relationship("Invoice", back_populates="items") 

app/main.py

@@ -0,0 +1,52 @@
+from fastapi import FastAPI, Request
+from fastapi.staticfiles import StaticFiles
+from fastapi.templating import Jinja2Templates
+from .routes import invoices
+from app.db.database import init_db
+import os
+from fastapi.middleware.cors import CORSMiddleware
+from dotenv import load_dotenv
+
+# Load environment variables
+load_dotenv()
+
+# Get the absolute path to the app directory
+BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
+
+app = FastAPI(
+    title="Invoice Generator",
+    description="API for generating invoices",
+    version="1.0.0"
+)
+
+# Configure CORS
+app.add_middleware(
+    CORSMiddleware,
+    allow_origins=["*"],  # In production, replace with your frontend domain
+    allow_credentials=True,
+    allow_methods=["*"],
+    allow_headers=["*"],
+)
+
+# Mount static files with absolute path
+app.mount("/static", StaticFiles(directory=os.path.join(BASE_DIR, "app/static")), name="static")
+
+# Templates with absolute path
+templates = Jinja2Templates(directory=os.path.join(BASE_DIR, "app/templates"))
+
+# Include routers
+app.include_router(invoices.router)
+
+@app.on_event("startup")
+async def startup_event():
+    await init_db()
+
+# Root endpoint to serve the HTML page
+@app.get("/")
+async def root(request: Request):
+    return templates.TemplateResponse("index.html", {"request": request})
+
+# Health check endpoint
+@app.get("/health")
+async def health_check():
+    return {"status": "healthy"}

app/models/invoice.py

@@ -0,0 +1,10 @@
+from sqlalchemy import Column, Integer, String, DateTime, Float, ForeignKey, Sequence
+from sqlalchemy.orm import relationship
+from ..database import Base
+
+class Invoice(Base):
+    __tablename__ = "invoices"
+    
+    id = Column(Integer, Sequence('invoice_id_seq'), primary_key=True)
+    invoice_number = Column(String, unique=True)
+    # ... rest of your columns ... 

app/routes/__init__.py

@@ -0,0 +1 @@
+# Empty file to make the directory a Python package 

app/routes/invoice.py

@@ -0,0 +1,47 @@
+from fastapi import APIRouter, Depends, HTTPException
+from sqlalchemy.orm import Session
+from sqlalchemy import func
+from typing import Optional
+from ..database import get_db
+from ..models.invoice import Invoice, ClientType
+
+router = APIRouter()
+
+@router.get("/api/invoices/next-number/{client_type}")
+async def get_next_invoice_number(client_type: str, db: Session = Depends(get_db)):
+    if client_type not in ClientType.__members__:
+        raise HTTPException(status_code=400, detail="Invalid client type")
+    
+    # Get the last invoice number for this client type
+    last_invoice = db.query(Invoice)\
+        .filter(Invoice.client_type == ClientType[client_type])\
+        .order_by(Invoice.id.desc())\
+        .first()
+    
+    if last_invoice:
+        # Extract the number from the last invoice number (DCP/TYPE/NUMBER)
+        try:
+            last_number = int(last_invoice.invoice_number.split('/')[-1])
+            next_number = last_number + 1
+        except (ValueError, IndexError):
+            next_number = 1
+    else:
+        next_number = 1
+    
+    return {"next_number": f"{next_number:04d}"}  # Format as 4 digits
+
+@router.post("/api/invoices/")
+async def create_invoice(invoice_data: InvoiceCreate, db: Session = Depends(get_db)):
+    # Extract client type from invoice number
+    try:
+        client_type = invoice_data.invoice_number.split('/')[1]
+        if client_type not in ClientType.__members__:
+            raise HTTPException(status_code=400, detail="Invalid client type in invoice number")
+    except IndexError:
+        raise HTTPException(status_code=400, detail="Invalid invoice number format")
+
+    db_invoice = Invoice(
+        client_type=ClientType[client_type],
+        **invoice_data.dict()
+    )
+    # ... rest of your existing create logic ... 

app/routes/invoices.py

@@ -0,0 +1,177 @@
+from fastapi import APIRouter, Depends, HTTPException, Request
+from sqlalchemy.ext.asyncio import AsyncSession
+from sqlalchemy import select, func, Sequence
+from typing import List, Optional
+from sqlalchemy.orm import selectinload, joinedload, Session
+from fastapi.responses import StreamingResponse
+import logging
+from datetime import datetime
+
+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
+
+# Set up logging
+logger = logging.getLogger(__name__)
+
+router = APIRouter(prefix="/api/invoices", tags=["invoices"])
+
+@router.post("/", response_model=InvoiceResponse)
+async def create_new_invoice(
+    invoice: InvoiceCreate,
+    db: AsyncSession = Depends(get_db)
+):
+    try:
+        # Get current max ID
+        query = select(func.max(Invoice.id))
+        result = await db.execute(query)
+        current_max_id = result.scalar() or 0
+        next_id = current_max_id + 1
+        
+        # Extract client type from the invoice number
+        client_type = invoice.invoice_number.split('/')[1]
+        
+        # Create new invoice number
+        new_invoice_number = f"DCP/{client_type}/{next_id:04d}"
+        
+        # Create invoice with the new number
+        db_invoice = Invoice(
+            id=next_id,
+            invoice_number=new_invoice_number,
+            date=invoice.date,
+            project=invoice.project,
+            client_name=invoice.client_name,
+            client_phone=invoice.client_phone,
+            address=invoice.address,
+            total_ht=invoice.total_ht,
+            tax=invoice.tax,
+            total_ttc=invoice.total_ttc,
+            frame_number=invoice.frame_number
+        )
+        
+        db.add(db_invoice)
+        await db.commit()
+        await db.refresh(db_invoice)
+        
+        # Create invoice items
+        for item_data in invoice.items:
+            db_item = InvoiceItem(
+                invoice_id=db_invoice.id,
+                description=item_data.description,
+                unit=item_data.unit,
+                quantity=item_data.quantity,
+                length=item_data.length,
+                unit_price=item_data.unit_price,
+                total_price=item_data.total_price
+            )
+            db.add(db_item)
+
+        await db.commit()
+        await db.refresh(db_invoice)
+        
+        # Explicitly load the items relationship
+        result = await db.execute(
+            select(Invoice)
+            .options(selectinload(Invoice.items))
+            .filter(Invoice.id == db_invoice.id)
+        )
+        return result.scalar_one()
+
+    except Exception as e:
+        await db.rollback()
+        raise HTTPException(status_code=500, detail=str(e))
+
+@router.get("/{invoice_id}", response_model=InvoiceResponse)
+async def read_invoice(invoice_id: int, db: AsyncSession = Depends(get_db)):
+    result = await db.execute(
+        select(Invoice)
+        .options(selectinload(Invoice.items))
+        .filter(Invoice.id == invoice_id)
+    )
+    invoice = result.scalar_one_or_none()
+    if invoice is None:
+        raise HTTPException(status_code=404, detail="Invoice not found")
+    return invoice
+
+@router.get("/", response_model=List[InvoiceResponse])
+async def read_invoices(
+    skip: int = 0,
+    limit: int = 100,
+    db: AsyncSession = Depends(get_db)
+):
+    result = await db.execute(
+        select(Invoice)
+        .options(selectinload(Invoice.items))
+        .offset(skip)
+        .limit(limit)
+    )
+    return result.scalars().all()
+
+@router.post("/{invoice_id}/generate-pdf")
+async def generate_invoice_pdf(
+    invoice_id: int,
+    request: Request,
+    db: AsyncSession = Depends(get_db)
+):
+    try:
+        # Get invoice with items
+        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")
+            
+        logger.info(f"Generating PDF for invoice: {invoice_id}")
+        
+        # Generate PDF
+        pdf_bytes = InvoiceService.generate_pdf(invoice)
+        
+        return StreamingResponse(
+            iter([pdf_bytes]),
+            media_type="application/pdf",
+            headers={"Content-Disposition": f"attachment; filename=devis_{invoice_id}.pdf"}
+        )
+    except Exception as e:
+        logger.error(f"Error generating PDF: {str(e)}", 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,
+    db: AsyncSession = Depends(get_db)
+):
+    try:
+        # Use async query syntax
+        query = select(func.max(Invoice.id))
+        result = await db.execute(query)
+        current_max_id = result.scalar() or 0
+        
+        # Next ID will be current max + 1
+        next_id = current_max_id + 1
+        
+        # Format the invoice number with the next ID
+        formatted_number = f"DCP/{client_type}/{next_id:04d}"
+        
+        return {
+            "next_number": next_id,
+            "formatted_number": formatted_number
+        }
+    except Exception as e:
+        print(f"Error in get_last_invoice_number: {str(e)}")
+        raise HTTPException(status_code=500, detail=str(e))
+
+@router.post("/reset-sequence")
+def reset_invoice_sequence(db: Session = Depends(get_db)):
+    try:
+        # Reset the sequence to 1
+        db.execute("ALTER SEQUENCE invoice_id_seq RESTART WITH 1")
+        db.commit()
+        return {"message": "Sequence reset successfully"}
+    except Exception as e:
+        db.rollback()
+        raise HTTPException(status_code=500, detail=str(e)) 

app/schemas/__init__.py

@@ -0,0 +1 @@
+# Empty file to make the directory a Python package 

app/schemas/invoice.py

@@ -0,0 +1,49 @@
+from pydantic import BaseModel, computed_field
+from typing import List, Optional
+from datetime import datetime
+
+class InvoiceItemCreate(BaseModel):
+    description: str
+    unit: str
+    quantity: int
+    length: float
+    unit_price: float
+    
+    @computed_field
+    def total_price(self) -> float:
+        return self.quantity * self.length * self.unit_price
+
+class InvoiceCreate(BaseModel):
+    invoice_number: str
+    date: Optional[datetime] = None
+    project: str
+    client_name: str
+    client_phone: str
+    address: str
+    total_ht: float
+    tax: float
+    total_ttc: float
+    frame_number: Optional[str] = None
+    items: List[InvoiceItemCreate]
+    
+    @computed_field
+    def customer_name(self) -> str:
+        return self.client_name
+    
+    @computed_field
+    def amount(self) -> float:
+        return self.total_ttc
+
+class InvoiceItemResponse(InvoiceItemCreate):
+    id: int
+    invoice_id: int
+
+    class Config:
+        from_attributes = True
+
+class InvoiceResponse(InvoiceCreate):
+    id: int
+    items: List[InvoiceItemResponse]
+
+    class Config:
+        from_attributes = True 

app/services/invoice_service.py

@@ -0,0 +1,236 @@
+from reportlab.lib.pagesizes import A4
+from reportlab.pdfgen import canvas
+from reportlab.lib import colors
+from reportlab.lib.units import cm
+from io import BytesIO
+from app.db.models import Invoice
+import logging
+import os
+
+# Set up logging
+logger = logging.getLogger(__name__)
+
+class InvoiceService:
+    @staticmethod
+    def generate_pdf(data: Invoice) -> bytes:
+        try:
+            buffer = BytesIO()
+            pdf = canvas.Canvas(buffer, pagesize=A4)
+            page_width, page_height = A4
+
+            # Constants
+            HEADER_BLUE = (0.29, 0.45, 0.68)
+            BLUE_LIGHT = (0.8, 0.8, 1)
+            WHITE = (1, 1, 1)
+            BLACK = (0, 0, 0)
+            MARGIN = 30
+            LINE_HEIGHT = 20
+            BOX_PADDING = 10
+
+            # Helper function to draw centered text
+            def draw_centered_text(pdf, text, x, y, width, font="Helvetica", size=10):
+                text_width = pdf.stringWidth(text, font, size)
+                pdf.drawString(x + (width - text_width) / 2, y, text)
+
+            # Helper function to draw a bordered box
+            def draw_box(pdf, x, y, width, height, fill_color=None, stroke_color=BLACK):
+                if fill_color:
+                    pdf.setFillColorRGB(*fill_color)
+                    pdf.rect(x, y, width, height, fill=1, stroke=0)
+                pdf.setFillColorRGB(*stroke_color)
+                pdf.rect(x, y, width, height, stroke=1)
+
+            # Get the absolute path to the logo file
+            current_dir = os.path.dirname(os.path.abspath(__file__))
+            logo_path = os.path.join(current_dir, "..", "static", "logo.png")
+
+            # Top section layout
+            top_margin = page_height - 100
+
+            # Left side: Logo - moved far left and up
+            if os.path.exists(logo_path):
+                pdf.drawImage(logo_path, MARGIN, top_margin + 30, width=100, height=60)
+
+            # Right side: DEVIS and Client Box - moved far right and up
+            pdf.setFont("Helvetica-Bold", 48)
+            devis_text = "DEVIS"
+            devis_width = pdf.stringWidth(devis_text, "Helvetica-Bold", 48)
+            devis_x = page_width - devis_width - MARGIN - 10
+            devis_y = top_margin + 50
+            pdf.drawString(devis_x, devis_y, devis_text)
+
+            # Client info box - moved right under DEVIS
+            box_width = 200
+            box_height = 80
+            box_x = page_width - box_width - MARGIN + 10
+            box_y = devis_y - 90
+
+            # Draw client box
+            pdf.rect(box_x, box_y, box_width, box_height, stroke=1)
+
+            # Client Info
+            pdf.setFont("Helvetica", 10)
+            client_info = [
+                data.client_name,
+                data.project,
+                data.address,
+                data.client_phone
+            ]
+
+            # Center and draw each line of client info
+            line_height = box_height / (len(client_info) + 1)
+            for i, text in enumerate(client_info):
+                text_width = pdf.stringWidth(str(text), "Helvetica", 10)
+                x = box_x + (box_width - text_width) / 2
+                y = box_y + box_height - ((i + 1) * line_height)
+                pdf.drawString(x, y, str(text))
+
+            # Info boxes (Date, N° Devis, PLANCHER) - adjusted starting position
+            info_y = top_margin 
+            box_label_width = 120
+            box_value_width = 80
+
+            for label, value in [
+                ("Date du devis :", data.date.strftime("%d/%m/%Y")),
+                ("N° Devis :", data.invoice_number),
+                ("PLANCHER :", data.frame_number or "PH RDC")
+            ]:
+                draw_box(pdf, MARGIN, info_y, box_label_width, LINE_HEIGHT, fill_color=HEADER_BLUE)
+                pdf.setFillColorRGB(*WHITE)
+                pdf.drawString(MARGIN + BOX_PADDING, info_y + 6, label)
+
+                draw_box(pdf, MARGIN + box_label_width, info_y, box_value_width, LINE_HEIGHT, fill_color=WHITE)
+                pdf.setFillColorRGB(*BLACK)
+                draw_centered_text(pdf, str(value), MARGIN + box_label_width, info_y + 6, box_value_width)
+
+                info_y -= 25
+
+            # Table headers
+            table_y = info_y - 30
+            headers = [
+                ("Description", 150),
+                ("Unité", 50),
+                ("NBRE", 50),
+                ("LNG/Qté", 60),
+                ("P.U", 60),
+                ("Total HT", 170)
+            ]
+
+            total_width = sum(width for _, width in headers)
+            table_x = (page_width - total_width) / 2  # Center table
+            draw_box(pdf, table_x, table_y, total_width, LINE_HEIGHT, fill_color=HEADER_BLUE)
+            pdf.setFillColorRGB(*WHITE)
+
+            current_x = table_x
+            for title, width in headers:
+                draw_box(pdf, current_x, table_y, width, LINE_HEIGHT)
+                draw_centered_text(pdf, title, current_x, table_y + 6, width)
+                current_x += width
+
+
+            # Draw sections and items
+            current_y = table_y - LINE_HEIGHT
+
+            def draw_section_header(title):
+                nonlocal current_y
+                draw_box(pdf, table_x, current_y, total_width, LINE_HEIGHT, fill_color=BLUE_LIGHT)
+                pdf.setFillColorRGB(*BLACK)
+                pdf.drawString(table_x + BOX_PADDING, current_y + 6, title)
+                current_y -= LINE_HEIGHT
+
+            def draw_section_header2(title):
+                nonlocal current_y
+                draw_box(pdf, table_x, current_y, total_width, LINE_HEIGHT, fill_color=WHITE)
+                
+                # Set the font to a bold variant
+                pdf.setFont("Helvetica-Bold", 12)  # Adjust the font name and size as needed
+                
+                # Set the fill color to black
+                pdf.setFillColorRGB(0, 0, 0)  # RGB values for black
+                
+                # Draw the string
+                pdf.drawString(table_x + BOX_PADDING, current_y + 6, title)
+                
+                current_y -= LINE_HEIGHT
+
+            def draw_item_row(item, indent=False):
+                nonlocal current_y
+                pdf.setFillColorRGB(*BLACK)
+                current_x = table_x
+
+                draw_box(pdf, current_x, current_y, total_width, LINE_HEIGHT, fill_color=WHITE)
+
+                cells = [
+                    ("    " + item.description if indent else item.description, 150),
+                    (item.unit, 50),
+                    (str(item.quantity), 50),
+                    (f"{item.length:.2f}", 60),
+                    (f"{item.unit_price:.2f}", 60),
+                    (f"{item.total_price:.2f}", 170)
+                ]
+
+                for value, width in cells:
+                    draw_box(pdf, current_x, current_y, width, LINE_HEIGHT)
+                    if isinstance(value, str) and value.startswith("    "):
+                        pdf.drawString(current_x + 20, current_y + 6, value.strip())
+                    else:
+                        draw_centered_text(pdf, str(value), current_x, current_y + 6, width)
+                    current_x += width
+
+                current_y -= LINE_HEIGHT
+
+            # Draw sections
+            sections = [
+                ("POUTRELLES", "PCP"),
+                ("HOURDIS", "HOURDIS"),
+                ("PANNEAU TREILLIS SOUDES", "PTS")
+            ]
+
+            for section_title, keyword in sections:
+                draw_section_header(section_title)
+                items = [i for i in data.items if keyword in i.description]
+                for item in items:
+                    draw_item_row(item, indent=(keyword != "lfflflflf"))
+
+            # NB box with just "NB:" text
+            nb_box_width = 200
+            nb_box_height = 80
+            pdf.setFillColorRGB(*BLACK)
+            pdf.rect(20, current_y - nb_box_height, nb_box_width, nb_box_height, stroke=1)
+            pdf.setFont("Helvetica-Bold", 12)  # Made slightly larger for better visibility
+            pdf.drawString(60, current_y - nb_box_height + 60, "NB:")
+
+            # Totals section
+            current_y -= 20
+            totals_table_width = 300
+            row_height = 20
+
+            for i, (label1, label2, value) in enumerate([
+                ("Total", "H.T", f"{data.total_ht:.2f} DH"),
+                ("TVA", "20 %", f"{data.tax:.2f} DH"),
+                ("Total", "TTC", f"{data.total_ttc:.2f} DH")
+            ]):
+                y = current_y - (i * row_height)
+                totals_x = (page_width - totals_table_width) - 27  # Center totals table
+                draw_box(pdf, totals_x, y, totals_table_width / 2, row_height)
+                draw_box(pdf, totals_x + totals_table_width / 2, y, totals_table_width / 2, row_height)
+                pdf.drawString(totals_x + 10, y + 6, f"{label1}    {label2}")
+                pdf.drawRightString(totals_x + totals_table_width - 10, y + 6, value)
+
+            # Footer
+            pdf.setFont("Helvetica", 8)
+            if os.path.exists(logo_path):
+                pdf.drawImage(logo_path, MARGIN, 20, width=30, height=15)
+
+            footer_text = "Douar Ait Laarassi Tidili, Cercle El Kelâa, Route de Safi, Km 14-40000 Marrakech"
+            pdf.drawCentredString(page_width / 2, 30, footer_text)
+            footer_contact = "Tél: 05 24 01 55 54 Fax : 05 24 01 55 29 E-mail : [email protected]"
+            pdf.drawCentredString(page_width / 2, 20, footer_contact)
+
+            pdf.save()
+            buffer.seek(0)
+            return buffer.getvalue()
+
+        except Exception as e:
+            logger.error(f"Error in PDF generation: {str(e)}", exc_info=True)
+            raise

app/templates/index.html

@@ -0,0 +1,582 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <title>Invoice Generator</title>
+    <!-- Bootstrap CSS -->
+    <link href="https://cdn.jsdelivr.net/npm/[email protected]/dist/css/bootstrap.min.css" rel="stylesheet">
+    <style>
+        .table-fixed {
+            table-layout: fixed;
+        }
+        .table-fixed td {
+            overflow: hidden;
+            text-overflow: ellipsis;
+            white-space: nowrap;
+        }
+        .section-title {
+            background-color: #f8f9fa;
+            padding: 10px;
+            margin-top: 20px;
+            margin-bottom: 10px;
+            border-radius: 5px;
+        }
+    </style>
+</head>
+<body>
+    <div class="container mt-4">
+        <h2 class="mb-4">Générateur de Devis</h2>
+        
+        <form id="invoiceForm">
+            <!-- Client Information -->
+            <div class="row mb-4">
+                <div class="col-md-6">
+                    <div class="card">
+                        <div class="card-header">
+                            Information Client
+                        </div>
+                        <div class="card-body">
+                            <div class="mb-3">
+                                <label for="clientName" class="form-label">Nom du Client</label>
+                                <input type="text" class="form-control" id="clientName" required>
+                            </div>
+                            <div class="mb-3">
+                                <label for="clientPhone" class="form-label">Téléphone</label>
+                                <input type="tel" class="form-control" id="clientPhone" required>
+                            </div>
+                            <div class="mb-3">
+                                <label for="clientAddress" class="form-label">Adresse</label>
+                                <input type="text" class="form-control" id="clientAddress" required>
+                            </div>
+                            <div class="mb-3">
+                                <label class="form-label">Type Client</label>
+                                <div class="btn-group" role="group">
+                                    <input type="radio" class="btn-check" name="clientType" id="EE" value="EE" autocomplete="off">
+                                    <label class="btn btn-outline-primary" for="EE">EE</label>
+
+                                    <input type="radio" class="btn-check" name="clientType" id="MED" value="MED" autocomplete="off">
+                                    <label class="btn btn-outline-primary" for="MED">MED</label>
+
+                                    <input type="radio" class="btn-check" name="clientType" id="AM" value="AM" autocomplete="off">
+                                    <label class="btn btn-outline-primary" for="AM">AM</label>
+
+                                    <input type="radio" class="btn-check" name="clientType" id="DIV" value="DIV" autocomplete="off">
+                                    <label class="btn btn-outline-primary" for="DIV">DIV</label>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+                
+                <div class="col-md-6">
+                    <div class="card">
+                        <div class="card-header">
+                            Information Devis
+                        </div>
+                        <div class="card-body">
+                            <div class="mb-3">
+                                <label for="invoiceNumber" class="form-label">N° Devis</label>
+                                <input type="text" class="form-control" id="invoiceNumber" required>
+                            </div>
+                            <div class="mb-3">
+                                <label for="date" class="form-label">Date</label>
+                                <input type="date" class="form-control" id="date" readonly>
+                            </div>
+                            <div class="mb-3">
+                                <label for="project" class="form-label">Type d'ouvrage</label>
+                                <input type="text" class="form-control" id="project" required>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+
+            <!-- Poutrelles Section -->
+            <div class="section-title d-flex justify-content-between align-items-center">
+                <h4>POUTRELLES</h4>
+                <button type="button" class="btn btn-primary" id="addPoutrelles">
+                    Ajouter Poutrelle
+                </button>
+            </div>
+            <div class="table-responsive">
+                <table class="table table-bordered table-fixed">
+                    <thead class="table-primary">
+                        <tr>
+                            <th style="width: 30%">Description</th>
+                            <th style="width: 10%">Unité</th>
+                            <th style="width: 10%">Quantité</th>
+                            <th style="width: 15%">Longueur</th>
+                            <th style="width: 15%">P.U</th>
+                            <th style="width: 15%">Total HT</th>
+                            <th style="width: 5%"></th>
+                        </tr>
+                    </thead>
+                    <tbody id="poutrellesTable"></tbody>
+                </table>
+            </div>
+
+            <!-- Hourdis Section -->
+            <div class="section-title d-flex justify-content-between align-items-center">
+                <h4>HOURDIS</h4>
+                <button type="button" class="btn btn-primary" id="addHourdis">
+                    Ajouter Hourdis
+                </button>
+            </div>
+            <div class="table-responsive">
+                <table class="table table-bordered table-fixed">
+                    <thead class="table-primary">
+                        <tr>
+                            <th style="width: 30%">Description</th>
+                            <th style="width: 10%">Unité</th>
+                            <th style="width: 10%">Quantité</th>
+                            <th style="width: 15%">Longueur</th>
+                            <th style="width: 15%">P.U</th>
+                            <th style="width: 15%">Total HT</th>
+                            <th style="width: 5%"></th>
+                        </tr>
+                    </thead>
+                    <tbody id="hourdisTable"></tbody>
+                </table>
+            </div>
+
+            <!-- Panneau Section -->
+            <div class="section-title d-flex justify-content-between align-items-center">
+                <h4>PANNEAU TREILLIS SOUDES</h4>
+                <button type="button" class="btn btn-primary" id="addPanneau">
+                    Ajouter Panneau
+                </button>
+            </div>
+            <div class="table-responsive">
+                <table class="table table-bordered table-fixed">
+                    <thead class="table-primary">
+                        <tr>
+                            <th style="width: 30%">Description</th>
+                            <th style="width: 10%">Unité</th>
+                            <th style="width: 10%">Quantité</th>
+                            <th style="width: 15%">Longueur</th>
+                            <th style="width: 15%">P.U</th>
+                            <th style="width: 15%">Total HT</th>
+                            <th style="width: 5%"></th>
+                        </tr>
+                    </thead>
+                    <tbody id="panneauTable"></tbody>
+                </table>
+            </div>
+
+            <!-- Totals -->
+            <div class="row mt-4">
+                <div class="col-md-6">
+                    <!-- Empty for spacing -->
+                </div>
+                <div class="col-md-6">
+                    <div class="card">
+                        <div class="card-body">
+                            <div class="mb-3">
+                                <label for="totalHT" class="form-label">Total HT</label>
+                                <input type="number" class="form-control" id="totalHT" readonly>
+                            </div>
+                            <div class="mb-3">
+                                <label for="tax" class="form-label">TVA 20%</label>
+                                <input type="number" class="form-control" id="tax" readonly>
+                            </div>
+                            <div class="mb-3">
+                                <label for="totalTTC" class="form-label">Total TTC</label>
+                                <input type="number" class="form-control" id="totalTTC" readonly>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+
+            <div class="d-grid gap-2 col-md-6 mx-auto mt-4">
+                <button type="submit" class="btn btn-success btn-lg">Générer le Devis</button>
+            </div>
+        </form>
+    </div>
+
+    <!-- Poutrelles Modal -->
+    <div class="modal fade" id="poutrellesModal" tabindex="-1">
+        <div class="modal-dialog modal-lg">
+            <div class="modal-content">
+                <div class="modal-header">
+                    <h5 class="modal-title">Sélectionner Poutrelle</h5>
+                    <button type="button" class="btn-close" data-bs-dismiss="modal"></button>
+                </div>
+                <div class="modal-body">
+                    <div class="table-responsive">
+                        <table class="table">
+                            <thead>
+                                <tr>
+                                    <th>Description</th>
+                                    <th>Unité</th>
+                                    <th>Quantité</th>
+                                    <th>Longueur</th>
+                                    <th>P.U</th>
+                                    <th>Action</th>
+                                </tr>
+                            </thead>
+                            <tbody></tbody>
+                        </table>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+
+    <!-- Hourdis Modal -->
+    <div class="modal fade" id="hourdisModal" tabindex="-1">
+        <div class="modal-dialog modal-lg">
+            <div class="modal-content">
+                <div class="modal-header">
+                    <h5 class="modal-title">Sélectionner Hourdis</h5>
+                    <button type="button" class="btn-close" data-bs-dismiss="modal"></button>
+                </div>
+                <div class="modal-body">
+                    <div class="table-responsive">
+                        <table class="table">
+                            <thead>
+                                <tr>
+                                    <th>Description</th>
+                                    <th>Unité</th>
+                                    <th>Quantité</th>
+                                    <th>Longueur</th>
+                                    <th>P.U</th>
+                                    <th>Action</th>
+                                </tr>
+                            </thead>
+                            <tbody></tbody>
+                        </table>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+
+    <!-- Panneau Modal -->
+    <div class="modal fade" id="panneauModal" tabindex="-1">
+        <div class="modal-dialog modal-lg">
+            <div class="modal-content">
+                <div class="modal-header">
+                    <h5 class="modal-title">Sélectionner Panneau</h5>
+                    <button type="button" class="btn-close" data-bs-dismiss="modal"></button>
+                </div>
+                <div class="modal-body">
+                    <div class="table-responsive">
+                        <table class="table">
+                            <thead>
+                                <tr>
+                                    <th>Description</th>
+                                    <th>Unité</th>
+                                    <th>Quantité</th>
+                                    <th>Longueur</th>
+                                    <th>P.U</th>
+                                    <th>Action</th>
+                                </tr>
+                            </thead>
+                            <tbody></tbody>
+                        </table>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+
+    <!-- Bootstrap JS -->
+    <script src="https://cdn.jsdelivr.net/npm/[email protected]/dist/js/bootstrap.bundle.min.js"></script>
+    
+    <script>
+        document.addEventListener("DOMContentLoaded", function() {
+            const poutrellesTable = document.getElementById("poutrellesTable");
+            const hourdisTable = document.getElementById("hourdisTable");
+            const panneauTable = document.getElementById("panneauTable");
+            const invoiceForm = document.getElementById("invoiceForm");
+
+            // Default items data
+            const defaultItems = {
+                poutrelles: [
+                    { description: "PCP 114N", unit: "ML", quantity: 21, length: 3.00, unit_price: 26.00 },
+                    { description: "PCP 113N", unit: "ML", quantity: 12, length: 4.00, unit_price: 26.00 }
+                ],
+                hourdis: [
+                    { description: "HOURDIS TYPE 12", unit: "U", quantity: 1, length: 300, unit_price: 3.50 }
+                ],
+                panneaux: [
+                    { description: "PTS SISMIQUE 5*3,5", unit: "U", quantity: 1, length: 9, unit_price: 195.00 }
+                ]
+            };
+
+            // Function to add a new item row
+            function addItemRow(item, tableBody) {
+                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}" required></td>
+                    <td><input type="text" class="form-control" name="unit" value="${item.unit}" required></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();
+                });
+
+                // Add input event listeners to update total
+                ['quantity', 'length', 'unitPrice'].forEach(field => {
+                    row.querySelector(`input[name='${field}']`).addEventListener('input', () => {
+                        const qty = parseFloat(row.querySelector('input[name="quantity"]').value) || 0;
+                        const length = parseFloat(row.querySelector('input[name="length"]').value) || 0;
+                        const price = parseFloat(row.querySelector('input[name="unitPrice"]').value) || 0;
+                        const rowTotal = (qty * length * price).toFixed(2);
+                        row.querySelector('input[name="totalHT"]').value = rowTotal;
+                        updateTotals();
+                    });
+                });
+
+                tableBody.appendChild(row);
+                updateTotals();
+            }
+
+            // Function to update totals
+            function updateTotals() {
+                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;
+            }
+
+            // Initialize tables with default items
+            defaultItems.poutrelles.forEach(item => addItemRow(item, poutrellesTable));
+            defaultItems.hourdis.forEach(item => addItemRow(item, hourdisTable));
+            defaultItems.panneaux.forEach(item => addItemRow(item, panneauTable));
+
+            // Update initial totals
+            updateTotals();
+
+            // Predefined items data
+            const predefinedItems = {
+                poutrelles: [
+                    { description: "PCP 114N", unit: "ML", quantity: 21, length: 3.00, unit_price: 26.00 },
+                    { description: "PCP 113N", unit: "ML", quantity: 12, length: 4.00, unit_price: 26.00 },
+                    { description: "PCP 113B SISMIQUE", unit: "ML", quantity: 22, length: 4.20, unit_price: 26.00 },
+                    { description: "PCP 114B SISMIQUE", unit: "ML", quantity: 12, length: 4.90, unit_price: 30.00 },
+                    { description: "PCP 135 SISMIQUE", unit: "ML", quantity: 8, length: 5.00, unit_price: 38.00 },
+                    { description: "PCP 156 SISMIQUE", unit: "ML", quantity: 12, length: 5.10, unit_price: 38.00 },
+                    { description: "PCP 158 SISMIQUE", unit: "ML", quantity: 12, length: 5.50, unit_price: 51.00 }
+                ],
+                hourdis: [
+                    { description: "HOURDIS TYPE 08", unit: "U", quantity: 1, length: 200, unit_price: 3.40 },
+                    { description: "HOURDIS TYPE 12", unit: "U", quantity: 1, length: 300, unit_price: 3.50 },
+                    { description: "HOURDIS TYPE 16", unit: "U", quantity: 1, length: 0, unit_price: 0 },
+                    { description: "HOURDIS TYPE 20", unit: "U", quantity: 1, length: 0, unit_price: 0 },
+                    { description: "HOURDIS TYPE 25", unit: "U", quantity: 1, length: 450, unit_price: 4.80 },
+                    { description: "HOURDIS TYPE 30", unit: "U", quantity: 1, length: 0, unit_price: 0 }
+                ],
+                panneaux: [
+                    { description: "PTS Normal 3,5*3,5", unit: "U", quantity: 1, length: 0, unit_price: 0 },
+                    { description: "PTS SISMIQUE 5*3,5", unit: "U", quantity: 1, length: 9, unit_price: 195.00 }
+                ]
+            };
+
+            // Function to populate modal with items
+            function populateModal(modalId, items, targetTable) {
+                const modal = document.querySelector(modalId);
+                const tbody = modal.querySelector('tbody');
+                tbody.innerHTML = '';
+
+                items.forEach(item => {
+                    const row = document.createElement('tr');
+                    row.innerHTML = `
+                        <td>${item.description}</td>
+                        <td>${item.unit}</td>
+                        <td><input type="number" class="form-control form-control-sm" value="${item.quantity}" name="modal-quantity"></td>
+                        <td><input type="number" class="form-control form-control-sm" value="${item.length}" step="0.01" name="modal-length"></td>
+                        <td><input type="number" class="form-control form-control-sm" value="${item.unit_price}" step="0.01" name="modal-price"></td>
+                        <td>
+                            <button class="btn btn-primary btn-sm add-item">
+                                Ajouter
+                            </button>
+                        </td>
+                    `;
+
+                    row.querySelector('.add-item').addEventListener('click', () => {
+                        const newItem = {
+                            ...item,
+                            quantity: parseFloat(row.querySelector('[name="modal-quantity"]').value) || 0,
+                            length: parseFloat(row.querySelector('[name="modal-length"]').value) || 0,
+                            unit_price: parseFloat(row.querySelector('[name="modal-price"]').value) || 0
+                        };
+                        addItemRow(newItem, targetTable);
+                        bootstrap.Modal.getInstance(modal).hide();
+                    });
+
+                    tbody.appendChild(row);
+                });
+            }
+
+            // Update button click handlers
+            document.querySelector("#addPoutrelles").addEventListener("click", () => {
+                populateModal('#poutrellesModal', predefinedItems.poutrelles, poutrellesTable);
+                new bootstrap.Modal('#poutrellesModal').show();
+            });
+
+            document.querySelector("#addHourdis").addEventListener("click", () => {
+                populateModal('#hourdisModal', predefinedItems.hourdis, hourdisTable);
+                new bootstrap.Modal('#hourdisModal').show();
+            });
+
+            document.querySelector("#addPanneau").addEventListener("click", () => {
+                populateModal('#panneauModal', predefinedItems.panneaux, panneauTable);
+                new bootstrap.Modal('#panneauModal').show();
+            });
+
+            // Form submission
+            invoiceForm.addEventListener("submit", async (event) => {
+                event.preventDefault();
+
+                const getAllItems = () => {
+                    const items = [];
+                    [poutrellesTable, hourdisTable, panneauTable].forEach(table => {
+                        items.push(...Array.from(table.querySelectorAll("tr")).map(row => ({
+                            description: row.querySelector("input[name='description']").value,
+                            unit: row.querySelector("input[name='unit']").value,
+                            quantity: parseInt(row.querySelector("input[name='quantity']").value, 10),
+                            length: parseFloat(row.querySelector("input[name='length']").value),
+                            unit_price: parseFloat(row.querySelector("input[name='unitPrice']").value),
+                            total_price: parseFloat(row.querySelector("input[name='totalHT']").value)
+                        })));
+                    });
+                    return items;
+                };
+
+                const data = {
+                    invoice_number: document.querySelector("#invoiceNumber").value,
+                    date: new Date(document.querySelector("#date").value).toISOString(),
+                    project: document.querySelector("#project").value,
+                    client_name: document.querySelector("#clientName").value,
+                    client_phone: document.querySelector("#clientPhone").value,
+                    address: document.querySelector("#clientAddress").value,
+                    total_ht: parseFloat(document.querySelector("#totalHT").value || 0),
+                    tax: parseFloat(document.querySelector("#tax").value || 0),
+                    total_ttc: parseFloat(document.querySelector("#totalTTC").value || 0),
+                    items: getAllItems(),
+                    frame_number: "",
+                    status: "pending",
+                    created_at: new Date().toISOString()
+                };
+
+                console.log("Sending invoice data:", data);
+
+                try {
+                    // First create the invoice
+                    const createResponse = await fetch("/api/invoices/", {
+                        method: "POST",
+                        headers: { "Content-Type": "application/json" },
+                        body: JSON.stringify(data)
+                    });
+
+                    if (!createResponse.ok) {
+                        const errorData = await createResponse.json();
+                        console.error("Server error:", errorData);
+                        throw new Error(`Failed to create invoice: ${JSON.stringify(errorData)}`);
+                    }
+
+                    const invoice = await createResponse.json();
+                    console.log("Created invoice:", invoice);
+
+                    // Then generate the PDF
+                    const pdfResponse = await fetch(`/api/invoices/${invoice.id}/generate-pdf`, {
+                        method: "POST",
+                        headers: { 
+                            "Content-Type": "application/json"
+                        },
+                        body: JSON.stringify(invoice)  // Send the created invoice data for PDF generation
+                    });
+
+                    if (!pdfResponse.ok) {
+                        const errorData = await pdfResponse.text();
+                        console.error("PDF generation error:", errorData);
+                        throw new Error(`Failed to generate PDF: ${errorData}`);
+                    }
+
+                    // Handle PDF download
+                    const blob = await pdfResponse.blob();
+                    const url = window.URL.createObjectURL(blob);
+                    const a = document.createElement("a");
+                    a.href = url;
+                    a.download = `devis_${invoice.invoice_number}.pdf`;
+                    document.body.appendChild(a);
+                    a.click();
+                    document.body.removeChild(a);
+                    window.URL.revokeObjectURL(url);
+
+                } 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
+            const today = new Date();
+            const formattedDate = today.toISOString().split('T')[0];
+            document.querySelector("#date").value = formattedDate;
+
+            // Auto-generate invoice number when client type is selected
+            const clientTypeInputs = document.querySelectorAll('input[name="clientType"]');
+            const invoiceNumberInput = document.querySelector("#invoiceNumber");
+
+            // Function to get and update the invoice number
+            async function updateInvoiceNumber(selectedType) {
+                try {
+                    // Disable the input while fetching
+                    invoiceNumberInput.disabled = true;
+                    
+                    const response = await fetch(`/api/invoices/last-number/${selectedType}`);
+                    if (response.ok) {
+                        const data = await response.json();
+                        invoiceNumberInput.value = data.formatted_number;
+                    } else {
+                        throw new Error('Failed to get invoice number');
+                    }
+                } catch (error) {
+                    console.error('Error:', error);
+                    invoiceNumberInput.value = `DCP/${selectedType}/0001`;
+                } finally {
+                    // Re-enable the input
+                    invoiceNumberInput.disabled = false;
+                }
+            }
+
+            // Update invoice number when client type is selected
+            clientTypeInputs.forEach(input => {
+                input.addEventListener('change', () => {
+                    updateInvoiceNumber(input.value);
+                });
+            });
+
+            // Optional: Update the number when the page loads if a type is already selected
+            const selectedType = document.querySelector('input[name="clientType"]:checked')?.value;
+            if (selectedType) {
+                updateInvoiceNumber(selectedType);
+            }
+        });
+    </script>
+</body>
+</html>

migrations/versions/xxxx_add_invoice_sequence.py

@@ -0,0 +1,28 @@
+"""add invoice sequence and client type
+
+Revision ID: xxxx
+Revises: previous_revision_id
+Create Date: 2024-xx-xx
+"""
+from alembic import op
+import sqlalchemy as sa
+
+def upgrade():
+    # Create sequence for invoice IDs
+    op.execute('CREATE SEQUENCE IF NOT EXISTS invoice_id_seq START 1')
+    
+    # Add client_type column if not exists
+    op.add_column('invoices', sa.Column('client_type', sa.String(10), nullable=True))
+    
+    # Make invoice_number unique
+    op.create_unique_constraint('uq_invoice_number', 'invoices', ['invoice_number'])
+
+def downgrade():
+    # Remove unique constraint
+    op.drop_constraint('uq_invoice_number', 'invoices')
+    
+    # Drop client_type column
+    op.drop_column('invoices', 'client_type')
+    
+    # Drop sequence
+    op.execute('DROP SEQUENCE IF EXISTS invoice_id_seq') 

requirements.txt

@@ -0,0 +1,12 @@
+fastapi==0.109.0
+uvicorn==0.27.0
+sqlalchemy==2.0.25
+aiosqlite==0.19.0
+pydantic==2.5.3
+pydantic-settings==2.1.0
+jinja2==3.1.3
+python-multipart==0.0.6
+reportlab==4.0.8
+python-jose==3.3.0
+passlib==1.7.4
+alembic==1.13.1