cyc-type-def 4.0.0 → 5.1.0

package/README.md

@@ -4,9 +4,13 @@ Run these commands to use the package:
 
 ```bash
 npm run build
+npm config set //registry.npmjs.org/:_authToken=YOUR_NPM_TOKEN
 npm publish --access public
+npm config delete //registry.npmjs.org/:_authToken
 ```
+
 ---
+
 # TypeScript Package Setup Guide
 
 This guide outlines how to set up a simple TypeScript package with build and test scripts.
@@ -48,8 +52,8 @@ my-ts-package/
 ### `src/index.ts`
 
 ```ts
-export * from './utils';
-export * from './types';
+export * from "./utils";
+export * from "./types";
 ```
 
 ### `src/utils.ts`

package/dist/index.cjs

@@ -46,7 +46,10 @@ __export(index_exports, {
   SmallTeam: () => SmallTeam,
   Title: () => Title,
   TitleAttendance: () => TitleAttendance,
+  cgNum: () => cgNum,
+  compareCG: () => compareCG,
   formatDateDDMMYY: () => formatDateDDMMYY,
+  getDayMonthSortKey: () => getDayMonthSortKey,
   isDateInRangeIgnoreYear: () => isDateInRangeIgnoreYear,
   monthStr: () => monthStr,
   parseYYMMDD: () => parseYYMMDD,
@@ -603,6 +606,16 @@ var MsjJoinStatusInfo = {
   }
 };
 
+// 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");
@@ -637,6 +650,16 @@ function yearStr(timestamp) {
 function monthStr(timestamp) {
   return new Date(timestamp).toLocaleString("default", { month: "long" });
 }
+function getDayMonthSortKey(timestamp) {
+  const d = new Date(timestamp);
+  return d.getMonth() * 31 + d.getDate();
+}
+
+// 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,
@@ -665,7 +688,10 @@ function monthStr(timestamp) {
   SmallTeam,
   Title,
   TitleAttendance,
+  cgNum,
+  compareCG,
   formatDateDDMMYY,
+  getDayMonthSortKey,
   isDateInRangeIgnoreYear,
   monthStr,
   parseYYMMDD,

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[];
 }
 /**
@@ -529,6 +533,8 @@ declare const MsjJoinStatusInfo: Record<MsjJoinStatus, {
     short: string;
 }>;
 
+declare function cgNum(cgName: string): number;
+
 declare function formatDateDDMMYY(date: Date): string;
 declare function parseYYMMDD(str: string): Date;
 /**
@@ -539,5 +545,8 @@ declare function parseYYMMDD(str: string): Date;
 declare function isDateInRangeIgnoreYear(d: Date, start: Date, end: Date): boolean;
 declare function yearStr(timestamp: number): string;
 declare function monthStr(timestamp: number): string;
+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, 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, formatDateDDMMYY, isDateInRangeIgnoreYear, monthStr, parseYYMMDD, yearStr };
+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, getDayMonthSortKey, 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[];
 }
 /**
@@ -529,6 +533,8 @@ declare const MsjJoinStatusInfo: Record<MsjJoinStatus, {
     short: string;
 }>;
 
+declare function cgNum(cgName: string): number;
+
 declare function formatDateDDMMYY(date: Date): string;
 declare function parseYYMMDD(str: string): Date;
 /**
@@ -539,5 +545,8 @@ declare function parseYYMMDD(str: string): Date;
 declare function isDateInRangeIgnoreYear(d: Date, start: Date, end: Date): boolean;
 declare function yearStr(timestamp: number): string;
 declare function monthStr(timestamp: number): string;
+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, 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, formatDateDDMMYY, isDateInRangeIgnoreYear, monthStr, parseYYMMDD, yearStr };
+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, getDayMonthSortKey, isDateInRangeIgnoreYear, monthStr, parseYYMMDD, yearStr };

package/dist/index.js

@@ -547,6 +547,16 @@ var MsjJoinStatusInfo = {
   }
 };
 
+// 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");
@@ -581,6 +591,16 @@ function yearStr(timestamp) {
 function monthStr(timestamp) {
   return new Date(timestamp).toLocaleString("default", { month: "long" });
 }
+function getDayMonthSortKey(timestamp) {
+  const d = new Date(timestamp);
+  return d.getMonth() * 31 + d.getDate();
+}
+
+// src/util/sort.util.ts
+function compareCG(a, b) {
+  let v = cgNum(a.name) - cgNum(b.name);
+  return v;
+}
 export {
   AppUser,
   AssignedCG,
@@ -608,7 +628,10 @@ export {
   SmallTeam,
   Title,
   TitleAttendance,
+  cgNum,
+  compareCG,
   formatDateDDMMYY,
+  getDayMonthSortKey,
   isDateInRangeIgnoreYear,
   monthStr,
   parseYYMMDD,

package/package.json

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