fixed moe issues

MOE_MAIN-COLOR_CHANGES
umasoodch 3 years ago
parent 1573dbaafb
commit adb4aaae4d

@ -1231,6 +1231,7 @@ export class AddEitComponent implements OnInit {
} }
if (this.eitResponse[i].REQUIRED_FLAG == "Y" && !elemVal) { if (this.eitResponse[i].REQUIRED_FLAG == "Y" && !elemVal) {
elem.classList.add("requiredClassElm"); elem.classList.add("requiredClassElm");
this.cs.redToastPK("eit", "required-text");
//this.common.showRequiredMsg(); //this.common.showRequiredMsg();
return false; return false;
} else { } else {

@ -267,7 +267,7 @@ export class ConfirmAddressComponent implements OnInit {
//if(this.isResubmitEIT==false){ //if(this.isResubmitEIT==false){
// let msg: string = this.ts.trPK("eit", "approval-message-success"); // let msg: string = this.ts.trPK("eit", "approval-message-success");
// this.cs.presentAlert(msg); // this.cs.presentAlert(msg);
this.cs.greenToastPK("eit", "approval-message-success") this.cs.greenToastPK("eit", "contact-approval-message-success")
// } // }
// this.navCtrl.popToRoot(); // this.navCtrl.popToRoot();
this.cs.sharedService.setSharedData(true, HomeComponent.COUNT_CHANGED); this.cs.sharedService.setSharedData(true, HomeComponent.COUNT_CHANGED);

@ -194,7 +194,7 @@ export class ConfirmBasicDetailsComponent implements OnInit {
this.isSubmitBtnClicked = true; this.isSubmitBtnClicked = true;
// let msg: string = this.ts.trPK("eit", "approval-message-success"); // let msg: string = this.ts.trPK("eit", "approval-message-success");
// this.cs.presentAlert(msg); // this.cs.presentAlert(msg);
this.cs.greenToastPK("eit", "approval-message-success"); this.cs.greenToastPK("eit", "basic-approval-message-success");
this.cs.sharedService.setSharedData(true, HomeComponent.COUNT_CHANGED); this.cs.sharedService.setSharedData(true, HomeComponent.COUNT_CHANGED);
// this.cs.openProfile('sideMenu'); // this.cs.openProfile('sideMenu');
this.cs.openHome(); this.cs.openHome();

@ -1,4 +1,4 @@
import { Component, OnInit } from '@angular/core'; import { Component, OnInit, NgZone } from '@angular/core';
import { AddEitResponse } from 'src/app/eit/models/add.eit.response'; import { AddEitResponse } from 'src/app/eit/models/add.eit.response';
import { EitRequest } from 'src/app/eit/models/eit.request'; import { EitRequest } from 'src/app/eit/models/eit.request';
import { CommonService } from 'src/app/hmg-common/services/common/common.service'; import { CommonService } from 'src/app/hmg-common/services/common/common.service';
@ -20,7 +20,7 @@ export class ConatactComponent implements OnInit {
respID: any; respID: any;
selMenu: any; selMenu: any;
submitrequest: any; submitrequest: any;
constructor(public cs: CommonService, public ts: TranslatorService, public profileService: ProfileService,) { constructor(public cs: CommonService, public ts: TranslatorService, public profileService: ProfileService, public ngzone: NgZone) {
this.direction = TranslatorService.getCurrentLanguageName(); this.direction = TranslatorService.getCurrentLanguageName();
this.selEmp = this.cs.sharedService.getSharedData( this.selEmp = this.cs.sharedService.getSharedData(
MenuResponse.SHARED_SEL_EMP, MenuResponse.SHARED_SEL_EMP,
@ -40,10 +40,13 @@ export class ConatactComponent implements OnInit {
ngOnInit() { ngOnInit() {
this.phoneNumbers = this.cs.sharedService.getSharedData(ProfileService.EMP_PHONE, false); this.ngzone.run(() => {
this.setIsUpdated(); this.phoneNumbers = [];
this.direction = TranslatorService.getCurrentLanguageName(); this.phoneNumbers = this.cs.sharedService.getSharedData(ProfileService.EMP_PHONE, false);
this.getObjectValue(); this.setIsUpdated();
this.direction = TranslatorService.getCurrentLanguageName();
this.getObjectValue();
})
} }
setIsUpdated() { setIsUpdated() {
this.phoneNumbers.forEach(element => { this.phoneNumbers.forEach(element => {
@ -93,6 +96,14 @@ export class ConatactComponent implements OnInit {
addNewRow() { addNewRow() {
this.phoneNumbers.push({ 'PHONE_NUMBER': '', 'PHONE_TYPE': '', 'ACTION': 'NEW_ROW', 'OBJECT_VERSION_NUMBER': null, 'PHONE_ID': null }) this.phoneNumbers.push({ 'PHONE_NUMBER': '', 'PHONE_TYPE': '', 'ACTION': 'NEW_ROW', 'OBJECT_VERSION_NUMBER': null, 'PHONE_ID': null })
} }
ionViewDidLeave() {
this.phoneNumbers = this.phoneNumbers.filter(function( obj ) {
return obj.ACTION !== 'NEW_ROW';
});
this.cs.sharedService.setSharedData(this.phoneNumbers, ProfileService.EMP_PHONE);
}
deleteRow(row) { deleteRow(row) {
row['DELETE_ROW'] = true; row['DELETE_ROW'] = true;
// this.phoneNumbers = // this.phoneNumbers =

@ -396,7 +396,6 @@ export class HomeComponent implements OnInit {
if (this.cs.validResponse(response)) { if (this.cs.validResponse(response)) {
this.cs.stopLoading(); this.cs.stopLoading();
this.phoneNumbers = response['GetEmployeePhonesList']; this.phoneNumbers = response['GetEmployeePhonesList'];
console.log(this.phoneNumbers);
this.cs.sharedService.setSharedData(this.phoneNumbers, ProfileService.EMP_PHONE); this.cs.sharedService.setSharedData(this.phoneNumbers, ProfileService.EMP_PHONE);
} }
}) })

@ -2075,6 +2075,10 @@
} }
}, },
"eit": { "eit": {
"required-text": {
"en": "Please fill the required fields!",
"ar": "يرجى تعبئة جميع الحقول المطلوبة!"
},
"done-text": { "done-text": {
"en": "Done", "en": "Done",
"ar": "تم" "ar": "تم"
@ -2123,6 +2127,14 @@
"en": "Your request has been submitted for approvals.", "en": "Your request has been submitted for approvals.",
"ar": "تم إرسال طلبك للحصول على الموافقات." "ar": "تم إرسال طلبك للحصول على الموافقات."
}, },
"basic-approval-message-success": {
"en": "Update Basic details request has been submitted for approvals.",
"ar": "تم إرسال طلب تحديث التفاصيل الأساسية للموافقات."
},
"contact-approval-message-success": {
"en": "Update Contact details request has been submitted for approvals.",
"ar": "تم إرسال طلب تحديث تفاصيل الاتصال للحصول على الموافقات."
},
"delete-perm": { "delete-perm": {
"en": "Are you sure from deleting this file permanently?", "en": "Are you sure from deleting this file permanently?",
"ar": "هل أنت متأكد من حذف هذا الملف نهائيًا؟" "ar": "هل أنت متأكد من حذف هذا الملف نهائيًا؟"
@ -3566,8 +3578,8 @@
"ar": "طلب معرف" "ar": "طلب معرف"
}, },
"output": { "output": {
"en": "Output", "en": "Download",
"ar": "انتاج" "ar": "تحميل"
} }
} }
} }
Loading…
Cancel
Save