cyc-type-def 3.0.12 → 5.0.1

package/dist/index.cjs

@@ -45,7 +45,14 @@ __export(index_exports, {
   Sheep: () => Sheep,
   SmallTeam: () => SmallTeam,
   Title: () => Title,
-  TitleAttendance: () => TitleAttendance
+  TitleAttendance: () => TitleAttendance,
+  cgNum: () => cgNum,
+  compareCG: () => compareCG,
+  formatDateDDMMYY: () => formatDateDDMMYY,
+  isDateInRangeIgnoreYear: () => isDateInRangeIgnoreYear,
+  monthStr: () => monthStr,
+  parseYYMMDD: () => parseYYMMDD,
+  yearStr: () => yearStr
 });
 module.exports = __toCommonJS(index_exports);
 
@@ -540,6 +547,7 @@ var ClickAction = /* @__PURE__ */ ((ClickAction2) => {
   ClickAction2[ClickAction2["P_BIRTHDAY"] = 12] = "P_BIRTHDAY";
   ClickAction2[ClickAction2["P_CLAIM"] = 13] = "P_CLAIM";
   ClickAction2[ClickAction2["P_SETTING"] = 14] = "P_SETTING";
+  ClickAction2[ClickAction2["P_MSJ_STUDENT_RECORD"] = 15] = "P_MSJ_STUDENT_RECORD";
   return ClickAction2;
 })(ClickAction || {});
 
@@ -596,6 +604,57 @@ var MsjJoinStatusInfo = {
     short: "Refresh"
   }
 };
+
+// src/util/common.util.ts
+function cgNum(cgName) {
+  var num = cgName.match(/\d+/g);
+  if (num) {
+    return parseInt(num[0]);
+  } else {
+    return 0;
+  }
+}
+
+// src/util/date.util.ts
+function formatDateDDMMYY(date) {
+  const day = String(date.getDate()).padStart(2, "0");
+  const month = String(date.getMonth() + 1).padStart(2, "0");
+  const year = String(date.getFullYear()).slice(-2);
+  return `${year}${month}${day}`;
+}
+function parseYYMMDD(str) {
+  const year = 2e3 + parseInt(str.slice(0, 2));
+  const month = parseInt(str.slice(2, 4)) - 1;
+  const day = parseInt(str.slice(4, 6));
+  return new Date(year, month, day);
+}
+function isDateInRangeIgnoreYear(d, start, end) {
+  const code = mdCode(d);
+  const s = mdCode(start);
+  const e = mdCode(end);
+  if (s <= e) {
+    return code >= s && code <= e;
+  } else {
+    return code >= s || code <= e;
+  }
+}
+function mdCode(date) {
+  const m = date.getUTCMonth() + 1;
+  const d = date.getUTCDate();
+  return m * 100 + d;
+}
+function yearStr(timestamp) {
+  return new Date(timestamp).getFullYear().toString();
+}
+function monthStr(timestamp) {
+  return new Date(timestamp).toLocaleString("default", { month: "long" });
+}
+
+// src/util/sort.util.ts
+function compareCG(a, b) {
+  let v = cgNum(a.name) - cgNum(b.name);
+  return v;
+}
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   AppUser,
@@ -623,5 +682,12 @@ var MsjJoinStatusInfo = {
   Sheep,
   SmallTeam,
   Title,
-  TitleAttendance
+  TitleAttendance,
+  cgNum,
+  compareCG,
+  formatDateDDMMYY,
+  isDateInRangeIgnoreYear,
+  monthStr,
+  parseYYMMDD,
+  yearStr
 });

package/dist/index.d.cts

