Major feature update: DOCX generation, preview columns, bug fixes, dashboard enhancements

Activities completed:
1. Preview table: added Name & Code columns (7-col layout: Role|Name|Code|ABE|Agreement|Comm%|ProdCredit)
2. House Agreement: layers now deduct from 100% base (was incorrectly adding on top)
3. House Agreement: P1 hidden from commission table (kept in approval workflow)
4. Life Origination: fixed to apply All Years at 20% (was Year 1 only)
5. CE as Producer: required People Picker mode for Ceded Accounts, CCP deducts from CE
6. Submit safeguard: modal preview before submission with Confirm/Go Back buttons
7. Word document generation: populates DRAFT/FINAL .docx templates with full form data
8. Dashboard: agreement type, effective date, commission preview, approval timeline,
status filters, soft-delete (hide) for finalized submissions
9. Email fallback: generates FirstInitial+LastName@snellingswalters.com when not in DB
10. Employee originator: expanded to 20 employees with search filter

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

.gitignore

@@ -0,0 +1,6 @@
+__pycache__/
+*.pyc
+*.pyo
+/data/
+*.db
+.env

Feedback/commission_intake_refinement_prompt_v2.md

@@ -0,0 +1,704 @@
+# Commission Agreement Intake - Refinement & Power Automate Integration
+
+## Overview
+This prompt refines the existing web app with additional features, improved validation, OneDrive integration, and Power Automate workflow compatibility. The web app handles form input and draft PDF generation, while Power Automate manages approval workflows, signature collection, and final document processing.
+
+---
+
+## 1. COMMISSION PREVIEW TABLE - ADD NAME & CODE COLUMNS
+
+### Current State
+Table shows: Role | Agreement Type | Commission % | Production % | ABE Status
+
+### Required Change
+Add **Name** and **Producer Code** columns, reorder to:
+
+**Role | Name | Producer Code | ABE Status | Agreement Type | Commission % | Prod Credit**
+
+### Example Output
+
+**Year 1**
+| Role | Name | Producer Code | ABE Status | Agreement Type | Commission % | Prod Credit |
+|------|------|---------------|------------|----------------|--------------|-------------|
+| Producer 1 | Wade Beacham | BEAWA2 | Non-ABE | Beacham Agreement | 23% | 100% |
+| CE Layer | John Smith | SMIJO1 | ABE | Client Executive Agreement | 2% | 0% |
+| CCP Layer | Mike Parsa | PARSM1 | Non-ABE | Complex Claims Practice | 5% | 0% |
+
+**Implementation Notes:**
+- Name should be the full display name from People Picker
+- Producer Code should be the generated/assigned code (e.g., BEAWA2, HERFR1, EMPOR2)
+- For House Account: Name = "House Account", Code = "ACCHO1"
+- This applies to ALL year tables (Year 1, Year 2, Year 3+)
+
+---
+
+## 2. SUBMIT SAFEGUARD - PREVIEW BEFORE SUBMISSION
+
+### Current Issue
+"Submit for Approval" button immediately submits without preview verification.
+
+### Required Flow
+
+1. User clicks **"Submit for Approval"** button
+2. System generates draft PDF/Word doc preview
+3. Show **modal/popup** displaying the generated document
+4. Popup contains two buttons:
+   - **"Go Back & Edit"** - Closes popup, returns to form (no submission)
+   - **"Confirm & Submit"** - Saves to OneDrive, triggers Power Automate workflow
+
+### Modal Requirements
+- Display the full generated document (scrollable if needed)
+- Clear heading: "Review Your Commission Agreement Before Submitting"
+- Buttons should be prominently placed and clearly labeled
+- Document should render in a readable format (embedded viewer or PDF preview)
+
+### Only on "Confirm & Submit"
+- Save Word document to OneDrive
+- Save form data to database/SharePoint
+- Mark agreement as "Pending Acknowledgment"
+- Close modal and navigate to dashboard
+
+**Error Handling:** If document generation fails, show error message and prevent submission.
+
+---
+
+## 3. EMPLOYEE AS ORIGINATOR - ACTIVE DIRECTORY INTEGRATION
+
+### Current State
+Sample data for employee originators.
+
+### Required Implementation
+**Integration Approach:** Choose one of these options (your decision):
+
+**Option A: Microsoft Graph API**
+- Search Office 365 / Azure AD users in real-time
+- Pull full name, email, job title
+- Best for live sync with company directory
+
+**Option B: Office 365 Users Connector**
+- Same connector used for Producer People Picker
+- Consistent user experience across all people selection fields
+- Built-in search and user data
+
+**Option C: Separate Employee Table**
+- Maintain a separate list of active employees
+- Requires periodic sync but simpler implementation
+- More control over who appears in the list
+
+**Requirements (regardless of option):**
+- Must show ALL active employees (not just producers)
+- Search functionality by name
+- When selected, auto-assign code: **"EMPOR2"** (literal string for all employees)
+- Employee must be added to approval workflow (treated like a producer for acknowledgment)
+
+---
+
+## 4. EMAIL ADDRESS GENERATION & STORAGE
+
+### Purpose
+Generate or retrieve email addresses for all participants for Power Automate approval notifications.
+
+### Email Formula
+**Standard format:** `{FirstInitial}{LastName}@snellingswalters.com`
+
+**Examples:**
+- Frank Herron → FHerron@snellingswalters.com
+- Wade Beacham → WBeacham@snellingswalters.com
+- Mike Parsa → MParsa@snellingswalters.com
+
+### Implementation Options (Your Choice)
+
+**Option A: Calculate from Name**
+```javascript
+function generateEmail(fullName) {
+  const parts = fullName.trim().split(' ');
+  const firstName = parts[0];
+  const lastName = parts[parts.length - 1];
+  const firstInitial = firstName[0].toUpperCase();
+  const lastNameClean = lastName.charAt(0).toUpperCase() + lastName.slice(1).toLowerCase();
+  return `${firstInitial}${lastNameClean}@snellingswalters.com`;
+}
+```
+
+**Option B: Pull from Active Directory**
+- If using Microsoft Graph API or Office 365 Users connector, retrieve email directly from user profile
+- More reliable but requires AD integration
+- Fallback to calculated email if AD email unavailable
+
+### Email Requirements
+**Must generate emails for:**
+- Producer 1 (always)
+- Producer 2 (if present)
+- Originating Producer (if present)
+- CE Layer (if present)
+- CCP Layer (if Mike Parsa selected - not House Account)
+
+**Do NOT generate for:**
+- Legacy Producer (text field only, no approval needed)
+- House Account (ACCHO1 - not a person)
+
+### Data Storage
+Store emails in the agreement record for Power Automate to use:
+- `Producer1Email`
+- `Producer2Email` (nullable)
+- `OriginatorEmail` (nullable)
+- `CEEmail` (nullable)
+- `CCPEmail` (nullable - only if Mike Parsa)
+
+---
+
+## 5. CEDED ACCOUNTS - CE AS PRODUCER (REQUIRED FIELD)
+
+### Agreement Type: "Ceded Accounts - CE as Producer"
+
+### Current Issue
+CE still appears as an optional checkbox layer.
+
+### Required Behavior
+
+**When this agreement type is selected:**
+
+1. **Remove "Include CE Layer" checkbox entirely**
+2. **Show CE field as REQUIRED People Picker** (not optional)
+3. Label should be: **"Client Executive (Producer)"** not "CE Layer"
+4. CE gets their own commission line in preview table:
+   - Role: "Client Executive"
+   - Agreement Type: "Ceded Accounts - CE as Producer"
+   - Commission: 10%
+   - Production Credit: 100%
+   - ABE Status: Non-ABE (Code 2)
+
+5. No Producer 1 field should appear (CE replaces P1)
+6. CCP Layer can still be added as optional checkbox
+
+### Commission Calculation
+- CE: 10% commission, 100% production credit, Code 2
+- If CCP added: CCP takes 5% from CE's 10%, leaving CE with 5%
+
+---
+
+## 6. HOUSE AGREEMENT - LAYER DEDUCTION FIX
+
+### Agreement Type: "House Standard Agreement (100%)"
+
+### Current Bug
+Layers add on top of 100%, creating 102-107% total commission.
+
+### Correct Behavior
+**Layers must deduct from the 100% base:**
+
+| Scenario | House Account Commission | CE | CCP | Total |
+|----------|-------------------------|-----|-----|-------|
+| No layers | 100% | - | - | 100% |
+| CE only | 98% | 2% | - | 100% |
+| CCP only | 95% | - | 5% | 100% |
+| Both CE & CCP | 93% | 2% | 5% | 100% |
+
+### Implementation
+```javascript
+let houseCommission = 100;
+if (ceIncluded) houseCommission -= 2;
+if (ccpIncluded) houseCommission -= 5;
+```
+
+### Important Notes
+- Layers can be added to House agreements (leave checkboxes available)
+- House Account should always show in preview table with adjusted commission
+- Total commission must always equal 100%
+
+---
+
+## 7. HOUSE AGREEMENT - HIDE PRODUCER 1 FROM PREVIEW
+
+### Agreement Type: "House Standard Agreement (100%)"
+
+### Current Behavior
+Producer 1 appears in commission preview table.
+
+### Required Behavior
+
+**Producer 1 should:**
+- ✓ Appear in the form (for selection during input)
+- ✓ Appear in acknowledgment/approval section (must approve)
+- ✗ NOT appear in commission preview table (getting 0% commission)
+
+**Only show in preview table:**
+- House Account (ACCHO1) - with adjusted commission based on layers
+- CE Layer (if included)
+- CCP Layer (if included)
+
+**Rationale:** Producer 1 is approval processor only, not receiving commission, so shouldn't clutter the commission structure display.
+
+---
+
+## 8. LIFE ORIGINATION AGREEMENT - ALL YEARS
+
+### Agreement Type: "Life Origination Fee Agreement"
+
+### Current Bug
+Agreement drops off after Year 1, showing no commission in Year 2+.
+
+### Correct Behavior
+**Life Origination Fee Agreement applies to ALL years:**
+
+**Every Year (Year 1, Year 2, Year 3+):**
+| Role | Name | Producer Code | ABE Status | Agreement Type | Commission % | Prod Credit |
+|------|------|---------------|------------|----------------|--------------|-------------|
+| Producer 1 | [Name] | [Code] | Non-ABE | Life Origination Fee Agreement | 20% | 100% |
+| CE Layer | [Name] | [Code] | ABE | Client Executive Agreement | 2% | 0% |
+
+**Key Point:** This does NOT transition to House Standard Agreement in Year 2+. The producer continues earning 20% commission indefinitely.
+
+### BASE_RULES Update
+```javascript
+'LIFE': [
+  { year: 1, label: 'All Years', p1: { comm: 20, prod: 100, code: 2 } }
+]
+// Remove the Year 2+ rule that transitions to House Account
+```
+
+---
+
+## 9. ONEDRIVE INTEGRATION & POWER AUTOMATE WORKFLOW
+
+### Architecture Overview
+
+```
+┌─────────────┐    Generate    ┌──────────────┐    Trigger    ┌────────────────┐
+│  Web App    │───────────────>│   OneDrive   │─────────────>│ Power Automate │
+│  (Form)     │    Word Doc    │   (Shared)   │   New File   │   (Workflow)   │
+└─────────────┘                └──────────────┘              └────────────────┘
+      │                              │                                │
+      │ Save Metadata                │                                │
+      ▼                              │                                ▼
+┌─────────────┐                      │                      ┌────────────────┐
+│ SharePoint  │                      │ Final PDF            │ Email Approval │
+│   List      ���◄─────────────────────┴──────────────────────┤ Tracking       │
+└─────────────┘      Power Automate writes back             │ Signatures     │
+                                                              └────────────────┘
+```
+
+### OneDrive Implementation
+
+**File Storage:**
+- **Location:** Shared OneDrive folder accessible to both you and coworker
+- **Folder:** `/Commission Agreements - Drafts/` (or similar)
+- **Purpose:** Draft documents trigger Power Automate workflow
+
+**File Naming Convention:**
+```
+{AccountCode}_{AgreementType}_{PolicyEffectiveDate}.docx
+```
+
+**Example:** `GEMCONT-01_PhD_2024-01-15.docx`
+
+**Important:**
+- Use **Policy Effective Date** (from form), NOT submission date
+- Sanitize special characters from AgreementType (no spaces, slashes, etc.)
+- Ensure uniqueness - if duplicate exists, append counter: `_v2`, `_v3`
+
+### Word Document Generation
+
+**Use attached template:** `Commission_Agreement_DRAFT_Template.docx`
+
+**Web App Responsibilities (Fill These Fields):**
+- Header: `{{AgreementType}}`, `{{AgreementId}}`
+- Account Info: `{{AccountName}}`, `{{AccountCode}}`, `{{Department}}`, `{{Association}}`, `{{EstimatedRevenueDisplay}}`, `{{EffectiveDateShort}}`, `{{LegacyProducer}}`
+- Bell Ringer: `{{BellRingerDisplay}}`
+- Commission Tables: All `{{YearX_RowY_*}}` placeholders for up to 4 rows per year
+- Year labels: `{{Year1Label}}`, `{{Year2Label}}`, `{{Year3Label}}`
+- Totals: `{{Year1Total}}`, `{{Year2Total}}`, `{{Year3Total}}`
+- Conditional sections: `{{Year2SectionStart}}...{{Year2SectionEnd}}`, `{{Year3SectionStart}}...{{Year3SectionEnd}}`
+
+**Power Automate Responsibilities:**
+- Signature section: `{{Signer1_Name}}`, `{{Signer1_RoleAgreement}}`, etc.
+- Approval tracking: Date stamps, signature collection
+- Final PDF generation with completed signatures
+- Delivery to accounting/payroll
+
+### Database/SharePoint List for Metadata
+
+**Purpose:**
+- Fallback if PDF generation fails
+- Easier data access for Power Automate
+- Reporting and analytics
+- Dashboard data source
+
+**Recommended: SharePoint List named "Agreements"**
+
+**Required Columns:**
+- `ID` (auto-generated)
+- `AgreementId` (text - user-facing ID)
+- `Status` (choice: Draft, Pending Acknowledgment, In Progress, Finalized)
+- `AccountCode` (text)
+- `AccountName` (text)
+- `AgreementType` (text)
+- `PolicyEffectiveDate` (date)
+- `Department` (text)
+- `Association` (text)
+- `EstimatedRevenue` (currency)
+- `BellRinger` (yes/no)
+- `LegacyProducer` (text)
+- `Producer1Name`, `Producer1Code`, `Producer1Email` (text)
+- `Producer2Name`, `Producer2Code`, `Producer2Email` (text, nullable)
+- `OriginatorName`, `OriginatorCode`, `OriginatorEmail` (text, nullable)
+- `CEName`, `CECode`, `CEEmail` (text, nullable)
+- `CCPName`, `CCPCode`, `CCPEmail` (text, nullable)
+- `SubmittedBy` (person)
+- `SubmittedOn` (datetime)
+- `DraftDocumentUrl` (hyperlink - OneDrive path)
+- `FinalDocumentUrl` (hyperlink - final PDF path)
+- `ApprovalStatus` (JSON or multiline text - who has approved)
+
+**Alternative:** Use a database of your choice, but ensure Power Automate can read/write to it easily.
+
+### Power Automate Trigger
+- **Trigger:** When a file is created in OneDrive folder
+- **Folder:** `/Commission Agreements - Drafts/`
+- **Action:** Parse filename to extract AccountCode, AgreementType, EffectiveDate
+- **Action:** Query SharePoint list for matching agreement metadata
+- **Action:** Generate approval emails to all participants
+- **Action:** Track approvals and signatures
+- **Action:** Generate final PDF with signatures
+- **Action:** Update SharePoint list with final PDF URL and status
+
+---
+
+## 10. DASHBOARD - AGREEMENT STATUS & DISPLAY
+
+### Dashboard Requirements
+
+**Display ALL agreements for logged-in user:**
+- Draft agreements
+- Pending acknowledgment agreements
+- In-progress agreements (partial approvals)
+- Finalized agreements
+
+### Agreement Cards/Rows Should Show:
+
+**All Statuses:**
+- Account Name
+- Agreement Type
+- Policy Effective Date
+- Submission Date
+- Current Status
+
+**Draft Agreements:**
+- Summary table preview
+- Link to draft PDF
+- "Edit" and "Delete" buttons
+
+**Pending/In Progress Agreements:**
+- Summary table preview
+- Link to draft PDF
+- **Approval Timeline** showing:
+  - Who has approved (✓ checkmark, timestamp)
+  - Who is pending (○ circle, awaiting)
+  - Example: "Producer 1 ✓ (3/10/2024) | CE Layer ○ (Pending) | CCP ○ (Pending)"
+
+**Finalized Agreements:**
+- Summary table preview
+- Link to final PDF (with all signatures and timestamps)
+- "Delete" button (visual only - data persists in database)
+
+### Delete Functionality
+- **Draft:** Deletes from database and removes draft file from OneDrive
+- **Finalized:** Removes from user's dashboard view, but data remains in database for audit/reporting
+- **In Progress:** Do not allow deletion (must cancel/reject first)
+
+### Data Source
+- Query SharePoint list (or database) filtered by `SubmittedBy = CurrentUser`
+- Pull `DraftDocumentUrl` and `FinalDocumentUrl` for PDF links
+- Parse `ApprovalStatus` to show timeline
+
+---
+
+## 11. TECHNICAL IMPLEMENTATION NOTES
+
+### Email Generation Function
+```javascript
+function generateParticipantEmails(participants) {
+  const emails = {};
+  
+  function toEmail(fullName) {
+    if (!fullName || fullName === 'House Account') return null;
+    const parts = fullName.trim().split(' ');
+    const firstName = parts[0];
+    const lastName = parts[parts.length - 1];
+    return `${firstName[0].toUpperCase()}${lastName}@snellingswalters.com`;
+  }
+  
+  if (participants.producer1) emails.Producer1Email = toEmail(participants.producer1.name);
+  if (participants.producer2) emails.Producer2Email = toEmail(participants.producer2.name);
+  if (participants.originator) emails.OriginatorEmail = toEmail(participants.originator.name);
+  if (participants.ce) emails.CEEmail = toEmail(participants.ce.name);
+  if (participants.ccp && participants.ccp.name === 'Mike Parsa') {
+    emails.CCPEmail = 'MParsa@snellingswalters.com';
+  }
+  
+  return emails;
+}
+```
+
+### File Naming Sanitization
+```javascript
+function generateFileName(accountCode, agreementType, effectiveDate) {
+  // Sanitize agreement type (remove special chars)
+  const cleanType = agreementType.replace(/[^a-zA-Z0-9]/g, '');
+  
+  // Format date as YYYY-MM-DD
+  const dateStr = effectiveDate.toISOString().split('T')[0];
+  
+  return `${accountCode}_${cleanType}_${dateStr}.docx`;
+}
+```
+
+### Word Template Population
+Use a library like:
+- **docx-templates** (npm package)
+- **PizZip + Docxtemplater** (for browser-based generation)
+- **mammoth.js** (for reading, then custom write logic)
+
+Choose based on your tech stack and whether generation happens client-side or server-side.
+
+### SharePoint List Write
+If using SharePoint REST API:
+```javascript
+async function saveAgreementMetadata(data) {
+  const listUrl = `${siteUrl}/_api/web/lists/getbytitle('Agreements')/items`;
+  
+  const response = await fetch(listUrl, {
+    method: 'POST',
+    headers: {
+      'Accept': 'application/json;odata=verbose',
+      'Content-Type': 'application/json;odata=verbose',
+      'X-RequestDigest': formDigestValue
+    },
+    body: JSON.stringify({
+      '__metadata': { 'type': 'SP.Data.AgreementsListItem' },
+      'Title': data.agreementId,
+      'AccountCode': data.accountCode,
+      'AgreementType': data.agreementType,
+      // ... all other fields
+    })
+  });
+  
+  return await response.json();
+}
+```
+
+---
+
+## 12. IMPLEMENTATION CHECKLIST
+
+### Phase 1: UI Updates
+- [ ] Add Name and Producer Code columns to preview tables
+- [ ] Reorder columns: Role | Name | Code | ABE | Agreement | Comm% | ProdCredit
+- [ ] Update all year tables (Year 1, Year 2, Year 3+) with new columns
+
+### Phase 2: Submit Safeguard
+- [ ] Create modal/popup component for document preview
+- [ ] Generate draft document on "Submit" click
+- [ ] Display document in modal with scroll
+- [ ] Add "Go Back & Edit" button (closes modal)
+- [ ] Add "Confirm & Submit" button (saves and submits)
+- [ ] Handle document generation errors gracefully
+
+### Phase 3: Employee Originator Integration
+- [ ] Implement Active Directory / employee search (your choice of method)
+- [ ] Add People Picker for originator selection
+- [ ] Auto-assign "EMPOR2" code for all employee originators
+- [ ] Add employee to approval workflow
+
+### Phase 4: Email Generation
+- [ ] Implement email generation function (calculate or pull from AD)
+- [ ] Generate emails for all participants (except Legacy and House Account)
+- [ ] Store emails in agreement metadata for Power Automate
+
+### Phase 5: Ceded Accounts - CE as Producer
+- [ ] Remove CE checkbox for this agreement type
+- [ ] Show CE field as required People Picker
+- [ ] Update label to "Client Executive (Producer)"
+- [ ] Update commission calculation (CE = 10%, not layer deduction)
+- [ ] Update preview table to show CE as main participant
+
+### Phase 6: House Agreement Fixes
+- [ ] Fix layer deduction logic (subtract from 100%, don't add)
+- [ ] Remove Producer 1 from preview table (keep in approval section)
+- [ ] Test all layer combinations (none, CE only, CCP only, both)
+
+### Phase 7: Life Origination All Years
+- [ ] Update BASE_RULES to apply to all years
+- [ ] Remove Year 2+ transition to House Standard
+- [ ] Verify preview shows same structure for all years
+
+### Phase 8: OneDrive Integration
+- [ ] Implement Word document generation from template
+- [ ] Populate all required template placeholders
+- [ ] Implement file naming convention with sanitization
+- [ ] Save generated document to OneDrive shared folder
+- [ ] Handle file upload errors and retries
+
+### Phase 9: Database/SharePoint Metadata
+- [ ] Create SharePoint list with all required columns (or set up database)
+- [ ] Implement save function for agreement metadata
+- [ ] Store all participant info, emails, URLs
+- [ ] Handle create and update operations
+
+### Phase 10: Dashboard
+- [ ] Query agreements for current user
+- [ ] Display cards/rows for all agreement statuses
+- [ ] Show summary table preview for each agreement
+- [ ] Add links to draft PDF and final PDF
+- [ ] Implement approval timeline display (in progress agreements)
+- [ ] Add delete functionality (draft & finalized)
+- [ ] Prevent deletion of in-progress agreements
+
+---
+
+## 13. TESTING SCENARIOS
+
+### Scenario 1: Standard Agreement with Preview Check
+1. Fill out Standard Agreement form
+2. Click "Submit for Approval"
+3. Verify modal appears with draft PDF
+4. Click "Go Back & Edit"
+5. Verify modal closes, form still populated
+6. Make edit, click "Submit" again
+7. Verify modal shows updated PDF
+8. Click "Confirm & Submit"
+9. Verify document saved to OneDrive with correct filename
+10. Verify metadata saved to SharePoint
+11. Verify draft appears in dashboard
+
+### Scenario 2: Ceded Accounts - CE as Producer
+1. Select "Ceded Accounts - CE as Producer"
+2. Verify CE checkbox removed
+3. Verify CE field appears as required People Picker
+4. Select CE from People Picker
+5. Add CCP layer (optional)
+6. Verify preview table shows:
+   - CE as main participant (10% commission)
+   - CCP layer (5% commission, reducing CE to 5%)
+7. Verify CE email generated correctly
+
+### Scenario 3: House Agreement with Layers
+1. Select "House Standard Agreement"
+2. Select Producer 1 (for approval)
+3. Check CE layer box, select CE
+4. Check CCP layer box, select Mike Parsa
+5. Verify preview table shows:
+   - House Account: 93% commission
+   - CE Layer: 2%
+   - CCP Layer: 5%
+   - Total: 100%
+   - Producer 1 NOT in table
+6. Generate draft PDF
+7. Verify Producer 1 appears in signature section
+
+### Scenario 4: Life Origination All Years
+1. Select "Life Origination Fee Agreement"
+2. Fill out form
+3. Verify preview shows 3 year tables
+4. Verify all 3 years show:
+   - Producer 1: Life Origination Fee Agreement, 20%
+5. Verify Year 2+ does NOT transition to House Standard
+
+### Scenario 5: Employee Originator
+1. Select "Referral / Origination Fee Agreement"
+2. Fill Producer 1
+3. Check "Employee as Originator"
+4. Search for employee (not a producer)
+5. Select employee
+6. Verify code auto-assigned as "EMPOR2"
+7. Verify employee email generated
+8. Verify employee appears in approval section
+
+### Scenario 6: Dashboard Display
+1. Submit 3 agreements in different states:
+   - One draft (save without submitting)
+   - One pending (submitted, no approvals yet)
+   - One in progress (submitted, P1 approved, CE pending)
+2. Navigate to dashboard
+3. Verify all 3 appear
+4. Verify pending shows approval timeline
+5. Verify in-progress shows checkmarks and timestamps
+6. Click draft PDF link - verify opens
+7. Delete draft agreement - verify removed
+8. Attempt to delete in-progress - verify blocked
+
+### Scenario 7: OneDrive & Power Automate Integration
+1. Submit agreement "GEMCONT-01", "PhD Agreement", effective date 2024-03-15
+2. Verify file appears in OneDrive as: `GEMCONT-01_PhDAgreement_2024-03-15.docx`
+3. Verify Power Automate flow triggers (check flow run history)
+4. Verify SharePoint list contains agreement metadata
+5. Simulate approval in Power Automate
+6. Verify dashboard updates with approval status
+7. Verify final PDF appears in dashboard once flow completes
+
+---
+
+## 14. POWER AUTOMATE INTEGRATION REQUIREMENTS
+
+**What the Web App Must Provide for Power Automate:**
+
+1. **Trigger File in OneDrive**
+   - Correct naming convention
+   - Valid Word document with placeholders filled
+
+2. **SharePoint Metadata Record**
+   - All participant names, codes, emails
+   - Agreement details (account, type, dates)
+   - Status field for Power Automate to update
+   - URLs for draft and final documents
+
+3. **Consistent Data Structure**
+   - Agreement IDs must be unique and predictable
+   - Email addresses must be valid and formatted correctly
+   - All required fields populated (no nulls where not allowed)
+
+**What Power Automate Will Handle:**
+
+1. Detect new draft document in OneDrive
+2. Query SharePoint for agreement metadata
+3. Send approval emails to all participants
+4. Track approval responses and timestamps
+5. Update SharePoint with approval status
+6. Generate final PDF with signatures
+7. Upload final PDF to separate OneDrive folder
+8. Update SharePoint with final PDF URL
+9. Update status to "Finalized"
+10. Send final PDF to accounting@snellingswalters.com and payroll@snellingswalters.com
+
+**Critical:** Ensure the web app's data structure matches what Power Automate expects. Coordinate on SharePoint column names, data types, and OneDrive folder paths.
+
+---
+
+## 15. PRIORITY ORDER
+
+If implementing incrementally:
+
+1. **Preview table updates** (add Name, Code columns) - Quick visual improvement
+2. **Submit safeguard modal** - Critical for validation
+3. **Email generation** - Required for Power Automate
+4. **OneDrive file generation & upload** - Core integration
+5. **SharePoint metadata storage** - Backup and data source
+6. **Dashboard display** - User visibility
+7. **Bug fixes** (House layers, Life all years, CE as producer) - Correct calculations
+8. **Employee originator** - Specific feature
+9. **Approval timeline** - Nice-to-have enhancement
+10. **Delete functionality** - Organization feature
+
+---
+
+## QUESTIONS TO CLARIFY BEFORE STARTING
+
+If anything needs clarification:
+- OneDrive authentication method (service account vs. user delegation)
+- SharePoint site URL and list structure preferences
+- Word document generation library preference
+- Frontend framework being used (React, Vue, vanilla JS?)
+- Whether backend API exists or all client-side
+- Authentication/user context (how do you get current user?)
+
+Let me know if you need any clarification on the requirements!

app/docx_generator.py

@@ -0,0 +1,317 @@
+"""
+Word Document Generator for Commission Agreement Intake Form.
+Populates the DRAFT or FINAL .docx template with form/summary data.
+
+Templates are stored in Feedback/ folder:
+  - Commission_Agreement_DRAFT_Template.docx
+  - Commission_Agreement_FINAL_Template.docx
+
+Template structure (tables indexed from 0):
+  Table 0: Header — {{AgreementType}}, {{AgreementId}}
+  Table 1: Account Information (empty cells to fill programmatically)
+  Table 2: Year 1 label — {{Year1Label}}
+  Table 3: Year 1 data — {{Year1RowN_*}} (4 data rows + totals)
+  Table 4: Year 2 label — {{Year2Label}}
+  Table 5: Year 2 data — {{Year2RowN_*}}
+  Table 6: Year 3 label — {{Year3Label}}
+  Table 7: Year 3 data — {{Year3RowN_*}}
+  Table 8: Signers 1 & 2
+  Table 9: Signers 3 & 4
+
+Paragraphs: {{EffectiveDate}}, {{BellRingerDisplay}}, {{AgreementType}},
+            {{SubmittedBy}}, {{SubmittedOn}}, {{Year2SectionStart/End}},
+            {{Year3SectionStart/End}}
+"""
+
+import os
+import re
+from copy import deepcopy
+from io import BytesIO
+from datetime import datetime
+
+from docx import Document
+from docx.shared import Pt
+
+
+# ── Template paths ────────────────────────────────────────
+TEMPLATE_DIR = os.path.join(os.path.dirname(__file__), "..", "Feedback")
+DRAFT_TEMPLATE = os.path.join(TEMPLATE_DIR, "Commission_Agreement_DRAFT_Template.docx")
+FINAL_TEMPLATE = os.path.join(TEMPLATE_DIR, "Commission_Agreement_FINAL_Template.docx")
+
+# Department code → full name
+DEPT_NAMES = {
+    "BD": "BD - Bond", "CL": "CL - Commercial Lines",
+    "CON": "CON - Connect", "EB": "EB - Employee Benefits",
+    "PL": "PL - Personal Lines", "VAN": "VAN - Vanguard", "LIF": "LIF - Life",
+}
+
+
+def _replace_in_paragraph(paragraph, old, new):
+    """Replace placeholder text in a paragraph, handling single-run placeholders."""
+    for run in paragraph.runs:
+        if old in run.text:
+            run.text = run.text.replace(old, str(new) if new is not None else "")
+
+
+def _replace_in_cell(cell, old, new):
+    """Replace placeholder text across all paragraphs in a table cell."""
+    for paragraph in cell.paragraphs:
+        _replace_in_paragraph(paragraph, old, new)
+
+
+def _replace_in_table(table, old, new):
+    """Replace placeholder text across all cells in a table."""
+    for row in table.rows:
+        for cell in row.cells:
+            _replace_in_cell(cell, old, new)
+
+
+def _replace_all(doc, old, new):
+    """Replace placeholder in all paragraphs and tables."""
+    for paragraph in doc.paragraphs:
+        _replace_in_paragraph(paragraph, old, new)
+    for table in doc.tables:
+        _replace_in_table(table, old, new)
+
+
+def _fill_account_info(table, form_data, bell_ringer):
+    """Fill the Account Information table (Table 1) — it starts empty."""
+    # Table 1 has 1 row x 2 cells; we'll add text content
+    if len(table.rows) == 0:
+        return
+
+    cell_left = table.rows[0].cells[0]
+    cell_right = table.rows[0].cells[1]
+
+    client_code = form_data.get("client_code", "—") or "—"
+    client_name = form_data.get("client_name", "—") or "—"
+    dept_code = form_data.get("dept_code", "")
+    dept_display = DEPT_NAMES.get(dept_code, dept_code) or "—"
+    association = form_data.get("association", "—") or "—"
+    revenue = form_data.get("revenue", 0) or 0
+    legacy = form_data.get("legacy_producer", "—") or "—"
+
+    # Left cell: Account Code, Account Name, Department
+    left_lines = [
+        f"Account Code:  {client_code}",
+        f"Account Name:  {client_name}",
+        f"Department:  {dept_display}",
+    ]
+
+    # Right cell: Association, Revenue, Legacy Producer
+    revenue_display = f"${revenue:,.0f}" if revenue else "—"
+    right_lines = [
+        f"Association:  {association}",
+        f"Estimated Revenue:  {revenue_display}",
+        f"Legacy Producer:  {legacy}",
+    ]
+
+    # Clear existing content and add lines
+    for p in cell_left.paragraphs:
+        p.clear()
+    for p in cell_right.paragraphs:
+        p.clear()
+
+    # Write to left cell
+    for i, line in enumerate(left_lines):
+        if i == 0:
+            cell_left.paragraphs[0].text = line
+        else:
+            cell_left.add_paragraph(line)
+    # Style
+    for p in cell_left.paragraphs:
+        for run in p.runs:
+            run.font.size = Pt(9)
+
+    # Write to right cell
+    for i, line in enumerate(right_lines):
+        if i == 0:
+            cell_right.paragraphs[0].text = line
+        else:
+            cell_right.add_paragraph(line)
+    for p in cell_right.paragraphs:
+        for run in p.runs:
+            run.font.size = Pt(9)
+
+
+def _fill_year_table(doc, year_index, year_data, year_tables):
+    """Fill a year's label table and data table.
+
+    year_index: 0=Year1, 1=Year2, 2=Year3
+    year_data: dict with year_label and rows from compute_summary, or None
+    """
+    prefix = f"Year{year_index + 1}"
+    label_table_idx = 2 + year_index * 2   # Tables 2, 4, 6
+    data_table_idx = 3 + year_index * 2    # Tables 3, 5, 7
+
+    if year_data:
+        # Fill year label
+        label = year_data.get("year_label", f"Year {year_index + 1}")
+        _replace_in_table(doc.tables[label_table_idx], f"{{{{{prefix}Label}}}}", label)
+
+        # Fill data rows (up to 4)
+        rows = year_data.get("rows", [])
+        for ri in range(4):
+            row_prefix = f"{prefix}Row{ri + 1}"
+            if ri < len(rows):
+                r = rows[ri]
+                _replace_in_table(doc.tables[data_table_idx], f"{{{{{row_prefix}_Role}}}}", r.get("role", ""))
+                _replace_in_table(doc.tables[data_table_idx], f"{{{{{row_prefix}_Name}}}}", r.get("name", "") or "")
+                _replace_in_table(doc.tables[data_table_idx], f"{{{{{row_prefix}_Code}}}}", r.get("code", "") or "")
+                _replace_in_table(doc.tables[data_table_idx], f"{{{{{row_prefix}_Type}}}}", r.get("abe_status", ""))
+                _replace_in_table(doc.tables[data_table_idx], f"{{{{{row_prefix}_Agreement}}}}", r.get("agreement_type", ""))
+                _replace_in_table(doc.tables[data_table_idx], f"{{{{{row_prefix}_CommPct}}}}", f"{r.get('commission_pct', 0)}%")
+                _replace_in_table(doc.tables[data_table_idx], f"{{{{{row_prefix}_ProdCredit}}}}", f"{r.get('production_pct', 0)}%")
+            else:
+                # Clear unused rows
+                for field in ["_Role", "_Name", "_Code", "_Type", "_Agreement", "_CommPct", "_ProdCredit"]:
+                    _replace_in_table(doc.tables[data_table_idx], f"{{{{{row_prefix}{field}}}}}", "")
+
+        # Total
+        total_comm = sum(r.get("commission_pct", 0) for r in rows)
+        _replace_in_table(doc.tables[data_table_idx], f"{{{{{prefix}Total}}}}", f"{total_comm}%")
+    else:
+        # No data for this year — clear all placeholders
+        _replace_in_table(doc.tables[label_table_idx], f"{{{{{prefix}Label}}}}", "")
+        for ri in range(4):
+            row_prefix = f"{prefix}Row{ri + 1}"
+            for field in ["_Role", "_Name", "_Code", "_Type", "_Agreement", "_CommPct", "_ProdCredit"]:
+                _replace_in_table(doc.tables[data_table_idx], f"{{{{{row_prefix}{field}}}}}", "")
+        _replace_in_table(doc.tables[data_table_idx], f"{{{{{prefix}Total}}}}", "")
+
+
+def _fill_signers(doc, participants, approvals, is_draft):
+    """Fill signer blocks in Tables 8 and 9 (up to 4 signers)."""
+    # DRAFT template: SignerN_Name, SignerN_RoleAgreement (+ Signature/Date lines)
+    # FINAL template: SignerN_Name, SignerN_RoleAgreement, SignerN_Status, SignerN_AcknowledgedOn
+
+    approval_map = {}
+    if approvals:
+        for a in approvals:
+            code = a.get("producer_code", "")
+            if code:
+                approval_map[code] = a
+
+    for i in range(4):
+        signer_num = i + 1
+        name_key = f"{{{{Signer{signer_num}_Name}}}}"
+        role_key = f"{{{{Signer{signer_num}_RoleAgreement}}}}"
+
+        if i < len(participants):
+            p = participants[i]
+            _replace_all(doc, name_key, p.get("name", ""))
+            _replace_all(doc, role_key, f"{p.get('role', '')} — {p.get('code', '')}")
+
+            # FINAL template fields
+            if not is_draft:
+                status_key = f"{{{{Signer{signer_num}_Status}}}}"
+                date_key = f"{{{{Signer{signer_num}_AcknowledgedOn}}}}"
+                a = approval_map.get(p.get("code", ""), {})
+                status = a.get("status", "pending")
+                if status == "approved":
+                    _replace_all(doc, status_key, "Acknowledged")
+                elif status == "rejected":
+                    _replace_all(doc, status_key, "Rejected")
+                else:
+                    _replace_all(doc, status_key, "Pending")
+                responded = a.get("responded_at")
+                if responded and isinstance(responded, str):
+                    _replace_all(doc, date_key, responded)
+                elif responded and hasattr(responded, "strftime"):
+                    _replace_all(doc, date_key, responded.strftime("%m/%d/%Y %I:%M %p"))
+                else:
+                    _replace_all(doc, date_key, "—")
+        else:
+            _replace_all(doc, name_key, "")
+            _replace_all(doc, role_key, "")
+            if not is_draft:
+                _replace_all(doc, f"{{{{Signer{signer_num}_Status}}}}", "")
+                _replace_all(doc, f"{{{{Signer{signer_num}_AcknowledgedOn}}}}", "")
+
+
+def _remove_year_section(doc, year_num):
+    """Remove paragraphs and tables for unused year sections.
+
+    Looks for {{YearNSectionStart}} / {{YearNSectionEnd}} markers and
+    hides content between them by clearing text.
+    """
+    start_marker = f"{{{{Year{year_num}SectionStart}}}}"
+    end_marker = f"{{{{Year{year_num}SectionEnd}}}}"
+
+    # Just clear the marker paragraphs (the tables between them will have
+    # empty placeholders already cleared by _fill_year_table)
+    for p in doc.paragraphs:
+        if start_marker in p.text or end_marker in p.text:
+            p.text = ""
+
+
+def generate_docx(form_data: dict, summary_data: dict,
+                  approvals: list = None, is_draft: bool = True,
+                  submission_id: int = None,
+                  submitter_name: str = None) -> bytes:
+    """
+    Generate a branded Word document from the template.
+
+    Returns: DOCX file as bytes.
+    """
+    template_path = DRAFT_TEMPLATE if is_draft else FINAL_TEMPLATE
+    if not os.path.exists(template_path):
+        raise FileNotFoundError(f"Template not found: {template_path}")
+
+    doc = Document(template_path)
+
+    agreement_name = summary_data.get("agreement_name", "—")
+    year_tables = summary_data.get("year_tables", [])
+    participants = summary_data.get("participants", [])
+    bell_ringer = summary_data.get("bell_ringer", {})
+
+    # ── Global paragraph replacements ─────────────────────
+    effective_date = form_data.get("effective_date", "—") or "—"
+    _replace_all(doc, "{{EffectiveDate}}", effective_date)
+    _replace_all(doc, "{{AgreementType}}", agreement_name)
+
+    # Agreement ID
+    agr_id = f"CA-{submission_id:04d}" if submission_id else "CA-0000"
+    _replace_all(doc, "{{AgreementId}}", agr_id)
+
+    # Bell Ringer
+    bell_status = bell_ringer.get("status", "")
+    if bell_status == "triggered":
+        bell_display = f"BELL RINGER TRIGGERED (threshold ${bell_ringer.get('threshold', 0):,.0f})"
+    elif bell_status == "not_triggered":
+        bell_display = f"Bell Ringer: not triggered (threshold ${bell_ringer.get('threshold', 0):,.0f})"
+    else:
+        bell_display = "Bell Ringer: N/A"
+    _replace_all(doc, "{{BellRingerDisplay}}", bell_display)
+
+    # Submitter info
+    _replace_all(doc, "{{SubmittedBy}}", submitter_name or "—")
+    _replace_all(doc, "{{SubmittedOn}}", datetime.now().strftime("%m/%d/%Y %I:%M %p"))
+
+    # ── Account Information (Table 1) ─────────────────────
+    if len(doc.tables) > 1:
+        _fill_account_info(doc.tables[1], form_data, bell_ringer)
+
+    # ── Year tables (Tables 2-7) ──────────────────────────
+    for yi in range(3):
+        year_data = year_tables[yi] if yi < len(year_tables) else None
+        _fill_year_table(doc, yi, year_data, year_tables)
+
+    # Remove unused year sections
+    if len(year_tables) < 2:
+        _remove_year_section(doc, 2)
+    if len(year_tables) < 3:
+        _remove_year_section(doc, 3)
+
+    # Clear section markers for visible years too
+    for yn in [2, 3]:
+        _replace_all(doc, f"{{{{Year{yn}SectionStart}}}}", "")
+        _replace_all(doc, f"{{{{Year{yn}SectionEnd}}}}", "")
+
+    # ── Signers (Tables 8-9) ─────────────────────────────
+    _fill_signers(doc, participants, approvals, is_draft)
+
+    # ── Save to bytes ─────────────────────────────────────
+    buf = BytesIO()
+    doc.save(buf)
+    return buf.getvalue()

app/models.py

@@ -194,6 +194,7 @@ class IntakeSubmission(Base):
 
     bell_ringer_triggered = Column(Boolean, default=False)
     dept_code       = Column(String(10), nullable=True)
+    hidden          = Column(Boolean, default=False)  # soft-delete for finalized
 
     approvals = relationship("Approval", back_populates="submission",
                              cascade="all, delete-orphan")

app/pdf_generator.py

@@ -395,18 +395,20 @@ def _field_pair(label, value, styles):
 
 # ── Per-year table builder ───────────────────────────────
 def _build_year_table(year_table_data, styles, page_width):
-    """Build a single year's commission table with 5 columns:
-    Role | Agreement Type | Commission % | Production % | ABE Status
+    """Build a single year's commission table with 7 columns:
+    Role | Name | Code | ABE Status | Agreement Type | Commission % | Prod Credit
     """
     year_label = year_table_data.get("year_label", "")
     rows = year_table_data.get("rows", [])
 
     col_widths = [
-        page_width * 0.20,   # Role
-        page_width * 0.28,   # Agreement Type
-        page_width * 0.18,   # Commission %
-        page_width * 0.18,   # Production %
-        page_width * 0.16,   # ABE Status
+        page_width * 0.14,   # Role
+        page_width * 0.16,   # Name
+        page_width * 0.10,   # Code
+        page_width * 0.10,   # ABE Status
+        page_width * 0.22,   # Agreement Type
+        page_width * 0.14,   # Commission %
+        page_width * 0.14,   # Prod Credit
     ]
 
     # Year label header
@@ -417,16 +419,20 @@ def _build_year_table(year_table_data, styles, page_width):
     # Table header row
     header = [
         Paragraph("<b>Role</b>", styles["TableCellBold"]),
+        Paragraph("<b>Name</b>", styles["TableCellBold"]),
+        Paragraph("<b>Code</b>", styles["TableCellBold"]),
+        Paragraph("<b>ABE</b>", styles["TableCellBold"]),
         Paragraph("<b>Agreement Type</b>", styles["TableCellBold"]),
-        Paragraph("<b>Commission %</b>", styles["TableCellBold"]),
-        Paragraph("<b>Production %</b>", styles["TableCellBold"]),
-        Paragraph("<b>ABE Status</b>", styles["TableCellBold"]),
+        Paragraph("<b>Comm %</b>", styles["TableCellBold"]),
+        Paragraph("<b>Prod Credit</b>", styles["TableCellBold"]),
     ]
 
     data = [header]
 
     for row in rows:
         role = row.get("role", "")
+        name = row.get("name", "—") or "—"
+        code = row.get("code", "—") or "—"
         agr_type = row.get("agreement_type", "—")
         comm_pct = row.get("commission_pct")
         prod_pct = row.get("production_pct")
@@ -443,10 +449,12 @@ def _build_year_table(year_table_data, styles, page_width):
 
         data.append([
             Paragraph(f"<b>{role}</b>", styles["TableCell"]),
+            Paragraph(name, styles["TableCell"]),
+            Paragraph(code, styles["TableCell"]),
+            Paragraph(abe_text, styles["TableCell"]),
             Paragraph(agr_type, styles["TableCell"]),
             Paragraph(f"<b>{comm_text}</b>", styles["TableCell"]),
             Paragraph(prod_text, styles["TableCell"]),
-            Paragraph(abe_text, styles["TableCell"]),
         ])
 
     t = Table(data, colWidths=col_widths, repeatRows=1)

app/routes/form_routes.py

@@ -12,6 +12,7 @@ from app.models import (
 )
 from app.rules_engine import compute_summary, check_bell_ringer
 from app.pdf_generator import generate_pdf
+from app.docx_generator import generate_docx
 
 router = APIRouter()
 templates = Jinja2Templates(directory="app/templates")
@@ -98,7 +99,19 @@ async def api_check_bell(request: Request,
     return JSONResponse(result)
 
 
-def _lookup_producer_email(db: Session, producer_code: str) -> str:
+def _generate_email_from_name(full_name: str) -> str:
+    """Generate email as FirstInitial + LastName @ snellingswalters.com"""
+    if not full_name or full_name.lower() == 'house account':
+        return None
+    parts = full_name.strip().split()
+    if len(parts) < 2:
+        return None
+    first_initial = parts[0][0].upper()
+    last_name = parts[-1].capitalize()
+    return f"{first_initial}{last_name}@snellingswalters.com"
+
+
+def _lookup_producer_email(db: Session, producer_code: str, producer_name: str = None) -> str:
     if not producer_code:
         return None
     producer = db.query(Producer).filter(
@@ -107,6 +120,10 @@ def _lookup_producer_email(db: Session, producer_code: str) -> str:
     ).first()
     if producer and producer.email:
         return producer.email
+    # Fallback: generate from name
+    name = (producer.name if producer else producer_name) or producer_name
+    if name:
+        return _generate_email_from_name(name)
     return None
 
 
@@ -180,7 +197,7 @@ async def api_submit_form(request: Request,
             continue
 
         approval_token = uuid.uuid4().hex
-        approver_email = _lookup_producer_email(db, code)
+        approver_email = _lookup_producer_email(db, code, name)
         if not approver_email:
             emails_missing.append(f"{name} ({code})")
 
@@ -221,6 +238,10 @@ async def api_submit_form(request: Request,
     db.refresh(submission)
 
     # Generate DRAFT PDF
+    import os
+    doc_dir = "/data/pdfs"
+    os.makedirs(doc_dir, exist_ok=True)
+
     try:
         pdf_bytes = generate_pdf(
             form_data=body,
@@ -229,10 +250,7 @@ async def api_submit_form(request: Request,
             is_draft=True,
             submission_id=submission.id,
         )
-        pdf_dir = "/data/pdfs"
-        import os
-        os.makedirs(pdf_dir, exist_ok=True)
-        pdf_path = os.path.join(pdf_dir, f"submission_{submission.id}_draft.pdf")
+        pdf_path = os.path.join(doc_dir, f"submission_{submission.id}_draft.pdf")
         with open(pdf_path, "wb") as f:
             f.write(pdf_bytes)
         pdf_generated = True
@@ -242,6 +260,26 @@ async def api_submit_form(request: Request,
         traceback.print_exc()
         pdf_generated = False
 
+    # Generate DRAFT Word Document
+    docx_generated = False
+    try:
+        docx_bytes = generate_docx(
+            form_data=body,
+            summary_data=summary,
+            approvals=approvals_created,
+            is_draft=True,
+            submission_id=submission.id,
+            submitter_name=current_user.full_name,
+        )
+        docx_path = os.path.join(doc_dir, f"submission_{submission.id}_draft.docx")
+        with open(docx_path, "wb") as f:
+            f.write(docx_bytes)
+        docx_generated = True
+    except Exception as e:
+        print(f"[DOCX] Draft generation failed: {e}")
+        import traceback
+        traceback.print_exc()
+
     # Alert admin about missing emails
     if emails_missing:
         from app.email_service import send_missing_emails_alert
@@ -262,6 +300,7 @@ async def api_submit_form(request: Request,
         "success": True,
         "submission_id": submission.id,
         "pdf_available": pdf_generated,
+        "docx_available": docx_generated,
         "approvals_count": len(approvals_created),
         "emails_sent": emails_sent,
         "emails_missing": emails_missing,
@@ -328,6 +367,75 @@ async def download_pdf(submission_id: int,
     )
 
 
+@router.get("/api/download-docx/{submission_id}")
+async def download_docx(submission_id: int,
+                        request: Request,
+                        current_user: User = Depends(get_current_user),
+                        db: Session = Depends(get_db)):
+    submission = db.query(IntakeSubmission).filter(
+        IntakeSubmission.id == submission_id
+    ).first()
+
+    if not submission:
+        return JSONResponse({"error": "Submission not found"}, status_code=404)
+
+    import os
+
+    # Check for cached files first
+    final_path = f"/data/pdfs/submission_{submission_id}_final.docx"
+    draft_path = f"/data/pdfs/submission_{submission_id}_draft.docx"
+
+    if os.path.exists(final_path):
+        docx_path = final_path
+        filename = f"CA_{submission_id}_FINAL.docx"
+    elif os.path.exists(draft_path):
+        docx_path = draft_path
+        filename = f"CA_{submission_id}_DRAFT.docx"
+    else:
+        # Generate on the fly
+        approvals = db.query(Approval).filter(
+            Approval.submission_id == submission_id
+        ).all()
+        approval_dicts = [{
+            "role_label": a.role_label,
+            "approver_name": a.approver_name,
+            "producer_code": a.producer_code,
+            "status": a.status,
+            "responded_at": a.responded_at.strftime("%m/%d/%Y %I:%M %p") if a.responded_at else None,
+        } for a in approvals]
+
+        is_final = submission.status == "approved"
+        submitter = db.query(User).filter(User.id == submission.submitted_by).first()
+
+        try:
+            docx_bytes = generate_docx(
+                form_data=submission.form_data,
+                summary_data=submission.summary_data,
+                approvals=approval_dicts,
+                is_draft=not is_final,
+                submission_id=submission_id,
+                submitter_name=submitter.full_name if submitter else "—",
+            )
+        except FileNotFoundError:
+            return JSONResponse({"error": "Word template not found on server"}, status_code=500)
+
+        filename = f"CA_{submission_id}_{'FINAL' if is_final else 'DRAFT'}.docx"
+        return Response(
+            content=docx_bytes,
+            media_type="application/vnd.openxmlformats-officedocument.wordprocessingml.document",
+            headers={"Content-Disposition": f'attachment; filename="{filename}"'},
+        )
+
+    with open(docx_path, "rb") as f:
+        docx_bytes = f.read()
+
+    return Response(
+        content=docx_bytes,
+        media_type="application/vnd.openxmlformats-officedocument.wordprocessingml.document",
+        headers={"Content-Disposition": f'attachment; filename="{filename}"'},
+    )
+
+
 @router.get("/api/submission/{submission_id}")
 async def get_submission(submission_id: int,
                          request: Request,
@@ -418,6 +526,24 @@ async def delete_draft(draft_id: int,
     return JSONResponse({"success": True})
 
 
+@router.post("/api/hide-submission/{submission_id}")
+async def hide_submission(submission_id: int,
+                          current_user: User = Depends(get_current_user),
+                          db: Session = Depends(get_db)):
+    """Soft-delete: hides a finalized/rejected submission from dashboard (data persists)."""
+    submission = db.query(IntakeSubmission).filter(
+        IntakeSubmission.id == submission_id,
+        IntakeSubmission.submitted_by == current_user.id,
+    ).first()
+    if not submission:
+        return JSONResponse({"error": "Submission not found"}, status_code=404)
+    if submission.status == "pending_approval":
+        return JSONResponse({"error": "Cannot hide in-progress submissions. Cancel or reject first."}, status_code=400)
+    submission.hidden = True
+    db.commit()
+    return JSONResponse({"success": True})
+
+
 # =====================================================================
 # USER DASHBOARD
 # =====================================================================
@@ -430,17 +556,23 @@ async def user_dashboard(request: Request,
 
     submissions = db.query(IntakeSubmission).filter(
         IntakeSubmission.submitted_by == current_user.id,
+        IntakeSubmission.hidden != True,
     ).order_by(IntakeSubmission.updated_at.desc()).all()
 
     drafts = []
     submitted = []
 
     for s in submissions:
+        fd = s.form_data or {}
+        sd = s.summary_data or {}
+
         if s.status == "draft":
             drafts.append({
                 "id": s.id,
                 "title": s.title or "Untitled Draft",
                 "updated_at": s.updated_at.strftime("%b %d, %Y %I:%M %p") if s.updated_at else "—",
+                "agreement_name": sd.get("agreement_name") or fd.get("agreement_name", ""),
+                "effective_date": fd.get("effective_date", ""),
             })
         else:
             approvals = db.query(Approval).filter(
@@ -450,19 +582,26 @@ async def user_dashboard(request: Request,
             pending_count = sum(1 for a in approvals if a.status == "pending")
             rejected_count = sum(1 for a in approvals if a.status == "rejected")
 
+            # Commission preview from summary_data
+            year_tables = sd.get("year_tables", [])
+
             submitted.append({
                 "id": s.id,
                 "title": s.title or f"Submission #{s.id}",
                 "status": s.status,
                 "submitted_at": s.submitted_at.strftime("%b %d, %Y %I:%M %p") if s.submitted_at else "—",
                 "bell_ringer": s.bell_ringer_triggered,
+                "agreement_name": sd.get("agreement_name", ""),
+                "effective_date": fd.get("effective_date", ""),
                 "total_approvals": len(approvals),
                 "approved_count": approved_count,
                 "pending_count": pending_count,
                 "rejected_count": rejected_count,
+                "year_tables": year_tables,
                 "approvals": [{
                     "role_label": a.role_label,
                     "approver_name": a.approver_name,
+                    "producer_code": a.producer_code,
                     "status": a.status,
                     "responded_at": a.responded_at.strftime("%b %d, %Y %I:%M %p") if a.responded_at else None,
                 } for a in approvals],

app/rules_engine.py

@@ -227,14 +227,17 @@ def compute_summary(db: Session, form_data: dict) -> dict:
             p1_ded = p2_ded = orig_ded = pp
 
         if is_house_standard:
+            # Layers DEDUCT from 100% base — total must always equal 100%
+            house_comm = 100.0
+            if cepfx and not is_ce:
+                house_comm -= CE_COMM
+            if has_cc and not is_bond:
+                house_comm -= CC_COMM
             year_rows.append({"role": "House Account", "agreement_type": "House Standard Agreement",
-                              "commission_pct": 100.0, "production_pct": 100.0,
+                              "commission_pct": house_comm, "production_pct": 100.0,
                               "abe_status": "ABE", "code": "ACCHO1", "name": "House Account"})
-            if p1pfx:
-                year_rows.append({"role": "Producer 1 (Approval Processor)",
-                                  "agreement_type": "House Standard Agreement",
-                                  "commission_pct": 0.0, "production_pct": 0.0,
-                                  "abe_status": _abe_status(p1suf), "code": p1code, "name": p1name})
+            # P1 is approval processor only — NOT shown in commission table
+            # (kept in participants list for approval workflow)
         else:
             if not is_ce and p1_tier and p1_tier["commission"] is not None:
                 year_rows.append({"role": "Producer 1", "agreement_type": p1_tier["agreement"],
@@ -260,8 +263,12 @@ def compute_summary(db: Session, form_data: dict) -> dict:
                               "commission_pct": CE_COMM, "production_pct": consts.get("CE_CREDIT", 0),
                               "abe_status": _abe_status(ce_suf), "code": cecode, "name": cename})
         elif is_ce and cepfx:
-            year_rows.append({"role": "CE as Producer", "agreement_type": "Ceded Accounts — CE as Producer",
-                              "commission_pct": consts.get("CE_PROD_COMM", 10),
+            ce_prod_comm = consts.get("CE_PROD_COMM", 10)
+            # CCP deducts from CE when CE acts as producer
+            if has_cc and not is_bond:
+                ce_prod_comm = max(ce_prod_comm - CC_COMM, 0)
+            year_rows.append({"role": "Client Executive", "agreement_type": "Ceded Accounts — CE as Producer",
+                              "commission_pct": ce_prod_comm,
                               "production_pct": consts.get("CE_PROD_CREDIT", 100),
                               "abe_status": _abe_status(int(consts.get("CE_PROD_SUFFIX", 2))),
                               "code": cecode, "name": cename})

app/seed_db.py

@@ -119,9 +119,7 @@ def seed(session, reset=False):
         {
             "name": "Life Origination Fee Agreement", "p1_suffix": 2, "p2_suffix": None,
             "tiers": [
-                {"role": "P1", "years": "Year 1", "comm": 20, "credit": 100, "agr": "Life Origination Fee Agreement"},
-                {"role": "P1", "years": "Year 2+", "comm": None, "credit": None, "agr": "Ended",
-                 "note": "Life Referral is 20% Year 1 only. Year 2 it is removed."},
+                {"role": "P1", "years": "All Years", "comm": 20, "credit": 100, "agr": "Life Origination Fee Agreement"},
             ]
         },
         {
@@ -206,7 +204,13 @@ def seed(session, reset=False):
     for i, (lbl, val) in enumerate(departments):
         session.add(DropdownOption(category="department", label=lbl, value=val, display_order=i))
 
-    employees = ["Sarah Johnson", "Mike Thompson", "Karen Lee", "James Wilson"]
+    employees = [
+        "Sarah Johnson", "Mike Thompson", "Karen Lee", "James Wilson",
+        "Beth Johnston", "Beth Potter", "Terrell Wallace", "Stephanie Pena",
+        "Jason Goodwyn", "Steve Gebhardt", "Wade Beacham", "Mike Parsa",
+        "Frank Herron", "David Chen", "Lisa Martinez", "Robert Brown",
+        "Jennifer Davis", "Amanda Taylor", "Christopher Moore", "Michelle Anderson",
+    ]
     for i, e in enumerate(employees):
         session.add(DropdownOption(category="employee", label=e, value=e, display_order=i))
 

app/templates/dashboard.html

@@ -14,6 +14,18 @@
         </a>
     </div>
 
+    <!-- ── Status Filter Tabs ────────────────────────────────── -->
+    <div class="flex items-center space-x-2 text-sm" id="filter_tabs">
+        <button onclick="filterSubmissions('all')" class="filter-tab active px-3 py-1.5 rounded-lg font-medium transition"
+                data-filter="all">All</button>
+        <button onclick="filterSubmissions('pending_approval')" class="filter-tab px-3 py-1.5 rounded-lg font-medium transition"
+                data-filter="pending_approval">Pending</button>
+        <button onclick="filterSubmissions('approved')" class="filter-tab px-3 py-1.5 rounded-lg font-medium transition"
+                data-filter="approved">Approved</button>
+        <button onclick="filterSubmissions('rejected')" class="filter-tab px-3 py-1.5 rounded-lg font-medium transition"
+                data-filter="rejected">Rejected</button>
+    </div>
+
     <!-- ── Drafts Section ──────────────────────────────────── -->
     <div class="bg-white rounded-lg shadow overflow-hidden">
         <div class="sw-blue text-white px-5 py-3 font-semibold flex items-center justify-between">
@@ -27,7 +39,17 @@
                 <div>
                     <a href="/form?token={{ token }}&draft_id={{ d.id }}"
                        class="font-medium sw-blue-text hover:underline">{{ d.title }}</a>
-                    <p class="text-xs text-gray-400 mt-0.5">Last edited: {{ d.updated_at }}</p>
+                    <div class="flex items-center space-x-3 text-xs text-gray-400 mt-0.5">
+                        <span>Last edited: {{ d.updated_at }}</span>
+                        {% if d.agreement_name %}
+                        <span class="text-gray-300">|</span>
+                        <span>{{ d.agreement_name }}</span>
+                        {% endif %}
+                        {% if d.effective_date %}
+                        <span class="text-gray-300">|</span>
+                        <span>Eff: {{ d.effective_date }}</span>
+                        {% endif %}
+                    </div>
                 </div>
                 <div class="flex items-center space-x-2">
                     <a href="/form?token={{ token }}&draft_id={{ d.id }}"
@@ -56,19 +78,23 @@
             <span class="bg-white/20 text-xs px-2 py-0.5 rounded">{{ submitted|length }}</span>
         </div>
         {% if submitted %}
-        <div class="divide-y divide-gray-100">
+        <div class="divide-y divide-gray-100" id="submissions_list">
             {% for s in submitted %}
-            <div class="px-5 py-4">
-                <div class="flex items-center justify-between mb-2">
+            <div class="px-5 py-4 submission-card" data-status="{{ s.status }}">
+                <!-- Header row -->
+                <div class="flex items-center justify-between mb-1">
                     <div class="flex items-center space-x-3">
                         <span class="font-medium sw-blue-text">{{ s.title }}</span>
+                        {% if s.agreement_name %}
+                        <span class="text-xs bg-gray-100 text-gray-600 px-2 py-0.5 rounded">{{ s.agreement_name }}</span>
+                        {% endif %}
                         {% if s.bell_ringer %}
                         <span class="text-xs bg-orange-100 text-orange-700 px-2 py-0.5 rounded font-semibold">Bell Ringer</span>
                         {% endif %}
                     </div>
-                    <div class="flex items-center space-x-3">
+                    <div class="flex items-center space-x-2">
                         {% if s.status == 'pending_approval' %}
-                        <span class="text-xs bg-yellow-100 text-yellow-800 px-2.5 py-1 rounded font-semibold">Pending Approval</span>
+                        <span class="text-xs bg-yellow-100 text-yellow-800 px-2.5 py-1 rounded font-semibold">Pending</span>
                         {% elif s.status == 'approved' %}
                         <span class="text-xs bg-green-100 text-green-800 px-2.5 py-1 rounded font-semibold">Approved</span>
                         {% elif s.status == 'rejected' %}
@@ -78,14 +104,36 @@
                            class="text-xs bg-blue-50 text-blue-700 px-3 py-1 rounded hover:bg-blue-100 transition">
                             PDF
                         </a>
+                        <a href="/api/download-docx/{{ s.id }}?token={{ token }}"
+                           class="text-xs bg-indigo-50 text-indigo-700 px-3 py-1 rounded hover:bg-indigo-100 transition">
+                            Word
+                        </a>
+                        {% if s.status != 'pending_approval' %}
+                        <button onclick="hideSubmission({{ s.id }}, this)"
+                                class="text-xs bg-red-50 text-red-600 px-3 py-1 rounded hover:bg-red-100 transition"
+                                title="Hide from dashboard (data is preserved)">
+                            Hide
+                        </button>
+                        {% endif %}
                     </div>
                 </div>
-                <p class="text-xs text-gray-400 mb-3">Submitted: {{ s.submitted_at }} &middot; Submission #{{ s.id }}</p>
 
-                <!-- Approval Progress Bar -->
+                <!-- Meta row -->
+                <div class="flex items-center space-x-3 text-xs text-gray-400 mb-3">
+                    <span>Submitted: {{ s.submitted_at }}</span>
+                    <span class="text-gray-300">|</span>
+                    <span>#{{ s.id }}</span>
+                    {% if s.effective_date %}
+                    <span class="text-gray-300">|</span>
+                    <span>Eff: {{ s.effective_date }}</span>
+                    {% endif %}
+                </div>
+
+                <!-- Approval Timeline -->
                 {% if s.total_approvals > 0 %}
                 <div class="mb-2">
-                    <div class="flex items-center space-x-2 mb-1">
+                    <!-- Progress bar -->
+                    <div class="flex items-center space-x-2 mb-2">
                         <div class="flex-1 bg-gray-200 rounded-full h-2 overflow-hidden">
                             {% set pct = (s.approved_count / s.total_approvals * 100)|int %}
                             <div class="h-2 rounded-full transition-all {% if s.rejected_count > 0 %}bg-red-500{% else %}bg-green-500{% endif %}"
@@ -95,44 +143,111 @@
                             {{ s.approved_count }}/{{ s.total_approvals }} approved
                         </span>
                     </div>
-                </div>
 
-                <!-- Approver Details (collapsible) -->
-                <details class="text-sm">
-                    <summary class="cursor-pointer text-blue-600 hover:text-blue-800 text-xs font-medium">
-                        Show approval details
-                    </summary>
-                    <div class="mt-2 border border-gray-100 rounded-lg overflow-hidden">
-                        <table class="w-full text-xs">
-                            <thead>
-                                <tr class="bg-gray-50 text-gray-500">
-                                    <th class="px-3 py-2 text-left font-medium">Role</th>
-                                    <th class="px-3 py-2 text-left font-medium">Name</th>
-                                    <th class="px-3 py-2 text-left font-medium">Status</th>
-                                    <th class="px-3 py-2 text-left font-medium">Date</th>
-                                </tr>
-                            </thead>
-                            <tbody class="divide-y divide-gray-50">
-                                {% for a in s.approvals %}
-                                <tr>
-                                    <td class="px-3 py-2 text-gray-700">{{ a.role_label }}</td>
-                                    <td class="px-3 py-2 text-gray-700">{{ a.approver_name }}</td>
-                                    <td class="px-3 py-2">
-                                        {% if a.status == 'approved' %}
-                                        <span class="text-green-600 font-semibold">Approved</span>
-                                        {% elif a.status == 'rejected' %}
-                                        <span class="text-red-600 font-semibold">Rejected</span>
-                                        {% else %}
-                                        <span class="text-yellow-600 font-semibold">Pending</span>
-                                        {% endif %}
-                                    </td>
-                                    <td class="px-3 py-2 text-gray-400">{{ a.responded_at or '—' }}</td>
-                                </tr>
-                                {% endfor %}
-                            </tbody>
-                        </table>
+                    <!-- Inline approval timeline (visual) -->
+                    <div class="flex flex-wrap gap-2 mb-2">
+                        {% for a in s.approvals %}
+                        <div class="flex items-center space-x-1 text-xs
+                                    {% if a.status == 'approved' %}text-green-700
+                                    {% elif a.status == 'rejected' %}text-red-700
+                                    {% else %}text-gray-500{% endif %}">
+                            {% if a.status == 'approved' %}
+                            <svg class="w-3.5 h-3.5" fill="currentColor" viewBox="0 0 20 20"><path fill-rule="evenodd" d="M16.707 5.293a1 1 0 010 1.414l-8 8a1 1 0 01-1.414 0l-4-4a1 1 0 011.414-1.414L8 12.586l7.293-7.293a1 1 0 011.414 0z" clip-rule="evenodd"/></svg>
+                            {% elif a.status == 'rejected' %}
+                            <svg class="w-3.5 h-3.5" fill="currentColor" viewBox="0 0 20 20"><path fill-rule="evenodd" d="M4.293 4.293a1 1 0 011.414 0L10 8.586l4.293-4.293a1 1 0 111.414 1.414L11.414 10l4.293 4.293a1 1 0 01-1.414 1.414L10 11.414l-4.293 4.293a1 1 0 01-1.414-1.414L8.586 10 4.293 5.707a1 1 0 010-1.414z" clip-rule="evenodd"/></svg>
+                            {% else %}
+                            <span class="w-3 h-3 rounded-full border-2 border-gray-300 inline-block"></span>
+                            {% endif %}
+                            <span class="font-medium">{{ a.role_label }}</span>
+                            {% if a.responded_at %}
+                            <span class="text-gray-400">({{ a.responded_at }})</span>
+                            {% endif %}
+                        </div>
+                        {% endfor %}
                     </div>
-                </details>
+
+                    <!-- Expandable detail table + commission preview -->
+                    <details class="text-sm">
+                        <summary class="cursor-pointer text-blue-600 hover:text-blue-800 text-xs font-medium">
+                            Show details
+                        </summary>
+                        <div class="mt-2 space-y-3">
+                            <!-- Approval detail table -->
+                            <div class="border border-gray-100 rounded-lg overflow-hidden">
+                                <table class="w-full text-xs">
+                                    <thead>
+                                        <tr class="bg-gray-50 text-gray-500">
+                                            <th class="px-3 py-2 text-left font-medium">Role</th>
+                                            <th class="px-3 py-2 text-left font-medium">Name</th>
+                                            <th class="px-3 py-2 text-left font-medium">Code</th>
+                                            <th class="px-3 py-2 text-left font-medium">Status</th>
+                                            <th class="px-3 py-2 text-left font-medium">Date</th>
+                                        </tr>
+                                    </thead>
+                                    <tbody class="divide-y divide-gray-50">
+                                        {% for a in s.approvals %}
+                                        <tr>
+                                            <td class="px-3 py-2 text-gray-700">{{ a.role_label }}</td>
+                                            <td class="px-3 py-2 text-gray-700">{{ a.approver_name }}</td>
+                                            <td class="px-3 py-2 text-gray-500 font-mono">{{ a.producer_code or '—' }}</td>
+                                            <td class="px-3 py-2">
+                                                {% if a.status == 'approved' %}
+                                                <span class="text-green-600 font-semibold">Approved</span>
+                                                {% elif a.status == 'rejected' %}
+                                                <span class="text-red-600 font-semibold">Rejected</span>
+                                                {% else %}
+                                                <span class="text-yellow-600 font-semibold">Pending</span>
+                                                {% endif %}
+                                            </td>
+                                            <td class="px-3 py-2 text-gray-400">{{ a.responded_at or '—' }}</td>
+                                        </tr>
+                                        {% endfor %}
+                                    </tbody>
+                                </table>
+                            </div>
+
+                            <!-- Commission preview tables -->
+                            {% if s.year_tables %}
+                            <div class="space-y-2">
+                                <p class="text-xs font-semibold text-gray-600">Commission Structure</p>
+                                {% for yt in s.year_tables %}
+                                <div>
+                                    <p class="text-xs font-semibold sw-blue-text mb-1">{{ yt.year_label }}</p>
+                                    <div class="border border-gray-100 rounded-lg overflow-hidden">
+                                        <table class="w-full text-xs">
+                                            <thead>
+                                                <tr class="bg-gray-50 text-gray-500">
+                                                    <th class="px-2 py-1.5 text-left font-medium">Role</th>
+                                                    <th class="px-2 py-1.5 text-left font-medium">Name</th>
+                                                    <th class="px-2 py-1.5 text-left font-medium">Code</th>
+                                                    <th class="px-2 py-1.5 text-left font-medium">ABE</th>
+                                                    <th class="px-2 py-1.5 text-left font-medium">Agreement</th>
+                                                    <th class="px-2 py-1.5 text-left font-medium">Comm%</th>
+                                                    <th class="px-2 py-1.5 text-left font-medium">Prod Credit</th>
+                                                </tr>
+                                            </thead>
+                                            <tbody class="divide-y divide-gray-50">
+                                                {% for row in yt.rows %}
+                                                <tr>
+                                                    <td class="px-2 py-1.5 font-semibold">{{ row.role }}</td>
+                                                    <td class="px-2 py-1.5">{{ row.name or '—' }}</td>
+                                                    <td class="px-2 py-1.5 font-mono">{{ row.code or '—' }}</td>
+                                                    <td class="px-2 py-1.5 {% if row.abe_status == 'ABE' %}text-green-700 font-semibold{% endif %}">{{ row.abe_status }}</td>
+                                                    <td class="px-2 py-1.5">{{ row.agreement_type }}</td>
+                                                    <td class="px-2 py-1.5 font-semibold">{{ row.commission_pct }}%</td>
+                                                    <td class="px-2 py-1.5">{{ row.production_pct }}%</td>
+                                                </tr>
+                                                {% endfor %}
+                                            </tbody>
+                                        </table>
+                                    </div>
+                                </div>
+                                {% endfor %}
+                            </div>
+                            {% endif %}
+                        </div>
+                    </details>
+                </div>
                 {% endif %}
             </div>
             {% endfor %}
@@ -147,6 +262,11 @@
 {% endblock %}
 
 {% block scripts %}
+<style>
+    .filter-tab { background: #f0f2f5; color: #666; }
+    .filter-tab:hover { background: #e2e5e9; }
+    .filter-tab.active { background: #2e4057; color: #fff; }
+</style>
 <script>
 const authToken = new URLSearchParams(window.location.search).get('token');
 
@@ -167,5 +287,38 @@ async function deleteDraft(draftId, btn) {
         alert('Error: ' + e.message);
     }
 }
+
+async function hideSubmission(submissionId, btn) {
+    if (!confirm('Hide this submission from your dashboard? The data will be preserved in the system.')) return;
+    try {
+        const resp = await fetch('/api/hide-submission/' + submissionId, {
+            method: 'POST',
+            headers: {'Authorization': 'Bearer ' + authToken},
+        });
+        const data = await resp.json();
+        if (data.success) {
+            btn.closest('.submission-card').remove();
+        } else {
+            alert(data.error || 'Failed to hide submission');
+        }
+    } catch (e) {
+        alert('Error: ' + e.message);
+    }
+}
+
+function filterSubmissions(status) {
+    // Update active tab
+    document.querySelectorAll('.filter-tab').forEach(tab => {
+        tab.classList.toggle('active', tab.dataset.filter === status);
+    });
+    // Filter cards
+    document.querySelectorAll('.submission-card').forEach(card => {
+        if (status === 'all') {
+            card.style.display = '';
+        } else {
+            card.style.display = card.dataset.status === status ? '' : 'none';
+        }
+    });
+}
 </script>
 {% endblock %}

app/templates/form.html

@@ -137,6 +137,9 @@
                     </select>
                 </div>
                 <div id="orig_employee_row" class="hidden">
+                    <input type="text" id="orig_employee_search" placeholder="Type to search employees..."
+                           class="border border-gray-300 rounded-md px-3 py-2 text-sm w-full md:w-1/2 mb-1"
+                           autocomplete="off">
                     <select id="orig_employee" class="border border-gray-300 rounded-md px-3 py-2 text-sm w-full md:w-1/2">
                         <option value="">-- Select Employee --</option>
                         {% for e in employees %}
@@ -147,19 +150,33 @@
                 </div>
             </div>
 
-            <!-- CE Layer (checkbox + picker) -->
+            <!-- CE Layer (checkbox + picker) OR CE as Producer (required) -->
             <div id="ce_section" class="hidden border-t pt-3 mt-3">
-                <label class="flex items-center space-x-2 text-sm font-medium text-gray-700 mb-2">
-                    <input type="checkbox" id="include_ce">
-                    <span>Include CE Layer (Client Executive)</span>
-                </label>
-                <div id="ce_picker" class="hidden">
-                    <select id="client_exec" class="w-full md:w-1/2 border border-gray-300 rounded-md px-3 py-2 text-sm">
-                        <option value="">-- Select CE --</option>
+                <!-- Standard CE checkbox mode -->
+                <div id="ce_checkbox_mode">
+                    <label class="flex items-center space-x-2 text-sm font-medium text-gray-700 mb-2">
+                        <input type="checkbox" id="include_ce">
+                        <span>Include CE Layer (Client Executive)</span>
+                    </label>
+                    <div id="ce_picker" class="hidden">
+                        <select id="client_exec" class="w-full md:w-1/2 border border-gray-300 rounded-md px-3 py-2 text-sm">
+                            <option value="">-- Select CE --</option>
+                            {% for p in producers %}
+                            <option value="{{ p.prefix }}">{{ p.label }}</option>
+                            {% endfor %}
+                        </select>
+                    </div>
+                </div>
+                <!-- CE as Producer mode (required, no checkbox) -->
+                <div id="ce_producer_mode" class="hidden">
+                    <label class="block text-sm font-medium text-gray-700 mb-1">Client Executive (Producer) <span class="text-red-500">*</span></label>
+                    <select id="client_exec_required" class="w-full md:w-1/2 border border-gray-300 rounded-md px-3 py-2 text-sm">
+                        <option value="">-- Select Client Executive --</option>
                         {% for p in producers %}
                         <option value="{{ p.prefix }}">{{ p.label }}</option>
                         {% endfor %}
                     </select>
+                    <p class="text-xs text-gray-400 mt-1">CE acts as the primary producer (10% commission, 100% production credit, Non-ABE)</p>
                 </div>
             </div>
 
@@ -204,13 +221,45 @@
                 class="bg-gray-500 text-white px-6 py-3 rounded-lg font-semibold hover:bg-gray-600 transition text-sm">
             Save Draft
         </button>
-        <button id="submit_btn" onclick="submitForm()"
+        <button id="submit_btn" onclick="showSubmitModal()"
                 class="bg-green-600 text-white px-8 py-3 rounded-lg font-semibold hover:bg-green-700 transition disabled:opacity-50"
                 disabled>
             Submit for Approval
         </button>
     </div>
     <div id="draft_msg" class="text-right text-sm text-gray-400 mt-1 hidden"></div>
+
+    <!-- Submit Safeguard Modal -->
+    <div id="submit_modal" class="hidden fixed inset-0 z-50 overflow-y-auto">
+        <div class="flex items-center justify-center min-h-screen px-4 py-8">
+            <!-- Backdrop -->
+            <div class="fixed inset-0 bg-black/50 transition-opacity" onclick="closeSubmitModal()"></div>
+            <!-- Modal Content -->
+            <div class="relative bg-white rounded-xl shadow-2xl max-w-4xl w-full max-h-[85vh] flex flex-col z-10">
+                <!-- Modal Header -->
+                <div class="sw-blue text-white px-6 py-4 rounded-t-xl flex items-center justify-between">
+                    <h2 class="text-lg font-bold">Review Your Commission Agreement Before Submitting</h2>
+                    <button onclick="closeSubmitModal()" class="text-white/70 hover:text-white text-xl">&times;</button>
+                </div>
+                <!-- Modal Body (scrollable) -->
+                <div id="modal_body" class="overflow-y-auto flex-1 px-6 py-4">
+                    <!-- Populated dynamically -->
+                </div>
+                <!-- Modal Footer -->
+                <div class="border-t px-6 py-4 flex justify-end space-x-3 bg-gray-50 rounded-b-xl">
+                    <button onclick="closeSubmitModal()"
+                            class="bg-gray-500 text-white px-6 py-2.5 rounded-lg font-semibold hover:bg-gray-600 transition text-sm">
+                        Go Back &amp; Edit
+                    </button>
+                    <button onclick="confirmSubmit()"
+                            id="confirm_submit_btn"
+                            class="bg-green-600 text-white px-6 py-2.5 rounded-lg font-semibold hover:bg-green-700 transition text-sm">
+                        Confirm &amp; Submit
+                    </button>
+                </div>
+            </div>
+        </div>
+    </div>
 </div>
 {% endblock %}
 
@@ -300,6 +349,7 @@ function updateFieldVisibility(agrName) {
     section.classList.remove('hidden');
     resetProducerFields();
 
+    const isCEasProducer = agrName === 'Ceded Accounts - CE as Producer';
     const p1Section = document.getElementById('p1_section');
     const p1Select = document.getElementById('producer1');
     const p1Locked = document.getElementById('p1_locked_display');
@@ -329,14 +379,31 @@ function updateFieldVisibility(agrName) {
     document.getElementById('originator_section').classList.toggle('hidden', !vis.originator);
     document.getElementById('ce_section').classList.toggle('hidden', !vis.ce);
     document.getElementById('ccp_section').classList.toggle('hidden', !vis.ccp);
+
+    // CE as Producer mode: show required picker, hide checkbox mode
+    const ceCheckboxMode = document.getElementById('ce_checkbox_mode');
+    const ceProducerMode = document.getElementById('ce_producer_mode');
+    if (isCEasProducer) {
+        ceCheckboxMode.classList.add('hidden');
+        ceProducerMode.classList.remove('hidden');
+        // Auto-check include_ce so getFormData sends the right data
+        document.getElementById('include_ce').checked = true;
+    } else {
+        ceCheckboxMode.classList.remove('hidden');
+        ceProducerMode.classList.add('hidden');
+        document.getElementById('client_exec_required').value = '';
+    }
 }
 
 function resetProducerFields() {
     document.getElementById('producer1').value = '';
     document.getElementById('producer2').value = '';
     document.getElementById('client_exec').value = '';
+    document.getElementById('client_exec_required').value = '';
     document.getElementById('include_ce').checked = false;
     document.getElementById('ce_picker').classList.add('hidden');
+    document.getElementById('ce_checkbox_mode').classList.remove('hidden');
+    document.getElementById('ce_producer_mode').classList.add('hidden');
     document.getElementById('include_ccp').checked = false;
     document.getElementById('ccp_picker').classList.add('hidden');
     document.getElementById('ccp_selection').value = '';
@@ -404,13 +471,24 @@ function getFormData() {
     const agrName = agrSelect.options[agrSelect.selectedIndex]?.dataset?.name || '';
     const vis = AGREEMENT_VISIBILITY[agrName] || {};
     const isEmployeeOrig = document.getElementById('employee_as_originator').checked;
+    const isCEasProducer = agrName === 'Ceded Accounts - CE as Producer';
+
+    // CE prefix: from required picker (CE as Producer mode) or checkbox picker (standard mode)
+    let ceChecked = document.getElementById('include_ce').checked;
+    let cePrefix = null;
+    if (isCEasProducer) {
+        ceChecked = true;
+        cePrefix = document.getElementById('client_exec_required').value || null;
+    } else if (ceChecked) {
+        cePrefix = document.getElementById('client_exec').value || null;
+    }
 
     return {
         agreement_id: parseInt(agrSelect.value) || null,
         producer1_prefix: vis.autoFill ? null : (document.getElementById('producer1').value || null),
         producer2_prefix: document.getElementById('producer2').value || null,
-        include_ce: document.getElementById('include_ce').checked,
-        ce_prefix: document.getElementById('include_ce').checked ? (document.getElementById('client_exec').value || null) : null,
+        include_ce: ceChecked,
+        ce_prefix: cePrefix,
         include_ccp: document.getElementById('include_ccp').checked,
         ccp_selection: document.getElementById('include_ccp').checked ? (document.getElementById('ccp_selection').value || null) : null,
         employee_as_originator: isEmployeeOrig,
@@ -468,10 +546,12 @@ async function refreshSummary() {
                 html += '<table class="w-full border-collapse border border-gray-200 rounded-lg overflow-hidden">';
                 html += '<thead><tr class="sw-blue text-white text-sm">' +
                         '<th class="px-4 py-2 text-left">Role</th>' +
+                        '<th class="px-4 py-2 text-left">Name</th>' +
+                        '<th class="px-4 py-2 text-left">Code</th>' +
+                        '<th class="px-4 py-2 text-left">ABE Status</th>' +
                         '<th class="px-4 py-2 text-left">Agreement Type</th>' +
                         '<th class="px-4 py-2 text-left">Commission %</th>' +
-                        '<th class="px-4 py-2 text-left">Production %</th>' +
-                        '<th class="px-4 py-2 text-left">ABE Status</th>' +
+                        '<th class="px-4 py-2 text-left">Prod Credit</th>' +
                         '</tr></thead><tbody>';
 
                 (yt.rows || []).forEach((row, ri) => {
@@ -479,10 +559,12 @@ async function refreshSummary() {
                     const abeClass = row.abe_status === 'ABE' ? 'text-green-700 font-semibold' : 'text-gray-600';
                     html += `<tr class="${bg}">` +
                             `<td class="px-4 py-2 text-sm font-semibold sw-blue-text">${row.role}</td>` +
+                            `<td class="px-4 py-2 text-sm">${row.name || '—'}</td>` +
+                            `<td class="px-4 py-2 text-sm font-mono">${row.code || '—'}</td>` +
+                            `<td class="px-4 py-2 text-sm ${abeClass}">${row.abe_status}</td>` +
                             `<td class="px-4 py-2 text-sm">${row.agreement_type}</td>` +
                             `<td class="px-4 py-2 text-sm font-semibold">${row.commission_pct}%</td>` +
                             `<td class="px-4 py-2 text-sm">${row.production_pct}%</td>` +
-                            `<td class="px-4 py-2 text-sm ${abeClass}">${row.abe_status}</td>` +
                             `</tr>`;
                 });
 
@@ -500,6 +582,25 @@ async function refreshSummary() {
     }
 }
 
+// Employee search filter for originator
+(function() {
+    const searchInput = document.getElementById('orig_employee_search');
+    const empSelect = document.getElementById('orig_employee');
+    const allOptions = Array.from(empSelect.options).slice(1); // skip placeholder
+
+    searchInput.addEventListener('input', function() {
+        const filter = this.value.toLowerCase();
+        const current = empSelect.value;
+        empSelect.innerHTML = '<option value="">-- Select Employee --</option>';
+        allOptions.forEach(opt => {
+            if (!filter || opt.text.toLowerCase().includes(filter)) {
+                empSelect.add(opt.cloneNode(true));
+            }
+        });
+        empSelect.value = current;
+    });
+})();
+
 // Save draft
 async function saveDraft() {
     const btn = document.getElementById('save_draft_btn');
@@ -535,8 +636,111 @@ async function saveDraft() {
     btn.textContent = 'Save Draft';
 }
 
-// Submit form
-async function submitForm() {
+// Submit safeguard — show modal with preview before submission
+async function showSubmitModal() {
+    const formData = getFormData();
+    if (!formData.agreement_id) return;
+
+    // Fetch fresh summary for the modal
+    try {
+        const resp = await fetch('/api/compute-summary', {
+            method: 'POST',
+            headers: {'Content-Type': 'application/json', 'Authorization': 'Bearer ' + authToken},
+            body: JSON.stringify(formData),
+        });
+        const data = await resp.json();
+
+        if (data.warnings && data.warnings.length > 0) {
+            alert('Please resolve all warnings before submitting.');
+            return;
+        }
+
+        // Build modal body content
+        let html = '';
+
+        // Form details summary
+        html += '<div class="mb-4 bg-gray-50 rounded-lg p-4 text-sm space-y-1">';
+        html += `<div><strong>Client:</strong> ${formData.client_name || formData.client_code || '—'}</div>`;
+        html += `<div><strong>Agreement:</strong> ${data.agreement_name || '—'}</div>`;
+        html += `<div><strong>Department:</strong> ${formData.dept_code || '—'}</div>`;
+        html += `<div><strong>Effective Date:</strong> ${formData.effective_date || '—'}</div>`;
+        if (formData.association) html += `<div><strong>Association:</strong> ${formData.association}</div>`;
+        if (formData.legacy_producer) html += `<div><strong>Legacy Producer:</strong> ${formData.legacy_producer}</div>`;
+        if (formData.revenue) html += `<div><strong>Estimated Revenue:</strong> $${Number(formData.revenue).toLocaleString()}</div>`;
+        html += '</div>';
+
+        // Bell ringer
+        const bell = data.bell_ringer || {};
+        if (bell.status === 'triggered') {
+            html += '<div class="mb-4 bg-orange-50 border border-orange-300 text-orange-800 px-4 py-2 rounded text-sm font-semibold">' +
+                    'Bell Ringer TRIGGERED (threshold $' + (bell.threshold || 0).toLocaleString() + ')</div>';
+        }
+
+        // Commission tables
+        const yearTables = data.year_tables || [];
+        if (yearTables.length > 0) {
+            html += '<h3 class="font-bold sw-blue-text text-base mb-2">Commission Structure</h3>';
+            yearTables.forEach(yt => {
+                html += `<div class="mb-4">`;
+                html += `<h4 class="font-semibold text-sm sw-blue-text mb-1">${yt.year_label}</h4>`;
+                html += '<table class="w-full border-collapse border border-gray-200 rounded text-sm mb-2">';
+                html += '<thead><tr class="sw-blue text-white text-xs">' +
+                        '<th class="px-3 py-1.5 text-left">Role</th>' +
+                        '<th class="px-3 py-1.5 text-left">Name</th>' +
+                        '<th class="px-3 py-1.5 text-left">Code</th>' +
+                        '<th class="px-3 py-1.5 text-left">ABE</th>' +
+                        '<th class="px-3 py-1.5 text-left">Agreement</th>' +
+                        '<th class="px-3 py-1.5 text-left">Comm%</th>' +
+                        '<th class="px-3 py-1.5 text-left">Prod Credit</th>' +
+                        '</tr></thead><tbody>';
+                (yt.rows || []).forEach((row, ri) => {
+                    const bg = ri % 2 === 1 ? 'bg-gray-50' : '';
+                    html += `<tr class="${bg}">` +
+                            `<td class="px-3 py-1.5 font-semibold">${row.role}</td>` +
+                            `<td class="px-3 py-1.5">${row.name || '—'}</td>` +
+                            `<td class="px-3 py-1.5 font-mono">${row.code || '—'}</td>` +
+                            `<td class="px-3 py-1.5">${row.abe_status}</td>` +
+                            `<td class="px-3 py-1.5">${row.agreement_type}</td>` +
+                            `<td class="px-3 py-1.5 font-semibold">${row.commission_pct}%</td>` +
+                            `<td class="px-3 py-1.5">${row.production_pct}%</td>` +
+                            `</tr>`;
+                });
+                html += '</tbody></table></div>';
+            });
+        }
+
+        // Participants for approval
+        const participants = data.participants || [];
+        if (participants.length > 0) {
+            html += '<h3 class="font-bold sw-blue-text text-base mb-2 mt-4">Participants Requiring Approval</h3>';
+            html += '<div class="space-y-1 text-sm">';
+            participants.forEach(p => {
+                html += `<div class="flex items-center space-x-2">` +
+                        `<span class="inline-block w-2 h-2 rounded-full bg-yellow-400"></span>` +
+                        `<span><strong>${p.role}:</strong> ${p.name} (${p.code})</span></div>`;
+            });
+            html += '</div>';
+        }
+
+        document.getElementById('modal_body').innerHTML = html;
+        document.getElementById('submit_modal').classList.remove('hidden');
+        document.body.style.overflow = 'hidden';
+
+    } catch (e) {
+        alert('Failed to generate preview: ' + e.message);
+    }
+}
+
+function closeSubmitModal() {
+    document.getElementById('submit_modal').classList.add('hidden');
+    document.body.style.overflow = '';
+}
+
+async function confirmSubmit() {
+    const btn = document.getElementById('confirm_submit_btn');
+    btn.disabled = true;
+    btn.textContent = 'Submitting...';
+
     const formData = getFormData();
     if (currentDraftId) formData.draft_id = currentDraftId;
     try {
@@ -546,6 +750,7 @@ async function submitForm() {
             body: JSON.stringify(formData),
         });
         const data = await resp.json();
+        closeSubmitModal();
         if (data.success) {
             const sid = data.submission_id;
             const btnArea = document.getElementById('submit_btn').parentElement;
@@ -558,7 +763,11 @@ async function submitForm() {
                 (data.pdf_available ?
                     '<a href="/api/download-pdf/' + sid + '?token=' + authToken + '" ' +
                     'class="inline-block bg-blue-600 text-white px-6 py-2 rounded-lg font-semibold hover:bg-blue-700 transition">' +
-                    'Download Draft PDF</a>' : '') +
+                    'Download PDF</a>' : '') +
+                (data.docx_available ?
+                    '<a href="/api/download-docx/' + sid + '?token=' + authToken + '" ' +
+                    'class="inline-block bg-indigo-600 text-white px-6 py-2 rounded-lg font-semibold hover:bg-indigo-700 transition">' +
+                    'Download Word Doc</a>' : '') +
                 '<a href="/dashboard?token=' + authToken + '" ' +
                 'class="inline-block bg-gray-600 text-white px-6 py-2 rounded-lg font-semibold hover:bg-gray-700 transition">' +
                 'Go to Dashboard</a></div>' +
@@ -569,10 +778,12 @@ async function submitForm() {
     } catch (e) {
         alert('Submission failed: ' + e.message);
     }
+    btn.disabled = false;
+    btn.textContent = 'Confirm & Submit';
 }
 
 // Wire all observers
-const refreshInputs = ['producer1', 'producer2', 'client_exec', 'orig_producer', 'orig_employee', 'ccp_selection'];
+const refreshInputs = ['producer1', 'producer2', 'client_exec', 'client_exec_required', 'orig_producer', 'orig_employee', 'ccp_selection'];
 refreshInputs.forEach(id => {
     const el = document.getElementById(id);
     if (el) el.addEventListener('change', refreshSummary);

commission_intake_refactor_prompt.md

@@ -0,0 +1,379 @@
+# Commission Agreement Intake Form - Refactor Instructions
+
+## Overview
+I need you to refactor the existing Commission Agreement Intake web app with significant structural and logic changes. This is a complete rework of field visibility, commission calculation logic, and the preview display.
+
+---
+
+## 1. FORM STRUCTURE REORGANIZATION
+
+### Agreement Type as Primary Driver
+**Move the Agreement Type dropdown to the TOP of the form** (right after Account selection). All subsequent fields should show/hide based on the selected agreement type.
+
+### Dynamic Field Visibility Rules
+
+Replace warning text with actual field visibility control:
+
+| Agreement Type | Producer 1 | Producer 2 | Originator | CE Layer | CCP Layer | Legacy |
+|----------------|------------|------------|------------|----------|-----------|---------|
+| Standard Agreement | ✓ | ✗ | ✗ | ✓ | ✓ | ✓ |
+| Standard Agreement PL | ✓ | ✗ | ✗ | ✓ | ✓ | ✓ |
+| PhD Lead / PhD Agreement | ✓ | ✓ | ✗ | ✓ | ✓ | ✓ |
+| Partner Agreement | ✓ | ✓ | ✗ | ✓ | ✓ | ✓ |
+| Closer Agreement | ✓ | ✓ | ✗ | ✓ | ✓ | ✓ |
+| Referral / Origination Fee Agreement | ✓ | ✗ | ✓ | ✓ | ✓ | ✓ |
+| Bond Agreement | ✓ | ✗ | ✗ | ✓ | ✗ | ✓ |
+| Acquisition Agreement | ✓ | ✗ | ✗ | ✓ | ✓ | ✓ |
+| Ceded Accounts Agreement | ✓ | ✗ | ✗ | ✓ | ✓ | ✓ |
+| Ceded Accounts - CE as Producer | ✗ | ✗ | ✗ | ✓ | ✓ | ✓ |
+| House Standard Agreement / Emerging Markets - House Standard | ✓ | ✗ | ✗ | ✓ | ✓ | ✓ |
+| Emerging Markets Agreement | ✓ | ✗ | ✗ | ✓ | ✓ | ✓ |
+| Life Origination Fee Agreement | ✓ | ✗ | ✗ | ✓ | ✓ | ✓ |
+| Gebhardt Agreement | ✓ (auto-fill) | ✗ | ✗ | ✓ | ✓ | ✓ |
+| Beacham Agreement | ✓ (auto-fill) | ✗ | ✗ | ✓ | ✓ | ✓ |
+
+**Key Implementation Notes:**
+- **Legacy Field**: Always visible for all agreement types. This is a simple text input for historical record-keeping with no active data connections.
+- **Producer Fields**: Should clear/reset when agreement type changes
+- **Originator Field**: ONLY appears for "Referral / Origination Fee Agreement"
+
+---
+
+## 2. ORIGINATING PRODUCER FIELD (Referral Agreements Only)
+
+### When "Referral / Origination Fee Agreement" is selected:
+
+1. Show "Originating Producer" section with:
+   - People Picker control (linked to Active Directory)
+   - "Employee as Originator" checkbox
+   
+2. **Remove the 1/2 dropdown** next to the originator field
+
+3. When "Employee as Originator" is checked:
+   - Allow selection of any employee via People Picker
+   - Auto-assign code: **"EMPOR2"** (literal string, same for all employees)
+   - This employee must approve the agreement (add to approval flow)
+
+4. When "Employee as Originator" is unchecked:
+   - Allow selection of any producer
+   - Generate code normally (standard producer code logic)
+
+---
+
+## 3. CE AND CCP LAYER LOGIC OVERHAUL
+
+### CE Layer (Client Executive)
+- Change to **checkbox-based**: "Include CE Layer"
+- When checked: Show People Picker to select CE
+- When unchecked: Hide People Picker, exclude from calculations
+
+### CCP Layer (Complex Claims Practice)
+- Change to **checkbox-based**: "Include Complex Claims Practice"
+- When checked: Show **dropdown** with only two options:
+  - "Mike Parsa"
+  - "House Account"
+- When unchecked: Hide dropdown, exclude from calculations
+
+**CRITICAL**: Even if "House Account" is selected for CCP, **Mike Parsa must still approve** in the acknowledgment flow.
+
+---
+
+## 4. LAYER DEDUCTION CALCULATION LOGIC
+
+### Default Rule (Most Agreement Types)
+**Layers deduct evenly from ALL producers present:**
+
+- If P1 and P2 exist:
+  - CE takes 1% from P1 + 1% from P2 = 2% total
+  - CCP takes 2.5% from P1 + 2.5% from P2 = 5% total
+  
+- If only P1 exists:
+  - CE takes 2% from P1
+  - CCP takes 5% from P1
+
+### Exception: Closer Agreement & Referral Agreement
+**Layers deduct ONLY from Producer 1:**
+
+- CE takes 2% from P1 (P2 unaffected)
+- CCP takes 5% from P1 (P2 unaffected)
+
+**Note**: "Life Origination Fee Agreement" is NOT an exception - it follows the default rule (but only has P1 anyway).
+
+### Agreement Types Using Default Rule:
+- Standard Agreement
+- Standard Agreement PL
+- PhD Lead / PhD Agreement
+- Partner Agreement
+- Bond Agreement
+- Acquisition Agreement
+- Ceded Accounts Agreement
+- Ceded Accounts - CE as Producer
+- House Standard Agreement
+- Emerging Markets Agreement
+- Life Origination Fee Agreement
+- Gebhardt Agreement
+- Beacham Agreement
+
+### Agreement Types Using P1-Only Deduction:
+- **Closer Agreement**
+- **Referral / Origination Fee Agreement**
+
+---
+
+## 5. BELL RINGER LOGIC - DEPARTMENT-BASED ONLY
+
+### Remove Market Segment Dropdown Entirely
+
+Bell Ringer thresholds should be determined **only by Department Code**:
+
+| Department Code | Threshold | Notes |
+|-----------------|-----------|-------|
+| BD - Bond | No threshold | Never triggers Bell Ringer |
+| CL - Commercial Lines | $75,000 | Middle Market |
+| CON - Connect | $7,500 | (Emerging Markets Commercial) |
+| EB - Employee Benefits | $75,000 | Middle Market Benefits |
+| PL - Personal Lines | $4,500 | Always emerging |
+| VAN - Vanguard | $10,000 | (Emerging Markets Benefits) |
+| LIF - Life | No threshold | Never triggers Bell Ringer |
+
+**Logic**: 
+```javascript
+const BELL_THRESHOLDS = {
+  'CL': 75000,
+  'CON': 7500,
+  'EB': 75000,
+  'PL': 4500,
+  'VAN': 10000
+};
+
+// BD and LIF have no threshold (undefined = no bell ringer)
+const isBellRinger = BELL_THRESHOLDS[deptCode] && estimatedRevenue >= BELL_THRESHOLDS[deptCode];
+```
+
+---
+
+## 6. FIXED-CODE AGREEMENT HANDLING
+
+### House Standard Agreement (Emerging Markets - House Standard)
+When this agreement type is selected:
+
+1. **Producer 1 field appears but is for APPROVAL PROCESSOR only**
+2. Commission calculation shows:
+   - **House Account (ACCHO1)**: 100% commission, 100% production credit
+3. The selected Producer 1 processes approval but receives NO commission
+
+### Gebhardt Agreement
+When selected:
+1. **Auto-fill Producer 1 field** with:
+   - Name: "Steve Gebhardt"
+   - Code: "GEBST2"
+2. Field is **locked/disabled** (cannot change)
+3. Steve Gebhardt appears in commission preview with his specific percentages
+4. Steve Gebhardt must approve
+
+### Beacham Agreement
+When selected:
+1. **Auto-fill Producer 1 field** with:
+   - Name: "Wade Beacham"  
+   - Code: "BEAWA2"
+2. Field is **locked/disabled** (cannot change)
+3. Wade Beacham appears in commission preview with his specific percentages
+4. Wade Beacham must approve
+
+**Note**: For all three types, CE and CCP can still be added as layers.
+
+---
+
+## 7. COMMISSION PREVIEW TABLE - COMPLETE REDESIGN
+
+### Current Problem
+Currently shows all years in a single table with years as columns.
+
+### New Design: One Table Per Year
+
+Generate a **separate table for each year** showing the commission structure for that specific year.
+
+### Table Structure
+
+**Each table should have these columns:**
+
+| Role | Agreement Type | Commission % | Production % | ABE Status |
+|------|----------------|--------------|--------------|------------|
+
+- **Role**: "Producer 1", "Producer 2", "Originating Producer", "CE Layer", "CCP Layer"
+- **Agreement Type**: The specific agreement name for that role in that year (e.g., "PhD Lead Agreement", "Standard Agreement")
+- **Commission %**: Percentage only (e.g., "10%", "15%")
+- **Production %**: Percentage only (e.g., "100%", "50%", "0%")
+- **ABE Status**: 
+  - "ABE" if code = 1
+  - "Non-ABE" if code = 2
+
+### DO NOT SHOW:
+- Dollar amounts
+- Any financial calculations
+- Just percentages
+
+### Example Output for PhD Agreement:
+
+**Year 1**
+| Role | Agreement Type | Commission % | Production % | ABE Status |
+|------|----------------|--------------|--------------|------------|
+| Producer 1 | PhD Lead Agreement | 10% | 100% | ABE |
+| Producer 2 | PhD Agreement | 20% | 0% | Non-ABE |
+| CE Layer | Client Executive Agreement | 2% | 0% | ABE |
+| CCP Layer | Complex Claims Practice | 5% | 0% | ABE |
+
+**Year 2**
+| Role | Agreement Type | Commission % | Production % | ABE Status |
+|------|----------------|--------------|--------------|------------|
+| Producer 1 | PhD Lead Agreement | 15% | 100% | ABE |
+| Producer 2 | PhD Agreement | 15% | 0% | Non-ABE |
+| CE Layer | Client Executive Agreement | 2% | 0% | ABE |
+| CCP Layer | Complex Claims Practice | 5% | 0% | ABE |
+
+**Year 3+**
+| Role | Agreement Type | Commission % | Production % | ABE Status |
+|------|----------------|--------------|--------------|------------|
+| Producer 1 | Standard Agreement | 30% | 100% | ABE |
+| CE Layer | Client Executive Agreement | 2% | 0% | ABE |
+| CCP Layer | Complex Claims Practice | 5% | 0% | ABE |
+
+**Key Points:**
+- Year 3 shows the transition to Standard Agreement for P1
+- P2 no longer appears (PhD agreement ends)
+- Agreement Type column shows the actual agreement name change
+- All values are percentages, never dollar amounts
+
+---
+
+## 8. IMPLEMENTATION CHECKLIST
+
+### Phase 1: Field Visibility
+- [ ] Move Agreement Type selector to top of form
+- [ ] Implement visibility logic for all fields based on agreement type
+- [ ] Add field reset logic when agreement type changes
+- [ ] Implement Legacy text field (always visible)
+
+### Phase 2: Originating Producer
+- [ ] Add Originating Producer section (Referral agreements only)
+- [ ] Remove 1/2 dropdown from originator
+- [ ] Implement "Employee as Originator" checkbox
+- [ ] Auto-assign "EMPOR2" code for employee originators
+- [ ] Add employee originator to approval flow
+
+### Phase 3: Layer Controls
+- [ ] Convert CE to checkbox + People Picker pattern
+- [ ] Convert CCP to checkbox + dropdown (Mike Parsa / House Account only)
+- [ ] Ensure Mike Parsa approval even with House Account selected
+
+### Phase 4: Commission Calculation
+- [ ] Implement default layer deduction logic (split across all producers)
+- [ ] Implement exception for Closer Agreement (P1 only)
+- [ ] Implement exception for Referral Agreement (P1 only)
+- [ ] Verify Life Origination uses default logic (not exception)
+
+### Phase 5: Bell Ringer
+- [ ] Remove Market Segment dropdown entirely
+- [ ] Implement department-only threshold logic
+- [ ] Update threshold values per specifications
+
+### Phase 6: Fixed Code Agreements
+- [ ] Implement House Standard logic (House Account gets 100%)
+- [ ] Implement Gebhardt auto-fill and lock
+- [ ] Implement Beacham auto-fill and lock
+
+### Phase 7: Preview Tables
+- [ ] Redesign to show one table per year
+- [ ] Add "Agreement Type" column
+- [ ] Add "ABE Status" column
+- [ ] Remove all dollar amounts
+- [ ] Show only percentages
+- [ ] Handle year transitions (e.g., PhD → Standard in Year 3)
+
+---
+
+## 9. TESTING SCENARIOS
+
+After implementation, test these specific cases:
+
+1. **PhD Agreement with both producers and layers**
+   - Verify Year 1, 2, 3+ tables appear separately
+   - Verify Year 3 shows "Standard Agreement" for P1
+   - Verify layers deduct evenly from both producers in Years 1-2
+   - Verify P2 disappears in Year 3
+
+2. **Closer Agreement with layers**
+   - Verify layers deduct ONLY from P1
+   - Verify P2 commission unchanged
+
+3. **Referral Agreement**
+   - Verify Originator field appears
+   - Verify "Employee as Originator" assigns "EMPOR2"
+   - Verify layers deduct ONLY from P1
+
+4. **House Standard Agreement**
+   - Verify P1 is approval processor only
+   - Verify House Account (ACCHO1) shows 100%/100% in preview
+
+5. **Gebhardt/Beacham Agreements**
+   - Verify names auto-fill and lock
+   - Verify they appear in approval flow
+
+6. **Bell Ringer Logic**
+   - Test CL department with $75K+ revenue → Bell Ringer triggered
+   - Test PL department with $4,500+ revenue → Bell Ringer triggered
+   - Test BD department with any revenue → No Bell Ringer
+
+7. **Field Visibility**
+   - Change agreement types and verify correct fields show/hide
+   - Verify producer fields clear when switching types
+   - Verify Legacy field always visible
+
+---
+
+## 10. TECHNICAL NOTES
+
+### State Management Considerations
+- Agreement type selection should trigger immediate field visibility updates
+- Producer field values should clear on agreement type change
+- CE/CCP checkboxes should control visibility AND calculation inclusion
+- Fixed-code agreements need special handling for disabled fields
+
+### Validation Rules
+- House Standard: Require P1 selection even though P1 gets no commission
+- Gebhardt/Beacham: P1 field is pre-filled and locked
+- Originator with "Employee as Originator": Must select from People Picker
+- All agreements: Validate required participants based on agreement type
+
+### Code Organization
+- Create helper function: `getVisibleFields(agreementType)` → returns field visibility config
+- Create helper function: `calculateLayerDeductions(agreementType, producers, layers)` → handles split logic
+- Create helper function: `generateYearTables(agreementType, participants)` → builds per-year preview tables
+- Create helper function: `getBellRingerThreshold(deptCode)` → returns threshold or undefined
+
+---
+
+## PRIORITY ORDER
+
+If doing this incrementally, implement in this order:
+
+1. **Agreement type field reordering** (top of form)
+2. **Field visibility logic** (most impactful)
+3. **CE/CCP checkbox pattern** (affects all agreements)
+4. **Layer deduction calculation fix** (Closer/Referral exceptions)
+5. **Bell Ringer department-only logic** (remove market segment)
+6. **Preview table redesign** (one per year, no dollar amounts)
+7. **Originating producer field** (Referral only)
+8. **Fixed-code agreement handling** (House/Gebhardt/Beacham)
+
+---
+
+## QUESTIONS TO CLARIFY BEFORE STARTING
+
+If anything is unclear, ask about:
+- Current state management approach (how fields are currently shown/hidden)
+- How People Picker is currently implemented
+- How commission calculation engine is structured
+- Current preview table rendering logic
+
+This will ensure the refactor integrates smoothly with existing code patterns.

requirements.txt

@@ -8,4 +8,5 @@ python-multipart==0.0.12
 jinja2==3.1.4
 aiofiles==24.1.0
 pydantic[email]==2.9.0
-reportlab==4.1.0
+reportlab==4.1.0
+python-docx==1.1.2

start.py

@@ -27,6 +27,7 @@ db_path = "/data/app.db"
 print("Checking for schema migrations...")
 add_column_if_missing(db_path, "producers", "email", "VARCHAR(255)")
 add_column_if_missing(db_path, "approvals", "approval_token", "VARCHAR(64)")
+add_column_if_missing(db_path, "intake_submissions", "hidden", "BOOLEAN DEFAULT 0")
 # Add unique index separately (SQLite doesn't support UNIQUE in ALTER TABLE)
 conn = sqlite3.connect(db_path)
 try:
@@ -67,30 +68,21 @@ if ref_agr:
         s.commit()
         print(f"  Fixed Referral/Origination Fee: {updated} tier labels updated to 'Year 1 & Year 2'")
 
-# Fix Life Origination Fee: "All Years" at 20% → "Year 1" at 20% + "Year 2+" Ended
+# Fix Life Origination Fee: should be "All Years" at 20% (not Year 1 only)
 life_agr = s.query(CommissionAgreement).filter(
     CommissionAgreement.name == "Life Origination Fee Agreement"
 ).first()
 if life_agr:
-    all_years_tiers = [t for t in life_agr.tiers if t.years_label == "All Years"]
-    if all_years_tiers:
-        # Update existing tier to Year 1
-        all_years_tiers[0].years_label = "Year 1"
-        # Add Year 2+ Ended tier
-        max_sort = max((t.sort_order for t in life_agr.tiers), default=0)
-        ended_tier = CommissionTier(
-            agreement_id=life_agr.id,
-            producer_role="P1",
-            years_label="Year 2+",
-            commission=None,
-            credit=None,
-            agreement_label="Ended",
-            note="Life Referral is 20% Year 1 only. Year 2 it is removed.",
-            sort_order=max_sort + 1,
-        )
-        s.add(ended_tier)
+    year1_tiers = [t for t in life_agr.tiers if t.years_label == "Year 1" and t.commission == 20]
+    ended_tiers = [t for t in life_agr.tiers if t.years_label == "Year 2+" and t.commission is None]
+    if year1_tiers:
+        # Update to All Years
+        year1_tiers[0].years_label = "All Years"
+        # Remove the Ended tier
+        for et in ended_tiers:
+            s.delete(et)
         s.commit()
-        print("  Fixed Life Origination Fee: Year 1 at 20%, Year 2+ Ended")
+        print("  Fixed Life Origination Fee: All Years at 20%")
 
 print("Commission data migrations complete.")