@rocketlink/crm-model 1.0.125 → 1.0.126

package/dist/util/dateUtil.d.ts

@@ -30,4 +30,9 @@ export declare function addDaysToDateString(value: string, days: number, formatS
 export declare function subtractDaysFromDateString(value: string, days: number, formatString?: string): string;
 export declare function addMonthsToDate(date: Date, months: number): Date;
 export declare function addPeriodToDate(date: Date, period: number, unit: INTERVAL_UNIT): Date;
+export type UiDateInput = Date | string;
+export type FormatDateForUiOptions = {
+    includeSeconds?: boolean;
+};
+export declare function formatDateForUi(value: UiDateInput | null | undefined, options?: FormatDateForUiOptions): string;
 //# sourceMappingURL=dateUtil.d.ts.map

package/dist/util/dateUtil.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"dateUtil.d.ts","sourceRoot":"","sources":["../../src/util/dateUtil.ts"],"names":[],"mappings":"AAEA,eAAO,MAAM,OAAO;;;;;;;CAOV,CAAC;AAEX,eAAO,MAAM,aAAa;;;CAGhB,CAAC;AACX,MAAM,MAAM,aAAa,GAAG,CAAC,OAAO,aAAa,CAAC,CAAC,MAAM,OAAO,aAAa,CAAC,CAAC;AAK/E,wBAAgB,YAAY,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,YAAY,GAAE,MAAyB,GAAG,MAAM,CAKzF;AAED,wBAAgB,cAAc,CAAC,IAAI,CAAC,EAAE,IAAI,GAAG,MAAM,CAElD;AAED,wBAAgB,QAAQ,CAAC,IAAI,CAAC,EAAE,IAAI,GAAG,MAAM,CAE5C;AAED,wBAAgB,aAAa,CAAC,IAAI,CAAC,EAAE,IAAI,GAAG,MAAM,CAEjD;AAED,wBAAgB,oBAAoB,CAAC,IAAI,CAAC,EAAE,IAAI,GAAG,MAAM,CAExD;AAED,wBAAgB,uBAAuB,IAAI,MAAM,CAEhD;AAGD,wBAAgB,YAAY,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAGnD;AAKD,wBAAgB,YAAY,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI,CAShD;AAKD,wBAAgB,gBAAgB,CAAC,KAAK,EAAE,MAAM,EAAE,YAAY,GAAE,MAAyB,GAAG,MAAM,CAM/F;AAED,wBAAgB,qBAAqB,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAE3D;AAED,wBAAgB,eAAe,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAErD;AAED,wBAAgB,oBAAoB,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAE1D;AAED,wBAAgB,oBAAoB,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAE1D;AAKD,wBAAgB,aAAa,CAAC,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,MAAM,GAAG,IAAI,CAK5D;AAED,wBAAgB,oBAAoB,CAAC,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,MAAM,GAAG,IAAI,CAKnE;AAED,wBAAgB,mBAAmB,CAAC,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,YAAY,GAAE,MAAyB,GAAG,MAAM,CAIhH;AAED,wBAAgB,0BAA0B,CAAC,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,YAAY,GAAE,MAAyB,GAAG,MAAM,CAIvH;AAED,wBAAgB,eAAe,CAAC,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,GAAG,IAAI,CAKhE;AAED,wBAAgB,eAAe,CAAC,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,aAAa,GAAG,IAAI,CAUrF"}
+{"version":3,"file":"dateUtil.d.ts","sourceRoot":"","sources":["../../src/util/dateUtil.ts"],"names":[],"mappings":"AAEA,eAAO,MAAM,OAAO;;;;;;;CAOV,CAAC;AAEX,eAAO,MAAM,aAAa;;;CAGhB,CAAC;AACX,MAAM,MAAM,aAAa,GAAG,CAAC,OAAO,aAAa,CAAC,CAAC,MAAM,OAAO,aAAa,CAAC,CAAC;AAK/E,wBAAgB,YAAY,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,YAAY,GAAE,MAAyB,GAAG,MAAM,CAKzF;AAED,wBAAgB,cAAc,CAAC,IAAI,CAAC,EAAE,IAAI,GAAG,MAAM,CAElD;AAED,wBAAgB,QAAQ,CAAC,IAAI,CAAC,EAAE,IAAI,GAAG,MAAM,CAE5C;AAED,wBAAgB,aAAa,CAAC,IAAI,CAAC,EAAE,IAAI,GAAG,MAAM,CAEjD;AAED,wBAAgB,oBAAoB,CAAC,IAAI,CAAC,EAAE,IAAI,GAAG,MAAM,CAExD;AAED,wBAAgB,uBAAuB,IAAI,MAAM,CAEhD;AAGD,wBAAgB,YAAY,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAGnD;AAKD,wBAAgB,YAAY,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI,CAShD;AAKD,wBAAgB,gBAAgB,CAAC,KAAK,EAAE,MAAM,EAAE,YAAY,GAAE,MAAyB,GAAG,MAAM,CAM/F;AAED,wBAAgB,qBAAqB,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAE3D;AAED,wBAAgB,eAAe,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAErD;AAED,wBAAgB,oBAAoB,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAE1D;AAED,wBAAgB,oBAAoB,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAE1D;AAKD,wBAAgB,aAAa,CAAC,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,MAAM,GAAG,IAAI,CAK5D;AAED,wBAAgB,oBAAoB,CAAC,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,MAAM,GAAG,IAAI,CAKnE;AAED,wBAAgB,mBAAmB,CAAC,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,YAAY,GAAE,MAAyB,GAAG,MAAM,CAIhH;AAED,wBAAgB,0BAA0B,CAAC,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,YAAY,GAAE,MAAyB,GAAG,MAAM,CAIvH;AAED,wBAAgB,eAAe,CAAC,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,GAAG,IAAI,CAKhE;AAED,wBAAgB,eAAe,CAAC,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,aAAa,GAAG,IAAI,CAUrF;AAMD,MAAM,MAAM,WAAW,GAAG,IAAI,GAAG,MAAM,CAAC;AAwDxC,MAAM,MAAM,sBAAsB,GAAG;IAAE,cAAc,CAAC,EAAE,OAAO,CAAA;CAAE,CAAC;AAElE,wBAAgB,eAAe,CAC7B,KAAK,EAAE,WAAW,GAAG,IAAI,GAAG,SAAS,EACrC,OAAO,CAAC,EAAE,sBAAsB,GAC/B,MAAM,CA8BR"}

