@platform-modules/civil-aviation-authority 1.0.12 → 1.0.14

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.
@@ -1,19 +1,34 @@
1
1
  import { BaseModel } from './BaseModel';
2
2
  export declare class User extends BaseModel {
3
- first_name: string;
4
- last_name: string;
5
- full_name: string;
6
- password: string;
7
- mobile: string;
8
- email: string;
9
- address: string;
10
- city: string;
11
- state: string;
12
- country: string;
13
- pincode: string;
14
- is_active: boolean;
15
- EncryptPassword: string;
16
- roleId: number;
17
- company: string;
18
- constructor(first_name: string, last_name: string, full_name: string, password: string, mobile: string, email: string, address: string, city: string, state: string, country: string, pincode: string, is_active: boolean, EncryptPassword: string, roleId: number, company: string);
3
+ employee_id?: number;
4
+ civil_employee_id?: number;
5
+ employee_name?: string;
6
+ employee_arabic_name?: string;
7
+ person_type?: string;
8
+ date_of_birth?: string;
9
+ region_of_birth?: string;
10
+ country_of_birth?: string;
11
+ date_of_joining?: string;
12
+ last_promotion_date?: string;
13
+ gender?: string;
14
+ qualification?: string;
15
+ marital_status?: string;
16
+ nationality?: string;
17
+ email?: string;
18
+ blood_type?: string;
19
+ national_id?: number;
20
+ manpower_id?: number;
21
+ mobile?: string;
22
+ office_number?: string;
23
+ department?: string;
24
+ category?: string;
25
+ directorate?: string;
26
+ section?: string;
27
+ position?: string;
28
+ arabic_position?: string;
29
+ grade?: number;
30
+ location?: string;
31
+ supervisor_emp_id?: number;
32
+ supervisor_emp_name?: string;
33
+ constructor(employee_id?: number, civil_employee_id?: number, employee_name?: string, employee_arabic_name?: string, person_type?: string, date_of_birth?: string, region_of_birth?: string, country_of_birth?: string, date_of_joining?: string, last_promotion_date?: string, gender?: string, qualification?: string, marital_status?: string, nationality?: string, email?: string, blood_type?: string, national_id?: number, manpower_id?: number, mobile?: string, office_number?: string, department?: string, category?: string, directorate?: string, section?: string, position?: string, arabic_position?: string, grade?: number, location?: string, supervisor_emp_id?: number, supervisor_emp_name?: string);
19
34
  }
@@ -13,51 +13,97 @@ 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(first_name, last_name, full_name, password, mobile, email, address, city, state, country, pincode, is_active, EncryptPassword, roleId,
17
- // contract_start_date: string,
18
- // contract_end_date: string,
19
- company) {
16
+ constructor(employee_id, civil_employee_id, employee_name, employee_arabic_name, person_type, date_of_birth, region_of_birth, country_of_birth, date_of_joining, last_promotion_date, gender, qualification, marital_status, nationality, email, blood_type, national_id, manpower_id, mobile, office_number, department, category, directorate, section, position, arabic_position, grade, location, supervisor_emp_id, supervisor_emp_name) {
20
17
  super();
21
- this.first_name = first_name,
22
- this.last_name = last_name,
23
- this.full_name = full_name,
24
- this.password = password,
25
- this.EncryptPassword = EncryptPassword,
26
- this.mobile = mobile,
27
- this.email = email,
28
- this.is_active = is_active,
29
- this.address = address,
30
- this.city = city,
31
- this.state = state,
32
- this.country = country,
33
- this.pincode = pincode,
34
- this.roleId = roleId,
35
- // this.contract_start_date = contract_start_date,
36
- // this.contract_end_date = contract_end_date,
37
- this.company = company;
18
+ this.employee_id = employee_id;
19
+ this.civil_employee_id = civil_employee_id;
20
+ this.employee_name = employee_name;
21
+ this.employee_arabic_name = employee_arabic_name;
22
+ this.person_type = person_type;
23
+ this.date_of_birth = date_of_birth;
24
+ this.region_of_birth = region_of_birth;
25
+ this.country_of_birth = country_of_birth;
26
+ this.date_of_joining = date_of_joining;
27
+ this.last_promotion_date = last_promotion_date;
28
+ this.gender = gender;
29
+ this.qualification = qualification;
30
+ this.marital_status = marital_status;
31
+ this.nationality = nationality;
32
+ this.email = email;
33
+ this.blood_type = blood_type;
34
+ this.national_id = national_id;
35
+ this.manpower_id = manpower_id;
36
+ this.mobile = mobile;
37
+ this.office_number = office_number;
38
+ this.department = department;
39
+ this.category = category;
40
+ this.directorate = directorate;
41
+ this.section = section;
42
+ this.position = position;
43
+ this.arabic_position = arabic_position;
44
+ this.grade = grade;
45
+ this.location = location;
46
+ this.supervisor_emp_id = supervisor_emp_id;
47
+ this.supervisor_emp_name = supervisor_emp_name;
38
48
  }
39
49
  };
