@platform-modules/foreign-ministry 1.3.76 → 1.3.79

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.
Files changed (39) hide show
  1. package/dist/models/UserEmploymentDetailsModel.d.ts +2 -0
  2. package/dist/models/UserEmploymentDetailsModel.js +8 -0
  3. package/package.json +1 -1
  4. package/src/models/DiplomaticClubCardMembersModel.ts +75 -75
  5. package/src/models/DiplomaticClubSubscriptionMasterModel.ts +26 -26
  6. package/src/models/DiplomaticRequestsModel.ts +157 -157
  7. package/src/models/UserEmploymentDetailsModel.ts +6 -0
  8. package/dist/models/DiplomaticClubCardApprovalModel.d.ts +0 -16
  9. package/dist/models/DiplomaticClubCardApprovalModel.js +0 -58
  10. package/dist/models/DiplomaticClubCardAttachmentModel.d.ts +0 -9
  11. package/dist/models/DiplomaticClubCardAttachmentModel.js +0 -44
  12. package/dist/models/DiplomaticClubCardChatModel.d.ts +0 -7
  13. package/dist/models/DiplomaticClubCardChatModel.js +0 -36
  14. package/dist/models/DiplomaticClubCardMemberModel.d.ts +0 -13
  15. package/dist/models/DiplomaticClubCardMemberModel.js +0 -60
  16. package/dist/models/DiplomaticClubCardRequestModel.d.ts +0 -33
  17. package/dist/models/DiplomaticClubCardRequestModel.js +0 -98
  18. package/dist/models/DiplomaticClubCardWorkFlowModel.d.ts +0 -12
  19. package/dist/models/DiplomaticClubCardWorkFlowModel.js +0 -42
  20. package/dist/models/DiplomaticServiceDetailsModel.d.ts +0 -20
  21. package/dist/models/DiplomaticServiceDetailsModel.js +0 -65
  22. package/dist/models/DiplomaticSettingsModel.d.ts +0 -11
  23. package/dist/models/DiplomaticSettingsModel.js +0 -59
  24. package/dist/models/DiplomaticTitleModel.d.ts +0 -12
  25. package/dist/models/DiplomaticTitleModel.js +0 -45
  26. package/dist/models/PassportRequestApprovalModel.d.ts +0 -22
  27. package/dist/models/PassportRequestApprovalModel.js +0 -91
  28. package/dist/models/PassportRequestAttachmentModel.d.ts +0 -10
  29. package/dist/models/PassportRequestAttachmentModel.js +0 -54
  30. package/dist/models/PassportRequestChatModel.d.ts +0 -8
  31. package/dist/models/PassportRequestChatModel.js +0 -44
  32. package/dist/models/PassportRequestDependentModel.d.ts +0 -20
  33. package/dist/models/PassportRequestDependentModel.js +0 -85
  34. package/dist/models/PassportRequestModel.d.ts +0 -40
  35. package/dist/models/PassportRequestModel.js +0 -128
  36. package/dist/models/PassportRequestWorkFlowModel.d.ts +0 -15
  37. package/dist/models/PassportRequestWorkFlowModel.js +0 -60
  38. package/dist/models/SubscriptionAmountModel.d.ts +0 -67
  39. package/dist/models/SubscriptionAmountModel.js +0 -114
