diff --git a/src/app/components/hris/employees/employee-profile/accordions/accordion-profile/accordion-profile-address-details/accordion-profile-address-details.component.ts b/src/app/components/hris/employees/employee-profile/accordions/accordion-profile/accordion-profile-address-details/accordion-profile-address-details.component.ts
index 21086fe1f..c24941c88 100644
--- a/src/app/components/hris/employees/employee-profile/accordions/accordion-profile/accordion-profile-address-details/accordion-profile-address-details.component.ts
+++ b/src/app/components/hris/employees/employee-profile/accordions/accordion-profile/accordion-profile-address-details/accordion-profile-address-details.component.ts
@@ -81,8 +81,8 @@ export class AccordionProfileAddressDetailsComponent {
physicalComplexName: [this.employeeProfile!.employeeDetails.physicalAddress?.complexName?.trim()],
physicalStreetNumber: [this.employeeProfile!.employeeDetails.physicalAddress?.streetNumber?.trim(), [Validators.required, Validators.pattern(/^[0-9]*$/)]],
physicalStreetName: [this.employeeProfile!.employeeDetails.physicalAddress?.streetName?.trim(), Validators.required],
- physicalSuburb: [this.employeeProfile!.employeeDetails.physicalAddress?.suburbOrDistrict?.trim(), Validators.required],
physicalCity: [this.employeeProfile!.employeeDetails.physicalAddress?.city?.trim(), Validators.required],
+ physicalSuburb: [this.employeeProfile!.employeeDetails.physicalAddress?.suburbOrDistrict?.trim()],
physicalCountry: [this.employeeProfile!.employeeDetails.physicalAddress?.country?.trim(), Validators.required],
physicalProvince: [this.employeeProfile!.employeeDetails.physicalAddress?.province?.trim(), Validators.required],
physicalPostalCode: [this.employeeProfile!.employeeDetails.physicalAddress?.postalCode?.trim(), [Validators.required, Validators.pattern(/^[0-9]*$/), Validators.maxLength(4), Validators.minLength(4)]],
@@ -90,8 +90,8 @@ export class AccordionProfileAddressDetailsComponent {
postalComplexName: [this.employeeProfile!.employeeDetails.postalAddress?.complexName?.trim()],
postalStreetNumber: [this.employeeProfile!.employeeDetails.postalAddress?.streetNumber?.trim(), [Validators.required, Validators.pattern(/^[0-9]*$/)]],
postalStreetName: [this.employeeProfile!.employeeDetails.postalAddress?.streetName?.trim(), Validators.required],
- postalSuburb: [this.employeeProfile!.employeeDetails.postalAddress?.suburbOrDistrict?.trim(), Validators.required],
postalCity: [this.employeeProfile!.employeeDetails.postalAddress?.city?.trim(), Validators.required],
+ postalSuburb: [this.employeeProfile!.employeeDetails.postalAddress?.suburbOrDistrict?.trim()],
postalCountry: [this.employeeProfile!.employeeDetails.postalAddress?.country?.trim(), Validators.required],
postalProvince: [this.employeeProfile!.employeeDetails.postalAddress?.province?.trim(), Validators.required],
postalPostalCode: [this.employeeProfile!.employeeDetails.postalAddress?.postalCode?.trim(), [Validators.required, Validators.pattern(/^[0-9]*$/), Validators.maxLength(4), Validators.minLength(4)]]
@@ -110,8 +110,8 @@ export class AccordionProfileAddressDetailsComponent {
postalComplexName: this.sharedAccordionFunctionality.addressDetailsForm.get('physicalComplexName')?.value,
postalStreetNumber: this.sharedAccordionFunctionality.addressDetailsForm.get('physicalStreetNumber')?.value,
postalStreetName: this.sharedAccordionFunctionality.addressDetailsForm.get('physicalStreetName')?.value,
- postalSuburb: this.sharedAccordionFunctionality.addressDetailsForm.get('physicalSuburb')?.value,
postalCity: this.sharedAccordionFunctionality.addressDetailsForm.get('physicalCity')?.value,
+ postalSuburb: this.sharedAccordionFunctionality.addressDetailsForm.get('physicalSuburb')?.value,
postalCountry: this.sharedAccordionFunctionality.addressDetailsForm.get('physicalCountry')?.value,
postalProvince: this.sharedAccordionFunctionality.addressDetailsForm.get('physicalProvince')?.value,
postalPostalCode: this.sharedAccordionFunctionality.addressDetailsForm.get('physicalPostalCode')?.value
@@ -127,8 +127,8 @@ export class AccordionProfileAddressDetailsComponent {
complexName: addressDetailFormValue['physicalComplexName'],
streetName: addressDetailFormValue['physicalStreetName'],
streetNumber: addressDetailFormValue['physicalStreetNumber'],
- suburbOrDistrict: addressDetailFormValue['physicalSuburb'],
city: addressDetailFormValue['physicalCity'],
+ suburbOrDistrict: addressDetailFormValue['physicalSuburb'],
country: addressDetailFormValue['physicalCountry'],
province: addressDetailFormValue['physicalProvince'],
postalCode: addressDetailFormValue['physicalPostalCode'],
@@ -140,8 +140,8 @@ export class AccordionProfileAddressDetailsComponent {
complexName: this.sharedAccordionFunctionality.physicalEqualPostal ? addressDetailFormValue['physicalComplexName'] : addressDetailFormValue['postalComplexName'],
streetNumber: this.sharedAccordionFunctionality.physicalEqualPostal ? addressDetailFormValue['physicalStreetNumber'] : addressDetailFormValue['postalStreetNumber'],
streetName: this.sharedAccordionFunctionality.physicalEqualPostal ? addressDetailFormValue['physicalStreetName'] : addressDetailFormValue['postalStreetName'],
- suburbOrDistrict: this.sharedAccordionFunctionality.physicalEqualPostal ? addressDetailFormValue['physicalSuburb'] : addressDetailFormValue['postalSuburb'],
city: this.sharedAccordionFunctionality.physicalEqualPostal ? addressDetailFormValue['physicalCity'] : addressDetailFormValue['postalCity'],
+ suburbOrDistrict: this.sharedAccordionFunctionality.physicalEqualPostal ? addressDetailFormValue['physicalSuburb'] : addressDetailFormValue['postalSuburb'],
country: this.sharedAccordionFunctionality.physicalEqualPostal ? addressDetailFormValue['physicalCountry'] : addressDetailFormValue['postalCountry'],
province: this.sharedAccordionFunctionality.physicalEqualPostal ? addressDetailFormValue['physicalProvince'] : addressDetailFormValue['postalProvince'],
postalCode: this.sharedAccordionFunctionality.physicalEqualPostal ? addressDetailFormValue['physicalPostalCode'] : addressDetailFormValue['postalPostalCode'],
@@ -161,14 +161,10 @@ export class AccordionProfileAddressDetailsComponent {
this.getEmployeeFields();
this.sharedAccordionFunctionality.editAddress = false;
},
- error: (error: any) => {
- this.snackBarService.showSnackbar("Unable to Update Address Information", "snack-error");
- },
+ error: (er) => this.snackBarService.showError(er),
});
},
- error: (error: any) => {
- this.snackBarService.showSnackbar("Unable to Update Address Information", "snack-error");
- },
+ error: (er: any) => this.snackBarService.showError(er),
});
} else {
this.snackBarService.showSnackbar("Some Fields Are Still Missing Information", "snack-error");
@@ -224,74 +220,91 @@ export class AccordionProfileAddressDetailsComponent {
loadPhysicalAddress() {
this.locationApiService.getCountries().subscribe({
- next: (data) => {
- this.countries = data
- },
- error: (error: any) => {
- this.snackBarService.showSnackbar('Unable to Load Countries', "snack-error")
- },
- complete: () => {
- this.selectedCountry = this.employeeProfile!.employeeDetails.physicalAddress?.country!
- if(this.selectedCountry == " ")
- {
- return;
- }
- this.locationApiService.getProvinces(this.selectedCountry).subscribe({
- next: (data) => this.provinces = data,
- error: (error: any) => {
- this.snackBarService.showSnackbar('Unable to Load Provinces', "snack-error")
- },
- complete: () => {
- this.selectedProvince = this.employeeProfile!.employeeDetails.physicalAddress?.province!
+ next: (data) => {
+ if (!data || data.length === 0) {
+ return;
+ }
+ this.countries = data;
+ this.selectedCountry = this.employeeProfile?.employeeDetails.physicalAddress?.country || '';
+ if (!this.selectedCountry.trim()) {
+ return;
+ }
this.locationApiService.getProvinces(this.selectedCountry).subscribe({
- next: (data) => this.provinces = data,
- complete: () => {
- this.locationApiService.getCities(this.selectedCountry, this.selectedProvince).subscribe({
- next: (data) => this.cities = data,
- });
- }
+ next: (data) => {
+ if (!data || data.length === 0) {
+ return;
+ }
+ this.provinces = data;
+ this.selectedProvince = this.employeeProfile?.employeeDetails.physicalAddress?.province || '';
+ if (this.selectedProvince) {
+ this.locationApiService.getCities(this.selectedCountry, this.selectedProvince).subscribe({
+ next: (data) => {
+ if (!data || data.length === 0) {
+ return;
+ }
+ this.cities = data;
+ },
+ error: (error: any) => {
+ this.snackBarService.showSnackbar('Unable to Load Cities', "snack-error");
+ }
+ });
+ }
+ },
+ error: (error: any) => {
+ this.snackBarService.showSnackbar('Unable to Load Provinces', "snack-error");
+ }
});
- }
- })
- }
- })
+ },
+ error: (error: any) => {
+ this.snackBarService.showSnackbar('Unable to Load Countries', "snack-error");
+ }
+ });
}
loadPostalAddress() {
this.locationApiService.getCountries().subscribe({
- next: (data) => {
- this.postalCountries = data
- },
- error: (error: any) => {
- this.snackBarService.showSnackbar('Unable to Load Countries', "snack-error")
- },
- complete: () => {
- this.selectedPostalCountry = this.employeeProfile!.employeeDetails.postalAddress?.country!
- if(this.selectedPostalCountry == " ")
- {
- return;
- }
- this.locationApiService.getProvinces(this.selectedPostalCountry).subscribe({
- next: (data) => this.postalProvinces = data,
- error: (error: any) => {
- this.snackBarService.showSnackbar('Unable to Load Provinces', "snack-error")
- },
- complete: () => {
- this.selectedPostalProvince = this.employeeProfile!.employeeDetails.postalAddress?.province!
+ next: (data) => {
+ if (!data || data.length === 0) {
+ return;
+ }
+ this.postalCountries = data;
+ this.selectedPostalCountry = this.employeeProfile?.employeeDetails.postalAddress?.country || '';
+ if (!this.selectedPostalCountry.trim()) {
+ return;
+ }
this.locationApiService.getProvinces(this.selectedPostalCountry).subscribe({
- next: (data) => this.postalProvinces = data,
- complete: () => {
- this.locationApiService.getCities(this.selectedPostalCountry, this.selectedPostalProvince).subscribe({
- next: (data) => this.postalCities = data,
- });
- }
+ next: (data) => {
+ if (!data || data.length === 0) {
+ return;
+ }
+ this.postalProvinces = data;
+ this.selectedPostalProvince = this.employeeProfile?.employeeDetails.postalAddress?.province || '';
+ if (this.selectedPostalProvince) {
+ this.locationApiService.getCities(this.selectedPostalCountry, this.selectedPostalProvince).subscribe({
+ next: (data) => {
+ if (!data || data.length === 0) {
+ return;
+ }
+ this.postalCities = data;
+ },
+ error: (error: any) => {
+ this.snackBarService.showSnackbar('Unable to Load Cities', "snack-error");
+ }
+ });
+ }
+ },
+ error: (error: any) => {
+ this.snackBarService.showSnackbar('Unable to Load Provinces', "snack-error");
+ }
});
- }
- })
- }
- })
+ },
+ error: (error: any) => {
+ this.snackBarService.showSnackbar('Unable to Load Countries', "snack-error");
+ }
+ });
}
+
getEmployeeData() {
if (this.employeeId != undefined) {
this.employeeDataService.getEmployeeData(this.employeeId).subscribe({
@@ -361,9 +374,8 @@ export class AccordionProfileAddressDetailsComponent {
}
this.getEmployeeFieldCodes();
this.initializeForm();
- }, error: () => {
- this.snackBarService.showSnackbar("Unable to Fetch User Profile", "snack-error");
- }
+ },
+ error: (er) => this.snackBarService.showError(er),
})
}
}
diff --git a/src/app/components/hris/employees/employee-profile/accordions/accordion-profile/accordion-profile-contact-details/accordion-profile-contact-details.component.html b/src/app/components/hris/employees/employee-profile/accordions/accordion-profile/accordion-profile-contact-details/accordion-profile-contact-details.component.html
index a392a4a9b..ce280b9fd 100644
--- a/src/app/components/hris/employees/employee-profile/accordions/accordion-profile/accordion-profile-contact-details/accordion-profile-contact-details.component.html
+++ b/src/app/components/hris/employees/employee-profile/accordions/accordion-profile/accordion-profile-contact-details/accordion-profile-contact-details.component.html
@@ -41,7 +41,7 @@
- Work email
+ Work Email
@@ -81,7 +81,7 @@
- Home Number
+ Alternative Number
- Emergency contact name
+ Emergency Contact Name
@@ -119,7 +119,7 @@
- Emergency contact number
+ Emergency Contact Number
{ this.snackBarService.showSnackbar("Unable to Save Contact Information", "snack-error") },
+ error: (er) => this.snackBarService.showError(er),
});
}
else {
diff --git a/src/app/components/hris/employees/employee-profile/accordions/accordion-profile/accordion-profile-employee-details/accordion-profile-employee-details.component.ts b/src/app/components/hris/employees/employee-profile/accordions/accordion-profile/accordion-profile-employee-details/accordion-profile-employee-details.component.ts
index 64ef8dbba..e3ff4fa10 100644
--- a/src/app/components/hris/employees/employee-profile/accordions/accordion-profile/accordion-profile-employee-details/accordion-profile-employee-details.component.ts
+++ b/src/app/components/hris/employees/employee-profile/accordions/accordion-profile/accordion-profile-employee-details/accordion-profile-employee-details.component.ts
@@ -248,9 +248,7 @@ export class AccordionProfileEmployeeDetailsComponent {
this.sharedAccordionFunctionality.employeeDetailsForm.disable();
this.navService.refreshEmployee();
},
- error: () => {
- this.snackBarService.showSnackbar("Unable to Update Employee Details", "snack-error");
- }
+ error: (er) => this.snackBarService.showError(er),
});
} else {
this.snackBarService.showSnackbar("ID Number Already in Use", "snack-error");
@@ -377,7 +375,8 @@ export class AccordionProfileEmployeeDetailsComponent {
this.sharedAccordionFunctionality.employeePostalAddress = data.postalAddress!;
this.sharedAccordionFunctionality.hasDisability = data.disability;
this.sharedAccordionFunctionality.hasDisability = this.employeeProfile!.employeeDetails.disability;
- }, complete: () => {
+ },
+ complete: () => {
this.getEmployeeData();
this.getEmployeeTypes();
if (this.authAccessService.isAdmin() || this.authAccessService.isSuperAdmin() || this.authAccessService.isJourney() || this.authAccessService.isTalent()) {
@@ -385,9 +384,8 @@ export class AccordionProfileEmployeeDetailsComponent {
}
this.getEmployeeFieldCodes();
this.initializeForm();
- }, error: () => {
- this.snackBarService.showSnackbar("Unable to Fetch User Profile", "snack-error");
- }
+ },
+ error: (er) => this.snackBarService.showError(er),
})
}
}
diff --git a/src/app/components/hris/employees/employee-profile/accordions/accordion-profile/accordion-profile-personal-details/accordion-profile-personal-details.component.html b/src/app/components/hris/employees/employee-profile/accordions/accordion-profile/accordion-profile-personal-details/accordion-profile-personal-details.component.html
index b420cad7c..7a1954388 100644
--- a/src/app/components/hris/employees/employee-profile/accordions/accordion-profile/accordion-profile-personal-details/accordion-profile-personal-details.component.html
+++ b/src/app/components/hris/employees/employee-profile/accordions/accordion-profile/accordion-profile-personal-details/accordion-profile-personal-details.component.html
@@ -69,18 +69,18 @@
-
+
Disability
-
-
+
+
{{disability.value}}
-
+
diff --git a/src/app/components/hris/employees/employee-profile/accordions/accordion-profile/accordion-profile-personal-details/accordion-profile-personal-details.component.ts b/src/app/components/hris/employees/employee-profile/accordions/accordion-profile/accordion-profile-personal-details/accordion-profile-personal-details.component.ts
index ad59a3d1f..f822e6eba 100644
--- a/src/app/components/hris/employees/employee-profile/accordions/accordion-profile/accordion-profile-personal-details/accordion-profile-personal-details.component.ts
+++ b/src/app/components/hris/employees/employee-profile/accordions/accordion-profile/accordion-profile-personal-details/accordion-profile-personal-details.component.ts
@@ -9,6 +9,8 @@ import { SnackbarService } from 'src/app/services/shared-services/snackbar-servi
import { SharedAccordionFunctionality } from '../../../shared-accordion-functionality';
import { PropertyAccessLevel } from 'src/app/models/hris/constants/enums/property-access-levels.enum';
import { LocationApiService } from 'src/app/services/hris/location-api.service';
+import { GenericDropDownObject } from 'src/app/models/hris/generic-drop-down-object.interface';
+import { disabilities } from 'src/app/models/hris/constants/disabilities.constant';
@Component({
selector: 'app-accordion-profile-personal-details',
@@ -19,6 +21,7 @@ export class AccordionProfilePersonalDetailsComponent {
screenWidth = window.innerWidth;
countries: string[] = [];
+ isCustomType: boolean = false;
@HostListener('window:resize', ['$event'])
usingProfile: boolean = true;
@@ -30,15 +33,46 @@ export class AccordionProfilePersonalDetailsComponent {
this.usingProfile = this.employeeProfile!.simpleEmployee == undefined;
this.initializeForm();
this.loadCountries();
+ this.checkDisabilityType();
+
+ this.sharedAccordionFunctionality.personalDetailsForm.get('disability')?.valueChanges.subscribe(value => {
+ const disabilityNotesControl = this.sharedAccordionFunctionality.personalDetailsForm.get('disabilityType');
+ if (value === true) {
+ disabilityNotesControl?.setValidators([Validators.required]);
+ } else {
+ disabilityNotesControl?.clearValidators();
+ }
+ disabilityNotesControl?.updateValueAndValidity();
+ });
+
+ this.sharedAccordionFunctionality.personalDetailsForm.get('disabilityType')?.valueChanges.subscribe(value => {
+ const disabilityNotesControl = this.sharedAccordionFunctionality.personalDetailsForm.get('disabilityNotes');
+ if (value == 'Other') {
+ disabilityNotesControl?.setValidators([Validators.required]);
+ } else {
+ disabilityNotesControl?.clearValidators();
+ }
+ disabilityNotesControl?.updateValueAndValidity();
+ });
}
@Input() employeeProfile!: { employeeDetails: EmployeeProfile, simpleEmployee: SimpleEmployee }
+ checkDisabilityType(){
+ if(disabilities.map(x => x.value).includes(this.employeeProfile.employeeDetails.disabilityNotes!)){
+ this.isCustomType = false;
+ }
+ else{
+ this.isCustomType = true
+ }
+ }
+
initializeForm() {
this.sharedAccordionFunctionality.personalDetailsForm = this.fb.group({
gender: [this.employeeProfile!.employeeDetails.gender, Validators.required],
race: [this.employeeProfile!.employeeDetails.race, Validators.required],
disability: [this.employeeProfile!.employeeDetails.disability, Validators.required],
+ disabilityType: [!this.isCustomType ? this.employeeProfile.employeeDetails.disabilityNotes: "Other"],
nationality: [this.employeeProfile!.employeeDetails.nationality, Validators.required],
countryOfBirth: [this.employeeProfile!.employeeDetails.countryOfBirth, Validators.required],
disabilityList: "",
@@ -122,11 +156,25 @@ export class AccordionProfilePersonalDetailsComponent {
this.sharedAccordionFunctionality.hasDisability = event.value;
}
+ setTypeOther(event: any) {
+ if(event.source.value == 'Other'){
+ this.sharedAccordionFunctionality.typeOther = true;
+ }
+ else{
+ this.sharedAccordionFunctionality.typeOther = false;
+ }
+ }
+
savePersonalEdit() {
if (this.sharedAccordionFunctionality.personalDetailsForm.valid) {
const personalDetailsFormValue = this.sharedAccordionFunctionality.personalDetailsForm.value;
this.sharedAccordionFunctionality.employeeProfileDto!.disability = personalDetailsFormValue.disability;
- this.sharedAccordionFunctionality.employeeProfileDto!.disabilityNotes = personalDetailsFormValue.disabilityNotes;
+ if(this.sharedAccordionFunctionality.typeOther == false){
+ this.sharedAccordionFunctionality.employeeProfileDto!.disabilityNotes = personalDetailsFormValue.disabilityType;
+ }
+ else{
+ this.sharedAccordionFunctionality.employeeProfileDto!.disabilityNotes = personalDetailsFormValue.disabilityNotes;
+ }
this.sharedAccordionFunctionality.employeeProfileDto!.race = personalDetailsFormValue.race;
this.sharedAccordionFunctionality.employeeProfileDto!.gender = personalDetailsFormValue.gender;
this.sharedAccordionFunctionality.employeeProfileDto!.countryOfBirth = personalDetailsFormValue.countryOfBirth;
@@ -140,9 +188,7 @@ export class AccordionProfilePersonalDetailsComponent {
this.sharedAccordionFunctionality.personalDetailsForm.disable();
this.sharedAccordionFunctionality.editPersonal = false;
},
- error: (error) => {
- this.snackBarService.showSnackbar("Unable to Save Personal Information", "snack-error");
- },
+ error: (er) => this.snackBarService.showError(er),
});
}
else {
diff --git a/src/app/components/hris/employees/employee-profile/employee-profile.component.css b/src/app/components/hris/employees/employee-profile/employee-profile.component.css
index fee495301..f41e628ee 100644
--- a/src/app/components/hris/employees/employee-profile/employee-profile.component.css
+++ b/src/app/components/hris/employees/employee-profile/employee-profile.component.css
@@ -132,6 +132,7 @@
font-weight: 500;
line-height: 20px;
letter-spacing: 0.1px;
+ cursor: pointer;
}
#profile-header {
@@ -427,4 +428,8 @@ div.row {
#overall-progress-bar {
border-color: #0029C6;
+}
+
+#progress-container{
+ margin-top: 0.8rem !important;
}
\ No newline at end of file
diff --git a/src/app/components/hris/employees/employee-profile/employee-profile.component.ts b/src/app/components/hris/employees/employee-profile/employee-profile.component.ts
index 8e18ebaf9..e2e768a5e 100644
--- a/src/app/components/hris/employees/employee-profile/employee-profile.component.ts
+++ b/src/app/components/hris/employees/employee-profile/employee-profile.component.ts
@@ -179,10 +179,7 @@ export class EmployeeProfileComponent implements OnChanges {
this.employeeId = this.authAccessService.getUserId();
}
- if (this.authAccessService.isAdmin() ||
- this.authAccessService.isSuperAdmin() ||
- this.authAccessService.isJourney() ||
- this.authAccessService.isTalent()) {
+ if (this.authAccessService.isSupport()) {
this.usingSimpleProfile = false;
}
else {
@@ -219,9 +216,7 @@ export class EmployeeProfileComponent implements OnChanges {
next: (data: EmployeeTermination) => {
this.terminationData = data;
},
- error: err => {
- this.snackBarService.showSnackbar('Unable to Fetch Termination Details', err);
- }
+ error: (er) => this.snackBarService.showError(er),
});
}
@@ -252,9 +247,7 @@ export class EmployeeProfileComponent implements OnChanges {
}
this.changeDetectorRef.detectChanges();
},
- error: (error: any) => {
- this.snackBarService.showSnackbar("Unable to Retrieve Profile", 'snack-error');
- }
+ error: (er: any) => this.snackBarService.showError(er),
})
}
@@ -275,9 +268,7 @@ export class EmployeeProfileComponent implements OnChanges {
if (!this.usingSimpleProfile)
this.getAllEmployees();
},
- error: () => {
- this.snackBarService.showSnackbar("Unable to Retrieve Profile", 'snack-error');
- }
+ error: (er: any) => this.snackBarService.showError(er),
})
}
@@ -297,7 +288,7 @@ export class EmployeeProfileComponent implements OnChanges {
get basedInString(): string {
let basedIn = '';
if (this.employeeProfile.physicalAddress !== undefined && this.employeeProfile.physicalAddress.suburbOrDistrict && this.employeeProfile.physicalAddress.suburbOrDistrict.length > 2) {
- basedIn = `Based in ${this.employeeProfile.physicalAddress.suburbOrDistrict}`;
+ basedIn = `Based in ${this.employeeProfile.physicalAddress.city}`;
}
return basedIn;
}
@@ -421,9 +412,7 @@ export class EmployeeProfileComponent implements OnChanges {
this.snackBarService.showSnackbar("Updated", "snack-success");
this.navService.refreshEmployee();
},
- error: () => {
- this.snackBarService.showSnackbar('Unable to Update Employee Profile Picture', 'snack-error');
- }
+ error: (er) => this.snackBarService.showError(er),
});
}
diff --git a/src/app/components/hris/employees/employee-profile/shared-accordion-functionality.ts b/src/app/components/hris/employees/employee-profile/shared-accordion-functionality.ts
index 73eab7bed..427eb538d 100644
--- a/src/app/components/hris/employees/employee-profile/shared-accordion-functionality.ts
+++ b/src/app/components/hris/employees/employee-profile/shared-accordion-functionality.ts
@@ -71,7 +71,6 @@ export class SharedAccordionFunctionality {
fileMyDocumentCategories = MyDocumentTypes;
employeeQualification!: EmployeeQualifications;
-
employeeQualificationDto: EmployeeQualifications = {
id: 0,
employeeId: 0,
@@ -87,6 +86,7 @@ export class SharedAccordionFunctionality {
panelOpenState: boolean = false;
physicalEqualPostal: boolean = true;
hasDisability: boolean | undefined = false;
+ typeOther: boolean | undefined = false;
editEmployee: boolean = false;
editPersonal: boolean = false;
editAddress: boolean = false;
@@ -432,86 +432,32 @@ export class SharedAccordionFunctionality {
}
calculateCareerAdditionalFormProgress() {
- let filledCount = 0;
+ let numberOfPopulatedFields = 0;
+ let numberOfRequiredFields = 0;
+
const formControls = this.additionalCareerInfoForm.controls;
- let totalFields = Object.keys(this.additionalCareerInfoForm.controls).length;
+
for (const controlName in formControls) {
if (formControls.hasOwnProperty(controlName)) {
const control = formControls[controlName];
- if (control.value != null && control.value != "") {
- filledCount++;
+ let isRequired = false;
+ if (control.validator) {
+ const validator = control.validator({} as AbstractControl);
+ isRequired = validator && validator['required'] ? true : false;
}
- }
- }
- this.additionalCareerFormProgress = Math.round((filledCount / totalFields) * 100);
- if (Number.isNaN(this.additionalCareerFormProgress)) {
- this.additionalCareerFormProgress = 0;
- }
- }
-
- calculateCareerWorkExperienceFormProgress() {
- let targetWorkExp: any = [];
- let newTargetWorkExp: any = [];
- this.filteredFilledWorkExp.length = 0;
- this.workExperienceFormFields = 7 * this.workExperience.length;
-
- if (this.workExperience.length === 0) {
- this.workExperienceFormFields = 0;
- this.filteredFilledWorkExp.length = 0;
- }
- else {
- for (const element of this.workExperience) {
- targetWorkExp.push(element);
- }
- targetWorkExp.filter((element: any) => {
- const { employeeId, id, ...samplearray } = element;
- newTargetWorkExp.push(samplearray);
- });
-
- newTargetWorkExp.filter((obj: any) => Object.values(obj).some((value: any) => {
- if (value.length !== 0) {
- this.filteredFilledWorkExp.push(value)
+ if (isRequired) {
+ numberOfRequiredFields++;
+ if (control.value != null && control.value !== '') {
+ numberOfPopulatedFields++;
+ }
}
}
- ));
- }
-
- const FilledCount = this.filteredFilledWorkExp.length;
- this.workExpFormProgress = FilledCount === 0 || this.workExperienceFormFields == 0 ? 0
- : Math.round((FilledCount / this.workExperienceFormFields) * 100);
- }
-
- calculateCareerCertificatesFormProgress() {
- let targetCertificates: any = [];
- let newTargetCertificates: any = [];
- this.filteredFilledCertificate.length = 0;
- this.employeeCertificatesFields = 4 * this.employeeCertificates.length;
-
- if (this.employeeCertificates.length === 0) {
- this.employeeCertificatesFields = 0;
- this.filteredFilledCertificate.length = 0;
}
- else {
- for (const element of this.employeeCertificates) {
- targetCertificates.push(element);
- }
-
- targetCertificates.filter((element: any) => {
- const { employeeId, id, certificateDocument, ...samplearray } = element;
- newTargetCertificates.push(samplearray);
- });
-
- newTargetCertificates.filter((obj: any) => Object.values(obj).some((value: any) => {
- if (value.length !== 0) {
- this.filteredFilledCertificate.push(value)
- }
- }
- ));
+ if (numberOfRequiredFields === 0) {
+ this.additionalCareerFormProgress = 100;
+ } else {
+ this.additionalCareerFormProgress = Math.round((numberOfPopulatedFields / numberOfRequiredFields) * 100);
}
-
- const FilledCount = this.filteredFilledCertificate.length;
- this.certificateFormProgress = FilledCount === 0 || this.employeeCertificatesFields == 0 ? 0
- : Math.round((FilledCount / this.employeeCertificatesFields) * 100);
}
calculateSalaryDetails() {
@@ -536,10 +482,10 @@ export class SharedAccordionFunctionality {
totalCareerProgress() {
if (this.additionalCareerFormProgress == Infinity) {
- this.careerFormProgress = Math.floor((this.qualificationFormProgress + this.certificateFormProgress + this.workExpFormProgress + this.salaryDetailsFormProgress) / 4);
+ this.careerFormProgress = Math.floor((this.qualificationFormProgress + this.salaryDetailsFormProgress) / 2);
}
else {
- this.careerFormProgress = Math.floor((this.additionalCareerFormProgress + this.qualificationFormProgress + this.certificateFormProgress + this.workExpFormProgress + this.salaryDetailsFormProgress) / 5);
+ this.careerFormProgress = Math.floor((this.additionalCareerFormProgress + this.qualificationFormProgress + this.salaryDetailsFormProgress) / 3);
this.updateCareer.emit(this.careerFormProgress);
}
}
diff --git a/src/app/components/hris/employees/employee-termination/employee-termination.component.ts b/src/app/components/hris/employees/employee-termination/employee-termination.component.ts
index 8c6204081..63082c548 100644
--- a/src/app/components/hris/employees/employee-termination/employee-termination.component.ts
+++ b/src/app/components/hris/employees/employee-termination/employee-termination.component.ts
@@ -109,7 +109,7 @@ export class EmployeeTerminationComponent implements OnInit {
};
this.employeeTerminationService.saveEmployeeTermination(employeeTerminationDto).subscribe({
next: () => this.snackBarService.showSnackbar("Employee Terminated", "snack-success"),
- error: () => this.snackBarService.showSnackbar("Unable to Save Termination", 'snack-error'),
+ error: (er) => this.snackBarService.showError(er),
complete: () => {
this.router.navigateByUrl(nextPage);
}
diff --git a/src/app/components/hris/employees/new-employee/new-employee.component.html b/src/app/components/hris/employees/new-employee/new-employee.component.html
index 194dbd507..2c3a706e2 100644
--- a/src/app/components/hris/employees/new-employee/new-employee.component.html
+++ b/src/app/components/hris/employees/new-employee/new-employee.component.html
@@ -147,7 +147,7 @@ Employee Details
Do you have any disabilities?
-
+
{{ check ? "Yes" : "No"}}
@@ -156,7 +156,13 @@ Employee Details
Disability is required
-
+
+ Disability Types
+
+ {{ type.value }}
+
+
+
Disability Notes
@@ -272,7 +278,7 @@ Physical Address
Street Number
- Street number must only contain numbers
+ Please enter a valid street number
@@ -550,7 +556,7 @@ Starter kits
+ {{ churnRate.churnRateDifference }}%
+ increase from last month
+