Merge branch 'refactor/counts-dashboard'

AI Prompt.txt

@@ -30,8 +30,9 @@ Long-term goal: evolve into a WMS, but right now focus on making this workflow r
 6) **Verify safety.** Warn me before destructive actions (delete/overwrite/migrations). Offer a safer alternative.
 7) **Evidence-based debugging.** Ask for exact error text/logs and versions before guessing.
 8) **CSS changes:** Ask which device(s) the change is for (desktop/mobile/scanner) before editing. Each has its own file.
-9) **Database changes:** The app auto-initializes the database if it doesn't exist. Schema is in /database/init_db.py.
-10) **Docker deployment:** Production runs in Docker on Linux (jisoo). Volume mounts only /app/database to preserve data between updates.
+9) **Docker deployment:** Production runs in Docker on Linux (PortainerVM). Volume mounts only /app/database to preserve data between updates.
+10) Database changes: Never tell user to "manually run SQL". Always add changes to migrations.py so they auto-apply on deployment.
+
 
 ## How you should respond
 - Start by confirming which mode we’re working on: Cycle Count or Physical Inventory.
@@ -43,10 +44,10 @@ Long-term goal: evolve into a WMS, but right now focus on making this workflow r
 ## Scanlook (current product summary)
 Scanlook is a web app for warehouse counting workflows built with Flask + SQLite.
 
-**Current Version:** 0.12.0
+**Current Version:** 0.13.0
 
 **Tech Stack:**
-- Backend: Python/Flask, raw SQL (no ORM)
+- Backend: Python/Flask, raw SQL (no ORM), openpyxl (Excel file generation)
 - Database: SQLite (located in /database/scanlook.db)
 - Frontend: Jinja2 templates, vanilla JS, custom CSS
 - CSS Architecture: Desktop-first with device-specific overrides
@@ -63,6 +64,7 @@ Scanlook is a web app for warehouse counting workflows built with Flask + SQLite
 - /database/ (scanlook.db, init_db.py)
 - db.py (database helper functions: query_db, execute_db)
 - utils.py (decorators: login_required, role_required)
+- migrations.py (database migration system)
 
 **Key Features (implemented):**
 - Count Sessions with archive/activate functionality
@@ -74,6 +76,8 @@ Scanlook is a web app for warehouse counting workflows built with Flask + SQLite
 - Session isolation (archived sessions blocked from access)
 - Role-based access: owner, admin, staff
 - Auto-initialize database on first run
+- Consumption Sheets module (production lot tracking with Excel export)
+- Database migration system (auto-applies schema changes on startup)
 
 **Two count types:**
 1. Cycle Count: shows Expected list for the BIN
@@ -81,7 +85,7 @@ Scanlook is a web app for warehouse counting workflows built with Flask + SQLite
 
 **Long-term goal:** Modular WMS with future modules for Shipping, Receiving, Transfers, Production.
 
-**Module System (v0.12.0):**
+**Module System (v0.13.0):**
 - Modules table defines available modules (module_key used for routing)
 - UserModules table tracks per-user access
 - Home page (/home) shows module cards based on user's access
@@ -90,6 +94,9 @@ Scanlook is a web app for warehouse counting workflows built with Flask + SQLite
   - __init__.py (blueprint registration)
   - routes.py (all routes)
   - templates/ (module-specific templates)
+- Current modules: 
+  - Inventory Counts (counting)
+  - Consumption Sheets (cons_sheets)
   
 
 ## Quick Reference

app.py

@@ -38,7 +38,7 @@ app.config['PERMANENT_SESSION_LIFETIME'] = timedelta(hours=1)
 
 
 # 1. Define the version
-APP_VERSION = '0.13.0'
+APP_VERSION = '0.13.2'
 
 # 2. Inject it into all templates automatically
 @app.context_processor
@@ -164,22 +164,6 @@ def admin_dashboard():
 
 
 
