zebra-day 1.0.2__py3-none-any.whl → 2.1.4__py3-none-any.whl

zebra_day/templates/modern/config.html

@@ -81,6 +81,13 @@
             <i class="fas fa-external-link-alt"></i> View Full
         </a>
     </div>
+
+    <!-- Config File Path -->
+    <div class="mb-md" style="padding: 0.75rem 1rem; background: var(--color-gray-700); border-radius: var(--radius-sm); font-family: 'JetBrains Mono', monospace; font-size: 0.875rem;">
+        <span class="text-muted"><i class="fas fa-file-alt"></i> Loaded from:</span>
+        <code style="color: var(--color-highlight); margin-left: 0.5rem;">{{ config_file_path | default('Unknown') }}</code>
+    </div>
+
     {% if config_summary %}
     <div class="grid grid-4 mb-lg">
         <div class="stat-card">

zebra_day/templates/modern/config_backups.html

@@ -0,0 +1,59 @@
+{% extends "modern/base.html" %}
+
+{% block title %}Config Backups - Zebra Day{% endblock %}
+
+{% block content %}
+<div class="page-header">
+    <h1 class="page-title">Configuration Backups</h1>
+    <div class="header-actions">
+        <a href="/config" class="btn btn-outline"><i class="fas fa-arrow-left"></i> Back</a>
+    </div>
+</div>
+
+<div class="card">
+    <div class="card-header">
+        <h3 class="card-title"><i class="fas fa-history"></i> Saved Configuration Files</h3>
+        <span class="badge">{{ backup_files | length }} backups</span>
+    </div>
+    
+    <p class="text-muted mb-md" style="padding: 0 1rem;">
+        To restore a backup, download the file, open in a text editor, copy the contents, 
+        then paste into the <a href="/config/edit">config editor</a> and save.
+    </p>
+    
+    {% if backup_files %}
+    <div class="table-container">
+        <table class="table">
+            <thead>
+                <tr>
+                    <th>Filename</th>
+                    <th>Actions</th>
+                </tr>
+            </thead>
+            <tbody>
+                {% for file in backup_files %}
+                <tr>
+                    <td>
+                        <i class="fas fa-file-code text-muted"></i>
+                        {{ file }}
+                    </td>
+                    <td>
+                        <a href="/etc/old_printer_config/{{ file }}" class="btn btn-sm btn-outline" download>
+                            <i class="fas fa-download"></i> Download
+                        </a>
+                    </td>
+                </tr>
+                {% endfor %}
+            </tbody>
+        </table>
+    </div>
+    {% else %}
+    <div class="empty-state">
+        <i class="fas fa-history"></i>
+        <p>No backup files found</p>
+        <small class="text-muted">Backups are created automatically when you save configuration changes</small>
+    </div>
+    {% endif %}
+</div>
+{% endblock %}
+

zebra_day/templates/modern/config_editor.html

@@ -0,0 +1,95 @@
+{% extends "modern/base.html" %}
+
+{% block title %}{{ title }} - Zebra Day{% endblock %}
+
+{% block content %}
+<div class="page-header">
+    <h1 class="page-title">{{ title }}</h1>
+    <div class="header-actions">
+        <a href="/config" class="btn btn-outline"><i class="fas fa-arrow-left"></i> Back</a>
+        {% if mode == 'edit' %}
+        <button type="button" class="btn btn-outline" onclick="resetConfig()"><i class="fas fa-undo"></i> Reset</button>
+        <button type="button" class="btn btn-outline" onclick="clearConfig()"><i class="fas fa-trash"></i> Clear</button>
+        {% endif %}
+    </div>
+</div>
+
+{% if error_msg %}
+<div class="alert alert-error mb-lg">
+    <i class="fas fa-exclamation-circle"></i> {{ error_msg }}
+</div>
+{% endif %}
+
+<div class="card">
+    <div class="card-header">
+        <h3 class="card-title"><i class="fas fa-file-code"></i> Printer Configuration JSON</h3>
+        {% if mode == 'edit' %}
+        <span class="badge badge-warning">Editing</span>
+        {% else %}
+        <span class="badge badge-info">Read Only</span>
+        {% endif %}
+    </div>
+    <form method="post" action="/config/save">
+        <div class="form-group">
+            <textarea name="json_data" id="json-editor" class="form-control code-editor" rows="30" {% if mode != 'edit' %}readonly{% endif %}>{{ config_json }}</textarea>
+        </div>
+        {% if mode == 'edit' %}
+        <div class="form-actions">
+            <button type="submit" class="btn btn-primary" onclick="showLoading('Saving configuration...')">
+                <i class="fas fa-save"></i> Save Configuration
+            </button>
+        </div>
+        {% endif %}
+    </form>
+</div>
+
+<style>
+.code-editor {
+    font-family: 'JetBrains Mono', 'Consolas', monospace;
+    font-size: 0.875rem;
+    line-height: 1.5;
+    background: var(--color-gray-700);
+    border: 1px solid var(--color-gray-600);
+    padding: 1rem;
+    resize: vertical;
+    min-height: 400px;
+}
+.code-editor:read-only {
+    background: var(--color-gray-800);
+    cursor: default;
+}
+.form-actions {
+    display: flex;
+    gap: 1rem;
+    padding: 1rem;
+    border-top: 1px solid var(--color-gray-600);
+}
+</style>
+
+<script>
+async function resetConfig() {
+    if (confirm('Reset configuration to template defaults? This will backup the current config.')) {
+        showLoading('Resetting configuration...');
+        window.location.href = '/config/reset';
+    }
+}
+
+async function clearConfig() {
+    if (confirm('Clear all printer configuration? This will backup the current config.')) {
+        showLoading('Clearing configuration...');
+        window.location.href = '/config/clear';
+    }
+}
+
+// Auto-format JSON on blur
+document.getElementById('json-editor')?.addEventListener('blur', function() {
+    try {
+        const parsed = JSON.parse(this.value);
+        this.value = JSON.stringify(parsed, null, 4);
+    } catch (e) {
+        // Invalid JSON, leave as-is
+    }
+});
+</script>
+{% endblock %}
+