package/dist/util/dateUtil.js

@@ -20,6 +20,7 @@ exports.addDaysToDateString = addDaysToDateString;
 exports.subtractDaysFromDateString = subtractDaysFromDateString;
 exports.addMonthsToDate = addMonthsToDate;
 exports.addPeriodToDate = addPeriodToDate;
+exports.formatDateForUi = formatDateForUi;
 const date_fns_1 = require("date-fns");
 exports.FORMATS = {
     ISO_DATE: 'yyyy-MM-dd', // "2026-01-07"
@@ -140,3 +141,74 @@ function addPeriodToDate(date, period, unit) {
     }
     return date;
 }
+//"15 Jan 2024, 10:30:40"  or "15 Jan 2024, 10:30" or just "15 Jan 2024".
+const parseUiDate = (value) => {
+    if (value instanceof Date) {
+        const d = value;
+        if (Number.isNaN(d.getTime()))
+            return null;
+        const hasTime = d.getHours() !== 0 ||
+            d.getMinutes() !== 0 ||
+            d.getSeconds() !== 0 ||
+            d.getMilliseconds() !== 0;
+        return { date: d, hasTime };
+    }
+    const raw = String(value).trim();
+    if (!raw)
+        return null;
+    // Explicit "dd.MM.yyyy" (e.g. "31.07.2024") -> date-only
+    const dotDateMatch = raw.match(/^(\d{2})\.(\d{2})\.(\d{4})$/);
+    if (dotDateMatch) {
+        const [, dd, mm, yyyy] = dotDateMatch;
+        const d = new Date(Number(yyyy), Number(mm) - 1, Number(dd));
+        if (Number.isNaN(d.getTime()))
+            return null;
+        return { date: d, hasTime: false };
+    }
+    // Plain ISO date "YYYY-MM-DD" -> date-only
+    const isoDateOnlyMatch = raw.match(/^(\d{4})-(\d{2})-(\d{2})$/);
+    if (isoDateOnlyMatch) {
+        const [, yyyy, mm, dd] = isoDateOnlyMatch;
+        const d = new Date(Number(yyyy), Number(mm) - 1, Number(dd));
+        if (Number.isNaN(d.getTime()))
+            return null;
+        return { date: d, hasTime: false };
+    }
+    // Fallback to native parser for ISO timestamps and other formats.
+    const d = new Date(raw);
+    if (Number.isNaN(d.getTime()))
+        return null;
+    // If the original string clearly contained a time (has 'T' or an HH:MM),
+    // treat it as having a time component, otherwise fall back to midnight check.
+    const explicitTime = /T\d\d?:\d\d/.test(raw) || /\d{1,2}:\d{2}/.test(raw);
+    const hasTime = explicitTime ||
+        d.getHours() !== 0 ||
+        d.getMinutes() !== 0 ||
+        d.getSeconds() !== 0 ||
+        d.getMilliseconds() !== 0;
+    return { date: d, hasTime };
+};
+function formatDateForUi(value, options) {
+    if (!value) {
+        return '-';
+    }
+    const parsed = parseUiDate(value);
+    if (!parsed) {
+        return '-';
+    }
+    const { date, hasTime } = parsed;
+    const includeSeconds = options?.includeSeconds ?? false;
+    const day = String(date.getDate()).padStart(2, '0');
+    const monthShort = date.toLocaleString('en-US', { month: 'short' });
+    const year = date.getFullYear();
+    const base = `${day} ${monthShort} ${year}`;
+    if (!hasTime) {
+        return base;
+    }
+    const hours = String(date.getHours()).padStart(2, '0');
+    const minutes = String(date.getMinutes()).padStart(2, '0');
+    const time = includeSeconds
+        ? `${hours}:${minutes}:${String(date.getSeconds()).padStart(2, '0')}`
+        : `${hours}:${minutes}`;
+    return `${base}, ${time}`;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rocketlink/crm-model",
-  "version": "1.0.125",
+  "version": "1.0.126",
   "description": "Shared DTOs and Models for CRM Rocketlink",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/src/util/dateUtil.ts

@@ -138,4 +138,101 @@ export function addPeriodToDate(date: Date, period: number, unit: INTERVAL_UNIT)
     date = addDaysToDate(date, period);
   }
   return date;
