law-common 11.3.21-beta.0 → 11.3.21-beta.2

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

@@ -17,10 +17,11 @@ export interface IClassificationWindowConfig {
     }>;
 }
 export interface SortableTimesheet {
-    projectClientName: string;
-    designation: string;
-    resourceName: string;
-    dateCodeForsorting: Date;
+    projectId?: number;
+    projectClientName?: string;
+    designation?: string;
+    resourceName?: string;
+    dateCodeForsorting?: Date;
 }
 export declare class TimesheetEntityModel extends BaseEntityModel<EntityEnum.TIMESHEET> implements ITimesheetEntity {
     id: number;
@@ -66,5 +67,5 @@ export declare class TimesheetEntityModel extends BaseEntityModel<EntityEnum.TIM
         startDay: number;
         endDay: Nullable<number>;
     }>;
-    static sortByProjectAndDesignation<T extends SortableTimesheet>(data: T[], designations: IDesignationEntity[]): T[];
+    static sortByProjectAndDesignation(data: SortableTimesheet[], designations: IDesignationEntity[]): SortableTimesheet[];
 }

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

@@ -156,18 +156,22 @@ class TimesheetEntityModel extends base_entity_model_1.BaseEntityModel {
             priorityMap.set(d.name, (_a = d.order) !== null && _a !== void 0 ? _a : Number.MAX_SAFE_INTEGER);
         });
         return [...data].sort((a, b) => {
-            var _a, _b;
-            const projectCompare = a.projectClientName.localeCompare(b.projectClientName);
+            var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p;
+            const aIsNB = ((_a = a.projectId) !== null && _a !== void 0 ? _a : 0) === 0;
+            const bIsNB = ((_b = b.projectId) !== null && _b !== void 0 ? _b : 0) === 0;
+            if (aIsNB !== bIsNB)
+                return aIsNB ? 1 : -1;
+            const projectCompare = ((_c = a.projectClientName) !== null && _c !== void 0 ? _c : "").localeCompare((_d = b.projectClientName) !== null && _d !== void 0 ? _d : "");
             if (projectCompare !== 0)
                 return projectCompare;
-            const priorityA = (_a = priorityMap.get(a.designation)) !== null && _a !== void 0 ? _a : Number.MAX_SAFE_INTEGER;
-            const priorityB = (_b = priorityMap.get(b.designation)) !== null && _b !== void 0 ? _b : Number.MAX_SAFE_INTEGER;
+            const priorityA = (_f = priorityMap.get((_e = a.designation) !== null && _e !== void 0 ? _e : "")) !== null && _f !== void 0 ? _f : Number.MAX_SAFE_INTEGER;
+            const priorityB = (_h = priorityMap.get((_g = b.designation) !== null && _g !== void 0 ? _g : "")) !== null && _h !== void 0 ? _h : Number.MAX_SAFE_INTEGER;
             if (priorityA !== priorityB)
                 return priorityA - priorityB;
-            const resourceCompare = a.resourceName.localeCompare(b.resourceName);
+            const resourceCompare = ((_j = a.resourceName) !== null && _j !== void 0 ? _j : "").localeCompare((_k = b.resourceName) !== null && _k !== void 0 ? _k : "");
             if (resourceCompare !== 0)
                 return resourceCompare;
-            return b.dateCodeForsorting.getTime() - a.dateCodeForsorting.getTime();
+            return ((_m = (_l = b.dateCodeForsorting) === null || _l === void 0 ? void 0 : _l.getTime()) !== null && _m !== void 0 ? _m : 0) - ((_p = (_o = a.dateCodeForsorting) === null || _o === void 0 ? void 0 : _o.getTime()) !== null && _p !== void 0 ? _p : 0);
         });
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "law-common",
-  "version": "11.3.21-beta.0",
+  "version": "11.3.21-beta.2",
   "description": "",
   "main": "dist/index.js",
   "files": [