fixed MOE EIT issues

SRCA_DEV
umasoodch 3 years ago
parent b683f54855
commit 723cdde798

@ -35,14 +35,14 @@
{{ts.trPK('userProfile','title')}}
</ion-label>
</ion-item>
<ion-item (click)="performanceEvaluation()">
<!-- <ion-item (click)="performanceEvaluation()">
<ion-thumbnail slot="start" class="menu-thumb">
<img style= "height: 24px !important;" src="../assets/icon/bar-chart.svg" item-left>
</ion-thumbnail>
<ion-label class="profile">
{{ts.trPK('userProfile','performance-evaluation')}}
</ion-label>
</ion-item>
</ion-item> -->
<ion-item [hidden]="TeamFlag!='true'" (click)="openMyTeamPage()">
<ion-thumbnail slot="start" class="menu-thumb">
<img style= "height: 14px !important;" src="../assets/imgs/my_team_icon.png" item-left>
@ -52,16 +52,16 @@
</ion-label>
</ion-item>
<ion-item (click)="openMyRequestPage()">
<!-- <ion-item (click)="openMyRequestPage()">
<ion-thumbnail slot="start" class="menu-thumb">
<img style= "height: 20px !important;" src="../assets/imgs/hr-request.png" item-left>
</ion-thumbnail>
<ion-label class="profile">
{{ts.trPK('userProfile','HR-Request')}}
</ion-label>
</ion-item>
</ion-item> -->
<div *ngFor="let menu of menuList">
<ion-item (click)="oepnMyRequest(menu)" *ngIf="menu.REQUEST_GROUP_NAME =='MBL_RG_01'">
<ion-item (click)="oepnMyRequest(menu)" *ngIf="menu.MENU_TYPE == 'E'">
<ion-thumbnail slot="start" class="menu-thumb">
<img style= "height: 20px !important;" src="../assets/imgs/my-request.png" item-left>
</ion-thumbnail>
@ -71,17 +71,17 @@
</ion-item>
</div>
<ion-item (click)="oepnTransaction()">
<!-- <ion-item (click)="oepnTransaction()">
<ion-thumbnail slot="start" class="menu-thumb">
<img style= "height: 20px !important;" src="../assets/imgs/pending-transaction.png" item-left>
</ion-thumbnail>
<ion-label class="profile">
{{ts.trPK('general','pending-transaction')}}
</ion-label>
</ion-item>
</ion-item> -->
<!-- <ion-item (click)="openChangePassword()"> -->
<ion-item (click)="openChangePassword()">
<!-- <ion-item (click)="openChangePassword()">
<ion-thumbnail slot="start" class="menu-thumb">
<img style= "height: 25px !important;" src="../assets/imgs/lock_icon.png" item-left>
</ion-thumbnail>
@ -89,9 +89,9 @@
{{ts.trPK('login','changepassword')}}
<ion-badge class="start-badge main-badge" slot="end" color="danger">{{notBadge}}</ion-badge>
</ion-label>
</ion-item>
</ion-item> -->
<ion-item (click)="openDigitalId()">
<!-- <ion-item (click)="openDigitalId()">
<ion-thumbnail slot="start" class="menu-thumb">
<img style= "height: 25px !important;" src="../assets/imgs/ID_ico_menu.png" item-left>
</ion-thumbnail>
@ -99,9 +99,9 @@
{{ts.trPK('general','digital-id')}}
<ion-badge class="start-badge main-badge" slot="end" color="danger">{{notBadge}}</ion-badge>
</ion-label>
</ion-item>
</ion-item> -->
<ion-item *ngIf='userInfo?.show_business' (click)="openBusinessCard()">
<!-- <ion-item *ngIf='userInfo?.show_business' (click)="openBusinessCard()">
<ion-thumbnail slot="start" class="menu-thumb">
<img style= "height: 25px !important;" src="../assets/imgs/business-card-design.png" item-left>
</ion-thumbnail>
@ -109,7 +109,7 @@
{{ts.trPK('general','business-card')}}
<ion-badge class="start-badge main-badge" slot="end" color="danger">{{notBadge}}</ion-badge>
</ion-label>
</ion-item>
</ion-item> -->
</ion-list>
@ -157,14 +157,14 @@
{{ts.trPK('userProfile','title')}}
</ion-label>
</ion-item>
<ion-item (click)="performanceEvaluation()">
<!-- <ion-item (click)="performanceEvaluation()">
<ion-thumbnail slot="start" class="menu-thumb">
<img style= "height: 24px !important;" src="../assets/icon/bar-chart.svg" item-left>
</ion-thumbnail>
<ion-label class="profile">
{{ts.trPK('userProfile','performance-evaluation')}}
</ion-label>
</ion-item>
</ion-item> -->
<ion-item [hidden]="TeamFlag!='true'" (click)="openMyTeamPage()">
<ion-thumbnail slot="start" class="menu-thumb">
<img style= "height: 14px !important;" src="../assets/imgs/my_team_icon.png" item-left>
@ -173,16 +173,16 @@
{{ts.trPK('myTeam','myTeam-header')}}
</ion-label>
</ion-item>
<ion-item (click)="openMyRequestPage()">
<!-- <ion-item (click)="openMyRequestPage()">
<ion-thumbnail slot="start" class="menu-thumb">
<img style= "height: 14px !important;" src="../assets/imgs/my_team_icon.png" item-left>
</ion-thumbnail>
<ion-label class="profile">
{{ts.trPK('userProfile','HR-Request')}}
</ion-label>
</ion-item>
</ion-item> -->
<div *ngFor="let menu of menuList">
<ion-item (click)="oepnMyRequest(menu)" *ngIf="menu.REQUEST_GROUP_NAME =='MBL_RG_01'">
<ion-item (click)="oepnMyRequest(menu)" *ngIf="menu.MENU_TYPE == 'E'">
<ion-thumbnail slot="start" class="menu-thumb">
<img style= "height: 20px !important;" src="../assets/imgs/my-request.png" item-left>
</ion-thumbnail>
@ -192,15 +192,15 @@
</ion-item>
</div>
<ion-item (click)="oepnTransaction()">
<!-- <ion-item (click)="oepnTransaction()">
<ion-thumbnail slot="start" class="menu-thumb">
<img style= "height: 20px !important;" src="../assets/imgs/pending-transaction.png" item-left>
</ion-thumbnail>
<ion-label class="profile">
{{ts.trPK('general','pending-transaction')}}
</ion-label>
</ion-item>
<ion-item (click)="openChangePassword()">
</ion-item> -->
<!-- <ion-item (click)="openChangePassword()">
<ion-thumbnail slot="start" class="menu-thumb">
<img style= "height: 25px !important;" src="../assets/imgs/lock_icon.png" item-left>
</ion-thumbnail>
@ -208,15 +208,15 @@
{{ts.trPK('login','changepassword')}}
<ion-badge [ngClass]=" direction === 'rtl' ? 'end-badge' : 'start-badge'" slot="end" color="danger" class="main-badge">{{notBadge}}</ion-badge>
</ion-label>
</ion-label> -->
<!-- <button class="menu-item" ion-item menuClose ion-item (click)="goToWorkListPage()" >
</button> -->
</ion-item>
<!-- </ion-item> -->
<ion-item (click)="openDigitalId()">
<!-- <ion-item (click)="openDigitalId()">
<ion-thumbnail slot="start" class="menu-thumb">
<img style= "height: 25px !important;" src="../assets/imgs/ID_ico_menu.png" item-left>
</ion-thumbnail>
@ -224,9 +224,9 @@
{{ts.trPK('general','digital-id')}}
<ion-badge class="start-badge main-badge" slot="end" color="danger">{{notBadge}}</ion-badge>
</ion-label>
</ion-item>
</ion-item> -->
<ion-item *ngIf='userInfo?.show_business' (click)="openBusinessCard()">
<!-- <ion-item *ngIf='userInfo?.show_business' (click)="openBusinessCard()">
<ion-thumbnail slot="start" class="menu-thumb">
<img style= "height: 25px !important;" src="../assets/imgs/business-card-design.png" item-left>
</ion-thumbnail>
@ -234,7 +234,7 @@
{{ts.trPK('general','business-card')}}
<ion-badge class="start-badge main-badge" slot="end" color="danger">{{notBadge}}</ion-badge>
</ion-label>
</ion-item>
</ion-item> -->
<!-- <ion-item (click)="profile()">
<ion-thumbnail slot="start" class="menu-thumb">

