From c3f63b78e7cc274ae3876a26bbe12a3900ca9349 Mon Sep 17 00:00:00 2001 From: umasoodch Date: Mon, 28 Jun 2021 12:13:37 +0300 Subject: [PATCH 1/3] fixed prod build issues --- .../app/itemforsale/items/items.component.html | 2 +- .../work-list-replacement-itg.component.html | 4 ++-- .../work-list-replacement-itg.component.ts | 5 ++++- .../profile/add-address/add-address.component.ts | 5 +++-- .../add-basic-details.component.html | 2 +- Mohem/src/app/profile/profile.module.ts | 15 +++++++++++++-- 6 files changed, 24 insertions(+), 9 deletions(-) diff --git a/Mohem/src/app/itemforsale/items/items.component.html b/Mohem/src/app/itemforsale/items/items.component.html index d93cba0e..9edbca38 100644 --- a/Mohem/src/app/itemforsale/items/items.component.html +++ b/Mohem/src/app/itemforsale/items/items.component.html @@ -156,7 +156,7 @@
- + diff --git a/Mohem/src/app/notification/work-list-replacement-itg/work-list-replacement-itg.component.html b/Mohem/src/app/notification/work-list-replacement-itg/work-list-replacement-itg.component.html index 16fc563a..284f1d6e 100644 --- a/Mohem/src/app/notification/work-list-replacement-itg/work-list-replacement-itg.component.html +++ b/Mohem/src/app/notification/work-list-replacement-itg/work-list-replacement-itg.component.html @@ -147,7 +147,7 @@
-
+
@@ -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 d320f7bb..e9739fc7 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 @@ -148,7 +148,8 @@ export class AddAddressComponent implements OnInit { P_FUNCTION_NAME: this.selMenu.GetMenuEntriesList.FUNCTION_NAME, P_SELECTED_EMPLOYEE_NUMBER: this.selEmp, P_MENU_TYPE: this.menuType, - P_SELECTED_RESP_ID: this.respID + P_SELECTED_RESP_ID: this.respID, + P_COUNTRY_CODE: 'SA' // P_USER_NAME:this.userName }; this.profileService.getAddressDiffStructure(body).subscribe((result: any) => { 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/profile.module.ts b/Mohem/src/app/profile/profile.module.ts index 46dc114d..f32b5a42 100644 --- a/Mohem/src/app/profile/profile.module.ts +++ b/Mohem/src/app/profile/profile.module.ts @@ -19,7 +19,8 @@ import { from } from 'rxjs'; import { EditDetailProfileComponent } from './modal/edit-detail-profile/edit-detail-profile.component'; import { AddBasicDetailsComponent } from './add-basic-details/add-basic-details.component'; import { AddAddressComponent } from './add-address/add-address.component'; - +import { ConfirmAddressComponent } from './confirm-address/confirm-address.component'; +import { ConfirmBasicDetailsComponent } from './confirm-basic-details/confirm-basic-details.component'; const routes: Routes = [ { path: '', @@ -32,6 +33,14 @@ const routes: Routes = [ { path: 'add-address', component: AddAddressComponent + }, + { + path: 'confirm-address', + component: ConfirmAddressComponent + }, + { + path: 'confirm-basic', + component: ConfirmBasicDetailsComponent } ], }, @@ -99,7 +108,9 @@ const routes: Routes = [ ProfileImageComponent, EditProfileComponent, PerformanceEvaluationComponent, - AddBasicDetailsComponent], + AddBasicDetailsComponent, + ConfirmAddressComponent, + ConfirmBasicDetailsComponent], entryComponents: [EditDetailProfileComponent], providers: [DatePicker] }) From 670980886a7da2a2e115ef56e2569cb47b140088 Mon Sep 17 00:00:00 2001 From: umasoodch Date: Mon, 28 Jun 2021 12:31:47 +0300 Subject: [PATCH 2/3] fixed data issue --- Mohem/src/app/profile/home/home.component.ts | 37 +++++++++++++------- 1 file changed, 25 insertions(+), 12 deletions(-) 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); From a6a6f176528807d44ceaa9dad7898bee827a167e Mon Sep 17 00:00:00 2001 From: Fatimah Alshammari Date: Tue, 29 Jun 2021 10:53:03 +0300 Subject: [PATCH 3/3] fixed testing issues --- .../my-request/my-request.component.ts | 1 + .../src/app/my-team/home/home.component.html | 19 +++++++++++++------ .../src/app/my-team/home/home.component.scss | 10 ++++++---- Mohem/src/app/my-team/home/home.component.ts | 13 +++++++++++-- 4 files changed, 31 insertions(+), 12 deletions(-) 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 @@
--> -
+