@@ -19,6 +19,7 @@ export declare class UserEmploymentDetails extends BaseModel {
19
19
  secondment_end_date: Date | null;
20
20
  disability_type: string | null;
21
21
  retirement_start_date: Date | null;
22
+ retirement_end_date: Date | null;
22
23
  contract_end_date: Date | null;
23
24
  job_type_group: string | null;
24
25
  entity_transferred_from: string | null;
@@ -33,6 +34,7 @@ export declare class UserEmploymentDetails extends BaseModel {
33
34
  mc_work: boolean | null;
34
35
  governorate_name: string | null;
35
36
  works_in_department: string | null;
37
+ office: string | null;
36
38
  full_name_of_mission: string | null;
37
39
  mission: string | null;
38
40
  description_of_mission: string | null;
@@ -76,6 +76,10 @@ __decorate([
76
76
  (0, typeorm_1.Column)({ type: 'date', nullable: true }),
77
77
  __metadata("design:type", Object)
78
78
  ], UserEmploymentDetails.prototype, "retirement_start_date", void 0);
79
+ __decorate([
80
+ (0, typeorm_1.Column)({ type: 'date', nullable: true }),
81
+ __metadata("design:type", Object)
82
+ ], UserEmploymentDetails.prototype, "retirement_end_date", void 0);
79
83
  __decorate([
80
84
  (0, typeorm_1.Column)({ type: 'date', nullable: true }),
81
85
  __metadata("design:type", Object)
@@ -132,6 +136,10 @@ __decorate([
132
136
  (0, typeorm_1.Column)({ type: 'varchar', length: 255, nullable: true }),
133
137
  __metadata("design:type", Object)
134
138
  ], UserEmploymentDetails.prototype, "works_in_department", void 0);
139
+ __decorate([
140
+ (0, typeorm_1.Column)({ type: 'varchar', length: 255, nullable: true }),
141
+ __metadata("design:type", Object)
142
+ ], UserEmploymentDetails.prototype, "office", void 0);
135
143
  __decorate([
136
144
  (0, typeorm_1.Column)({ type: 'varchar', length: 255, nullable: true }),
137
145
  __metadata("design:type", Object)
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@platform-modules/foreign-ministry",
3
- "version": "1.3.76",
3
+ "version": "1.3.79",
4
4
  "main": "dist/index.js",
5
5
  "types": "dist/index.d.ts",
6
6
  "scripts": {
@@ -1,75 +1,75 @@
1
- import { Column, Entity, ManyToOne, JoinColumn, OneToMany } from "typeorm";
2
- import { BaseModel } from './BaseModel';
3
- import { DiplomaticRequests } from "./DiplomaticRequestsModel";
4
- import type { DiplomaticClubCardPhotos } from './DiplomaticClubCardPhotosModel';
5
-
6
- export enum MembershipType {
7
- SINGLE = "Single",
8
- FAMILY = "Family"
9
- }
10
-
11
- export enum RequestType {
12
- EMPLOYEE_SELF = "Employee Self",
13
- NON_EMPLOYEE = "Non Employee"
14
- }
15
-
16
- export enum MemberType {
17
- PRIMARY = "Primary",
18
- FAMILY_MEMBER = "Family Member"
19
- }
20
-
21
- @Entity({ name: 'diplomatic_club_card_members' })
22
- export class DiplomaticClubCardMembers extends BaseModel {
23
- @Column({ type: 'int' })
24
- diplomatic_request_id: number;
25
-
26
- @Column({ type: 'varchar', length: 255 })
27
- family_member_name: string;
28
-
29
- @Column({ type: 'varchar', length: 100, nullable: true })
30
- relation: string | null;
31
-
32
- @Column({ type: 'varchar', length: 255, nullable: true })
33
- title: string | null;
34
-
35
- @Column({ type: 'int', nullable: true })
36
- diplomatic_title_id: number | null;
37
-
38
- @Column({ type: 'date', nullable: true })
39
- expiry_date: Date | null;
40
-
41
- @Column({ type: 'text', nullable: true })
42
- photo_url: string | null;
43
-
44
- @Column({ type: 'varchar', length: 100, nullable: true })
45
- membership_id: string | null;
46
-
47
- @ManyToOne(() => DiplomaticRequests, dr => dr.diplomaticClubCardMembers)
48
- @JoinColumn({ name: 'diplomatic_request_id' })
49
- diplomaticRequest?: DiplomaticRequests;
50
-
51
- @OneToMany('DiplomaticClubCardPhotos', 'diplomaticMember', { nullable: true })
52
- photos?: DiplomaticClubCardPhotos[];
53
-
54
- constructor(
55
- diplomatic_request_id: number,
56
- family_member_name: string,
57
- relation?: string | null,
58
- title?: string | null,
59
- diplomatic_title_id?: number | null,
60
- expiry_date?: Date | null,
61
- photo_url?: string | null,
62
- membership_id?: string | null
63
- ) {
64
- super();
65
- this.diplomatic_request_id = diplomatic_request_id;
66
- this.family_member_name = family_member_name;
67
- this.relation = relation || null;
68
- this.title = title || null;
69
- this.diplomatic_title_id = diplomatic_title_id || null;
70
- this.expiry_date = expiry_date || null;
71
- this.photo_url = photo_url || null;
72
- this.membership_id = membership_id || null;
73
- }
74
- }
75
-
1
+ import { Column, Entity, ManyToOne, JoinColumn, OneToMany } from "typeorm";
2
+ import { BaseModel } from './BaseModel';
3
+ import { DiplomaticRequests } from "./DiplomaticRequestsModel";
4
+ import type { DiplomaticClubCardPhotos } from './DiplomaticClubCardPhotosModel';
5
+
6
+ export enum MembershipType {
7
+ SINGLE = "Single",
8
+ FAMILY = "Family"
9
+ }
10
+
11
+ export enum RequestType {
12
+ EMPLOYEE_SELF = "Employee Self",
13
+ NON_EMPLOYEE = "Non Employee"
14
+ }
15
+
16
+ export enum MemberType {
17
+ PRIMARY = "Primary",
18
+ FAMILY_MEMBER = "Family Member"
19
+ }
20
+
21
+ @Entity({ name: 'diplomatic_club_card_members' })
22
+ export class DiplomaticClubCardMembers extends BaseModel {
23
+ @Column({ type: 'int' })
24
+ diplomatic_request_id: number;
25
+
26
+ @Column({ type: 'varchar', length: 255 })
27
+ family_member_name: string;
28
+
29
+ @Column({ type: 'varchar', length: 100, nullable: true })
30
+ relation: string | null;
31
+
32
+ @Column({ type: 'varchar', length: 255, nullable: true })
33
+ title: string | null;
34
+
35
+ @Column({ type: 'int', nullable: true })
36
+ diplomatic_title_id: number | null;
37
+
38
+ @Column({ type: 'date', nullable: true })
39
+ expiry_date: Date | null;
40
+
41
+ @Column({ type: 'text', nullable: true })
42
+ photo_url: string | null;
43
+
44
+ @Column({ type: 'varchar', length: 100, nullable: true })
45
+ membership_id: string | null;
46
+
47
+ @ManyToOne(() => DiplomaticRequests, dr => dr.diplomaticClubCardMembers)
48
+ @JoinColumn({ name: 'diplomatic_request_id' })
49
+ diplomaticRequest?: DiplomaticRequests;
50
+
51
+ @OneToMany('DiplomaticClubCardPhotos', 'diplomaticMember', { nullable: true })
52
+ photos?: DiplomaticClubCardPhotos[];
53
+
54
+ constructor(
55
+ diplomatic_request_id: number,
56
+ family_member_name: string,
57
+ relation?: string | null,
58
+ title?: string | null,
59
+ diplomatic_title_id?: number | null,
60
+ expiry_date?: Date | null,
61
+ photo_url?: string | null,
62
+ membership_id?: string | null
63
+ ) {
64
+ super();
65
+ this.diplomatic_request_id = diplomatic_request_id;
66
+ this.family_member_name = family_member_name;
67
+ this.relation = relation || null;
68
+ this.title = title || null;
69
+ this.diplomatic_title_id = diplomatic_title_id || null;
70
+ this.expiry_date = expiry_date || null;
71
+ this.photo_url = photo_url || null;
72
+ this.membership_id = membership_id || null;
73
+ }
74
+ }
75
+
@@ -1,26 +1,26 @@
1
- import { Column, Entity } from "typeorm";
2
- import { BaseModel } from './BaseModel';
3
-
4
- @Entity({ name: 'diplomatic_club_subscription_master' })
5
- export class DiplomaticClubSubscriptionMaster extends BaseModel {
6
- @Column({ type: 'varchar', length: 100, nullable: true })
7
- subscription_type: string | null; // Type: Single or Family
8
-
9
- @Column({ type: 'decimal', precision: 10, scale: 2 })
10
- subscription_amount: number;
11
-
12
- @Column({ type: 'varchar', length: 10, nullable: true })
13
- currency: string | null;
14
-
15
- constructor(
16
- subscription_type: string,
17
- subscription_amount: number,
18
- currency?: string | null,
19
- ) {
20
- super();
21
- this.subscription_type = subscription_type;
22
- this.subscription_amount = subscription_amount;
23
- this.currency = currency || null;
24
- }
25
- }
26
-
1
+ import { Column, Entity } from "typeorm";
2
+ import { BaseModel } from './BaseModel';
3
+
4
+ @Entity({ name: 'diplomatic_club_subscription_master' })
5
+ export class DiplomaticClubSubscriptionMaster extends BaseModel {
6
+ @Column({ type: 'varchar', length: 100, nullable: true })
7
+ subscription_type: string | null; // Type: Single or Family
8
+
9
+ @Column({ type: 'decimal', precision: 10, scale: 2 })
10
+ subscription_amount: number;
11
+
12
+ @Column({ type: 'varchar', length: 10, nullable: true })
13
+ currency: string | null;
14
+
15
+ constructor(
16
+ subscription_type: string,
17
+ subscription_amount: number,
18
+ currency?: string | null,
19
+ ) {
20
+ super();
21
+ this.subscription_type = subscription_type;
22
+ this.subscription_amount = subscription_amount;
23
+ this.currency = currency || null;
24
+ }
25
+ }
26
+
@@ -1,157 +1,157 @@
1
- import { Column, Entity, OneToOne, OneToMany, ManyToOne, JoinColumn } from "typeorm";
2
- import { BaseModel } from './BaseModel';
3
-
4
- // Import types only (not for runtime)
5
- import type { DiplomaticApprovals } from './DiplomaticApprovalsModel';
6
- import type { DiplomaticWorkFlow } from './DiplomaticWorkFlowModel';
7
- import type { DiplomaticAttachments } from './DiplomaticAttachmentsModel';
8
- import type { DiplomaticChats } from './DiplomaticChatsModel';
9
- import type { DiplomaticClubCardMembers } from './DiplomaticClubCardMembersModel';
10
-
11
- export enum DiplomaticRequestStatus {
12
- DRAFT = "Draft",
13
- SUBMITTED = "Submitted",
14
- PENDING = "Pending",
15
- IN_PROGRESS = "In Progress",
16
- APPROVED = "Approved",
17
- REJECTED = "Rejected",
18
- COMPLETED = "Completed",
19
- CANCELLED = "Cancelled"
20
- }
21
-
22
- @Entity({ name: 'diplomatic_club_card_requests' })
23
- export class DiplomaticRequests extends BaseModel {
24
- @Column({ type: 'int' })
25
- user_id: number;
26
-
27
- @Column({ type: 'varchar', length: 100 })
28
- employee_id: string;
29
-
30
- @Column({ type: 'varchar', length: 255 })
31
- employee_name: string;
32
-
33
- @Column({ type: 'varchar', length: 100, nullable: true })
34
- grade: string | null;
35
-
36
- @Column({ type: 'int', nullable: true })
37
- designation_id: number | null;
38
-
39
- @Column({ type: 'int', nullable: true })
40
- department_id: number | null;
41
-
42
- @Column({ type: 'varchar', length: 255 })
43
- email_address: string;
44
-
45
- @Column({ type: 'varchar', length: 20 })
46
- contact_number: string;
47
-
48
- @Column({ type: 'timestamp', default: () => 'CURRENT_TIMESTAMP' })
49
- request_date: Date;
50
-
51
- @Column({ type: 'enum', enum: DiplomaticRequestStatus, default: DiplomaticRequestStatus.PENDING })
52
- request_status: DiplomaticRequestStatus;
53
-
54
- @Column({ type: 'timestamp', nullable: true })
55
- request_close_date: Date | null;
56
-
57
- @Column({ type: 'date', nullable: true })
58
- end_date: Date | null;
59
-
60
- @Column({ type: 'text', nullable: true })
61
- remarks: string | null;
62
-
63
- @Column({ type: 'int', nullable: true })
64
- current_approval_level: number | null;
65
-
66
- @Column({ type: 'int', nullable: true })
67
- current_approver_id: number | null;
68
-
69
- @Column({ type: 'int', nullable: true })
70
- service_id: number | null;
71
-
72
- @Column({ type: 'int', nullable: true })
73
- sub_service_id: number | null;
74
-
75
- @Column({ type: 'varchar', length: 255, nullable: true })
76
- member_name: string | null;
77
-
78
- @Column({ type: 'varchar', length: 100, nullable: true })
79
- membership_type: string | null;
80
-
81
- @Column({ type: 'int', nullable: true })
82
- diplomatic_title_id: number | null;
83
-
84
- @Column({ type: 'varchar', length: 255, nullable: true })
85
- location: string | null;
86
-
87
- @Column({ type: 'varchar', length: 100, nullable: true })
88
- request_type: string | null;
89
-
90
- @Column({ type: 'date', nullable: true })
91
- expiry_date: Date | null;
92
-
93
- @Column({ type: 'varchar', length: 500, nullable: true })
94
- photo_url: string | null;
95
-
96
- @Column({ type: 'varchar', length: 100, nullable: true })
97
- membership_id: string | null;
98
-
99
- @Column({ type: 'varchar', length: 255, nullable: true })
100
- organization: string | null;
101
-
102
- @Column({ type: 'decimal', precision: 10, scale: 2, nullable: true })
103
- subscription_amount: number | null;
104
-
105
- @Column({ type: 'int', nullable: true })
106
- section_id: number | null;
107
-
108
- @Column({ type: 'int', nullable: true })
109
- reporting_manager: number | null;
110
-
111
- @Column({ type: 'varchar', length: 255, nullable: true })
112
- workflow_execution_id: string | null;
113
-
114
- @Column({ type: 'json', nullable: true })
115
- titles: any[] | null;
116
-
117
- @OneToMany('DiplomaticClubCardMembers', 'diplomaticRequest', { nullable: true })
118
- diplomaticClubCardMembers?: DiplomaticClubCardMembers[];
119
-
120
- @OneToMany('DiplomaticApprovals', 'diplomaticRequest')
121
- approvals?: DiplomaticApprovals[];
122
-
123
- @OneToMany('DiplomaticWorkFlow', 'diplomaticRequest')
124
- workflows?: DiplomaticWorkFlow[];
125
-
126
- @OneToMany('DiplomaticAttachments', 'diplomaticRequest')
127
- attachments?: DiplomaticAttachments[];
128
-
129
- @OneToMany('DiplomaticChats', 'diplomaticRequest')
130
- chats?: DiplomaticChats[];
131
-
132
- constructor(
133
- user_id: number,
134
- employee_id: string,
135
- employee_name: string,
136
- email_address: string,
137
- contact_number: string,
138
- service_id: number | null,
139
- sub_service_id: number | null,
140
- section_id: number | null,
141
- reporting_manager: number | null
142
- ) {
143
- super();
144
- this.user_id = user_id;
145
- this.employee_id = employee_id;
146
- this.employee_name = employee_name;
147
- this.email_address = email_address;
148
- this.contact_number = contact_number;
149
- this.request_date = new Date();
150
- this.request_status = DiplomaticRequestStatus.PENDING;
151
- this.service_id = service_id;
152
- this.sub_service_id = sub_service_id;
153
- this.section_id = section_id;
154
- this.reporting_manager = reporting_manager;
155
- }
156
- }
157
-
1
+ import { Column, Entity, OneToOne, OneToMany, ManyToOne, JoinColumn } from "typeorm";
2
+ import { BaseModel } from './BaseModel';
3
+
4
+ // Import types only (not for runtime)
5
+ import type { DiplomaticApprovals } from './DiplomaticApprovalsModel';
6
+ import type { DiplomaticWorkFlow } from './DiplomaticWorkFlowModel';
7
+ import type { DiplomaticAttachments } from './DiplomaticAttachmentsModel';
8
+ import type { DiplomaticChats } from './DiplomaticChatsModel';
9
+ import type { DiplomaticClubCardMembers } from './DiplomaticClubCardMembersModel';
10
+
11
+ export enum DiplomaticRequestStatus {
12
+ DRAFT = "Draft",
13
+ SUBMITTED = "Submitted",
14
+ PENDING = "Pending",
15
+ IN_PROGRESS = "In Progress",
16
+ APPROVED = "Approved",
17
+ REJECTED = "Rejected",
18
+ COMPLETED = "Completed",
19
+ CANCELLED = "Cancelled"
20
+ }
21
+
22
+ @Entity({ name: 'diplomatic_club_card_requests' })
23
+ export class DiplomaticRequests extends BaseModel {
24
+ @Column({ type: 'int' })
25
+ user_id: number;
26
+
27
+ @Column({ type: 'varchar', length: 100 })
28
+ employee_id: string;
29
+
30
+ @Column({ type: 'varchar', length: 255 })
31
+ employee_name: string;
32
+
33
+ @Column({ type: 'varchar', length: 100, nullable: true })
34
+ grade: string | null;
35
+
36
+ @Column({ type: 'int', nullable: true })
37
+ designation_id: number | null;
38
+
39
+ @Column({ type: 'int', nullable: true })
40
+ department_id: number | null;
41
+
42
+ @Column({ type: 'varchar', length: 255 })
43
+ email_address: string;
44
+
45
+ @Column({ type: 'varchar', length: 20 })
46
+ contact_number: string;
47
+
48
+ @Column({ type: 'timestamp', default: () => 'CURRENT_TIMESTAMP' })
49
+ request_date: Date;
50
+
51
+ @Column({ type: 'enum', enum: DiplomaticRequestStatus, default: DiplomaticRequestStatus.PENDING })
52
+ request_status: DiplomaticRequestStatus;
53
+
54
+ @Column({ type: 'timestamp', nullable: true })
55
+ request_close_date: Date | null;
56
+
57
+ @Column({ type: 'date', nullable: true })
58
+ end_date: Date | null;
59
+
60
+ @Column({ type: 'text', nullable: true })
61
+ remarks: string | null;
62
+
63
+ @Column({ type: 'int', nullable: true })
64
+ current_approval_level: number | null;
65
+
66
+ @Column({ type: 'int', nullable: true })
67
+ current_approver_id: number | null;
68
+
69
+ @Column({ type: 'int', nullable: true })
70
+ service_id: number | null;
71
+
72
+ @Column({ type: 'int', nullable: true })
73
+ sub_service_id: number | null;
74
+
75
+ @Column({ type: 'varchar', length: 255, nullable: true })
76
+ member_name: string | null;
77
+
78
+ @Column({ type: 'varchar', length: 100, nullable: true })
79
+ membership_type: string | null;
80
+
81
+ @Column({ type: 'int', nullable: true })
82
+ diplomatic_title_id: number | null;
83
+
84
+ @Column({ type: 'varchar', length: 255, nullable: true })
85
+ location: string | null;
86
+
87
+ @Column({ type: 'varchar', length: 100, nullable: true })
88
+ request_type: string | null;
89
+
90
+ @Column({ type: 'date', nullable: true })
91
+ expiry_date: Date | null;
92
+
93
+ @Column({ type: 'varchar', length: 500, nullable: true })
94
+ photo_url: string | null;
95
+
96
+ @Column({ type: 'varchar', length: 100, nullable: true })
97
+ membership_id: string | null;
98
+
99
+ @Column({ type: 'varchar', length: 255, nullable: true })
100
+ organization: string | null;
101
+
102
+ @Column({ type: 'decimal', precision: 10, scale: 2, nullable: true })
103
+ subscription_amount: number | null;
104
+
105
+ @Column({ type: 'int', nullable: true })
106
+ section_id: number | null;
107
+
108
+ @Column({ type: 'int', nullable: true })
109
+ reporting_manager: number | null;
110
+
111
+ @Column({ type: 'varchar', length: 255, nullable: true })
112
+ workflow_execution_id: string | null;
113
+
114
+ @Column({ type: 'json', nullable: true })
115
+ titles: any[] | null;
116
+
117
+ @OneToMany('DiplomaticClubCardMembers', 'diplomaticRequest', { nullable: true })
118
+ diplomaticClubCardMembers?: DiplomaticClubCardMembers[];
119
+
120
+ @OneToMany('DiplomaticApprovals', 'diplomaticRequest')
121
+ approvals?: DiplomaticApprovals[];
122
+
123
+ @OneToMany('DiplomaticWorkFlow', 'diplomaticRequest')
124
+ workflows?: DiplomaticWorkFlow[];
125
+
126
+ @OneToMany('DiplomaticAttachments', 'diplomaticRequest')
127
+ attachments?: DiplomaticAttachments[];
128
+
129
+ @OneToMany('DiplomaticChats', 'diplomaticRequest')
130
+ chats?: DiplomaticChats[];
131
+
132
+ constructor(
133
+ user_id: number,
134
+ employee_id: string,
135
+ employee_name: string,
136
+ email_address: string,
137
+ contact_number: string,
138
+ service_id: number | null,
139
+ sub_service_id: number | null,
140
+ section_id: number | null,
141
+ reporting_manager: number | null
142
+ ) {
143
+ super();
144
+ this.user_id = user_id;
145
+ this.employee_id = employee_id;
146
+ this.employee_name = employee_name;
147
+ this.email_address = email_address;
148
+ this.contact_number = contact_number;
149
+ this.request_date = new Date();
150
+ this.request_status = DiplomaticRequestStatus.PENDING;
151
+ this.service_id = service_id;
152
+ this.sub_service_id = sub_service_id;
153
+ this.section_id = section_id;
154
+ this.reporting_manager = reporting_manager;
155
+ }
156
+ }
157
+
@@ -51,6 +51,9 @@ export class UserEmploymentDetails extends BaseModel {
51
51
  @Column({ type: 'date', nullable: true })
52
52
  retirement_start_date: Date | null;
53
53
 
54
+ @Column({ type: 'date', nullable: true })
55
+ retirement_end_date: Date | null;
56
+
54
57
  @Column({ type: 'date', nullable: true })
55
58
  contract_end_date: Date | null;
56
59
 
@@ -95,6 +98,9 @@ export class UserEmploymentDetails extends BaseModel {
95
98
  @Column({ type: 'varchar', length: 255, nullable: true })
96
99
  works_in_department: string | null;
97
100
 
101
+ @Column({ type: 'varchar', length: 255, nullable: true })
102
+ office: string | null;
103
+
98
104
  // Mission Information
99
105
  @Column({ type: 'varchar', length: 255, nullable: true })
100
106
  full_name_of_mission: string | null;
@@ -1,16 +0,0 @@
1
- import { BaseModel } from './BaseModel';
2
- export declare enum DiplomaticClubCardApprovalStatus {
3
- PENDING = "Pending",
4
- APPROVED = "Approved",
5
- REJECTED = "Rejected"
6
- }
7
- export declare class DiplomaticClubCardApprovals extends BaseModel {
8
- request_id: number;
9
- approver_user_id: number;
10
- approver_role_id: number | null;
11
- step_order: number;
12
- status: DiplomaticClubCardApprovalStatus;
13
- comments: string | null;
14
- approved_at: Date | null;
15
- rejected_at: Date | null;
16
- }
@@ -1,58 +0,0 @@
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.DiplomaticClubCardApprovals = exports.DiplomaticClubCardApprovalStatus = void 0;
13
- const typeorm_1 = require("typeorm");
14
- const BaseModel_1 = require("./BaseModel");
15
- var DiplomaticClubCardApprovalStatus;
16
- (function (DiplomaticClubCardApprovalStatus) {
17
- DiplomaticClubCardApprovalStatus["PENDING"] = "Pending";
18
- DiplomaticClubCardApprovalStatus["APPROVED"] = "Approved";
19
- DiplomaticClubCardApprovalStatus["REJECTED"] = "Rejected";
20
- })(DiplomaticClubCardApprovalStatus || (exports.DiplomaticClubCardApprovalStatus = DiplomaticClubCardApprovalStatus = {}));
21
- let DiplomaticClubCardApprovals = class DiplomaticClubCardApprovals extends BaseModel_1.BaseModel {
22
- };
23
- exports.DiplomaticClubCardApprovals = DiplomaticClubCardApprovals;
24
- __decorate([
25
- (0, typeorm_1.Column)({ type: 'int', nullable: false }),
26
- __metadata("design:type", Number)
27
- ], DiplomaticClubCardApprovals.prototype, "request_id", void 0);
28
- __decorate([
29
- (0, typeorm_1.Column)({ type: 'int', nullable: false }),
30
- __metadata("design:type", Number)
31
- ], DiplomaticClubCardApprovals.prototype, "approver_user_id", void 0);
32
- __decorate([
33
- (0, typeorm_1.Column)({ type: 'int', nullable: true }),
34
- __metadata("design:type", Object)
35
- ], DiplomaticClubCardApprovals.prototype, "approver_role_id", void 0);
36
- __decorate([
37
- (0, typeorm_1.Column)({ type: 'int', nullable: false, default: 0 }),
38
- __metadata("design:type", Number)
39
- ], DiplomaticClubCardApprovals.prototype, "step_order", void 0);
40
- __decorate([
41
- (0, typeorm_1.Column)({ type: 'enum', enum: DiplomaticClubCardApprovalStatus, default: DiplomaticClubCardApprovalStatus.PENDING, nullable: false }),
42
- __metadata("design:type", String)
43
- ], DiplomaticClubCardApprovals.prototype, "status", void 0);
44
- __decorate([
45
- (0, typeorm_1.Column)({ type: 'text', nullable: true }),
46
- __metadata("design:type", Object)
47
- ], DiplomaticClubCardApprovals.prototype, "comments", void 0);
48
- __decorate([
49
- (0, typeorm_1.Column)({ type: 'timestamp', nullable: true }),
50
- __metadata("design:type", Object)
51
- ], DiplomaticClubCardApprovals.prototype, "approved_at", void 0);
52
- __decorate([
53
- (0, typeorm_1.Column)({ type: 'timestamp', nullable: true }),
54
- __metadata("design:type", Object)
55
- ], DiplomaticClubCardApprovals.prototype, "rejected_at", void 0);
56
- exports.DiplomaticClubCardApprovals = DiplomaticClubCardApprovals = __decorate([
57
- (0, typeorm_1.Entity)({ name: 'diplomatic_club_card_approvals' })
58
- ], DiplomaticClubCardApprovals);