@@ -190,6 +190,10 @@ interface Attendance extends Title {
     idSt: string;
     idCluster: string;
     timestamp: number;
+    /**
+     * time taken to fill in attendance (in seconds)
+     */
+    timeTaken?: number;
     arrSessionAttendance: SessionAttendance[];
 }
 /**
@@ -478,7 +482,8 @@ declare enum ClickAction {
     F_ExportVerticalView = 11,
     P_BIRTHDAY = 12,
     P_CLAIM = 13,
-    P_SETTING = 14
+    P_SETTING = 14,
+    P_MSJ_STUDENT_RECORD = 15
 }
 
 declare class Click {
@@ -528,4 +533,19 @@ declare const MsjJoinStatusInfo: Record<MsjJoinStatus, {
     short: string;
 }>;
 
-export { type AppPage, AppUser, AssignedCG, AttSheep, Attendance, BackupAttendance, type Base, type BaseDialog, CG, type Claim, ClaimStatus, ClaimType, Click, ClickAction, Cluster, Column, type Device, DisplayAttendance, FollowUpStatus, LIST_STATUS, METHOD, type MsjClassBatch, type MsjClassTime, type MsjClassType, MsjJoinStatus, MsjJoinStatusInfo, type MsjStudBatch, type MsjStudClass, PERMISSION, type PastoralTeam, ReportSheep, Session, SessionAttendance, Sheep, SmallTeam, Title, TitleAttendance };
+declare function cgNum(cgName: string): number;
+
+declare function formatDateDDMMYY(date: Date): string;
+declare function parseYYMMDD(str: string): Date;
+/**
+ * Returns true if `d` is between `start` and `end` by month/day only (inclusive).
+ * Year is ignored. Works even when the range crosses year-end.
+ * Uses UTC month/day to avoid timezone surprises.
+ */
+declare function isDateInRangeIgnoreYear(d: Date, start: Date, end: Date): boolean;
+declare function yearStr(timestamp: number): string;
+declare function monthStr(timestamp: number): string;
+
+declare function compareCG(a: CG, b: CG): number;
+
+export { type AppPage, AppUser, AssignedCG, AttSheep, Attendance, BackupAttendance, type Base, type BaseDialog, CG, type Claim, ClaimStatus, ClaimType, Click, ClickAction, Cluster, Column, type Device, DisplayAttendance, FollowUpStatus, LIST_STATUS, METHOD, type MsjClassBatch, type MsjClassTime, type MsjClassType, MsjJoinStatus, MsjJoinStatusInfo, type MsjStudBatch, type MsjStudClass, PERMISSION, type PastoralTeam, ReportSheep, Session, SessionAttendance, Sheep, SmallTeam, Title, TitleAttendance, cgNum, compareCG, formatDateDDMMYY, isDateInRangeIgnoreYear, monthStr, parseYYMMDD, yearStr };

package/dist/index.d.ts

@@ -190,6 +190,10 @@ interface Attendance extends Title {
     idSt: string;
     idCluster: string;
     timestamp: number;
+    /**
+     * time taken to fill in attendance (in seconds)
+     */
+    timeTaken?: number;
     arrSessionAttendance: SessionAttendance[];
 }
 /**
@@ -478,7 +482,8 @@ declare enum ClickAction {
     F_ExportVerticalView = 11,
     P_BIRTHDAY = 12,
     P_CLAIM = 13,
-    P_SETTING = 14
+    P_SETTING = 14,
+    P_MSJ_STUDENT_RECORD = 15
 }
 
 declare class Click {
@@ -528,4 +533,19 @@ declare const MsjJoinStatusInfo: Record<MsjJoinStatus, {
     short: string;
 }>;
 
-export { type AppPage, AppUser, AssignedCG, AttSheep, Attendance, BackupAttendance, type Base, type BaseDialog, CG, type Claim, ClaimStatus, ClaimType, Click, ClickAction, Cluster, Column, type Device, DisplayAttendance, FollowUpStatus, LIST_STATUS, METHOD, type MsjClassBatch, type MsjClassTime, type MsjClassType, MsjJoinStatus, MsjJoinStatusInfo, type MsjStudBatch, type MsjStudClass, PERMISSION, type PastoralTeam, ReportSheep, Session, SessionAttendance, Sheep, SmallTeam, Title, TitleAttendance };
+declare function cgNum(cgName: string): number;
+
+declare function formatDateDDMMYY(date: Date): string;
+declare function parseYYMMDD(str: string): Date;
+/**
+ * Returns true if `d` is between `start` and `end` by month/day only (inclusive).
+ * Year is ignored. Works even when the range crosses year-end.
+ * Uses UTC month/day to avoid timezone surprises.
+ */
+declare function isDateInRangeIgnoreYear(d: Date, start: Date, end: Date): boolean;
+declare function yearStr(timestamp: number): string;
+declare function monthStr(timestamp: number): string;
+
+declare function compareCG(a: CG, b: CG): number;
+
+export { type AppPage, AppUser, AssignedCG, AttSheep, Attendance, BackupAttendance, type Base, type BaseDialog, CG, type Claim, ClaimStatus, ClaimType, Click, ClickAction, Cluster, Column, type Device, DisplayAttendance, FollowUpStatus, LIST_STATUS, METHOD, type MsjClassBatch, type MsjClassTime, type MsjClassType, MsjJoinStatus, MsjJoinStatusInfo, type MsjStudBatch, type MsjStudClass, PERMISSION, type PastoralTeam, ReportSheep, Session, SessionAttendance, Sheep, SmallTeam, Title, TitleAttendance, cgNum, compareCG, formatDateDDMMYY, isDateInRangeIgnoreYear, monthStr, parseYYMMDD, yearStr };

