law-common 11.3.20 → 11.3.21-beta.1

package/dist/src/entities/model/timesheet.entity.model.d.ts

@@ -1,6 +1,7 @@
 import { CurrencyEnum } from "../../enums";
 import { TimesheetClassificationStatusEnum } from "../enums/timesheet.classification.status.enum";
 import { TimesheetStatusEnum } from "../enums/timesheet.status.enum";
+import { IDesignationEntity } from "../interface/designation.entity.interface";
 import { EntityEnum, Nullable } from "../interface/entity.utils.interface";
 import { RelationConfigs } from "../interface/relation-config.interface";
 import { ITimesheetEntity } from "../interface/timesheet.entity.interface";
@@ -15,6 +16,12 @@ export interface IClassificationWindowConfig {
         endDay: Nullable<number>;
     }>;
 }
+export interface SortableTimesheet {
+    projectClientName?: string;
+    designation?: string;
+    resourceName?: string;
+    dateCodeForsorting?: Date;
+}
 export declare class TimesheetEntityModel extends BaseEntityModel<EntityEnum.TIMESHEET> implements ITimesheetEntity {
     id: number;
     userId: number;
@@ -59,4 +66,5 @@ export declare class TimesheetEntityModel extends BaseEntityModel<EntityEnum.TIM
         startDay: number;
         endDay: Nullable<number>;
     }>;
+    static sortByProjectAndDesignation(data: SortableTimesheet[], designations: IDesignationEntity[]): SortableTimesheet[];
 }

package/dist/src/entities/model/timesheet.entity.model.js

@@ -149,6 +149,27 @@ class TimesheetEntityModel extends base_entity_model_1.BaseEntityModel {
             };
         });
     }
