fixed MOE issues before profuction

MOE-PHASE-2
umasoodch 1 year ago
parent 133c8ecc9d
commit 0aa437160f

@ -37,5 +37,5 @@
height: 60%;
}
.dependent-title .ion-title{
font-size:0.4cm !important;
font-size:0.5cm !important;
}

@ -19,8 +19,10 @@ export class CardFilterComponent implements OnInit {
ngOnInit() {
this.direction = TranslatorService.getCurrentLanguageName();
console.log(this.direction);
if (this.direction == 'ar') {
if (this.direction == 'ar' && this.text == 'HR') {
this.text = 'الموارد البشرية';
} else if (this.direction == 'ar' && this.text == 'HR-C') {
this.text = 'قائمة المهام';
}
}

@ -29,7 +29,7 @@ export class WorklistAdvancedSearchComponent implements OnInit {
ngOnInit() {
this.text = this.direction == 'en' ? 'HR': 'الموارد البشرية';
this.text2 = this.direction == 'en' ? 'HR Checklist': 'قائمة مراجعة الموارد البشرية';
this.text2 = this.direction == 'en' ? 'HR Checklist': 'قائمة المهام';
}
public dismissModal() {

@ -1256,6 +1256,11 @@
</ion-tab-button>
<ion-tab-button *ngIf="completeDis" (click)="actionButton('COMPLETE')">
<img src="../assets/imgs/mohemm-action/completed.png">
<ion-label class="action-btn"> {{complete_label}}</ion-label>
</ion-tab-button>
<ion-tab-button *ngIf="requestDis" (click)="actionButton('REQUEST_INFO')">
<img src="../assets/imgs/mohemm-action/info.png">
<!-- <ion-label > {{'worklistMain, request' | translate}}</ion-label> -->

@ -98,6 +98,7 @@ export class WorklistMainComponent implements OnInit {
approveDis: boolean = false;
rejectDis: boolean = false;
requestDis: boolean = false;
completeDis: boolean = false;
moreDisabled: boolean = true;
dirfromNotificationPage: boolean = false;
direction: string;
@ -108,6 +109,7 @@ export class WorklistMainComponent implements OnInit {
approve_label: any = "";
reject_label: any = "";
reqInfo_label: any = "";
complete_label: any = "";
close_label: any;
closeDis: boolean = false;
public selectedFilter: string;
@ -209,6 +211,7 @@ export class WorklistMainComponent implements OnInit {
this.requestDis = false;
this.moreDisabled = true;
this.closeDis = false;
this.completeDis = false;
if (this.messageSuccess) {
document.getElementById("notificationDynamicFields").innerHTML = "";
@ -579,11 +582,12 @@ export class WorklistMainComponent implements OnInit {
(this.notificationButtonRes[i].BUTTON_ACTION == "CLOSE") {
this.close_label = this.notificationButtonRes[i].BUTTON_LABEL;
this.closeDis = true;
} else if
(this.notificationButtonRes[i].BUTTON_ACTION != "APPROVED" && this.notificationButtonRes[i].BUTTON_ACTION != "REJECTED" && this.notificationButtonRes[i].BUTTON_ACTION != "REQUEST_INFO" && this.notificationButtonRes[i].BUTTON_ACTION != "CLOSE") {
}
else if (this.notificationButtonRes[i].BUTTON_ACTION == "COMPLETE") {
this.complete_label = this.notificationButtonRes[i].BUTTON_LABEL;
this.completeDis = true;
} else if (this.notificationButtonRes[i].BUTTON_ACTION != "APPROVED" && this.notificationButtonRes[i].BUTTON_ACTION != "REJECTED" && this.notificationButtonRes[i].BUTTON_ACTION != "REQUEST_INFO" && this.notificationButtonRes[i].BUTTON_ACTION != "CLOSE" && this.notificationButtonRes[i].BUTTON_ACTION != "COMPLETE") {
this.moreDisabled = false;
}
}
}

@ -50,3 +50,16 @@
color: #999999 !important;
height:80px
}
.addEitOkButton{
white-space: normal !important;
text-transform: capitalize !important;
min-height: 45px !important;
min-width: 5px !important;
margin: 8px !important;
background-color: #44A7A1;
width: 80% !important;
color: white !important;
border-radius: 16px !important;
--border-radius: 16px !important;
}

@ -165,8 +165,8 @@ export class AddUpdateContactComponent implements OnInit {
P_FUNCTION_NAME: this.functionName,
P_SELECTED_EMPLOYEE_NUMBER: this.selEmp,
P_MENU_TYPE: this.menuType,
P_SELECTED_RESP_ID: this.respID,
'P_DESC_FLEX_CONTEXT_CODE': 'HMG_ADD_CONTACT_DETAILS'
P_SELECTED_RESP_ID: this.respID
// 'P_DESC_FLEX_CONTEXT_CODE': 'HMG_ADD_CONTACT_DETAILS'
};
this.profileService.getContactDFFStrutre(body).subscribe((result: any) => {
this.handleDffStructureResult(result);
@ -181,16 +181,17 @@ export class AddUpdateContactComponent implements OnInit {
}
}
private getBasicffStructure() {
const body = {
P_FUNCTION_NAME: this.functionName,
P_SELECTED_EMPLOYEE_NUMBER: this.selEmp,
P_MENU_TYPE: this.menuType,
P_SELECTED_RESP_ID: this.respID,
P_REQUEST_TYPE: this.getPassMnuEntryObj.REQUEST_TYPE
};
this.profileService.getBasicDFFStrutre(body).subscribe((result: any) => {
this.handleBasicDffStructureResult(result);
});
this.getColumnStructure();
// const body = {
// P_FUNCTION_NAME: this.functionName,
// P_SELECTED_EMPLOYEE_NUMBER: this.selEmp,
// P_MENU_TYPE: this.menuType,
// P_SELECTED_RESP_ID: this.respID,
// P_REQUEST_TYPE: this.getPassMnuEntryObj.REQUEST_TYPE
// };
// this.profileService.getBasicDFFStrutre(body).subscribe((result: any) => {
// this.handleBasicDffStructureResult(result);
// });
}
public handleBasicColStructureResult(result) {
@ -2122,7 +2123,7 @@ export class AddUpdateContactComponent implements OnInit {
DATE_VALUE: this.cs.formatDate(this.endDate)
});
} else {
this.arrValues = this.getElementsValues();
// this.arrValues = this.getElementsValues();
var dffvalues = this.getElementsValuesDff();
let staticValues = this.getElementsStaticValues();
allStatisDynamicValues = dffvalues.concat(this.arrValues.concat(staticValues));

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.5 KiB

Loading…
Cancel
Save