zebra_day/templates/modern/config_new.html

@@ -0,0 +1,93 @@
+{% extends "modern/base.html" %}
+
+{% block title %}New Configuration - Zebra Day{% endblock %}
+
+{% block content %}
+<div class="page-header">
+    <h1 class="page-title">Build New Configuration</h1>
+    <div class="header-actions">
+        <a href="/config" class="btn btn-outline"><i class="fas fa-arrow-left"></i> Back</a>
+    </div>
+</div>
+
+<div class="grid grid-2">
+    <!-- Network Scan -->
+    <div class="card">
+        <div class="card-header">
+            <h3 class="card-title"><i class="fas fa-wifi"></i> Scan Network for Printers</h3>
+        </div>
+        <form action="/config/scan" method="get">
+            <div class="form-group">
+                <label class="form-label">IP Range Prefix</label>
+                <input type="text" name="ip_stub" class="form-control" value="{{ ip_root }}" placeholder="192.168.1">
+                <small class="text-muted">Enter the first three octets of your network</small>
+            </div>
+            <div class="form-group">
+                <label class="form-label">Lab Name</label>
+                <input type="text" name="lab" class="form-control" value="scan-results" placeholder="Enter lab name">
+                <small class="text-muted">Printers found will be added to this lab</small>
+            </div>
+            <div class="form-group">
+                <label class="form-label">Scan Wait Time</label>
+                <select name="scan_wait" class="form-control">
+                    <option value="0.15">Fast (0.15s)</option>
+                    <option value="0.25" selected>Normal (0.25s)</option>
+                    <option value="0.5">Slow (0.5s)</option>
+                    <option value="1.0">Very Slow (1.0s)</option>
+                </select>
+                <small class="text-muted">Longer wait times find more printers on slow networks</small>
+            </div>
+            <button type="submit" class="btn btn-primary" onclick="showLoading('Scanning network for Zebra printers...')">
+                <i class="fas fa-search"></i> Start Network Scan
+            </button>
+        </form>
+    </div>
+
+    <!-- Quick Actions -->
+    <div class="card">
+        <div class="card-header">
+            <h3 class="card-title"><i class="fas fa-bolt"></i> Quick Actions</h3>
+        </div>
+        <div class="quick-actions">
+            <a href="/config/reset" class="action-card" onclick="return confirm('Reset config to template defaults?')">
+                <i class="fas fa-undo"></i>
+                <div>
+                    <strong>Reset to Template</strong>
+                    <small class="text-muted d-block">Restore default configuration</small>
+                </div>
+            </a>
+            <a href="/config/clear" class="action-card" onclick="return confirm('Clear all printer configuration?')">
+                <i class="fas fa-trash"></i>
+                <div>
+                    <strong>Clear Configuration</strong>
+                    <small class="text-muted d-block">Remove all printers</small>
+                </div>
+            </a>
+            <a href="/config/edit" class="action-card">
+                <i class="fas fa-edit"></i>
+                <div>
+                    <strong>Manual Edit</strong>
+                    <small class="text-muted d-block">Edit JSON directly</small>
+                </div>
+            </a>
+        </div>
+        
+        <hr class="my-md">
+        
+        <h4 class="mb-md">Existing Labs</h4>
+        {% if labs %}
+        <div class="grid grid-3">
+            {% for lab in labs %}
+            <a href="/printers/{{ lab }}" class="action-card">
+                <i class="fas fa-building"></i>
+                <strong>{{ lab }}</strong>
+            </a>
+            {% endfor %}
+        </div>
+        {% else %}
+        <p class="text-muted">No labs configured yet. Run a network scan to discover printers.</p>
+        {% endif %}
+    </div>
+</div>
+{% endblock %}
+

