mirror of
https://github.com/ChuckBuilds/LEDMatrix.git
synced 2026-05-16 10:23:31 +00:00
* fix(deps): bump minimum versions to address CVEs Pillow 10.4.0 → 12.2.0: CVE-2026-40192 (DoS via FITS decompression bomb), CVE-2026-25990 (OOB write via PSD image), CVE-2026-42311/42308/42310 requests 2.32.0 → 2.33.0: CVE-2026-25645 (temp file security bypass), CVE-2024-47081 (.netrc credentials leak) werkzeug 3.0.0 → 3.1.6: CVE-2023-46136, CVE-2024-49766/49767, CVE-2025-66221, CVE-2026-21860/27199 (DoS, path traversal, safe_join bypass) Flask 3.0.0 → 3.1.3: CVE-2026-27205 (session data caching info disclosure) spotipy 2.24.0 → 2.25.2: CVE-2025-27154, CVE-2025-66040 python-socketio 5.11.0 → 5.14.0: CVE-2025-61765 pytest 7.4.0 → 9.0.3: CVE-2025-71176 (insecure temp dir handling) Updated in requirements.txt, web_interface/requirements.txt, plugin-repos/starlark-apps/requirements.txt, and plugin-repos/march-madness/requirements.txt. Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com> * fix: resolve Pylint errors in executor, data service, and odds call Rename TimeoutError to PluginTimeoutError in plugin_executor.py to avoid shadowing the built-in; no external callers affected. Remove dead try/except in BackgroundDataService.shutdown: executor.shutdown() never accepted a timeout kwarg so the try branch always raised TypeError. Simplify to a direct shutdown(wait=wait) call. Remove is_live kwarg from odds_manager.get_odds() call in sports.py; BaseOddsManager.get_odds() has no such parameter. The live update interval is already encoded in the update_interval_seconds argument passed alongside. Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com> * fix: MD5→SHA-256, shellcheck warnings, and broken doc links config_service.py: replace MD5 with SHA-256 for config change detection; same semantics (equality comparison), no stored hashes affected. Shell scripts — shellcheck warnings: - diagnose_web_interface.sh: remove useless cat (SC2002) - dev_plugin_setup.sh: restructure A&&B||C into if/then (SC2015) - fix_assets_permissions.sh: remove unused REAL_HOME block (SC2034) - install_web_service.sh: remove unused USER_HOME assignment (SC2034) - diagnose_web_ui.sh: remove unused SUDO assignments (SC2034) - diagnose_plugin_permissions.sh: remove unused BLUE color var (SC2034) - first_time_install.sh: remove unused CLEAR var, PACKAGE_NAME assignment, and replace loop variable with _ (SC2034) docs/PLUGIN_ARCHITECTURE_SPEC.md: fix 10 broken TOC anchor links to include section numbers matching the actual headings (MD051). Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com> * fix: remove unused imports and bare exception aliases (pyflakes F401/F841) Remove unused imports across 86 files in src/, web_interface/, test/, and scripts/ using autoflake. No logic changes — only dead import statements and unused names in from-imports are removed. Also remove bare exception aliases where the variable is never referenced in the handler body: - src/cache/disk_cache.py: except (IOError, OSError, PermissionError) as e - src/cache_manager.py: except (OSError, IOError, PermissionError) as perm_error - src/plugin_system/resource_monitor.py: except Exception as e - web_interface/app.py: except Exception as read_err 86 files changed, 205 lines removed, 18 pre-existing test failures unchanged. Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com> * fix: remove unused local variable assignments (pyflakes F841) Dead assignments removed across src/ and web_interface/: - background_data_service: drop future= on fire-and-forget executor.submit - base_classes/baseball: drop font= (all rendering uses self.fonts['time']) - base_classes/hockey: drop status_short= (never referenced after assignment) - common/cli: drop game_helper=/config_helper= bindings in import-test block; constructors called for instantiation-only validation - common/display_helper: drop text_width= (x_position uses display_width directly); drop draw= in create_error_image (uses _draw_centered_text) - config_manager: remove dead secrets_content loading block in migration path (comment already noted save_config_atomic handles secrets internally) - display_manager: drop setup_start= (timing was never completed or read) - font_manager: drop target_path= (catalog uses font_file_path directly); drop face=/font= bindings in validate_font (validation by construction — TypeError on failure is the signal, not the return value) - font_test_manager: drop width=/height= (draw_text uses display_manager directly) - plugin_system/state_reconciliation: drop manager= (only config/disk/state_mgr used) - plugin_system/store_manager: drop result= on pip install subprocess.run (check=True raises on failure; stdout unused) - web_interface/blueprints/pages_v3: drop main_config_path=""/secrets_config_path="" (render_template uses config_manager.get_*_path() inline) Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com> * fix(js): resolve ESLint no-undef warnings across 6 JS files Three distinct patterns: 1. Vendor library globals — htmx is injected by <script> before these extension files load; ESLint lints files in isolation and doesn't know. Fix: add /* global htmx */ to htmx-sse.js and htmx-json-enc.js. 2. Cross-file globals — showNotification is defined as window.showNotification in app.js/notification.js but called bare in app.js and error_handler.js. ESLint doesn't connect window.X = Y with a bare call to X. Fix: add /* global showNotification */ to app.js and error_handler.js. 3. Forward-reference window.* functions — in array-table.js, checkbox-group.js, and custom-feeds.js, functions like removeArrayTableRow are called early inside event-handler closures but assigned to window.* later in the file. At runtime this works (the handler fires after the assignment), but ESLint sees the bare name at the call site. Fix: change bare calls to window.removeArrayTableRow(this) etc. so the reference is explicit and ESLint-safe. Also guard the updateSystemStats call in app.js reconnectSSE: the function is called but defined nowhere in the codebase. Guard with typeof check so it won't throw ReferenceError if the reconnect path is hit. Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com> * fix(js): resolve Biome lint warnings across 9 JS files noUnusedVariables (catch bindings → optional catch syntax): - app.js, file-upload.js, timezone-selector.js: } catch (e) { → } catch { ES2019 optional catch binding; e was unused in all three handlers noUnusedVariables (dead assignments): - app.js: remove const data= in display SSE stub (handler does nothing yet) - api_client.js: remove const timeoutId= (setTimeout ID never used to cancel) - custom-feeds.js: remove const oldIndex= (getAttribute result never read) - schedule-picker.js: remove const compactMode= (never used in HTML build) - select-dropdown.js: remove const icons= (icons not yet rendered in options) noPrototypeBuiltins: - day-selector.js: DAY_LABELS.hasOwnProperty(x) → Object.prototype.hasOwnProperty.call(DAY_LABELS, x) Safe form that works even on null-prototype objects useIterableCallbackReturn: - file-upload.js, notification.js: forEach(x => expr) → forEach(x => { expr; }) — forEach ignores return values; implicit return from arrow body was misleading htmx-sse.js is a vendor extension file with old-style var/== patterns that are correct for it; 18 Biome issues suppressed via Codacy API rather than modifying the vendor source. Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com> * fix(security): escape user input in raw HTML responses in pages_v3.py plugin_id comes directly from the URL path (/partials/plugin-config/<plugin_id>) and was interpolated into an HTML fragment without escaping. A crafted URL like /partials/plugin-config/<script>alert(1)</script> would inject that tag into the DOM via the HTMX partial response. Fix: wrap all user-controlled values in markupsafe.escape() before embedding in raw HTML strings. Affects the plugin-not-found 404 response and both error 500 responses in the plugin config partial. Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com> * fix: address Bandit B108/B110 across production code B110 (try/except/pass): - display_controller.py: narrow 'except Exception' to 'except AttributeError' for get_offset_frame() — plugins not having this optional method is the expected case, not all exceptions - config_manager.py: B110 already resolved by the earlier removal of the dead secrets-loading block (the except/pass was inside it) - All other except/pass blocks in src/ and web_interface/ are intentional (last-resort recovery, best-effort fallbacks, non-critical startup probes). Annotated each with # nosec B110 and a brief inline reason so the decision is explicit for future reviewers. - Test files and plugin-repos B110 suppressed via Codacy API (not prod code). B108 (/tmp usage): - permission_utils.py: /tmp listed to PREVENT permission changes on it — not used as a temp path. Annotated # nosec B108. - display_manager.py: fixed snapshot path is intentional (web UI reads same path); path-check guard also annotated. - wifi_manager.py: named /tmp files match the sudoers allowlist installed with the system (the paths are hard-coded in both places by design). Annotated all six open/cp references # nosec B108. - scripts/render_plugin.py: dev script default overridable by user. Annotated. - web_interface/app.py: reads the same fixed path written by display_manager. Annotated # nosec B108. - Test files suppressed via Codacy API. Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com> * fix: address remaining Codacy security findings Flask debug=True (real fix): - web_interface/app.py: debug=True in __main__ block exposes the Werkzeug interactive debugger (arbitrary code execution). Changed to os.environ.get('FLASK_DEBUG', '0') == '1' — off by default, opt-in via environment variable for local development. nosec annotations (accepted risk with documented rationale): - disk_cache.py: os.chmod(0o660) is intentional — web UI and LED matrix service share a group, 660 gives group write while denying world access (B103 + Semgrep insecure-file-permissions suppressed in Codacy) - wifi_manager.py: urlopen to hardcoded connectivity-check.ubuntu.com URL (B310 — no user input involved) - font_manager.py: urlretrieve URL comes from user's own config file on their local device (B310) - start_web_conditionally.py: os.execvp with both sys.executable and a fixed PROJECT_DIR-relative constant (B606) Confirmed false positives suppressed via Codacy API (15 issues): - SSRF (3x): client-side JS fetch — SSRF is server-side; browser fetch is CORS-restricted to same origin - B105 (3x): test fixtures use dummy secrets by design; store_manager checks for the placeholder string, it is not itself a secret - PMD numeric literal (2x): 10000000 is within Number.MAX_SAFE_INTEGER - Prototype pollution (1x): read-only schema traversal, no writes - no-unsanitized_method (1x): dynamic import() is CORS-restricted - detect-unsafe-regex (1x): operates on server-controlled config values - plugin-repos B103 (1x): vendor code chmod on executable - Semgrep insecure-file-permissions (3x): same disk_cache 0o660 as above Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com> * fix: remove unnecessary f prefix from f-strings without placeholders (F541) Pyflakes F541 flags f-strings that contain no {} interpolation — they are identical to plain strings but trigger unnecessary string formatting overhead. Fixed in production code: - src/base_classes/data_sources.py (2 debug log calls) - src/logo_downloader.py (1 error log) - src/plugin_system/store_manager.py (5 strings across 3 log calls) - src/web_interface/validators.py (1 return value) - src/wifi_manager.py (4 log/message strings) - web_interface/start.py (1 print) F541 issues in test/, scripts/, and plugin-repos/ suppressed via Codacy API as non-production code. Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com> * chore(dev): add Pillow compatibility smoke test script Covers all Pillow APIs used in LEDMatrix — image creation, drawing, font metrics, LANCZOS resampling, paste/alpha_composite, and PNG I/O. Run after any Pillow version bump to catch regressions before deploy. python3 scripts/dev/test_pillow_compat.py Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com> * fix: resolve 8 new Codacy issues introduced by PR changes shellcheck SC2034: - first_time_install.sh: 'type' loop variable also unused in the wifi status loop (we previously fixed 'device' → '_' but left 'type'). Changed to '_ _ state' since neither device nor type is referenced. ESLint no-undef: - app.js: typeof guards don't satisfy no-undef; added updateSystemStats to the /* global */ declaration alongside showNotification. nosec annotation: - web_interface/app.py: app.run(host='0.0.0.0') line changed when we fixed debug=True, giving it a new issue ID. Re-added # nosec B104. pyflakes F401: - scripts/dev/test_pillow_compat.py: ImageFilter was imported but never used in the smoke test. Removed from the import. Codacy API suppressions (false positives on changed lines): - disk_cache.py 0o660 chmod (2x): lines changed when # nosec B103 was added, producing new Semgrep issue IDs. Re-suppressed. - pages_v3.py raw-html-concat: Semgrep does not recognise escape() as a sanitizer; the escape() call IS the correct fix. - app.py flask 0.0.0.0: same line as B104 above; Semgrep rule also re-suppressed. Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com> * fix: address PR review findings Fix (10 of 15 findings): plugin-repos/march-madness/requirements.txt: Add urllib3>=1.26.0 — manager.py directly imports from urllib3; it was an undeclared transitive dependency via requests. scripts/dev/dev_plugin_setup.sh: Restore subshell form (cd "$target_dir" && git pull --rebase) || true so the shell's working directory is not permanently changed after the if-cd block. Previous fix for SC2015 leaked cwd into the remainder of the script. src/base_classes/sports.py: Narrow 'except Exception' to 'except RuntimeError as e' and log via self.logger.debug — Path.home() raises only RuntimeError for service users; other exceptions should not be silently swallowed. src/config_service.py: Fix stale "MD5 checksum" in ConfigVersion.__init__ docstring (line 40); the implementation uses SHA-256 since the Codacy fix. src/wifi_manager.py: Log the last-resort AP enable failure with exc_info=True instead of silently passing — failure here means the device may be unreachable. web_interface/blueprints/pages_v3.py: Log the outer metadata pre-load exception at debug level instead of swallowing it silently; schema still loads fully below. src/background_data_service.py: Remove unused 'timeout' parameter from shutdown() — executor.shutdown() does not accept timeout; update __del__ caller accordingly. src/font_manager.py: Validate URL scheme before urlretrieve — reject non-http/https schemes (e.g. file://) to prevent reading local files from config-supplied URLs. src/plugin_system/plugin_executor.py: Simplify redundant except tuple: (PluginTimeoutError, PluginError, Exception) → Exception, which already covers the others. test/test_display_controller.py: Mark empty test_plugin_discovery_and_loading as @pytest.mark.skip with reason. Move duplicate 'from datetime import datetime' to module header and remove the stray mid-module copy. Skip (5 of 15 findings, with reasons): - pytest 9.0.3 concerns: full suite already verified (467 pass, 18 pre-existing) - Pillow 12.2.0 API concerns: no deprecated APIs in codebase; tests + Pi smoke test pass - diagnose_web_ui.sh sudo validation: set -e already ensures fail-fast on any sudo failure - app.py request-logging except: must stay silent (recursive logging risk); annotated - app.py SSE file-read except: genuinely transient I/O; annotated Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com> --------- Co-authored-by: Chuck <chuck@example.com> Co-authored-by: Claude Sonnet 4.6 <noreply@anthropic.com>
570 lines
25 KiB
JavaScript
570 lines
25 KiB
JavaScript
/**
|
|
* LEDMatrix Schedule Picker Widget
|
|
*
|
|
* Composite widget combining enable toggle, mode switch (global/per-day),
|
|
* and time range configurations. Composes day-selector and time-range widgets.
|
|
*
|
|
* Can be used standalone in schedule.html or by plugins via x-widget: "schedule-picker".
|
|
*
|
|
* Schema example:
|
|
* {
|
|
* "schedule": {
|
|
* "type": "object",
|
|
* "x-widget": "schedule-picker",
|
|
* "x-options": {
|
|
* "showModeToggle": true, // Allow switching global/per-day
|
|
* "showEnableToggle": true, // Show enabled checkbox
|
|
* "compactMode": false, // Compact layout for embedded use
|
|
* "defaultMode": "global" // Default mode: "global" or "per_day"
|
|
* }
|
|
* }
|
|
* }
|
|
*
|
|
* API-compatible output format:
|
|
* {
|
|
* enabled: boolean,
|
|
* mode: "global" | "per_day",
|
|
* start_time: "HH:MM", // if global mode
|
|
* end_time: "HH:MM", // if global mode
|
|
* days: { // if per_day mode
|
|
* monday: { enabled: boolean, start_time: "HH:MM", end_time: "HH:MM" },
|
|
* ...
|
|
* }
|
|
* }
|
|
*
|
|
* @module SchedulePickerWidget
|
|
*/
|
|
|
|
(function() {
|
|
'use strict';
|
|
|
|
const DAYS = ['monday', 'tuesday', 'wednesday', 'thursday', 'friday', 'saturday', 'sunday'];
|
|
|
|
const DAY_LABELS = {
|
|
monday: 'Monday',
|
|
tuesday: 'Tuesday',
|
|
wednesday: 'Wednesday',
|
|
thursday: 'Thursday',
|
|
friday: 'Friday',
|
|
saturday: 'Saturday',
|
|
sunday: 'Sunday'
|
|
};
|
|
|
|
// Use BaseWidget utilities if available
|
|
const base = window.BaseWidget ? new window.BaseWidget('SchedulePicker', '1.0.0') : null;
|
|
|
|
function escapeHtml(text) {
|
|
if (base) return base.escapeHtml(text);
|
|
const div = document.createElement('div');
|
|
div.textContent = String(text);
|
|
return div.innerHTML.replace(/"/g, '"').replace(/'/g, ''');
|
|
}
|
|
|
|
function sanitizeId(id) {
|
|
if (base) return base.sanitizeId(id);
|
|
return String(id).replace(/[^a-zA-Z0-9_-]/g, '_');
|
|
}
|
|
|
|
function triggerChange(fieldId, value) {
|
|
if (base) {
|
|
base.triggerChange(fieldId, value);
|
|
} else {
|
|
const event = new CustomEvent('widget-change', {
|
|
detail: { fieldId, value },
|
|
bubbles: true,
|
|
cancelable: true
|
|
});
|
|
document.dispatchEvent(event);
|
|
}
|
|
}
|
|
|
|
/**
|
|
* Generate default schedule config
|
|
*/
|
|
function getDefaultSchedule() {
|
|
const days = {};
|
|
DAYS.forEach(day => {
|
|
days[day] = {
|
|
enabled: true,
|
|
start_time: '07:00',
|
|
end_time: '23:00'
|
|
};
|
|
});
|
|
return {
|
|
enabled: false,
|
|
mode: 'global',
|
|
start_time: '07:00',
|
|
end_time: '23:00',
|
|
days: days
|
|
};
|
|
}
|
|
|
|
/**
|
|
* Coerce a value to boolean, handling string 'true'/'false' values
|
|
* that may come from config files or form submissions.
|
|
*/
|
|
function coerceToBoolean(value) {
|
|
if (typeof value === 'boolean') {
|
|
return value;
|
|
}
|
|
if (typeof value === 'string') {
|
|
const trimmed = value.trim().toLowerCase();
|
|
return trimmed === 'true' || trimmed === '1' || trimmed === 'on';
|
|
}
|
|
return Boolean(value);
|
|
}
|
|
|
|
/**
|
|
* Normalize mode value to handle both 'per_day' and 'per-day' variants.
|
|
*/
|
|
function normalizeMode(mode) {
|
|
if (!mode || typeof mode !== 'string') {
|
|
return 'global';
|
|
}
|
|
// Normalize: replace hyphens with underscores and check for per_day
|
|
const normalized = mode.trim().toLowerCase().replace(/-/g, '_');
|
|
return normalized === 'per_day' ? 'per_day' : 'global';
|
|
}
|
|
|
|
/**
|
|
* Merge user value with defaults
|
|
*/
|
|
function normalizeSchedule(value) {
|
|
const defaults = getDefaultSchedule();
|
|
if (!value || typeof value !== 'object') {
|
|
return defaults;
|
|
}
|
|
|
|
const schedule = {
|
|
enabled: coerceToBoolean(value.enabled),
|
|
mode: normalizeMode(value.mode),
|
|
start_time: value.start_time || defaults.start_time,
|
|
end_time: value.end_time || defaults.end_time,
|
|
days: {}
|
|
};
|
|
|
|
// Merge days
|
|
DAYS.forEach(day => {
|
|
const dayConfig = (value.days && value.days[day]) || defaults.days[day];
|
|
// Use coerceToBoolean but default to true if enabled is undefined
|
|
const dayEnabled = dayConfig.enabled === undefined ? true : coerceToBoolean(dayConfig.enabled);
|
|
schedule.days[day] = {
|
|
enabled: dayEnabled,
|
|
start_time: dayConfig.start_time || defaults.days[day].start_time,
|
|
end_time: dayConfig.end_time || defaults.days[day].end_time
|
|
};
|
|
});
|
|
|
|
return schedule;
|
|
}
|
|
|
|
window.LEDMatrixWidgets.register('schedule-picker', {
|
|
name: 'Schedule Picker Widget',
|
|
version: '1.0.0',
|
|
|
|
/**
|
|
* Render the schedule picker widget
|
|
* @param {HTMLElement} container - Container element
|
|
* @param {Object} config - Schema configuration
|
|
* @param {Object} value - Schedule configuration object
|
|
* @param {Object} options - Additional options (fieldId, pluginId)
|
|
*/
|
|
render: function(container, config, value, options) {
|
|
const fieldId = sanitizeId(options.fieldId || container.id || 'schedule');
|
|
const xOptions = config['x-options'] || config['x_options'] || {};
|
|
const showModeToggle = xOptions.showModeToggle !== false;
|
|
const showEnableToggle = xOptions.showEnableToggle !== false;
|
|
|
|
const schedule = normalizeSchedule(value);
|
|
|
|
let html = `<div id="${fieldId}_widget" class="schedule-picker-widget" data-field-id="${fieldId}">`;
|
|
|
|
// Hidden inputs for API-compatible form submission
|
|
html += this._renderHiddenInputs(fieldId, schedule);
|
|
|
|
// Enable toggle
|
|
if (showEnableToggle) {
|
|
html += `
|
|
<div class="bg-blue-50 rounded-lg p-4 mb-4">
|
|
<label class="flex items-center cursor-pointer">
|
|
<input type="checkbox"
|
|
id="${fieldId}_enabled"
|
|
${schedule.enabled ? 'checked' : ''}
|
|
onchange="window.LEDMatrixWidgets.getHandlers('schedule-picker').onEnabledChange('${fieldId}', this.checked)"
|
|
class="h-4 w-4 text-blue-600 focus:ring-blue-500 border-gray-300 rounded">
|
|
<span class="ml-2 text-sm font-medium text-gray-900">Enable Schedule</span>
|
|
</label>
|
|
<p class="mt-1 text-sm text-gray-600">When enabled, the display will only operate during specified hours.</p>
|
|
</div>
|
|
`;
|
|
}
|
|
|
|
// Mode selection
|
|
if (showModeToggle) {
|
|
html += `
|
|
<div class="bg-gray-50 rounded-lg p-4 mb-4">
|
|
<h3 class="text-md font-medium text-gray-900 mb-4">Schedule Mode</h3>
|
|
<div class="space-y-3">
|
|
<label class="flex items-center cursor-pointer">
|
|
<input type="radio"
|
|
name="${fieldId}_mode"
|
|
value="global"
|
|
id="${fieldId}_mode_global"
|
|
${schedule.mode === 'global' ? 'checked' : ''}
|
|
onchange="window.LEDMatrixWidgets.getHandlers('schedule-picker').onModeChange('${fieldId}', 'global')"
|
|
class="h-4 w-4 text-blue-600 focus:ring-blue-500 border-gray-300">
|
|
<span class="ml-2 text-sm font-medium text-gray-900">Global Schedule</span>
|
|
</label>
|
|
<p class="ml-6 text-sm text-gray-600">Use the same start and end time for all days of the week</p>
|
|
|
|
<label class="flex items-center cursor-pointer mt-4">
|
|
<input type="radio"
|
|
name="${fieldId}_mode"
|
|
value="per_day"
|
|
id="${fieldId}_mode_per_day"
|
|
${schedule.mode === 'per_day' ? 'checked' : ''}
|
|
onchange="window.LEDMatrixWidgets.getHandlers('schedule-picker').onModeChange('${fieldId}', 'per_day')"
|
|
class="h-4 w-4 text-blue-600 focus:ring-blue-500 border-gray-300">
|
|
<span class="ml-2 text-sm font-medium text-gray-900">Per-Day Schedule</span>
|
|
</label>
|
|
<p class="ml-6 text-sm text-gray-600">Set different times for each day of the week</p>
|
|
</div>
|
|
</div>
|
|
`;
|
|
}
|
|
|
|
// Global schedule section
|
|
const globalDisplay = schedule.mode === 'global' ? 'block' : 'none';
|
|
html += `
|
|
<div id="${fieldId}_global_section" class="bg-gray-50 rounded-lg p-4 mb-4" style="display: ${globalDisplay};">
|
|
<h3 class="text-md font-medium text-gray-900 mb-4">Global Times</h3>
|
|
<div class="grid grid-cols-1 md:grid-cols-2 gap-4">
|
|
<div class="form-group">
|
|
<label for="${fieldId}_global_start" class="block text-sm font-medium text-gray-700">Start Time</label>
|
|
<input type="time"
|
|
id="${fieldId}_global_start"
|
|
value="${escapeHtml(schedule.start_time)}"
|
|
onchange="window.LEDMatrixWidgets.getHandlers('schedule-picker').onGlobalTimeChange('${fieldId}')"
|
|
class="form-control mt-1">
|
|
<p class="mt-1 text-sm text-gray-600">When to start displaying content (HH:MM)</p>
|
|
</div>
|
|
<div class="form-group">
|
|
<label for="${fieldId}_global_end" class="block text-sm font-medium text-gray-700">End Time</label>
|
|
<input type="time"
|
|
id="${fieldId}_global_end"
|
|
value="${escapeHtml(schedule.end_time)}"
|
|
onchange="window.LEDMatrixWidgets.getHandlers('schedule-picker').onGlobalTimeChange('${fieldId}')"
|
|
class="form-control mt-1">
|
|
<p class="mt-1 text-sm text-gray-600">When to stop displaying content (HH:MM)</p>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
`;
|
|
|
|
// Per-day schedule section
|
|
const perDayDisplay = schedule.mode === 'per_day' ? 'block' : 'none';
|
|
html += `
|
|
<div id="${fieldId}_perday_section" style="display: ${perDayDisplay};">
|
|
<h3 class="text-md font-medium text-gray-900 mb-4">Day-Specific Times</h3>
|
|
<div class="bg-gray-50 rounded-lg p-4">
|
|
<div class="overflow-x-auto">
|
|
<table class="min-w-full divide-y divide-gray-200">
|
|
<thead>
|
|
<tr class="bg-gray-100">
|
|
<th class="px-3 py-2 text-left text-xs font-semibold text-gray-700 uppercase">Day</th>
|
|
<th class="px-3 py-2 text-left text-xs font-semibold text-gray-700 uppercase">Enabled</th>
|
|
<th class="px-3 py-2 text-left text-xs font-semibold text-gray-700 uppercase">Start</th>
|
|
<th class="px-3 py-2 text-left text-xs font-semibold text-gray-700 uppercase">End</th>
|
|
</tr>
|
|
</thead>
|
|
<tbody class="bg-white divide-y divide-gray-200">
|
|
`;
|
|
|
|
// Render each day row
|
|
DAYS.forEach(day => {
|
|
const dayConfig = schedule.days[day];
|
|
const disabled = !dayConfig.enabled;
|
|
const disabledClass = disabled ? 'bg-gray-100' : '';
|
|
|
|
html += `
|
|
<tr class="hover:bg-gray-50" id="${fieldId}_row_${day}">
|
|
<td class="px-3 py-2 whitespace-nowrap">
|
|
<span class="text-sm font-medium text-gray-900">${escapeHtml(DAY_LABELS[day])}</span>
|
|
</td>
|
|
<td class="px-3 py-2 whitespace-nowrap">
|
|
<input type="checkbox"
|
|
id="${fieldId}_${day}_enabled"
|
|
${dayConfig.enabled ? 'checked' : ''}
|
|
onchange="window.LEDMatrixWidgets.getHandlers('schedule-picker').onDayEnabledChange('${fieldId}', '${day}', this.checked)"
|
|
class="h-4 w-4 text-blue-600 focus:ring-blue-500 border-gray-300 rounded">
|
|
</td>
|
|
<td class="px-3 py-2 whitespace-nowrap">
|
|
<input type="time"
|
|
id="${fieldId}_${day}_start"
|
|
value="${escapeHtml(dayConfig.start_time)}"
|
|
${disabled ? 'disabled' : ''}
|
|
onchange="window.LEDMatrixWidgets.getHandlers('schedule-picker').onDayTimeChange('${fieldId}', '${day}')"
|
|
class="block w-full px-2 py-1 text-sm border border-gray-300 rounded-md focus:outline-none focus:ring-blue-500 focus:border-blue-500 ${disabledClass}">
|
|
</td>
|
|
<td class="px-3 py-2 whitespace-nowrap">
|
|
<input type="time"
|
|
id="${fieldId}_${day}_end"
|
|
value="${escapeHtml(dayConfig.end_time)}"
|
|
${disabled ? 'disabled' : ''}
|
|
onchange="window.LEDMatrixWidgets.getHandlers('schedule-picker').onDayTimeChange('${fieldId}', '${day}')"
|
|
class="block w-full px-2 py-1 text-sm border border-gray-300 rounded-md focus:outline-none focus:ring-blue-500 focus:border-blue-500 ${disabledClass}">
|
|
</td>
|
|
</tr>
|
|
`;
|
|
});
|
|
|
|
html += `
|
|
</tbody>
|
|
</table>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
`;
|
|
|
|
html += '</div>';
|
|
|
|
container.innerHTML = html;
|
|
},
|
|
|
|
/**
|
|
* Render hidden inputs for form submission
|
|
* These match the existing API format
|
|
*/
|
|
_renderHiddenInputs: function(fieldId, schedule) {
|
|
let html = '';
|
|
|
|
// Enabled state (hidden input ensures value is always sent, even when checkbox is unchecked)
|
|
html += `<input type="hidden" id="${fieldId}_enabled_hidden" name="enabled" value="${schedule.enabled}">`;
|
|
|
|
// Mode indicator (for the widget to track internally)
|
|
html += `<input type="hidden" id="${fieldId}_mode_value" name="mode" value="${schedule.mode}">`;
|
|
|
|
// Global times (used when mode is global)
|
|
html += `<input type="hidden" id="${fieldId}_start_time_hidden" name="start_time" value="${escapeHtml(schedule.start_time)}">`;
|
|
html += `<input type="hidden" id="${fieldId}_end_time_hidden" name="end_time" value="${escapeHtml(schedule.end_time)}">`;
|
|
|
|
// Per-day values (used when mode is per_day)
|
|
DAYS.forEach(day => {
|
|
const dayConfig = schedule.days[day];
|
|
html += `<input type="hidden" id="${fieldId}_${day}_enabled_hidden" name="${day}_enabled" value="${dayConfig.enabled}">`;
|
|
html += `<input type="hidden" id="${fieldId}_${day}_start_hidden" name="${day}_start" value="${escapeHtml(dayConfig.start_time)}">`;
|
|
html += `<input type="hidden" id="${fieldId}_${day}_end_hidden" name="${day}_end" value="${escapeHtml(dayConfig.end_time)}">`;
|
|
});
|
|
|
|
return html;
|
|
},
|
|
|
|
/**
|
|
* Get current schedule value
|
|
* @param {string} fieldId - Field ID
|
|
* @returns {Object} Schedule configuration object
|
|
*/
|
|
getValue: function(fieldId) {
|
|
const safeId = sanitizeId(fieldId);
|
|
const widget = document.getElementById(`${safeId}_widget`);
|
|
if (!widget) return getDefaultSchedule();
|
|
|
|
const enabledCheckbox = document.getElementById(`${safeId}_enabled`);
|
|
const modeGlobal = document.getElementById(`${safeId}_mode_global`);
|
|
const globalStart = document.getElementById(`${safeId}_global_start`);
|
|
const globalEnd = document.getElementById(`${safeId}_global_end`);
|
|
|
|
const schedule = {
|
|
enabled: enabledCheckbox ? enabledCheckbox.checked : false,
|
|
mode: (modeGlobal && modeGlobal.checked) ? 'global' : 'per_day',
|
|
start_time: globalStart ? globalStart.value : '07:00',
|
|
end_time: globalEnd ? globalEnd.value : '23:00',
|
|
days: {}
|
|
};
|
|
|
|
DAYS.forEach(day => {
|
|
const dayEnabled = document.getElementById(`${safeId}_${day}_enabled`);
|
|
const dayStart = document.getElementById(`${safeId}_${day}_start`);
|
|
const dayEnd = document.getElementById(`${safeId}_${day}_end`);
|
|
|
|
schedule.days[day] = {
|
|
enabled: dayEnabled ? dayEnabled.checked : true,
|
|
start_time: dayStart ? dayStart.value : '07:00',
|
|
end_time: dayEnd ? dayEnd.value : '23:00'
|
|
};
|
|
});
|
|
|
|
return schedule;
|
|
},
|
|
|
|
/**
|
|
* Set schedule value
|
|
* @param {string} fieldId - Field ID
|
|
* @param {Object} value - Schedule configuration object
|
|
*/
|
|
setValue: function(fieldId, value) {
|
|
const safeId = sanitizeId(fieldId);
|
|
const schedule = normalizeSchedule(value);
|
|
|
|
// Set enabled
|
|
const enabledCheckbox = document.getElementById(`${safeId}_enabled`);
|
|
if (enabledCheckbox) enabledCheckbox.checked = schedule.enabled;
|
|
|
|
// Set mode
|
|
const modeGlobal = document.getElementById(`${safeId}_mode_global`);
|
|
const modePerDay = document.getElementById(`${safeId}_mode_per_day`);
|
|
if (modeGlobal) modeGlobal.checked = schedule.mode === 'global';
|
|
if (modePerDay) modePerDay.checked = schedule.mode === 'per_day';
|
|
|
|
// Set global times
|
|
const globalStart = document.getElementById(`${safeId}_global_start`);
|
|
const globalEnd = document.getElementById(`${safeId}_global_end`);
|
|
if (globalStart) globalStart.value = schedule.start_time;
|
|
if (globalEnd) globalEnd.value = schedule.end_time;
|
|
|
|
// Set per-day values
|
|
DAYS.forEach(day => {
|
|
const dayConfig = schedule.days[day];
|
|
const dayEnabled = document.getElementById(`${safeId}_${day}_enabled`);
|
|
const dayStart = document.getElementById(`${safeId}_${day}_start`);
|
|
const dayEnd = document.getElementById(`${safeId}_${day}_end`);
|
|
|
|
if (dayEnabled) dayEnabled.checked = dayConfig.enabled;
|
|
if (dayStart) {
|
|
dayStart.value = dayConfig.start_time;
|
|
dayStart.disabled = !dayConfig.enabled;
|
|
dayStart.classList.toggle('bg-gray-100', !dayConfig.enabled);
|
|
}
|
|
if (dayEnd) {
|
|
dayEnd.value = dayConfig.end_time;
|
|
dayEnd.disabled = !dayConfig.enabled;
|
|
dayEnd.classList.toggle('bg-gray-100', !dayConfig.enabled);
|
|
}
|
|
});
|
|
|
|
// Update visibility
|
|
this.handlers.onModeChange(fieldId, schedule.mode);
|
|
|
|
// Update hidden inputs
|
|
this._updateHiddenInputs(fieldId);
|
|
},
|
|
|
|
/**
|
|
* Update all hidden inputs to match current state
|
|
*/
|
|
_updateHiddenInputs: function(fieldId) {
|
|
const safeId = sanitizeId(fieldId);
|
|
const schedule = this.getValue(fieldId);
|
|
|
|
// Enabled
|
|
const enabledHidden = document.getElementById(`${safeId}_enabled_hidden`);
|
|
if (enabledHidden) enabledHidden.value = schedule.enabled;
|
|
|
|
// Mode
|
|
const modeHidden = document.getElementById(`${safeId}_mode_value`);
|
|
if (modeHidden) modeHidden.value = schedule.mode;
|
|
|
|
// Global times
|
|
const startHidden = document.getElementById(`${safeId}_start_time_hidden`);
|
|
const endHidden = document.getElementById(`${safeId}_end_time_hidden`);
|
|
if (startHidden) startHidden.value = schedule.start_time;
|
|
if (endHidden) endHidden.value = schedule.end_time;
|
|
|
|
// Per-day values
|
|
DAYS.forEach(day => {
|
|
const dayConfig = schedule.days[day];
|
|
const enabledHidden = document.getElementById(`${safeId}_${day}_enabled_hidden`);
|
|
const startHidden = document.getElementById(`${safeId}_${day}_start_hidden`);
|
|
const endHidden = document.getElementById(`${safeId}_${day}_end_hidden`);
|
|
|
|
if (enabledHidden) enabledHidden.value = dayConfig.enabled;
|
|
if (startHidden) startHidden.value = dayConfig.start_time;
|
|
if (endHidden) endHidden.value = dayConfig.end_time;
|
|
});
|
|
},
|
|
|
|
handlers: {
|
|
/**
|
|
* Handle enabled toggle change
|
|
*/
|
|
onEnabledChange: function(fieldId, enabled) {
|
|
const widget = window.LEDMatrixWidgets.get('schedule-picker');
|
|
widget._updateHiddenInputs(fieldId);
|
|
triggerChange(fieldId, widget.getValue(fieldId));
|
|
},
|
|
|
|
/**
|
|
* Handle mode switch
|
|
*/
|
|
onModeChange: function(fieldId, mode) {
|
|
const safeId = sanitizeId(fieldId);
|
|
const globalSection = document.getElementById(`${safeId}_global_section`);
|
|
const perDaySection = document.getElementById(`${safeId}_perday_section`);
|
|
|
|
if (globalSection) globalSection.style.display = mode === 'global' ? 'block' : 'none';
|
|
if (perDaySection) perDaySection.style.display = mode === 'per_day' ? 'block' : 'none';
|
|
|
|
const widget = window.LEDMatrixWidgets.get('schedule-picker');
|
|
widget._updateHiddenInputs(fieldId);
|
|
triggerChange(fieldId, widget.getValue(fieldId));
|
|
},
|
|
|
|
/**
|
|
* Handle global time change
|
|
*/
|
|
onGlobalTimeChange: function(fieldId) {
|
|
const widget = window.LEDMatrixWidgets.get('schedule-picker');
|
|
widget._updateHiddenInputs(fieldId);
|
|
triggerChange(fieldId, widget.getValue(fieldId));
|
|
},
|
|
|
|
/**
|
|
* Handle day enabled change
|
|
*/
|
|
onDayEnabledChange: function(fieldId, day, enabled) {
|
|
const safeId = sanitizeId(fieldId);
|
|
const dayStart = document.getElementById(`${safeId}_${day}_start`);
|
|
const dayEnd = document.getElementById(`${safeId}_${day}_end`);
|
|
|
|
if (dayStart) {
|
|
dayStart.disabled = !enabled;
|
|
dayStart.classList.toggle('bg-gray-100', !enabled);
|
|
// Set default value only when enabling and input is empty
|
|
if (enabled && !dayStart.value) {
|
|
dayStart.value = '07:00';
|
|
}
|
|
}
|
|
|
|
if (dayEnd) {
|
|
dayEnd.disabled = !enabled;
|
|
dayEnd.classList.toggle('bg-gray-100', !enabled);
|
|
// Set default value only when enabling and input is empty
|
|
if (enabled && !dayEnd.value) {
|
|
dayEnd.value = '23:00';
|
|
}
|
|
}
|
|
|
|
const widget = window.LEDMatrixWidgets.get('schedule-picker');
|
|
widget._updateHiddenInputs(fieldId);
|
|
triggerChange(fieldId, widget.getValue(fieldId));
|
|
},
|
|
|
|
/**
|
|
* Handle day time change
|
|
*/
|
|
onDayTimeChange: function(fieldId, day) {
|
|
const widget = window.LEDMatrixWidgets.get('schedule-picker');
|
|
widget._updateHiddenInputs(fieldId);
|
|
triggerChange(fieldId, widget.getValue(fieldId));
|
|
}
|
|
}
|
|
});
|
|
|
|
// Expose constants for external use
|
|
window.LEDMatrixWidgets.get('schedule-picker').DAYS = DAYS;
|
|
window.LEDMatrixWidgets.get('schedule-picker').DAY_LABELS = DAY_LABELS;
|
|
window.LEDMatrixWidgets.get('schedule-picker').getDefaultSchedule = getDefaultSchedule;
|
|
window.LEDMatrixWidgets.get('schedule-picker').normalizeSchedule = normalizeSchedule;
|
|
|
|
})();
|