yroo changes da washo

api/invoices.py

@@ -15,6 +15,8 @@ except ImportError:
 router = APIRouter(prefix="/invoices", tags=["Invoices"])
 
 class ItemCreate(BaseModel):
+    patient_name: str
+    shade: str
     description: str
     quantity: int
     price_per_unit: float
@@ -34,14 +36,17 @@ class InvoiceCreate(BaseModel):
 def create_invoice(data: InvoiceCreate, db: Session = Depends(get_db)):
     # 1. Calculate total
     total = sum(item.quantity * item.price_per_unit for item in data.items)
+    first_item = data.items[0] if data.items else None
+    invoice_patient = data.patient_name or (first_item.patient_name if first_item else "")
+    invoice_shade = data.shade or (first_item.shade if first_item else "")
     
     # 2. Create the invoice object
     new_invoice = Invoice(
         date=data.date or datetime.utcnow(),
         doctor_name=data.doctor_name,
         clinic_name=data.clinic_name,
-        patient_name=data.patient_name,
-        shade=data.shade,
+        patient_name=invoice_patient,
+        shade=invoice_shade,
         total_amount=total,
         received_amount=data.received_amount,
         remaining_balance=total - data.received_amount,
@@ -62,6 +67,8 @@ def create_invoice(data: InvoiceCreate, db: Session = Depends(get_db)):
     for item in data.items:
         db.add(InvoiceItem(
             invoice_id=new_invoice.id,
+            patient_name=item.patient_name,
+            shade=item.shade,
             description=item.description,
             quantity=item.quantity,
             price_per_unit=item.price_per_unit,
@@ -97,6 +104,8 @@ def get_invoice(invoice_id: int, db: Session = Depends(get_db)):
         "remaining_balance": invoice.remaining_balance,
         "items": [
             {
+                "patient_name": item.patient_name,
+                "shade": item.shade,
                 "description": item.description,
                 "quantity": item.quantity,
                 "price_per_unit": item.price_per_unit,

main.py

@@ -3,6 +3,9 @@ import sys
 from pathlib import Path
 from fastapi import FastAPI
 from fastapi.middleware.cors import CORSMiddleware
+from fastapi.responses import FileResponse
+from fastapi.staticfiles import StaticFiles
+from sqlalchemy import inspect, text
 
 sys.path.append(str(Path(__file__).parent))
 
@@ -15,8 +18,42 @@ except ImportError:
 
 Base.metadata.create_all(bind=engine)
 
+def _ensure_schema():
+    inspector = inspect(engine)
+
+    migrations = {
+        "invoices": {
+            "patient_name": "VARCHAR",
+            "shade": "VARCHAR",
+        },
+        "invoice_items": {
+            "patient_name": "VARCHAR",
+            "shade": "VARCHAR",
+        },
+    }
+
+    with engine.begin() as conn:
+        for table_name, columns in migrations.items():
+            if not inspector.has_table(table_name):
+                continue
+
+            existing_columns = {col["name"] for col in inspector.get_columns(table_name)}
+            for column_name, column_type in columns.items():
+                if column_name in existing_columns:
+                    continue
+                conn.execute(text(f"ALTER TABLE {table_name} ADD COLUMN {column_name} {column_type}"))
+
+_ensure_schema()
+
 app = FastAPI(title="SmiloCAD API", redirect_slashes=False)
 
+BASE_DIR = Path(__file__).resolve().parent.parent
+FRONTEND_DIR = BASE_DIR / "frontend"
+
+app.mount("/css", StaticFiles(directory=FRONTEND_DIR / "css"), name="css")
+app.mount("/js", StaticFiles(directory=FRONTEND_DIR / "js"), name="js")
+app.mount("/img", StaticFiles(directory=FRONTEND_DIR / "img"), name="img")
+
 app.add_middleware(
     CORSMiddleware,
     allow_origins=[
@@ -28,6 +65,6 @@ app.add_middleware(
 
 @app.get("/")
 def root():
-    return {"status": "SmiloCAD API running"}
+    return FileResponse(FRONTEND_DIR / "index.html")
 
-app.include_router(invoice_router, prefix="/api")
+app.include_router(invoice_router, prefix="/api")

models/invoice.py

@@ -33,9 +33,11 @@ class InvoiceItem(Base):
     
     id = Column(Integer, primary_key=True, index=True, autoincrement=True)
     invoice_id = Column(Integer, ForeignKey("invoices.id"))
+    patient_name = Column(String)
+    shade = Column(String)
     description = Column(String)
     quantity = Column(Integer)
     price_per_unit = Column(Float)
     total_price = Column(Float)
 
-    invoice = relationship("Invoice", back_populates="items")
+    invoice = relationship("Invoice", back_populates="items")