zebra_day/templates/modern/print_request.html

@@ -96,9 +96,14 @@
             <a href="/" class="btn btn-outline">
                 <i class="fas fa-arrow-left"></i> Cancel
             </a>
-            <button type="submit" class="btn btn-primary btn-lg" onclick="showLoading('Sending print request...')">
-                <i class="fas fa-print"></i> Print Label
-            </button>
+            <div class="d-flex" style="gap: var(--spacing-md);">
+                <button type="button" class="btn btn-secondary btn-lg" onclick="downloadPNG()">
+                    <i class="fas fa-download"></i> Download PNG
+                </button>
+                <button type="submit" class="btn btn-primary btn-lg" onclick="showLoading('Sending print request...')">
+                    <i class="fas fa-print"></i> Print Label
+                </button>
+            </div>
         </div>
     </div>
 </form>
@@ -116,12 +121,16 @@
 
         printerSelect.innerHTML = '<option value="">Select a printer...</option>';
 
-        if (lab && labsDict[lab]) {
-            for (var printer in labsDict[lab]) {
+        if (lab && labsDict[lab] && labsDict[lab].printers) {
+            // v2 schema: printers are nested under 'printers' key
+            var printers = labsDict[lab].printers;
+            for (var printerId in printers) {
+                var printerInfo = printers[printerId];
                 var option = document.createElement('option');
-                option.value = printer;
-                option.text = printer;
-                if (printer === selectedPrinter) {
+                option.value = printerId;
+                // Display friendly name if available, otherwise use ID
+                option.text = printerInfo.printer_name || printerId;
+                if (printerId === selectedPrinter) {
                     option.selected = true;
                 }
                 printerSelect.appendChild(option);
@@ -136,6 +145,59 @@
             updatePrinters();
         }
     });
+
+    async function downloadPNG() {
+        var form = document.getElementById('print-form');
+        var template = form.querySelector('select[name="label_zpl_style"]').value;
+
+        if (!template) {
+            showToast('error', 'Error', 'Please select a label template');
+            return;
+        }
+
+        showLoading('Rendering PNG...');
+
+        try {
+            var response = await fetch('/api/v1/render/png', {
+                method: 'POST',
+                headers: {'Content-Type': 'application/json'},
+                body: JSON.stringify({
+                    template: template,
+                    uid_barcode: form.querySelector('input[name="uid_barcode"]').value || '',
+                    alt_a: form.querySelector('input[name="alt_a"]').value || '',
+                    alt_b: form.querySelector('input[name="alt_b"]').value || '',
+                    alt_c: form.querySelector('input[name="alt_c"]').value || '',
+                    alt_d: form.querySelector('input[name="alt_d"]').value || '',
+                    alt_e: form.querySelector('input[name="alt_e"]').value || '',
+                    alt_f: form.querySelector('input[name="alt_f"]').value || ''
+                })
+            });
+
+            hideLoading();
+
+            if (!response.ok) {
+                var error = await response.json();
+                showToast('error', 'Render Failed', error.detail || 'Unknown error');
+                return;
+            }
+
+            // Download the PNG file
+            var blob = await response.blob();
+            var url = window.URL.createObjectURL(blob);
+            var a = document.createElement('a');
+            a.href = url;
+            a.download = template + '_label.png';
+            document.body.appendChild(a);
+            a.click();
+            window.URL.revokeObjectURL(url);
+            a.remove();
+
+            showToast('success', 'Success', 'PNG downloaded');
+        } catch (e) {
+            hideLoading();
+            showToast('error', 'Error', 'Failed to render PNG: ' + e.message);
+        }
+    }
 </script>
 {% endblock %}
 

zebra_day/templates/modern/printer_detail.html

@@ -5,7 +5,7 @@
 {% block content %}
 <div class="page-header">
     <h1 class="page-title">{{ printer_name }}</h1>
-    <p class="page-subtitle">Printer details for {{ lab }}</p>
+    <p class="page-subtitle">Printer details for {{ lab_name | default(lab) }}</p>
 </div>
 
 <!-- Breadcrumb -->
@@ -14,7 +14,7 @@
     <span class="text-muted"> / </span>
     <a href="/printers">Printers</a>
     <span class="text-muted"> / </span>
-    <a href="/printers/{{ lab }}">{{ lab }}</a>
+    <a href="/printers/{{ lab }}">{{ lab_name | default(lab) }}</a>
     <span class="text-muted"> / </span>
     <span>{{ printer_name }}</span>
 </div>
@@ -32,53 +32,149 @@
         </div>
         <table class="table" style="background: transparent; box-shadow: none;">
             <tbody>
-                {% for key, value in printer_info.items() %}
                 <tr>
-                    <td style="width: 40%;"><strong>{{ key }}</strong></td>
+                    <td style="width: 40%;"><strong>Printer ID</strong></td>
+                    <td>{{ printer_id }}</td>
+                </tr>
+                <tr>
+                    <td><strong>Display Name</strong></td>
+                    <td>{{ printer_info.printer_name | default('Not set', true) }}</td>
+                </tr>
+                <tr>
+                    <td><strong>Location</strong></td>
+                    <td>{{ printer_info.lab_location | default('Not set', true) }}</td>
+                </tr>
+                <tr>
+                    <td><strong>Manufacturer</strong></td>
+                    <td>{{ printer_info.manufacturer | default('zebra') | title }}</td>
+                </tr>
+                <tr>
+                    <td><strong>Model</strong></td>
+                    <td>{{ printer_info.model | default('Unknown') }}</td>
+                </tr>
+                <tr>
+                    <td><strong>Serial</strong></td>
+                    <td>{{ printer_info.serial | default('Unknown') }}</td>
+                </tr>
+                <tr>
+                    <td><strong>IP Address</strong></td>
                     <td>
-                        {% if key == 'ip_address' and value != 'dl_png' %}
-                        <a href="http://{{ value }}" target="_blank">{{ value }}</a>
-                        {% elif key == 'status' %}
-                        {% if value == 'online' %}
-                        <span class="badge badge-success">Online</span>
+                        {% if printer_info.ip_address != 'dl_png' %}
+                        <a href="http://{{ printer_info.ip_address }}" target="_blank">{{ printer_info.ip_address }}</a>
                         {% else %}
-                        <span class="badge badge-error">Offline</span>
+                        {{ printer_info.ip_address }}
                         {% endif %}
-                        {% elif key == 'label_zpl_styles' %}
-                        {% for style in value %}
+                    </td>
+                </tr>
+                <tr>
+                    <td><strong>Print Method</strong></td>
+                    <td>{{ printer_info.print_method | default('socket') }}</td>
+                </tr>
+                <tr>
+                    <td><strong>Label Styles</strong></td>
+                    <td>
+                        {% for style in printer_info.label_zpl_styles %}
                         <span class="badge badge-primary">{{ style }}</span>
                         {% endfor %}
+                    </td>
+                </tr>
+                <tr>
+                    <td><strong>Default Label Style</strong></td>
+                    <td>
+                        {% if printer_info.default_label_style %}
+                        <span class="badge badge-success">{{ printer_info.default_label_style }}</span>
                         {% else %}
-                        {{ value }}
+                        <span class="text-muted">{{ printer_info.label_zpl_styles[0] if printer_info.label_zpl_styles else 'None' }} (first in list)</span>
                         {% endif %}
                     </td>
                 </tr>
-                {% endfor %}
+                {% if printer_info.notes %}
+                <tr>
+                    <td><strong>Notes</strong></td>
+                    <td>{{ printer_info.notes }}</td>
+                </tr>
+                {% endif %}
             </tbody>
         </table>
     </div>
-    
-    <!-- Quick Actions -->
+
+    <!-- Edit Printer Settings -->
     <div class="card">
         <div class="card-header">
-            <h3 class="card-title">Quick Actions</h3>
-        </div>
-        <div class="quick-actions">
-            <a href="/print?lab={{ lab }}&printer={{ printer_name }}" class="action-card">
-                <i class="fas fa-print"></i>
-                <div>
-                    <strong>Print Label</strong>
-                    <small class="text-muted d-block">Send a print request</small>
-                </div>
-            </a>
-            <a href="/templates" class="action-card">
-                <i class="fas fa-file-code"></i>
-                <div>
-                    <strong>View Templates</strong>
-                    <small class="text-muted d-block">Available label styles</small>
-                </div>
-            </a>
+            <h3 class="card-title">Edit Settings</h3>
         </div>
+        <form id="printer-edit-form" class="form-group">
+            <div class="form-group">
+                <label class="form-label">Display Name</label>
+                <input type="text" name="printer_name" class="form-control"
+                       value="{{ printer_info.printer_name | default('', true) }}"
+                       placeholder="e.g., Lab 3 - Bench A">
+                <small class="text-muted">User-friendly name for this printer</small>
+            </div>
+            <div class="form-group">
+                <label class="form-label">Location</label>
+                {% if available_locations %}
+                <select name="lab_location" class="form-control">
+                    <option value="">-- Select Location --</option>
+                    {% for loc in available_locations %}
+                    <option value="{{ loc }}" {% if printer_info.lab_location == loc %}selected{% endif %}>{{ loc }}</option>
+                    {% endfor %}
+                </select>
+                {% else %}
+                <input type="text" name="lab_location" class="form-control"
+                       value="{{ printer_info.lab_location | default('', true) }}"
+                       placeholder="No locations defined for this lab">
+                <small class="text-muted">Define locations at the lab level first</small>
+                {% endif %}
+            </div>
+            <div class="form-group">
+                <label class="form-label">Default Label Style</label>
+                <select name="default_label_style" class="form-control">
+                    <option value="">-- Use first in list --</option>
+                    {% for style in printer_info.label_zpl_styles %}
+                    <option value="{{ style }}" {% if printer_info.default_label_style == style %}selected{% endif %}>{{ style }}</option>
+                    {% endfor %}
+                </select>
+                <small class="text-muted">Style used when printing without specifying a template</small>
+            </div>
+            <div class="form-group">
+                <label class="form-label">Notes</label>
+                <textarea name="notes" class="form-control" rows="2" placeholder="Optional notes">{{ printer_info.notes | default('', true) }}</textarea>
+            </div>
+            <button type="submit" class="btn btn-primary">
+                <i class="fas fa-save"></i> Save Changes
+            </button>
+        </form>
+    </div>
+</div>
+
+<!-- Quick Actions -->
+<div class="card mt-lg">
+    <div class="card-header">
+        <h3 class="card-title">Quick Actions</h3>
+    </div>
+    <div class="grid grid-3">
+        <a href="/print?lab={{ lab }}&printer={{ printer_id }}" class="action-card">
+            <i class="fas fa-print"></i>
+            <div>
+                <strong>Print Label</strong>
+                <small class="text-muted d-block">Send a print request</small>
+            </div>
+        </a>
+        <a href="/templates" class="action-card">
+            <i class="fas fa-file-code"></i>
+            <div>
+                <strong>View Templates</strong>
+                <small class="text-muted d-block">Available label styles</small>
+            </div>
+        </a>
+        <a href="/printers/{{ lab }}" class="action-card">
+            <i class="fas fa-arrow-left"></i>
+            <div>
+                <strong>Back to Lab</strong>
+                <small class="text-muted d-block">View all printers</small>
+            </div>
+        </a>
     </div>
 </div>
 
@@ -103,7 +199,7 @@
     <p class="text-muted mb-lg">Send a test label to verify the printer is working correctly.</p>
     <div class="grid grid-3">
         {% for style in printer_info.label_zpl_styles[:6] %}
-        <a href="/print?lab={{ lab }}&printer={{ printer_name }}&template={{ style }}&test=1" class="action-card">
+        <a href="/print?lab={{ lab }}&printer={{ printer_id }}&template={{ style }}&test=1" class="action-card">
             <i class="fas fa-tag"></i>
             <div>
                 <strong>{{ style }}</strong>
@@ -113,5 +209,36 @@
         {% endfor %}
     </div>
 </div>
+
+<script>
+document.getElementById('printer-edit-form').addEventListener('submit', async (e) => {
+    e.preventDefault();
+    const form = e.target;
+    const data = {
+        printer_name: form.printer_name.value || null,
+        lab_location: form.lab_location.value || null,
+        default_label_style: form.default_label_style.value || null,
+        notes: form.notes.value || ''
+    };
+
+    try {
+        const response = await fetch('/api/v1/labs/{{ lab }}/printers/{{ printer_id }}', {
+            method: 'PATCH',
+            headers: { 'Content-Type': 'application/json' },
+            body: JSON.stringify(data)
+        });
+
+        if (response.ok) {
+            showToast('success', 'Saved', 'Printer settings updated successfully');
+            setTimeout(() => window.location.reload(), 1000);
+        } else {
+            const err = await response.json();
+            showToast('error', 'Error', err.detail || 'Failed to save settings');
+        }
+    } catch (err) {
+        showToast('error', 'Error', 'Network error: ' + err.message);
+    }
+});
+</script>
 {% endblock %}