@masterteam/system-settings 0.0.20 → 0.0.22

package/fesm2022/{masterteam-system-settings-masterteam-system-settings-DbsjQ7c7.mjs → masterteam-system-settings-masterteam-system-settings-7I4TfgwP.mjs}

@@ -489,7 +489,7 @@ class SystemSettings {
                 nonNullable: true,
                 validators: GLOBAL_WORKING_HOURS_WORKING_DAYS_VALIDATORS,
             }),
-            hoursPerDay: new FormControl(8, GLOBAL_WORKING_HOURS_HOURS_PER_DAY_VALIDATORS),
+            hoursPerDay: new FormControl(8, this.buildHoursPerDayValidators()),
             holidaysCsv: new FormControl('', { nonNullable: true }),
         }),
     }, maxDailyHoursGteHoursPerDay(() => this.hideTimeSheet()));
@@ -714,9 +714,15 @@ class SystemSettings {
         }
         const modalRef = this.modal.openModal(SystemSettingsHolidayEditor, 'drawer', {
             header: this.transloco.translate('system-settings.edit-holiday'),
-            styleClass: '!w-[30rem] !absolute !shadow-none',
+            // Deliberately viewport-fixed (appendTo defaults to 'body', no
+            // `!absolute` override) - see DynamicDrawerHost.connect(): appending
+            // anywhere other than 'body' drops the `position: fixed` override,
+            // and pairing that with a forced `!absolute` used to anchor this
+            // drawer to #page-content's document position instead of the
+            // viewport, so it rendered off-screen as soon as the page scrolled
+            // past Holidays (a card partway down a long Settings page).
+            styleClass: '!w-[30rem] !shadow-none',
             position: 'end',
-            appendTo: 'page-content',
             dismissible: true,
             inputValues: {
                 holiday,
@@ -1007,6 +1013,21 @@ class SystemSettings {
             holidays: parseCsv(globalForm.holidaysCsv),
         };
     }
+    /**
+     * Built via a method (not a module-level constant like the other
+     * GlobalWorkingHours/TimeSheet validator arrays) because
+     * `greaterThanZeroValidator` needs `this.transloco` to resolve its message
+     * - safe to call from the `form` field initializer since `transloco` is
+     * declared and `inject()`-ed earlier in the class body and field
+     * initializers run in declaration order.
+     */
+    buildHoursPerDayValidators() {
+        return [
+            Validators.required,
+            greaterThanZeroValidator(() => this.transloco.translate('system-settings.daily-working-hours-min-message')),
+            Validators.max(24),
+        ];
+    }
     findSettingByKey(key) {
         const normalizedKey = key.trim().toLowerCase();
         return (this.settings()?.find((setting) => setting.key.trim().toLowerCase() === normalizedKey) ?? null);
@@ -1356,14 +1377,21 @@ class SystemSettings {
      * Builds a localized, human-readable label for a date/time format key by
      * translating each format token (e.g. `dd-MM-yyyy` → `يوم-شهر-سنة`) while
      * preserving the original separators. Unknown characters are left as-is.
+     *
+     * `H` (24-hour) and `h` (12-hour) map to distinct translation keys -
+     * NOT the same `format-token-hour` key. They used to share one key, which
+     * made 'H:mm:ss' and 'hh:mm:ss' render as the identical label
+     * "Hour:Minute:Second" despite submitting genuinely different backend
+     * values (`H:mm:ss` vs `hh:mm:ss`), so an admin had no way to tell the two
+     * Time Format options apart before selecting one.
      */
     formatOptionLabel(formatKey) {
         const tokenKeyByLetter = {
             y: 'format-token-year',
             M: 'format-token-month',
             d: 'format-token-day',
-            H: 'format-token-hour',
-            h: 'format-token-hour',
+            H: 'format-token-hour-24',
+            h: 'format-token-hour-12',
             m: 'format-token-minute',
             s: 'format-token-second',
             t: 'format-token-period',
@@ -1394,7 +1422,12 @@ class SystemSettings {
             { id: '{0:#,0.0}', name: `1,000.0 ${unitLabel}` },
             { id: '{0:#,0.00}', name: `1,000.00 ${unitLabel}` },
             { id: '{0:#,0, K}', name: `1 K ${unitLabel}` },
-            { id: '{0:N3}', name: `1,000 N3 ${unitLabel}` },
+            // Was `1,000 N3 ${unitLabel}` - a leftover placeholder that pasted the
+            // .NET format specifier itself into the label instead of what it
+            // renders. N3 = thousands-separated with 3 decimal places, matching
+            // the `{0:#,0.00}` entry above's convention of writing out the actual
+            // formatted example rather than the format code.
+            { id: '{0:N3}', name: `1,000.000 ${unitLabel}` },
         ];
     }
     getCurrencyFormatLabel(currency) {
@@ -1600,11 +1633,32 @@ const TIME_SHEET_SUBMISSION_DEADLINE_VALIDATORS = [
 ];
 const GLOBAL_WORKING_HOURS_TIMEZONE_VALIDATORS = [Validators.required];
 const GLOBAL_WORKING_HOURS_WORKING_DAYS_VALIDATORS = [Validators.required];
-const GLOBAL_WORKING_HOURS_HOURS_PER_DAY_VALIDATORS = [
-    Validators.required,
-    Validators.min(0),
-    Validators.max(24),
-];
+/**
+ * `hoursPerDay` ("Daily Working Hours") needs an *exclusive* lower bound -
+ * `0` itself must be rejected, unlike every other range on this page which
+ * uses Angular's inclusive `Validators.min`. There's no built-in "greater
+ * than" validator, and reusing `Validators.min(0)`'s error would render the
+ * wrong message ("must be at least 0" on a control that just rejected 0), so
+ * this returns a distinct `dailyWorkingHoursMin` error carrying its own
+ * pre-translated `.message` - `ErrorMessagePipe` prefers a `.message` on the
+ * error object over its generic per-key translations (see
+ * `field-validation/error-message.pipe.ts`), so no changes are needed there
+ * or to its shared i18n keys.
+ *
+ * Mirrors `Validators.min`'s own null-handling: an empty control is left to
+ * `Validators.required` rather than also failing this check.
+ */
+function greaterThanZeroValidator(message) {
+    return (control) => {
+        const value = control.value;
+        if (value === null || value === undefined || value === '') {
+            return null;
+        }
+        return typeof value === 'number' && value > 0
+            ? null
+            : { dailyWorkingHoursMin: { min: 0, message: message() } };
+    };
+}
 /**
  * Cross-field validator comparing `timeSheetPolicy.maxDailyHours` against
  * `globalWorkingHours.hoursPerDay`. Takes the `hideTimeSheet` input as a
@@ -2835,7 +2889,7 @@ function isTestRequestConflict(error) {
 const EMAIL_DELIVERY_ROUTES = [
     {
         path: '',
-        loadComponent: () => import('./masterteam-system-settings-email-delivery-shell-CBPKuYXr.mjs').then((module) => module.EmailDeliveryShell),
+        loadComponent: () => import('./masterteam-system-settings-email-delivery-shell-oTWOzKWj.mjs').then((module) => module.EmailDeliveryShell),
     },
     { path: '**', redirectTo: '' },
 ];
@@ -2845,4 +2899,4 @@ const EMAIL_DELIVERY_ROUTES = [
  */
 
 export { DEFAULT_GENERAL_CONFIGURATION as D, EmailDeliveryFacade as E, FIXED_CURRENCIES as F, GENERAL_CONFIGURATION_SETTING_KEY as G, RATE_SOURCE_OPTIONS as R, SystemSettings as S, TIMESHEET_FREQUENCY_OPTIONS as T, WEEKEND_DAY_DEFINITIONS as W, EmailDeliveryStatus as a, EMAIL_DELIVERY_ATTEMPT_STATUSES as b, createEmailTestRequestId as c, areEmailTestRecipientsValid as d, isEmailTestRequestPending as e, EMAIL_DELIVERY_PERMISSIONS as f, getEmailDeliveryStatusMap as g, EXPLORE_DEFAULT_VIEW_OPTIONS as h, isConnectionTestAttempt as i, DEFAULT_DATE_FORMAT_OPTIONS as j, DEFAULT_TIME_FORMAT_OPTIONS as k, DOTNET_DAY_DEFINITIONS as l, SCHEDULE_ITEM_TYPE_OPTIONS as m, SystemSettingsHolidayEditor as n, DEFAULT_EMAIL_DELIVERY_OPTIONS as o, parseEmailTestRecipients as p, EMAIL_DELIVERY_OPTIONS as q, provideEmailDelivery as r, EmailDeliveryAccessService as s, collectEmailTemplatePlaceholders as t, buildEmailTemplatePlaceholderFields as u, EmailUserTestDialog as v, EMAIL_USER_INITIATED_TEST_OPERATION_KIND as w, EMAIL_DELIVERY_ROUTES as x };
-//# sourceMappingURL=masterteam-system-settings-masterteam-system-settings-DbsjQ7c7.mjs.map
+//# sourceMappingURL=masterteam-system-settings-masterteam-system-settings-7I4TfgwP.mjs.map