fixed overtime assignment - added disabling name - change MOE theme

MOE_MAIN-COLOR_CHANGES
umasoodch 3 years ago
parent 4064939d4c
commit 1acdd9459d

Binary file not shown.

Before

Width:  |  Height:  |  Size: 8.6 KiB

After

Width:  |  Height:  |  Size: 4.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.7 KiB

After

Width:  |  Height:  |  Size: 2.0 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.4 KiB

After

Width:  |  Height:  |  Size: 2.9 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 14 KiB

After

Width:  |  Height:  |  Size: 6.5 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 27 KiB

After

Width:  |  Height:  |  Size: 11 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 43 KiB

After

Width:  |  Height:  |  Size: 16 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 220 KiB

After

Width:  |  Height:  |  Size: 278 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 60 KiB

After

Width:  |  Height:  |  Size: 64 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 100 KiB

After

Width:  |  Height:  |  Size: 119 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 541 KiB

After

Width:  |  Height:  |  Size: 510 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1004 KiB

After

Width:  |  Height:  |  Size: 724 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.6 MiB

After

Width:  |  Height:  |  Size: 966 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 256 KiB

After

Width:  |  Height:  |  Size: 277 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 68 KiB

After

Width:  |  Height:  |  Size: 63 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 118 KiB

After

Width:  |  Height:  |  Size: 117 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 624 KiB

After

Width:  |  Height:  |  Size: 519 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.1 MiB

After

Width:  |  Height:  |  Size: 697 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.8 MiB

After

Width:  |  Height:  |  Size: 896 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 450 KiB

After

Width:  |  Height:  |  Size: 448 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 672 KiB

After

Width:  |  Height:  |  Size: 452 KiB

@ -537,11 +537,16 @@ export class AddEitComponent implements OnInit {
option.value = optionList[i].ID_COLUMN_NAME;
select.add(option);
}
if (select.dataset.hiddenval) {
select.value = select.dataset.hiddenval;
//select.dataset.hiddenval="";
} else {
select.value = DV.P_ID_COLUMN_NAME;
if (eitObj.DEFAULT_TYPE == "C" && eitObj.DEFAULT_VALUE) {
select.value = eitObj.DEFAULT_VALUE;
} else {
select.value = DV.P_ID_COLUMN_NAME;
}
}
select.disabled = false;
}
@ -984,6 +989,13 @@ export class AddEitComponent implements OnInit {
) as HTMLInputElement;
let text = x.value;
let val = x.dataset.colmText;
if (this.eitResponse[j].DISPLAY_FLAG == "N" && this.eitResponse[i].REQUIRED_FLAG == "Y" && !val) {
const attributeValue = x.getAttribute('value');
val = attributeValue ? attributeValue : '';
}
if (
(val == undefined || val == "") &&
parentsList[i].IsRequired == "REQUIRED"

@ -30,8 +30,8 @@ export class ConnectorService {
// public static host = 'https://uat.hmgwebservices.com/';
// public static host = 'https://hmgwebservices.com/';
// public static host = 'http://10.0.50.241:4444/' // MOE live vpn
// public static host = 'https://uathrmsys.moenergy.gov.sa/' //MOE UAT
public static host = 'https://hrmsys.moenergy.gov.sa/' // MOE ;LIVE
public static host = 'https://uathrmsys.moenergy.gov.sa/' //MOE UAT
// public static host = 'https://hrmsys.moenergy.gov.sa/' // MOE ;LIVE

@ -27,6 +27,7 @@ import { UserItemTypes } from "../models/userItemTypeRequest";
@Injectable()
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 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";
@ -77,6 +78,22 @@ export class WorklistMainService {
);
}
public getOPMNotificationBody(
WorkListBodyRequest: any,
onError?: any,
errorLabel?: string
): Observable<any> {
const request = WorkListBodyRequest;
this.authService.authenticateRequest(request);
return this.api.post(
WorklistMainService.getOPMNotificationBody,
request,
onError,
errorLabel
);
}
public getAbsencesNotificationBody(
WorkListBodyRequest: any,
onError?: any,

@ -301,6 +301,9 @@ export class WorklistMainComponent implements OnInit {
} else if (this.getPassNotificationDetails.REQUEST_TYPE === 'CEI') {
this.getCEINotification(this.WorkListBodyObj);
}
// else if (this.getPassNotificationDetails.REQUEST_TYPE === 'OPM') {
// this.getOPMNotification(this.WorkListBodyObj);
// }
}
getStampMSNotification(notificationBodyObj) {
@ -397,6 +400,15 @@ export class WorklistMainComponent implements OnInit {
});
}
getOPMNotification(notificationBodyObj) {
this.notificationBodyRes = []
this.worklistMainService
.getOPMNotificationBody(notificationBodyObj)
.subscribe((result: EITNotificatonBodyResponse) => {
this.handleWorkListBodyResult(result, "OPM");
});
}
getAbsenceNotificationDetails(notificationBodyObj) {
this.notificationBodyRes = [];
this.worklistMainService

@ -188,6 +188,11 @@ export class AddBasicDetailsComponent implements OnInit {
let defaultVal: string = "";
let defaultValText: string = "";
let mobileEnabled = 'Y';
if (feildsList[i].READ_ONLY == 'Y') {
mobileEnabled = 'N';
}
if (feildsList[i].DISPLAY_FLAG != "N") {
//text , date , time
if (feildsList[i].DATATYPE == "VARCHAR2" && feildsList[i].ObjectValuesList === null) {
@ -198,7 +203,7 @@ export class AddBasicDetailsComponent implements OnInit {
defaultVal,
containerId,
defaultValText,
feildsList[i].MOBILE_ENABLED,
mobileEnabled,
feildsList[i].DISPLAY_FLAG,
feildsList[i].REQUIRED_FLAG,
feildsList[i].REQ_COL_TIP
@ -209,7 +214,7 @@ export class AddBasicDetailsComponent implements OnInit {
feildsList[i].APPLICATION_COLUMN_NAME,
defaultVal,
containerId,
feildsList[i].MOBILE_ENABLED,
mobileEnabled,
feildsList[i].DISPLAY_FLAG,
feildsList[i].REQUIRED_FLAG,
feildsList[i].REQ_COL_TIP
@ -225,7 +230,7 @@ export class AddBasicDetailsComponent implements OnInit {
feildsList[i].APPLICATION_COLUMN_NAME,
defaultVal,
containerId,
feildsList[i].MOBILE_ENABLED,
mobileEnabled,
feildsList[i].DISPLAY_FLAG,
feildsList[i].REQUIRED_FLAG,
feildsList[i].REQ_COL_TIP
@ -236,7 +241,7 @@ export class AddBasicDetailsComponent implements OnInit {
feildsList[i].APPLICATION_COLUMN_NAME,
"",
containerId,
feildsList[i].MOBILE_ENABLED,
mobileEnabled,
feildsList[i].DISPLAY_FLAG,
feildsList[i].REQUIRED_FLAG,
this.direction,

Loading…
Cancel
Save