@platform-modules/foreign-ministry 1.0.88 → 1.0.90
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/data-source.js +25 -1
- package/dist/index.d.ts +12 -0
- package/dist/index.js +12 -0
- package/dist/models/FinancialApprovalsModel.d.ts +6 -6
- package/dist/models/FinancialApprovalsModel.js +6 -6
- package/dist/models/FinancialRequestsModel.d.ts +12 -12
- package/dist/models/FinancialRequestsModel.js +12 -12
- package/package.json +1 -1
- package/src/data-source.ts +27 -1
- package/src/index.ts +12 -0
- package/src/models/FinancialApprovalsModel.ts +8 -8
- package/src/models/FinancialRequestsModel.ts +15 -15
package/dist/data-source.js
CHANGED
|
@@ -54,6 +54,18 @@ const userRolesModel_1 = require("./models/userRolesModel");
|
|
|
54
54
|
const roleRightsModel_1 = require("./models/roleRightsModel");
|
|
55
55
|
const PortalFeedbackModel_1 = require("./models/PortalFeedbackModel");
|
|
56
56
|
const NotificationModel_1 = require("./models/NotificationModel");
|
|
57
|
+
const FinancialRequestsModel_1 = require("./models/FinancialRequestsModel");
|
|
58
|
+
const FinancialApprovalsModel_1 = require("./models/FinancialApprovalsModel");
|
|
59
|
+
const FinancialSettingsModel_1 = require("./models/FinancialSettingsModel");
|
|
60
|
+
const PayslipRequestsModel_1 = require("./models/PayslipRequestsModel");
|
|
61
|
+
const SalaryCertificateRequestsModel_1 = require("./models/SalaryCertificateRequestsModel");
|
|
62
|
+
const AllowanceRequestsModel_1 = require("./models/AllowanceRequestsModel");
|
|
63
|
+
const ReimbursementRequestsModel_1 = require("./models/ReimbursementRequestsModel");
|
|
64
|
+
const BankAccountChangeRequestsModel_1 = require("./models/BankAccountChangeRequestsModel");
|
|
65
|
+
const FinancialChatsModel_1 = require("./models/FinancialChatsModel");
|
|
66
|
+
const FinancialWorkFlowModel_1 = require("./models/FinancialWorkFlowModel");
|
|
67
|
+
const FinancialAttachmentsModel_1 = require("./models/FinancialAttachmentsModel");
|
|
68
|
+
const RequestTypeMasterModel_1 = require("./models/RequestTypeMasterModel");
|
|
57
69
|
exports.AppDataSource = new typeorm_1.DataSource({
|
|
58
70
|
type: 'postgres',
|
|
59
71
|
host: process.env.DB_HOST || 'localhost',
|
|
@@ -112,6 +124,18 @@ exports.AppDataSource = new typeorm_1.DataSource({
|
|
|
112
124
|
userRolesModel_1.UserRole,
|
|
113
125
|
roleRightsModel_1.RoleRights,
|
|
114
126
|
PortalFeedbackModel_1.PortalFeedback,
|
|
115
|
-
NotificationModel_1.Notification
|
|
127
|
+
NotificationModel_1.Notification,
|
|
128
|
+
FinancialRequestsModel_1.FinancialRequests,
|
|
129
|
+
FinancialApprovalsModel_1.FinancialApprovals,
|
|
130
|
+
FinancialSettingsModel_1.FinancialSettings,
|
|
131
|
+
PayslipRequestsModel_1.PayslipRequests,
|
|
132
|
+
SalaryCertificateRequestsModel_1.SalaryCertificateRequests,
|
|
133
|
+
AllowanceRequestsModel_1.AllowanceRequests,
|
|
134
|
+
ReimbursementRequestsModel_1.ReimbursementRequests,
|
|
135
|
+
BankAccountChangeRequestsModel_1.BankAccountChangeRequests,
|
|
136
|
+
FinancialChatsModel_1.FinancialChats,
|
|
137
|
+
FinancialWorkFlowModel_1.FinancialWorkFlow,
|
|
138
|
+
FinancialAttachmentsModel_1.FinancialAttachments,
|
|
139
|
+
RequestTypeMasterModel_1.RequestTypeMaster,
|
|
116
140
|
],
|
|
117
141
|
});
|
package/dist/index.d.ts
CHANGED
|
@@ -47,3 +47,15 @@ export * from './models/userRolesModel';
|
|
|
47
47
|
export * from './models/roleRightsModel';
|
|
48
48
|
export * from './models/PortalFeedbackModel';
|
|
49
49
|
export * from './models/NotificationModel';
|
|
50
|
+
export * from './models/FinancialRequestsModel';
|
|
51
|
+
export * from './models/FinancialApprovalsModel';
|
|
52
|
+
export * from './models/FinancialSettingsModel';
|
|
53
|
+
export * from './models/PayslipRequestsModel';
|
|
54
|
+
export * from './models/SalaryCertificateRequestsModel';
|
|
55
|
+
export * from './models/AllowanceRequestsModel';
|
|
56
|
+
export * from './models/ReimbursementRequestsModel';
|
|
57
|
+
export * from './models/BankAccountChangeRequestsModel';
|
|
58
|
+
export * from './models/FinancialChatsModel';
|
|
59
|
+
export * from './models/FinancialAttachmentsModel';
|
|
60
|
+
export * from './models/FinancialWorkFlowModel';
|
|
61
|
+
export * from './models/RequestTypeMasterModel';
|
package/dist/index.js
CHANGED
|
@@ -63,3 +63,15 @@ __exportStar(require("./models/userRolesModel"), exports);
|
|
|
63
63
|
__exportStar(require("./models/roleRightsModel"), exports);
|
|
64
64
|
__exportStar(require("./models/PortalFeedbackModel"), exports);
|
|
65
65
|
__exportStar(require("./models/NotificationModel"), exports);
|
|
66
|
+
__exportStar(require("./models/FinancialRequestsModel"), exports);
|
|
67
|
+
__exportStar(require("./models/FinancialApprovalsModel"), exports);
|
|
68
|
+
__exportStar(require("./models/FinancialSettingsModel"), exports);
|
|
69
|
+
__exportStar(require("./models/PayslipRequestsModel"), exports);
|
|
70
|
+
__exportStar(require("./models/SalaryCertificateRequestsModel"), exports);
|
|
71
|
+
__exportStar(require("./models/AllowanceRequestsModel"), exports);
|
|
72
|
+
__exportStar(require("./models/ReimbursementRequestsModel"), exports);
|
|
73
|
+
__exportStar(require("./models/BankAccountChangeRequestsModel"), exports);
|
|
74
|
+
__exportStar(require("./models/FinancialChatsModel"), exports);
|
|
75
|
+
__exportStar(require("./models/FinancialAttachmentsModel"), exports);
|
|
76
|
+
__exportStar(require("./models/FinancialWorkFlowModel"), exports);
|
|
77
|
+
__exportStar(require("./models/RequestTypeMasterModel"), exports);
|
|
@@ -9,14 +9,14 @@ export declare enum FinancialApprovalStatus {
|
|
|
9
9
|
export declare class FinancialApprovals extends BaseModel {
|
|
10
10
|
financial_request_id: number;
|
|
11
11
|
level: number;
|
|
12
|
-
approver_user_id: number;
|
|
12
|
+
approver_user_id: number | null;
|
|
13
13
|
approver_role_id: number;
|
|
14
|
-
comment: string;
|
|
14
|
+
comment: string | null;
|
|
15
15
|
approval_status: FinancialApprovalStatus;
|
|
16
16
|
action_date: Date;
|
|
17
|
-
department_id: number;
|
|
18
|
-
section_id: number;
|
|
19
|
-
approved_by: number;
|
|
17
|
+
department_id: number | null;
|
|
18
|
+
section_id: number | null;
|
|
19
|
+
approved_by: number | null;
|
|
20
20
|
financialRequest?: FinancialRequests;
|
|
21
|
-
constructor(financial_request_id: number, level: number, approver_role_id: number, approval_status: FinancialApprovalStatus, department_id: number, section_id: number, approved_by: number);
|
|
21
|
+
constructor(financial_request_id: number, level: number, approver_role_id: number, approval_status: FinancialApprovalStatus, department_id: number | null, section_id: number | null, approved_by: number | null);
|
|
22
22
|
}
|
|
@@ -43,7 +43,7 @@ __decorate([
|
|
|
43
43
|
], FinancialApprovals.prototype, "level", void 0);
|
|
44
44
|
__decorate([
|
|
45
45
|
(0, typeorm_1.Column)({ type: 'int', nullable: true }),
|
|
46
|
-
__metadata("design:type",
|
|
46
|
+
__metadata("design:type", Object)
|
|
47
47
|
], FinancialApprovals.prototype, "approver_user_id", void 0);
|
|
48
48
|
__decorate([
|
|
49
49
|
(0, typeorm_1.Column)({ type: 'int' }),
|
|
@@ -51,7 +51,7 @@ __decorate([
|
|
|
51
51
|
], FinancialApprovals.prototype, "approver_role_id", void 0);
|
|
52
52
|
__decorate([
|
|
53
53
|
(0, typeorm_1.Column)({ type: 'text', nullable: true }),
|
|
54
|
-
__metadata("design:type",
|
|
54
|
+
__metadata("design:type", Object)
|
|
55
55
|
], FinancialApprovals.prototype, "comment", void 0);
|
|
56
56
|
__decorate([
|
|
57
57
|
(0, typeorm_1.Column)({ type: 'enum', enum: FinancialApprovalStatus, default: FinancialApprovalStatus.PENDING }),
|
|
@@ -63,15 +63,15 @@ __decorate([
|
|
|
63
63
|
], FinancialApprovals.prototype, "action_date", void 0);
|
|
64
64
|
__decorate([
|
|
65
65
|
(0, typeorm_1.Column)({ type: 'int', nullable: true }),
|
|
66
|
-
__metadata("design:type",
|
|
66
|
+
__metadata("design:type", Object)
|
|
67
67
|
], FinancialApprovals.prototype, "department_id", void 0);
|
|
68
68
|
__decorate([
|
|
69
69
|
(0, typeorm_1.Column)({ type: 'int', nullable: true }),
|
|
70
|
-
__metadata("design:type",
|
|
70
|
+
__metadata("design:type", Object)
|
|
71
71
|
], FinancialApprovals.prototype, "section_id", void 0);
|
|
72
72
|
__decorate([
|
|
73
73
|
(0, typeorm_1.Column)({ type: 'int', nullable: true }),
|
|
74
|
-
__metadata("design:type",
|
|
74
|
+
__metadata("design:type", Object)
|
|
75
75
|
], FinancialApprovals.prototype, "approved_by", void 0);
|
|
76
76
|
__decorate([
|
|
77
77
|
(0, typeorm_1.ManyToOne)(() => FinancialRequestsModel_1.FinancialRequests, fr => fr.approvals),
|
|
@@ -80,5 +80,5 @@ __decorate([
|
|
|
80
80
|
], FinancialApprovals.prototype, "financialRequest", void 0);
|
|
81
81
|
exports.FinancialApprovals = FinancialApprovals = __decorate([
|
|
82
82
|
(0, typeorm_1.Entity)({ name: 'financial_approvals' }),
|
|
83
|
-
__metadata("design:paramtypes", [Number, Number, Number, String,
|
|
83
|
+
__metadata("design:paramtypes", [Number, Number, Number, String, Object, Object, Object])
|
|
84
84
|
], FinancialApprovals);
|
|
@@ -23,22 +23,22 @@ export declare class FinancialRequests extends BaseModel {
|
|
|
23
23
|
user_id: number;
|
|
24
24
|
employee_id: string;
|
|
25
25
|
employee_name: string;
|
|
26
|
-
grade: string;
|
|
27
|
-
designation_id: number;
|
|
28
|
-
department_id: number;
|
|
26
|
+
grade: string | null;
|
|
27
|
+
designation_id: number | null;
|
|
28
|
+
department_id: number | null;
|
|
29
29
|
email_address: string;
|
|
30
30
|
contact_number: string;
|
|
31
31
|
request_type_id: number;
|
|
32
32
|
request_date: Date;
|
|
33
33
|
request_status: FinancialRequestStatus;
|
|
34
|
-
request_close_date: Date;
|
|
35
|
-
remarks: string;
|
|
36
|
-
current_approval_level: number;
|
|
37
|
-
current_approver_id: number;
|
|
38
|
-
service_id: number;
|
|
39
|
-
sub_service_id: number;
|
|
40
|
-
section_id: number;
|
|
41
|
-
reporting_manager: number;
|
|
34
|
+
request_close_date: Date | null;
|
|
35
|
+
remarks: string | null;
|
|
36
|
+
current_approval_level: number | null;
|
|
37
|
+
current_approver_id: number | null;
|
|
38
|
+
service_id: number | null;
|
|
39
|
+
sub_service_id: number | null;
|
|
40
|
+
section_id: number | null;
|
|
41
|
+
reporting_manager: number | null;
|
|
42
42
|
payslipRequest?: PayslipRequests;
|
|
43
43
|
salaryCertificateRequest?: SalaryCertificateRequests;
|
|
44
44
|
allowanceRequest?: AllowanceRequests;
|
|
@@ -49,5 +49,5 @@ export declare class FinancialRequests extends BaseModel {
|
|
|
49
49
|
workflows?: FinancialWorkFlow[];
|
|
50
50
|
attachments?: FinancialAttachments[];
|
|
51
51
|
requestType?: RequestTypeMaster;
|
|
52
|
-
constructor(user_id: number, employee_id: string, employee_name: string, email_address: string, contact_number: string, request_type_id: number, service_id: number, sub_service_id: number, section_id: number, reporting_manager: number);
|
|
52
|
+
constructor(user_id: number, employee_id: string, employee_name: string, email_address: string, contact_number: string, request_type_id: number, service_id: number | null, sub_service_id: number | null, section_id: number | null, reporting_manager: number | null);
|
|
53
53
|
}
|
|
@@ -55,15 +55,15 @@ __decorate([
|
|
|
55
55
|
], FinancialRequests.prototype, "employee_name", void 0);
|
|
56
56
|
__decorate([
|
|
57
57
|
(0, typeorm_1.Column)({ type: 'varchar', length: 100, nullable: true }),
|
|
58
|
-
__metadata("design:type",
|
|
58
|
+
__metadata("design:type", Object)
|
|
59
59
|
], FinancialRequests.prototype, "grade", void 0);
|
|
60
60
|
__decorate([
|
|
61
61
|
(0, typeorm_1.Column)({ type: 'int', nullable: true }),
|
|
62
|
-
__metadata("design:type",
|
|
62
|
+
__metadata("design:type", Object)
|
|
63
63
|
], FinancialRequests.prototype, "designation_id", void 0);
|
|
64
64
|
__decorate([
|
|
65
65
|
(0, typeorm_1.Column)({ type: 'int', nullable: true }),
|
|
66
|
-
__metadata("design:type",
|
|
66
|
+
__metadata("design:type", Object)
|
|
67
67
|
], FinancialRequests.prototype, "department_id", void 0);
|
|
68
68
|
__decorate([
|
|
69
69
|
(0, typeorm_1.Column)({ type: 'varchar', length: 255 }),
|
|
@@ -87,35 +87,35 @@ __decorate([
|
|
|
87
87
|
], FinancialRequests.prototype, "request_status", void 0);
|
|
88
88
|
__decorate([
|
|
89
89
|
(0, typeorm_1.Column)({ type: 'timestamp', nullable: true }),
|
|
90
|
-
__metadata("design:type",
|
|
90
|
+
__metadata("design:type", Object)
|
|
91
91
|
], FinancialRequests.prototype, "request_close_date", void 0);
|
|
92
92
|
__decorate([
|
|
93
93
|
(0, typeorm_1.Column)({ type: 'text', nullable: true }),
|
|
94
|
-
__metadata("design:type",
|
|
94
|
+
__metadata("design:type", Object)
|
|
95
95
|
], FinancialRequests.prototype, "remarks", void 0);
|
|
96
96
|
__decorate([
|
|
97
97
|
(0, typeorm_1.Column)({ type: 'int', nullable: true }),
|
|
98
|
-
__metadata("design:type",
|
|
98
|
+
__metadata("design:type", Object)
|
|
99
99
|
], FinancialRequests.prototype, "current_approval_level", void 0);
|
|
100
100
|
__decorate([
|
|
101
101
|
(0, typeorm_1.Column)({ type: 'int', nullable: true }),
|
|
102
|
-
__metadata("design:type",
|
|
102
|
+
__metadata("design:type", Object)
|
|
103
103
|
], FinancialRequests.prototype, "current_approver_id", void 0);
|
|
104
104
|
__decorate([
|
|
105
105
|
(0, typeorm_1.Column)({ type: 'int', nullable: true }),
|
|
106
|
-
__metadata("design:type",
|
|
106
|
+
__metadata("design:type", Object)
|
|
107
107
|
], FinancialRequests.prototype, "service_id", void 0);
|
|
108
108
|
__decorate([
|
|
109
109
|
(0, typeorm_1.Column)({ type: 'int', nullable: true }),
|
|
110
|
-
__metadata("design:type",
|
|
110
|
+
__metadata("design:type", Object)
|
|
111
111
|
], FinancialRequests.prototype, "sub_service_id", void 0);
|
|
112
112
|
__decorate([
|
|
113
113
|
(0, typeorm_1.Column)({ type: 'int', nullable: true }),
|
|
114
|
-
__metadata("design:type",
|
|
114
|
+
__metadata("design:type", Object)
|
|
115
115
|
], FinancialRequests.prototype, "section_id", void 0);
|
|
116
116
|
__decorate([
|
|
117
117
|
(0, typeorm_1.Column)({ type: 'int', nullable: true }),
|
|
118
|
-
__metadata("design:type",
|
|
118
|
+
__metadata("design:type", Object)
|
|
119
119
|
], FinancialRequests.prototype, "reporting_manager", void 0);
|
|
120
120
|
__decorate([
|
|
121
121
|
(0, typeorm_1.OneToOne)('PayslipRequests', 'financialRequest', { nullable: true }),
|
|
@@ -160,5 +160,5 @@ __decorate([
|
|
|
160
160
|
], FinancialRequests.prototype, "requestType", void 0);
|
|
161
161
|
exports.FinancialRequests = FinancialRequests = __decorate([
|
|
162
162
|
(0, typeorm_1.Entity)({ name: 'financial_requests' }),
|
|
163
|
-
__metadata("design:paramtypes", [Number, String, String, String, String, Number,
|
|
163
|
+
__metadata("design:paramtypes", [Number, String, String, String, String, Number, Object, Object, Object, Object])
|
|
164
164
|
], FinancialRequests);
|
package/package.json
CHANGED
package/src/data-source.ts
CHANGED
|
@@ -56,6 +56,20 @@ import { RoleRights } from './models/roleRightsModel';
|
|
|
56
56
|
import { PortalFeedback } from './models/PortalFeedbackModel';
|
|
57
57
|
import { Notification } from './models/NotificationModel';
|
|
58
58
|
|
|
59
|
+
import { FinancialRequests } from './models/FinancialRequestsModel';
|
|
60
|
+
import { FinancialApprovals } from './models/FinancialApprovalsModel';
|
|
61
|
+
import { FinancialSettings } from './models/FinancialSettingsModel';
|
|
62
|
+
import { PayslipRequests } from './models/PayslipRequestsModel';
|
|
63
|
+
import { SalaryCertificateRequests } from './models/SalaryCertificateRequestsModel';
|
|
64
|
+
import { AllowanceRequests } from './models/AllowanceRequestsModel';
|
|
65
|
+
import { ReimbursementRequests } from './models/ReimbursementRequestsModel';
|
|
66
|
+
import { BankAccountChangeRequests } from './models/BankAccountChangeRequestsModel';
|
|
67
|
+
import { FinancialChats } from './models/FinancialChatsModel';
|
|
68
|
+
import { FinancialWorkFlow } from './models/FinancialWorkFlowModel';
|
|
69
|
+
import { FinancialAttachments } from './models/FinancialAttachmentsModel';
|
|
70
|
+
import { RequestTypeMaster } from './models/RequestTypeMasterModel';
|
|
71
|
+
|
|
72
|
+
|
|
59
73
|
|
|
60
74
|
export const AppDataSource = new DataSource({
|
|
61
75
|
type: 'postgres',
|
|
@@ -115,6 +129,18 @@ export const AppDataSource = new DataSource({
|
|
|
115
129
|
UserRole,
|
|
116
130
|
RoleRights,
|
|
117
131
|
PortalFeedback,
|
|
118
|
-
Notification
|
|
132
|
+
Notification,
|
|
133
|
+
FinancialRequests,
|
|
134
|
+
FinancialApprovals,
|
|
135
|
+
FinancialSettings,
|
|
136
|
+
PayslipRequests,
|
|
137
|
+
SalaryCertificateRequests,
|
|
138
|
+
AllowanceRequests,
|
|
139
|
+
ReimbursementRequests,
|
|
140
|
+
BankAccountChangeRequests,
|
|
141
|
+
FinancialChats,
|
|
142
|
+
FinancialWorkFlow,
|
|
143
|
+
FinancialAttachments,
|
|
144
|
+
RequestTypeMaster,
|
|
119
145
|
],
|
|
120
146
|
});
|
package/src/index.ts
CHANGED
|
@@ -47,3 +47,15 @@ export * from './models/userRolesModel';
|
|
|
47
47
|
export * from './models/roleRightsModel';
|
|
48
48
|
export * from './models/PortalFeedbackModel';
|
|
49
49
|
export * from './models/NotificationModel';
|
|
50
|
+
export * from './models/FinancialRequestsModel';
|
|
51
|
+
export * from './models/FinancialApprovalsModel';
|
|
52
|
+
export * from './models/FinancialSettingsModel';
|
|
53
|
+
export * from './models/PayslipRequestsModel';
|
|
54
|
+
export * from './models/SalaryCertificateRequestsModel';
|
|
55
|
+
export * from './models/AllowanceRequestsModel';
|
|
56
|
+
export * from './models/ReimbursementRequestsModel';
|
|
57
|
+
export * from './models/BankAccountChangeRequestsModel';
|
|
58
|
+
export * from './models/FinancialChatsModel';
|
|
59
|
+
export * from './models/FinancialAttachmentsModel';
|
|
60
|
+
export * from './models/FinancialWorkFlowModel';
|
|
61
|
+
export * from './models/RequestTypeMasterModel';
|
|
@@ -18,13 +18,13 @@ export class FinancialApprovals extends BaseModel {
|
|
|
18
18
|
level: number;
|
|
19
19
|
|
|
20
20
|
@Column({ type: 'int', nullable: true })
|
|
21
|
-
approver_user_id: number;
|
|
21
|
+
approver_user_id: number | null;
|
|
22
22
|
|
|
23
23
|
@Column({ type: 'int' })
|
|
24
24
|
approver_role_id: number;
|
|
25
25
|
|
|
26
26
|
@Column({ type: 'text', nullable: true })
|
|
27
|
-
comment: string;
|
|
27
|
+
comment: string | null;
|
|
28
28
|
|
|
29
29
|
@Column({ type: 'enum', enum: FinancialApprovalStatus, default: FinancialApprovalStatus.PENDING })
|
|
30
30
|
approval_status: FinancialApprovalStatus;
|
|
@@ -33,13 +33,13 @@ export class FinancialApprovals extends BaseModel {
|
|
|
33
33
|
action_date: Date;
|
|
34
34
|
|
|
35
35
|
@Column({ type: 'int', nullable: true })
|
|
36
|
-
department_id: number;
|
|
36
|
+
department_id: number | null;
|
|
37
37
|
|
|
38
38
|
@Column({ type: 'int', nullable: true })
|
|
39
|
-
section_id: number;
|
|
39
|
+
section_id: number | null;
|
|
40
40
|
|
|
41
41
|
@Column({ type: 'int', nullable: true })
|
|
42
|
-
approved_by: number;
|
|
42
|
+
approved_by: number | null;
|
|
43
43
|
|
|
44
44
|
@ManyToOne(() => FinancialRequests, fr => fr.approvals)
|
|
45
45
|
@JoinColumn({ name: 'financial_request_id' })
|
|
@@ -50,9 +50,9 @@ export class FinancialApprovals extends BaseModel {
|
|
|
50
50
|
level: number,
|
|
51
51
|
approver_role_id: number,
|
|
52
52
|
approval_status: FinancialApprovalStatus,
|
|
53
|
-
department_id: number,
|
|
54
|
-
section_id: number,
|
|
55
|
-
approved_by: number
|
|
53
|
+
department_id: number | null,
|
|
54
|
+
section_id: number | null,
|
|
55
|
+
approved_by: number | null
|
|
56
56
|
) {
|
|
57
57
|
super();
|
|
58
58
|
this.financial_request_id = financial_request_id;
|
|
@@ -36,13 +36,13 @@ export class FinancialRequests extends BaseModel {
|
|
|
36
36
|
employee_name: string;
|
|
37
37
|
|
|
38
38
|
@Column({ type: 'varchar', length: 100, nullable: true })
|
|
39
|
-
grade: string;
|
|
39
|
+
grade: string | null;
|
|
40
40
|
|
|
41
41
|
@Column({ type: 'int', nullable: true })
|
|
42
|
-
designation_id: number;
|
|
42
|
+
designation_id: number | null;
|
|
43
43
|
|
|
44
44
|
@Column({ type: 'int', nullable: true })
|
|
45
|
-
department_id: number;
|
|
45
|
+
department_id: number | null;
|
|
46
46
|
|
|
47
47
|
@Column({ type: 'varchar', length: 255 })
|
|
48
48
|
email_address: string;
|
|
@@ -60,28 +60,28 @@ export class FinancialRequests extends BaseModel {
|
|
|
60
60
|
request_status: FinancialRequestStatus;
|
|
61
61
|
|
|
62
62
|
@Column({ type: 'timestamp', nullable: true })
|
|
63
|
-
request_close_date: Date;
|
|
63
|
+
request_close_date: Date | null;
|
|
64
64
|
|
|
65
65
|
@Column({ type: 'text', nullable: true })
|
|
66
|
-
remarks: string;
|
|
66
|
+
remarks: string | null;
|
|
67
67
|
|
|
68
68
|
@Column({ type: 'int', nullable: true })
|
|
69
|
-
current_approval_level: number;
|
|
69
|
+
current_approval_level: number | null;
|
|
70
70
|
|
|
71
71
|
@Column({ type: 'int', nullable: true })
|
|
72
|
-
current_approver_id: number;
|
|
72
|
+
current_approver_id: number | null;
|
|
73
73
|
|
|
74
74
|
@Column({ type: 'int', nullable: true })
|
|
75
|
-
service_id: number;
|
|
75
|
+
service_id: number | null;
|
|
76
76
|
|
|
77
77
|
@Column({ type: 'int', nullable: true })
|
|
78
|
-
sub_service_id: number;
|
|
78
|
+
sub_service_id: number | null;
|
|
79
79
|
|
|
80
80
|
@Column({ type: 'int', nullable: true })
|
|
81
|
-
section_id: number;
|
|
81
|
+
section_id: number | null;
|
|
82
82
|
|
|
83
83
|
@Column({ type: 'int', nullable: true })
|
|
84
|
-
reporting_manager: number;
|
|
84
|
+
reporting_manager: number | null;
|
|
85
85
|
|
|
86
86
|
@OneToOne('PayslipRequests', 'financialRequest', { nullable: true })
|
|
87
87
|
payslipRequest?: PayslipRequests;
|
|
@@ -121,10 +121,10 @@ export class FinancialRequests extends BaseModel {
|
|
|
121
121
|
email_address: string,
|
|
122
122
|
contact_number: string,
|
|
123
123
|
request_type_id: number,
|
|
124
|
-
service_id: number,
|
|
125
|
-
sub_service_id: number,
|
|
126
|
-
section_id: number,
|
|
127
|
-
reporting_manager: number
|
|
124
|
+
service_id: number | null,
|
|
125
|
+
sub_service_id: number | null,
|
|
126
|
+
section_id: number | null,
|
|
127
|
+
reporting_manager: number | null
|
|
128
128
|
) {
|
|
129
129
|
super();
|
|
130
130
|
this.user_id = user_id;
|