diff --git a/Mohem/src/app/itemforsale/items/items.component.html b/Mohem/src/app/itemforsale/items/items.component.html index a290d7a4..32e85170 100644 --- a/Mohem/src/app/itemforsale/items/items.component.html +++ b/Mohem/src/app/itemforsale/items/items.component.html @@ -147,7 +147,7 @@
- + diff --git a/Mohem/src/app/mowadhafi/my-request/my-request.component.ts b/Mohem/src/app/mowadhafi/my-request/my-request.component.ts index 24476202..06e83aa2 100644 --- a/Mohem/src/app/mowadhafi/my-request/my-request.component.ts +++ b/Mohem/src/app/mowadhafi/my-request/my-request.component.ts @@ -39,6 +39,7 @@ export class MyRequestComponent implements OnInit { } ngOnInit() { + this.cs.startLoading(); this.getTicketsByEmployee(); } diff --git a/Mohem/src/app/my-team/home/home.component.html b/Mohem/src/app/my-team/home/home.component.html index 59406b7e..59dba377 100644 --- a/Mohem/src/app/my-team/home/home.component.html +++ b/Mohem/src/app/my-team/home/home.component.html @@ -31,10 +31,17 @@ --> - - - - + +
+ + + +
+
+ + + +
@@ -104,14 +111,14 @@ --> -
+
-
+
@@ -156,7 +156,7 @@
- +
diff --git a/Mohem/src/app/notification/work-list-replacement-itg/work-list-replacement-itg.component.ts b/Mohem/src/app/notification/work-list-replacement-itg/work-list-replacement-itg.component.ts index 4f960ddf..5ee7bec2 100644 --- a/Mohem/src/app/notification/work-list-replacement-itg/work-list-replacement-itg.component.ts +++ b/Mohem/src/app/notification/work-list-replacement-itg/work-list-replacement-itg.component.ts @@ -34,11 +34,14 @@ export class WorkListReplacementItgComponent implements OnInit { isAnswer: boolean = false; favoriteUserList: [] = []; userNote: any; + public direction = ''; constructor(public vacationRuleService: VacationRuleServiceService, public ts: TranslatorService, public cs: CommonService, public worklistService: WorklistService, - public modalController: ModalController) { } + public modalController: ModalController) { + this.direction = TranslatorService.getCurrentDirection(); + } ngOnInit() { this.getFavruite(); diff --git a/Mohem/src/app/profile/add-address/add-address.component.ts b/Mohem/src/app/profile/add-address/add-address.component.ts index 1d64d6c9..0b88a65a 100644 --- a/Mohem/src/app/profile/add-address/add-address.component.ts +++ b/Mohem/src/app/profile/add-address/add-address.component.ts @@ -78,7 +78,7 @@ export class AddAddressComponent implements OnInit { constructor( public modalController: ModalController, public cs: CommonService, - private ts: TranslatorService, + public ts: TranslatorService, private eitService: EitService, public datePicker: DatePicker, public profileService: ProfileService diff --git a/Mohem/src/app/profile/add-basic-details/add-basic-details.component.html b/Mohem/src/app/profile/add-basic-details/add-basic-details.component.html index 9b604048..e4082aa9 100644 --- a/Mohem/src/app/profile/add-basic-details/add-basic-details.component.html +++ b/Mohem/src/app/profile/add-basic-details/add-basic-details.component.html @@ -36,7 +36,7 @@
- + {{'vacation-rule, next-label' | translate}}
\ No newline at end of file diff --git a/Mohem/src/app/profile/home/home.component.html b/Mohem/src/app/profile/home/home.component.html index 690190cc..adfd1d65 100644 --- a/Mohem/src/app/profile/home/home.component.html +++ b/Mohem/src/app/profile/home/home.component.html @@ -193,8 +193,8 @@

{{ts.trPK('general','main-address')}}

- - + + diff --git a/Mohem/src/app/profile/home/home.component.ts b/Mohem/src/app/profile/home/home.component.ts index a12852d2..3694d942 100644 --- a/Mohem/src/app/profile/home/home.component.ts +++ b/Mohem/src/app/profile/home/home.component.ts @@ -100,23 +100,36 @@ export class HomeComponent implements OnInit { public setMenuEntries() { let personalInformationChildren: any; let personalInfoNestedChildren: any; - 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 (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]; + } } } } } } + } 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]; + } + } } console.log(this.basicDetailsSubMenu); console.log(this.addressSubMenu); diff --git a/Mohem/src/app/profile/profile.module.ts b/Mohem/src/app/profile/profile.module.ts index 6ff96fc7..42bd13b9 100644 --- a/Mohem/src/app/profile/profile.module.ts +++ b/Mohem/src/app/profile/profile.module.ts @@ -22,6 +22,7 @@ import { AddAddressComponent } from './add-address/add-address.component'; import { ConfirmAddressComponent } from './confirm-address/confirm-address.component'; import { SubmitAddressModalComponent } from './submit-eit-modal/submit-address-modal.component'; +import { ConfirmBasicDetailsComponent } from './confirm-basic-details/confirm-basic-details.component'; const routes: Routes = [ { path: '', @@ -38,6 +39,11 @@ const routes: Routes = [ { path: 'confirm-add-address', component: ConfirmAddressComponent + + }, + { + path: 'confirm-basic', + component: ConfirmBasicDetailsComponent } ], }, @@ -107,8 +113,12 @@ const routes: Routes = [ PerformanceEvaluationComponent, ConfirmAddressComponent, SubmitAddressModalComponent, + AddBasicDetailsComponent, + ConfirmAddressComponent, + ConfirmBasicDetailsComponent, AddBasicDetailsComponent], entryComponents: [EditDetailProfileComponent, SubmitAddressModalComponent], + providers: [DatePicker] }) export class ProfilePageModule { }