fixed OPM AND OLM

MOE_MAIN-COLOR_CHANGES
umasoodch 3 years ago
parent 3554dbe717
commit 64bcb0ef23

@ -28,6 +28,7 @@ import { UserItemTypes } from "../models/userItemTypeRequest";
export class WorklistMainService {
public static getEITNotificationBody = "Services/ERP.svc/REST/GET_EIT_NOTIFICATION_BODY";
public static getOPMNotificationBody = "Services/ERP.svc/REST/GET_OPM_NOTIFICATION_BODY";
public static getOLMNotificationBody = "Services/ERP.svc/REST/GET_OLM_NOTIFICATION_BODY";
public static getAbsenceNotificationBody = "Services/ERP.svc/REST/GET_ABSENCE_NOTIFICATION_BODY";
public static getPoNotificationBody = "Services/ERP.svc/REST/GET_PO_NOTIFICATION_BODY";
public static getMONotificationBody = "Services/ERP.svc/REST/GET_MO_NOTIFICATION_BODY";
@ -94,6 +95,21 @@ export class WorklistMainService {
);
}
public getOLMNotification(
WorkListBodyRequest: any,
onError?: any,
errorLabel?: string
): Observable<any> {
const request = WorkListBodyRequest;
this.authService.authenticateRequest(request);
return this.api.post(
WorklistMainService.getOLMNotificationBody,
request,
onError,
errorLabel
);
}
public getAbsencesNotificationBody(
WorkListBodyRequest: any,
onError?: any,

@ -52,6 +52,8 @@
getPassNotificationDetails?.REQUEST_TYPE != 'CONTACT' &&
getPassNotificationDetails?.REQUEST_TYPE != 'PHONE_NUMBERS' &&
getPassNotificationDetails?.REQUEST_TYPE != 'TERMINATION' &&
getPassNotificationDetails?.REQUEST_TYPE != 'OPM' &&
getPassNotificationDetails?.REQUEST_TYPE != 'OLM' &&
getPassNotificationDetails?.REQUEST_TYPE != 'CEI'">
<div *ngIf="showInformation">
@ -301,6 +303,8 @@
getPassNotificationDetails?.REQUEST_TYPE == 'CONTACT' &&
getPassNotificationDetails?.REQUEST_TYPE != 'PHONE_NUMBERS' &&
getPassNotificationDetails?.REQUEST_TYPE != 'TERMINATION' &&
getPassNotificationDetails?.REQUEST_TYPE != 'OPM' &&
getPassNotificationDetails?.REQUEST_TYPE != 'OLM' &&
getPassNotificationDetails?.REQUEST_TYPE != 'CEI'">
<div *ngIf="showInformation">
<p>{{'worklist, loading'| translate}} <img style="width: 3%;"
@ -351,6 +355,8 @@
getPassNotificationDetails?.REQUEST_TYPE != 'ADDRESS' &&
getPassNotificationDetails?.REQUEST_TYPE == 'PHONE_NUMBERS' &&
getPassNotificationDetails?.REQUEST_TYPE != 'TERMINATION' &&
getPassNotificationDetails?.REQUEST_TYPE != 'OPM' &&
getPassNotificationDetails?.REQUEST_TYPE != 'OLM' &&
getPassNotificationDetails?.REQUEST_TYPE != 'CEI'">
<div *ngIf="showInformation">
<p>{{'worklist, loading'| translate}} <img style="width: 3%;"
@ -382,6 +388,8 @@
getPassNotificationDetails?.REQUEST_TYPE != 'ADDRESS' &&
getPassNotificationDetails?.REQUEST_TYPE != 'PHONE_NUMBERS' &&
getPassNotificationDetails?.REQUEST_TYPE == 'TERMINATION' &&
getPassNotificationDetails?.REQUEST_TYPE != 'OPM' &&
getPassNotificationDetails?.REQUEST_TYPE != 'OLM' &&
getPassNotificationDetails?.REQUEST_TYPE != 'CEI'">
<div *ngIf="showInformation">
<p>{{'worklist, loading'| translate}} <img style="width: 3%;"
@ -414,6 +422,8 @@
getPassNotificationDetails?.REQUEST_TYPE != 'ADDRESS' &&
getPassNotificationDetails?.REQUEST_TYPE != 'PHONE_NUMBERS' &&
getPassNotificationDetails?.REQUEST_TYPE != 'TERMINATION' &&
getPassNotificationDetails?.REQUEST_TYPE != 'OPM' &&
getPassNotificationDetails?.REQUEST_TYPE != 'OLM' &&
getPassNotificationDetails?.REQUEST_TYPE == 'CEI'">
<div *ngIf="showInformation">
<p>{{'worklist, loading'| translate}} <img style="width: 3%;"
@ -439,6 +449,420 @@
</ion-card>
</div>
</ion-col>
<!-- IF OLM -->
<ion-col *ngIf="getPassNotificationDetails?.REQUEST_TYPE != 'BASIC_DETAILS' &&
getPassNotificationDetails?.REQUEST_TYPE != 'ADDRESS' &&
getPassNotificationDetails?.REQUEST_TYPE != 'CONTACT' &&
getPassNotificationDetails?.REQUEST_TYPE != 'PHONE_NUMBERS' &&
getPassNotificationDetails?.REQUEST_TYPE != 'TERMINATION' &&
getPassNotificationDetails?.REQUEST_TYPE != 'OPM' &&
getPassNotificationDetails?.REQUEST_TYPE == 'OLM' &&
getPassNotificationDetails?.REQUEST_TYPE != 'CEI'">
<div *ngIf="showInformation">
<p>{{'worklist, loading'| translate}} <img style="width: 3%;"
src="../assets/icon/progress-loading.gif" /></p>
</div>
<div class="no-data-div" *ngIf="notificationBodyRes?.length === 0 && !showInformation">
<p>{{ 'general, empty' | translate}}</p>
</div>
<div *ngIf='notificationBodyRes.length > 0'>
<div *ngFor="let item of notificationBodyRes;let i=index;">
<h3 style="text-align: center; font-weight: bold;">{{'worklist, enrollmentDetails' | translate}}</h3>
<ion-card style="width: 91%;">
<ion-card-content>
<!-- <div *ngFor="let item of notificationBodyRes;let i=index;"> -->
<ion-row>
<ion-col class="rowBorder" style="background: #024d71;">
<ion-label>
<p style="color: white;">{{ 'worklist, courseName' | translate}}</p>
</ion-label>
</ion-col>
<ion-col class="rowBorder">
<ion-label>
<p style="color: black;">{{item.COURSE_NAME}}</p>
</ion-label>
</ion-col>
</ion-row>
<ion-row>
<ion-col class="rowBorder" style="background: #024d71;">
<ion-label>
<p style="color: white;">{{ 'worklist, startDate' | translate}}</p>
</ion-label>
</ion-col>
<ion-col class="rowBorder">
<ion-label>
<p style="color: black;">{{item.START_DATE}}</p>
</ion-label>
</ion-col>
</ion-row>
<ion-row>
<ion-col class="rowBorder" style="background: #024d71;">
<ion-label>
<p style="color: white;">{{ 'worklist, timeZone' | translate}}</p>
</ion-label>
</ion-col>
<ion-col class="rowBorder">
<ion-label>
<p style="color: black;">{{item.TIMEZONE}}</p>
</ion-label>
</ion-col>
</ion-row>
<ion-row>
<ion-col class="rowBorder" style="background: #024d71;">
<ion-label>
<p style="color: white;">{{ 'worklist, trainingCenter' | translate}}</p>
</ion-label>
</ion-col>
<ion-col class="rowBorder">
<ion-label>
<p style="color: black;">{{item.TRAINING_CENTER}}</p>
</ion-label>
</ion-col>
</ion-row>
<ion-row>
<ion-col class="rowBorder" style="background: #024d71;">
<ion-label>
<p style="color: white;">{{ 'worklist, enrollmentJustification' | translate}}</p>
</ion-label>
</ion-col>
<ion-col class="rowBorder">
<ion-label>
<p style="color: black;">{{item.ENROLLMENT_JUSTIFICATION}}</p>
</ion-label>
</ion-col>
</ion-row>
</ion-card-content>
</ion-card>
<ion-card style="width: 91%;">
<ion-card-content>
<ion-row>
<ion-col class="rowBorder" style="background: #024d71;">
<ion-label>
<p style="color: white;">{{ 'worklist, className' | translate}}</p>
</ion-label>
</ion-col>
<ion-col class="rowBorder">
<ion-label>
<p style="color: black;">{{item.CLASS_NAME}}</p>
</ion-label>
</ion-col>
</ion-row>
<ion-row>
<ion-col class="rowBorder" style="background: #024d71;">
<ion-label>
<p style="color: white;">{{ 'worklist, endDate' | translate}}</p>
</ion-label>
</ion-col>
<ion-col class="rowBorder">
<ion-label>
<p style="color: black;">{{item.END_DATE}}</p>
</ion-label>
</ion-col>
</ion-row>
<ion-row>
<ion-col class="rowBorder" style="background: #024d71;">
<ion-label>
<p style="color: white;">{{ 'worklist, deliveryMode' | translate}}</p>
</ion-label>
</ion-col>
<ion-col class="rowBorder">
<ion-label>
<p style="color: black;">{{item.DELIVERY_MODE}}</p>
</ion-label>
</ion-col>
</ion-row>
<ion-row>
<ion-col class="rowBorder" style="background: #024d71;">
<ion-label>
<p style="color: white;">{{ 'worklist, language' | translate}}</p>
</ion-label>
</ion-col>
<ion-col class="rowBorder">
<ion-label>
<p style="color: black;">{{item.LANGUAGE}}</p>
</ion-label>
</ion-col>
</ion-row>
<ion-row>
<ion-col class="rowBorder" style="background: #024d71;">
<ion-label>
<p style="color: white;">{{ 'worklist, Note' | translate}}</p>
</ion-label>
</ion-col>
<ion-col class="rowBorder">
<ion-label>
<p style="color: black;">{{item.NOTE}}</p>
</ion-label>
</ion-col>
</ion-row>
</ion-card-content>
</ion-card>
</div>
</div>
</ion-col>
<!-- IF OPM -->
<ion-col *ngIf="getPassNotificationDetails?.REQUEST_TYPE != 'BASIC_DETAILS' &&
getPassNotificationDetails?.REQUEST_TYPE != 'ADDRESS' &&
getPassNotificationDetails?.REQUEST_TYPE != 'CONTACT' &&
getPassNotificationDetails?.REQUEST_TYPE != 'PHONE_NUMBERS' &&
getPassNotificationDetails?.REQUEST_TYPE != 'TERMINATION' &&
getPassNotificationDetails?.REQUEST_TYPE == 'OPM' &&
getPassNotificationDetails?.REQUEST_TYPE != 'OLM' &&
getPassNotificationDetails?.REQUEST_TYPE != 'CEI'">
<div *ngIf="showInformation">
<p>{{'worklist, loading'| translate}} <img style="width: 3%;"
src="../assets/icon/progress-loading.gif" /></p>
</div>
<div class="no-data-div" *ngIf="notificationBodyRes?.length === 0 && !showInformation">
<p>{{ 'general, empty' | translate}}</p>
</div>
<!-- OPM OVERALL RATING -->
<div *ngIf='notificationBodyRes.P_OVERALL_RATING_LIST.length > 0'>
<h3 style="text-align: center; font-weight: bold;">{{'worklist, overallRating' | translate}}</h3>
<div *ngFor="let item of notificationBodyRes.P_OVERALL_RATING_LIST;let i=index;">
<ion-card style="width: 91%;">
<ion-card-content>
<ion-row>
<ion-col class="rowBorder" style="background: #024d71;">
<ion-label>
<p style="color: white;">{{ 'worklist, rateName' | translate}}</p>
</ion-label>
</ion-col>
<ion-col class="rowBorder">
<ion-label>
<p style="color: black;">{{item.RATE_NAME}}</p>
</ion-label>
</ion-col>
</ion-row>
<ion-row>
<ion-col class="rowBorder" style="background: #024d71;">
<ion-label>
<p style="color: white;">{{ 'worklist, overalLPerformanceID' | translate}}</p>
</ion-label>
</ion-col>
<ion-col class="rowBorder">
<ion-label>
<p style="color: black;">{{item.OVERALL_PERFORMANCE_LEVEL_ID}}</p>
</ion-label>
</ion-col>
</ion-row>
<ion-row>
<ion-col class="rowBorder" style="background: #024d71;">
<ion-label>
<p style="color: white;">{{ 'worklist, overallRating' | translate}}</p>
</ion-label>
</ion-col>
<ion-col class="rowBorder">
<ion-label>
<p style="color: black;">{{item.OVERALL_RATING}}</p>
</ion-label>
</ion-col>
</ion-row>
<ion-row>
<ion-col class="rowBorder" style="background: #024d71;">
<ion-label>
<p style="color: white;">{{ 'worklist, comments' | translate}}</p>
</ion-label>
</ion-col>
<ion-col class="rowBorder">
<ion-label>
<p style="color: black;">{{item.COMMENTS}}</p>
</ion-label>
</ion-col>
</ion-row>
</ion-card-content>
</ion-card>
</div>
</div>
<!-- OPM OBJECTIVE RATING -->
<div *ngIf='notificationBodyRes.P_OBJECTIVES_RATING_LIST.length > 0'>
<h3 style="text-align: center; font-weight: bold;">{{'worklist, objectiveRating' | translate}}</h3>
<div *ngFor="let item of notificationBodyRes.P_OBJECTIVES_RATING_LIST;let i=index;">
<ion-card style="width: 91%;">
<ion-card-content>
<ion-row>
<ion-col class="rowBorder" style="background: #024d71;">
<ion-label>
<p style="color: white;">{{ 'worklist, objectiveName' | translate}}</p>
</ion-label>
</ion-col>
<ion-col class="rowBorder">
<ion-label>
<p style="color: black;">{{item.OBJECTIVE_NAME}}</p>
</ion-label>
</ion-col>
</ion-row>
<ion-row>
<ion-col class="rowBorder" style="background: #024d71;">
<ion-label>
<p style="color: white;">{{ 'worklist, weightingPercent' | translate}}</p>
</ion-label>
</ion-col>
<ion-col class="rowBorder">
<ion-label>
<p style="color: black;">{{item.WEIGHTING_PERCENT}}</p>
</ion-label>
</ion-col>
</ion-row>
<ion-row>
<ion-col class="rowBorder" style="background: #024d71;">
<ion-label>
<p style="color: white;">{{ 'worklist, targetValue' | translate}}</p>
</ion-label>
</ion-col>
<ion-col class="rowBorder">
<ion-label>
<p style="color: black;">{{item.TARGET_VALUE}}</p>
</ion-label>
</ion-col>
</ion-row>
<ion-row>
<ion-col class="rowBorder" style="background: #024d71;">
<ion-label>
<p style="color: white;">{{ 'worklist, actualVALUE' | translate}}</p>
</ion-label>
</ion-col>
<ion-col class="rowBorder">
<ion-label>
<p style="color: black;">{{item.ACTUAL_VALUE}}</p>
</ion-label>
</ion-col>
</ion-row>
<ion-row>
<ion-col class="rowBorder" style="background: #024d71;">
<ion-label>
<p style="color: white;">{{ 'worklist, appraisedPerformance' | translate}}</p>
</ion-label>
</ion-col>
<ion-col class="rowBorder">
<ion-label>
<p style="color: black;">{{item.APPRAISED_PERFORMANCE}}</p>
</ion-label>
</ion-col>
</ion-row>
<ion-row>
<ion-col class="rowBorder" style="background: #024d71;">
<ion-label>
<p style="color: white;">{{ 'worklist, appraisedPerformanceDesc' | translate}}</p>
</ion-label>
</ion-col>
<ion-col class="rowBorder">
<ion-label>
<p style="color: black;">{{item.APPRAISED_PERFORMANCE_DESC}}</p>
</ion-label>
</ion-col>
</ion-row>
</ion-card-content>
</ion-card>
</div>
</div>
<!-- OPM Competency RATING -->
<div *ngIf='notificationBodyRes.P_COMPETENCIES_RATING_LIST.length > 0'>
<h3 style="text-align: center; font-weight: bold;">{{'worklist, competenciesRating' | translate}}</h3>
<div *ngFor="let item of notificationBodyRes.P_COMPETENCIES_RATING_LIST;let i=index;">
<ion-card style="width: 91%;">
<ion-card-content>
<ion-row>
<ion-col class="rowBorder" style="background: #024d71;">
<ion-label>
<p style="color: white;">{{ 'worklist, competencyName' | translate}}</p>
</ion-label>
</ion-col>
<ion-col class="rowBorder">
<ion-label>
<p style="color: black;">{{item.COMPETENCY_NAME}}</p>
</ion-label>
</ion-col>
</ion-row>
<ion-row>
<ion-col class="rowBorder" style="background: #024d71;">
<ion-label>
<p style="color: white;">{{ 'worklist, targetValue' | translate}}</p>
</ion-label>
</ion-col>
<ion-col class="rowBorder">
<ion-label>
<p style="color: black;">{{item.TARGET_VALUE}}</p>
</ion-label>
</ion-col>
</ion-row>
<ion-row>
<ion-col class="rowBorder" style="background: #024d71;">
<ion-label>
<p style="color: white;">{{ 'worklist, weightingPercent' | translate}}</p>
</ion-label>
</ion-col>
<ion-col class="rowBorder">
<ion-label>
<p style="color: black;">{{item.WEIGHTING_PERCENT}}</p>
</ion-label>
</ion-col>
</ion-row>
<ion-row>
<ion-col class="rowBorder" style="background: #024d71;">
<ion-label>
<p style="color: white;">{{ 'worklist, actualVALUE' | translate}}</p>
</ion-label>
</ion-col>
<ion-col class="rowBorder">
<ion-label>
<p style="color: black;">{{item.ACTUAL_VALUE}}</p>
</ion-label>
</ion-col>
</ion-row>
<ion-row>
<ion-col class="rowBorder" style="background: #024d71;">
<ion-label>
<p style="color: white;">{{ 'worklist, appraisedPerformance' | translate}}</p>
</ion-label>
</ion-col>
<ion-col class="rowBorder">
<ion-label>
<p style="color: black;">{{item.APPRAISED_PERFORMANCE}}</p>
</ion-label>
</ion-col>
</ion-row>
<ion-row>
<ion-col class="rowBorder" style="background: #024d71;">
<ion-label>
<p style="color: white;">{{ 'worklist, appraisedPerformanceDesc' | translate}}</p>
</ion-label>
</ion-col>
<ion-col class="rowBorder">
<ion-label>
<p style="color: black;">{{item.APPRAISED_PERFORMANCE_DESC}}</p>
</ion-label>
</ion-col>
</ion-row>
</ion-card-content>
</ion-card>
</div>
</div>
</ion-col>
</ion-row>
</ion-grid>
</ng-container>

@ -300,10 +300,11 @@ export class WorklistMainComponent implements OnInit {
this.getContactNotificationDetails(this.WorkListBodyObj);
} else if (this.getPassNotificationDetails.REQUEST_TYPE === 'CEI') {
this.getCEINotification(this.WorkListBodyObj);
} else if (this.getPassNotificationDetails.REQUEST_TYPE === 'OPM') {
this.getOPMNotification(this.WorkListBodyObj);
} else if (this.getPassNotificationDetails.REQUEST_TYPE === 'OLM') {
this.getOLMNotification(this.WorkListBodyObj);
}
// else if (this.getPassNotificationDetails.REQUEST_TYPE === 'OPM') {
// this.getOPMNotification(this.WorkListBodyObj);
// }
}
getStampMSNotification(notificationBodyObj) {
@ -409,6 +410,15 @@ export class WorklistMainComponent implements OnInit {
});
}
getOLMNotification(notificationBodyObj) {
this.notificationBodyRes = []
this.worklistMainService
.getOLMNotification(notificationBodyObj)
.subscribe((result: EITNotificatonBodyResponse) => {
this.handleWorkListBodyResult(result, "OLM");
});
}
getAbsenceNotificationDetails(notificationBodyObj) {
this.notificationBodyRes = [];
this.worklistMainService
@ -505,6 +515,16 @@ export class WorklistMainComponent implements OnInit {
console.log(result);
}
}
else if (Type === "OPM") {
if (result.OPM_Notification_Body) {
this.notificationBodyRes = result.OPM_Notification_Body;
}
}
else if (Type === "OLM") {
if (result.OLM_Notification_Body) {
this.notificationBodyRes = result.OLM_Notification_Body.P_ENROLLMENT_DETAILS_LIST;
}
}
}
} //End handleWorkListBodyResult

