Add triage samples and update medical resources UI

app.py

@@ -324,6 +324,7 @@ def get_defaults():
             "generic_name, brand_name, form, strength, expiry_date, batch_lot, "
             "storage_location, manufacturer, indication, allergy_warnings, dosage, notes."
         ),
+        "vaccine_types": ["MMR", "DTaP", "HepB", "HepA", "Td/Tdap", "Influenza", "COVID-19"],
     }
 
 
@@ -347,6 +348,14 @@ def db_op(cat, data=None, workspace=None):
                 "homePort": "",
                 "callSign": "",
                 "tonnage": "",
+                "netTonnage": "",
+                "mmsi": "",
+                "hullNumber": "",
+                "starboardEngine": "",
+                "starboardEngineSn": "",
+                "portEngine": "",
+                "portEngineSn": "",
+                "ribSn": "",
                 "crewCapacity": "",
             }
         else:
@@ -369,7 +378,12 @@ def db_op(cat, data=None, workspace=None):
         path.write_text(json.dumps(data, indent=4))
         return data
 
-    return json.loads(path.read_text() or "[]")
+    loaded = json.loads(path.read_text() or "[]")
+    if cat == "settings":
+        if not isinstance(loaded, dict):
+            loaded = {}
+        return {**get_defaults(), **loaded}
+    return loaded
 
 
 def safe_float(val, default):
@@ -393,6 +407,40 @@ def _is_resource_excluded(item):
     return bool(val)
 
 
+def _patient_display_name(record, fallback):
+    if not record:
+        return fallback
+    name = record.get("name") or record.get("fullName") or ""
+    if name and name.strip():
+        return name
+    parts = [
+        record.get("firstName") or "",
+        record.get("middleName") or "",
+        record.get("lastName") or "",
+    ]
+    combined = " ".join(part for part in parts if part).strip()
+    return combined or fallback
+
+
+def lookup_patient_display_name(p_name, workspace, default="Unnamed Crew"):
+    if not p_name:
+        return default
+    try:
+        patients = db_op("patients", workspace=workspace)
+    except Exception:
+        return default
+    rec = next(
+        (
+            p
+            for p in patients
+            if (p.get("id") and p.get("id") == p_name)
+            or (p.get("name") and p.get("name") == p_name)
+        ),
+        None,
+    )
+    return _patient_display_name(rec, p_name or default)
+
+
 def build_prompt(settings, mode, msg, p_name, workspace):
     rep_penalty = safe_float(settings.get("rep_penalty", 1.1) or 1.1, 1.1)
     mission_context = settings.get("mission_context", "")
@@ -421,19 +469,19 @@ def build_prompt(settings, mode, msg, p_name, workspace):
                 continue
             if not item_name:
                 continue
-            cat = (m.get("type") or "").strip().lower()
+            cat = (m.get("type") or "medication").strip().lower()
             key = (item_name or "").strip().lower()
             if not key:
                 continue
-            if cat == "medication":
+            if cat in {"medication", ""}:
                 pharma_items[key] = item_name
             elif cat == "consumable":
                 consumable_items[key] = item_name
             elif cat == "equipment":
                 equip_items[key] = item_name
             else:
-                # If no recognizable category, skip to avoid polluting lists
-                continue
+                # Default unknown types to medication so they are not dropped
+                pharma_items[key] = item_name
         pharma_list = [pharma_items[k] for k in sorted(pharma_items)]
         equip_list = [equip_items[k] for k in sorted(equip_items)]
         consumable_list = [consumable_items[k] for k in sorted(consumable_items)]
@@ -447,21 +495,7 @@ def build_prompt(settings, mode, msg, p_name, workspace):
             if tool_name:
                 tool_items.append(tool_name)
         tool_items.sort(key=lambda s: (s or "").lower())
