UI changes

SRCA_DEV
Sultan Khan 4 years ago
parent defa182fcc
commit 231caf5bcd

@ -10,7 +10,7 @@
<ion-grid>
<ion-row style="margin-top: 20px;margin-left: 12px;">
<ion-col>
<div size="10" [ngClass]=" direction === 'en' ? 'approvalTitle' : 'approvalTitle-ar'">{{'general, addAttach' | translate}}</div>
<div size="10" [ngClass]=" direction === 'en' ? 'approvalTitle' : 'approvalTitle-ar'">{{'general, addAttach' | translate}} <span *ngIf="selEmp.ATTACHMENT_REQUIRED ==='Y'">*</span></div>
</ion-col>
<ion-col style="padding-left: 7%;" size="2">
<div class="fileDiv">
@ -255,7 +255,7 @@
</ion-content>
<ion-footer>
<div class="centerDiv">
<ion-button class="confirmEitOkButton" (click)="openSubmitModal()">{{ts.trPK('confirmAddEit','start')}}</ion-button>
<ion-button class="confirmEitOkButton" (click)="openSubmitModal()" [disabled] ="selEmp.ATTACHMENT_REQUIRED =='Y' && !attachListOver">{{ts.trPK('confirmAddEit','start')}}</ion-button>
</div>
</ion-footer>

@ -14,7 +14,7 @@
<app-generic-header
showBack="true"
[headerText]="'home,leave-balance' | translate">
[headerText]="headerTitle">
</app-generic-header>