+}
+
+// ============================================
+// UI-friendly formatting (used by admin-ts)
+// ============================================
+
+export type UiDateInput = Date | string;
+
+//"15 Jan 2024, 10:30:40"  or "15 Jan 2024, 10:30" or just "15 Jan 2024".
+
+const parseUiDate = (
+  value: UiDateInput
+): { date: Date; hasTime: boolean } | null => {
+  if (value instanceof Date) {
+    const d = value;
+    if (Number.isNaN(d.getTime())) return null;
+    const hasTime =
+      d.getHours() !== 0 ||
+      d.getMinutes() !== 0 ||
+      d.getSeconds() !== 0 ||
+      d.getMilliseconds() !== 0;
+    return { date: d, hasTime };
+  }
+
+  const raw = String(value).trim();
+  if (!raw) return null;
+
+  // Explicit "dd.MM.yyyy" (e.g. "31.07.2024") -> date-only
+  const dotDateMatch = raw.match(/^(\d{2})\.(\d{2})\.(\d{4})$/);
+  if (dotDateMatch) {
+    const [, dd, mm, yyyy] = dotDateMatch;
+    const d = new Date(Number(yyyy), Number(mm) - 1, Number(dd));
+    if (Number.isNaN(d.getTime())) return null;
+    return { date: d, hasTime: false };
+  }
+
+  // Plain ISO date "YYYY-MM-DD" -> date-only
+  const isoDateOnlyMatch = raw.match(/^(\d{4})-(\d{2})-(\d{2})$/);
+  if (isoDateOnlyMatch) {
+    const [, yyyy, mm, dd] = isoDateOnlyMatch;
+    const d = new Date(Number(yyyy), Number(mm) - 1, Number(dd));
+    if (Number.isNaN(d.getTime())) return null;
+    return { date: d, hasTime: false };
+  }
+
+  // Fallback to native parser for ISO timestamps and other formats.
+  const d = new Date(raw);
+  if (Number.isNaN(d.getTime())) return null;
+
+  // If the original string clearly contained a time (has 'T' or an HH:MM),
+  // treat it as having a time component, otherwise fall back to midnight check.
+  const explicitTime = /T\d\d?:\d\d/.test(raw) || /\d{1,2}:\d{2}/.test(raw);
+  const hasTime =
+    explicitTime ||
+    d.getHours() !== 0 ||
+    d.getMinutes() !== 0 ||
+    d.getSeconds() !== 0 ||
+    d.getMilliseconds() !== 0;
+
+  return { date: d, hasTime };
+};
+
+export type FormatDateForUiOptions = { includeSeconds?: boolean };
+
+export function formatDateForUi(
+  value: UiDateInput | null | undefined,
+  options?: FormatDateForUiOptions
+): string {
+  if (!value) {
+    return '-';
+  }
+
+  const parsed = parseUiDate(value);
+  if (!parsed) {
+    return '-';
+  }
+
+  const { date, hasTime } = parsed;
+  const includeSeconds = options?.includeSeconds ?? false;
+
+  const day = String(date.getDate()).padStart(2, '0');
+  const monthShort = date.toLocaleString('en-US', { month: 'short' });
+  const year = date.getFullYear();
+  const base = `${day} ${monthShort} ${year}`;
+
+  if (!hasTime) {
+    return base;
+  }
+
+  const hours = String(date.getHours()).padStart(2, '0');
+  const minutes = String(date.getMinutes()).padStart(2, '0');
+  const time =
+    includeSeconds
+      ? `${hours}:${minutes}:${String(date.getSeconds()).padStart(2, '0')}`
+      : `${hours}:${minutes}`;
+
+  return `${base}, ${time}`;
 }