-@app.route('/staff-mode')
-@login_required
-def staff_mode():
-    """Allow admin/owner to switch to staff view for scanning"""
-    # Show staff dashboard view regardless of role
-    active_sessions = query_db('''
-        SELECT session_id, session_name, session_type, created_timestamp
-        FROM CountSessions
-        WHERE status = 'active'
-        ORDER BY created_timestamp DESC
-    ''')
-    
-    return render_template('staff_dashboard.html', sessions=active_sessions, is_admin_mode=True)
-
-
-
 # ==================== PWA SUPPORT ROUTES ====================
 
 @app.route('/manifest.json')

blueprints/counting.py

@@ -10,6 +10,50 @@ def get_active_session(session_id):
         return None
     return sess
 
+
+
+@counting_bp.route('/counts/admin')
+@login_required
+def admin_dashboard():
+    """Admin dashboard for Counts module"""
+    # Security check: Ensure user is admin/owner
+    if session.get('role') not in ['owner', 'admin']:
+        flash('Access denied. Admin role required.', 'danger')
+        return redirect(url_for('counting.index'))
+
+    show_archived = request.args.get('show_archived', '0') == '1'
+    
+    # This SQL was moved from app.py
+    if show_archived:
+        sessions_list = query_db('''
+            SELECT s.*, u.full_name as created_by_name,
+                   COUNT(DISTINCT lc.location_count_id) as total_locations,
+                   SUM(CASE WHEN lc.status = 'completed' THEN 1 ELSE 0 END) as completed_locations,
+                   SUM(CASE WHEN lc.status = 'in_progress' THEN 1 ELSE 0 END) as in_progress_locations
+            FROM CountSessions s
+            LEFT JOIN Users u ON s.created_by = u.user_id
+            LEFT JOIN LocationCounts lc ON s.session_id = lc.session_id
+            WHERE s.status IN ('active', 'archived')
+            GROUP BY s.session_id
+            ORDER BY s.status ASC, s.created_timestamp DESC
+        ''')
+    else:
+        sessions_list = query_db('''
+            SELECT s.*, u.full_name as created_by_name,
+                   COUNT(DISTINCT lc.location_count_id) as total_locations,
+                   SUM(CASE WHEN lc.status = 'completed' THEN 1 ELSE 0 END) as completed_locations,
+                   SUM(CASE WHEN lc.status = 'in_progress' THEN 1 ELSE 0 END) as in_progress_locations
+            FROM CountSessions s
+            LEFT JOIN Users u ON s.created_by = u.user_id
+            LEFT JOIN LocationCounts lc ON s.session_id = lc.session_id
+            WHERE s.status = 'active'
+            GROUP BY s.session_id
+            ORDER BY s.created_timestamp DESC
+        ''')
+    
+    return render_template('counts/admin_dashboard.html', sessions=sessions_list, show_archived=show_archived)
+
+
 @counting_bp.route('/counts')
 @login_required
 def index():
@@ -33,7 +77,7 @@ def index():
         ORDER BY created_timestamp DESC
     ''')
     
-    return render_template('staff_dashboard.html', sessions=active_sessions)
+    return render_template('counts/staff_dashboard.html', sessions=active_sessions)
 
 
 @counting_bp.route('/count/<int:session_id>')
@@ -91,7 +135,7 @@ def my_counts(session_id):
         ORDER BY lc.end_timestamp DESC
     ''', [session_id, session['user_id']])
     
