Merge branch 'dev'

frontend/src/components/JobSheetTemplate.tsx

@@ -36,37 +36,37 @@ type RatingTone = {
 
 const CATEGORY_SCALE: Record<string, RatingTone> = {
   "0": {
-    label: "100% Original Strength",
+    label: "(100% Original Strength)",
     bg: "bg-green-100",
     text: "text-green-800",
     border: "border-green-200",
   },
   "1": {
-    label: "100% Original Strength",
+    label: "(100% Original Strength)",
     bg: "bg-green-200",
     text: "text-green-800",
     border: "border-green-200",
   },
   "2": {
-    label: "95-100% Original Strength",
+    label: "(95-100% Original Strength)",
     bg: "bg-yellow-100",
     text: "text-yellow-800",
     border: "border-yellow-200",
   },
   "3": {
-    label: "75-95% Original Strength",
+    label: "(75-95% Original Strength)",
     bg: "bg-yellow-200",
     text: "text-yellow-800",
     border: "border-yellow-200",
   },
   "4": {
-    label: "50-75% Original Strength",
+    label: "(50-75% Original Strength)",
     bg: "bg-orange-200",
     text: "text-orange-800",
     border: "border-orange-200",
   },
   "5": {
-    label: "<50% Original Strength",
+    label: "(<50% Original Strength)",
     bg: "bg-red-200",
     text: "text-red-800",
     border: "border-red-200",
@@ -75,31 +75,31 @@ const CATEGORY_SCALE: Record<string, RatingTone> = {
 
 const PRIORITY_SCALE: Record<string, RatingTone> = {
   "1": {
-    label: "Immediate",
+    label: "(Immediate)",
     bg: "bg-red-200",
     text: "text-red-800",
     border: "border-red-200",
   },
   "2": {
-    label: "1 Year",
+    label: "(1 Year)",
     bg: "bg-orange-200",
     text: "text-orange-800",
     border: "border-orange-200",
   },
   "3": {
-    label: "3 Years",
+    label: "(3 Years)",
     bg: "bg-green-200",
     text: "text-green-800",
     border: "border-green-200",
   },
   X: {
-    label: "At Use",
+    label: "(At Use)",
     bg: "bg-purple-200",
     text: "text-purple-800",
     border: "border-purple-200",
   },
   M: {
-    label: "Monitor",
+    label: "(Monitor)",
     bg: "bg-blue-200",
     text: "text-blue-800",
     border: "border-blue-200",
@@ -111,7 +111,7 @@ function ratingKey(value: string) {
   if (!raw) return "";
   const match = raw.match(/^([0-9]|[xXmM])/);
   if (match) return match[1].toUpperCase();
-  return raw.split("-")[0].trim().toUpperCase();
+  return raw.split("")[0].trim().toUpperCase();
 }
 
 function formatRating(value: string, scale: Record<string, RatingTone>) {
@@ -120,12 +120,12 @@ function formatRating(value: string, scale: Record<string, RatingTone>) {
   const tone = key ? scale[key] : undefined;
   if (!tone) {
     return {
-      text: raw || "-",
+      text: raw || "",
       className: "bg-gray-50 text-gray-700 border-gray-200",
     };
   }
   return {
-    text: `${key} - ${tone.label}`,
+    text: `${key} ${tone.label}`,
     className: `${tone.bg} ${tone.text} ${tone.border}`,
   };
 }

frontend/src/components/PdfPreviewPanel.tsx

@@ -0,0 +1 @@
+

frontend/src/components/report-editor.js

@@ -2,20 +2,20 @@
 import * as feather from "feather-icons";
 
 const CATEGORY_SCALE = {
-  "0": { label: "100% Original Strength", className: "bg-green-100 text-green-800 border-green-200" },
-  "1": { label: "100% Original Strength", className: "bg-green-200 text-green-800 border-green-200" },
-  "2": { label: "95-100% Original Strength", className: "bg-yellow-100 text-yellow-800 border-yellow-200" },
-  "3": { label: "75-95% Original Strength", className: "bg-yellow-200 text-yellow-800 border-yellow-200" },
-  "4": { label: "50-75% Original Strength", className: "bg-orange-200 text-orange-800 border-orange-200" },
-  "5": { label: "<50% Original Strength", className: "bg-red-200 text-red-800 border-red-200" },
+  "0": { label: "(100% Original Strength)", className: "bg-green-100 text-green-800 border-green-200" },
+  "1": { label: "(100% Original Strength)", className: "bg-green-200 text-green-800 border-green-200" },
+  "2": { label: "(95-100% Original Strength)", className: "bg-yellow-100 text-yellow-800 border-yellow-200" },
+  "3": { label: "(75-95% Original Strength)", className: "bg-yellow-200 text-yellow-800 border-yellow-200" },
+  "4": { label: "(50-75% Original Strength)", className: "bg-orange-200 text-orange-800 border-orange-200" },
+  "5": { label: "(<50% Original Strength)", className: "bg-red-200 text-red-800 border-red-200" },
 };
 
 const PRIORITY_SCALE = {
-  "1": { label: "Immediate", className: "bg-red-200 text-red-800 border-red-200" },
-  "2": { label: "1 Year", className: "bg-orange-200 text-orange-800 border-orange-200" },
-  "3": { label: "3 Years", className: "bg-green-200 text-green-800 border-green-200" },
-  X: { label: "At Use", className: "bg-purple-200 text-purple-800 border-purple-200" },
-  M: { label: "Monitor", className: "bg-blue-200 text-blue-800 border-blue-200" },
+  "1": { label: "(Immediate)", className: "bg-red-200 text-red-800 border-red-200" },
+  "2": { label: "(1 Year)", className: "bg-orange-200 text-orange-800 border-orange-200" },
+  "3": { label: "(3 Years)", className: "bg-green-200 text-green-800 border-green-200" },
+  X: { label: "(At Use)", className: "bg-purple-200 text-purple-800 border-purple-200" },
+  M: { label: "(Monitor)", className: "bg-blue-200 text-blue-800 border-blue-200" },
 };
 
 const MAX_PHOTOS_PRIMARY_PAGE = 2;
@@ -29,14 +29,14 @@ function parseScaleCode(value) {
 function buildScaleBadge(value, scale) {
   const raw = String(value || "").trim();
   if (!raw) {
-    return { text: "-", className: "bg-gray-50 text-gray-700 border-gray-200" };
+    return { text: "", className: "bg-gray-50 text-gray-700 border-gray-200" };
   }
   const code = parseScaleCode(raw);
   const tone = scale[code];
   if (!tone) {
     return { text: raw, className: "bg-gray-50 text-gray-700 border-gray-200" };
   }
-  return { text: `${code} - ${tone.label}`, className: tone.className };
+  return { text: `${code} ${tone.label}`, className: tone.className };
 }
 class ReportEditor extends HTMLElement {
   constructor() {
@@ -1034,29 +1034,29 @@ class ReportEditor extends HTMLElement {
     const requiredAction = template.required_action || "";
 
     const categoryScale = {
-      "0": { label: "Excellent (100%)", bg: "bg-green-100", text: "text-green-800", border: "border-green-200" },
-      "1": { label: "Good (100%)", bg: "bg-green-200", text: "text-green-800", border: "border-green-200" },
-      "2": { label: "Fair (95-100%)", bg: "bg-yellow-100", text: "text-yellow-800", border: "border-yellow-200" },
-      "3": { label: "Unsatisfactory (75-95%)", bg: "bg-yellow-200", text: "text-yellow-800", border: "border-yellow-200" },
-      "4": { label: "Poor (50-75%)", bg: "bg-orange-200", text: "text-orange-800", border: "border-orange-200" },
-      "5": { label: "Severe (<50%)", bg: "bg-red-200", text: "text-red-800", border: "border-red-200" },
+      "0": { label: "(100% Original Strength)", bg: "bg-green-100", text: "text-green-800", border: "border-green-200" },
+      "1": { label: "(100% Original Strength)", bg: "bg-green-200", text: "text-green-800", border: "border-green-200" },
+      "2": { label: "(95-100% Original Strength)", bg: "bg-yellow-100", text: "text-yellow-800", border: "border-yellow-200" },
+      "3": { label: "(75-95% Original Strength)", bg: "bg-yellow-200", text: "text-yellow-800", border: "border-yellow-200" },
+      "4": { label: "(50-75% Original Strength)", bg: "bg-orange-200", text: "text-orange-800", border: "border-orange-200" },
+      "5": { label: "(<50% Original Strength)", bg: "bg-red-200", text: "text-red-800", border: "border-red-200" },
     };
     const priorityScale = {
-      "1": { label: "Immediate", bg: "bg-red-200", text: "text-red-800", border: "border-red-200" },
-      "2": { label: "1 Year", bg: "bg-orange-200", text: "text-orange-800", border: "border-orange-200" },
-      "3": { label: "3 Years", bg: "bg-green-200", text: "text-green-800", border: "border-green-200" },
-      X: { label: "At Use", bg: "bg-purple-200", text: "text-purple-800", border: "border-purple-200" },
-      M: { label: "Monitor", bg: "bg-blue-200", text: "text-blue-800", border: "border-blue-200" },
+      "1": { label: "(Immediate)", bg: "bg-red-200", text: "text-red-800", border: "border-red-200" },
+      "2": { label: "(1 Year)", bg: "bg-orange-200", text: "text-orange-800", border: "border-orange-200" },
+      "3": { label: "(3 Years)", bg: "bg-green-200", text: "text-green-800", border: "border-green-200" },
+      X: { label: "(At Use)", bg: "bg-purple-200", text: "text-purple-800", border: "border-purple-200" },
+      M: { label: "(Monitor)", bg: "bg-blue-200", text: "text-blue-800", border: "border-blue-200" },
     };
     const categoryBadge = this._ratingBadge(category, categoryScale);
     const priorityBadge = this._ratingBadge(priority, priorityScale);
     const categoryOptions = ["0", "1", "2", "3", "4", "5"].map((key) => ({
       value: key,
-      label: `${key} - ${categoryScale[key].label}`,
+      label: `${key} ${categoryScale[key].label}`,
     }));
     const priorityOptions = ["1", "2", "3", "X", "M"].map((key) => ({
       value: key,
-      label: `${key} - ${priorityScale[key].label}`,
+      label: `${key} ${priorityScale[key].label}`,
     }));
 
     const variant =
@@ -1372,16 +1372,16 @@ class ReportEditor extends HTMLElement {
   _ratingBadge(value, scale) {
     const raw = String(value || "").trim();
     if (!raw) {
-      return { text: "-", className: "bg-gray-50 text-gray-700 border-gray-200" };
+      return { text: "", className: "bg-gray-50 text-gray-700 border-gray-200" };
     }
     const match = raw.match(/^([0-9]|[xXmM])/);
-    const key = match ? match[1].toUpperCase() : raw.split("-")[0].trim().toUpperCase();
+    const key = match ? match[1].toUpperCase() : raw.split("")[0].trim().toUpperCase();
     const tone = scale[key];
     if (!tone) {
       return { text: raw, className: "bg-gray-50 text-gray-700 border-gray-200" };
     }
     return {
-      text: `${key} - ${tone.label}`,
+      text: `${key} ${tone.label}`,
       className: `${tone.bg} ${tone.text} ${tone.border}`,
     };
   }

frontend/src/pages/EditReportPage.tsx

@@ -96,7 +96,9 @@ export default function EditReportPage() {
       void saveAndNavigate(`/report-viewer${sessionQuery}`);
     };
     editorEl.addEventListener("editor-closed", handleClose);
-    return () => editorEl.removeEventListener("editor-closed", handleClose);
+    return () => {
+      editorEl.removeEventListener("editor-closed", handleClose);
+    };
   }, [editorEl, saveAndNavigate, sessionQuery]);
 
   useEffect(() => {

server/app/services/pdf_export.py

@@ -1,59 +1,42 @@
-from __future__ import annotations
+from __future__ import annotations
 
-import asyncio
-import sys
 from pathlib import Path
 
-from playwright.async_api import async_playwright
+from playwright.sync_api import sync_playwright
 
 from ..core.config import get_settings
 
 
-async def _render_pdf_async(session_id: str, output_path: Path) -> Path:
+def render_pdf(session_id: str, output_path: Path) -> Path:
     settings = get_settings()
     base_url = settings.frontend_base_url.rstrip("/")
     url = f"{base_url}/print/report?session={session_id}"
 
     output_path.parent.mkdir(parents=True, exist_ok=True)
 
-    async with async_playwright() as playwright:
-        browser = await playwright.chromium.launch(headless=True, args=["--no-sandbox"])
-        context = await browser.new_context()
-        page = await context.new_page()
-        await page.goto(url, wait_until="networkidle", timeout=settings.pdf_timeout_ms)
-        await page.wait_for_selector(
-            '[data-print-ready="true"]', timeout=settings.pdf_timeout_ms
+    with sync_playwright() as playwright:
+        browser = playwright.chromium.launch(headless=True, args=["--no-sandbox"])
+        context = browser.new_context()
+        page = context.new_page()
+        page.goto(url, wait_until="networkidle", timeout=settings.pdf_timeout_ms)
+        page.wait_for_selector(
+            '[data-print-ready="true"]',
+            timeout=settings.pdf_timeout_ms,
         )
-        await page.wait_for_function("document.fonts && document.fonts.ready")
-        await page.wait_for_function(
+        page.wait_for_function("document.fonts && document.fonts.ready")
+        page.wait_for_function(
             "Array.from(document.images || []).every(img => img.complete)"
         )
 
-        await page.pdf(
+        page.pdf(
             path=str(output_path),
             format="A4",
             print_background=True,
             prefer_css_page_size=True,
-            margin={"top": "0mm", "right": "0mm", "bottom": "0mm", "left": "0mm"},
+            margin={"top": "10mm", "right": "10mm", "bottom": "10mm", "left": "10mm"},
         )
 
-        await context.close()
-        await browser.close()
+        context.close()
+        browser.close()
 
     return output_path
-
-
-def _run_with_proactor(coro: asyncio.Future) -> Path:
-    if sys.platform.startswith("win"):
-        loop = asyncio.ProactorEventLoop()
-        try:
-            asyncio.set_event_loop(loop)
-            return loop.run_until_complete(coro)
-        finally:
-            loop.close()
-            asyncio.set_event_loop(None)
-    return asyncio.run(coro)
-
-
-def render_pdf_sync(session_id: str, output_path: Path) -> Path:
-    return _run_with_proactor(_render_pdf_async(session_id, output_path))

server/app/services/pdf_reportlab.py

@@ -185,8 +185,8 @@ def _badge_style(value: str, scale: dict) -> tuple[str, colors.Color, colors.Col
         key = match.group(1)
     tone = scale.get(key)
     if not tone:
-        return (raw or "-"), colors.HexColor("#f9fafb"), colors.HexColor("#374151")
-    return f"{key} - {tone['label']}", tone["bg"], tone["text"]
+        return (raw or ""), colors.HexColor("#f9fafb"), colors.HexColor("#374151")
+    return f"{key} {tone['label']}", tone["bg"], tone["text"]
 
 
 def _resolve_logo_path(store: SessionStore, session: dict, raw: str) -> Optional[Path]:
@@ -579,19 +579,19 @@ def render_report_pdf(
             category = _safe_text(template.get("category"))
             priority = _safe_text(template.get("priority"))
             cat_scale = {
-                "0": {"label": "100% Original Strength", "bg": green_100, "text": colors.HexColor("#166534")},
-                "1": {"label": "100% Original Strength", "bg": green_200, "text": colors.HexColor("#166534")},
-                "2": {"label": "95-100% Original Strength", "bg": yellow_100, "text": colors.HexColor("#854d0e")},
-                "3": {"label": "75-95% Original Strength", "bg": yellow_200, "text": colors.HexColor("#854d0e")},
-                "4": {"label": "50-75% Original Strength", "bg": orange_200, "text": colors.HexColor("#9a3412")},
-                "5": {"label": "<50% Original Strength", "bg": red_200, "text": colors.HexColor("#991b1b")},
+                "0": {"label": "(100% Original Strength)", "bg": green_100, "text": colors.HexColor("#166534")},
+                "1": {"label": "(100% Original Strength)", "bg": green_200, "text": colors.HexColor("#166534")},
+                "2": {"label": "(95-100% Original Strength)", "bg": yellow_100, "text": colors.HexColor("#854d0e")},
+                "3": {"label": "(75-95% Original Strength)", "bg": yellow_200, "text": colors.HexColor("#854d0e")},
+                "4": {"label": "(50-75% Original Strength)", "bg": orange_200, "text": colors.HexColor("#9a3412")},
+                "5": {"label": "(<50% Original Strength)", "bg": red_200, "text": colors.HexColor("#991b1b")},
             }
             pr_scale = {
-                "1": {"label": "Immediate", "bg": red_200, "text": colors.HexColor("#991b1b")},
-                "2": {"label": "1 Year", "bg": orange_200, "text": colors.HexColor("#9a3412")},
-                "3": {"label": "3 Years", "bg": green_200, "text": colors.HexColor("#166534")},
-                "X": {"label": "At Use", "bg": purple_200, "text": purple_800},
-                "M": {"label": "Monitor", "bg": blue_200, "text": blue_900},
+                "1": {"label": "(Immediate)", "bg": red_200, "text": colors.HexColor("#991b1b")},
+                "2": {"label": "(1 Year)", "bg": orange_200, "text": colors.HexColor("#9a3412")},
+                "3": {"label": "(3 Years)", "bg": green_200, "text": colors.HexColor("#166534")},
+                "X": {"label": "(At Use)", "bg": purple_200, "text": purple_800},
+                "M": {"label": "(Monitor)", "bg": blue_200, "text": blue_900},
             }
             cat_text, cat_bg, cat_text_color = _badge_style(category, cat_scale)
             pr_text, pr_bg, pr_text_color = _badge_style(priority, pr_scale)
@@ -662,7 +662,7 @@ def render_report_pdf(
             pdf.setStrokeColor(gray_200)
             cond_lines = _wrap_lines(
                 pdf,
-                condition or "-",
+                condition or "",
                 width - 2 * margin - 4 * mm,
                 4,
                 "Helvetica",
@@ -698,7 +698,7 @@ def render_report_pdf(
             pdf.setStrokeColor(gray_200)
             action_lines = _wrap_lines(
                 pdf,
-                action or "-",
+                action or "",
                 width - 2 * margin - 4 * mm,
                 4,
                 "Helvetica",

server/app/services/session_store.py

@@ -11,6 +11,7 @@ from typing import Iterable, List, Optional
 from uuid import uuid4
 
 from fastapi import UploadFile
+from PIL import Image, ImageOps, UnidentifiedImageError
 
 from ..core.config import get_settings
 
@@ -18,6 +19,7 @@ from ..core.config import get_settings
 IMAGE_EXTS = {".jpg", ".jpeg", ".png", ".gif", ".webp"}
 DOC_EXTS = {".pdf", ".doc", ".docx"}
 DATA_EXTS = {".csv", ".xls", ".xlsx"}
+EXIF_NORMALIZE_EXTS = {".jpg", ".jpeg", ".png", ".webp"}
 SESSION_ID_RE = re.compile(r"^[0-9a-f]{32}$")
 BUILTIN_PAGE_TEMPLATES = [
     {
@@ -82,6 +84,27 @@ def _category_for(filename: str) -> str:
     return "documents"
 
 
+def _normalize_uploaded_photo(path: Path) -> None:
+    ext = path.suffix.lower()
+    if ext not in EXIF_NORMALIZE_EXTS:
+        return
+
+    try:
+        with Image.open(path) as image:
+            normalized = ImageOps.exif_transpose(image)
+            format_name = image.format
+            if normalized.mode in ("RGBA", "LA", "P") and format_name in {"JPEG", "JPG"}:
+                normalized = normalized.convert("RGB")
+            save_kwargs = {"exif": b""}
+            if format_name in {"JPEG", "JPG"}:
+                save_kwargs["quality"] = 95
+                save_kwargs["optimize"] = True
+            normalized.save(path, format=format_name, **save_kwargs)
+    except (UnidentifiedImageError, OSError, ValueError, TypeError):
+        # Keep original bytes if the file cannot be decoded by Pillow.
+        return
+
+
 def _validate_session_id(session_id: str) -> str:
     if not session_id:
         raise ValueError("Invalid session id.")
@@ -585,6 +608,9 @@ class SessionStore:
                 handle.write(chunk)
 
         category = _category_for(filename)
+        if category == "photos":
+            _normalize_uploaded_photo(dest)
+            size = dest.stat().st_size
         return StoredFile(
             id=file_id,
             name=filename,