diff --git a/Mohem/src/app/absence/absence-confirm/absence-confirm.component.html b/Mohem/src/app/absence/absence-confirm/absence-confirm.component.html index 3b38814c..73ed3634 100644 --- a/Mohem/src/app/absence/absence-confirm/absence-confirm.component.html +++ b/Mohem/src/app/absence/absence-confirm/absence-confirm.component.html @@ -10,7 +10,7 @@ -
{{'general, addAttach' | translate}}
+
{{'general, addAttach' | translate}} *
@@ -255,7 +255,7 @@
- {{ts.trPK('confirmAddEit','start')}} + {{ts.trPK('confirmAddEit','start')}}
\ No newline at end of file diff --git a/Mohem/src/app/absence/home/home.component.html b/Mohem/src/app/absence/home/home.component.html index 3d4c4ec9..5b60bdc0 100644 --- a/Mohem/src/app/absence/home/home.component.html +++ b/Mohem/src/app/absence/home/home.component.html @@ -14,7 +14,7 @@ + [headerText]="headerTitle"> diff --git a/Mohem/src/app/absence/home/home.component.ts b/Mohem/src/app/absence/home/home.component.ts index 1e08083c..e0e22e86 100644 --- a/Mohem/src/app/absence/home/home.component.ts +++ b/Mohem/src/app/absence/home/home.component.ts @@ -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: [ diff --git a/Mohem/src/app/app.component.html b/Mohem/src/app/app.component.html index f4f782cc..2c601296 100644 --- a/Mohem/src/app/app.component.html +++ b/Mohem/src/app/app.component.html @@ -52,14 +52,14 @@ - +
@@ -175,14 +175,14 @@ {{ts.trPK('myTeam','myTeam-header')}} - +
diff --git a/Mohem/src/app/eit/confirm-add-eit/confirm-add-eit.component.html b/Mohem/src/app/eit/confirm-add-eit/confirm-add-eit.component.html index a3a64748..dcd0ec6b 100644 --- a/Mohem/src/app/eit/confirm-add-eit/confirm-add-eit.component.html +++ b/Mohem/src/app/eit/confirm-add-eit/confirm-add-eit.component.html @@ -11,7 +11,7 @@ -
{{'general, addAttach' | translate}}
+
{{'general, addAttach' | translate}} *
@@ -261,7 +261,7 @@
- + {{ (isDelete ? 'general, delete' : 'general, submit') | translate }}
\ No newline at end of file diff --git a/Mohem/src/app/eit/confirm-add-eit/confirm-add-eit.component.ts b/Mohem/src/app/eit/confirm-add-eit/confirm-add-eit.component.ts index 35abae8a..4c176b62 100644 --- a/Mohem/src/app/eit/confirm-add-eit/confirm-add-eit.component.ts +++ b/Mohem/src/app/eit/confirm-add-eit/confirm-add-eit.component.ts @@ -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); diff --git a/Mohem/src/app/hmg-common/services/connector/connector.service.ts b/Mohem/src/app/hmg-common/services/connector/connector.service.ts index 00ebe2fa..3b4ce09a 100644 --- a/Mohem/src/app/hmg-common/services/connector/connector.service.ts +++ b/Mohem/src/app/hmg-common/services/connector/connector.service.ts @@ -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, diff --git a/Mohem/src/app/hmg-common/services/menu/models/menu.entry.ts b/Mohem/src/app/hmg-common/services/menu/models/menu.entry.ts index 7a52d8c6..8bb03e7b 100644 --- a/Mohem/src/app/hmg-common/services/menu/models/menu.entry.ts +++ b/Mohem/src/app/hmg-common/services/menu/models/menu.entry.ts @@ -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; } \ No newline at end of file diff --git a/Mohem/src/app/home/home.page.ts b/Mohem/src/app/home/home.page.ts index 7b0b26d5..3ec8afc6 100644 --- a/Mohem/src/app/home/home.page.ts +++ b/Mohem/src/app/home/home.page.ts @@ -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(); diff --git a/Mohem/src/app/profile/home/home.component.ts b/Mohem/src/app/profile/home/home.component.ts index e423d395..a5cc44e6 100644 --- a/Mohem/src/app/profile/home/home.component.ts +++ b/Mohem/src/app/profile/home/home.component.ts @@ -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);