package/dist/index.js

@@ -489,6 +489,7 @@ var ClickAction = /* @__PURE__ */ ((ClickAction2) => {
   ClickAction2[ClickAction2["P_BIRTHDAY"] = 12] = "P_BIRTHDAY";
   ClickAction2[ClickAction2["P_CLAIM"] = 13] = "P_CLAIM";
   ClickAction2[ClickAction2["P_SETTING"] = 14] = "P_SETTING";
+  ClickAction2[ClickAction2["P_MSJ_STUDENT_RECORD"] = 15] = "P_MSJ_STUDENT_RECORD";
   return ClickAction2;
 })(ClickAction || {});
 
@@ -545,6 +546,57 @@ var MsjJoinStatusInfo = {
     short: "Refresh"
   }
 };
+
+// src/util/common.util.ts
+function cgNum(cgName) {
+  var num = cgName.match(/\d+/g);
+  if (num) {
+    return parseInt(num[0]);
+  } else {
+    return 0;
+  }
+}
+
+// src/util/date.util.ts
+function formatDateDDMMYY(date) {
+  const day = String(date.getDate()).padStart(2, "0");
+  const month = String(date.getMonth() + 1).padStart(2, "0");
+  const year = String(date.getFullYear()).slice(-2);
+  return `${year}${month}${day}`;
+}
+function parseYYMMDD(str) {
+  const year = 2e3 + parseInt(str.slice(0, 2));
+  const month = parseInt(str.slice(2, 4)) - 1;
+  const day = parseInt(str.slice(4, 6));
+  return new Date(year, month, day);
+}
+function isDateInRangeIgnoreYear(d, start, end) {
+  const code = mdCode(d);
+  const s = mdCode(start);
+  const e = mdCode(end);
+  if (s <= e) {
+    return code >= s && code <= e;
+  } else {
+    return code >= s || code <= e;
+  }
+}
+function mdCode(date) {
+  const m = date.getUTCMonth() + 1;
+  const d = date.getUTCDate();
+  return m * 100 + d;
+}
+function yearStr(timestamp) {
+  return new Date(timestamp).getFullYear().toString();
+}
+function monthStr(timestamp) {
+  return new Date(timestamp).toLocaleString("default", { month: "long" });
+}
+
+// src/util/sort.util.ts
+function compareCG(a, b) {
+  let v = cgNum(a.name) - cgNum(b.name);
+  return v;
+}
 export {
   AppUser,
   AssignedCG,
@@ -571,5 +623,12 @@ export {
   Sheep,
   SmallTeam,
   Title,
-  TitleAttendance
+  TitleAttendance,
+  cgNum,
+  compareCG,
+  formatDateDDMMYY,
+  isDateInRangeIgnoreYear,
+  monthStr,
+  parseYYMMDD,
+  yearStr
 };

package/package.json

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