40
50
  exports.User = User;
51
+ __decorate([
52
+ (0, typeorm_1.Column)({ type: 'bigint', nullable: true }),
53
+ __metadata("design:type", Number)
54
+ ], User.prototype, "employee_id", void 0);
55
+ __decorate([
56
+ (0, typeorm_1.Column)({ type: 'bigint', nullable: true }),
57
+ __metadata("design:type", Number)
58
+ ], User.prototype, "civil_employee_id", void 0);
41
59
  __decorate([
42
60
  (0, typeorm_1.Column)({ nullable: true }),
43
61
  __metadata("design:type", String)
44
- ], User.prototype, "first_name", void 0);
62
+ ], User.prototype, "employee_name", void 0);
45
63
  __decorate([
46
64
  (0, typeorm_1.Column)({ nullable: true }),
47
65
  __metadata("design:type", String)
48
- ], User.prototype, "last_name", void 0);
66
+ ], User.prototype, "employee_arabic_name", void 0);
49
67
  __decorate([
50
68
  (0, typeorm_1.Column)({ nullable: true }),
51
69
  __metadata("design:type", String)
52
- ], User.prototype, "full_name", void 0);
70
+ ], User.prototype, "person_type", void 0);
53
71
  __decorate([
54
72
  (0, typeorm_1.Column)({ nullable: true }),
55
73
  __metadata("design:type", String)
56
- ], User.prototype, "password", void 0);
74
+ ], User.prototype, "date_of_birth", void 0);
57
75
  __decorate([
58
76
  (0, typeorm_1.Column)({ nullable: true }),
59
77
  __metadata("design:type", String)
60
- ], User.prototype, "mobile", void 0);
78
+ ], User.prototype, "region_of_birth", void 0);
79
+ __decorate([
80
+ (0, typeorm_1.Column)({ nullable: true }),
81
+ __metadata("design:type", String)
82
+ ], User.prototype, "country_of_birth", void 0);
83
+ __decorate([
84
+ (0, typeorm_1.Column)({ nullable: true }),
85
+ __metadata("design:type", String)
86
+ ], User.prototype, "date_of_joining", void 0);
87
+ __decorate([
88
+ (0, typeorm_1.Column)({ nullable: true }),
89
+ __metadata("design:type", String)
90
+ ], User.prototype, "last_promotion_date", void 0);
91
+ __decorate([
92
+ (0, typeorm_1.Column)({ nullable: true }),
93
+ __metadata("design:type", String)
94
+ ], User.prototype, "gender", void 0);
95
+ __decorate([
96
+ (0, typeorm_1.Column)({ nullable: true }),
97
+ __metadata("design:type", String)
98
+ ], User.prototype, "qualification", void 0);
99
+ __decorate([
100
+ (0, typeorm_1.Column)({ nullable: true }),
101
+ __metadata("design:type", String)
102
+ ], User.prototype, "marital_status", void 0);
103
+ __decorate([
104
+ (0, typeorm_1.Column)({ nullable: true }),
105
+ __metadata("design:type", String)
106
+ ], User.prototype, "nationality", void 0);
61
107
  __decorate([
62
108
  (0, typeorm_1.Column)({ nullable: true }),
63
109
  __metadata("design:type", String)
@@ -65,40 +111,64 @@ __decorate([
65
111
  __decorate([
66
112
  (0, typeorm_1.Column)({ nullable: true }),
67
113
  __metadata("design:type", String)
68
- ], User.prototype, "address", void 0);
114
+ ], User.prototype, "blood_type", void 0);
115
+ __decorate([
116
+ (0, typeorm_1.Column)({ type: 'bigint', nullable: true }),
117
+ __metadata("design:type", Number)
118
+ ], User.prototype, "national_id", void 0);
119
+ __decorate([
120
+ (0, typeorm_1.Column)({ type: 'bigint', nullable: true }),
121
+ __metadata("design:type", Number)
122
+ ], User.prototype, "manpower_id", void 0);
123
+ __decorate([
124
+ (0, typeorm_1.Column)({ nullable: true }),
125
+ __metadata("design:type", String)
126
+ ], User.prototype, "mobile", void 0);
127
+ __decorate([
128
+ (0, typeorm_1.Column)({ nullable: true }),
129
+ __metadata("design:type", String)
130
+ ], User.prototype, "office_number", void 0);
69
131
  __decorate([
70
132
  (0, typeorm_1.Column)({ nullable: true }),
71
133
  __metadata("design:type", String)
72
- ], User.prototype, "city", void 0);
134
+ ], User.prototype, "department", void 0);
73
135
  __decorate([
74
136
  (0, typeorm_1.Column)({ nullable: true }),
75
137
  __metadata("design:type", String)
76
- ], User.prototype, "state", void 0);
138
+ ], User.prototype, "category", void 0);
77
139
  __decorate([
78
140
  (0, typeorm_1.Column)({ nullable: true }),
79
141
  __metadata("design:type", String)
80
- ], User.prototype, "country", void 0);
142
+ ], User.prototype, "directorate", void 0);
81
143
  __decorate([
82
144
  (0, typeorm_1.Column)({ nullable: true }),
83
145
  __metadata("design:type", String)
84
- ], User.prototype, "pincode", void 0);
146
+ ], User.prototype, "section", void 0);
85
147
  __decorate([
86
- (0, typeorm_1.Column)({ nullable: true, default: true }),
87
- __metadata("design:type", Boolean)
88
- ], User.prototype, "is_active", void 0);
148
+ (0, typeorm_1.Column)({ nullable: true }),
149
+ __metadata("design:type", String)
150
+ ], User.prototype, "position", void 0);
89
151
  __decorate([
90
152
  (0, typeorm_1.Column)({ nullable: true }),
91
153
  __metadata("design:type", String)
92
- ], User.prototype, "EncryptPassword", void 0);
154
+ ], User.prototype, "arabic_position", void 0);
93
155
  __decorate([
94
156
  (0, typeorm_1.Column)({ nullable: true }),
95
157
  __metadata("design:type", Number)
96
- ], User.prototype, "roleId", void 0);
158
+ ], User.prototype, "grade", void 0);
159
+ __decorate([
160
+ (0, typeorm_1.Column)({ nullable: true }),
161
+ __metadata("design:type", String)
162
+ ], User.prototype, "location", void 0);
163
+ __decorate([
164
+ (0, typeorm_1.Column)({ type: 'bigint', nullable: true }),
165
+ __metadata("design:type", Number)
166
+ ], User.prototype, "supervisor_emp_id", void 0);
97
167
  __decorate([
98
168
  (0, typeorm_1.Column)({ nullable: true }),
99
169
  __metadata("design:type", String)
100
- ], User.prototype, "company", void 0);
170
+ ], User.prototype, "supervisor_emp_name", void 0);
101
171
  exports.User = User = __decorate([
102
172
  (0, typeorm_1.Entity)({ name: 'users' }),
103
- __metadata("design:paramtypes", [String, String, String, String, String, String, String, String, String, String, String, Boolean, String, Number, String])
173
+ __metadata("design:paramtypes", [Number, Number, String, String, String, String, String, String, String, String, String, String, String, String, String, String, Number, Number, String, String, String, String, String, String, String, String, Number, String, Number, String])
104
174
  ], User);
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@platform-modules/civil-aviation-authority",
3
- "version": "1.0.12",
3
+ "version": "1.0.14",
4
4
  "main": "dist/index.js",