-    return render_template('my_counts.html',
+    return render_template('counts/my_counts.html',
                          count_session=sess,
                          active_bins=active_bins,
                          completed_bins=completed_bins)
@@ -219,7 +263,7 @@ def count_location(session_id, location_count_id):
             ORDER BY lot_number
         ''', [session_id, location['location_name'], location_count_id])
     
-    return render_template('count_location.html', 
+    return render_template('counts/count_location.html', 
                          session_id=session_id,
                          location=location, 
                          scans=scans,

templates/admin_dashboard.html

@@ -4,121 +4,28 @@
 
 {% block content %}
 <div class="dashboard-container">
-    <!-- Mode Selector -->
-    <div class="mode-selector">
-    <a href="{{ url_for('home') }}" class="btn btn-secondary btn-sm">
-        <i class="fa-solid fa-arrow-left"></i> Back to Home
-    </a>
-    <button class="mode-btn mode-btn-active" data-href="{{ url_for('admin_dashboard') }}">
-        👔 Admin Console
-    </button>
-    <button class="mode-btn" data-href="{{ url_for('staff_mode') }}">
-        📦 Scanning Mode
-    </button>
-    </div>
-
-    <script>
-    document.querySelectorAll('.mode-selector button').forEach(btn => {
-        btn.addEventListener('click', function() {
-            window.location.href = this.getAttribute('data-href');
-        });
-    });
-    </script>
-
-    <div class="dashboard-header">
-        <div class="header-left">
-            <h1 class="page-title">Admin Dashboard</h1>
-            <label class="filter-toggle">
-                <input type="checkbox" id="showArchived" {% if show_archived %}checked{% endif %} onchange="toggleArchived()">
-                <span class="filter-label">Show Archived</span>
-            </label>
+<div class="dashboard-header" style="margin-top: var(--space-lg);">
+        <div class="header-left" style="display: flex; align-items: center; gap: var(--space-md);">
+            <a href="{{ url_for('home') }}" class="btn btn-secondary btn-sm">
+                <i class="fa-solid fa-arrow-left"></i> Back to Home
+            </a>
+            <h1 class="page-title" style="margin-bottom: 0;">Admin Dashboard</h1>
         </div>
-        <a href="{{ url_for('sessions.create_session') }}" class="btn btn-primary">
-            <span class="btn-icon">+</span> New Session
-        </a>
     </div>
 
-    <script>
-    function toggleArchived() {
-        const checked = document.getElementById('showArchived').checked;
-        window.location.href = '{{ url_for("admin_dashboard") }}' + (checked ? '?show_archived=1' : '');
-    }
-    </script>
-
-    <!-- Modules Section -->
     <div class="modules-section">
         <h2 class="section-title">Modules</h2>
         <div class="modules-grid">
-            <div class="module-card module-card-active">
-                <div class="module-icon">📋</div>
-                <h3 class="module-name">Counts</h3>
+            <a href="{{ url_for('counting.admin_dashboard') }}" class="module-card">
+                <div class="module-icon">📊</div> <h3 class="module-name">Counts</h3>
                 <p class="module-desc">Cycle counts & physical inventory</p>
-            </div>
+            </a>
+            
             <a href="{{ url_for('cons_sheets.admin_processes') }}" class="module-card module-card-link">
-                <div class="module-icon">📝</div>
-                <h3 class="module-name">Consumption Sheets</h3>
+                <div class="module-icon">📝</div> <h3 class="module-name">Consumption Sheets</h3>
                 <p class="module-desc">Production consumption tracking</p>
             </a>
         </div>
     </div>
-
-    {% if sessions %}
-        <div class="sessions-grid">
-            {% for session in sessions %}
-            <div class="session-card {% if session.status == 'archived' %}session-archived{% endif %}">
-                <div class="session-card-header">
-                    <h3 class="session-name">
-                        {{ session.session_name }}
-                        {% if session.status == 'archived' %}<span class="archived-badge">ARCHIVED</span>{% endif %}
-                    </h3>
-                    <span class="session-type-badge session-type-{{ session.session_type }}">
-                        {{ 'Full Physical' if session.session_type == 'full_physical' else 'Cycle Count' }}
-                    </span>
-                </div>
-
-                <div class="session-stats">
-                    <div class="stat-item">
-                        <div class="stat-value">{{ session.total_locations or 0 }}</div>
-                        <div class="stat-label">Total Locations</div>
-                    </div>
-                    <div class="stat-item">
-                        <div class="stat-value">{{ session.completed_locations or 0 }}</div>
-                        <div class="stat-label">Completed</div>
-                    </div>
-                    <div class="stat-item">
-                        <div class="stat-value">{{ session.in_progress_locations or 0 }}</div>
-                        <div class="stat-label">In Progress</div>
-                    </div>
-                </div>
-
-                <div class="session-meta">
-                    <div class="meta-item">
-                        <span class="meta-label">Created:</span>
-                        <span class="meta-value">{{ session.created_timestamp[:16] }}</span>
-                    </div>
-                    <div class="meta-item">
-                        <span class="meta-label">By:</span>
-                        <span class="meta-value">{{ session.created_by_name }}</span>
-                    </div>
-                </div>
-
-                <div class="session-actions">
-                    <a href="{{ url_for('sessions.session_detail', session_id=session.session_id) }}" class="btn btn-secondary btn-block">
-                        View Details
-                    </a>
-                </div>
-            </div>
-            {% endfor %}
-        </div>
-    {% else %}
-        <div class="empty-state">
-            <div class="empty-icon">📋</div>
-            <h2 class="empty-title">No Active Sessions</h2>
-            <p class="empty-text">Create a new count session to get started</p>
-            <a href="{{ url_for('sessions.create_session') }}" class="btn btn-primary">
-                Create First Session
-            </a>
-        </div>
-    {% endif %}
 </div>
 {% endblock %}

templates/cons_sheets/admin_processes.html

@@ -4,18 +4,18 @@
 
 {% block content %}
 <div class="dashboard-container">
-    <!-- Back to Admin Dashboard -->
-    <div class="mode-selector">
-        <a href="{{ url_for('admin_dashboard') }}" class="btn btn-secondary btn-sm">
-            <i class="fa-solid fa-arrow-left"></i> Back to Admin
-        </a>
-    </div>
-
-    <div class="dashboard-header">
-        <div class="header-left">
-            <h1 class="page-title">Consumption Sheets</h1>
-            <p class="page-subtitle">Manage process types and templates</p>
+    <div class="dashboard-header" style="margin-top: var(--space-lg);">
+        <div class="header-left" style="display: flex; align-items: center; gap: var(--space-md);">
+            <a href="{{ url_for('admin_dashboard') }}" class="btn btn-secondary btn-sm">
+                <i class="fa-solid fa-arrow-left"></i> Back to Admin
+            </a>
+            
+            <div>
+                <h1 class="page-title" style="margin-bottom: 0;">Consumption Sheets</h1>
+                <p class="page-subtitle" style="margin-bottom: 0;">Manage process types and templates</p>
+            </div>
         </div>
+        
         <a href="{{ url_for('cons_sheets.create_process') }}" class="btn btn-primary">
             <span class="btn-icon">+</span> New Process
         </a>

templates/cons_sheets/process_fields.html

@@ -49,7 +49,13 @@
                         <td>{{ field.excel_cell or '—' }}</td>
                         <td>
                             <a href="{{ url_for('cons_sheets.edit_field', process_id=process.id, field_id=field.id) }}" class="btn btn-secondary btn-sm">Edit</a>
-                            <button onclick="confirmDelete({{ field.id }}, '{{ field.field_label }}')" class="btn btn-sm" style="background: var(--color-danger); color: white;">Delete</button>
+                            <button onclick="confirmDelete(this)" 
+                                data-id="{{ field.id }}" 
+                                data-label="{{ field.field_label }}" 
+                                class="btn btn-sm" 
+                                style="background: var(--color-danger); color: white;">
+                            Delete
+                        </button>
                         </td>
                     </tr>
                     {% endfor %}
@@ -95,7 +101,13 @@
                         <td>{{ field.excel_cell or '—' }}</td>
                         <td>
                             <a href="{{ url_for('cons_sheets.edit_field', process_id=process.id, field_id=field.id) }}" class="btn btn-secondary btn-sm">Edit</a>
-                            <button onclick="confirmDelete({{ field.id }}, '{{ field.field_label }}')" class="btn btn-sm" style="background: var(--color-danger); color: white;">Delete</button>
+                            <button onclick="confirmDelete(this)" 
+                                    data-id="{{ field.id }}" 
+                                    data-label="{{ field.field_label }}" 
+                                    class="btn btn-sm" 
+                                    style="background: var(--color-danger); color: white;">
+                                Delete
+                            </button>
                         </td>
                     </tr>
                     {% endfor %}
@@ -138,7 +150,11 @@
 </style>
 
 <script>
-function confirmDelete(fieldId, fieldLabel) {
+function confirmDelete(btn) {
+    // Read values from data attributes
+    const fieldId = btn.dataset.id;
+    const fieldLabel = btn.dataset.label;
+
     if (confirm('Delete field "' + fieldLabel + '"?\n\nThis will soft-delete the field (data preserved but hidden).')) {
         fetch('{{ url_for("cons_sheets.delete_field", process_id=process.id, field_id=0) }}'.replace('0', fieldId), {
             method: 'POST'

templates/cons_sheets/scan_session.html

@@ -101,9 +101,11 @@
         <div class="scans-header">
             <h3 class="scans-title">Scanned Items (<span id="scanListCount">{{ scans|length }}</span>)</h3>
         </div>
-        <div id="scansList" class="scans-grid">
+        <div id="scansList" class="scans-grid" style="--field-count: {{ detail_fields|length }};">
             {% for scan in scans %}
-            <div class="scan-row scan-row-{{ scan.duplicate_status }}" data-detail-id="{{ scan.id }}" onclick="openScanDetail({{ scan.id }})">
+            <div class="scan-row scan-row-{{ scan.duplicate_status }}" 
+                data-detail-id="{{ scan.id }}" 
+                onclick="openScanDetail(this.dataset.detailId)">
                 {% for field in detail_fields %}
                 <div class="scan-row-cell">{% if field.field_type == 'REAL' %}{{ '%.1f'|format(scan[field.field_name]|float) if scan[field.field_name] else '-' }}{% else %}{{ scan[field.field_name] or '-' }}{% endif %}</div>
                 {% endfor %}
@@ -139,7 +141,7 @@
 .header-values { display: flex; flex-wrap: wrap; gap: var(--space-sm); margin: var(--space-sm) 0; }
 .header-pill { background: var(--color-surface-elevated); padding: var(--space-xs) var(--space-sm); border-radius: var(--radius-sm); font-size: 0.8rem; color: var(--color-text-muted); }
 .header-pill strong { color: var(--color-text); }
-.scan-row { display: grid; grid-template-columns: repeat({{ detail_fields|length }}, 1fr) auto; gap: var(--space-sm); padding: var(--space-md); background: var(--color-surface); border: 2px solid var(--color-border); border-radius: var(--radius-md); margin-bottom: var(--space-sm); cursor: pointer; transition: var(--transition); }
+.scan-row { display: grid; grid-template-columns: repeat(var(--field-count), 1fr) auto; gap: var(--space-sm); padding: var(--space-md); background: var(--color-surface); border: 2px solid var(--color-border); border-radius: var(--radius-md); margin-bottom: var(--space-sm); cursor: pointer; transition: var(--transition); }
 .scan-row:hover { border-color: var(--color-primary); }
 .scan-row-cell { font-size: 0.9rem; overflow: hidden; text-overflow: ellipsis; white-space: nowrap; }
 .scan-row-dup_same_session { border-left: 4px solid var(--color-duplicate) !important; background: rgba(0, 163, 255, 0.1) !important; }
@@ -151,11 +153,22 @@
 .duplicate-message { color: var(--color-text-muted); margin-bottom: var(--space-lg); }
 </style>
 
-<script>
-const detailFields = {{ detail_fields|tojson|safe }};
-const dupKeyFieldName = {{ (dup_key_field.field_name if dup_key_field else '')|tojson|safe }};
-const sessionId = {{ session.id }};
+<script id="session-data" type="application/json">
+{
+    "detailFields": {{ detail_fields|tojson|safe }},
+    "dupKeyFieldName": {{ (dup_key_field.field_name if dup_key_field else '')|tojson|safe }},
+    "sessionId": {{ session.id }}
+}
+</script>
 
+<script>
+// Read data from the JSON block above
+const sessionData = JSON.parse(document.getElementById('session-data').textContent);
+const detailFields = sessionData.detailFields;
+const dupKeyFieldName = sessionData.dupKeyFieldName;
+const sessionId = sessionData.sessionId;
+
+// Standard variables
 let currentDupKeyValue = '';
 let currentDuplicateStatus = '';
 let isDuplicateConfirmed = false;

templates/cons_sheets/staff_index.html

@@ -47,7 +47,7 @@
                         <span class="arrow-icon">→</span>
                     </div>
                 </a>
-                <button class="btn-archive" onclick="archiveSession({{ s.id }}, '{{ s.process_name }}')" title="Archive this session">
+                <button class="btn-archive" onclick="archiveSession(this)" data-id="{{ s.id }}" data-name="{{ s.process_name }}" title="Archive this session">
                     🗑️
                 </button>
             </div>

templates/counts/admin_dashboard.html

@@ -0,0 +1,102 @@
+{% extends "base.html" %}
+
+{% block title %}Inventory Counts - ScanLook{% endblock %}
+
+{% block content %}
+<div class="dashboard-container">
+    <div class="dashboard-header">
+        <div class="header-left">
+            <a href="{{ url_for('admin_dashboard') }}" class="btn btn-secondary btn-sm" style="margin-right: var(--space-md);">
+                <i class="fa-solid fa-arrow-left"></i> Back to Admin
+            </a>
+            <div>
+                <h1 class="page-title">Inventory Counts</h1>
+                <p class="page-subtitle">Manage cycle counts and physical inventory</p>
+            </div>
+        </div>
+        <div class="header-right">
+            <label class="filter-toggle" style="margin-right: var(--space-lg);">
+                <input type="checkbox" id="showArchived" {% if show_archived %}checked{% endif %} onchange="toggleArchived()">
+                <span class="filter-label">Show Archived</span>
+            </label>
+            <a href="{{ url_for('sessions.create_session') }}" class="btn btn-primary">
+                <span class="btn-icon">+</span> New Session
+            </a>
+        </div>
+    </div>
+
+    {% if sessions %}
+        <div class="sessions-grid">
+            {% for session in sessions %}
+            <div class="session-card {% if session.status == 'archived' %}session-archived{% endif %}">
+                <div class="session-card-header">
+                    <h3 class="session-name">
+                        {{ session.session_name }}
+                        {% if session.status == 'archived' %}<span class="archived-badge">ARCHIVED</span>{% endif %}
+                    </h3>
+                    <span class="session-type-badge session-type-{{ session.session_type }}">
+                        {{ 'Full Physical' if session.session_type == 'full_physical' else 'Cycle Count' }}
+                    </span>
+                </div>
+
+                <div class="session-stats">
+                    <div class="stat-item">
+                        <div class="stat-value">{{ session.total_locations or 0 }}</div>
+                        <div class="stat-label">Total Locations</div>
+                    </div>
+                    <div class="stat-item">
+                        <div class="stat-value">{{ session.completed_locations or 0 }}</div>
+                        <div class="stat-label">Completed</div>
+                    </div>
+                    <div class="stat-item">
+                        <div class="stat-value">{{ session.in_progress_locations or 0 }}</div>
+                        <div class="stat-label">In Progress</div>
+                    </div>
+                </div>
+
+                <div class="session-meta">
+                    <div class="meta-item">
+                        <span class="meta-label">Created:</span>
+                        <span class="meta-value">{{ session.created_timestamp[:16] }}</span>
+                    </div>
+                    <div class="meta-item">
+                        <span class="meta-label">By:</span>
+                        <span class="meta-value">{{ session.created_by_name }}</span>
+                    </div>
+                </div>
+
+                <div class="session-actions">
+                    <a href="{{ url_for('sessions.session_detail', session_id=session.session_id) }}" class="btn btn-secondary btn-block">
+                        View Details
+                    </a>
+                </div>
+            </div>
+            {% endfor %}
+        </div>
+    {% else %}
+        <div class="empty-state">
+            <div class="empty-icon">📋</div>
+            <h2 class="empty-title">No Active Sessions</h2>
+            <p class="empty-text">Create a new count session to get started</p>
+        </div>
+    {% endif %}
+</div>
+
+<script>
+function toggleArchived() {
+    const checked = document.getElementById('showArchived').checked;
+    window.location.href = '{{ url_for("counting.admin_dashboard") }}' + (checked ? '?show_archived=1' : '');
+}
+</script>
+
+<style>
+.dashboard-header {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    margin-bottom: var(--space-xl);
+}
+.header-left { display: flex; align-items: center; }
+.header-right { display: flex; align-items: center; }
+</style>
+{% endblock %}