law-common 12.11.1-beta.21 → 12.11.1-beta.22
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/api/index.d.ts +3 -0
- package/dist/src/api/index.js +3 -0
- package/dist/src/api/interface/timesheet.create.dto.interface.d.ts +11 -0
- package/dist/src/api/interface/timesheet.create.dto.interface.js +2 -0
- package/dist/src/api/interface/timesheet.entity.response.interface.d.ts +2 -1
- package/dist/src/api/interface/timesheet.filter.dto.interface.d.ts +4 -0
- package/dist/src/api/interface/timesheet.filter.dto.interface.js +2 -0
- package/dist/src/api/interface/timesheet.update.dto.interface.d.ts +11 -0
- package/dist/src/api/interface/timesheet.update.dto.interface.js +2 -0
- package/dist/src/entities/enums/{timesheet.action.enum.d.ts → timesheet_action_enum.d.ts} +1 -1
- package/dist/src/entities/enums/{timesheet.action.enum.js → timesheet_action_enum.js} +2 -2
- package/dist/src/entities/enums/{timesheet.status.enum.d.ts → timesheet_status_enum.d.ts} +3 -3
- package/dist/src/entities/enums/{timesheet.status.enum.js → timesheet_status_enum.js} +3 -3
- package/dist/src/entities/index.d.ts +3 -3
- package/dist/src/entities/index.js +3 -3
- package/dist/src/entities/interface/timesheet.entity.interface.d.ts +3 -30
- package/dist/src/entities/model/timesheet.entity.model.d.ts +3 -7
- package/dist/src/entities/model/timesheet.entity.model.js +3 -3
- package/dist/src/model/entities/timesheet.model.js +1 -1
- package/package.json +1 -1
- /package/dist/src/entities/enums/{timesheet.classification.status.enum.d.ts → timesheet_classification_status_enum.d.ts} +0 -0
- /package/dist/src/entities/enums/{timesheet.classification.status.enum.js → timesheet_classification_status_enum.js} +0 -0
package/dist/src/api/index.d.ts
CHANGED
|
@@ -25,6 +25,9 @@ export * from "./interface/billing.update.dto.interface";
|
|
|
25
25
|
export * from "./interface/moving_timesheet.create.dto.interface";
|
|
26
26
|
export * from "./interface/moving_timesheet.filter.dto.interface";
|
|
27
27
|
export * from "./interface/moving_timesheet.update.dto.interface";
|
|
28
|
+
export * from "./interface/timesheet.create.dto.interface";
|
|
29
|
+
export * from "./interface/timesheet.filter.dto.interface";
|
|
30
|
+
export * from "./interface/timesheet.update.dto.interface";
|
|
28
31
|
export * from "./interface/bank.create.dto.interface";
|
|
29
32
|
export * from "./interface/bank.entity.response";
|
|
30
33
|
export * from "./interface/bank.update.dto.interface";
|
package/dist/src/api/index.js
CHANGED
|
@@ -41,6 +41,9 @@ __exportStar(require("./interface/billing.update.dto.interface"), exports);
|
|
|
41
41
|
__exportStar(require("./interface/moving_timesheet.create.dto.interface"), exports);
|
|
42
42
|
__exportStar(require("./interface/moving_timesheet.filter.dto.interface"), exports);
|
|
43
43
|
__exportStar(require("./interface/moving_timesheet.update.dto.interface"), exports);
|
|
44
|
+
__exportStar(require("./interface/timesheet.create.dto.interface"), exports);
|
|
45
|
+
__exportStar(require("./interface/timesheet.filter.dto.interface"), exports);
|
|
46
|
+
__exportStar(require("./interface/timesheet.update.dto.interface"), exports);
|
|
44
47
|
__exportStar(require("./interface/bank.create.dto.interface"), exports);
|
|
45
48
|
__exportStar(require("./interface/bank.entity.response"), exports);
|
|
46
49
|
__exportStar(require("./interface/bank.update.dto.interface"), exports);
|
|
@@ -0,0 +1,11 @@
|
|
|
1
|
+
import { IEntityCreateDto, ITimesheetEntity, IUserEntity, ProjectUserMappingEntityModel, TimesheetClassificationStatusEnum, TimesheetEntityModel, TimesheetStatusEnum } from "../../entities";
|
|
2
|
+
export type ITimesheetEntityExclude = "status" | "billedDuration" | "notBilledDuration" | "classificationStatus" | "classifiedBy";
|
|
3
|
+
export interface ITimesheetEntityCreateDto extends Omit<IEntityCreateDto<ITimesheetEntity>, ITimesheetEntityExclude> {
|
|
4
|
+
status?: TimesheetStatusEnum;
|
|
5
|
+
classificationStatus?: TimesheetClassificationStatusEnum;
|
|
6
|
+
}
|
|
7
|
+
export interface ITimesheetEntityCreateDtoValidationData {
|
|
8
|
+
projectUserMappingEntities: ProjectUserMappingEntityModel[];
|
|
9
|
+
userEntity: IUserEntity;
|
|
10
|
+
existingTimesheet: TimesheetEntityModel;
|
|
11
|
+
}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
|
-
import { IProjectUserMappingEntity, ITimesheetEntity,
|
|
1
|
+
import { IProjectUserMappingEntity, ITimesheetEntity, IUserEntity, TimesheetActionEnum, TimesheetEntityModel, TimesheetStatusEnum } from "../../entities";
|
|
2
2
|
import { IClientApiEntityDependent } from "./client.entity.response";
|
|
3
3
|
import { IProjectApiEntityDependent } from "./project.entity.response";
|
|
4
|
+
import { ITimesheetEntityUpdateDto } from "./timesheet.update.dto.interface";
|
|
4
5
|
export type ITimesheetEntityGet = {
|
|
5
6
|
timesheets: ITimesheetEntity[];
|
|
6
7
|
clients: {
|
|
@@ -0,0 +1,11 @@
|
|
|
1
|
+
import { IEntityUpdateDto, ITimesheetEntity, TimesheetActionEnum } from "../../entities";
|
|
2
|
+
import { ITimesheetEntityCreateDtoValidationData } from "./timesheet.create.dto.interface";
|
|
3
|
+
export interface IActionDataDto {
|
|
4
|
+
action: TimesheetActionEnum;
|
|
5
|
+
remark?: string;
|
|
6
|
+
}
|
|
7
|
+
export interface ITimesheetEntityUpdateDto extends IEntityUpdateDto<ITimesheetEntity> {
|
|
8
|
+
actionData?: IActionDataDto;
|
|
9
|
+
}
|
|
10
|
+
export interface ITimesheetEntityUpdateDtoValidationData extends ITimesheetEntityCreateDtoValidationData {
|
|
11
|
+
}
|
|
@@ -6,7 +6,7 @@ const exceptions_1 = require("../../exceptions");
|
|
|
6
6
|
var TimesheetActionEnum;
|
|
7
7
|
(function (TimesheetActionEnum) {
|
|
8
8
|
TimesheetActionEnum["VIEW"] = "view";
|
|
9
|
-
TimesheetActionEnum["
|
|
9
|
+
TimesheetActionEnum["UPDATE"] = "edit";
|
|
10
10
|
TimesheetActionEnum["DELETE"] = "delete";
|
|
11
11
|
TimesheetActionEnum["CREATE"] = "create";
|
|
12
12
|
TimesheetActionEnum["APPROVE"] = "approve";
|
|
@@ -21,7 +21,7 @@ var TimesheetActionEnum;
|
|
|
21
21
|
const actionLabelMap = {
|
|
22
22
|
[TimesheetActionEnum.APPROVE]: "Approve",
|
|
23
23
|
[TimesheetActionEnum.VIEW]: "View",
|
|
24
|
-
[TimesheetActionEnum.
|
|
24
|
+
[TimesheetActionEnum.UPDATE]: "Edit",
|
|
25
25
|
[TimesheetActionEnum.DELETE]: "Delete",
|
|
26
26
|
[TimesheetActionEnum.CREATE]: "Create",
|
|
27
27
|
[TimesheetActionEnum.REJECT]: "Reject",
|
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
export declare enum TimesheetStatusEnum {
|
|
2
2
|
ONTIME = "ontime",
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
3
|
+
CREATE_APPROVAL_PENDING = "create_approval",
|
|
4
|
+
UPDATE_APPROVAL_PENDING = "edit_approval",
|
|
5
|
+
DELETE_APPROVAL_PENDING = "delete_approval",
|
|
6
6
|
RESOLVED_REJECTED = "resolved_rejected",
|
|
7
7
|
REJECTED = "rejected",
|
|
8
8
|
APPROVED = "approved",
|
|
@@ -6,9 +6,9 @@ const exceptions_1 = require("../../exceptions");
|
|
|
6
6
|
var TimesheetStatusEnum;
|
|
7
7
|
(function (TimesheetStatusEnum) {
|
|
8
8
|
TimesheetStatusEnum["ONTIME"] = "ontime";
|
|
9
|
-
TimesheetStatusEnum["
|
|
10
|
-
TimesheetStatusEnum["
|
|
11
|
-
TimesheetStatusEnum["
|
|
9
|
+
TimesheetStatusEnum["CREATE_APPROVAL_PENDING"] = "create_approval";
|
|
10
|
+
TimesheetStatusEnum["UPDATE_APPROVAL_PENDING"] = "edit_approval";
|
|
11
|
+
TimesheetStatusEnum["DELETE_APPROVAL_PENDING"] = "delete_approval";
|
|
12
12
|
TimesheetStatusEnum["RESOLVED_REJECTED"] = "resolved_rejected";
|
|
13
13
|
TimesheetStatusEnum["REJECTED"] = "rejected";
|
|
14
14
|
TimesheetStatusEnum["APPROVED"] = "approved";
|
|
@@ -41,9 +41,9 @@ export * from "./enums/history_operation.enum";
|
|
|
41
41
|
export * from "./interface/billing_history.entity.interface";
|
|
42
42
|
export * from "./interface/billing_timesheet_history.entity.interface";
|
|
43
43
|
export * from "./enums/history_operation.enum";
|
|
44
|
-
export * from "./enums/
|
|
45
|
-
export * from "./enums/
|
|
46
|
-
export * from "./enums/
|
|
44
|
+
export * from "./enums/timesheet_action_enum";
|
|
45
|
+
export * from "./enums/timesheet_classification_status_enum";
|
|
46
|
+
export * from "./enums/timesheet_status_enum";
|
|
47
47
|
export * from "./enums/billing.action.enum";
|
|
48
48
|
export * from "./enums/configuration_type_enum";
|
|
49
49
|
export * from "./enums/project_user_status.enum";
|
|
@@ -57,9 +57,9 @@ __exportStar(require("./enums/history_operation.enum"), exports);
|
|
|
57
57
|
__exportStar(require("./interface/billing_history.entity.interface"), exports);
|
|
58
58
|
__exportStar(require("./interface/billing_timesheet_history.entity.interface"), exports);
|
|
59
59
|
__exportStar(require("./enums/history_operation.enum"), exports);
|
|
60
|
-
__exportStar(require("./enums/
|
|
61
|
-
__exportStar(require("./enums/
|
|
62
|
-
__exportStar(require("./enums/
|
|
60
|
+
__exportStar(require("./enums/timesheet_action_enum"), exports);
|
|
61
|
+
__exportStar(require("./enums/timesheet_classification_status_enum"), exports);
|
|
62
|
+
__exportStar(require("./enums/timesheet_status_enum"), exports);
|
|
63
63
|
__exportStar(require("./enums/billing.action.enum"), exports);
|
|
64
64
|
__exportStar(require("./enums/configuration_type_enum"), exports);
|
|
65
65
|
__exportStar(require("./enums/project_user_status.enum"), exports);
|
|
@@ -1,11 +1,6 @@
|
|
|
1
|
-
import {
|
|
2
|
-
import {
|
|
3
|
-
import { TimesheetStatusEnum } from "../enums/timesheet.status.enum";
|
|
4
|
-
import { ProjectUserMappingEntityModel } from "../model/project_user_mapping.entity.model";
|
|
5
|
-
import { TimesheetEntityModel } from "../model/timesheet.entity.model";
|
|
1
|
+
import { TimesheetClassificationStatusEnum } from "../enums/timesheet_classification_status_enum";
|
|
2
|
+
import { TimesheetStatusEnum } from "../enums/timesheet_status_enum";
|
|
6
3
|
import { IEntityAuditColumn } from "./entity-audit-columns.interface";
|
|
7
|
-
import { IEntityCreateDto, IEntityFilterData, IEntityUpdateDto } from "./entity.utils.interface";
|
|
8
|
-
import { IUserEntity } from "./user.entity.interface";
|
|
9
4
|
export interface ITimesheetEntity extends IEntityAuditColumn {
|
|
10
5
|
id: number;
|
|
11
6
|
userId: number;
|
|
@@ -22,26 +17,4 @@ export interface ITimesheetEntity extends IEntityAuditColumn {
|
|
|
22
17
|
classificationStatus: TimesheetClassificationStatusEnum;
|
|
23
18
|
classifiedBy?: number;
|
|
24
19
|
}
|
|
25
|
-
export type
|
|
26
|
-
export interface ITimesheetEntityCreateDto extends Omit<IEntityCreateDto<ITimesheetEntity>, ITimesheetEntityExclude> {
|
|
27
|
-
status?: TimesheetStatusEnum;
|
|
28
|
-
classificationStatus?: TimesheetClassificationStatusEnum;
|
|
29
|
-
}
|
|
30
|
-
export interface ITimesheetEntityCreateDtoValidationData {
|
|
31
|
-
projectUserMappingEntities: ProjectUserMappingEntityModel[];
|
|
32
|
-
userEntity: IUserEntity;
|
|
33
|
-
existingTimesheet: TimesheetEntityModel;
|
|
34
|
-
}
|
|
35
|
-
export interface ITimesheetEntityUpdateDtoValidationData extends ITimesheetEntityCreateDtoValidationData {
|
|
36
|
-
}
|
|
37
|
-
export interface IActionDataDto {
|
|
38
|
-
action: TimesheetActionEnum;
|
|
39
|
-
remark?: string;
|
|
40
|
-
}
|
|
41
|
-
export interface ITimesheetEntityUpdateDto extends IEntityUpdateDto<ITimesheetEntity> {
|
|
42
|
-
actionData?: IActionDataDto;
|
|
43
|
-
}
|
|
44
|
-
export interface ITimesheetEntityFilterData extends IEntityFilterData<ITimesheetEntity> {
|
|
45
|
-
createdBy?: number[];
|
|
46
|
-
}
|
|
47
|
-
export type PendingApprovalStatus = TimesheetStatusEnum.CREATE_APPROVAL | TimesheetStatusEnum.EDIT_APPROVAL | TimesheetStatusEnum.DELETE_APPROVAL | TimesheetStatusEnum.RESOLVED_REJECTED;
|
|
20
|
+
export type PendingApprovalStatus = TimesheetStatusEnum.CREATE_APPROVAL_PENDING | TimesheetStatusEnum.UPDATE_APPROVAL_PENDING | TimesheetStatusEnum.DELETE_APPROVAL_PENDING | TimesheetStatusEnum.RESOLVED_REJECTED;
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { CurrencyEnum } from "../../enums";
|
|
2
|
-
import { TimesheetClassificationStatusEnum } from "../enums/
|
|
3
|
-
import { TimesheetStatusEnum } from "../enums/
|
|
2
|
+
import { TimesheetClassificationStatusEnum } from "../enums/timesheet_classification_status_enum";
|
|
3
|
+
import { TimesheetStatusEnum } from "../enums/timesheet_status_enum";
|
|
4
4
|
import { IDesignationEntity } from "../interface/designation.entity.interface";
|
|
5
5
|
import { EntityEnum, Nullable } from "../interface/entity.utils.interface";
|
|
6
6
|
import { RelationConfigs } from "../interface/relation-config.interface";
|
|
@@ -47,11 +47,7 @@ export declare class TimesheetEntityModel extends BaseEntityModel<EntityEnum.TIM
|
|
|
47
47
|
entityHistory?: EntityHistoryEntityModel[];
|
|
48
48
|
static fromEntity(entity: ITimesheetEntity): TimesheetEntityModel;
|
|
49
49
|
getRelationConfigs(): any[];
|
|
50
|
-
static relationConfigs: RelationConfigs<[
|
|
51
|
-
EntityEnum.USER,
|
|
52
|
-
EntityEnum.ENTITY_HISTORY,
|
|
53
|
-
EntityEnum.PROJECT
|
|
54
|
-
], EntityEnum.TIMESHEET>;
|
|
50
|
+
static relationConfigs: RelationConfigs<[EntityEnum.USER, EntityEnum.ENTITY_HISTORY, EntityEnum.PROJECT], EntityEnum.TIMESHEET>;
|
|
55
51
|
getTimesheetAmount(projectCurrency: CurrencyEnum): number;
|
|
56
52
|
get formattedDate(): string;
|
|
57
53
|
get userName(): string | undefined;
|
|
@@ -4,8 +4,8 @@ exports.TimesheetEntityModel = void 0;
|
|
|
4
4
|
const date_fns_1 = require("date-fns");
|
|
5
5
|
const utils_1 = require("../../utils");
|
|
6
6
|
const relation_type_enum_1 = require("../enums/relation-type.enum");
|
|
7
|
-
const timesheet_classification_status_enum_1 = require("../enums/
|
|
8
|
-
const timesheet_status_enum_1 = require("../enums/
|
|
7
|
+
const timesheet_classification_status_enum_1 = require("../enums/timesheet_classification_status_enum");
|
|
8
|
+
const timesheet_status_enum_1 = require("../enums/timesheet_status_enum");
|
|
9
9
|
const entity_utils_interface_1 = require("../interface/entity.utils.interface");
|
|
10
10
|
const base_entity_model_1 = require("./base.entity.model");
|
|
11
11
|
// Use this mdoel for UI & BACKEND
|
|
@@ -18,7 +18,7 @@ class TimesheetEntityModel extends base_entity_model_1.BaseEntityModel {
|
|
|
18
18
|
this.task = "";
|
|
19
19
|
this.dateCode = "";
|
|
20
20
|
this.totalDuration = 0;
|
|
21
|
-
this.status = timesheet_status_enum_1.TimesheetStatusEnum.
|
|
21
|
+
this.status = timesheet_status_enum_1.TimesheetStatusEnum.CREATE_APPROVAL_PENDING;
|
|
22
22
|
this.classificationStatus = timesheet_classification_status_enum_1.TimesheetClassificationStatusEnum.PENDING;
|
|
23
23
|
this.createdBy = 0;
|
|
24
24
|
this.updatedBy = 0;
|
|
@@ -15,7 +15,7 @@ class TimesheetEntityModel {
|
|
|
15
15
|
this.createdOn = 0;
|
|
16
16
|
this.updatedBy = 1;
|
|
17
17
|
this.updatedOn = 0;
|
|
18
|
-
this.status = entities_1.TimesheetStatusEnum.
|
|
18
|
+
this.status = entities_1.TimesheetStatusEnum.CREATE_APPROVAL_PENDING;
|
|
19
19
|
this.billingId = 0;
|
|
20
20
|
this.classificationStatus = entities_1.TimesheetClassificationStatusEnum.PENDING;
|
|
21
21
|
}
|
package/package.json
CHANGED
|
File without changes
|
|
File without changes
|