diff --git a/fusion_plating/fusion_plating_shopfloor/__manifest__.py b/fusion_plating/fusion_plating_shopfloor/__manifest__.py index 6d9a2046..a7dd2455 100644 --- a/fusion_plating/fusion_plating_shopfloor/__manifest__.py +++ b/fusion_plating/fusion_plating_shopfloor/__manifest__.py @@ -5,7 +5,7 @@ { 'name': 'Fusion Plating — Shop Floor', - 'version': '19.0.32.0.7', + 'version': '19.0.32.0.8', 'category': 'Manufacturing/Plating', 'summary': 'Shop-floor tablet stations, QR scanning, bake window enforcer, ' 'first-piece inspection gates.', diff --git a/fusion_plating/fusion_plating_shopfloor/static/src/js/tablet_lock.js b/fusion_plating/fusion_plating_shopfloor/static/src/js/tablet_lock.js index ccac4ffd..ea6287bb 100644 --- a/fusion_plating/fusion_plating_shopfloor/static/src/js/tablet_lock.js +++ b/fusion_plating/fusion_plating_shopfloor/static/src/js/tablet_lock.js @@ -157,11 +157,14 @@ export class FpTabletLock extends Component { // === 2026-05-24 redesign helpers ===================================== _formatTime(d) { - // 24-hour HH:MM with leading zeros. Per project rule 20 this MUST - // live in JS, not the template — padStart isn't in OWL scope. - const hh = String(d.getHours()).padStart(2, "0"); + // 12-hour H:MM AM/PM. Per project rule 20 this MUST live in JS, + // not the template — padStart isn't in OWL scope. Hour is NOT + // zero-padded (1:05 PM, not 01:05 PM) to match phone-clock idiom. + let h = d.getHours(); + const meridiem = h >= 12 ? "PM" : "AM"; + h = h % 12 || 12; // 0 → 12 const mm = String(d.getMinutes()).padStart(2, "0"); - return hh + ":" + mm; + return h + ":" + mm + " " + meridiem; } _formatDate(d) {