@platform-modules/foreign-ministry 1.1.74 → 1.1.75
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/models/LeaveApprovalDetailsModel.d.ts +13 -0
- package/dist/models/LeaveApprovalDetailsModel.js +51 -0
- package/dist/models/LeaveApprovalMatrixModel.d.ts +7 -0
- package/dist/models/LeaveApprovalMatrixModel.js +40 -0
- package/dist/models/LeaveApprovalsModel.d.ts +2 -1
- package/dist/models/LeaveApprovalsModel.js +7 -2
- package/dist/models/UpdateAttendanceApprovalModel.d.ts +1 -0
- package/dist/models/UpdateAttendanceApprovalModel.js +4 -0
- package/dist/models/UpdateAttendenceRequestModel.d.ts +28 -0
- package/dist/models/UpdateAttendenceRequestModel.js +86 -0
- package/dist/models/user.d.ts +2 -1
- package/dist/models/user.js +7 -2
- package/package.json +1 -1
- package/src/models/LeaveApprovalsModel.ts +5 -1
- package/src/models/UpdateAttendanceApprovalModel.ts +3 -0
- package/src/models/user.ts +5 -0
|
@@ -0,0 +1,13 @@
|
|
|
1
|
+
import { BaseModel } from './BaseModel';
|
|
2
|
+
export declare enum ApprovalStatus {
|
|
3
|
+
PENDING = "Pending",
|
|
4
|
+
APPROVED = "Approved",
|
|
5
|
+
REJECTED = "Rejected"
|
|
6
|
+
}
|
|
7
|
+
export declare class LeaveApprovalDetails extends BaseModel {
|
|
8
|
+
leave_request_id: number;
|
|
9
|
+
level: number;
|
|
10
|
+
approver_id: number;
|
|
11
|
+
approval_status: ApprovalStatus;
|
|
12
|
+
constructor(leave_request_id: number, approver_id: number, approval_status: ApprovalStatus, level: number);
|
|
13
|
+
}
|
|
@@ -0,0 +1,51 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
|
|
3
|
+
var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
|
|
4
|
+
if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
|
|
5
|
+
else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
|
|
6
|
+
return c > 3 && r && Object.defineProperty(target, key, r), r;
|
|
7
|
+
};
|
|
8
|
+
var __metadata = (this && this.__metadata) || function (k, v) {
|
|
9
|
+
if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
|
|
10
|
+
};
|
|
11
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
|
+
exports.LeaveApprovalDetails = exports.ApprovalStatus = void 0;
|
|
13
|
+
const typeorm_1 = require("typeorm");
|
|
14
|
+
const BaseModel_1 = require("./BaseModel");
|
|
15
|
+
var ApprovalStatus;
|
|
16
|
+
(function (ApprovalStatus) {
|
|
17
|
+
ApprovalStatus["PENDING"] = "Pending";
|
|
18
|
+
ApprovalStatus["APPROVED"] = "Approved";
|
|
19
|
+
ApprovalStatus["REJECTED"] = "Rejected";
|
|
20
|
+
})(ApprovalStatus || (exports.ApprovalStatus = ApprovalStatus = {}));
|
|
21
|
+
//This model is used to store the store the leave apporval details of the user for the leave request
|
|
22
|
+
let LeaveApprovalDetails = class LeaveApprovalDetails extends BaseModel_1.BaseModel {
|
|
23
|
+
constructor(leave_request_id, approver_id, approval_status, level) {
|
|
24
|
+
super();
|
|
25
|
+
this.leave_request_id = leave_request_id;
|
|
26
|
+
this.approver_id = approver_id;
|
|
27
|
+
this.approval_status = approval_status;
|
|
28
|
+
this.level = level;
|
|
29
|
+
}
|
|
30
|
+
};
|
|
31
|
+
exports.LeaveApprovalDetails = LeaveApprovalDetails;
|
|
32
|
+
__decorate([
|
|
33
|
+
(0, typeorm_1.Column)({ type: 'int', nullable: false }),
|
|
34
|
+
__metadata("design:type", Number)
|
|
35
|
+
], LeaveApprovalDetails.prototype, "leave_request_id", void 0);
|
|
36
|
+
__decorate([
|
|
37
|
+
(0, typeorm_1.Column)({ type: 'int', nullable: false }),
|
|
38
|
+
__metadata("design:type", Number)
|
|
39
|
+
], LeaveApprovalDetails.prototype, "level", void 0);
|
|
40
|
+
__decorate([
|
|
41
|
+
(0, typeorm_1.Column)({ type: 'int', nullable: false }),
|
|
42
|
+
__metadata("design:type", Number)
|
|
43
|
+
], LeaveApprovalDetails.prototype, "approver_id", void 0);
|
|
44
|
+
__decorate([
|
|
45
|
+
(0, typeorm_1.Column)({ type: 'enum', enum: ApprovalStatus, default: ApprovalStatus.PENDING, nullable: false }),
|
|
46
|
+
__metadata("design:type", String)
|
|
47
|
+
], LeaveApprovalDetails.prototype, "approval_status", void 0);
|
|
48
|
+
exports.LeaveApprovalDetails = LeaveApprovalDetails = __decorate([
|
|
49
|
+
(0, typeorm_1.Entity)({ name: 'leave_approval_details' }),
|
|
50
|
+
__metadata("design:paramtypes", [Number, Number, String, Number])
|
|
51
|
+
], LeaveApprovalDetails);
|
|
@@ -0,0 +1,40 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
|
|
3
|
+
var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
|
|
4
|
+
if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
|
|
5
|
+
else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
|
|
6
|
+
return c > 3 && r && Object.defineProperty(target, key, r), r;
|
|
7
|
+
};
|
|
8
|
+
var __metadata = (this && this.__metadata) || function (k, v) {
|
|
9
|
+
if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
|
|
10
|
+
};
|
|
11
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
|
+
exports.LeaveApprovalMatrix = void 0;
|
|
13
|
+
const typeorm_1 = require("typeorm");
|
|
14
|
+
const BaseModel_1 = require("./BaseModel");
|
|
15
|
+
//This model is used to store the store the leave apporval matrix(HOD, Manager, HR, Director) based on leave type along with the levels
|
|
16
|
+
let LeaveApprovalMatrix = class LeaveApprovalMatrix extends BaseModel_1.BaseModel {
|
|
17
|
+
constructor(leave_type, level, approval_matrix) {
|
|
18
|
+
super();
|
|
19
|
+
this.leave_type = leave_type;
|
|
20
|
+
this.level = level;
|
|
21
|
+
this.approval_matrix = approval_matrix;
|
|
22
|
+
}
|
|
23
|
+
};
|
|
24
|
+
exports.LeaveApprovalMatrix = LeaveApprovalMatrix;
|
|
25
|
+
__decorate([
|
|
26
|
+
(0, typeorm_1.Column)({ type: 'int', nullable: false }),
|
|
27
|
+
__metadata("design:type", Number)
|
|
28
|
+
], LeaveApprovalMatrix.prototype, "leave_type", void 0);
|
|
29
|
+
__decorate([
|
|
30
|
+
(0, typeorm_1.Column)({ type: 'int', nullable: false }),
|
|
31
|
+
__metadata("design:type", Number)
|
|
32
|
+
], LeaveApprovalMatrix.prototype, "level", void 0);
|
|
33
|
+
__decorate([
|
|
34
|
+
(0, typeorm_1.Column)({ type: 'varchar', length: 255, nullable: false }),
|
|
35
|
+
__metadata("design:type", String)
|
|
36
|
+
], LeaveApprovalMatrix.prototype, "approval_matrix", void 0);
|
|
37
|
+
exports.LeaveApprovalMatrix = LeaveApprovalMatrix = __decorate([
|
|
38
|
+
(0, typeorm_1.Entity)({ name: 'leave_approval_matrix' }),
|
|
39
|
+
__metadata("design:paramtypes", [Number, Number, String])
|
|
40
|
+
], LeaveApprovalMatrix);
|
|
@@ -16,5 +16,6 @@ export declare class LeaveApprovalDetails extends BaseModel {
|
|
|
16
16
|
section_id: number;
|
|
17
17
|
comment: string;
|
|
18
18
|
approval_status: ApprovalStatus;
|
|
19
|
-
|
|
19
|
+
is_allowed: boolean;
|
|
20
|
+
constructor(leave_request_id: number, approver_user_id: number, approver_role_id: number, comment: string, approval_status: ApprovalStatus, level: number, department_id: number, section_id: number, is_allowed: boolean);
|
|
20
21
|
}
|
|
@@ -21,7 +21,7 @@ var ApprovalStatus;
|
|
|
21
21
|
})(ApprovalStatus || (exports.ApprovalStatus = ApprovalStatus = {}));
|
|
22
22
|
//This model is used to store the store the leave apporval details of the user for the leave request
|
|
23
23
|
let LeaveApprovalDetails = class LeaveApprovalDetails extends BaseModel_1.BaseModel {
|
|
24
|
-
constructor(leave_request_id, approver_user_id, approver_role_id, comment, approval_status, level, department_id, section_id) {
|
|
24
|
+
constructor(leave_request_id, approver_user_id, approver_role_id, comment, approval_status, level, department_id, section_id, is_allowed) {
|
|
25
25
|
super();
|
|
26
26
|
this.leave_request_id = leave_request_id;
|
|
27
27
|
this.approver_user_id = approver_user_id;
|
|
@@ -31,6 +31,7 @@ let LeaveApprovalDetails = class LeaveApprovalDetails extends BaseModel_1.BaseMo
|
|
|
31
31
|
this.comment = comment;
|
|
32
32
|
this.approval_status = approval_status;
|
|
33
33
|
this.level = level;
|
|
34
|
+
this.is_allowed = is_allowed;
|
|
34
35
|
}
|
|
35
36
|
};
|
|
36
37
|
exports.LeaveApprovalDetails = LeaveApprovalDetails;
|
|
@@ -74,7 +75,11 @@ __decorate([
|
|
|
74
75
|
(0, typeorm_1.Column)({ type: 'enum', enum: ApprovalStatus, default: ApprovalStatus.PENDING, nullable: false }),
|
|
75
76
|
__metadata("design:type", String)
|
|
76
77
|
], LeaveApprovalDetails.prototype, "approval_status", void 0);
|
|
78
|
+
__decorate([
|
|
79
|
+
(0, typeorm_1.Column)({ type: 'boolean', default: true, nullable: false }),
|
|
80
|
+
__metadata("design:type", Boolean)
|
|
81
|
+
], LeaveApprovalDetails.prototype, "is_allowed", void 0);
|
|
77
82
|
exports.LeaveApprovalDetails = LeaveApprovalDetails = __decorate([
|
|
78
83
|
(0, typeorm_1.Entity)({ name: 'leave_approvals' }),
|
|
79
|
-
__metadata("design:paramtypes", [Number, Number, Number, String, String, Number, Number, Number])
|
|
84
|
+
__metadata("design:paramtypes", [Number, Number, Number, String, String, Number, Number, Number, Boolean])
|
|
80
85
|
], LeaveApprovalDetails);
|
|
@@ -70,6 +70,10 @@ __decorate([
|
|
|
70
70
|
(0, typeorm_1.Column)({ type: 'enum', enum: UpdateAttendanceApprovalStatus, default: UpdateAttendanceApprovalStatus.PENDING, nullable: false }),
|
|
71
71
|
__metadata("design:type", String)
|
|
72
72
|
], UpdateAttendanceApprovalDetails.prototype, "approval_status", void 0);
|
|
73
|
+
__decorate([
|
|
74
|
+
(0, typeorm_1.Column)({ type: 'boolean', default: true, nullable: false }),
|
|
75
|
+
__metadata("design:type", Boolean)
|
|
76
|
+
], UpdateAttendanceApprovalDetails.prototype, "is_allowed", void 0);
|
|
73
77
|
exports.UpdateAttendanceApprovalDetails = UpdateAttendanceApprovalDetails = __decorate([
|
|
74
78
|
(0, typeorm_1.Entity)({ name: 'update_attendance_approvals' })
|
|
75
79
|
], UpdateAttendanceApprovalDetails);
|
|
@@ -0,0 +1,28 @@
|
|
|
1
|
+
import { BaseModel } from './BaseModel';
|
|
2
|
+
export declare enum UpdateAttendenceStatus {
|
|
3
|
+
PENDING = "Pending",
|
|
4
|
+
ASSIGNED = "Assigned",
|
|
5
|
+
IN_PROGRESS = "In Progress",
|
|
6
|
+
APPROVED = "Approved",
|
|
7
|
+
REJECTED = "Rejected"
|
|
8
|
+
}
|
|
9
|
+
export declare enum UpdateAttendenceReason {
|
|
10
|
+
MEETING = "Meeting",
|
|
11
|
+
EARLY_CHECKOUT = "Early Checkout",
|
|
12
|
+
SPECIAL_REASON = "Special Reason"
|
|
13
|
+
}
|
|
14
|
+
export declare class UpdateAttendenceRequests extends BaseModel {
|
|
15
|
+
req_user_department_id: number | null;
|
|
16
|
+
req_user_section_id: number | null;
|
|
17
|
+
service_id: number | null;
|
|
18
|
+
sub_service_id: number | null;
|
|
19
|
+
user_id: number;
|
|
20
|
+
from_date: string | null;
|
|
21
|
+
to_date: string | null;
|
|
22
|
+
from_time: string | null;
|
|
23
|
+
to_time: string | null;
|
|
24
|
+
reason: UpdateAttendenceReason;
|
|
25
|
+
comments: string | null;
|
|
26
|
+
status: UpdateAttendenceStatus;
|
|
27
|
+
workflow_execution_id: string | null;
|
|
28
|
+
}
|
|
@@ -0,0 +1,86 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
|
|
3
|
+
var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
|
|
4
|
+
if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
|
|
5
|
+
else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
|
|
6
|
+
return c > 3 && r && Object.defineProperty(target, key, r), r;
|
|
7
|
+
};
|
|
8
|
+
var __metadata = (this && this.__metadata) || function (k, v) {
|
|
9
|
+
if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
|
|
10
|
+
};
|
|
11
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
|
+
exports.UpdateAttendenceRequests = exports.UpdateAttendenceReason = exports.UpdateAttendenceStatus = void 0;
|
|
13
|
+
const typeorm_1 = require("typeorm");
|
|
14
|
+
const BaseModel_1 = require("./BaseModel");
|
|
15
|
+
var UpdateAttendenceStatus;
|
|
16
|
+
(function (UpdateAttendenceStatus) {
|
|
17
|
+
UpdateAttendenceStatus["PENDING"] = "Pending";
|
|
18
|
+
UpdateAttendenceStatus["ASSIGNED"] = "Assigned";
|
|
19
|
+
UpdateAttendenceStatus["IN_PROGRESS"] = "In Progress";
|
|
20
|
+
UpdateAttendenceStatus["APPROVED"] = "Approved";
|
|
21
|
+
UpdateAttendenceStatus["REJECTED"] = "Rejected";
|
|
22
|
+
})(UpdateAttendenceStatus || (exports.UpdateAttendenceStatus = UpdateAttendenceStatus = {}));
|
|
23
|
+
var UpdateAttendenceReason;
|
|
24
|
+
(function (UpdateAttendenceReason) {
|
|
25
|
+
UpdateAttendenceReason["MEETING"] = "Meeting";
|
|
26
|
+
UpdateAttendenceReason["EARLY_CHECKOUT"] = "Early Checkout";
|
|
27
|
+
UpdateAttendenceReason["SPECIAL_REASON"] = "Special Reason";
|
|
28
|
+
})(UpdateAttendenceReason || (exports.UpdateAttendenceReason = UpdateAttendenceReason = {}));
|
|
29
|
+
let UpdateAttendenceRequests = class UpdateAttendenceRequests extends BaseModel_1.BaseModel {
|
|
30
|
+
};
|
|
31
|
+
exports.UpdateAttendenceRequests = UpdateAttendenceRequests;
|
|
32
|
+
__decorate([
|
|
33
|
+
(0, typeorm_1.Column)({ type: 'int', nullable: true }),
|
|
34
|
+
__metadata("design:type", Object)
|
|
35
|
+
], UpdateAttendenceRequests.prototype, "req_user_department_id", void 0);
|
|
36
|
+
__decorate([
|
|
37
|
+
(0, typeorm_1.Column)({ type: 'int', nullable: true }),
|
|
38
|
+
__metadata("design:type", Object)
|
|
39
|
+
], UpdateAttendenceRequests.prototype, "req_user_section_id", void 0);
|
|
40
|
+
__decorate([
|
|
41
|
+
(0, typeorm_1.Column)({ type: 'int', nullable: true }),
|
|
42
|
+
__metadata("design:type", Object)
|
|
43
|
+
], UpdateAttendenceRequests.prototype, "service_id", void 0);
|
|
44
|
+
__decorate([
|
|
45
|
+
(0, typeorm_1.Column)({ type: 'int', nullable: true }),
|
|
46
|
+
__metadata("design:type", Object)
|
|
47
|
+
], UpdateAttendenceRequests.prototype, "sub_service_id", void 0);
|
|
48
|
+
__decorate([
|
|
49
|
+
(0, typeorm_1.Column)({ type: 'int', nullable: false }),
|
|
50
|
+
__metadata("design:type", Number)
|
|
51
|
+
], UpdateAttendenceRequests.prototype, "user_id", void 0);
|
|
52
|
+
__decorate([
|
|
53
|
+
(0, typeorm_1.Column)({ type: 'date', nullable: true }),
|
|
54
|
+
__metadata("design:type", Object)
|
|
55
|
+
], UpdateAttendenceRequests.prototype, "from_date", void 0);
|
|
56
|
+
__decorate([
|
|
57
|
+
(0, typeorm_1.Column)({ type: 'date', nullable: true }),
|
|
58
|
+
__metadata("design:type", Object)
|
|
59
|
+
], UpdateAttendenceRequests.prototype, "to_date", void 0);
|
|
60
|
+
__decorate([
|
|
61
|
+
(0, typeorm_1.Column)({ type: 'time', nullable: true }),
|
|
62
|
+
__metadata("design:type", Object)
|
|
63
|
+
], UpdateAttendenceRequests.prototype, "from_time", void 0);
|
|
64
|
+
__decorate([
|
|
65
|
+
(0, typeorm_1.Column)({ type: 'time', nullable: true }),
|
|
66
|
+
__metadata("design:type", Object)
|
|
67
|
+
], UpdateAttendenceRequests.prototype, "to_time", void 0);
|
|
68
|
+
__decorate([
|
|
69
|
+
(0, typeorm_1.Column)({ type: 'enum', enum: UpdateAttendenceReason, nullable: false }),
|
|
70
|
+
__metadata("design:type", String)
|
|
71
|
+
], UpdateAttendenceRequests.prototype, "reason", void 0);
|
|
72
|
+
__decorate([
|
|
73
|
+
(0, typeorm_1.Column)({ type: 'varchar', length: 500, nullable: true }),
|
|
74
|
+
__metadata("design:type", Object)
|
|
75
|
+
], UpdateAttendenceRequests.prototype, "comments", void 0);
|
|
76
|
+
__decorate([
|
|
77
|
+
(0, typeorm_1.Column)({ type: 'enum', enum: UpdateAttendenceStatus, default: UpdateAttendenceStatus.PENDING, nullable: false }),
|
|
78
|
+
__metadata("design:type", String)
|
|
79
|
+
], UpdateAttendenceRequests.prototype, "status", void 0);
|
|
80
|
+
__decorate([
|
|
81
|
+
(0, typeorm_1.Column)({ type: 'varchar', nullable: true }),
|
|
82
|
+
__metadata("design:type", Object)
|
|
83
|
+
], UpdateAttendenceRequests.prototype, "workflow_execution_id", void 0);
|
|
84
|
+
exports.UpdateAttendenceRequests = UpdateAttendenceRequests = __decorate([
|
|
85
|
+
(0, typeorm_1.Entity)({ name: 'update_attendence_requests' })
|
|
86
|
+
], UpdateAttendenceRequests);
|
package/dist/models/user.d.ts
CHANGED
|
@@ -42,5 +42,6 @@ export declare class User extends BaseModel {
|
|
|
42
42
|
children2_name?: string;
|
|
43
43
|
language_preferences?: string;
|
|
44
44
|
category: "FM" | "Embassy";
|
|
45
|
-
|
|
45
|
+
mandc_number: number;
|
|
46
|
+
constructor(employee_id?: number, employee_name?: string, employee_arabic_name?: string, date_of_birth?: string, region_of_birth?: string, country_of_birth?: string, date_of_joining?: string, last_promotion_date?: string, gender?: string, marital_status?: string, nationality?: string, email?: string, blood_group?: string, national_id?: number, mobile?: string, office_number?: string, department?: number, section?: number, grade?: number, location?: string, country?: string, is_admin?: boolean, division?: number, reporting_to?: number, address?: string, residential_status?: string, religion?: string, designation?: number, avatar?: string, passport_number?: string, personal_email?: string, extension_number?: number, fax_number?: string, diplomatic_name?: string, civil_employee_id?: number, qualification?: string, father_name?: string, spouse_name?: string, children1_name?: string, children2_name?: string, language_preferences?: string, category?: "FM" | "Embassy", mandc_number?: number);
|
|
46
47
|
}
|
package/dist/models/user.js
CHANGED
|
@@ -13,7 +13,7 @@ exports.User = void 0;
|
|
|
13
13
|
const typeorm_1 = require("typeorm");
|
|
14
14
|
const BaseModel_1 = require("./BaseModel");
|
|
15
15
|
let User = class User extends BaseModel_1.BaseModel {
|
|
16
|
-
constructor(employee_id, employee_name, employee_arabic_name, date_of_birth, region_of_birth, country_of_birth, date_of_joining, last_promotion_date, gender, marital_status, nationality, email, blood_group, national_id, mobile, office_number, department, section, grade, location, country, is_admin, division, reporting_to, address, residential_status, religion, designation, avatar, passport_number, personal_email, extension_number, fax_number, diplomatic_name, civil_employee_id, qualification, father_name, spouse_name, children1_name, children2_name, language_preferences, category) {
|
|
16
|
+
constructor(employee_id, employee_name, employee_arabic_name, date_of_birth, region_of_birth, country_of_birth, date_of_joining, last_promotion_date, gender, marital_status, nationality, email, blood_group, national_id, mobile, office_number, department, section, grade, location, country, is_admin, division, reporting_to, address, residential_status, religion, designation, avatar, passport_number, personal_email, extension_number, fax_number, diplomatic_name, civil_employee_id, qualification, father_name, spouse_name, children1_name, children2_name, language_preferences, category, mandc_number) {
|
|
17
17
|
super();
|
|
18
18
|
this.employee_id = employee_id;
|
|
19
19
|
this.employee_name = employee_name;
|
|
@@ -57,6 +57,7 @@ let User = class User extends BaseModel_1.BaseModel {
|
|
|
57
57
|
this.children2_name = children2_name;
|
|
58
58
|
this.language_preferences = language_preferences;
|
|
59
59
|
this.category = category || "FM";
|
|
60
|
+
this.mandc_number = mandc_number || 0;
|
|
60
61
|
}
|
|
61
62
|
};
|
|
62
63
|
exports.User = User;
|
|
@@ -228,7 +229,11 @@ __decorate([
|
|
|
228
229
|
(0, typeorm_1.Column)({ type: "enum", enum: ["FM", "Embassy"], nullable: false, default: "FM" }),
|
|
229
230
|
__metadata("design:type", String)
|
|
230
231
|
], User.prototype, "category", void 0);
|
|
232
|
+
__decorate([
|
|
233
|
+
(0, typeorm_1.Column)({ type: "int", nullable: true, default: 0 }),
|
|
234
|
+
__metadata("design:type", Number)
|
|
235
|
+
], User.prototype, "mandc_number", void 0);
|
|
231
236
|
exports.User = User = __decorate([
|
|
232
237
|
(0, typeorm_1.Entity)({ name: 'users' }),
|
|
233
|
-
__metadata("design:paramtypes", [Number, String, String, String, String, String, String, String, String, String, String, String, String, Number, String, String, Number, Number, Number, String, String, Boolean, Number, Number, String, String, String, Number, String, String, String, Number, String, String, Number, String, String, String, String, String, String, String])
|
|
238
|
+
__metadata("design:paramtypes", [Number, String, String, String, String, String, String, String, String, String, String, String, String, Number, String, String, Number, Number, Number, String, String, Boolean, Number, Number, String, String, String, Number, String, String, String, Number, String, String, Number, String, String, String, String, String, String, String, Number])
|
|
234
239
|
], User);
|
package/package.json
CHANGED
|
@@ -42,7 +42,10 @@ export class LeaveApprovalDetails extends BaseModel {
|
|
|
42
42
|
@Column({ type: 'enum', enum: ApprovalStatus,default: ApprovalStatus.PENDING, nullable: false })
|
|
43
43
|
approval_status: ApprovalStatus;
|
|
44
44
|
|
|
45
|
-
|
|
45
|
+
@Column({ type: 'boolean', default: true, nullable: false })
|
|
46
|
+
is_allowed: boolean;
|
|
47
|
+
|
|
48
|
+
constructor(leave_request_id: number, approver_user_id: number, approver_role_id: number, comment: string, approval_status: ApprovalStatus, level: number, department_id: number, section_id: number, is_allowed: boolean) {
|
|
46
49
|
super();
|
|
47
50
|
this.leave_request_id = leave_request_id;
|
|
48
51
|
this.approver_user_id = approver_user_id;
|
|
@@ -52,5 +55,6 @@ export class LeaveApprovalDetails extends BaseModel {
|
|
|
52
55
|
this.comment = comment;
|
|
53
56
|
this.approval_status = approval_status;
|
|
54
57
|
this.level = level;
|
|
58
|
+
this.is_allowed = is_allowed;
|
|
55
59
|
}
|
|
56
60
|
}
|
|
@@ -45,6 +45,9 @@ export class UpdateAttendanceApprovalDetails extends BaseModel {
|
|
|
45
45
|
|
|
46
46
|
@Column({ type: 'enum', enum: UpdateAttendanceApprovalStatus, default: UpdateAttendanceApprovalStatus.PENDING, nullable: false })
|
|
47
47
|
approval_status: UpdateAttendanceApprovalStatus;
|
|
48
|
+
|
|
49
|
+
@Column({ type: 'boolean', default: true, nullable: false })
|
|
50
|
+
is_allowed: boolean;
|
|
48
51
|
}
|
|
49
52
|
|
|
50
53
|
|
package/src/models/user.ts
CHANGED
|
@@ -132,6 +132,9 @@ export class User extends BaseModel {
|
|
|
132
132
|
@Column({ type: "enum", enum: ["FM", "Embassy"], nullable: false, default: "FM" })
|
|
133
133
|
category: "FM" | "Embassy"; // Mandatory
|
|
134
134
|
|
|
135
|
+
@Column({ type: "int", nullable: true , default: 0})
|
|
136
|
+
mandc_number: number;
|
|
137
|
+
|
|
135
138
|
constructor(
|
|
136
139
|
employee_id?: number,
|
|
137
140
|
employee_name?: string,
|
|
@@ -175,6 +178,7 @@ export class User extends BaseModel {
|
|
|
175
178
|
children2_name?: string,
|
|
176
179
|
language_preferences?: string,
|
|
177
180
|
category?: "FM" | "Embassy",
|
|
181
|
+
mandc_number?: number,
|
|
178
182
|
) {
|
|
179
183
|
super();
|
|
180
184
|
this.employee_id = employee_id;
|
|
@@ -219,5 +223,6 @@ export class User extends BaseModel {
|
|
|
219
223
|
this.children2_name = children2_name;
|
|
220
224
|
this.language_preferences = language_preferences;
|
|
221
225
|
this.category = category || "FM";
|
|
226
|
+
this.mandc_number = mandc_number || 0;
|
|
222
227
|
}
|
|
223
228
|
}
|