+
+
-
+
+
diff --git a/HRM.UI/ClientApp/src/app/core-hr/employee-profile/academic/academic-entry/academic-entry.component.ts b/HRM.UI/ClientApp/src/app/core-hr/employee-profile/academic/academic-entry/academic-entry.component.ts
index 06299d9..9e16c82 100644
--- a/HRM.UI/ClientApp/src/app/core-hr/employee-profile/academic/academic-entry/academic-entry.component.ts
+++ b/HRM.UI/ClientApp/src/app/core-hr/employee-profile/academic/academic-entry/academic-entry.component.ts
@@ -17,6 +17,7 @@ import { BasicService } from '../../../../_services/Basic/basic.service';
import { enumEmpFileUploadType, EnumStatus } from '../../../../_models/enums';
import { loadingPanelService } from '../../../../hrm-loding panel/loding.panel.service';
import { empFileuploads } from '../../../../_models/HREmployee/hrEmployee';
+import { forkJoin } from 'rxjs';
@Component({
selector: 'app-academic-entry',
@@ -115,94 +116,139 @@ export class AcademicEntryComponent implements OnInit {
// }
// }
loadData() {
- this.basicService.getAllEducationLevel().subscribe(
- (resp) => {
- this.alleducationLevels = resp;
+ // this.basicService.getAllEducationLevel().subscribe(
+ // (resp) => {
+ // this.alleducationLevels = resp;
+ // },
+ // (err: any) => {
+ // console.log(err);
+ // },
+ // () => {
+ // // if (this.academic.id > 0) {
+ // // this.educationLevels = this.alleducationLevels//.filter(x => x.educationTypeID == this.academic.educationTypeID);
+ // // }
+ // // else {
+ // this.educationLevels = this.alleducationLevels//.filter(x => x.educationTypeID == this.academic.educationTypeID);
+ // // }
+ // this.basicService.getAllDiscipline().subscribe(
+ // (resp) => {
+ // this.alleducationDiscipline = resp;
+ // },
+ // (err: any) => {
+ // console.log(err);
+ // },
+ // () => {
+ // // if (this.academic.id > 0) {
+ // // // this.educationDiscipline = this.alleducationDiscipline.filter(x => x.educationLevelID == this.academic.educationLevelID);
+ // // // this.educationDiscipline = this.alleducationDiscipline.filter(x => x.id == this.academic.disciplineID);
+ // // this.educationDiscipline = this.alleducationDiscipline;
+ // // }
+ // // else {
+ // // this.educationDiscipline = this.alleducationDiscipline.filter(x => x.educationLevelID == this.academic.educationLevelID);
+ // this.educationDiscipline = this.alleducationDiscipline;
+ // // }
+
+
+ // this.basicService.getAllInstitutions().subscribe(
+ // (resp) => {
+ // this.allinstitutions = resp;
+ // },
+ // (err: any) => {
+ // console.log(err);
+ // },
+ // () => {
+ // if (this.academic.id > 0) {
+ // // this.institutions = this.allinstitutions.filter(x => x.boardRequired == this.academic.educationType.boardRequired);
+ // if (this.academic.institution != undefined && this.academic.institution.boardRequired)
+ // // this.institutions = this.allinstitutions.filter(x => x.id == this.academic.institutionID || x.boardRequired == true);
+ // this.institutions = this.allinstitutions.filter(x => x.boardRequired == true);
+ // else
+ // // this.institutions = this.allinstitutions.filter(x => x.educationTypeID == this.academic.educationTypeID);
+ // this.institutions = this.allinstitutions.filter(x => x.boardRequired == false);
+ // }
+ // //console.log(this.institutions);
+
+ // this.basicService.getAllResultTypesByStatus(EnumStatus.Regardless).subscribe(
+ // (resp) => {
+ // this.allresultTypes = resp;
+ // },
+ // (err: any) => {
+ // console.log(err);
+ // },
+ // () => {
+ // if (this.academic.id > 0)
+ // //console.log(this.allresultTypes);
+ // if (this.academic.id > 0) {
+ // let selectedEducationType: EducationType[] = this.educationTypes//.filter(x => x.id == this.academic.educationTypeID)
+ // // this.resultTypes = this.allresultTypes.filter(x => x.type == selectedEducationType[0].resultType);
+ // // if (selectedEducationType[0].resultType === 2 || selectedEducationType[0].resultType === 4) {
+ // // this.isGrade = true;
+ // // }
+ // // else {
+ // // this.isGrade = false;
+ // // }
+ // }
+
+
+ // let educationType = this.educationTypes.find(x => x.description.toLowerCase() == "academic");
+ // if (this.academic.id == 0 && educationType != undefined) {
+ // this.academic.educationTypeID = educationType.id;
+ // this.selectedEducationTypeID = this.academic.educationTypeID;
+ // this.academic.examDate = new Date().getFullYear();
+ // this.academic.passingYear = new Date().getFullYear();
+ // this.selectEducationTypeEvent(educationType.id);
+ // let descp = this.alleducationDiscipline.find(d => d.description.toLowerCase() == 'nil');
+ // this.academic.disciplineID = descp != undefined ? descp.id : 0;
+ // let inst = this.allinstitutions.find(d => d.name.toLowerCase() == 'Institute of Chartered Secretary of Bangladesh'.toLowerCase());
+ // this.academic.institutionID = inst != undefined ? inst.id : 0;
+ // }
+ // }
+ // );
+ // }
+ // );
+ // }
+ // );
+ // }
+ // );
+ const educationlevelService = this.basicService.getAllEducationLevel();
+ const disciplineService = this.basicService.getAllDiscipline();
+ const institutionService = this.basicService.getAllInstitutions();
+ const resultTyoeService = this.basicService.getAllResultTypesByStatus(EnumStatus.Regardless);
+
+ this.loadingPanelService.ShowLoadingPanel = true;
+ forkJoin(educationlevelService, disciplineService, institutionService, resultTyoeService).subscribe(
+ ([res1, res2, res3, res4]) => {
+ this.alleducationLevels = res1;
+ this.alleducationDiscipline = res2;
+ this.allinstitutions = res3;
+ this.allresultTypes = res4;
},
- (err: any) => {
- console.log(err);
+ (x) => {
+ this.loadingPanelService.ShowLoadingPanel = false;
+ console.log(x);
+ this.notificationService.showError(x.error);
},
() => {
- if (this.academic.id > 0) {
- this.educationLevels = this.alleducationLevels.filter(x => x.educationTypeID == this.academic.educationTypeID);
+ this.educationLevels = this.alleducationLevels;
+ this.educationDiscipline = this.alleducationDiscipline;
+ this.institutions = this.allinstitutions;
+ this.resultTypes = this.allresultTypes;
+
+ this.loadingPanelService.ShowLoadingPanel = false;
+ let educationType = this.educationTypes.find(x => x.description.toLowerCase() == "academic");
+ if (this.academic.id == 0 && educationType != undefined) {
+ this.academic.educationTypeID = educationType.id;
+ this.selectedEducationTypeID = this.academic.educationTypeID;
+ let descp = this.alleducationDiscipline.find(d => d.description.toLowerCase() == 'nil');
+ this.academic.disciplineID = descp != undefined ? descp.id : 0;
+ this.selectedDisciplineID = this.academic.disciplineID;
+ let inst = this.allinstitutions.find(d => d.name.toLowerCase() == 'Institute of Chartered Secretary of Bangladesh'.toLowerCase());
+ this.academic.institutionID = inst != undefined ? inst.id : 0;
+ this. selectedInstitutionID = this.academic.institutionID;
+ this.academic.examDate = new Date().getFullYear();
+ this.academic.passingYear = new Date().getFullYear();
+ // this.selectEducationTypeEvent(educationType.id);
}
- else {
- this.educationLevels = this.alleducationLevels.filter(x => x.educationTypeID == this.academic.educationTypeID);
- }
- this.basicService.getAllDiscipline().subscribe(
- (resp) => {
- this.alleducationDiscipline = resp;
- },
- (err: any) => {
- console.log(err);
- },
- () => {
- if (this.academic.id > 0) {
- // this.educationDiscipline = this.alleducationDiscipline.filter(x => x.educationLevelID == this.academic.educationLevelID);
- // this.educationDiscipline = this.alleducationDiscipline.filter(x => x.id == this.academic.disciplineID);
- this.educationDiscipline = this.alleducationDiscipline;
- }
- else {
- // this.educationDiscipline = this.alleducationDiscipline.filter(x => x.educationLevelID == this.academic.educationLevelID);
- this.educationDiscipline = this.alleducationDiscipline;
- }
-
-
- this.basicService.getAllInstitutions().subscribe(
- (resp) => {
- this.allinstitutions = resp;
- },
- (err: any) => {
- console.log(err);
- },
- () => {
- if (this.academic.id > 0) {
- // this.institutions = this.allinstitutions.filter(x => x.boardRequired == this.academic.educationType.boardRequired);
- if (this.academic.institution.boardRequired)
- // this.institutions = this.allinstitutions.filter(x => x.id == this.academic.institutionID || x.boardRequired == true);
- this.institutions = this.allinstitutions.filter(x => x.boardRequired == true);
- else
- // this.institutions = this.allinstitutions.filter(x => x.educationTypeID == this.academic.educationTypeID);
- this.institutions = this.allinstitutions.filter(x => x.boardRequired == false);
- }
- //console.log(this.institutions);
-
- this.basicService.getAllResultTypesByStatus(EnumStatus.Regardless).subscribe(
- (resp) => {
- this.allresultTypes = resp;
- },
- (err: any) => {
- console.log(err);
- },
- () => {
- if (this.academic.id > 0)
- //console.log(this.allresultTypes);
- if (this.academic.id > 0) {
- let selectedEducationType: EducationType[] = this.educationTypes.filter(x => x.id == this.academic.educationTypeID)
- // this.resultTypes = this.allresultTypes.filter(x => x.type == selectedEducationType[0].resultType);
- // if (selectedEducationType[0].resultType === 2 || selectedEducationType[0].resultType === 4) {
- // this.isGrade = true;
- // }
- // else {
- // this.isGrade = false;
- // }
- }
-
-
- let educationType = this.educationTypes.find(x => x.description.toLowerCase() == "academic");
- if (this.academic.id == 0 && educationType != undefined) {
- this.academic.educationTypeID = educationType.id;
- this.selectedEducationTypeID = this.academic.educationTypeID;
- this.academic.examDate = new Date().getFullYear();
- this.academic.passingYear = new Date().getFullYear();
- this.selectEducationTypeEvent(educationType.id);
- }
- }
- );
- }
- );
- }
- );
}
);
}
@@ -220,8 +266,8 @@ export class AcademicEntryComponent implements OnInit {
}
selectEducationTypeEvent(typeid: number) {
if (typeid !== null) {
- this.educationLevels = this.alleducationLevels.filter(x => x.educationTypeID == typeid);
- let selectedEducationType: EducationType[] = this.educationTypes.filter(x => x.id == this.academic.educationTypeID)
+ this.educationLevels = this.alleducationLevels//.filter(x => x.educationTypeID == typeid);
+ let selectedEducationType: EducationType[] = this.educationTypes//.filter(x => x.id == this.academic.educationTypeID)
// this.institutions = this.allinstitutions.filter(x => x.boardRequired == selectedEducationType[0].boardRequired);
// this.institutions = this.allinstitutions.filter(x => x.educationTypeID == typeid);
this.institutions = this.allinstitutions;
@@ -260,7 +306,7 @@ export class AcademicEntryComponent implements OnInit {
if (seletedInstitution.boardRequired == true) resultType = 1;
else resultType = 2;
if (institutionid !== null)
- this.resultTypes = this.allresultTypes.filter(x => x.type == resultType);
+ this.resultTypes = this.allresultTypes//.filter(x => x.type == resultType);
this.selectedResultTypeID = null;
this.isGrade = false;
diff --git a/HRM.UI/ClientApp/src/app/core-hr/employee-profile/family/children/children-list/children-list.component.ts b/HRM.UI/ClientApp/src/app/core-hr/employee-profile/family/children/children-list/children-list.component.ts
index c338f7d..f3f6456 100644
--- a/HRM.UI/ClientApp/src/app/core-hr/employee-profile/family/children/children-list/children-list.component.ts
+++ b/HRM.UI/ClientApp/src/app/core-hr/employee-profile/family/children/children-list/children-list.component.ts
@@ -68,6 +68,11 @@ export class ChildrenListComponent implements OnInit {
this.editIndex = -1;
this.empChildren = new EmpChildren();
this.empChildren.birthDate = new Date();
+ let notApli = null;
+ if(this.occupations != null)
+ notApli = this.occupations.find(o => o.description.toUpperCase() == 'N/A');
+ if (notApli != null)
+ this.empChildren.occupationID = notApli.id;
this.isDisplay = true;
}
diff --git a/HRM.UI/ClientApp/src/app/core-hr/employee-profile/family/spouse/spouse-list/spouse-list.component.ts b/HRM.UI/ClientApp/src/app/core-hr/employee-profile/family/spouse/spouse-list/spouse-list.component.ts
index 27400e7..a41805f 100644
--- a/HRM.UI/ClientApp/src/app/core-hr/employee-profile/family/spouse/spouse-list/spouse-list.component.ts
+++ b/HRM.UI/ClientApp/src/app/core-hr/employee-profile/family/spouse/spouse-list/spouse-list.component.ts
@@ -1,14 +1,14 @@
-import {Component, OnInit, ViewEncapsulation} from '@angular/core';
-import {EmpSpouse} from '../../../../../_models/HREmployee/empSpouse';
-import {EmployeeServices} from '../../../../../_services/employee/employee.service';
-import {UntilityHandlerService} from '../../../../../utility.hanldler.service';
-import {DataTransferService} from '../../../../../data.transfer.service';
-import {ApiService} from '../../../../../app.api.service';
-import {AppWindowPopUp} from '../../../../../app.windowPopup.service';
-import {HRMNotificationService} from '../../../../../app.notification.service';
-import {Occupation} from '../../../../../_models/HRBasic/occupation';
-import {BasicService} from '../../../../../_services/Basic/basic.service';
-import {EducationLevel} from '../../../../../_models/HRBasic/education-level';
+import { Component, OnInit, ViewEncapsulation } from '@angular/core';
+import { EmpSpouse } from '../../../../../_models/HREmployee/empSpouse';
+import { EmployeeServices } from '../../../../../_services/employee/employee.service';
+import { UntilityHandlerService } from '../../../../../utility.hanldler.service';
+import { DataTransferService } from '../../../../../data.transfer.service';
+import { ApiService } from '../../../../../app.api.service';
+import { AppWindowPopUp } from '../../../../../app.windowPopup.service';
+import { HRMNotificationService } from '../../../../../app.notification.service';
+import { Occupation } from '../../../../../_models/HRBasic/occupation';
+import { BasicService } from '../../../../../_services/Basic/basic.service';
+import { EducationLevel } from '../../../../../_models/HRBasic/education-level';
@Component({
selector: 'app-spouse-list',
@@ -27,12 +27,12 @@ export class SpouseListComponent implements OnInit {
editIndex: number;
constructor(public employeeService: EmployeeServices,
- public basicService: BasicService,
- public apiService: ApiService,
- public notificationService: HRMNotificationService,
- public dataTransferService: DataTransferService,
- public WindowPopUp: AppWindowPopUp,
- public utilityHandlerService: UntilityHandlerService) {
+ public basicService: BasicService,
+ public apiService: ApiService,
+ public notificationService: HRMNotificationService,
+ public dataTransferService: DataTransferService,
+ public WindowPopUp: AppWindowPopUp,
+ public utilityHandlerService: UntilityHandlerService) {
this.empSpouse = new EmpSpouse();
}
@@ -68,7 +68,13 @@ export class SpouseListComponent implements OnInit {
addNew() {
this.editIndex = -1;
this.empSpouse = new EmpSpouse();
+ this.empSpouse.dateOfBirth = new Date();
this.empSpouse.marriageDate = new Date();
+ let notApli = null;
+ if(this.occupations != null)
+ notApli = this.occupations.find(o => o.description.toUpperCase() == 'N/A');
+ if (notApli != null)
+ this.empSpouse.occupationID = notApli.id;
this.isDisplay = true;
}
@@ -86,7 +92,7 @@ export class SpouseListComponent implements OnInit {
id: item.id
};
this.employeeService.deleteChildData(data).subscribe(
- () => {},
+ () => { },
(err) => {
console.log(err);
},
@@ -121,7 +127,7 @@ export class SpouseListComponent implements OnInit {
this.empSpouse = new EmpSpouse();
this.isDisplay = false;
}
- addHandler() {}
+ addHandler() { }
onPopUpClose() {
this.isDisplay = false;
diff --git a/HRM.UI/ClientApp/src/app/core-hr/employee-profile/nominee/nominee-entry/nominee-entry.component.html b/HRM.UI/ClientApp/src/app/core-hr/employee-profile/nominee/nominee-entry/nominee-entry.component.html
index 61a0e4a..fef5cf2 100644
--- a/HRM.UI/ClientApp/src/app/core-hr/employee-profile/nominee/nominee-entry/nominee-entry.component.html
+++ b/HRM.UI/ClientApp/src/app/core-hr/employee-profile/nominee/nominee-entry/nominee-entry.component.html
@@ -71,11 +71,14 @@
-
+
-
+
+
@@ -102,6 +105,83 @@
pInputText style="width:100%" />
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/HRM.UI/ClientApp/src/app/core-hr/employee-profile/nominee/nominee-entry/nominee-entry.component.ts b/HRM.UI/ClientApp/src/app/core-hr/employee-profile/nominee/nominee-entry/nominee-entry.component.ts
index c70a21c..3fe3cf7 100644
--- a/HRM.UI/ClientApp/src/app/core-hr/employee-profile/nominee/nominee-entry/nominee-entry.component.ts
+++ b/HRM.UI/ClientApp/src/app/core-hr/employee-profile/nominee/nominee-entry/nominee-entry.component.ts
@@ -11,10 +11,12 @@ import { HrEmployee } from '../../../../_models/HREmployee/hrEmployee';
import { BasicService } from '../../../../_services/Basic/basic.service';
import { forkJoin } from 'rxjs';
import { Relation } from '../../../../_models/HRBasic/relation';
+import { District } from '../../../../_models/HRBasic/district';
+import { Thana } from '../../../../_models/HRBasic/thana';
import { Occupation } from '../../../../_models/HRBasic/occupation';
import { NominationPurpose } from '../../../../_models/HRBasic/nomination-purpose';
import { loadingPanelService } from '../../../../hrm-loding panel/loding.panel.service';
-import { enumEmpFileUploadType } from '../../../../_models/enums';
+import { enumEmpFileUploadType, EnumExtension, EnumGender, EnumMaritalStatus } from '../../../../_models/enums';
import { debug } from 'console';
@@ -30,6 +32,9 @@ export class NomineeEntryComponent implements OnInit {
nomineeForm: FormGroup;
public active = false;
nominee: EmpNominee;
+ genderType: any = EnumExtension.getNamesAndValues(EnumGender);
+ districts: District[];
+ thanas: Thana[];
selectedPicture?: FileList;
selectedSignature?: FileList;
currentFile?: File;
@@ -38,6 +43,8 @@ export class NomineeEntryComponent implements OnInit {
@Input()
public set InputObject(InputObject: EmpNominee) {
this.nominee = InputObject;
+ if(this.nominee != undefined && this.nominee.districtID != null && this.nominee.districtID != 0)
+ this.loadThana(this.nominee.districtID);
}
constructor(public employeeService: EmployeeServices,
@@ -60,12 +67,14 @@ export class NomineeEntryComponent implements OnInit {
const getRelations = this.basicService.getAllRelations();
const getOccupations = this.basicService.getAllOccupation();
const getNominationPurpose = this.basicService.getAllNominationPurpose();
+ const getDistricts = this.basicService.getAllDistricts();
- forkJoin([getRelations, getOccupations, getNominationPurpose]).subscribe(
- ([resp1, resp2, resp3]) => {
+ forkJoin([getRelations, getOccupations, getNominationPurpose, getDistricts]).subscribe(
+ ([resp1, resp2, resp3, resp4]) => {
this.relations = resp1;
this.occupations = resp2;
this.nominationPurposes = resp3;
+ this.districts = resp4;
},
(x) => {
console.log(x);
@@ -76,6 +85,19 @@ export class NomineeEntryComponent implements OnInit {
);
}
+ loadThana(value: any) {
+ this.basicService.getAllThanas(value).subscribe((resp) => {
+ this.thanas = resp;
+ },
+ () => {
+
+ },
+ () => {
+
+ }
+ );
+ }
+
createForm() {
this.nomineeForm = new FormBuilder().group({
nominationDate: ['', Validators.required],
@@ -91,6 +113,14 @@ export class NomineeEntryComponent implements OnInit {
picturePath: [''],
signaturePath: [''],
mobile: [''],
+ gender: ['', Validators.required],
+ fatherName: [''],
+ motherName: [''],
+ spouseName: [''],
+ nID: [''],
+ district: [''],
+ thana: [''],
+ postOffice: [''],
});
}
@@ -157,4 +187,5 @@ export class NomineeEntryComponent implements OnInit {
selectedFiles = undefined;
}
}
+
}
diff --git a/HRM.UI/ClientApp/src/app/core-hr/employee-profile/nominee/nominee-list/nominee-list.component.ts b/HRM.UI/ClientApp/src/app/core-hr/employee-profile/nominee/nominee-list/nominee-list.component.ts
index b7039fe..43b5f2d 100644
--- a/HRM.UI/ClientApp/src/app/core-hr/employee-profile/nominee/nominee-list/nominee-list.component.ts
+++ b/HRM.UI/ClientApp/src/app/core-hr/employee-profile/nominee/nominee-list/nominee-list.component.ts
@@ -87,6 +87,11 @@ export class NomineeListComponent implements OnInit {
this.nominee = new EmpNominee();
this.nominee.employeeID = this.employeeService.hrEmployee.id;
this.nominee.percentage = 100;
+ let notApli = null;
+ if(this.occupations != null)
+ notApli = this.occupations.find(o => o.description.toUpperCase() == 'N/A');
+ if (notApli != null)
+ this.nominee.occupationID = notApli.id;
this.isDisplay = true;
}
public editHandler(rowIndex: any) {