@ -2487,6 +2487,110 @@
}
},
"worklist": {
"competencies": {
"en": "Competencies",
"ar": "الكفاءات"
},
"information": {
"en": "Information",
"ar": "معلومات"
},
"competenciesRating": {
"en": "Competencies Rating",
"ar": "الجدارات"
},
"appraisedPerformance": {
"en": "Appraisal Performance",
"ar": "أداء التقييم"
},
"competencyName": {
"en": "Competency Name",
"ar": "الجدارة"
},
"targetValue": {
"en": "Target Value",
"ar": "القيمة المستهدف تحققيقها"
},
"objectiveRating": {
"en": "Objective Rating",
"ar": "الأهداف"
},
"overallRating": {
"en": "Overall Rating",
"ar": "التقييم العام و الملاحظات"
},
"overalLPerformanceID": {
"en": "Overall Performance ID",
"ar": "رقم الأداء العام"
},
"objectiveName": {
"en": "Objective Name",
"ar": "اسم الهدف"
},
"enrollmentDetails": {
"en": "Enrollment Details",
"ar": "تفاصيل التسجيل"
},
"courseName": {
"en": "Course Name",
"ar": "اسم البرنامج التدريبي"
},
"className": {
"en": "Class Name",
"ar": "اسم الفصل الدراسي"
},
"timeZone": {
"en": "Timezone",
"ar": "منطقة التوقيت"
},
"trainingCenter": {
"en": "Training Center",
"ar": "مركز التدريب"
},
"enrollmentJustification": {
"en": "Enrollment Justification",
"ar": "تبرير التسجيل"
},
"deliveryMode": {
"en": "Delivery Mode",
"ar": "طريقة التقديم"
},
"language": {
"en": "Language",
"ar": "اللغة"
},
"Note": {
"en": "Note",
"ar": "ملاحظات"
},
"actualVALUE": {
"en": "Actual Value",
"ar": "القيمة المحققة"
},
"weightingPercent": {
"en": "Weighting Percentage",
"ar": "الوزن النسبي"
},
"appraisedPerformanceDesc": {
"en": "Appraisal Performance Description",
"ar": "وصف تقييم الأداء"
},
"rateName": {
"en": "Rate Name",
"ar": "اسم التقييم"
},
"comments": {
"en": "Comments",
"ar": "تعليقات"
},
"startDate": {
"en": "Start Date",
"ar": "تاريخ البداية"
},
"endDate": {
"en": "End Date",
"ar": "تاريخ الانتهاء"
},
"view": {
"en": "View",
"ar": "عرض"

Loading…
Cancel
Save