5
5
  "types": "dist/index.d.ts",
6
6
  "scripts": {
package/src/index.ts CHANGED
@@ -3,3 +3,4 @@ export * from './models/role';
3
3
  export * from './models/user-sessions';
4
4
  export * from './models/ITHelpDeskModel';
5
5
  export * from './models/ITServicesTypesModel';
6
+
@@ -1,100 +1,161 @@
1
-
2
- import { Column, Entity ,BeforeInsert,BeforeUpdate } from "typeorm";
1
+ import { Column, Entity } from "typeorm";
3
2
  import { BaseModel } from './BaseModel';
4
3
 
5
4
  @Entity({ name: 'users' })
6
5
  export class User extends BaseModel {
7
6
 
7
+ @Column({ type: 'bigint', nullable: true })
8
+ employee_id?: number;
9
+
10
+ @Column({ type: 'bigint', nullable: true })
11
+ civil_employee_id?: number;
12
+
8
13
  @Column({ nullable: true })
9
- first_name: string;
14
+ employee_name?: string;
10
15
 
11
16
  @Column({ nullable: true })
12
- last_name: string;
17
+ employee_arabic_name?: string;
13
18
 
14
19
  @Column({ nullable: true })
15
- full_name: string;
20
+ person_type?: string;
16
21
 
17
22
  @Column({ nullable: true })
18
- password: string;
23
+ date_of_birth?: string;
19
24
 
20
25
  @Column({ nullable: true })
21
- mobile: string;
26
+ region_of_birth?: string;
22
27
 
23
28
  @Column({ nullable: true })
24
- email: string;
29
+ country_of_birth?: string;
25
30
 
26
31
  @Column({ nullable: true })
27
- address: string;
32
+ date_of_joining?: string;
28
33
 
29
34
  @Column({ nullable: true })
30
- city: string;
35
+ last_promotion_date?: string;
31
36
 
32
37
  @Column({ nullable: true })
33
- state: string;
38
+ gender?: string;
34
39
 
35
40
  @Column({ nullable: true })
36
- country: string;
41
+ qualification?: string;
37
42
 
38
43
  @Column({ nullable: true })
39
- pincode: string;
44
+ marital_status?: string;
40
45
 
41
- @Column({ nullable: true, default: true })
42
- is_active: boolean;
46
+ @Column({ nullable: true })
47
+ nationality?: string;
43
48
 
44
49
  @Column({ nullable: true })
45
- EncryptPassword: string;
50
+ email?: string;
46
51
 
47
52
  @Column({ nullable: true })
48
- roleId: number;
53
+ blood_type?: string;
49
54
 
50
- // @Column({ nullable: true })
51
- // contract_start_date: string;
55
+ @Column({ type: 'bigint', nullable: true })
56
+ national_id?: number;
52
57
 
53
- // @Column({ nullable: true })
54
- // contract_end_date: string;
58
+ @Column({ type: 'bigint', nullable: true })
59
+ manpower_id?: number;
55
60
 
56
61
  @Column({ nullable: true })
57
- company: string;
62
+ mobile?: string;
58
63
 
59
- constructor(
60
- first_name: string,
61
- last_name: string,
62
- full_name: string,
63
- password: string,
64
- mobile: string,
65
- email: string,
66
- address: string,
67
- city: string,
68
- state: string,
69
- country: string,
70
- pincode: string,
71
- is_active: boolean,
72
- EncryptPassword: string,
73
- roleId: number,
74
- // contract_start_date: string,
75
- // contract_end_date: string,
76
- company: string
64
+ @Column({ nullable: true })
65
+ office_number?: string;
66
+
67
+ @Column({ nullable: true })
68
+ department?: string;
69
+
70
+ @Column({ nullable: true })
71
+ category?: string;
72
+
73
+ @Column({ nullable: true })
74
+ directorate?: string;
75
+
76
+ @Column({ nullable: true })
77
+ section?: string;
77
78
 
79
+ @Column({ nullable: true })
80
+ position?: string;
81
+
82
+ @Column({ nullable: true })
83
+ arabic_position?: string;
84
+
85
+ @Column({ nullable: true })
86
+ grade?: number;
87
+
88
+ @Column({ nullable: true })
89
+ location?: string;
90
+
91
+ @Column({ type: 'bigint', nullable: true })
92
+ supervisor_emp_id?: number;
93
+
94
+ @Column({ nullable: true })
95
+ supervisor_emp_name?: string;
96
+
97
+ constructor(
98
+ employee_id?: number,
99
+ civil_employee_id?: number,
100
+ employee_name?: string,
101
+ employee_arabic_name?: string,
102
+ person_type?: string,
103
+ date_of_birth?: string,
104
+ region_of_birth?: string,
105
+ country_of_birth?: string,
106
+ date_of_joining?: string,
107
+ last_promotion_date?: string,
108
+ gender?: string,
109
+ qualification?: string,
110
+ marital_status?: string,
111
+ nationality?: string,
112
+ email?: string,
113
+ blood_type?: string,
114
+ national_id?: number,
115
+ manpower_id?: number,
116
+ mobile?: string,
117
+ office_number?: string,
118
+ department?: string,
119
+ category?: string,
120
+ directorate?: string,
121
+ section?: string,
122
+ position?: string,
123
+ arabic_position?: string,
124
+ grade?: number,
125
+ location?: string,
126
+ supervisor_emp_id?: number,
127
+ supervisor_emp_name?: string
78
128
  ) {
79
129
  super();
80
- this.first_name = first_name,
81
- this.last_name = last_name,
82
- this.full_name = full_name ,
83
- this.password = password,
84
- this.EncryptPassword = EncryptPassword,
85
- this.mobile = mobile,
86
- this.email = email,
87
- this.is_active = is_active,
88
- this.address = address,
89
- this.city = city,
90
- this.state = state,
91
- this.country = country,
92
- this.pincode = pincode,
93
- this.roleId = roleId,
94
- // this.contract_start_date = contract_start_date,
95
- // this.contract_end_date = contract_end_date,
96
- this.company = company
130
+ this.employee_id = employee_id;
131
+ this.civil_employee_id = civil_employee_id;
132
+ this.employee_name = employee_name;
133
+ this.employee_arabic_name = employee_arabic_name;
134
+ this.person_type = person_type;
135
+ this.date_of_birth = date_of_birth;
136
+ this.region_of_birth = region_of_birth;
137
+ this.country_of_birth = country_of_birth;
138
+ this.date_of_joining = date_of_joining;
139
+ this.last_promotion_date = last_promotion_date;
140
+ this.gender = gender;
141
+ this.qualification = qualification;
142
+ this.marital_status = marital_status;
143
+ this.nationality = nationality;
144
+ this.email = email;
145
+ this.blood_type = blood_type;
146
+ this.national_id = national_id;
147
+ this.manpower_id = manpower_id;
148
+ this.mobile = mobile;
149
+ this.office_number = office_number;
150
+ this.department = department;
151
+ this.category = category;
152
+ this.directorate = directorate;
153
+ this.section = section;
154
+ this.position = position;
155
+ this.arabic_position = arabic_position;
156
+ this.grade = grade;
157
+ this.location = location;
158
+ this.supervisor_emp_id = supervisor_emp_id;
159
+ this.supervisor_emp_name = supervisor_emp_name;
97
160
  }
98
- }
99
-
100
-
161
+ }