@ -704,7 +704,8 @@ export class AddEitComponent implements OnInit {
}else{
// console.log("else - " + elem.value);
elem.value = val;
elem.innerText = text;
// elem.innerText = text;
elem.setAttribute("value", val);
// console.log("else - " + elem.value);
}
@ -869,7 +870,7 @@ export class AddEitComponent implements OnInit {
SEGMENT_NAME: this.eitResponse[j].SEGMENT_NAME,
VALUE_COLUMN_NAME: val,
DESCRIPTION: "",
ID_COLUMN_NAME: idColName,
ID_COLUMN_NAME: idColName ? idColName: '',
FLEX_VALUE_SET_NAME: this.eitResponse[j].FLEX_VALUE_SET_NAME
});
break;
@ -899,7 +900,7 @@ export class AddEitComponent implements OnInit {
SEGMENT_NAME: this.eitResponse[j].SEGMENT_NAME,
VALUE_COLUMN_NAME: text,
DESCRIPTION: "",
ID_COLUMN_NAME: val,
ID_COLUMN_NAME: val ? val : '' ,
FLEX_VALUE_SET_NAME: this.eitResponse[j].FLEX_VALUE_SET_NAME
});
break;
@ -924,7 +925,7 @@ export class AddEitComponent implements OnInit {
SEGMENT_NAME: this.eitResponse[j].SEGMENT_NAME,
VALUE_COLUMN_NAME: text,
DESCRIPTION: "",
ID_COLUMN_NAME: val,
ID_COLUMN_NAME: val ? val : '',
FLEX_VALUE_SET_NAME: this.eitResponse[j].FLEX_VALUE_SET_NAME
});
break;
@ -951,7 +952,7 @@ export class AddEitComponent implements OnInit {
SEGMENT_NAME: this.eitResponse[j].SEGMENT_NAME,
VALUE_COLUMN_NAME: text,
DESCRIPTION: "",
ID_COLUMN_NAME: val,
ID_COLUMN_NAME: val ? val: '',
FLEX_VALUE_SET_NAME: this.eitResponse[j].FLEX_VALUE_SET_NAME
});
break;
@ -965,7 +966,8 @@ export class AddEitComponent implements OnInit {
emptyChildElement(segmentName) {
let elem = this.getElementByName(segmentName);
elem.value = null;
elem.innerHTML = "";
// elem.innerHTML = "";
if ("dtvalue" in elem.dataset) {
elem.dataset.dtvalue = "";
}

@ -27,8 +27,16 @@ export class ConnectorService {
public static retryTimes = 0;
public static timeOut = 180 * 1000;
public static host = 'https://uat.hmgwebservices.com/';
// public static host = 'https://uat.hmgwebservices.com/';
// public static host = 'https://hmgwebservices.com/';
// public static host = 'http://riyt-mohemm1:1010/' //MOE
public static host = 'http://riyt-mohemm1.mopm.gov.sa:1010/'
// public static host = 'http://mohemm-app-test.srca.org.sa:1010/'
// public static host = 'http://10.254.212.41:1010/'
constructor(public httpClient: HttpClient,
public cs: CommonService,
private events: Events,

@ -783,8 +783,10 @@ export class HomePage implements OnInit {
);
selMenu.GetMenuEntriesList = subMenu;
this.common.sharedService.setSharedData(selMenu, MenuResponse.SHARED_DATA);
if (subMenu.REQUEST_TYPE === 'EIT' && subMenu.FUNCTION_NAME === 'XXX_HR_EIT_LOA_CREATE_SS') {
this.common.openAbsencePage();
// if (subMenu.REQUEST_TYPE === 'EIT' && subMenu.FUNCTION_NAME === 'XXX_HR_EIT_LOA_CREATE_SS') {
if (subMenu.REQUEST_TYPE === 'EIT') {
// this.common.openAbsencePage();
this.common.openEitListPage();
} else if (subMenu.REQUEST_TYPE === 'EIT') {
this.common.openEitListPage();
} else if (subMenu.REQUEST_TYPE === 'PAYSLIP') {

Loading…
Cancel
Save