cyc-type-def 7.0.0 → 7.1.1

package/dist/index.cjs

@@ -53,6 +53,7 @@ __export(index_exports, {
   cgNum: () => cgNum,
   compareCG: () => compareCG,
   formatDateDDMMYY: () => formatDateDDMMYY,
+  generateId: () => generateId,
   getDayMonthSortKey: () => getDayMonthSortKey,
   isDateInRangeIgnoreYear: () => isDateInRangeIgnoreYear,
   monthStr: () => monthStr,
@@ -476,6 +477,7 @@ var Sheep = class _Sheep {
   nric;
   address;
   // in future might break to details like address line 1, state etc.
+  email;
   // attendance
   attCnt;
   /** Attendance count in recent 15 weeks (tentatively) */
@@ -583,32 +585,6 @@ var FollowUpStatus = class {
 
 // src/classes/pastoral-team/CG.ts
 var CG = class {
-  name;
-  /** small team id */
-  st;
-  //
-  /** cluster id */
-  cluster;
-  cglCnt;
-  sglCnt;
-  cglName;
-  /** row index in attendance report (1-based) */
-  rptRowIdx;
-  // base attributes
-  id;
-  deleted;
-  createdAt;
-  createdBy;
-  updatedAt;
-  updatedBy;
-  remark;
-  constructor(id, name, st, cluster, deleted) {
-    this.id = id;
-    this.name = name;
-    this.st = st;
-    this.cluster = cluster;
-    this.deleted = deleted;
-  }
 };
 
 // src/classes/pastoral-team/Cluster.ts
@@ -658,6 +634,11 @@ var AssignedCG = class {
   }
 };
 
+// src/classes/history/History.ts
+function generateId(history) {
+  history.id = history.idRef + "@" + history.idPeriod;
+}
+
 // src/classes/helper/Click.ts
 var Click = class {
   action;
@@ -911,6 +892,7 @@ function compareCG(a, b) {
   cgNum,
   compareCG,
   formatDateDDMMYY,
+  generateId,
   getDayMonthSortKey,
   isDateInRangeIgnoreYear,
   monthStr,

package/dist/index.d.cts

@@ -8,7 +8,7 @@ interface Base {
     remark?: string;
 }
 
-declare class CG implements Base {
+interface CG extends Base {
     name: string;
     /** small team id */
     st: string;
@@ -19,14 +19,8 @@ declare class CG implements Base {
     cglName?: string;
     /** row index in attendance report (1-based) */
     rptRowIdx?: number;
-    id: string;
-    deleted: boolean;
-    createdAt?: number;
-    createdBy?: string;
-    updatedAt?: number;
-    updatedBy?: string;
-    remark?: string;
-    constructor(id: string, name: string, st: string, cluster: string, deleted: boolean);
+}
+declare class CG implements CG {
 }
 
 interface MsjStudClass {
@@ -88,6 +82,7 @@ declare class Sheep implements Base {
     gender?: string;
     nric?: string;
     address?: string;
+    email?: string;
     attCnt: number;
     /** Attendance count in recent 15 weeks (tentatively) */
     recentAttCnt?: number;
@@ -446,6 +441,14 @@ interface Claim extends Base {
     status: string;
 }
 
+type History<T extends Base> = T & {
+    /** id of the current period */
+    idPeriod: string;
+    /** original id of the object */
+    idRef: string;
+};
+declare function generateId(history: History<Base>): void;
+
 declare enum ClickAction {
     P_WeeklyAttendance = 0,
     P_AttendanceReport = 1,
@@ -610,4 +613,4 @@ declare function getDayMonthSortKey(timestamp: number): number;
 
 declare function compareCG(a: CG, b: CG): number;
 
-export { type AppPage, AppUser, AssignedCG, AttSheep, Attendance, BackupAttendance, type Base, type BaseDialog, type BaseDialogInput, CG, type Claim, ClaimStatus, ClaimType, Click, ClickAction, Cluster, Column, DateEvent, DatePrecision, type Device, DialogAction, DisplayAttendance, FollowUpStatus, LIST_STATUS, METHOD, type MsjClassBatch, type MsjClassTime, type MsjClassType, MsjJoinStatus, MsjJoinStatusInfo, type MsjStudBatch, type MsjStudClass, PERMISSION, type PastoralTeam, Period, ReportSheep, Session, SessionAttendance, Sheep, SmallTeam, Title, TitleAttendance, cgNum, compareCG, formatDateDDMMYY, getDayMonthSortKey, isDateInRangeIgnoreYear, monthStr, parseYYMMDD, yearStr };
+export { type AppPage, AppUser, AssignedCG, AttSheep, Attendance, BackupAttendance, type Base, type BaseDialog, type BaseDialogInput, CG, type Claim, ClaimStatus, ClaimType, Click, ClickAction, Cluster, Column, DateEvent, DatePrecision, type Device, DialogAction, DisplayAttendance, FollowUpStatus, type History, LIST_STATUS, METHOD, type MsjClassBatch, type MsjClassTime, type MsjClassType, MsjJoinStatus, MsjJoinStatusInfo, type MsjStudBatch, type MsjStudClass, PERMISSION, type PastoralTeam, Period, ReportSheep, Session, SessionAttendance, Sheep, SmallTeam, Title, TitleAttendance, cgNum, compareCG, formatDateDDMMYY, generateId, getDayMonthSortKey, isDateInRangeIgnoreYear, monthStr, parseYYMMDD, yearStr };

package/dist/index.d.ts

@@ -8,7 +8,7 @@ interface Base {
     remark?: string;
 }
 
-declare class CG implements Base {
+interface CG extends Base {
     name: string;
     /** small team id */
     st: string;
@@ -19,14 +19,8 @@ declare class CG implements Base {
     cglName?: string;
     /** row index in attendance report (1-based) */
     rptRowIdx?: number;
-    id: string;
-    deleted: boolean;
-    createdAt?: number;
-    createdBy?: string;
-    updatedAt?: number;
-    updatedBy?: string;
-    remark?: string;
-    constructor(id: string, name: string, st: string, cluster: string, deleted: boolean);
+}
+declare class CG implements CG {
 }
 
 interface MsjStudClass {
@@ -88,6 +82,7 @@ declare class Sheep implements Base {
     gender?: string;
     nric?: string;
     address?: string;
+    email?: string;
     attCnt: number;
     /** Attendance count in recent 15 weeks (tentatively) */
     recentAttCnt?: number;
@@ -446,6 +441,14 @@ interface Claim extends Base {
     status: string;
 }
 
+type History<T extends Base> = T & {
+    /** id of the current period */
+    idPeriod: string;
+    /** original id of the object */
+    idRef: string;
+};
+declare function generateId(history: History<Base>): void;
+
 declare enum ClickAction {
     P_WeeklyAttendance = 0,
     P_AttendanceReport = 1,
@@ -610,4 +613,4 @@ declare function getDayMonthSortKey(timestamp: number): number;
 
 declare function compareCG(a: CG, b: CG): number;
 
-export { type AppPage, AppUser, AssignedCG, AttSheep, Attendance, BackupAttendance, type Base, type BaseDialog, type BaseDialogInput, CG, type Claim, ClaimStatus, ClaimType, Click, ClickAction, Cluster, Column, DateEvent, DatePrecision, type Device, DialogAction, DisplayAttendance, FollowUpStatus, LIST_STATUS, METHOD, type MsjClassBatch, type MsjClassTime, type MsjClassType, MsjJoinStatus, MsjJoinStatusInfo, type MsjStudBatch, type MsjStudClass, PERMISSION, type PastoralTeam, Period, ReportSheep, Session, SessionAttendance, Sheep, SmallTeam, Title, TitleAttendance, cgNum, compareCG, formatDateDDMMYY, getDayMonthSortKey, isDateInRangeIgnoreYear, monthStr, parseYYMMDD, yearStr };
+export { type AppPage, AppUser, AssignedCG, AttSheep, Attendance, BackupAttendance, type Base, type BaseDialog, type BaseDialogInput, CG, type Claim, ClaimStatus, ClaimType, Click, ClickAction, Cluster, Column, DateEvent, DatePrecision, type Device, DialogAction, DisplayAttendance, FollowUpStatus, type History, LIST_STATUS, METHOD, type MsjClassBatch, type MsjClassTime, type MsjClassType, MsjJoinStatus, MsjJoinStatusInfo, type MsjStudBatch, type MsjStudClass, PERMISSION, type PastoralTeam, Period, ReportSheep, Session, SessionAttendance, Sheep, SmallTeam, Title, TitleAttendance, cgNum, compareCG, formatDateDDMMYY, generateId, getDayMonthSortKey, isDateInRangeIgnoreYear, monthStr, parseYYMMDD, yearStr };

package/dist/index.js

@@ -413,6 +413,7 @@ var Sheep = class _Sheep {
   nric;
   address;
   // in future might break to details like address line 1, state etc.
+  email;
   // attendance
   attCnt;
   /** Attendance count in recent 15 weeks (tentatively) */
@@ -520,32 +521,6 @@ var FollowUpStatus = class {
 
 // src/classes/pastoral-team/CG.ts
 var CG = class {
-  name;
-  /** small team id */
-  st;
-  //
-  /** cluster id */
-  cluster;
-  cglCnt;
-  sglCnt;
-  cglName;
-  /** row index in attendance report (1-based) */
-  rptRowIdx;
-  // base attributes
-  id;
-  deleted;
-  createdAt;
-  createdBy;
-  updatedAt;
-  updatedBy;
-  remark;
-  constructor(id, name, st, cluster, deleted) {
-    this.id = id;
-    this.name = name;
-    this.st = st;
-    this.cluster = cluster;
-    this.deleted = deleted;
-  }
 };
 
 // src/classes/pastoral-team/Cluster.ts
@@ -595,6 +570,11 @@ var AssignedCG = class {
   }
 };
 
+// src/classes/history/History.ts
+function generateId(history) {
+  history.id = history.idRef + "@" + history.idPeriod;
+}
+
 // src/classes/helper/Click.ts
 var Click = class {
   action;
@@ -847,6 +827,7 @@ export {
   cgNum,
   compareCG,
   formatDateDDMMYY,
+  generateId,
   getDayMonthSortKey,
   isDateInRangeIgnoreYear,
   monthStr,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cyc-type-def",
-  "version": "7.0.0",
+  "version": "7.1.1",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "type": "module",