-        tools = ", ".join(tool_items)
-
-        def _patient_display_name(record, fallback):
-            if not record:
-                return fallback
-            name = record.get("name") or record.get("fullName") or ""
-            if name and name.strip():
-                return name
-            parts = [
-                record.get("firstName") or "",
-                record.get("middleName") or "",
-                record.get("lastName") or "",
-            ]
-            combined = " ".join(part for part in parts if part).strip()
-            return combined or fallback
+        equipment_extra = ", ".join(tool_items)
 
         patient_record = next(
             (
@@ -475,20 +509,67 @@ def build_prompt(settings, mode, msg, p_name, workspace):
         p_hist = patient_record.get("history", "No records.")
         p_sex = patient_record.get("sex") or patient_record.get("gender") or "Unknown"
         p_birth = patient_record.get("birthdate") or "Unknown"
+        vaccines = patient_record.get("vaccines") or []
+
+        def _format_vaccines(vax_list):
+            if not isinstance(vax_list, list) or not vax_list:
+                return "No vaccines recorded."
+            formatted = []
+            for v in vax_list:
+                if not isinstance(v, dict):
+                    continue
+                parts = []
+                v_type = v.get("vaccineType") or "Vaccine"
+                date = v.get("dateAdministered")
+                dose = v.get("doseNumber")
+                trade = v.get("tradeNameManufacturer")
+                lot = v.get("lotNumber")
+                provider = v.get("provider")
+                provider_country = v.get("providerCountry")
+                next_due = v.get("nextDoseDue")
+                exp = v.get("expirationDate")
+                site = v.get("siteRoute")
+                reactions = v.get("reactions")
+                if date:
+                    parts.append(f"Date: {date}")
+                if dose:
+                    parts.append(f"Dose: {dose}")
+                if trade:
+                    parts.append(f"Trade/Manufacturer: {trade}")
+                if lot:
+                    parts.append(f"Lot: {lot}")
+                if provider:
+                    parts.append(f"Provider: {provider}")
+                if provider_country:
+                    parts.append(f"Provider Country: {provider_country}")
+                if next_due:
+                    parts.append(f"Next Dose Due: {next_due}")
+                if exp:
+                    parts.append(f"Expiration: {exp}")
+                if site:
+                    parts.append(f"Site/Route: {site}")
+                if reactions:
+                    parts.append(f"Reactions: {reactions}")
+                details = "; ".join(parts)
+                if details:
+                    formatted.append(f"{v_type} ({details})")
+                else:
+                    formatted.append(v_type)
+            return "; ".join(formatted) if formatted else "No vaccines recorded."
 
         prompt_sections = [
             f"MISSION CONTEXT: {mission_context}" if mission_context else "",
             f"TRIAGE INSTRUCTION:\n{settings.get('triage_instruction')}",
             "RESOURCES:\n"
             f"- Pharmaceuticals: {pharma_str or 'None listed'}\n"
-            f"- Medical Equipment: {equip_str or 'None listed'}\n"
-            f"- Consumables: {consumable_str or 'None listed'}\n"
-            f"- Tools: {tools or 'None listed'}",
+            f"- Medical Equipment: {equip_str or equipment_extra or 'None listed'}\n"
+            f"- Consumables: {consumable_str or 'None listed'}",
             "PATIENT:\n"
             f"- Name: {display_name}\n"
             f"- Sex: {p_sex}\n"
             f"- Date of Birth: {p_birth}\n"
-            f"- Medical History (profile): {p_hist or 'No records.'}",
+            f"- Medical History (profile): {p_hist or 'No records.'}\n"
+            f"- Vaccines: {_format_vaccines(vaccines)}",
             f"SITUATION:\n{msg}",
         ]
         prompt = "\n\n".join(section for section in prompt_sections if section.strip())
@@ -1394,6 +1475,7 @@ async def chat(request: Request, _=Depends(require_auth)):
         start_time = datetime.now()
         form = await request.form()
         msg = form.get("message")
+        user_msg_raw = msg
         p_name = form.get("patient")
         mode = form.get("mode")
         is_priv = form.get("private") == "true"
@@ -1454,15 +1536,25 @@ async def chat(request: Request, _=Depends(require_auth)):
 
         if not is_priv:
             h = db_op("history", workspace=workspace)
+            patient_display = (
+                lookup_patient_display_name(p_name, workspace, default="Unnamed Crew")
+                if mode == "triage"
+                else "Inquiry"
+            )
             h.append(
                 {
                     "id": datetime.now().isoformat(),
                     "date": datetime.now().strftime("%Y-%m-%d %H:%M"),
-                    "patient": p_name if mode == "triage" else "Inquiry",
+                    "patient": patient_display,
+                    "patient_id": p_name or "",
+                    "mode": mode,
                     "query": msg,
+                    "user_query": user_msg_raw,
                     "response": res,
                     "model": models["active_name"],
                     "duration_ms": elapsed_ms,
+                    "prompt": prompt,
+                    "injected_prompt": prompt,
                 }
             )
             db_op("history", h, workspace=workspace)

static/data/triage_samples.json

@@ -0,0 +1,602 @@
+[
+  {
+    "id": 1,
+    "situation": "Open Femur Fracture",
+    "chat_text": "One of the crew fell from the mast and their thigh is completely deformed with a bone sticking out. They are barely awake and breathing very fast. There is a lot of blood and they look incredibly pale.",
+    "responsive": "Drowsy",
+    "breathing": "Rapid/Shallow",
+    "pain": "10/10",
+    "main_problem": "Heavy bleeding/deformed thigh",
+    "temp": "36.2°C",
+    "circulation": "Pale, weak pulse, BP 90/60",
+    "cause": "Fall from mast during squall"
+  },
+  {
+    "id": 2,
+    "situation": "Tension Pneumothorax",
+    "chat_text": "He got hit hard in the chest by the boom and now he can't catch his breath. He’s struggling to breathe, his neck veins are bulging out, and his lips are turning blue.",
+    "responsive": "Alert/Anxious",
+    "breathing": "Struggling",
+    "pain": "8/10",
+    "main_problem": "One side of chest not moving",
+    "temp": "37.0°C",
+    "circulation": "Distended neck veins, low BP",
+    "cause": "Blown into shroud by boom"
+  },
+  {
+    "id": 3,
+    "situation": "Severe Scalp Laceration",
+    "chat_text": "A heavy block hit her in the head and blood is literally pulsing out in a spray. She’s awake but there’s a massive amount of bright red blood everywhere.",
+    "responsive": "Alert",
+    "breathing": "Normal",
+    "pain": "7/10",
+    "main_problem": "Arterial spurting from head",
+    "temp": "36.8°C",
+    "circulation": "Rapid pulse, BP normal",
+    "cause": "Hit by mainsheet block"
+  },
+  {
+    "id": 4,
+    "situation": "Traumatic Amputation",
+    "chat_text": "Her hand got sucked into the electric winch. Three fingers are gone and the stumps are bleeding uncontrollably. She’s passed out and her skin is cold and white.",
+    "responsive": "Unconscious",
+    "breathing": "Labored",
+    "pain": "N/A",
+    "main_problem": "Missing fingers (R hand)",
+    "temp": "35.5°C",
+    "circulation": "Massive hemorrhage, shock",
+    "cause": "Hand caught in electric winch"
+  },
+  {
+    "id": 5,
+    "situation": "Internal Hemorrhage",
+    "chat_text": "He was thrown against the cockpit table during a roll. His stomach is becoming very hard and bloated, he’s breathing fast, and he looks like he’s going into shock.",
+    "responsive": "Drowsy",
+    "breathing": "Fast",
+    "pain": "6/10",
+    "main_problem": "Distended/rigid abdomen",
+    "temp": "36.0°C",
+    "circulation": "Cold/clammy, BP dropping",
+    "cause": "Thrown against cockpit table"
+  },
+  {
+    "id": 6,
+    "situation": "Crush Injury (Foot)",
+    "chat_text": "An anchor fell on his foot. The pain is a 9 out of 10, his foot is turning blue and cold, and I can't find a pulse anywhere on his ankle.",
+    "responsive": "Normal",
+    "breathing": "Normal",
+    "pain": "9/10",
+    "main_problem": "Swollen, blue, no pulse in foot",
+    "temp": "37.2°C",
+    "circulation": "Good BP, peripheral blockage",
+    "cause": "Heavy anchor dropped on foot"
+  },
+  {
+    "id": 7,
+    "situation": "Flail Chest",
+    "chat_text": "He slammed his chest into a winch. Part of his ribcage is moving inward when he breathes in and outward when he breathes out. He’s in a lot of pain and struggling for air.",
+    "responsive": "Alert",
+    "breathing": "Very painful",
+    "pain": "9/10",
+    "main_problem": "Paradoxical chest movement",
+    "temp": "37.1°C",
+    "circulation": "Fast pulse",
+    "cause": "Chest slammed into winch"
+  },
+  {
+    "id": 8,
+    "situation": "Concussion/TBI",
+    "chat_text": "She hit her head on the deck. She’s very confused, keep throwing up, and one of her pupils is much larger than the other.",
+    "responsive": "Confused",
+    "breathing": "Normal",
+    "pain": "5/10",
+    "main_problem": "Repeated vomiting, pupil dilation",
+    "temp": "36.9°C",
+    "circulation": "BP 140/90 (Rising)",
+    "cause": "Slip on wet deck, head hit GRP"
+  },
+  {
+    "id": 9,
+    "situation": "Dislocated Shoulder",
+    "chat_text": "He reached for the rail during a big wave and his shoulder popped out. It looks completely misshapen and he can't move his arm at all.",
+    "responsive": "Alert",
+    "breathing": "Normal",
+    "pain": "8/10",
+    "main_problem": "Visual deformity, arm locked",
+    "temp": "37.0°C",
+    "circulation": "Normal",
+    "cause": "Reaching for rail during roll"
+  },
+  {
+    "id": 10,
+    "situation": "Impaled Object",
+    "chat_text": "The spinnaker pole shattered and a long, sharp piece of carbon fiber is stuck deep in his thigh. It’s not bleeding much but the object is still in there.",
+    "responsive": "Alert",
+    "breathing": "Normal",
+    "pain": "7/10",
+    "main_problem": "Shard of carbon fiber in thigh",
+    "temp": "36.8°C",
+    "circulation": "Steady, bleeding controlled",
+    "cause": "Shattered spinnaker pole"
+  },
+  {
+    "id": 11,
+    "situation": "Severe Hypothermia",
+    "chat_text": "We pulled him out of the water after 30 minutes. He’s stopped shivering, he’s mumbles when he speaks, and his body feels ice cold and stiff.",
+    "responsive": "Mumbling",
+    "breathing": "Very slow",
+    "pain": "None",
+    "main_problem": "Shivering stopped, rigid",
+    "temp": "31.0°C",
+    "circulation": "Barely palpable pulse",
+    "cause": "30 mins in 15°C water (MOB)"
+  },
+  {
+    "id": 12,
+    "situation": "Heat Stroke",
+    "chat_text": "He’s been working in the engine room and now he’s unconscious. His skin is red and bone dry, he’s having a seizure, and he feels like he's burning up.",
+    "responsive": "Unconscious",
+    "breathing": "Snoring",
+    "pain": "N/A",
+    "main_problem": "Hot, dry skin; seizures",
+    "temp": "41.1°C",
+    "circulation": "Tachycardia (140 bpm)",
+    "cause": "Engine room repair in tropics"
+  },
+  {
+    "id": 13,
+    "situation": "Saltwater Aspiration",
+    "chat_text": "She swallowed a lot of water when she fell overboard. She’s coughing constantly, gasping for air, and her lips look blue.",
+    "responsive": "Alert",
+    "breathing": "Gasping",
+    "pain": "6/10",
+    "main_problem": "Persistent coughing, blue lips",
+    "temp": "37.5°C",
+    "circulation": "Rapid pulse",
+    "cause": "Swallowed water during MOB"
+  },
+  {
+    "id": 14,
+    "situation": "Severe Dehydration",
+    "chat_text": "He’s been seasick for days and hasn't peed in 24 hours. His eyes are sunken in, he’s very weak, and he has a slight fever.",
+    "responsive": "Lethargic",
+    "breathing": "Normal",
+    "pain": "4/10",
+    "main_problem": "No urine for 24h, sunken eyes",
+    "temp": "38.2°C",
+    "circulation": "Weak pulse, very low BP",
+    "cause": "Chronic seasickness/vomiting"
+  },
+  {
+    "id": 15,
+    "situation": "2nd Degree Sunburn",
+    "chat_text": "He fell asleep on deck and has a massive sunburn. Almost half his body is covered in large blisters and he’s shaking even though he has a fever.",
+    "responsive": "Alert",
+    "breathing": "Normal",
+    "pain": "8/10",
+    "main_problem": "Blistering over 40% of body",
+    "temp": "38.5°C",
+    "circulation": "Shivers, mild hypotension",
+    "cause": "Fallen asleep on deck in doldrums"
+  },
+  {
+    "id": 16,
+    "situation": "Immersion Foot",
+    "chat_text": "His boots have been wet for four days straight. His feet are completely white, numb, and the skin is starting to peel off in chunks.",
+    "responsive": "Alert",
+    "breathing": "Normal",
+    "pain": "6/10",
+    "main_problem": "Feet white, numb, peeling",
+    "temp": "36.5°C",
+    "circulation": "Poor capillary refill",
+    "cause": "4 days in wet boots on watch"
+  },
+  {
+    "id": 17,
+    "situation": "Severe Hyponatremia",
+    "chat_text": "He’s been drinking gallons of water but eating no salt. Now he’s staggering around like he’s drunk and his speech is totally slurred.",
+    "responsive": "Confused",
+    "breathing": "Normal",
+    "pain": "2/10",
+    "main_problem": "Slurred speech, staggering",
+    "temp": "37.0°C",
+    "circulation": "Normal BP",
+    "cause": "Over-drinking water, no salt"
+  },
+  {
+    "id": 18,
+    "situation": "Deep Frostbite",
+    "chat_text": "We’ve been handling ice-cold lines and his fingers have turned hard and gray-black. He can't feel them at all.",
+    "responsive": "Alert",
+    "breathing": "Normal",
+    "pain": "3/10",
+    "main_problem": "Fingers hard, black/gray",
+    "temp": "35.8°C",
+    "circulation": "Poor circulation to hand",
+    "cause": "Hand handling icy lines"
+  },
+  {
+    "id": 19,
+    "situation": "Nitrogen Narcosis",
+    "chat_text": "He came up too fast after checking the hull. He’s acting very strangely, giggling, and seems totally confused about where he is.",
+    "responsive": "Giggling",
+    "breathing": "Fast",
+    "pain": "None",
+    "main_problem": "Irrational behavior/confusion",
+    "temp": "36.7°C",
+    "circulation": "Normal",
+    "cause": "Rapid ascent from hull check"
+  },
+  {
+    "id": 20,
+    "situation": "Lightning Strike",
+    "chat_text": "The boat was hit by lightning. He’s unconscious and not breathing. I can't find a pulse and there are weird burn marks on his skin.",
+    "responsive": "Unconscious",
+    "breathing": "Arrested",
+    "pain": "N/A",
+    "main_problem": "Cardiac arrest, \"feather\" burns",
+    "temp": "36.4°C",
+    "circulation": "No pulse (requires CPR)",
+    "cause": "Direct hit on mast during storm"
+  },
+  {
+    "id": 21,
+    "situation": "Acute Appendicitis",
+    "chat_text": "She has a 9 out of 10 pain in her lower right stomach. If I press down and let go, the pain is even worse. She also has a fever.",
+    "responsive": "Alert",
+    "breathing": "Guarded",
+    "pain": "9/10",
+    "main_problem": "Rebound tenderness lower R",
+    "temp": "38.9°C",
+    "circulation": "High BP from pain",
+    "cause": "Random/Bacterial"
+  },
+  {
+    "id": 22,
+    "situation": "Sepsis (Infected Wound)",
+    "chat_text": "An old coral cut on his leg has red streaks coming out of it. He’s shaking with chills, has a high fever, and his blood pressure seems very low.",
+    "responsive": "Drowsy",
+    "breathing": "Rapid",
+    "pain": "5/10",
+    "main_problem": "Red streaks, shaking chills",
+    "temp": "39.5°C",
+    "circulation": "BP 80/50 (Septic shock)",
+    "cause": "Uncleaned coral cut"
+  },
+  {
+    "id": 23,
+    "situation": "Anaphylaxis",
+    "chat_text": "He got bit by an insect and now his throat is swelling up. He’s wheezing, covered in hives, and looks like he’s about to pass out.",
+    "responsive": "Drowsy",
+    "breathing": "Wheezing",
+    "pain": "4/10",
+    "main_problem": "Swollen throat, hives",
+    "temp": "37.2°C",
+    "circulation": "BP dropping rapidly",
+    "cause": "Unknown insect bite/food"
+  },
+  {
+    "id": 24,
+    "situation": "Myocardial Infarction",
+    "chat_text": "He says it feels like an elephant is sitting on his chest. The pain is going down his left arm, he’s sweating, and his pulse feels irregular.",
+    "responsive": "Alert",
+    "breathing": "Shortness",
+    "pain": "9/10",
+    "main_problem": "Crushing chest pain/Left arm",
+    "temp": "37.0°C",
+    "circulation": "Irregular pulse, sweating",
+    "cause": "Clogged artery (Heart Attack)"
+  },
+  {
+    "id": 25,
+    "situation": "Diabetic Ketoacidosis",
+    "chat_text": "He’s very confused and his breath smells sweet, almost like fruit. He’s breathing very deeply and fast and says he’s incredibly thirsty.",
+    "responsive": "Confused",
+    "breathing": "Deep/Fast",
+    "pain": "3/10",
+    "main_problem": "Fruity breath, extreme thirst",
+    "temp": "37.4°C",
+    "circulation": "Weak pulse",
+    "cause": "Insulin pump failure"
+  },
+  {
+    "id": 26,
+    "situation": "Perforated Ulcer",
+    "chat_text": "He has a sudden, agonizing pain in his stomach. His belly feels as hard as a board and he’s pale and sweating.",
+    "responsive": "Alert",
+    "breathing": "Shallow",
+    "pain": "10/10",
+    "main_problem": "Sudden, board-like abdomen",
+    "temp": "37.8°C",
+    "circulation": "Shock signs",
+    "cause": "Long-term NSAID use (Advil)"
+  },
+  {
+    "id": 27,
+    "situation": "Kidney Stones",
+    "chat_text": "He’s in 10 out of 10 pain in his side and back. He’s pacing around because he can't get comfortable and there is blood in his urine.",
+    "responsive": "Alert",
+    "breathing": "Fast",
+    "pain": "10/10",
+    "main_problem": "Agonizing flank pain/blood",
+    "temp": "37.3°C",
+    "circulation": "Pacing around, high BP",
+    "cause": "Dehydration"
+  },
+  {
+    "id": 28,
+    "situation": "Acute Asthma Attack",
+    "chat_text": "She’s having a massive asthma attack. Her inhaler isn't working and I can't hear any air moving in her chest at all. Her lips are turning blue.",
+    "responsive": "Alert",
+    "breathing": "Silent",
+    "pain": "7/10",
+    "main_problem": "No air movement (Silent chest)",
+    "temp": "37.0°C",
+    "circulation": "Tachycardia",
+    "cause": "Mold in cabin/ventilation"
+  },
+  {
+    "id": 29,
+    "situation": "Ischemic Stroke",
+    "chat_text": "One side of his face is drooping and he can't move his right arm or leg. He’s awake but his blood pressure is extremely high.",
+    "responsive": "Alert",
+    "breathing": "Normal",
+    "pain": "2/10",
+    "main_problem": "Facial droop, R-side paralysis",
+    "temp": "36.8°C",
+    "circulation": "BP 180/110",
+    "cause": "Blood clot"
+  },
+  {
+    "id": 30,
+    "situation": "Status Epilepticus",
+    "chat_text": "He’s been having a violent seizure for over five minutes straight and it won't stop. His breathing is irregular and he’s turning red.",
+    "responsive": "Seizing",
+    "breathing": "Irregular",
+    "pain": "N/A",
+    "main_problem": "Continuous convulsions >5min",
+    "temp": "38.0°C",
+    "circulation": "Rapid pulse",
+    "cause": "Missed meds/High stress"
+  },
+  {
+    "id": 31,
+    "situation": "Carbon Monoxide",
+    "chat_text": "Everyone in the cabin is lethargic with a headache. One person has bright red skin and is breathing very slowly. We suspect an exhaust leak.",
+    "responsive": "Lethargic",
+    "breathing": "Slow",
+    "pain": "5/10",
+    "main_problem": "Cherry-red skin, headache",
+    "temp": "36.6°C",
+    "circulation": "Normal",
+    "cause": "Leaking heater/engine exhaust"
+  },
+  {
+    "id": 32,
+    "situation": "Ciguatera Poisoning",
+    "chat_text": "We ate a barracuda and now he’s acting weird. He says cold water feels hot to him, and his heart rate has dropped to 40 beats per minute.",
+    "responsive": "Alert",
+    "breathing": "Normal",
+    "pain": "6/10",
+    "main_problem": "Hot feels cold, cold feels hot",
+    "temp": "37.2°C",
+    "circulation": "Bradycardia (Slow pulse)",
+    "cause": "Eating reef fish (Barracuda)"
+  },
+  {
+    "id": 33,
+    "situation": "Box Jellyfish Sting",
+    "chat_text": "He was stung by a jellyfish and went into cardiac arrest almost immediately. There are massive red welts all over his chest and legs.",
+    "responsive": "Unconscious",
+    "breathing": "Arrested",
+    "pain": "10/10",
+    "main_problem": "Massive welts, heart failure",
+    "temp": "37.4°C",
+    "circulation": "Cardiac arrest signs",
+    "cause": "Swimming in doldrums"
+  },
+  {
+    "id": 34,
+    "situation": "Cellulitis",
+    "chat_text": "A small cut on her leg has turned into a massive, hot, red swelling that is spreading quickly. She has a high fever.",
+    "responsive": "Alert",
+    "breathing": "Normal",
+    "pain": "7/10",
+    "main_problem": "Leg hot, red, and swollen",
+    "temp": "39.0°C",
+    "circulation": "Fast pulse",
+    "cause": "Infected shaving cut"
+  },
+  {
+    "id": 35,
+    "situation": "Chemical Burn (Eyes)",
+    "chat_text": "Battery acid splashed directly into his eyes. He can't open them, he’s in 10 out of 10 pain, and his eyes look hazy and white.",
+    "responsive": "Alert",
+    "breathing": "Normal",
+    "pain": "10/10",
+    "main_problem": "Cannot open eyes, white haze",
+    "temp": "36.8°C",
+    "circulation": "Normal",
+    "cause": "Battery acid splash"
+  },
+  {
+    "id": 36,
+    "situation": "Aspiration Pneumonia",
+    "chat_text": "He’s been sick since he inhaled some vomit. He’s coughing up green gunk, has a high fever, and is struggling to breathe.",
+    "responsive": "Alert",
+    "breathing": "Labored",
+    "pain": "5/10",
+    "main_problem": "Productive cough (green)",
+    "temp": "39.2°C",
+    "circulation": "Low oxygen saturation",
+    "cause": "Vomit inhaled during storm"
+  },
+  {
+    "id": 37,
+    "situation": "Acute Urinary Retention",
+    "chat_text": "He’s in extreme pain because he hasn't been able to pee for hours. His lower stomach is hard and bulging.",
+    "responsive": "Alert",
+    "breathing": "Normal",
+    "pain": "9/10",
+    "main_problem": "Bladder distended, cannot pee",
+    "temp": "37.1°C",
+    "circulation": "High BP",
+    "cause": "Enlarged prostate"
+  },
+  {
+    "id": 38,
+    "situation": "Dental Abscess",
+    "chat_text": "His tooth is broken and now his entire face is swollen. His eye is starting to swell shut and he has a high fever.",
+    "responsive": "Alert",
+    "breathing": "Normal",
+    "pain": "8/10",
+    "main_problem": "Face swollen, eye closing",
+    "temp": "38.6°C",
+    "circulation": "Normal",
+    "cause": "Cracked tooth"
+  },
+  {
+    "id": 39,
+    "situation": "Pulmonary Embolism",
+    "chat_text": "He suddenly got a sharp pain in his chest and can't breathe. His lips are blue and he’s coughing up a little bit of blood.",
+    "responsive": "Alert",
+    "breathing": "Sharp pain",
+    "pain": "9/10",
+    "main_problem": "Sudden SOB, coughing blood",
+    "temp": "37.4°C",
+    "circulation": "Cyanosis (Blue lips)",
+    "cause": "DVT from long sitting/watch"
+  },
+  {
+    "id": 40,
+    "situation": "Bowel Obstruction",
+    "chat_text": "He hasn't been able to go to the bathroom or pass gas. Now he is actually vomiting stuff that smells like a bowel movement.",
+    "responsive": "Alert",
+    "breathing": "Normal",
+    "pain": "7/10",
+    "main_problem": "Fecal vomiting, no gas",
+    "temp": "37.6°C",
+    "circulation": "Low BP, dehydrated",
+    "cause": "Previous surgery/Adhesions"
+  },
+  {
+    "id": 41,
+    "situation": "Dengue Hemorrhagic",
+    "chat_text": "He has a high fever and his gums are bleeding. He’s covered in dark, blackish bruises and looks very weak.",
+    "responsive": "Drowsy",
+    "breathing": "Normal",
+    "pain": "7/10",
+    "main_problem": "Bleeding gums, black bruises",
+    "temp": "39.8°C",
+    "circulation": "Low BP (Shock)",
+    "cause": "Mosquito bite in Sumatra"
+  },
+  {
+    "id": 42,
+    "situation": "Malaria (Falciparum)",
+    "chat_text": "He’s totally confused and has a 40.5°C fever. His eyes look yellow and he’s breathing very fast.",
+    "responsive": "Confused",
+    "breathing": "Rapid",
+    "pain": "6/10",
+    "main_problem": "Cycling high fever, yellow eyes",
+    "temp": "40.5°C",
+    "circulation": "Tachycardia",
+    "cause": "Mosquito bite"
+  },
+  {
+    "id": 43,
+    "situation": "Giardia (Severe)",
+    "chat_text": "He has constant, explosive diarrhea that smells like sulfur. He’s becoming very dehydrated and lightheaded.",
+    "responsive": "Alert",
+    "breathing": "Normal",
+    "pain": "5/10",
+    "main_problem": "Explosive sulfurous diarrhea",
+    "temp": "37.5°C",
+    "circulation": "Orthostatic hypotension",
+    "cause": "Bad water tank hygiene"
+  },
+  {
+    "id": 44,
+    "situation": "Corneal Ulcer",
+    "chat_text": "His eye is bright red and filled with pus. He says it feels like there is sand in it and he can't look at any light.",
+    "responsive": "Alert",
+    "breathing": "Normal",
+    "pain": "9/10",
+    "main_problem": "Constant sand sensation, pus",
+    "temp": "36.8°C",
+    "circulation": "Normal",
+    "cause": "Contact lens left in too long"
+  },
+  {
+    "id": 45,
+    "situation": "Orchitis",
+    "chat_text": "He has sudden, 9 out of 10 pain in his groin. One side is swollen to the size of a grapefruit and he has a fever.",
+    "responsive": "Alert",
+    "breathing": "Normal",
+    "pain": "9/10",
+    "main_problem": "Scrotal swelling (grapefruit)",
+    "temp": "38.8°C",
+    "circulation": "Pain-induced high BP",
+    "cause": "Bacterial/STI"
+  },
+  {
+    "id": 46,
+    "situation": "Meningitis",
+    "chat_text": "He has a very high fever and a splitting headache. His neck is so stiff he can't touch his chin to his chest and light hurts his eyes.",
+    "responsive": "Lethargic",
+    "breathing": "Normal",
+    "pain": "9/10",
+    "main_problem": "Stiff neck, light sensitivity",
+    "temp": "40.1°C",
+    "circulation": "BP 100/60",
+    "cause": "Viral/Bacterial"
+  },
+  {
+    "id": 47,
+    "situation": "Staph (MRSA)",
+    "chat_text": "He has a huge, painful, pus-filled lump that looks like a spider bite. It’s hot to the touch and he has a fever.",
+    "responsive": "Alert",
+    "breathing": "Normal",
+    "pain": "6/10",
+    "main_problem": "\"Spider bite\" look, pus-filled",
+    "temp": "38.2°C",
+    "circulation": "Normal",
+    "cause": "Shared towels/gym gear"
+  },
+  {
+    "id": 48,
+    "situation": "Leptospirosis",
+    "chat_text": "His eyes are bright red, his skin looks yellow, and his calves are in a lot of pain. He has a high fever and low blood pressure.",
+    "responsive": "Alert",
+    "breathing": "Normal",
+    "pain": "8/10",
+    "main_problem": "Calf pain, jaundice, red eyes",
+    "temp": "39.4°C",
+    "circulation": "Low BP",
+    "cause": "Rat urine in bilge water"
+  },
+  {
+    "id": 49,
+    "situation": "Sea Urchin Granuloma",
+    "chat_text": "He stepped on a sea urchin and has over 20 spines stuck in his foot. His joints are starting to feel stiff and lock up.",
+    "responsive": "Alert",
+    "breathing": "Normal",
+    "pain": "4/10",
+    "main_problem": "20+ spines, joints locking",
+    "temp": "37.2°C",
+    "circulation": "Normal",
+    "cause": "Stepped on urchin in surf"
+  },
+  {
+    "id": 50,
+    "situation": "Ectopic Pregnancy",
+    "chat_text": "She has a sudden, ripping pain in her lower stomach and just fainted. She is very pale, cold, and her blood pressure is very low.",
+    "responsive": "Alert",
+    "breathing": "Fast",
+    "pain": "10/10",
+    "main_problem": "Ripping pelvic pain, fainting",
+    "temp": "36.5°C",
+    "circulation": "BP 85/40 (Internal bleed)",
+    "cause": "Ruptured fallopian tube"
+  }
+]

static/js/chat.js

@@ -6,9 +6,73 @@ let isProcessing = false;
 let currentMode = 'triage';
 const LAST_PROMPT_KEY = 'sailingmed:lastPrompt';
 const LAST_PATIENT_KEY = 'sailingmed:lastPatient';
+const LAST_CHAT_MODE_KEY = 'sailingmed:lastChatMode';
+const LOGGING_MODE_KEY = 'sailingmed:loggingOff';
 const PROMPT_PREVIEW_STATE_KEY = 'sailingmed:promptPreviewOpen';
 const PROMPT_PREVIEW_CONTENT_KEY = 'sailingmed:promptPreviewContent';
 const CHAT_STATE_KEY = 'sailingmed:chatState';
+let triageSamples = [];
+
+function escapeHtml(str) {
+    return (str || '')
+        .replace(/&/g, '&')
+        .replace(/</g, '&lt;')
+        .replace(/>/g, '&gt;')
+        .replace(/"/g, '&quot;')
+        .replace(/'/g, '&#39;');
+}
+
+async function loadTriageSamples() {
+    if (triageSamples.length) return triageSamples;
+    try {
+        const res = await fetch('/static/data/triage_samples.json', { cache: 'no-store' });
+        if (!res.ok) throw new Error(`Status ${res.status}`);
+        triageSamples = await res.json();
+        const select = document.getElementById('triage-sample-select');
+        if (select && Array.isArray(triageSamples)) {
+            triageSamples.forEach((s) => {
+                const opt = document.createElement('option');
+                opt.value = String(s.id);
+                opt.textContent = `${s.id}. ${s.situation}`;
+                select.appendChild(opt);
+            });
+        }
+    } catch (err) {
+        console.warn('Unable to load triage samples', err);
+    }
+    return triageSamples;
+}
+
+function setSelectValue(selectEl, value) {
+    if (!selectEl) return;
+    const match = Array.from(selectEl.options).find(o => o.value === value || o.textContent === value);
+    if (match) {
+        selectEl.value = match.value;
+        return;
+    }
+    const opt = new Option(value, value, true, true);
+    selectEl.add(opt);
+    selectEl.value = value;
+}
+
+function applyTriageSample(sampleId) {
+    if (!sampleId) return;
+    const sample = triageSamples.find((s) => String(s.id) === String(sampleId));
+    if (!sample) return;
+    const msgTextarea = document.getElementById('msg');
+    if (msgTextarea) {
+        msgTextarea.value = sample.chat_text || '';
+        msgTextarea.dispatchEvent(new Event('input', { bubbles: true }));
+    }
+    setSelectValue(document.getElementById('triage-consciousness'), sample.responsive || '');
+    setSelectValue(document.getElementById('triage-breathing-status'), sample.breathing || '');
+    setSelectValue(document.getElementById('triage-pain-level'), sample.pain || '');
+    setSelectValue(document.getElementById('triage-main-problem'), sample.main_problem || '');
+    setSelectValue(document.getElementById('triage-temperature'), sample.temp || '');
+    setSelectValue(document.getElementById('triage-circulation'), sample.circulation || '');
+    setSelectValue(document.getElementById('triage-cause'), sample.cause || '');
+    persistChatState();
+}
 
 function setupPromptInjectionPanel() {
     const promptHeader = document.getElementById('prompt-preview-header');
@@ -76,6 +140,21 @@ if (document.readyState !== 'loading') {
     document.addEventListener('DOMContentLoaded', () => applyChatState(currentMode), { once: true });
 }
 
+document.addEventListener('DOMContentLoaded', () => {
+    try {
+        const stored = localStorage.getItem(LOGGING_MODE_KEY);
+        if (stored === '1') {
+            isPrivate = true;
+        }
+    } catch (err) { /* ignore */ }
+    const btn = document.getElementById('priv-btn');
+    if (btn) {
+        btn.style.background = isPrivate ? 'var(--triage)' : '#333';
+        btn.style.border = isPrivate ? '2px solid #fff' : '1px solid #222';
+        btn.innerText = isPrivate ? 'LOGGING: OFF' : 'LOGGING: ON';
+    }
+});
+
 function updateUI() {
     const banner = document.getElementById('banner');
     const modeSelect = document.getElementById('mode-select');
@@ -207,6 +286,7 @@ function togglePriv() {
     btn.style.background = isPrivate ? 'var(--triage)' : '#333';
     btn.style.border = isPrivate ? '2px solid #fff' : '1px solid #222';
     btn.innerText = isPrivate ? 'LOGGING: OFF' : 'LOGGING: ON';
+    try { localStorage.setItem(LOGGING_MODE_KEY, isPrivate ? '1' : '0'); } catch (err) { /* ignore */ }
     updateUI();
 }
 
@@ -217,14 +297,16 @@ async function runChat(promptText = null, force28b = false) {
     isProcessing = true;
     lastPrompt = txt;
     const startTime = Date.now();
+    const blocker = document.getElementById('chat-blocker');
+    if (blocker) blocker.style.display = 'flex';
     
-    // Show loading indicator
-    const display = document.getElementById('display');
-    const loadingDiv = document.createElement('div');
-    loadingDiv.id = 'loading-indicator';
-    loadingDiv.className = 'loading-indicator';
-    loadingDiv.innerHTML = '🔄 Analyzing...';
-    display.appendChild(loadingDiv);
+        // Show loading indicator
+        const display = document.getElementById('display');
+        const loadingDiv = document.createElement('div');
+        loadingDiv.id = 'loading-indicator';
+        loadingDiv.className = 'loading-indicator';
+        loadingDiv.innerHTML = '🔄 Analyzing...';
+        display.appendChild(loadingDiv);
     display.scrollTop = display.scrollHeight;
     
     // Disable buttons
@@ -283,30 +365,77 @@ async function runChat(promptText = null, force28b = false) {
                 : (res.response || '').replace(/\n/g, '<br>');
             const meta = res.model ? `[${res.model}${res.duration_ms ? ` · ${Math.round(res.duration_ms)} ms` : ` · ${Math.round(durationMs)} ms`}]` : '';
             display.innerHTML += `<div class="response-block"><b>${meta}</b><br>${parsed}</div>`;
+            if (typeof loadData === 'function') {
+                loadData(); // refresh crew history/logs after a chat completes
+            }
         }
         
-        if (!promptText) {
-            document.getElementById('msg').value = '';
-        }
+        // Keep user-entered text so they can tweak/re-run
         persistChatState();
-        try { localStorage.setItem(LAST_PROMPT_KEY, lastPrompt); } catch (err) { /* ignore storage issues */ }
+        try {
+            localStorage.setItem(LAST_PROMPT_KEY, lastPrompt);
+            localStorage.setItem(LAST_CHAT_MODE_KEY, currentMode);
+        } catch (err) { /* ignore storage issues */ }
         if (display.lastElementChild) display.lastElementChild.scrollIntoView({behavior:'smooth'});
     } catch (error) {
         loadingDiv.remove();
         display.innerHTML += `<div class="response-block" style="border-left-color:var(--red);"><b>ERROR:</b> ${error.message}</div>`;
     } finally {
         isProcessing = false;
+        const blocker = document.getElementById('chat-blocker');
+        if (blocker) blocker.style.display = 'none';
         document.getElementById('run-btn').disabled = false;
         document.getElementById('repeat-btn').disabled = false;
     }
 }
 
-function repeatLast() {
-    if (lastPrompt) {
-        runChat(lastPrompt);
-    } else {
-        alert('No previous prompt to repeat');
+function restoreLast() {
+    // Restore last mode used
+    let modeToRestore = currentMode;
+    try {
+        const storedMode = localStorage.getItem(LAST_CHAT_MODE_KEY);
+        if (storedMode) modeToRestore = storedMode;
+    } catch (_) { /* ignore */ }
+    if (modeToRestore !== currentMode) {
+        setMode(modeToRestore);
+    }
+    const state = loadChatState();
+    const modeState = state[modeToRestore] || {};
+    const msgEl = document.getElementById('msg');
+    if (msgEl && typeof modeState.msg === 'string') {
+        msgEl.value = modeState.msg;
+        msgEl.focus();
+    }
+    if (modeToRestore === 'triage' && modeState.fields && typeof modeState.fields === 'object') {
+        Object.entries(modeState.fields).forEach(([id, val]) => {
+            const el = document.getElementById(id);
+            if (el) el.value = val;
+        });
+    }
+    // Restore patient selection
+    const patientSelect = document.getElementById('p-select');
+    if (patientSelect) {
+        const savedPatient = (() => {
+            try { return localStorage.getItem(LAST_PATIENT_KEY) || ''; } catch (_) { return ''; }
+        })();
+        if (savedPatient && Array.from(patientSelect.options).some(o => o.value === savedPatient)) {
+            patientSelect.value = savedPatient;
+        }
+    }
+    // Restore prompt preview if cached
+    const promptBox = document.getElementById('prompt-preview');
+    const promptHeader = document.getElementById('prompt-preview-header');
+    if (promptBox) {
+        try {
+            const cached = localStorage.getItem(PROMPT_PREVIEW_CONTENT_KEY);
+            if (cached) {
+                promptBox.value = cached;
+                promptBox.dataset.autofilled = 'false';
+                if (promptHeader) togglePromptPreviewArrow(promptHeader, true);
+            }
+        } catch (_) { /* ignore */ }
     }
+    alert('Last chat restored to editor. You can revise and resend.');
 }
 
 // Handle Enter key for submission
@@ -324,6 +453,7 @@ document.addEventListener('DOMContentLoaded', () => {
     }
     const savedPrompt = localStorage.getItem(LAST_PROMPT_KEY);
     if (savedPrompt) lastPrompt = savedPrompt;
+    loadTriageSamples().catch(() => {});
 
     // Debug current patient select state
     const pSelect = document.getElementById('p-select');
@@ -334,6 +464,109 @@ document.addEventListener('DOMContentLoaded', () => {
     }
 });
 
+async function reactivateChat(historyId) {
+    try {
+        const res = await fetch('/api/data/history', { credentials: 'same-origin' });
+        if (!res.ok) throw new Error(`History load failed (${res.status})`);
+        const data = await res.json();
+        const entry = Array.isArray(data) ? data.find((h) => h.id === historyId) : null;
+        if (!entry) {
+            alert('Unable to reactivate: history entry not found.');
+            return;
+        }
+        const sameThread = Array.isArray(data)
+            ? data
+                .filter((h) => {
+                    const samePatient = (entry.patient_id && h.patient_id === entry.patient_id) || (entry.patient && h.patient === entry.patient);
+                    const sameMode = (entry.mode || 'triage') === (h.mode || 'triage');
+                    return samePatient && sameMode;
+                })
+                .sort((a, b) => (a.date || '').localeCompare(b.date || ''))
+            : [entry];
+        const transcript = sameThread
+            .map((h, idx) => {
+                const title = h.date ? `Entry ${idx + 1} — ${h.date}` : `Entry ${idx + 1}`;
+                return `${title}\nQUERY:\n${h.query || ''}\nRESPONSE:\n${h.response || ''}`;
+            })
+            .join('\n\n----\n\n');
+        // Set mode based on stored value if present
+        if (entry.mode) {
+            setMode(entry.mode);
+        }
+        // Navigate to the correct tab
+        const triageTabBtn = document.querySelector('.tab.tab-triage');
+        if (triageTabBtn) {
+            triageTabBtn.click();
+        }
+        // Attempt to restore patient selection using patient_id first, then name
+        const patientSelect = document.getElementById('p-select');
+        if (patientSelect) {
+            let targetVal = entry.patient_id || '';
+            if (targetVal && Array.from(patientSelect.options).some((o) => o.value === targetVal)) {
+                patientSelect.value = targetVal;
+            } else if (entry.patient) {
+                const matchByName = Array.from(patientSelect.options).find((o) => o.textContent === entry.patient);
+                if (matchByName) patientSelect.value = matchByName.value;
+            }
+            try { localStorage.setItem(LAST_PATIENT_KEY, patientSelect.value || ''); } catch (err) { /* ignore */ }
+        }
+        // Restore chat area with previous exchange
+        const display = document.getElementById('display');
+        if (display) {
+            const queryHtml = escapeHtml(entry.query || '').replace(/\n/g, '<br>');
+            const respHtml = escapeHtml(entry.response || '').replace(/\n/g, '<br>');
+            display.innerHTML = `
+                <div class="response-block" style="border-left-color:var(--inquiry);">
+                    <b>Reactivated Chat</b><br>
+                    <div style="margin-top:6px;"><strong>Query:</strong><br>${queryHtml}</div>
+                    <div style="margin-top:6px;"><strong>Response:</strong><br>${respHtml}</div>
+                </div>`;
+            display.scrollTop = display.scrollHeight;
+        }
+        // Prefill message box with last query so user can continue
+        const msgTextarea = document.getElementById('msg');
+        if (msgTextarea) {
+            msgTextarea.value = entry.query || '';
+            msgTextarea.focus();
+        }
+        // Restore prompt (injected) view if available
+        const promptBox = document.getElementById('prompt-preview');
+        const promptHeader = document.getElementById('prompt-preview-header');
+        if (promptBox && entry.prompt) {
+            promptBox.value = entry.prompt;
+            promptBox.dataset.autofilled = 'false';
+            try { localStorage.setItem(PROMPT_PREVIEW_CONTENT_KEY, entry.prompt); } catch (err) { /* ignore */ }
+            if (promptHeader) {
+                togglePromptPreviewArrow(promptHeader, true);
+            }
+        }
+        // Inject transcript into prompt preview so the model sees prior context
+        if (promptBox) {
+            const transcriptBlock = transcript ? `Previous chat transcript:\n${transcript}` : '';
+            const combined = [transcriptBlock, promptBox.value].filter(Boolean).join('\n\n');
+            promptBox.value = combined;
+            promptBox.dataset.autofilled = 'false';
+            try { localStorage.setItem(PROMPT_PREVIEW_CONTENT_KEY, combined); } catch (err) { /* ignore */ }
+            if (promptHeader) {
+                togglePromptPreviewArrow(promptHeader, true);
+            }
+            const container = document.getElementById('prompt-preview-container');
+            if (container) container.style.display = 'block';
+        }
+        // Persist last prompt locally
+        if (entry.query) {
+            lastPrompt = entry.query;
+            try { localStorage.setItem(LAST_PROMPT_KEY, entry.query); } catch (err) { /* ignore */ }
+        }
+        alert('Chat restored. You can continue the conversation.');
+    } catch (err) {
+        alert(`Unable to reactivate chat: ${err.message}`);
+    }
+}
+
+window.reactivateChat = reactivateChat;
+window.applyTriageSample = applyTriageSample;
+
 function setMode(mode) {
     const target = mode === 'inquiry' ? 'inquiry' : 'triage';
     if (target === currentMode) return;

static/js/crew.js

@@ -2,6 +2,7 @@
 
 // Reuse the chat dropdown storage key without redefining the global constant
 const CREW_LAST_PATIENT_KEY = typeof LAST_PATIENT_KEY !== 'undefined' ? LAST_PATIENT_KEY : 'sailingmed:lastPatient';
+const DEFAULT_VACCINE_TYPES = [];
 
 function escapeHtml(str) {
     return (str || '')
@@ -125,11 +126,16 @@ function groupHistoryByPatient(history) {
         if (item && item.id) {
             historyStoreById[item.id] = item;
         }
-        let key = (item.patient || '').trim();
-        if (!key) key = 'Unnamed Crew';
-        if (key.toLowerCase() === 'inquiry') key = 'Inquiry History';
-        if (!map[key]) map[key] = [];
-        map[key].push(item);
+        const keys = [];
+        const patientName = (item.patient || '').trim();
+        if (patientName) keys.push(patientName);
+        if (item.patient_id) keys.push(`id:${item.patient_id}`);
+        if (!patientName && !item.patient_id) keys.push('Unnamed Crew');
+        if (patientName && patientName.toLowerCase() === 'inquiry') keys.push('Inquiry History');
+        keys.forEach((k) => {
+            if (!map[k]) map[k] = [];
+            map[k].push(item);
+        });
     });
     return map;
 }
@@ -154,6 +160,7 @@ function renderHistoryEntries(entries) {
                         <span class="toggle-label history-arrow" style="font-size:16px; margin-right:8px;">▸</span>
                         <span style="flex:1; white-space:nowrap; overflow:hidden; text-overflow:ellipsis; font-weight:600; font-size:13px;">${date || 'Entry'}${preview ? ' — ' + preview : ''}</span>
                         <div style="display:flex; gap:6px; align-items:center;">
+                            <button class="btn btn-sm history-entry-action" style="background:#3949ab; visibility:hidden;" onclick="event.stopPropagation(); reactivateChat('${item.id || ''}')">↩ Reactivate</button>
                             <button class="btn btn-sm history-entry-action" style="background:var(--inquiry); visibility:hidden;" onclick="event.stopPropagation(); exportHistoryItemById('${item.id || ''}')">Export</button>
                             <button class="btn btn-sm history-entry-action" style="background:var(--red); visibility:hidden;" onclick="event.stopPropagation(); deleteHistoryItemById('${item.id || ''}')">Delete</button>
                         </div>
@@ -190,14 +197,119 @@ function getHistoryForCrew(p, historyMap) {
     if (fullName) keys.push(fullName);
     if (p.name) keys.push(p.name);
     if (p.firstName || p.lastName) keys.push(`${p.firstName || ''} ${p.lastName || ''}`.trim());
+    if (p.id) keys.push(`id:${p.id}`);
     for (const k of keys) {
         if (historyMap[k]) return historyMap[k];
     }
     return [];
 }
 
+function getVaccineOptions(settings = {}) {
+    const raw = Array.isArray(settings.vaccine_types) ? settings.vaccine_types : DEFAULT_VACCINE_TYPES;
+    const seen = new Set();
+    return raw
+        .map((v) => (typeof v === 'string' ? v.trim() : ''))
+        .filter((v) => !!v)
+        .filter((v) => {
+            const key = v.toLowerCase();
+            if (seen.has(key)) return false;
+            seen.add(key);
+            return true;
+        });
+}
+
+function renderVaccineDetails(v) {
+    const fields = [
+        ['Vaccine Type/Disease', v.vaccineType],
+        ['Date Administered', v.dateAdministered],
+        ['Dose Number', v.doseNumber],
+        ['Next Dose Due Date', v.nextDoseDue],
+        ['Trade Name & Manufacturer', v.tradeNameManufacturer],
+        ['Lot/Batch Number', v.lotNumber],
+        ['Administering Clinic/Provider', v.provider],
+        ['Clinic/Provider Country', v.providerCountry],
+        ['Expiration Date (dose)', v.expirationDate],
+        ['Site & Route', v.siteRoute],
+        ['Allergic Reactions', v.reactions],
+        ['Remarks', v.remarks],
+    ];
+    const rows = fields
+        .filter(([, val]) => val)
+        .map(([label, val]) => `<div><strong>${escapeHtml(label)}:</strong> ${escapeHtml(val)}</div>`)
+        .join('');
+    return rows || '<div style="color:#666;">No details recorded for this dose.</div>';
+}
+
+function renderVaccineList(vaccines = [], crewId) {
+    if (!Array.isArray(vaccines) || vaccines.length === 0) {
+        return '<div style="font-size:12px; color:#666;">No vaccines recorded.</div>';
+    }
+    return vaccines
+        .map((v) => {
+            const vid = escapeHtml(v.id || '');
+            const label = escapeHtml(v.vaccineType || 'Vaccine');
+            const date = escapeHtml(v.dateAdministered || '');
+            return `
+                <div class="collapsible" style="margin-bottom:8px;">
+                    <div class="col-header crew-med-header" onclick="toggleCrewSection(this)" style="justify-content:flex-start; background:#fff;">
+                        <span class="dev-tag">dev:crew-vax-entry</span>
+                        <span class="toggle-label history-arrow" style="font-size:16px; margin-right:8px;">▸</span>
+                        <span style="flex:1; font-weight:600; font-size:13px; white-space:nowrap; overflow:hidden; text-overflow:ellipsis;">${label}${date ? ' — ' + date : ''}</span>
+                        <button onclick="event.stopPropagation(); deleteVaccine('${crewId}', '${vid}')" class="btn btn-sm history-action-btn" style="background:var(--red); visibility:hidden;">🗑 Delete</button>
+                    </div>
+                    <div class="col-body" style="padding:10px; display:none; font-size:12px; background:#f9fbff; border:1px solid #e0e7ff; border-top:none;">
+                        ${renderVaccineDetails(v)}
+                    </div>
+                </div>`;
+        })
+        .join('');
+}
+
+function clearVaccineInputs(crewId) {
+    const ids = [
+        `vx-type-${crewId}`,
+        `vx-type-other-${crewId}`,
+        `vx-date-${crewId}`,
+        `vx-dose-${crewId}`,
+        `vx-trade-${crewId}`,
+        `vx-lot-${crewId}`,
+        `vx-provider-${crewId}`,
+        `vx-provider-country-${crewId}`,
+        `vx-next-${crewId}`,
+        `vx-exp-${crewId}`,
+        `vx-site-${crewId}`,
+        `vx-remarks-${crewId}`,
+    ];
+    ids.forEach((id) => {
+        const el = document.getElementById(id);
+        if (el) {
+            el.value = '';
+            if (id.includes('type-other')) {
+                el.style.display = 'none';
+            }
+        }
+    });
+    const rx = document.getElementById(`vx-reactions-${crewId}`);
+    if (rx) rx.value = '';
+    const typeSelect = document.getElementById(`vx-type-${crewId}`);
+    if (typeSelect) typeSelect.value = '';
+}
+
+function handleVaccineTypeChange(crewId) {
+    const select = document.getElementById(`vx-type-${crewId}`);
+    const other = document.getElementById(`vx-type-other-${crewId}`);
+    if (!select || !other) return;
+    const showOther = select.value === '__other__';
+    other.style.display = showOther ? 'block' : 'none';
+    if (!showOther) {
+        other.value = '';
+    } else {
+        other.focus();
+    }
+}
+
 // Load crew data for both medical and vessel/crew info
-function loadCrewData(data, history = []) {
+function loadCrewData(data, history = [], settings = {}) {
     if (!Array.isArray(data)) {
         console.warn('loadCrewData expected array, got', data);
         return;
@@ -318,6 +430,10 @@ function loadCrewData(data, history = []) {
         const ageStr = calculateAge(p.birthdate);
         const posInfo = p.position ? ` • ${p.position}` : '';
         const info = `${displayName}${ageStr}${posInfo}`;
+        const vaccines = Array.isArray(p.vaccines) ? p.vaccines : [];
+        const vaccineOptions = getVaccineOptions(settings);
+        const vaccineOptionMarkup = vaccineOptions.map((opt) => `<option value="${escapeHtml(opt)}">${escapeHtml(opt)}</option>`).join('');
+        const vaccineList = renderVaccineList(vaccines, p.id);
         
         // Check if crew has data to determine default collapse state
         const hasData = p.firstName && p.lastName && p.citizenship;
@@ -387,18 +503,54 @@ function loadCrewData(data, history = []) {
                 <div style="margin-bottom:8px; font-size:13px;">
                     <input type="text" id="phone-${p.id}" value="${p.phoneNumber || ''}" placeholder="Cell/WhatsApp Number" onchange="autoSaveProfile('${p.id}')" style="padding:5px; width:100%;">
                 </div>
-                <div style="display:grid; grid-template-columns: 1fr 1fr; gap:12px; margin-bottom:8px;">
-                    <div style="border:1px solid #ddd; padding:8px; border-radius:4px; background:#f9f9f9;">
-                        <label style="margin-bottom:4px; display:block; font-weight:bold; font-size:11px;">Passport Photo:</label>
-                        ${p.passportPhoto ? (p.passportPhoto.startsWith('data:image/') ? `<div style="margin-bottom:4px;"><img src="${p.passportPhoto}" style="max-width:100%; max-height:120px; border:1px solid #ccc; border-radius:4px; cursor:pointer;" onclick="window.open('${p.passportPhoto}', '_blank')"><div style="margin-top:4px;"><button onclick="deleteDocument('${p.id}', 'passportPhoto')" style="background:var(--red); color:white; border:none; padding:2px 8px; border-radius:3px; cursor:pointer; font-size:10px;">🗑 Delete</button></div></div>` : `<div style="margin-bottom:4px;"><a href="${p.passportPhoto}" target="_blank" style="color:var(--inquiry); font-size:11px;">📎 View PDF</a> | <button onclick="deleteDocument('${p.id}', 'passportPhoto')" style="background:none; border:none; color:var(--red); cursor:pointer; font-size:10px;">🗑</button></div>`) : ''}
-                        <input type="file" id="pp-${p.id}" accept="image/*,.pdf" onchange="uploadDocument('${p.id}', 'passportPhoto', this)" style="font-size:10px; width:100%;">
+                    <div style="display:grid; grid-template-columns: 1fr 1fr; gap:12px; margin-bottom:8px;">
+                        <div style="border:1px solid #ddd; padding:8px; border-radius:4px; background:#f9f9f9;">
+                            <label style="margin-bottom:4px; display:block; font-weight:bold; font-size:11px;">Passport Photo:</label>
+                            ${p.passportPhoto ? (p.passportPhoto.startsWith('data:image/') ? `<div style="margin-bottom:4px;"><img src="${p.passportPhoto}" style="max-width:100%; max-height:120px; border:1px solid #ccc; border-radius:4px; cursor:pointer;" onclick="window.open('${p.passportPhoto}', '_blank')"><div style="margin-top:4px;"><button onclick="deleteDocument('${p.id}', 'passportPhoto')" style="background:var(--red); color:white; border:none; padding:2px 8px; border-radius:3px; cursor:pointer; font-size:10px;">🗑 Delete</button></div></div>` : `<div style="margin-bottom:4px;"><a href="${p.passportPhoto}" target="_blank" style="color:var(--inquiry); font-size:11px;">📎 View PDF</a> | <button onclick="deleteDocument('${p.id}', 'passportPhoto')" style="background:none; border:none; color:var(--red); cursor:pointer; font-size:10px;">🗑</button></div>`) : ''}
+                            <input type="file" id="pp-${p.id}" accept="image/*,.pdf" onchange="uploadDocument('${p.id}', 'passportPhoto', this)" style="font-size:10px; width:100%;">
+                        </div>
+                        <div style="border:1px solid #ddd; padding:8px; border-radius:4px; background:#f9f9f9;">
+                            <label style="margin-bottom:4px; display:block; font-weight:bold; font-size:11px;">Passport Page Photo:</label>
+                            ${p.passportPage ? (p.passportPage.startsWith('data:image/') ? `<div style="margin-bottom:4px;"><img src="${p.passportPage}" style="max-width:100%; max-height:120px; border:1px solid #ccc; border-radius:4px; cursor:pointer;" onclick="window.open('${p.passportPage}', '_blank')"><div style="margin-top:4px;"><button onclick="deleteDocument('${p.id}', 'passportPage')" style="background:var(--red); color:white; border:none; padding:2px 8px; border-radius:3px; cursor:pointer; font-size:10px;">🗑 Delete</button></div></div>` : `<div style="margin-bottom:4px;"><a href="${p.passportPage}" target="_blank" style="color:var(--inquiry); font-size:11px;">📎 View PDF</a> | <button onclick="deleteDocument('${p.id}', 'passportPage')" style="background:none; border:none; color:var(--red); cursor:pointer; font-size:10px;">🗑</button></div>`) : ''}
+                            <input type="file" id="ppg-${p.id}" accept="image/*,.pdf" onchange="uploadDocument('${p.id}', 'passportPage', this)" style="font-size:10px; width:100%;">
+                        </div>
                     </div>
-                    <div style="border:1px solid #ddd; padding:8px; border-radius:4px; background:#f9f9f9;">
-                        <label style="margin-bottom:4px; display:block; font-weight:bold; font-size:11px;">Passport Page Photo:</label>
-                        ${p.passportPage ? (p.passportPage.startsWith('data:image/') ? `<div style="margin-bottom:4px;"><img src="${p.passportPage}" style="max-width:100%; max-height:120px; border:1px solid #ccc; border-radius:4px; cursor:pointer;" onclick="window.open('${p.passportPage}', '_blank')"><div style="margin-top:4px;"><button onclick="deleteDocument('${p.id}', 'passportPage')" style="background:var(--red); color:white; border:none; padding:2px 8px; border-radius:3px; cursor:pointer; font-size:10px;">🗑 Delete</button></div></div>` : `<div style="margin-bottom:4px;"><a href="${p.passportPage}" target="_blank" style="color:var(--inquiry); font-size:11px;">📎 View PDF</a> | <button onclick="deleteDocument('${p.id}', 'passportPage')" style="background:none; border:none; color:var(--red); cursor:pointer; font-size:10px;">🗑</button></div>`) : ''}
-                        <input type="file" id="ppg-${p.id}" accept="image/*,.pdf" onchange="uploadDocument('${p.id}', 'passportPage', this)" style="font-size:10px; width:100%;">
+                    <div class="collapsible" style="margin-top:12px;">
+                        <div class="col-header crew-med-header" onclick="toggleCrewSection(this)" style="background:#fff6e8; border:1px solid #f0d9a8; justify-content:flex-start;">
+                            <span class="dev-tag">dev:crew-vax-shell</span>
+                            <span class="toggle-label history-arrow" style="font-size:18px; margin-right:8px;">▸</span>
+                            <span style="font-weight:700;">Crew Vaccines</span>
+                            <span style="font-size:12px; color:#6a5b3a; margin-left:8px;">${vaccines.length} recorded</span>
+                        </div>
+                        <div class="col-body" style="padding:10px; background:#fffdf7; border:1px solid #f0d9a8; border-top:none; display:none;">
+                            <div class="dev-tag" style="margin-bottom:6px;">dev:crew-vax-form</div>
+                            <div style="display:grid; grid-template-columns: repeat(auto-fit, minmax(220px, 1fr)); gap:8px; margin-bottom:8px; font-size:12px;">
+                                <div style="grid-column: span 2;">
+                                    <label style="font-weight:700; font-size:12px;">Vaccine Type/Disease *</label>
+                                    <select id="vx-type-${p.id}" onchange="handleVaccineTypeChange('${p.id}')" style="width:100%; padding:6px;">
+                                        <option value="">Select or choose Other…</option>
+                                        ${vaccineOptionMarkup}
+                                        <option value="__other__">Other (type below)</option>
+                                    </select>
+                                    <input id="vx-type-other-${p.id}" type="text" style="width:100%; padding:6px; margin-top:6px; display:none;" placeholder="Enter other vaccine type">
+                                </div>
+                                <div><label style="font-weight:700; font-size:12px;">Date Administered</label><input id="vx-date-${p.id}" type="text" style="width:100%; padding:6px;" placeholder="26-Jan-2026"></div>
+                                <div><label style="font-weight:700; font-size:12px;">Dose Number</label><input id="vx-dose-${p.id}" type="text" style="width:100%; padding:6px;" placeholder="Dose 1 of 3"></div>
+                                <div><label style="font-weight:700; font-size:12px;">Next Dose Due Date</label><input id="vx-next-${p.id}" type="text" style="width:100%; padding:6px;" placeholder="e.g., 10-Feb-2026"></div>
+                                <div style="grid-column: span 2;"><label style="font-weight:700; font-size:12px;">Trade Name & Manufacturer</label><input id="vx-trade-${p.id}" type="text" style="width:100%; padding:6px;" placeholder="Adacel by Sanofi Pasteur"></div>
+                                <div><label style="font-weight:700; font-size:12px;">Lot/Batch Number</label><input id="vx-lot-${p.id}" type="text" style="width:100%; padding:6px;" placeholder="Batch #12345X"></div>
+                                <div><label style="font-weight:700; font-size:12px;">Administering Clinic/Provider</label><input id="vx-provider-${p.id}" type="text" style="width:100%; padding:6px;" placeholder="Harbor Medical Clinic, Dock 3"></div>
+                                <div><label style="font-weight:700; font-size:12px;">Clinic/Provider Country</label><input id="vx-provider-country-${p.id}" type="text" style="width:100%; padding:6px;" placeholder="Spain"></div>
+                                <div><label style="font-weight:700; font-size:12px;">Expiration Date (dose)</label><input id="vx-exp-${p.id}" type="text" style="width:100%; padding:6px;" placeholder="e.g., 30-Dec-2026"></div>
+                                <div><label style="font-weight:700; font-size:12px;">Site & Route</label><input id="vx-site-${p.id}" type="text" style="width:100%; padding:6px;" placeholder="Left Arm - IM"></div>
+                                <div style="grid-column: span 1;"><label style="font-weight:700; font-size:12px;">Allergic Reactions</label><textarea id="vx-reactions-${p.id}" style="width:100%; padding:6px; min-height:60px;" placeholder="Redness, fever, swelling..."></textarea></div>
+                                <div style="grid-column: span 1;"><label style="font-weight:700; font-size:12px;">Remarks</label><textarea id="vx-remarks-${p.id}" style="width:100%; padding:6px; min-height:60px;" placeholder="Notes, special handling, country requirements, follow-up instructions..."></textarea></div>
+                            </div>
+                            <button onclick="addVaccine('${p.id}')" class="btn btn-sm" style="background:var(--dark); width:100%;"><span class="dev-tag">dev:crew-vax-add</span>+ Add Vaccine</button>
+                            <div class="dev-tag" style="margin:10px 0 6px;">dev:crew-vax-list</div>
+                            <div id="vax-list-${p.id}">${vaccineList}</div>
+                        </div>
                     </div>
-                </div>
                     </div>
                 </div>
             </div>
@@ -464,6 +616,7 @@ async function addCrew() {
         emergencyContactEmail: emergencyContactEmail,
         emergencyContactNotes: emergencyContactNotes,
         phoneNumber: phoneNumber,
+        vaccines: [],
         passportPhoto: '',
         passportPage: '',
         history: '' 
@@ -494,6 +647,75 @@ async function addCrew() {
     loadData();
 }
 
+async function addVaccine(crewId) {
+    const getVal = (suffix) => document.getElementById(`vx-${suffix}-${crewId}`)?.value.trim() || '';
+    const typeSelect = document.getElementById(`vx-type-${crewId}`);
+    const selectedType = typeSelect ? typeSelect.value : '';
+    const otherVal = getVal('type-other');
+    const vaccineType = selectedType === '__other__' ? otherVal : selectedType;
+    if (!vaccineType) {
+        alert('Please enter Vaccine Type/Disease');
+        if (selectedType === '__other__') {
+            const otherField = document.getElementById(`vx-type-other-${crewId}`);
+            if (otherField) otherField.focus();
+        } else if (typeSelect) {
+            typeSelect.focus();
+        }
+        return;
+    }
+    const entry = {
+        id: `vax-${Date.now()}`,
+        vaccineType,
+        dateAdministered: getVal('date'),
+        doseNumber: getVal('dose'),
+        tradeNameManufacturer: getVal('trade'),
+        lotNumber: getVal('lot'),
+        provider: getVal('provider'),
+        providerCountry: getVal('provider-country'),
+        nextDoseDue: getVal('next'),
+        expirationDate: getVal('exp'),
+        siteRoute: getVal('site'),
+        reactions: document.getElementById(`vx-reactions-${crewId}`)?.value.trim() || '',
+        remarks: document.getElementById(`vx-remarks-${crewId}`)?.value.trim() || ''
+    };
+
+    const data = await (await fetch('/api/data/patients', { credentials: 'same-origin' })).json();
+    const patient = data.find((p) => p.id === crewId);
+    if (!patient) {
+        alert('Crew member not found.');
+        return;
+    }
+    patient.vaccines = Array.isArray(patient.vaccines) ? patient.vaccines : [];
+    patient.vaccines.push(entry);
+    await fetch('/api/data/patients', {
+        method: 'POST',
+        headers: { 'Content-Type': 'application/json' },
+        body: JSON.stringify(data),
+        credentials: 'same-origin',
+    });
+    clearVaccineInputs(crewId);
+    loadData();
+}
+
+async function deleteVaccine(crewId, vaccineId) {
+    if (!vaccineId) return;
+    if (!confirm('Delete this vaccine record?')) return;
+    const data = await (await fetch('/api/data/patients', { credentials: 'same-origin' })).json();
+    const patient = data.find((p) => p.id === crewId);
+    if (!patient || !Array.isArray(patient.vaccines)) {
+        alert('Vaccine record not found.');
+        return;
+    }
+    patient.vaccines = patient.vaccines.filter((v) => v.id !== vaccineId);
+    await fetch('/api/data/patients', {
+        method: 'POST',
+        headers: { 'Content-Type': 'application/json' },
+        body: JSON.stringify(data),
+        credentials: 'same-origin',
+    });
+    loadData();
+}
+
 // Auto-save profile (debounced to prevent excessive saves)
 let saveTimers = {};
 async function autoSaveProfile(id) {
@@ -826,6 +1048,12 @@ async function loadVesselInfo() {
     setVal('vessel-tonnage', v.tonnage);
     setVal('vessel-net-tonnage', v.netTonnage);
     setVal('vessel-mmsi', v.mmsi);
+    setVal('vessel-hull-number', v.hullNumber);
+    setVal('vessel-starboard-engine', v.starboardEngine);
+    setVal('vessel-starboard-sn', v.starboardEngineSn);
+    setVal('vessel-port-engine', v.portEngine);
+    setVal('vessel-port-sn', v.portEngineSn);
+    setVal('vessel-rib-sn', v.ribSn);
 }
 
 async function saveVesselInfo() {
@@ -837,7 +1065,13 @@ async function saveVesselInfo() {
         callSign: document.getElementById('vessel-callsign')?.value || '',
         tonnage: document.getElementById('vessel-tonnage')?.value || '',
         netTonnage: document.getElementById('vessel-net-tonnage')?.value || '',
-        mmsi: document.getElementById('vessel-mmsi')?.value || ''
+        mmsi: document.getElementById('vessel-mmsi')?.value || '',
+        hullNumber: document.getElementById('vessel-hull-number')?.value || '',
+        starboardEngine: document.getElementById('vessel-starboard-engine')?.value || '',
+        starboardEngineSn: document.getElementById('vessel-starboard-sn')?.value || '',
+        portEngine: document.getElementById('vessel-port-engine')?.value || '',
+        portEngineSn: document.getElementById('vessel-port-sn')?.value || '',
+        ribSn: document.getElementById('vessel-rib-sn')?.value || ''
     };
     await fetch('/api/data/vessel', {method:'POST', headers:{'Content-Type':'application/json'}, body:JSON.stringify(v), credentials:'same-origin'});
     alert('Vessel information saved.');

static/js/equipment.js

@@ -1005,6 +1005,10 @@ async function addMedicationItem() {
         return;
     }
     const category = getNewEquipmentVal('med-new-cat') || 'Medication';
+    const sortSel = document.getElementById('med-new-sort');
+    const sortCustom = document.getElementById('med-new-sort-custom');
+    const sortCategory = sortSel ? (sortSel.value === 'Other' ? (sortCustom?.value || '') : (sortSel.value || '')) : '';
+    const verified = !!document.getElementById('med-new-verified')?.checked;
     const exclude = document.getElementById('med-new-exclude')?.checked || false;
     const newId = `med-${Date.now()}`;
     const newMed = {
@@ -1024,6 +1028,8 @@ async function addMedicationItem() {
         primaryIndication: '',
         allergyWarnings: '',
         standardDosage: '',
+        sortCategory,
+        verified,
         photos: [],
         purchaseHistory: [],
         source: 'manual_entry',
@@ -1044,6 +1050,12 @@ async function addMedicationItem() {
 
     ['med-new-name','med-new-cat','med-new-loc','med-new-subloc','med-new-parent','med-new-exp','med-new-inspect','med-new-batt','med-new-cal','med-new-qty','med-new-par','med-new-sup','med-new-notes']
         .forEach((id) => { const el = document.getElementById(id); if (el) el.value = ''; });
+    const sortSelect = document.getElementById('med-new-sort');
+    const sortCustomInput = document.getElementById('med-new-sort-custom');
+    if (sortSelect) sortSelect.value = '';
+    if (sortCustomInput) { sortCustomInput.value = ''; sortCustomInput.style.display = 'none'; }
+    const medVerified = document.getElementById('med-new-verified');
+    if (medVerified) medVerified.checked = false;
     const medExclude = document.getElementById('med-new-exclude');
     if (medExclude) medExclude.checked = false;
     const typeSel = document.getElementById('med-new-type');

static/js/main.js

@@ -146,18 +146,26 @@ async function showTab(e, n) {
 async function loadData() {
     console.log('[DEBUG] loadData: start');
     try {
-        const [res, historyRes] = await Promise.all([
+        const [res, historyRes, settingsRes] = await Promise.all([
             fetch('/api/data/patients', { credentials: 'same-origin' }),
             fetch('/api/data/history', { credentials: 'same-origin' }),
+            fetch('/api/data/settings', { credentials: 'same-origin' })
         ]);
-        console.log('[DEBUG] loadData: status patients', res.status, 'history', historyRes.status);
+        console.log('[DEBUG] loadData: status patients', res.status, 'history', historyRes.status, 'settings', settingsRes.status);
         if (!res.ok) throw new Error(`Patients request failed: ${res.status}`);
         if (!historyRes.ok) throw new Error(`History request failed: ${historyRes.status}`);
+        if (!settingsRes.ok) console.warn('Settings request failed:', settingsRes.status);
         const data = await res.json();
         const history = await historyRes.json();
+        let settings = {};
+        try {
+            settings = await settingsRes.json();
+        } catch (err) {
+            console.warn('Settings parse failed, using defaults.', err);
+        }
         console.log('[DEBUG] loadData: patients length', Array.isArray(data) ? data.length : 'n/a');
         if (!Array.isArray(data)) throw new Error('Unexpected patients data format');
-        loadCrewData(data, Array.isArray(history) ? history : []);
+        loadCrewData(data, Array.isArray(history) ? history : [], settings || {});
     } catch (err) {
         console.error('[DEBUG] Failed to load crew data', err);
         // Gracefully clear UI to avoid JS errors

static/js/pharmacy.js

@@ -117,6 +117,28 @@ function getTextareaHeights() {
     return map;
 }
 
+function handleSortCategoryChange(id) {
+    const select = document.getElementById(`sort-${id}`);
+    const custom = document.getElementById(`sort-custom-${id}`);
+    if (!select || !custom) return;
+    const val = select.value;
+    const isCustom = val === 'Other';
+    custom.style.display = isCustom ? 'block' : 'none';
+    if (!isCustom) {
+        custom.value = '';
+    }
+    scheduleSaveMedication(id, true);
+}
+
+function toggleCustomSortField() {
+    const sel = document.getElementById('med-new-sort');
+    const custom = document.getElementById('med-new-sort-custom');
+    if (!sel || !custom) return;
+    const isCustom = sel.value === 'Other';
+    custom.style.display = isCustom ? 'block' : 'none';
+    if (!isCustom) custom.value = '';
+}
+
 function ensurePurchaseDefaults(p) {
     return {
         id: p.id || `ph-${Date.now()}-${Math.floor(Math.random() * 1000)}`,
@@ -145,6 +167,8 @@ function ensurePharmacyDefaults(item) {
         primaryIndication: item.primaryIndication || '',
         allergyWarnings: item.allergyWarnings || '',
         standardDosage: item.standardDosage || '',
+        sortCategory: item.sortCategory || '',
+        verified: !!item.verified,
         photos: Array.isArray(item.photos) ? item.photos : [],
         purchaseHistory: Array.isArray(item.purchaseHistory)
             ? item.purchaseHistory.map(ensurePurchaseDefaults)
@@ -155,12 +179,12 @@ function ensurePharmacyDefaults(item) {
     };
 }
 
-function scheduleSaveMedication(id) {
+function scheduleSaveMedication(id, rerender = false) {
     if (pharmacySaveTimers[id]) {
         clearTimeout(pharmacySaveTimers[id]);
     }
     pharmacySaveTimers[id] = setTimeout(() => {
-        saveMedication(id);
+        saveMedication(id, rerender);
     }, 400);
 }
 
@@ -180,13 +204,17 @@ function getMedicationDisplayName(med) {
 function sortPharmacyItems(items) {
     const list = Array.isArray(items) ? [...items] : [];
     const sortSel = document.getElementById('pharmacy-sort');
-    const mode = (sortSel && sortSel.value) || 'generic';
+    const mode = (sortSel && sortSel.value) || 'sortCategory';
     const byText = (a, b, pathA, pathB) => {
         const va = (pathA || '').toLowerCase();
         const vb = (pathB || '').toLowerCase();
         return va.localeCompare(vb);
     };
     list.sort((a, b) => {
+        if (mode === 'sortCategory') {
+            const cat = byText(a, b, a.sortCategory || '', b.sortCategory || '');
+            if (cat !== 0) return cat;
+        }
         if (mode === 'brand') {
             return byText(a, b, a.brandName || '', b.brandName || '');
         }
@@ -224,6 +252,12 @@ async function loadPharmacy() {
     }
 }
 
+function handlePharmacySortChange() {
+    const openIds = getOpenMedIds();
+    const textHeights = getTextareaHeights();
+    renderPharmacy(pharmacyCache, openIds, textHeights);
+}
+
 function getOpenMedIds() {
     return Array.from(document.querySelectorAll('#pharmacy-list .history-item .col-body[data-med-id]'))
         .filter((el) => el.style.display !== 'none')
@@ -296,6 +330,7 @@ function renderMedicationCard(med, isOpen = true, textHeights = {}) {
     const headerNote = [lowStock ? 'Low Stock' : null, expirySoon ? 'Expiring Soon' : null].filter(Boolean).join(' · ');
     const displayName = getMedicationDisplayName(med);
     const strength = (med.strength || '').trim();
+    const sortLabel = med.sortCategory ? `<span style="font-size:11px; color:#455a64; margin-right:8px;">${med.sortCategory}</span>` : '';
     const bodyDisplay = isOpen ? 'display:block;' : 'display:none;';
     const arrow = isOpen ? '▾' : '▸';
     const headerBg = med.excludeFromResources ? '#ffecef' : '#eef7ff';
@@ -304,7 +339,10 @@ function renderMedicationCard(med, isOpen = true, textHeights = {}) {
     const bodyBorderColor = med.excludeFromResources ? '#ffcfd0' : '#cfe9d5';
     const badgeColor = med.excludeFromResources ? '#d32f2f' : '#2e7d32';
     const badgeText = med.excludeFromResources ? 'Resource Currently Unavailable' : 'Resource Available';
-    const availabilityBadge = `<span style="margin-left:auto; padding:2px 10px; border-radius:999px; background:${badgeColor}; color:#fff; font-size:11px; white-space:nowrap;">${badgeText}</span>`;
+    const availabilityBadge = `<span style="padding:2px 10px; border-radius:999px; background:${badgeColor}; color:#fff; font-size:11px; white-space:nowrap;">${badgeText}</span>`;
+    const verifiedBadge = med.verified
+        ? `<span style="padding:2px 10px; border-radius:999px; background:#1b5e20; color:#fff; font-size:11px; white-space:nowrap;">Verified</span>`
+        : `<span style="padding:2px 10px; border-radius:999px; background:transparent; color:#1b5e20; font-size:11px; white-space:nowrap; border:1px dashed #b2c7b5;">Not verified</span>`;
     const doseHeight = textHeights[`dose-${med.id}`] ? `height:${textHeights[`dose-${med.id}`]};` : '';
     const photoThumbs = (med.photos || []).map(
         (src, idx) => `
@@ -322,9 +360,14 @@ function renderMedicationCard(med, isOpen = true, textHeights = {}) {
             <span style="flex:1; white-space:nowrap; overflow:hidden; text-overflow:ellipsis; font-weight:700;">
                 ${displayName}${strength ? ' — ' + strength : ''}
             </span>
+            ${sortLabel}
             ${headerNote ? `<span class="sidebar-pill" style="margin-right:8px; background:${lowStock ? '#ffebee' : '#fff7e0'}; color:${lowStock ? '#c62828' : '#b26a00'};">${headerNote}</span>` : ''}
             <button onclick="event.stopPropagation(); deleteMedication('${med.id}')" class="btn btn-sm history-action-btn" style="background:var(--red); visibility:hidden;">🗑 Delete Medication</button>
-            ${availabilityBadge}
+            <div style="display:flex; align-items:center; gap:6px; margin-left:8px;">${verifiedBadge}${availabilityBadge}</div>
+            <label style="display:flex; align-items:center; gap:4px; font-size:11px; margin-left:8px; padding:4px 8px; border:1px solid #c7ddff; border-radius:6px; background:#fff;" onclick="event.stopPropagation();">
+                <input id="ver-${med.id}" type="checkbox" ${med.verified ? 'checked' : ''} onchange="scheduleSaveMedication('${med.id}', true); event.stopPropagation();">
+                Verified
+            </label>
         </div>
         <div class="col-body" data-med-id="${med.id}" style="padding:12px; background:${bodyBg}; border:1px solid ${bodyBorderColor}; border-radius:6px; ${bodyDisplay}">
             <div class="collapsible" style="margin-bottom:10px;">
@@ -335,10 +378,10 @@ function renderMedicationCard(med, isOpen = true, textHeights = {}) {
                 </div>
             <div class="col-body" style="padding:10px; display:block;" id="details-${med.id}">
                 <div style="display:flex; align-items:center; gap:8px; margin-bottom:10px;">
-                    <input id="exclude-${med.id}" type="checkbox" ${med.excludeFromResources ? 'checked' : ''} onchange="scheduleSaveMedication('${med.id}')">
-                    <label style="font-size:12px; line-height:1.2; margin:0;">Resource Currently Unavailable</label>
-                </div>
-                    <div style="display:grid; grid-template-columns: repeat(2, minmax(240px, 1fr)); gap:10px; margin-bottom:10px;">
+                            <input id="exclude-${med.id}" type="checkbox" ${med.excludeFromResources ? 'checked' : ''} onchange="scheduleSaveMedication('${med.id}', true)">
+                            <label style="font-size:12px; line-height:1.2; margin:0;">Resource Currently Unavailable</label>
+                        </div>
+                        <div style="display:grid; grid-template-columns: repeat(2, minmax(240px, 1fr)); gap:10px; margin-bottom:10px;">
                         <div>
                             <label style="font-weight:700; font-size:12px;">Generic Name</label>
                             <input id="gn-${med.id}" type="text" value="${med.genericName}" style="width:100%; padding:8px;" oninput="scheduleSaveMedication('${med.id}')">
@@ -389,6 +432,21 @@ function renderMedicationCard(med, isOpen = true, textHeights = {}) {
                                 <option value="true" ${med.controlled ? 'selected' : ''}>Yes</option>
                             </select>
                         </div>
+                        <div>
+                            <label style="font-weight:700; font-size:12px;">Sort Category</label>
+                            <select id="sort-${med.id}" style="width:100%; padding:8px;" onchange="handleSortCategoryChange('${med.id}')">
+                                <option value="">Select...</option>
+                                <option value="Antibiotic" ${med.sortCategory === 'Antibiotic' ? 'selected' : ''}>Antibiotic</option>
+                                <option value="Analgesic" ${med.sortCategory === 'Analgesic' ? 'selected' : ''}>Analgesic</option>
+                                <option value="Cardiac" ${med.sortCategory === 'Cardiac' ? 'selected' : ''}>Cardiac</option>
+                                <option value="Respiratory" ${med.sortCategory === 'Respiratory' ? 'selected' : ''}>Respiratory</option>
+                                <option value="Gastrointestinal" ${med.sortCategory === 'Gastrointestinal' ? 'selected' : ''}>Gastrointestinal</option>
+                                <option value="Endocrine" ${med.sortCategory === 'Endocrine' ? 'selected' : ''}>Endocrine</option>
+                                <option value="Emergency" ${med.sortCategory === 'Emergency' ? 'selected' : ''}>Emergency</option>
+                                <option value="Other" ${med.sortCategory && !['Antibiotic','Analgesic','Cardiac','Respiratory','Gastrointestinal','Endocrine','Emergency'].includes(med.sortCategory) ? 'selected' : ''}>Custom...</option>
+                            </select>
+                            <input id="sort-custom-${med.id}" type="text" value="${(['Antibiotic','Analgesic','Cardiac','Respiratory','Gastrointestinal','Endocrine','Emergency'].includes(med.sortCategory) ? '' : med.sortCategory) || ''}" placeholder="Custom category" style="width:100%; padding:6px; margin-top:6px; ${med.sortCategory && !['Antibiotic','Analgesic','Cardiac','Respiratory','Gastrointestinal','Endocrine','Emergency'].includes(med.sortCategory) ? '' : 'display:none;'}" oninput="scheduleSaveMedication('${med.id}', true)">
+                        </div>
                         <div>
                             <label style="font-weight:700; font-size:12px;">Manufacturer</label>
                             <input id="manu-${med.id}" type="text" value="${med.manufacturer}" style="width:100%; padding:8px;" oninput="scheduleSaveMedication('${med.id}')">
@@ -625,7 +683,7 @@ function addPurchaseEntry(medId) {
     scheduleSaveMedication(medId);
 }
 
-async function saveMedication(id) {
+async function saveMedication(id, rerender = false) {
     const openMedIds = getOpenMedIds();
     const textHeights = getTextareaHeights();
     const data = await (await fetchInventory()).json();
@@ -655,6 +713,8 @@ async function saveMedication(id) {
     med.allergyWarnings = document.getElementById(`alg-${id}`)?.value || '';
     med.standardDosage = document.getElementById(`dose-${id}`)?.value || '';
     med.excludeFromResources = !!document.getElementById(`exclude-${id}`)?.checked;
+    med.sortCategory = document.getElementById(`sort-${id}`)?.value || document.getElementById(`sort-custom-${id}`)?.value || '';
+    med.verified = !!document.getElementById(`ver-${id}`)?.checked;
     med.purchaseHistory = collectPurchaseEntries(id);
 
     await fetchInventory({
@@ -663,7 +723,9 @@ async function saveMedication(id) {
         body: JSON.stringify(meds),
     });
     pharmacyCache = meds;
-    renderPharmacy(pharmacyCache, openMedIds, textHeights);
+    if (rerender) {
+        renderPharmacy(pharmacyCache, openMedIds, textHeights);
+    }
 }
 
 function collectPurchaseEntries(medId) {

static/js/settings.js

@@ -13,7 +13,8 @@ const DEFAULT_SETTINGS = {
     rep_penalty: 1.1,
     user_mode: "user",
     med_photo_model: "qwen",
-    med_photo_prompt: "You are a pharmacy intake assistant on a sailing vessel. Look at the medication photo and return JSON only with keys: generic_name, brand_name, form, strength, expiry_date, batch_lot, storage_location, manufacturer, indication, allergy_warnings, dosage, notes."
+    med_photo_prompt: "You are a pharmacy intake assistant on a sailing vessel. Look at the medication photo and return JSON only with keys: generic_name, brand_name, form, strength, expiry_date, batch_lot, storage_location, manufacturer, indication, allergy_warnings, dosage, notes.",
+    vaccine_types: ["MMR", "DTaP", "HepB", "HepA", "Td/Tdap", "Influenza", "COVID-19"]
 };
 
 let settingsDirty = false;
@@ -21,6 +22,7 @@ let settingsLoaded = false;
 let settingsAutoSaveTimer = null;
 let workspaceListLoaded = false;
 let offlineStatusCache = null;
+let vaccineTypeList = [...DEFAULT_SETTINGS.vaccine_types];
 
 function setUserMode(mode) {
     const body = document.body;
@@ -42,6 +44,8 @@ function setUserMode(mode) {
 
 function applySettingsToUI(data = {}) {
     const merged = { ...DEFAULT_SETTINGS, ...(data || {}) };
+    vaccineTypeList = normalizeVaccineTypes(merged.vaccine_types);
+    renderVaccineTypes();
     Object.keys(merged).forEach(k => {
         const el = document.getElementById(k);
         if (el) {
@@ -164,6 +168,7 @@ async function saveSettings(showAlert = true, reason = 'manual') {
                 s[k] = val;
             }
         });
+        s.vaccine_types = normalizeVaccineTypes(vaccineTypeList);
         console.log('[settings] saving', { reason, payload: s });
         updateSettingsStatus('Saving…', false);
         const headers = { 'Content-Type': 'application/json' };
@@ -188,7 +193,7 @@ async function saveSettings(showAlert = true, reason = 'manual') {
         const updated = await res.json();
         console.log('[settings] save response', updated);
         // Preserve the locally selected user_mode to avoid flicker if the server echoes stale data
-        const merged = { ...updated, user_mode: s.user_mode || updated.user_mode };
+        const merged = { ...updated, user_mode: s.user_mode || updated.user_mode, vaccine_types: s.vaccine_types || updated.vaccine_types };
         applySettingsToUI(merged);
         try { localStorage.setItem('user_mode', updated.user_mode || 'user'); } catch (err) { /* ignore */ }
         settingsDirty = false;
@@ -232,6 +237,77 @@ function resetSection(section) {
     saveSettings();
 }
 
+function normalizeVaccineTypes(list) {
+    if (!Array.isArray(list)) return [...DEFAULT_SETTINGS.vaccine_types];
+    const seen = new Set();
+    return list
+        .map((v) => (typeof v === 'string' ? v.trim() : ''))
+        .filter((v) => !!v)
+        .filter((v) => {
+            const key = v.toLowerCase();
+            if (seen.has(key)) return false;
+            seen.add(key);
+            return true;
+        });
+}
+
+function renderVaccineTypes() {
+    const container = document.getElementById('vaccine-types-list');
+    if (!container) return;
+    if (!vaccineTypeList.length) {
+        container.innerHTML = '<div style="color:#666; font-size:12px;">No vaccine types defined. Add at least one to enable the dropdown.</div>';
+        return;
+    }
+    container.innerHTML = vaccineTypeList
+        .map((v, idx) => `
+            <div style="display:flex; align-items:center; gap:8px; padding:6px 0; border-bottom:1px solid #eee;">
+                <div style="width:28px; text-align:right; font-weight:700; color:#666;">${idx + 1}.</div>
+                <div style="flex:1; font-weight:600;">${v}</div>
+                <div style="display:flex; gap:6px; align-items:center;">
+                    <button class="btn btn-sm" style="background:#607d8b;" ${idx === 0 ? 'disabled' : ''} onclick="moveVaccineType(${idx}, -1)">↑</button>
+                    <button class="btn btn-sm" style="background:#607d8b;" ${idx === vaccineTypeList.length - 1 ? 'disabled' : ''} onclick="moveVaccineType(${idx}, 1)">↓</button>
+                    <button class="btn btn-sm" style="background:var(--red);" onclick="removeVaccineType(${idx})">🗑 Remove</button>
+                </div>
+            </div>
+        `).join('');
+}
+
+function addVaccineType() {
+    const input = document.getElementById('vaccine-type-input');
+    if (!input) return;
+    const val = input.value.trim();
+    if (!val) {
+        alert('Enter a vaccine type before adding.');
+        return;
+    }
+    vaccineTypeList = normalizeVaccineTypes([...vaccineTypeList, val]);
+    input.value = '';
+    renderVaccineTypes();
+    settingsDirty = true;
+    scheduleAutoSave('vaccine-type-add');
+}
+
+function removeVaccineType(idx) {
+    if (idx < 0 || idx >= vaccineTypeList.length) return;
+    vaccineTypeList.splice(idx, 1);
+    vaccineTypeList = normalizeVaccineTypes(vaccineTypeList);
+    renderVaccineTypes();
+    settingsDirty = true;
+    scheduleAutoSave('vaccine-type-remove');
+}
+
+function moveVaccineType(idx, delta) {
+    const newIndex = idx + delta;
+    if (newIndex < 0 || newIndex >= vaccineTypeList.length) return;
+    const nextList = [...vaccineTypeList];
+    const [item] = nextList.splice(idx, 1);
+    nextList.splice(newIndex, 0, item);
+    vaccineTypeList = normalizeVaccineTypes(nextList);
+    renderVaccineTypes();
+    settingsDirty = true;
+    scheduleAutoSave('vaccine-type-reorder');
+}
+
 function renderOfflineStatus(msg, isError = false) {
     const box = document.getElementById('offline-status');
     if (!box) return;
@@ -528,3 +604,6 @@ window.setUserMode = setUserMode;
 window.runOfflineCheck = runOfflineCheck;
 window.createOfflineBackup = createOfflineBackup;
 window.restoreOfflineBackup = restoreOfflineBackup;
+window.addVaccineType = addVaccineType;
+window.removeVaccineType = removeVaccineType;
+window.moveVaccineType = moveVaccineType;

templates/index.html

@@ -184,6 +184,38 @@
         .phone-block { display: block; }
         .phone-import-panel { width: 100%; min-height: 130vh; }
         }
+    /* Blocking modal while GPU chat is running */
+    #chat-blocker {
+        display: none;
+        position: fixed;
+        inset: 0;
+        background: rgba(0,0,0,0.65);
+        z-index: 9000;
+        align-items: center;
+        justify-content: center;
+        padding: 16px;
+        box-sizing: border-box;
+    }
+    #chat-blocker .modal {
+        background: #fff;
+        border-radius: 10px;
+        padding: 18px;
+        max-width: 520px;
+        width: 100%;
+        box-shadow: 0 12px 32px rgba(0,0,0,0.2);
+        text-align: center;
+    }
+    #chat-blocker h3 { margin: 0 0 10px 0; color: #1f2d3d; }
+    #chat-blocker p { margin: 8px 0; color: #2c3e50; line-height: 1.5; }
+    #chat-blocker .spinner {
+        width: 40px; height: 40px;
+        border-radius: 50%;
+        border: 4px solid #e0e0e0;
+        border-top-color: var(--inquiry);
+        margin: 14px auto;
+        animation: spin 1s linear infinite;
+    }
+    @keyframes spin { to { transform: rotate(360deg); } }
     </style>
     <script>
         window.WORKSPACE_LABEL = "{{ workspace.label if workspace else '' }}";
@@ -268,6 +300,12 @@
                             <div style="display:flex; align-items:center; gap:6px; margin-bottom:6px;">
                                 <span class="dev-tag">dev:triage-message</span>
                             </div>
+                            <div style="display:flex; gap:10px; align-items:center; margin-bottom:8px;">
+                                <label for="triage-sample-select" style="font-size:12px; color:#333; font-weight:700;">Load sample case:</label>
+                                <select id="triage-sample-select" style="padding:8px; min-width:240px;" onchange="applyTriageSample(this.value)">
+                                    <option value="">Select a sample…</option>
+                                </select>
+                            </div>
                             <textarea id="msg" style="height:105px;" placeholder="Describe what's happening"></textarea>
                             <div id="triage-meta-selects" style="display:grid; grid-template-columns: repeat(auto-fit, minmax(220px, 1fr)); gap:10px; margin-top:10px;">
                                 <div>
@@ -368,7 +406,7 @@
                             </div>
                             <div style="display:flex; gap:10px; margin-top:10px; align-items:center; flex-wrap:wrap;">
                                 <button onclick="runChat()" id="run-btn" class="btn" style="flex-grow:1; background:var(--triage); min-width:160px;">SUBMIT FOR TRIAGE</button>
-                                <button onclick="repeatLast()" id="repeat-btn" class="btn user-adv-only" style="background:#555; min-width:120px;">REPEAT LAST</button>
+                                <button onclick="restoreLast()" id="repeat-btn" class="btn user-adv-only" style="background:#555; min-width:120px;">RESTORE LAST</button>
                             </div>
                         </div>
                     </div>
@@ -432,6 +470,10 @@
                                 <span class="detail-icon history-arrow" style="font-size:18px; margin-right:8px;">▸</span><span style="font-weight:700;">Pharmaceuticals</span><span id="pharmacy-count" style="margin-left:8px; font-weight:700; font-size:12px; color:#1f2d3d;">(0)</span><span class="dev-tag">dev:medicines-shell</span>
                             </div>
                             <div class="col-body" style="padding:12px; display:none; background:#f5f8ff; border:1px solid #d7e2ff; border-top:none;">
+                                <div class="developer-only" style="display:none; margin-bottom:8px; display:flex; gap:8px; flex-wrap:wrap;">
+                                    <button class="btn btn-sm" style="background:#0b8457;" onclick="exportPharmacyJSON()">Export Pharmaceuticals JSON</button>
+                                    <button class="btn btn-sm" style="background:#1b4f72;" onclick="importPharmacyJSON()">Import Pharmaceuticals JSON</button>
+                                </div>
                                 <div class="collapsible" style="margin-bottom:12px;">
                                     <div id="medication-add-header" class="col-header crew-med-header" data-sidebar-id="equipment-medication-add" onclick="toggleSection(this)" style="background:#fff; justify-content:flex-start;">
                                         <span class="detail-icon history-arrow" style="font-size:18px; margin-right:8px;">▸</span><span style="font-weight:700;">Add Pharmaceuticals</span><span class="dev-tag">dev:medication-add</span>
@@ -480,6 +522,25 @@
                                                     <option value="Damaged/Out of Service">Damaged/Out of Service</option>
                                                 </select>
                                             </div>
+                                            <div>
+                                                <label style="font-weight:700; font-size:12px;">Sort Category</label>
+                                                <select id="med-new-sort" style="width:100%; padding:8px;" onchange="toggleCustomSortField()">
+                                                    <option value="">Select...</option>
+                                                    <option value="Antibiotic">Antibiotic</option>
+                                                    <option value="Analgesic">Analgesic</option>
+                                                    <option value="Cardiac">Cardiac</option>
+                                                    <option value="Respiratory">Respiratory</option>
+                                                    <option value="Gastrointestinal">Gastrointestinal</option>
+                                                    <option value="Endocrine">Endocrine</option>
+                                                    <option value="Emergency">Emergency</option>
+                                                    <option value="Other">Custom...</option>
+                                                </select>
+                                                <input id="med-new-sort-custom" type="text" placeholder="Custom category" style="margin-top:6px; width:100%; padding:8px; display:none;">
+                                            </div>
+                                            <div style="display:flex; align-items:center; gap:6px;">
+                                                <input id="med-new-verified" type="checkbox">
+                                                <label style="font-size:12px; margin:0;">Verified</label>
+                                            </div>
                                             <div>
                                                 <label style="font-weight:700; font-size:12px;">Expiry Date</label>
                                                 <input id="med-new-exp" type="date" style="width:100%; padding:8px;">
@@ -571,10 +632,20 @@
                                     </div>
                                     </div>
                                 </div>
-                                <div class="collapsible" style="margin-bottom:12px;">
+                                        <div class="collapsible" style="margin-bottom:12px;">
                                     <div class="col-body" style="padding:12px; background:#f8f9fa; display:block;">
                                         <div class="dev-tag" style="margin-bottom:6px;">dev:pharmacy-inventory</div>
                                         <div class="dev-tag" style="margin-bottom:6px;">dev:pharmacy-controls</div>
+                                        <div style="display:flex; gap:10px; align-items:center; flex-wrap:wrap; margin-bottom:8px;">
+                                            <label style="font-size:12px; font-weight:700;">Sort by:</label>
+                                            <select id="pharmacy-sort" style="padding:8px; min-width:180px;" onchange="handlePharmacySortChange()">
+                                                <option value="sortCategory">Sort Category</option>
+                                                <option value="generic">Generic Name</option>
+                                                <option value="brand">Brand Name</option>
+                                                <option value="strength">Strength</option>
+                                                <option value="expiry">Expiry Date</option>
+                                            </select>
+                                        </div>
                                         <div class="dev-tag" style="margin-bottom:6px;">dev:pharmacy-list</div>
                                         <div id="pharmacy-list"></div>
                                     </div>
@@ -693,6 +764,7 @@
         <div class="page-body sidebar-open">
             <div class="page-main">
                 <div class="page-shell">
+                    <div class="dev-tag" style="margin-bottom:8px;">dev:vessel-crew-tab</div>
                     <div class="panel-wrapper">
                 <div class="collapsible" style="margin-bottom:15px;">
                     <div class="col-header crew-med-header" data-sidebar-id="vessel-info" onclick="toggleSection(this)" style="background:#e3f2fd; border:1px solid #c5ddf8; justify-content:flex-start;">
@@ -702,39 +774,71 @@
                         <div class="dev-tag" style="margin-bottom:6px;">dev:vessel-fields</div>
                         <div style="display:grid; grid-template-columns: 1fr 1fr; gap:12px; margin-bottom:12px; font-size:15px;">
                             <div>
+                                <div class="dev-tag">dev:vessel-name</div>
                                 <label style="font-size:12px; font-weight:bold; margin-bottom:4px; display:block;">Vessel Name</label>
                                 <input type="text" id="vessel-name" style="padding:8px; width:100%;">
                             </div>
                             <div>
+                                <div class="dev-tag">dev:vessel-registration</div>
                                 <label style="font-size:12px; font-weight:bold; margin-bottom:4px; display:block;">Registration Number</label>
                                 <input type="text" id="vessel-registration" style="padding:8px; width:100%;">
                             </div>
                             <div>
+                                <div class="dev-tag">dev:vessel-flag</div>
                                 <label style="font-size:12px; font-weight:bold; margin-bottom:4px; display:block;">Flag Country</label>
                                 <input type="text" id="vessel-flag" style="padding:8px; width:100%;">
                             </div>
                             <div>
+                                <div class="dev-tag">dev:vessel-homeport</div>
                                 <label style="font-size:12px; font-weight:bold; margin-bottom:4px; display:block;">Home Port</label>
                                 <input type="text" id="vessel-homeport" style="padding:8px; width:100%;">
                             </div>
                             <div>
+                                <div class="dev-tag">dev:vessel-tonnage</div>
                                 <label style="font-size:12px; font-weight:bold; margin-bottom:4px; display:block;">Gross Tonnage</label>
                                 <input type="text" id="vessel-tonnage" style="padding:8px; width:100%;">
                             </div>
                             <div>
+                                <div class="dev-tag">dev:vessel-net-tonnage</div>
                                 <label style="font-size:12px; font-weight:bold; margin-bottom:4px; display:block;">Net/Register Tonnage</label>
                                 <input type="text" id="vessel-net-tonnage" style="padding:8px; width:100%;">
                             </div>
                             <div>
+                                <div class="dev-tag">dev:vessel-callsign</div>
                                 <label style="font-size:12px; font-weight:bold; margin-bottom:4px; display:block;">Call Sign</label>
                                 <input type="text" id="vessel-callsign" style="padding:8px; width:100%;">
                             </div>
                             <div>
+                                <div class="dev-tag">dev:vessel-mmsi</div>
                                 <label style="font-size:12px; font-weight:bold; margin-bottom:4px; display:block;">MMSI Number</label>
                                 <input type="text" id="vessel-mmsi" style="padding:8px; width:100%;">
                             </div>
+                            <div>
+                                <label style="font-size:12px; font-weight:bold; margin-bottom:4px; display:block;">Vessel Hull Number</label>
+                                <input type="text" id="vessel-hull-number" style="padding:8px; width:100%;">
+                            </div>
+                            <div>
+                                <label style="font-size:12px; font-weight:bold; margin-bottom:4px; display:block;">Starboard Engine Brand/Model/Size</label>
+                                <input type="text" id="vessel-starboard-engine" style="padding:8px; width:100%;">
+                            </div>
+                            <div>
+                                <label style="font-size:12px; font-weight:bold; margin-bottom:4px; display:block;">Starboard Engine S/N</label>
+                                <input type="text" id="vessel-starboard-sn" style="padding:8px; width:100%;">
+                            </div>
+                            <div>
+                                <label style="font-size:12px; font-weight:bold; margin-bottom:4px; display:block;">Port Engine Brand/Model/Size</label>
+                                <input type="text" id="vessel-port-engine" style="padding:8px; width:100%;">
+                            </div>
+                            <div>
+                                <label style="font-size:12px; font-weight:bold; margin-bottom:4px; display:block;">Port Engine S/N</label>
+                                <input type="text" id="vessel-port-sn" style="padding:8px; width:100%;">
+                            </div>
+                            <div>
+                                <label style="font-size:12px; font-weight:bold; margin-bottom:4px; display:block;">RIB S/N</label>
+                                <input type="text" id="vessel-rib-sn" style="padding:8px; width:100%;">
+                            </div>
                         </div>
-                        <button onclick="saveVesselInfo()" class="btn btn-sm" style="background:var(--inquiry); width:100%;">Save Vessel Info</button>
+                        <button onclick="saveVesselInfo()" class="btn btn-sm" style="background:var(--inquiry); width:100%;"><span class="dev-tag">dev:vessel-save</span>Save Vessel Info</button>
                     </div>
                 </div>
                 <div class="collapsible" style="margin-bottom:15px;">
@@ -749,12 +853,12 @@
                             <div class="col-body" style="padding:15px; background:#f8f9fa;">
                                 <div class="dev-tag" style="margin-bottom:6px;">dev:crew-add-fields</div>
                                 <div style="display:grid; grid-template-columns: 1fr 1fr 1fr; gap:8px; margin-bottom:8px; font-size:15px;">
-                                    <div><label style="font-size:13px; margin-bottom:2px;">First Name *</label><input type="text" id="cn-first" style="padding:6px; width:100%;"></div>
-                                    <div><label style="font-size:13px; margin-bottom:2px;">Middle Name(s)</label><input type="text" id="cn-middle" style="padding:6px; width:100%;"></div>
-                                    <div><label style="font-size:13px; margin-bottom:2px;">Last Name *</label><input type="text" id="cn-last" style="padding:6px; width:100%;"></div>
+                                    <div><div class="dev-tag">dev:crew-add-first</div><label style="font-size:13px; margin-bottom:2px;">First Name *</label><input type="text" id="cn-first" style="padding:6px; width:100%;"></div>
+                                    <div><div class="dev-tag">dev:crew-add-middle</div><label style="font-size:13px; margin-bottom:2px;">Middle Name(s)</label><input type="text" id="cn-middle" style="padding:6px; width:100%;"></div>
+                                    <div><div class="dev-tag">dev:crew-add-last</div><label style="font-size:13px; margin-bottom:2px;">Last Name *</label><input type="text" id="cn-last" style="padding:6px; width:100%;"></div>
                                 </div>
                                 <div style="display:grid; grid-template-columns: 1fr 1fr 1fr; gap:8px; margin-bottom:8px; font-size:15px;">
-                                    <div><label style="font-size:13px; margin-bottom:2px;">Sex</label><select id="cn-sex" style="padding:6px; width:100%;">
+                                    <div><div class="dev-tag">dev:crew-add-sex</div><label style="font-size:13px; margin-bottom:2px;">Sex</label><select id="cn-sex" style="padding:6px; width:100%;">
                                         <option value="">Select...</option>
                                         <option value="Male">Male</option>
                                         <option value="Female">Female</option>
@@ -762,8 +866,8 @@
                                         <option value="Other">Other</option>
                                         <option value="Prefer not to say">Prefer not to say</option>
                                     </select></div>
-                                    <div><label style="font-size:13px; margin-bottom:2px;">Birthdate</label><input type="date" id="cn-birthdate" style="padding:6px; width:100%;"></div>
-                                    <div><label style="font-size:13px; margin-bottom:2px;">Position</label><select id="cn-position" style="padding:6px; width:100%;">
+                                    <div><div class="dev-tag">dev:crew-add-birthdate</div><label style="font-size:13px; margin-bottom:2px;">Birthdate</label><input type="date" id="cn-birthdate" style="padding:6px; width:100%;"></div>
+                                    <div><div class="dev-tag">dev:crew-add-position</div><label style="font-size:13px; margin-bottom:2px;">Position</label><select id="cn-position" style="padding:6px; width:100%;">
                                         <option value="">Select...</option>
                                         <option value="Captain">Captain</option>
                                         <option value="Crew">Crew</option>
@@ -771,36 +875,38 @@
                                     </select></div>
                                 </div>
                                 <div style="display:grid; grid-template-columns: 1fr 1fr 1fr 1fr 1fr; gap:8px; margin-bottom:8px; font-size:15px;">
-                                    <div><label style="font-size:13px; margin-bottom:2px;">Citizenship</label><input type="text" id="cn-citizenship" list="countries" style="padding:6px; width:100%;"></div>
-                                    <div><label style="font-size:13px; margin-bottom:2px;">Birthplace</label><input type="text" id="cn-birthplace" list="countries" style="padding:6px; width:100%;"></div>
-                                    <div><label style="font-size:13px; margin-bottom:2px;">Passport Number</label><input type="text" id="cn-passport" style="padding:6px; width:100%;"></div>
-                                    <div><label style="font-size:13px; margin-bottom:2px;">Issue Date</label><input type="date" id="cn-pass-issue" style="padding:6px; width:100%;"></div>
-                                    <div><label style="font-size:13px; margin-bottom:2px;">Expiry Date</label><input type="date" id="cn-pass-expiry" style="padding:6px; width:100%;"></div>
+                                    <div><div class="dev-tag">dev:crew-add-citizenship</div><label style="font-size:13px; margin-bottom:2px;">Citizenship</label><input type="text" id="cn-citizenship" list="countries" style="padding:6px; width:100%;"></div>
+                                    <div><div class="dev-tag">dev:crew-add-birthplace</div><label style="font-size:13px; margin-bottom:2px;">Birthplace</label><input type="text" id="cn-birthplace" list="countries" style="padding:6px; width:100%;"></div>
+                                    <div><div class="dev-tag">dev:crew-add-passport</div><label style="font-size:13px; margin-bottom:2px;">Passport Number</label><input type="text" id="cn-passport" style="padding:6px; width:100%;"></div>
+                                    <div><div class="dev-tag">dev:crew-add-pass-issue</div><label style="font-size:13px; margin-bottom:2px;">Issue Date</label><input type="date" id="cn-pass-issue" style="padding:6px; width:100%;"></div>
+                                    <div><div class="dev-tag">dev:crew-add-pass-expiry</div><label style="font-size:13px; margin-bottom:2px;">Expiry Date</label><input type="date" id="cn-pass-expiry" style="padding:6px; width:100%;"></div>
                                 </div>
                             <div style="display:grid; grid-template-columns: 1fr 1fr 1fr 1fr; gap:8px; margin-bottom:8px; font-size:15px;">
-                                <div><label style="font-size:13px; margin-bottom:2px;">Cell/WhatsApp</label><input type="text" id="cn-phone" placeholder="+1234567890" style="padding:6px; width:100%;"></div>
-                                <div><label style="font-size:13px; margin-bottom:2px;">Passport Photo/PDF</label><input type="file" id="cn-passport-photo" accept="image/*,.pdf" style="padding:4px; width:100%; font-size:13px;"></div>
-                                <div><label style="font-size:13px; margin-bottom:2px;">Passport Page Photo/PDF</label><input type="file" id="cn-passport-page" accept="image/*,.pdf" style="padding:4px; width:100%; font-size:13px;"></div>
+                                <div><div class="dev-tag">dev:crew-add-phone</div><label style="font-size:13px; margin-bottom:2px;">Cell/WhatsApp</label><input type="text" id="cn-phone" placeholder="+1234567890" style="padding:6px; width:100%;"></div>
+                                <div><div class="dev-tag">dev:crew-add-passport-photo</div><label style="font-size:13px; margin-bottom:2px;">Passport Photo/PDF</label><input type="file" id="cn-passport-photo" accept="image/*,.pdf" style="padding:4px; width:100%; font-size:13px;"></div>
+                                <div><div class="dev-tag">dev:crew-add-passport-page</div><label style="font-size:13px; margin-bottom:2px;">Passport Page Photo/PDF</label><input type="file" id="cn-passport-page" accept="image/*,.pdf" style="padding:4px; width:100%; font-size:13px;"></div>
                             </div>
                             <div style="margin-bottom:8px;"><label style="font-size:12px; font-weight:bold;">Emergency Contact</label></div>
                             <div class="dev-tag" style="margin-bottom:6px;">dev:crew-add-emergency</div>
                             <div style="display:grid; grid-template-columns: 1fr 1fr 1fr 1fr; gap:8px; margin-bottom:8px; font-size:15px;">
-                                <div><label style="font-size:13px; margin-bottom:2px;">Name</label><input type="text" id="cn-emerg-name" style="padding:6px; width:100%;"></div>
-                                <div><label style="font-size:13px; margin-bottom:2px;">Relationship</label><input type="text" id="cn-emerg-rel" style="padding:6px; width:100%;"></div>
-                                <div><label style="font-size:13px; margin-bottom:2px;">Phone</label><input type="text" id="cn-emerg-phone" style="padding:6px; width:100%;"></div>
-                                <div><label style="font-size:13px; margin-bottom:2px;">Email</label><input type="email" id="cn-emerg-email" style="padding:6px; width:100%;"></div>
+                                <div><div class="dev-tag">dev:crew-add-emerg-name</div><label style="font-size:13px; margin-bottom:2px;">Name</label><input type="text" id="cn-emerg-name" style="padding:6px; width:100%;"></div>
+                                <div><div class="dev-tag">dev:crew-add-emerg-rel</div><label style="font-size:13px; margin-bottom:2px;">Relationship</label><input type="text" id="cn-emerg-rel" style="padding:6px; width:100%;"></div>
+                                <div><div class="dev-tag">dev:crew-add-emerg-phone</div><label style="font-size:13px; margin-bottom:2px;">Phone</label><input type="text" id="cn-emerg-phone" style="padding:6px; width:100%;"></div>
+                                <div><div class="dev-tag">dev:crew-add-emerg-email</div><label style="font-size:13px; margin-bottom:2px;">Email</label><input type="email" id="cn-emerg-email" style="padding:6px; width:100%;"></div>
                             </div>
                             <div style="margin-bottom:10px; font-size:15px;">
                                 <label style="font-size:13px; margin-bottom:2px;">Emergency Contact Notes</label>
+                                <div class="dev-tag">dev:crew-add-emerg-notes</div>
                                 <input type="text" id="cn-emerg-notes" placeholder="Additional emergency contact information" style="padding:6px; width:100%;">
                             </div>
                             <datalist id="countries">
                                 <option value="USA"><option value="Canada"><option value="UK"><option value="Australia"><option value="New Zealand"><option value="France"><option value="Germany"><option value="Spain"><option value="Italy"><option value="Netherlands"><option value="Singapore"><option value="Malaysia"><option value="Thailand"><option value="Philippines"><option value="Japan"><option value="China"><option value="India">
                             </datalist>
-                            <button onclick="addCrew()" class="btn btn-sm" style="background:var(--dark); width:100%;">+ Add Crew Member</button>
+                            <button onclick="addCrew()" class="btn btn-sm" style="background:var(--dark); width:100%;"><span class="dev-tag">dev:crew-add-submit</span>+ Add Crew Member</button>
                         </div>
                         </div>
 
+                        <div class="dev-tag" style="margin-bottom:6px;">dev:crew-info-anchor</div>
                         <div id="crew-info-list"></div>
                     </div>
                 </div>
@@ -849,6 +955,21 @@
                             <div style="font-size:12px; color:#555;">Ensures all required models are cached and lets you back up/restore the cache before going offline.</div>
                         </div>
                     </div>
+                    <div class="collapsible" style="margin-bottom:12px;">
+                        <div class="col-header crew-med-header" onclick="toggleSection(this)" style="background:#fff; justify-content:flex-start;">
+                            <span class="dev-tag">dev:settings-vax-types</span><span class="detail-icon history-arrow" style="font-size:18px; margin-right:8px;">▸</span><span style="font-weight:700;">Vaccine Type Dropdown</span>
+                        </div>
+                        <div class="col-body" style="padding:12px; background:#f8f9fa; display:none;">
+                            <div style="margin-bottom:8px; font-size:12px; color:#2c3e50;">Manage the Vaccine Type/Disease options shown in Crew Vaccines. An "Other" option is always available for ad-hoc entries.</div>
+                            <div style="display:flex; gap:8px; flex-wrap:wrap; align-items:center; margin-bottom:10px;">
+                                <input id="vaccine-type-input" type="text" style="padding:8px; min-width:220px; flex:1;" placeholder="e.g., MMR, DTaP, HepB">
+                                <button class="btn btn-sm" style="background:var(--inquiry);" onclick="addVaccineType()">Add Type</button>
+                            </div>
+                            <div class="dev-tag" style="margin-bottom:6px;">dev:settings-vax-list</div>
+                            <div id="vaccine-types-list"></div>
+                            <div id="vaccine-types-status" style="margin-top:8px; font-size:12px; color:#555;">Saved with workspace settings.</div>
+                        </div>
+                    </div>
                     <div class="collapsible developer-only" style="margin-bottom:12px; display:none;">
                         <div class="col-header crew-med-header" onclick="toggleSection(this)" style="background:#fff; justify-content:flex-start;">
                             <span class="dev-tag">dev:settings-default-export</span><span class="detail-icon history-arrow" style="font-size:18px; margin-right:8px;">▸</span><span style="font-weight:700;">Export Default Dataset (Dev)</span>
@@ -1017,11 +1138,19 @@
     </div>
 </div>
 
+<div id="chat-blocker">
+    <div class="modal">
+        <div class="spinner"></div>
+        <h3>Processing Triage Chat…</h3>
+        <p>Please wait. Navigation or edits in SailingMedAdvisor are temporarily paused until this response completes.</p>
+    </div>
+</div>
+
 <script src="/static/js/chat.js?v=2017"></script>
-<script src="/static/js/crew.js?v=2024"></script>
+<script src="/static/js/crew.js?v=2025"></script>
 <script src="/static/js/pharmacy.js?v=2026"></script>
 <script src="/static/js/equipment.js?v=2038"></script>
-<script src="/static/js/settings.js?v=2025"></script>
-<script src="/static/js/main.js?v=2019"></script>
+<script src="/static/js/settings.js?v=2026"></script>
+<script src="/static/js/main.js?v=2020"></script>
 </body>
 </html>

templates/sidebars/sidebar_chat.html

@@ -2,7 +2,7 @@
 <div class="sidebar-section">
     <div class="sidebar-title">Overview</div>
     <div class="sidebar-body">
-        This app was created out of the need for high quality medical guidance when there are no other options. Our family of six is circumnavigating on a sailboat. We are often in remote and inaccessible locations where there simply are no doctors.<br><br>
+        This app was created out of the need for high quality medical guidance when there are no other options. Our family of six is circumnavigating on a sailboat. We are often in remote and inaccessible locations where there simply are no doctors to assist with a medical emergency.<br><br>
         For example, we were anchored in a remote part of the Solomon Islands when our oldest son got a large three-prong off-shore fish hook stuck in his left cheek very close to his eye. It had large barbs and was impossible to pull out. Another time, our youngest son was biten by a dog suspected by the locals of having rabies. We needed to quickly cobble together a precautionary treatment from our medical chest. Another time, our son experienced a Shallow Water Blackout at a depth of 10m. He floated to the surface unconscious and was awakened by his younger siblings who were with him.<br><br>
         In all cases, we needed timely access to medical assistance to address the situation. We struggled to find it, and hence, this app was born.</div>
 </div>

templates/sidebars/sidebar_crew_medical.html

@@ -1,7 +1,18 @@
 <div class="dev-tag">dev:sidebar-crew-medical</div>
 <div class="sidebar-section" data-sidebar-section="crew-medical-section">
     <div class="sidebar-title"><span class="sidebar-pill">Health Records</span> Intake Notes</div>
-    <div class="sidebar-body">Lorem ipsum dolor sit amet, consectetur adipiscing elit. Phasellus at arcu sed urna commodo pulvinar.</div>
+    <div class="sidebar-body">
+        When Logging is on the details of Triage and Inquiry chats 
+        are saved here under each crew member's name. If Logging
+        is off then the chats are not saved.<br><br>
+        When you reactivate a past chat that chat is loaded into
+        the Triage or Inquiry section and you can continue from where
+        you last left-off. This is useful when you want to resubmit
+        a chat for further consideration by the larger model.<br><br>
+        When a crew member has not been selected for a chat the chat
+        will be logged under Unnamed Crew as either Triage chat or
+        an Inquiry chat.
+    </div>
 </div>
 <div class="sidebar-section">
     <div class="sidebar-title">Updates & Exports</div>