+    static sortByProjectAndDesignation(data, designations) {
+        const priorityMap = new Map();
+        designations.forEach((d) => {
+            var _a;
+            priorityMap.set(d.name, (_a = d.order) !== null && _a !== void 0 ? _a : Number.MAX_SAFE_INTEGER);
+        });
+        return [...data].sort((a, b) => {
+            var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m;
+            const projectCompare = ((_a = a.projectClientName) !== null && _a !== void 0 ? _a : "").localeCompare((_b = b.projectClientName) !== null && _b !== void 0 ? _b : "");
+            if (projectCompare !== 0)
+                return projectCompare;
+            const priorityA = (_d = priorityMap.get((_c = a.designation) !== null && _c !== void 0 ? _c : "")) !== null && _d !== void 0 ? _d : Number.MAX_SAFE_INTEGER;
+            const priorityB = (_f = priorityMap.get((_e = b.designation) !== null && _e !== void 0 ? _e : "")) !== null && _f !== void 0 ? _f : Number.MAX_SAFE_INTEGER;
+            if (priorityA !== priorityB)
+                return priorityA - priorityB;
+            const resourceCompare = ((_g = a.resourceName) !== null && _g !== void 0 ? _g : "").localeCompare((_h = b.resourceName) !== null && _h !== void 0 ? _h : "");
+            if (resourceCompare !== 0)
+                return resourceCompare;
+            return ((_k = (_j = b.dateCodeForsorting) === null || _j === void 0 ? void 0 : _j.getTime()) !== null && _k !== void 0 ? _k : 0) - ((_m = (_l = a.dateCodeForsorting) === null || _l === void 0 ? void 0 : _l.getTime()) !== null && _m !== void 0 ? _m : 0);
+        });
+    }
 }
 exports.TimesheetEntityModel = TimesheetEntityModel;
 TimesheetEntityModel.relationConfigs = [

package/package.json

@@ -1,50 +1,50 @@
-{
-  "name": "law-common",
-  "version": "11.3.20",
-  "description": "",
-  "main": "dist/index.js",
-  "files": [
-    "dist/**/*"
-  ],
-  "scripts": {
-    "clean": "rm -rf dist",
-    "build": "npm run clean && tsc",
-    "publish:beta": "npm run build && npm version prerelease --preid beta && git push && npm publish --tag beta",
-    "publish:beta:link": "npm run build && npm version prerelease --preid beta && git push && npm publish --tag beta && npm run link",
-    "publish:patch": "npm version patch && git push && npm run build && npm publish",
-    "publish:minor": "npm version minor && git push && npm run build && npm publish",
-    "publish:major": "npm verYsion major && git push && npm run build && npm publish",
-    "link": "npm run build && npm link",
-    "link:backend": "npm run build && npm link && cd ../law-backend && npm link law-common && cd ../law-common",
-    "link:frontend": "npm run build && npm link && cd ../law-admin-web && npm link law-common && cd ../law-common",
-    "link:both": "npm run build && npm link && cd ../law-backend && npm link law-common && cd ../law-admin-web && npm link law-common && cd ../law-common",
-    "test": "jest",
-    "format": "prettier --write .",
-    "check-format": "prettier --check .",
-    "pull:link": "git pull && npm run link",
-    "check-version": "npm view law-common versions --json | jq -r '.[-1]'",
-    "script:publish": "node scripts/publish.js",
-    "script:publish:latest:beta": "npm run build && node scripts/publish.js prerelease beta && git push",
-    "script:publish:latest:patch": "npm run build && node scripts/publish.js patch && git push"
-  },
-  "keywords": [],
-  "author": "",
-  "license": "ISC",
-  "devDependencies": {
-    "@types/jest": "^29.5.13",
-    "@types/lodash": "^4.17.21",
-    "@types/node": "^22.6.1",
-    "jest": "^29.7.0",
-    "prettier": "3.8.1",
-    "semver": "^7.8.1",
-    "ts-jest": "^29.2.5",
-    "ts-node": "^10.9.2",
-    "typescript": "^5.6.2"
-  },
-  "dependencies": {
-    "@types/express": "^5.0.0",
-    "@types/multer": "^1.4.12",
-    "date-fns": "^4.1.0",
-    "lodash": "4.17.21"
-  }
-}
+{
+  "name": "law-common",
+  "version": "11.3.21-beta.1",
+  "description": "",
+  "main": "dist/index.js",
+  "files": [
+    "dist/**/*"
+  ],
+  "scripts": {
+    "clean": "rm -rf dist",
+    "build": "npm run clean && tsc",
+    "publish:beta": "npm run build && npm version prerelease --preid beta && git push && npm publish --tag beta",
+    "publish:beta:link": "npm run build && npm version prerelease --preid beta && git push && npm publish --tag beta && npm run link",
+    "publish:patch": "npm version patch && git push && npm run build && npm publish",
+    "publish:minor": "npm version minor && git push && npm run build && npm publish",
+    "publish:major": "npm verYsion major && git push && npm run build && npm publish",
+    "link": "npm run build && npm link",
+    "link:backend": "npm run build && npm link && cd ../law-backend && npm link law-common && cd ../law-common",
+    "link:frontend": "npm run build && npm link && cd ../law-admin-web && npm link law-common && cd ../law-common",
+    "link:both": "npm run build && npm link && cd ../law-backend && npm link law-common && cd ../law-admin-web && npm link law-common && cd ../law-common",
+    "test": "jest",
+    "format": "prettier --write .",
+    "check-format": "prettier --check .",
+    "pull:link": "git pull && npm run link",
+    "check-version": "npm view law-common versions --json | jq -r '.[-1]'",
+    "script:publish": "node scripts/publish.js",
+    "script:publish:latest:beta": "npm run build && node scripts/publish.js prerelease beta && git push",
+    "script:publish:latest:patch": "npm run build && node scripts/publish.js patch && git push"
+  },
+  "keywords": [],
+  "author": "",
+  "license": "ISC",
+  "devDependencies": {
+    "@types/jest": "^29.5.13",
+    "@types/lodash": "^4.17.21",
+    "@types/node": "^22.6.1",
+    "jest": "^29.7.0",
+    "prettier": "3.8.1",
+    "semver": "^7.8.1",
+    "ts-jest": "^29.2.5",
+    "ts-node": "^10.9.2",
+    "typescript": "^5.6.2"
+  },
+  "dependencies": {
+    "@types/express": "^5.0.0",
+    "@types/multer": "^1.4.12",
+    "date-fns": "^4.1.0",
+    "lodash": "4.17.21"
+  }
+}