law-common 11.3.3-beta.0 → 11.3.3-beta.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/src/entities/enums/timesheet.classification.status.enum.d.ts +10 -0
- package/dist/src/entities/enums/timesheet.classification.status.enum.js +28 -0
- package/dist/src/entities/index.d.ts +1 -0
- package/dist/src/entities/index.js +1 -0
- package/dist/src/entities/interface/timesheet.entity.interface.d.ts +7 -1
- package/dist/src/entities/model/billing.entity.model.js +2 -3
- package/dist/src/entities/model/timesheet.entity.model.d.ts +5 -0
- package/dist/src/entities/model/timesheet.entity.model.js +2 -0
- package/dist/src/model/entities/timesheet.model.d.ts +5 -1
- package/dist/src/model/entities/timesheet.model.js +1 -0
- package/package.json +1 -1
|
@@ -0,0 +1,10 @@
|
|
|
1
|
+
export declare enum TimesheetClassificationStatusEnum {
|
|
2
|
+
PENDING = "pending",
|
|
3
|
+
CLASSIFIED = "classified",
|
|
4
|
+
AUTO_CLASSIFIED = "auto_classified",
|
|
5
|
+
CORRECTED = "corrected"
|
|
6
|
+
}
|
|
7
|
+
export declare namespace TimesheetClassificationStatusEnum {
|
|
8
|
+
function getNames(): string[];
|
|
9
|
+
function parse(value: string): TimesheetClassificationStatusEnum;
|
|
10
|
+
}
|
|
@@ -0,0 +1,28 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.TimesheetClassificationStatusEnum = void 0;
|
|
4
|
+
const error_key_enum_1 = require("../../enums/error.key.enum");
|
|
5
|
+
const exceptions_1 = require("../../exceptions");
|
|
6
|
+
var TimesheetClassificationStatusEnum;
|
|
7
|
+
(function (TimesheetClassificationStatusEnum) {
|
|
8
|
+
TimesheetClassificationStatusEnum["PENDING"] = "pending";
|
|
9
|
+
TimesheetClassificationStatusEnum["CLASSIFIED"] = "classified";
|
|
10
|
+
TimesheetClassificationStatusEnum["AUTO_CLASSIFIED"] = "auto_classified";
|
|
11
|
+
TimesheetClassificationStatusEnum["CORRECTED"] = "corrected";
|
|
12
|
+
})(TimesheetClassificationStatusEnum || (exports.TimesheetClassificationStatusEnum = TimesheetClassificationStatusEnum = {}));
|
|
13
|
+
(function (TimesheetClassificationStatusEnum) {
|
|
14
|
+
function getNames() {
|
|
15
|
+
return Object.values(TimesheetClassificationStatusEnum).filter((value) => typeof value === "string");
|
|
16
|
+
}
|
|
17
|
+
TimesheetClassificationStatusEnum.getNames = getNames;
|
|
18
|
+
function parse(value) {
|
|
19
|
+
if (Object.values(TimesheetClassificationStatusEnum).includes(value)) {
|
|
20
|
+
return value;
|
|
21
|
+
}
|
|
22
|
+
throw new exceptions_1.AppBadRequestException({
|
|
23
|
+
key: error_key_enum_1.ErrorKeyEnum.TIMESHEET_STATUS,
|
|
24
|
+
message: ["Invalid timesheet classification status"],
|
|
25
|
+
});
|
|
26
|
+
}
|
|
27
|
+
TimesheetClassificationStatusEnum.parse = parse;
|
|
28
|
+
})(TimesheetClassificationStatusEnum || (exports.TimesheetClassificationStatusEnum = TimesheetClassificationStatusEnum = {}));
|
|
@@ -39,6 +39,7 @@ export * from "./interface/billing_timesheet_history.entity.interface";
|
|
|
39
39
|
export * from "./enums/history_operation.enum";
|
|
40
40
|
export * from "./enums/timesheet.action.enum";
|
|
41
41
|
export * from "./enums/timesheet.status.enum";
|
|
42
|
+
export * from "./enums/timesheet.classification.status.enum";
|
|
42
43
|
export * from "./enums/billing.action.enum";
|
|
43
44
|
export * from "./enums/configuration.type.enum";
|
|
44
45
|
export * from "./enums/project_user_status.enum";
|
|
@@ -55,6 +55,7 @@ __exportStar(require("./interface/billing_timesheet_history.entity.interface"),
|
|
|
55
55
|
__exportStar(require("./enums/history_operation.enum"), exports);
|
|
56
56
|
__exportStar(require("./enums/timesheet.action.enum"), exports);
|
|
57
57
|
__exportStar(require("./enums/timesheet.status.enum"), exports);
|
|
58
|
+
__exportStar(require("./enums/timesheet.classification.status.enum"), exports);
|
|
58
59
|
__exportStar(require("./enums/billing.action.enum"), exports);
|
|
59
60
|
__exportStar(require("./enums/configuration.type.enum"), exports);
|
|
60
61
|
__exportStar(require("./enums/project_user_status.enum"), exports);
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { TimesheetActionEnum } from "../enums/timesheet.action.enum";
|
|
2
|
+
import { TimesheetClassificationStatusEnum } from "../enums/timesheet.classification.status.enum";
|
|
2
3
|
import { TimesheetStatusEnum } from "../enums/timesheet.status.enum";
|
|
3
4
|
import { ProjectUserMappingEntityModel } from "../model/project-user-mapping.entity.model";
|
|
4
5
|
import { TimesheetEntityModel } from "../model/timesheet.entity.model";
|
|
@@ -16,10 +17,15 @@ export interface ITimesheetEntity extends IEntityAuditColumn {
|
|
|
16
17
|
status: TimesheetStatusEnum;
|
|
17
18
|
remark?: string;
|
|
18
19
|
billingId?: number;
|
|
20
|
+
billedDuration?: number;
|
|
21
|
+
notBilledDuration?: number;
|
|
22
|
+
classificationStatus: TimesheetClassificationStatusEnum;
|
|
23
|
+
classifiedBy?: number;
|
|
19
24
|
}
|
|
20
|
-
export type ITimesheetEntityExclude = "status";
|
|
25
|
+
export type ITimesheetEntityExclude = "status" | "billedDuration" | "notBilledDuration" | "classificationStatus" | "classifiedBy";
|
|
21
26
|
export interface ITimesheetEntityCreateDto extends Omit<IEntityCreateDto<ITimesheetEntity>, ITimesheetEntityExclude> {
|
|
22
27
|
status?: TimesheetStatusEnum;
|
|
28
|
+
classificationStatus?: TimesheetClassificationStatusEnum;
|
|
23
29
|
}
|
|
24
30
|
export interface ITimesheetEntityCreateDtoValidationData {
|
|
25
31
|
projectUserMappingEntities: ProjectUserMappingEntityModel[];
|
|
@@ -248,8 +248,7 @@ class BillingEntityModel extends base_entity_model_1.BaseEntityModel {
|
|
|
248
248
|
var _a, _b;
|
|
249
249
|
return ((0, utils_1.getDecimalNumberFromString)(this.totalAmount) -
|
|
250
250
|
(this.getTotalAmountRecieved() +
|
|
251
|
-
(0, utils_1.sumNormalised)((_b = (_a = this.billingTransactions) === null || _a === void 0 ? void 0 : _a.filter((transaction) => [billing_transaction_enum_1.BillingTransactionType.CREDIT_NOTE, billing_transaction_enum_1.BillingTransactionType.WRITE_OFF].includes(transaction.type) &&
|
|
252
|
-
transaction.status !== billing_transaction_status_enum_1.BillingTransactionStatusEnum.REJECTED)) !== null && _b !== void 0 ? _b : [], "amount")));
|
|
251
|
+
(0, utils_1.sumNormalised)((_b = (_a = this.billingTransactions) === null || _a === void 0 ? void 0 : _a.filter((transaction) => [billing_transaction_enum_1.BillingTransactionType.CREDIT_NOTE, billing_transaction_enum_1.BillingTransactionType.WRITE_OFF].includes(transaction.type))) !== null && _b !== void 0 ? _b : [], "amount")));
|
|
253
252
|
}
|
|
254
253
|
validateAdvanceBillingId(adjustedBillingTransactions) {
|
|
255
254
|
const index = adjustedBillingTransactions.findIndex((item) => item.advanceBillingId === null);
|
|
@@ -262,7 +261,7 @@ class BillingEntityModel extends base_entity_model_1.BaseEntityModel {
|
|
|
262
261
|
}
|
|
263
262
|
getApprovedBillingTransactionsTotalAmount() {
|
|
264
263
|
var _a, _b;
|
|
265
|
-
return (0, utils_1.sumNormalised)((_b = (_a = this.billingTransactions) === null || _a === void 0 ? void 0 : _a.filter((entity) => ![billing_transaction_status_enum_1.BillingTransactionStatusEnum.CREDITNOTE_APPROVAL_PENDING, billing_transaction_status_enum_1.BillingTransactionStatusEnum.WRITEOFF_APPROVAL_PENDING
|
|
264
|
+
return (0, utils_1.sumNormalised)((_b = (_a = this.billingTransactions) === null || _a === void 0 ? void 0 : _a.filter((entity) => ![billing_transaction_status_enum_1.BillingTransactionStatusEnum.CREDITNOTE_APPROVAL_PENDING, billing_transaction_status_enum_1.BillingTransactionStatusEnum.WRITEOFF_APPROVAL_PENDING].includes(entity.status))) !== null && _b !== void 0 ? _b : [], "amount");
|
|
266
265
|
}
|
|
267
266
|
getCurrentBillingBillingProfile(billingProfiles) {
|
|
268
267
|
const billingParticularsOfCurrentBilling = this.billingProfileParticulars;
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { CurrencyEnum } from "../../enums";
|
|
2
|
+
import { TimesheetClassificationStatusEnum } from "../enums/timesheet.classification.status.enum";
|
|
2
3
|
import { TimesheetStatusEnum } from "../enums/timesheet.status.enum";
|
|
3
4
|
import { EntityEnum } from "../interface/entity.utils.interface";
|
|
4
5
|
import { RelationConfigs } from "../interface/relation-config.interface";
|
|
@@ -17,6 +18,10 @@ export declare class TimesheetEntityModel extends BaseEntityModel<EntityEnum.TIM
|
|
|
17
18
|
status: TimesheetStatusEnum;
|
|
18
19
|
remark?: string;
|
|
19
20
|
billingId?: number;
|
|
21
|
+
billedDuration?: number;
|
|
22
|
+
notBilledDuration?: number;
|
|
23
|
+
classificationStatus: TimesheetClassificationStatusEnum;
|
|
24
|
+
classifiedBy?: number;
|
|
20
25
|
createdBy: number;
|
|
21
26
|
updatedBy: number;
|
|
22
27
|
createdOn: number;
|
|
@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.TimesheetEntityModel = void 0;
|
|
4
4
|
const utils_1 = require("../../utils");
|
|
5
5
|
const relation_type_enum_1 = require("../enums/relation-type.enum");
|
|
6
|
+
const timesheet_classification_status_enum_1 = require("../enums/timesheet.classification.status.enum");
|
|
6
7
|
const timesheet_status_enum_1 = require("../enums/timesheet.status.enum");
|
|
7
8
|
const entity_utils_interface_1 = require("../interface/entity.utils.interface");
|
|
8
9
|
const base_entity_model_1 = require("./base.entity.model");
|
|
@@ -16,6 +17,7 @@ class TimesheetEntityModel extends base_entity_model_1.BaseEntityModel {
|
|
|
16
17
|
this.dateCode = "";
|
|
17
18
|
this.totalDuration = 0;
|
|
18
19
|
this.status = timesheet_status_enum_1.TimesheetStatusEnum.CREATE_APPROVAL;
|
|
20
|
+
this.classificationStatus = timesheet_classification_status_enum_1.TimesheetClassificationStatusEnum.PENDING;
|
|
19
21
|
this.createdBy = 0;
|
|
20
22
|
this.updatedBy = 0;
|
|
21
23
|
this.createdOn = 0;
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { ITimesheetEntity, TimesheetStatusEnum } from "../../entities";
|
|
1
|
+
import { ITimesheetEntity, TimesheetClassificationStatusEnum, TimesheetStatusEnum } from "../../entities";
|
|
2
2
|
import { ITimesheetEntityModel } from "./interface/timesheet.model.interface";
|
|
3
3
|
export declare class TimesheetEntityModel implements ITimesheetEntityModel {
|
|
4
4
|
id: number;
|
|
@@ -14,6 +14,10 @@ export declare class TimesheetEntityModel implements ITimesheetEntityModel {
|
|
|
14
14
|
updatedOn: number;
|
|
15
15
|
status: TimesheetStatusEnum;
|
|
16
16
|
billingId?: number;
|
|
17
|
+
billedDuration?: number;
|
|
18
|
+
notBilledDuration?: number;
|
|
19
|
+
classificationStatus: TimesheetClassificationStatusEnum;
|
|
20
|
+
classifiedBy?: number;
|
|
17
21
|
/**
|
|
18
22
|
* @param timesheets - Array of TimesheetModel instances
|
|
19
23
|
* @return - Array of Timesheet Model
|
|
@@ -17,6 +17,7 @@ class TimesheetEntityModel {
|
|
|
17
17
|
this.updatedOn = 0;
|
|
18
18
|
this.status = entities_1.TimesheetStatusEnum.CREATE_APPROVAL;
|
|
19
19
|
this.billingId = 0;
|
|
20
|
+
this.classificationStatus = entities_1.TimesheetClassificationStatusEnum.PENDING;
|
|
20
21
|
}
|
|
21
22
|
/**
|
|
22
23
|
* @param timesheets - Array of TimesheetModel instances
|