@ -95,19 +95,20 @@ export class HomeComponent implements OnInit {
false
);
this.leaveAccrualBalance = this.common.sharedService.getSharedData('leaveAccrualBalance', false);
console.log("this.leaveAccrualBalance>>>>>>>>>>" + this.leaveAccrualBalance.ACCRUAL_NET_ENTITLEMENT);
this.headerTitle = this.selMenu.GetMenuEntriesList.PROMPT;
//console.log("this.leaveAccrualBalance>>>>>>>>>>" + this.leaveAccrualBalance.ACCRUAL_NET_ENTITLEMENT);
/***
ACCRUAL_NET_ENTITLEMENT: 24.59
ACCRUAL_USED_ENTITLEMENT: 0
ACCRUAL_YEARLY_ENTITLEMENT: 50.4*/
this.accrualNet = this.leaveAccrualBalance.ACCRUAL_NET_ENTITLEMENT;
this.accrualUsed = this.leaveAccrualBalance.ACCRUAL_USED_ENTITLEMENT;
this.accrualYearly = this.leaveAccrualBalance.ACCRUAL_YEARLY_ENTITLEMENT;
this.accrualNet = this.leaveAccrualBalance ? this.leaveAccrualBalance.ACCRUAL_NET_ENTITLEMENT : 0;
this.accrualUsed = this.leaveAccrualBalance ? this.leaveAccrualBalance.ACCRUAL_USED_ENTITLEMENT : 0;
this.accrualYearly = this.leaveAccrualBalance ? this.leaveAccrualBalance.ACCRUAL_YEARLY_ENTITLEMENT : 0;
this.totalnumber = this.accrualNet + this.accrualUsed + this.accrualYearly;
this.totalnumber = this.totalnumber.toFixed(3);
this.request = this.common.sharedService.getSharedData('leaveAccrualBalanceDate', false);
console.log("this.request" + this.request.P_EFFECTIVE_DATE);
this.effectiveDate = this.request.P_EFFECTIVE_DATE;
//console.log("this.request" + this.request.P_EFFECTIVE_DATE);
this.effectiveDate = this.request ? this.request.P_EFFECTIVE_DATE : '';
this.data = {
// labels: ['earingTotal', 'deductionTotal'],
datasets: [

@ -52,14 +52,14 @@
</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' && menu.MENU_TYPE =='E'">
@ -175,14 +175,14 @@
{{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' && menu.MENU_TYPE =='E'">

@ -11,7 +11,7 @@
<ion-grid>
<ion-row style="margin-top: 20px;margin-left: 12px;">
<ion-col>
<div size="10" [ngClass]=" direction === 'en' ? 'approvalTitle' : 'approvalTitle-ar'" >{{'general, addAttach' | translate}}</div>
<div size="10" [ngClass]=" direction === 'en' ? 'approvalTitle' : 'approvalTitle-ar'" >{{'general, addAttach' | translate}} <span *ngIf="isAttachment ==='Y'">*</span></div>
</ion-col>
<ion-col style="padding-left: 7%;" size="2">
<div class="fileDiv">
@ -261,7 +261,7 @@
<ion-footer>
<div class="centerDiv">
<ion-button class="confirmEitOkButton" color="customnavy" ion-button (click)="openSubmitModal()">
<ion-button class="confirmEitOkButton" color="customnavy" ion-button (click)="openSubmitModal()" [disabled] ="isAttachment ==='Y' && attachListOver.length ===0">
{{ (isDelete ? 'general, delete' : 'general, submit') | translate }}</ion-button>
</div>
</ion-footer>

@ -62,7 +62,7 @@ export class ConfirmAddEitComponent implements OnInit {
indexLastObj: any = 0;
filterAllowedType: any = ['application/pdf', 'image/jpeg', 'image/png', 'text/plain', 'image/jpg', 'application/vnd.ms-excel', 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'];
direction: string;
isAttachment: string;
constructor(public modalController: ModalController, public cs: CommonService, private ts: TranslatorService, private eitService: EitService) {
this.direction = TranslatorService.getCurrentLanguageName()
@ -78,6 +78,7 @@ export class ConfirmAddEitComponent implements OnInit {
this.respID = this.cs.sharedService.getSharedData(MenuResponse.SHARED_SEL_RESP_ID, false);
this.eitRequest = this.cs.sharedService.getSharedData(EitRequest.SHARED_DATA, false);
this.isResubmitEIT = this.cs.sharedService.getSharedData('confirmAddEITData', false).isResubmit;
this.isAttachment = this.selMenu.GetMenuEntriesList.ATTACHMENT_REQUIRED;
if (this.isResubmitEIT) {
this.getPassNotificationDetails = this.cs.sharedService.getSharedData(EITNotificatonBodyResponse.NOT_WORKLIST, false); //WARINING **
// console.log("this.getPassNotificationDetails: " + this.getPassNotificationDetails);

@ -27,9 +27,9 @@ 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://10.201.204.124:5818/' //MOE
public static host = 'http://10.201.204.124:5818/' //MOES
constructor(public httpClient: HttpClient,
public cs: CommonService,
private events: Events,

@ -1,13 +1,14 @@
export class MenuEntry {
public MENU_NAME:string;
public ADD_BUTTON:string;
public DELETE_BUTTON:string;
public UPDATE_BUTTON:string;
public ENTRY_SEQUENCE:number;
public FUNCTION_NAME:string;
public LVL:number;
public MENU_ENTRY_TYPE:string;
public PARENT_MENU_NAME:string;
public PROMPT:string;
public REQUEST_TYPE:string;
public MENU_NAME: string;
public ADD_BUTTON: string;
public DELETE_BUTTON: string;
public UPDATE_BUTTON: string;
public ENTRY_SEQUENCE: number;
public FUNCTION_NAME: string;
public LVL: number;
public MENU_ENTRY_TYPE: string;
public PARENT_MENU_NAME: string;
public PROMPT: string;
public REQUEST_TYPE: string;
public ATTACHMENT_REQUIRED: string;
}

@ -783,6 +783,12 @@ export class HomePage implements OnInit {
'menuEntries'
);
this.common.openEITPage();
} else if (subMenu.REQUEST_TYPE === 'BASIC_DETAILS') {
this.common.openProfile('basicDetails');
} else if (subMenu.REQUEST_TYPE === 'ADDRESS' || subMenu.REQUEST_TYPE === 'PHONE_NUMBERS') {
this.common.openProfile('contact');
} else if (subMenu.REQUEST_TYPE === 'CONTACT') {
this.common.openProfile('family');
}
if (subMenu.REQUEST_TYPE === 'TIME_CARD') {
this.common.openTimeCardPage();

@ -129,41 +129,41 @@ export class HomeComponent implements OnInit {
let personalInformationChildren: any;
let personalInfoNestedChildren: any;
if (this.targetValue === 'sideMenu') {
for (let i = 0; i < this.menuEntries.length; i++) {
if (this.menuEntries[i].MENU_NAME === 'MBL_E_PROFESSIONALS_01') {
personalInformationChildren = this.menuEntries[i].children;
for (let j = 0; j < personalInformationChildren.length; j++) {
if (personalInformationChildren[j].MENU_NAME = 'MBL_PERINFO_SS' && personalInformationChildren[j].ENTRY_SEQUENCE === 15) {
personalInfoNestedChildren = personalInformationChildren[j].children;
for (let k = 0; k < personalInfoNestedChildren.length; k++) {
if (personalInfoNestedChildren[k].REQUEST_TYPE === 'BASIC_DETAILS') {
this.basicDetailsSubMenu = personalInfoNestedChildren[k];
}
if (personalInfoNestedChildren[k].REQUEST_TYPE === 'ADDRESS') {
this.addressSubMenu = personalInfoNestedChildren[k];
}
if (personalInfoNestedChildren[k].REQUEST_TYPE === 'CONTACT') {
this.dependentDetails = personalInfoNestedChildren[k];
}
//if (this.targetValue === 'sideMenu') {
for (let i = 0; i < this.menuEntries.length; i++) {
if (this.menuEntries[i].MENU_NAME === 'MBL_E_PROFESSIONALS_01') {
personalInformationChildren = this.menuEntries[i].children;
for (let j = 0; j < personalInformationChildren.length; j++) {
if (personalInformationChildren[j].MENU_NAME = 'MBL_PERINFO_SS' && personalInformationChildren[j].ENTRY_SEQUENCE === 15) {
personalInfoNestedChildren = personalInformationChildren[j].children;
for (let k = 0; k < personalInfoNestedChildren.length; k++) {
if (personalInfoNestedChildren[k].REQUEST_TYPE === 'BASIC_DETAILS') {
this.basicDetailsSubMenu = personalInfoNestedChildren[k];
}
if (personalInfoNestedChildren[k].REQUEST_TYPE === 'ADDRESS') {
this.addressSubMenu = personalInfoNestedChildren[k];
}
if (personalInfoNestedChildren[k].REQUEST_TYPE === 'CONTACT') {
this.dependentDetails = personalInfoNestedChildren[k];
}
}
}
}
}
} else {
const menuEntriesLocalArray: any = this.menuEntries.children;
for (let i = 0; i < menuEntriesLocalArray.length; i++) {
if (menuEntriesLocalArray[i].REQUEST_TYPE === 'BASIC_DETAILS') {
this.basicDetailsSubMenu = menuEntriesLocalArray[i];
}
if (menuEntriesLocalArray[i].REQUEST_TYPE === 'ADDRESS') {
this.addressSubMenu = menuEntriesLocalArray[i];
}
if (menuEntriesLocalArray[i].REQUEST_TYPE === 'CONTACT') {
this.dependentDetails = menuEntriesLocalArray[i];
}
}
// }
//} else {
// const menuEntriesLocalArray: any = this.menuEntries.children;
// for (let i = 0; i < menuEntriesLocalArray.length; i++) {
// if (menuEntriesLocalArray[i].REQUEST_TYPE === 'BASIC_DETAILS') {
// this.basicDetailsSubMenu = menuEntriesLocalArray[i];
// }
// if (menuEntriesLocalArray[i].REQUEST_TYPE === 'ADDRESS') {
// this.addressSubMenu = menuEntriesLocalArray[i];
// }
// if (menuEntriesLocalArray[i].REQUEST_TYPE === 'CONTACT') {
// this.dependentDetails = menuEntriesLocalArray[i];
// }
//}
}
console.log(this.basicDetailsSubMenu);
console.log(this.addressSubMenu);

Loading…
Cancel
Save