From a18c30eaa5d293c65db359cee96adcc8c83c3235 Mon Sep 17 00:00:00 2001 From: "Fatimah.Alshammari" Date: Sun, 8 Mar 2020 10:07:07 +0300 Subject: [PATCH 01/17] general enhancments --- Mohem/src/app/eit/eit-list/eit-list.component.html | 3 +++ .../ui/stats-button/stats-button.component.scss | 9 +++++++-- Mohem/src/theme/styles.scss | 4 +++- 3 files changed, 13 insertions(+), 3 deletions(-) diff --git a/Mohem/src/app/eit/eit-list/eit-list.component.html b/Mohem/src/app/eit/eit-list/eit-list.component.html index b442044d..43f3d4b8 100644 --- a/Mohem/src/app/eit/eit-list/eit-list.component.html +++ b/Mohem/src/app/eit/eit-list/eit-list.component.html @@ -1,10 +1,13 @@ + {{headerTitle}} {{headerTitle}} + +
diff --git a/Mohem/src/app/hmg-common/ui/stats-button/stats-button.component.scss b/Mohem/src/app/hmg-common/ui/stats-button/stats-button.component.scss index d2cfa8ae..b0f2c44f 100644 --- a/Mohem/src/app/hmg-common/ui/stats-button/stats-button.component.scss +++ b/Mohem/src/app/hmg-common/ui/stats-button/stats-button.component.scss @@ -14,10 +14,15 @@ width: 100%; position: static; img { + // display: block; + // max-width: 45%; + // padding-bottom: 5px; + // padding-top: 5px; display: block; - max-width: 45%; - padding-bottom: 5px; + max-width: 67%; + padding-bottom: 9px; padding-top: 5px; + height: 47px; } } diff --git a/Mohem/src/theme/styles.scss b/Mohem/src/theme/styles.scss index b2768650..e4781f35 100644 --- a/Mohem/src/theme/styles.scss +++ b/Mohem/src/theme/styles.scss @@ -637,7 +637,7 @@ img.flipImg{ transform: translate3d(0, 0, 0); width: 100%; padding: 6px 0px; - background: var(--light); + // background: var(--light); border-bottom: var(--cusgray) solid 1px; border-radius: 0px; -webkit-appearance: none; @@ -646,6 +646,7 @@ img.flipImg{ box-shadow: none; -webkit-box-shadow:none; -moz-box-shadow: none; + } .daynamicForm-DateTime:after{ width: 0; @@ -664,6 +665,7 @@ img.flipImg{ } content: ""; z-index: 98; + margin-left: 31px; } .daynamicForm-Select{ From 2397fc1482b841e419759ea5254930964aba1bf1 Mon Sep 17 00:00:00 2001 From: ashwaq Date: Mon, 9 Mar 2020 14:59:38 +0300 Subject: [PATCH 02/17] fix bug --- .../change-password.component.html | 23 +++++--- .../change-password.component.scss | 4 ++ .../change-password.component.ts | 52 ++++++++++++++++++- .../services/common/common.service.ts | 4 ++ .../worklist-main/worklist-main.component.ts | 1 + 5 files changed, 76 insertions(+), 8 deletions(-) diff --git a/Mohem/src/app/authentication/change-password/change-password.component.html b/Mohem/src/app/authentication/change-password/change-password.component.html index 29eb0d85..9e7c2ecb 100644 --- a/Mohem/src/app/authentication/change-password/change-password.component.html +++ b/Mohem/src/app/authentication/change-password/change-password.component.html @@ -27,33 +27,42 @@ - +

{{'changePassword,newPassword' | translate}}

+ + + - +
- + +
\ No newline at end of file diff --git a/Mohem/src/app/authentication/change-password/change-password.component.scss b/Mohem/src/app/authentication/change-password/change-password.component.scss index baffb4ff..727737ed 100644 --- a/Mohem/src/app/authentication/change-password/change-password.component.scss +++ b/Mohem/src/app/authentication/change-password/change-password.component.scss @@ -29,3 +29,7 @@ width: 315px; } +.disabledButton{ + opacity:.5; + +} diff --git a/Mohem/src/app/authentication/change-password/change-password.component.ts b/Mohem/src/app/authentication/change-password/change-password.component.ts index 455ffffb..c7449268 100644 --- a/Mohem/src/app/authentication/change-password/change-password.component.ts +++ b/Mohem/src/app/authentication/change-password/change-password.component.ts @@ -12,6 +12,7 @@ import { SharedDataService } from 'src/app/hmg-common/services/shared-data-servi import {LoginComponent} from "src/app/authentication/login/login.component"; import { Password } from '../models/password'; import { AuthenticatedUser } from "src/app/hmg-common/services/authentication/models/authenticated-user"; +//import { FormBuilder, FormGroup, Validators } from '@angular/forms'; @Component({ selector: 'app-change-password', @@ -28,6 +29,11 @@ export class ChangePasswordComponent implements OnInit { userData: any = {}; public isExpiredPwd: boolean = false; + public NEW_PASSWORD: boolean = false; + public Confirm_NEW_PASSWORD: boolean = false; + public OLD_PASSWORD: boolean = false; + //public profile_form: FormGroup; + constructor( public cs: CommonService, public authService: AuthenticationService, @@ -36,7 +42,9 @@ export class ChangePasswordComponent implements OnInit { public ts: TranslatorService, public smsService: SmsReaderService, public changeDetector: ChangeDetectorRef, - public sharedData: SharedDataService) { + public sharedData: SharedDataService, + // public formBuilder: FormBuilder, + ) { console.log("change password constructor"); } @@ -48,6 +56,11 @@ export class ChangePasswordComponent implements OnInit { this.P_USER_NAME =data.P_USER_NAME; console.log(this.isExpiredPwd); console.log(this.P_USER_NAME); + + + // this.profile_form = this.formBuilder.group({ + // password: ['', Validators.compose([Validators.minLength(8)])] + // }); // this.authService // .loadAuthenticatedUser() // .subscribe((user: AuthenticatedUser) => { @@ -119,6 +132,43 @@ export class ChangePasswordComponent implements OnInit { } }); } + onChangeCNP(){ +// in UAT Alow to the length of password less than 8 +// so if we ready to go life change it to >= 8 + if (this.P_Confirm_NEW_PASSWORD.length >= 3) { + this.Confirm_NEW_PASSWORD=true; + + }else{ + this.Confirm_NEW_PASSWORD=false; + + } } + +onChangeNP(){ +// in UAT Alow to the length of password less than 8 +// so if we ready to go life change it to >= 8 + if (this.P_NEW_PASSWORD.length >= 3) { + this.NEW_PASSWORD=true; + +}else{ + this.NEW_PASSWORD=false; + +} + +} +onChangeOP(){ +// in UAT Alow to the length of password less than 8 +// so if we ready to go life change it to >= 8 + if (this.P_OLD_PASSWORD.length >= 3) { + this.OLD_PASSWORD=true; + +}else{ + this.OLD_PASSWORD=false; + +} + +} + +} diff --git a/Mohem/src/app/hmg-common/services/common/common.service.ts b/Mohem/src/app/hmg-common/services/common/common.service.ts index 08163c91..17992c66 100644 --- a/Mohem/src/app/hmg-common/services/common/common.service.ts +++ b/Mohem/src/app/hmg-common/services/common/common.service.ts @@ -1211,6 +1211,10 @@ public getMonthNameAr(value: number): string { public openPerformanceevaluation() { this.nav.navigateForward(["/profile/performanceevaluation"]); } + public eitUpdate() { + this.nav.navigateForward(["/eit/eit-update-list"]); + } + public navigatePage(path) { diff --git a/Mohem/src/app/notification/worklist-main/worklist-main.component.ts b/Mohem/src/app/notification/worklist-main/worklist-main.component.ts index 916d0c59..5f15674a 100644 --- a/Mohem/src/app/notification/worklist-main/worklist-main.component.ts +++ b/Mohem/src/app/notification/worklist-main/worklist-main.component.ts @@ -542,6 +542,7 @@ export class WorklistMainComponent implements OnInit { EITNotificatonBodyResponse.NOT_WORKLIST ); // this.navCtrl.push("EitUpdateListPage"); + this.common.eitUpdate();// must be test } else if (this.getPassNotificationDetails.REQUEST_TYPE == "ABSENCE") { this.common.sharedService.setSharedData( this.notificationBodyRes, From 5aeab4b08cf5ccbcbb897a76811aec3cefb0d898 Mon Sep 17 00:00:00 2001 From: ashwaq Date: Tue, 10 Mar 2020 12:18:29 +0300 Subject: [PATCH 03/17] add MO item History --- .../services/common/common.service.ts | 5 + .../item-history/item-history.component.html | 2 +- .../mo-item-history.component.html | 226 ++++++++++++++++++ .../mo-item-history.component.scss | 20 ++ .../mo-item-history.component.spec.ts | 27 +++ .../mo-item-history.component.ts | 123 ++++++++++ .../app/notification/notification.module.ts | 10 +- .../service/work-list.main.service.ts | 2 +- .../worklist-main-mr.component.html | 19 ++ .../worklist-main-mr.component.ts | 53 +++- Mohem/src/assets/localization/i18n.json | 4 + 11 files changed, 486 insertions(+), 5 deletions(-) create mode 100644 Mohem/src/app/notification/mo-item-history/mo-item-history.component.html create mode 100644 Mohem/src/app/notification/mo-item-history/mo-item-history.component.scss create mode 100644 Mohem/src/app/notification/mo-item-history/mo-item-history.component.spec.ts create mode 100644 Mohem/src/app/notification/mo-item-history/mo-item-history.component.ts diff --git a/Mohem/src/app/hmg-common/services/common/common.service.ts b/Mohem/src/app/hmg-common/services/common/common.service.ts index 17992c66..792c5131 100644 --- a/Mohem/src/app/hmg-common/services/common/common.service.ts +++ b/Mohem/src/app/hmg-common/services/common/common.service.ts @@ -1171,6 +1171,11 @@ public getMonthNameAr(value: number): string { public openItemHistoryPage() { this.nav.navigateForward(['/notification/item-history-PO']); } + + public openMOItemHistoryPage(){ + this.nav.navigateForward(["/notification/item-history-MO"]); + + } public openQutationAnalysisPage() { this.nav.navigateForward(['/notification/qutation-analysis-PO']); } diff --git a/Mohem/src/app/notification/item-history/item-history.component.html b/Mohem/src/app/notification/item-history/item-history.component.html index 1ac2132a..f462abf7 100644 --- a/Mohem/src/app/notification/item-history/item-history.component.html +++ b/Mohem/src/app/notification/item-history/item-history.component.html @@ -1,5 +1,5 @@ - + {{ts.trPK('worklistMain','ITEM_HIS')}} diff --git a/Mohem/src/app/notification/mo-item-history/mo-item-history.component.html b/Mohem/src/app/notification/mo-item-history/mo-item-history.component.html new file mode 100644 index 00000000..cc1a2b58 --- /dev/null +++ b/Mohem/src/app/notification/mo-item-history/mo-item-history.component.html @@ -0,0 +1,226 @@ + + + + + {{ts.trPK('worklistMain','ITEM_HIS')}} + + + + + + + + + + + + + +
+

{{ 'general, empty' | translate}}

+
+ + + + +
+ + + + + + + + + + + + +
+ + {{itemHistory.REQUEST_NUMBER}} +
+ + + + +
+ + {{itemHistory.UNIT_OF_MEASURE}} +
+
+ + + + +
+ + {{itemHistory.QUANTITY}} +
+ + + + +
+ + {{itemHistory.DATE_REQUIRED}} + +
+
+ + + + + +
+ + {{itemHistory.LINE_STATUS_DIS}} +
+ + + + + +
+ + {{itemHistory.STATUS_DATE}} +
+ +
+ + + + + +
+ + {{itemHistory.TRANSACTION_TYPE_NAME}} +
+ + + + + +
+ + {{itemHistory.ORGANIZATION_NAME}} +
+ +
+ + + + + +
+ + {{itemHistory.ORGANIZATION_CODE}} +
+ + + + + +
+ + {{itemHistory.OPERATING_UNIT_NAME}} +
+ +
+ + + + + +
+ + {{itemHistory.FROM_SUBINVENTORY_CODE}} +
+ + + + + +
+ + {{itemHistory.FROM_LOCATOR}} +
+ +
+ + + + + +
+ + {{itemHistory.TO_SUBINVENTORY_CODE}} +
+ + + + + +
+ + {{itemHistory.TO_LOCATOR}} +
+ +
+ + + + + +
+ + {{itemHistory.SHIP_TO_LOCATION}} +
+ + +
+
+ +
+ +
+
+ + + + + +
\ No newline at end of file diff --git a/Mohem/src/app/notification/mo-item-history/mo-item-history.component.scss b/Mohem/src/app/notification/mo-item-history/mo-item-history.component.scss new file mode 100644 index 00000000..95c01568 --- /dev/null +++ b/Mohem/src/app/notification/mo-item-history/mo-item-history.component.scss @@ -0,0 +1,20 @@ +.itemeHistoryist { + background: #f0efef; + padding: 6px; + /* margin-top: 20px; */ + /* width: 100%;*/ +} +ion-label.labelValue.sc-ion-label-ios-h.sc-ion-label-ios-s.ios.hydrated, +ion-label.labelValue.sc-ion-label-md-h.sc-ion-label-md-s.md.hydrated +{ + white-space: pre-wrap !important; + --color: initial; + display: block; + color: var(--color); + font-family: var(--ion-font-family,inherit); + font-size: inherit; + text-overflow: ellipsis; + overflow: hidden; + -webkit-box-sizing: border-box; + box-sizing: border-box +} \ No newline at end of file diff --git a/Mohem/src/app/notification/mo-item-history/mo-item-history.component.spec.ts b/Mohem/src/app/notification/mo-item-history/mo-item-history.component.spec.ts new file mode 100644 index 00000000..00e6b861 --- /dev/null +++ b/Mohem/src/app/notification/mo-item-history/mo-item-history.component.spec.ts @@ -0,0 +1,27 @@ +import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core'; +import { async, ComponentFixture, TestBed } from '@angular/core/testing'; + +import { MoItemHistoryComponent } from './mo-item-history.component'; + +describe('MoItemHistoryComponent', () => { + let component: MoItemHistoryComponent; + let fixture: ComponentFixture; + + beforeEach(async(() => { + TestBed.configureTestingModule({ + declarations: [ MoItemHistoryComponent ], + schemas: [CUSTOM_ELEMENTS_SCHEMA], + }) + .compileComponents(); + })); + + beforeEach(() => { + fixture = TestBed.createComponent(MoItemHistoryComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/Mohem/src/app/notification/mo-item-history/mo-item-history.component.ts b/Mohem/src/app/notification/mo-item-history/mo-item-history.component.ts new file mode 100644 index 00000000..f67d319d --- /dev/null +++ b/Mohem/src/app/notification/mo-item-history/mo-item-history.component.ts @@ -0,0 +1,123 @@ +import { Component, OnInit } from '@angular/core'; +import { WorklistMainService } from '../service/work-list.main.service'; +import { CommonService } from 'src/app/hmg-common/services/common/common.service'; +import { TranslatorService } from 'src/app/hmg-common/services/translator/translator.service'; +import { ModalController } from '@ionic/angular'; +import { WorklistService } from '../service/worklist.service'; +import { MOItemHistoryReq } from '../models/MOItemHistoryReq'; +import { MOItemHistoryRes } from '../models/MOItemHistoryRes'; + +@Component({ + selector: 'app-mo-item-history', + templateUrl: './mo-item-history.component.html', + styleUrls: ['./mo-item-history.component.scss'], +}) +export class MoItemHistoryComponent implements OnInit { + getPassMOInfo: any; + itemHistoryRes: any; + IsReachEnd: boolean = false; + P_PAGE_NUM: number = 1; + P_PAGE_LIMIT: number = 50; + MOItemHistoryReq: any; + + constructor( + public worklistMainService: WorklistMainService, + private cs: CommonService, + private ts: TranslatorService, + public worklistService: WorklistService + ) { + this.getPassMOInfo = this.cs.sharedService.getSharedData('passMOReq'); + + this.MOItemHistoryReq = new MOItemHistoryReq(); + this.MOItemHistoryReq.P_PAGE_NUM = this.P_PAGE_NUM; + this.MOItemHistoryReq.P_PAGE_LIMIT = this.P_PAGE_LIMIT; + this.MOItemHistoryReq.P_ITEM_ID= this.getPassMOInfo.P_ITEM_ID; + this.MOItemHistoryReq.P_ORG_ID= this.getPassMOInfo.P_ORG_ID; + + } + + ngOnInit() { + + this.getMOItemHistory(this.getPassMOInfo.P_ITEM_ID,this.getPassMOInfo.P_ORG_ID); + + + + } + + getMOItemHistory(itemID ,orgID) { + console.log(itemID); + this.IsReachEnd = false; + const request = new MOItemHistoryReq(); + request.P_ITEM_ID = parseInt(itemID); + request.P_PAGE_LIMIT = 100; + request.P_PAGE_NUM = 1; + request.P_ORG_ID= parseInt(orgID); + + + + this.worklistMainService.getMOItemHistory(request). + subscribe((result: MOItemHistoryRes) => { + + this.handleItemHistoryResult(result); + }); + } + + + handleItemHistoryResult(result) { + if (this.cs.validResponse(result)) { + if (this.cs.hasData(result.GetMoItemHistoryList)) { + this.itemHistoryRes = result.GetMoItemHistoryList; + this.P_PAGE_NUM++; + this.MOItemHistoryReq.P_PAGE_NUM = this.P_PAGE_NUM; + let lastItemIndex = this.itemHistoryRes.length - 1; + if (result.GetMoItemHistoryList[lastItemIndex]) { + let lastitem = result.GetMoItemHistoryList[lastItemIndex]; + if (lastitem.NO_OF_ROWS == lastitem.ROW_NUM) { + this.IsReachEnd = true; + } else { + this.IsReachEnd = false; + } + } + } + + + } + +} + + +doInfinite(infiniteScroll) { + if (!this.IsReachEnd) { + // this.POItemHistoryReq.P_PAGE_NUM = this.P_PAGE_NUM; + this.worklistMainService.getMOItemHistory(this.MOItemHistoryReq). + subscribe((result: any) => { + if (this.cs.validResponse(result)) { + if (result.GetMoItemHistoryList != undefined) { + this.MOItemHistoryReq.P_PAGE_NUM=this.P_PAGE_NUM++; + (result.GetMoItemHistoryList).forEach(element => { + if (element.ROW_NUM == element.NO_OF_ROWS) { + this.IsReachEnd = true; + } else { + this.IsReachEnd = false; + } + this.itemHistoryRes.push(element); + }, (Error) => console.log(Error), () => infiniteScroll.target.complete()); + }// if list length >0 + else { + this.IsReachEnd = true; + } + }// if response == 1 + //this.pageNum++; + infiniteScroll.target.complete(); + + }); + } else { + if (infiniteScroll) + infiniteScroll.target.complete(); + } +}//end infiniteScroll + + + + +} diff --git a/Mohem/src/app/notification/notification.module.ts b/Mohem/src/app/notification/notification.module.ts index caa8cc34..4935cb92 100644 --- a/Mohem/src/app/notification/notification.module.ts +++ b/Mohem/src/app/notification/notification.module.ts @@ -31,6 +31,7 @@ import { WorkListMainItgComponent } from './work-list-main-itg/work-list-main-it // import { WorklistMainComponent } from './worklist-main/worklist-main.component'; import {MoreActionModalComponent} from './more-action-modal/more-action-modal.component' import { WorkListReplacementItgComponent } from './work-list-replacement-itg/work-list-replacement-itg.component'; +import { MoItemHistoryComponent } from './mo-item-history/mo-item-history.component'; const routes: Routes = [ @@ -114,7 +115,11 @@ const routes: Routes = [ { path: 'worklist-replacement-itg', component: WorkListReplacementItgComponent - } + }, + { + path: 'item-history-MO', + component: MoItemHistoryComponent + } ] } ]; @@ -148,7 +153,8 @@ const routes: Routes = [ WorklistMainMRComponent, WorklistAdvancedSearchComponent, WorkListMainItgComponent, - WorkListReplacementItgComponent + WorkListReplacementItgComponent, + MoItemHistoryComponent // WorklistMainComponent ], entryComponents: [ diff --git a/Mohem/src/app/notification/service/work-list.main.service.ts b/Mohem/src/app/notification/service/work-list.main.service.ts index 720f5c1e..3b55cffd 100644 --- a/Mohem/src/app/notification/service/work-list.main.service.ts +++ b/Mohem/src/app/notification/service/work-list.main.service.ts @@ -34,7 +34,7 @@ export class WorklistMainService { public static getPRNotificationBody = "Services/ERP.svc/REST/GET_PR_NOTIFICATION_BODY"; public static getPOItemHistory = "Services/ERP.svc/REST/GET_PO_ITEM_HISTORY"; - public static getMOItemHistory = "GET_MO_ITEM_HISTORY"; + public static getMOItemHistory = "Services/ERP.svc/REST/GET_MO_ITEM_HISTORY"; public static getNotificationButtons = "Services/ERP.svc/REST/GET_NOTIFICATION_BUTTONS"; public static getUserInfo = "Services/ERP.svc/REST/Get_UserInformation"; diff --git a/Mohem/src/app/notification/worklist-main-mr/worklist-main-mr.component.html b/Mohem/src/app/notification/worklist-main-mr/worklist-main-mr.component.html index e4f7e7a5..5d633db5 100644 --- a/Mohem/src/app/notification/worklist-main-mr/worklist-main-mr.component.html +++ b/Mohem/src/app/notification/worklist-main-mr/worklist-main-mr.component.html @@ -408,6 +408,25 @@ + + + + +
+ + +
+ + +
+
+ + diff --git a/Mohem/src/app/notification/worklist-main-mr/worklist-main-mr.component.ts b/Mohem/src/app/notification/worklist-main-mr/worklist-main-mr.component.ts index edffe2f5..15585a23 100644 --- a/Mohem/src/app/notification/worklist-main-mr/worklist-main-mr.component.ts +++ b/Mohem/src/app/notification/worklist-main-mr/worklist-main-mr.component.ts @@ -31,6 +31,8 @@ import { ApplyActionModalComponent } from '../apply-action-modal/apply-action-mo import { MoreActionModalComponent } from '../more-action-modal/more-action-modal.component'; import { WorkListReplacementRollComponent } from '../work-list-replacement-roll/work-list-replacement-roll.component'; import { WorkListRfcComponent } from '../work-list-rfc/work-list-rfc.component'; +import { MOItemHistoryRes } from '../models/MOItemHistoryRes'; +import { MOItemHistoryReq } from '../models/MOItemHistoryReq'; @Component({ selector: 'app-worklist-main-mr', @@ -99,6 +101,7 @@ export class WorklistMainMRComponent implements OnInit { approveDis: boolean = false; rejectDis: boolean = false; requestDis: boolean = false; + public static PASS_MO_REQ = "passMOReq"; @@ -233,7 +236,7 @@ export class WorklistMainMRComponent implements OnInit { } handleWorkListBodyResult(result, Type) { - this.notificationBodyRes = {}; + this.notificationBodyRes = []; if (this.common.validResponse(result)) { this.pInformation = result.P_INFORMATION; this.pQuestion = result.P_QUESTION; @@ -1026,4 +1029,52 @@ export class WorklistMainMRComponent implements OnInit { } + getMOItemHistory(itemID ,orgID) { + console.log(itemID); + this.IsReachEnd = false; + const request = new MOItemHistoryReq(); + request.P_ITEM_ID = parseInt(itemID); + request.P_PAGE_LIMIT = 100; + request.P_PAGE_NUM = 1; + request.P_ORG_ID= parseInt(orgID); + + + + this.worklistMainService.getMOItemHistory(request). + subscribe((result: MOItemHistoryRes) => { + // this.common.sharedService.setSharedData( + // result.GetItemHistoryList, + // WorklistMainPoComponent.ItemHistoryList + // ); + this.common.sharedService.setSharedData( + request, + WorklistMainMRComponent.PASS_MO_REQ + ); + //open page + // this.common.openItemHistoryPage(); + this.handleItemHistoryResult(result); + }); + } + + + handleItemHistoryResult(result) { + if (this.common.validResponse(result)) { + if (this.common.hasData(result.GetMoItemHistoryList)) { + this.common.openMOItemHistoryPage(); + + } + } + else { + this.common.presentAlert( + this.ts.trPK("general", "empty") + ); + } + + } + + } + + + + diff --git a/Mohem/src/assets/localization/i18n.json b/Mohem/src/assets/localization/i18n.json index 33d6dac0..79891a78 100644 --- a/Mohem/src/assets/localization/i18n.json +++ b/Mohem/src/assets/localization/i18n.json @@ -2184,6 +2184,10 @@ "line_details":{ "en": "Line Details", "ar":"Line Details" + }, + "request_number":{ + "en": "Request Number", + "ar":"Request Number" } }, From 30bfa05c2d9b29ed4194376b019d64d381773957 Mon Sep 17 00:00:00 2001 From: ashwaq Date: Tue, 10 Mar 2020 12:51:44 +0300 Subject: [PATCH 04/17] fix MO item History --- .../mo-item-history.component.scss | 25 +++++++++++++------ Mohem/src/theme/worklist.scss | 1 + 2 files changed, 19 insertions(+), 7 deletions(-) diff --git a/Mohem/src/app/notification/mo-item-history/mo-item-history.component.scss b/Mohem/src/app/notification/mo-item-history/mo-item-history.component.scss index 95c01568..ae11a4d9 100644 --- a/Mohem/src/app/notification/mo-item-history/mo-item-history.component.scss +++ b/Mohem/src/app/notification/mo-item-history/mo-item-history.component.scss @@ -7,14 +7,25 @@ ion-label.labelValue.sc-ion-label-ios-h.sc-ion-label-ios-s.ios.hydrated, ion-label.labelValue.sc-ion-label-md-h.sc-ion-label-md-s.md.hydrated { - white-space: pre-wrap !important; + // white-space: pre-wrap !important; + // --color: initial; + // display: block; + // color: var(--color); + // font-family: var(--ion-font-family,inherit); + // font-size: inherit; + // text-overflow: ellipsis; + // overflow: hidden; + // -webkit-box-sizing: border-box; + // box-sizing: border-box + + + --color: initial; - display: block; - color: var(--color); - font-family: var(--ion-font-family,inherit); + display: contents !important; + font-family: var(--ion-font-family, inherit); font-size: inherit; - text-overflow: ellipsis; + text-overflow: ellipsis !important; + white-space: pre; overflow: hidden; - -webkit-box-sizing: border-box; - box-sizing: border-box + box-sizing: border-box; } \ No newline at end of file diff --git a/Mohem/src/theme/worklist.scss b/Mohem/src/theme/worklist.scss index 57aa1748..28a013ce 100644 --- a/Mohem/src/theme/worklist.scss +++ b/Mohem/src/theme/worklist.scss @@ -33,6 +33,7 @@ } .itemReqDiv{ padding:10px; + width: 100%; // padding-bottom: 10px; // padding-top: 10px; } From 47054eca843815c7d0cbaf242f0738fe9549c294 Mon Sep 17 00:00:00 2001 From: ashwaq Date: Thu, 12 Mar 2020 10:00:39 +0300 Subject: [PATCH 05/17] fix vacation-rule issue --- .../change-password.component.ts | 6 ++-- .../work-list-replacement-roll.component.html | 6 ++-- .../work-list-replacement-roll.component.scss | 6 ++++ .../work-list-replacement-roll.component.ts | 23 ++++++++++++++ .../replacement-list.component.html | 10 +++--- .../replacement-list.component.scss | 3 ++ .../replacement-list.component.ts | 31 ++++++++++++++++++- 7 files changed, 73 insertions(+), 12 deletions(-) diff --git a/Mohem/src/app/authentication/change-password/change-password.component.ts b/Mohem/src/app/authentication/change-password/change-password.component.ts index c7449268..6ad7b9be 100644 --- a/Mohem/src/app/authentication/change-password/change-password.component.ts +++ b/Mohem/src/app/authentication/change-password/change-password.component.ts @@ -21,9 +21,9 @@ import { AuthenticatedUser } from "src/app/hmg-common/services/authentication/mo }) export class ChangePasswordComponent implements OnInit { private loginData = new LoginModel(); - public P_NEW_PASSWORD: string; - public P_Confirm_NEW_PASSWORD : string; - public P_OLD_PASSWORD : string; + public P_NEW_PASSWORD: string = ""; + public P_Confirm_NEW_PASSWORD : string = ""; + public P_OLD_PASSWORD : string = ""; public P_USER_NAME : string; public logo = "assets/icon/login/lock.png"; diff --git a/Mohem/src/app/notification/work-list-replacement-roll/work-list-replacement-roll.component.html b/Mohem/src/app/notification/work-list-replacement-roll/work-list-replacement-roll.component.html index b4edfb82..0016e66f 100644 --- a/Mohem/src/app/notification/work-list-replacement-roll/work-list-replacement-roll.component.html +++ b/Mohem/src/app/notification/work-list-replacement-roll/work-list-replacement-roll.component.html @@ -11,7 +11,7 @@ {{'replacementRoll, searchBy' | translate}} + [(ngModel)]="searchBy" (ionChange)="onChangeSelect($event)"> {{'addAttach, name' | translate}} {{'login, username' | translate}} {{'general, email' | translate}} @@ -19,11 +19,11 @@ - + - + - +
diff --git a/Mohem/src/app/vacation-rule/replacement-list/replacement-list.component.scss b/Mohem/src/app/vacation-rule/replacement-list/replacement-list.component.scss index 31ba8d46..8212dc68 100644 --- a/Mohem/src/app/vacation-rule/replacement-list/replacement-list.component.scss +++ b/Mohem/src/app/vacation-rule/replacement-list/replacement-list.component.scss @@ -164,4 +164,7 @@ button.item-button.button.button-md.button-clear.button-clear-md { border: #dedede solid 1px; } +.disabledButton{ + opacity:.5; +} diff --git a/Mohem/src/app/vacation-rule/replacement-list/replacement-list.component.ts b/Mohem/src/app/vacation-rule/replacement-list/replacement-list.component.ts index d136c2a1..731fe21d 100644 --- a/Mohem/src/app/vacation-rule/replacement-list/replacement-list.component.ts +++ b/Mohem/src/app/vacation-rule/replacement-list/replacement-list.component.ts @@ -29,12 +29,18 @@ export class ReplacementListComponent implements OnInit { isAbs: boolean = false; isSave: boolean = false; active: any; + isSelect: boolean =false; + searchKeyEnter: boolean = false; constructor(public vacationRuleService: VacationRuleServiceService, public ts: TranslatorService, public cs: CommonService, public modalController: ModalController) { } - ngOnInit() { } + ngOnInit() { + + } SearchReplacementList() { + console.log("this.searchKeySelect" + this.searchKeySelect); + this.ReplacementList = []; this.IsReachEnd = false; this.P_PAGE_NUM = 1; @@ -198,4 +204,27 @@ export class ReplacementListComponent implements OnInit { infiniteScroll.target.complete(); } } + + onChangeSelect(select){ + console.log(select.detail.value); + let selectValue= select.detail.value; + + if(selectValue == "1" || selectValue == "2" ||selectValue == "3"){ + this.isSelect=true; + } + else{ + this.isSelect=false; + + } + } + + onChangeInput(){ + if (this.searchKey.length >0) { + this.searchKeyEnter=true; + + }else{ + this.searchKeyEnter=false; + + } + } } From 7c17cb09132ba8d980bc70ca7157ec580c4e0eee Mon Sep 17 00:00:00 2001 From: "Fatimah.Alshammari" Date: Thu, 12 Mar 2020 15:48:54 +0300 Subject: [PATCH 06/17] add fix bug --- .../app/eit/eit-list/eit-list.component.html | 12 +++++++++-- .../src/app/payslip/home/home.component.html | 21 +++++++++++++------ .../src/app/payslip/home/home.component.scss | 16 +++++++------- .../edit-profile/edit-profile.component.html | 18 +++++++++++++--- .../edit-profile/edit-profile.component.scss | 15 +++++++------ .../edit-profile/edit-profile.component.ts | 4 ++++ Mohem/src/assets/localization/i18n.json | 4 ++++ 7 files changed, 66 insertions(+), 24 deletions(-) diff --git a/Mohem/src/app/eit/eit-list/eit-list.component.html b/Mohem/src/app/eit/eit-list/eit-list.component.html index 43f3d4b8..7c964713 100644 --- a/Mohem/src/app/eit/eit-list/eit-list.component.html +++ b/Mohem/src/app/eit/eit-list/eit-list.component.html @@ -1,8 +1,16 @@ - + + + + + {{headerTitle}} + + + diff --git a/Mohem/src/app/payslip/home/home.component.html b/Mohem/src/app/payslip/home/home.component.html index cb9a57a0..3fbc44b0 100644 --- a/Mohem/src/app/payslip/home/home.component.html +++ b/Mohem/src/app/payslip/home/home.component.html @@ -9,12 +9,21 @@ --> - + + + + + {{ts.trPK('payslip','monthly-payslip')}} + + + + + @@ -99,11 +108,11 @@
+ width: 15%; height: 6px;"> @@ -114,11 +123,11 @@
+ width: 15%; height: 6px;"> diff --git a/Mohem/src/app/payslip/home/home.component.scss b/Mohem/src/app/payslip/home/home.component.scss index 11086df0..4e9a5280 100644 --- a/Mohem/src/app/payslip/home/home.component.scss +++ b/Mohem/src/app/payslip/home/home.component.scss @@ -143,8 +143,10 @@ border-radius: 20px !important; padding-top: 13px; padding-bottom: 14px; - margin-left: 26px; - margin-right: 28px; + // margin-left: 26px; + // margin-right: 28px; + margin-left: 19px; + margin-right: 19px; margin-top: -2px; margin-bottom: 10px; padding-right: 21px; @@ -179,23 +181,23 @@ } } .green-label{ -font-size: 12px; -margin-top: -13px; + font-size: 10px; + margin-top: -13px; } .green-amount{ - font-size: 17px; + font-size: 14px; font-family: WorkSans-Bold; margin-top: -3px; } .blue-label{ - font-size: 12px; + font-size: 10px; margin-top: -13px; } .blue-amount{ - font-size: 17px; + font-size: 14px; font-family: WorkSans-Bold; margin-top: -4px; } diff --git a/Mohem/src/app/profile/edit-profile/edit-profile.component.html b/Mohem/src/app/profile/edit-profile/edit-profile.component.html index 9163ba2a..c60661c1 100644 --- a/Mohem/src/app/profile/edit-profile/edit-profile.component.html +++ b/Mohem/src/app/profile/edit-profile/edit-profile.component.html @@ -1,9 +1,21 @@ + + + + {{ts.trPK('userProfile','title')}} + + + + + + + +
- + +
diff --git a/Mohem/src/app/profile/edit-profile/edit-profile.component.scss b/Mohem/src/app/profile/edit-profile/edit-profile.component.scss index 651acf4b..834dd70f 100644 --- a/Mohem/src/app/profile/edit-profile/edit-profile.component.scss +++ b/Mohem/src/app/profile/edit-profile/edit-profile.component.scss @@ -8,16 +8,19 @@ background: var(--ion-item-background,var(--ion-background-color,#fff)); } +.header-toolbar-new{ + --background: #22c6b3; +} .colorBG{ --background: #f0efef; } .header-div{ - text-transform: capitalize; - background: #22C6B3; - display: block; - position: relative; - height: 160px; - margin-bottom: 60px; + text-transform: capitalize; + background: #22C6B3; + display: block; + position: relative; + height: 113px; + margin-bottom: 60px; } diff --git a/Mohem/src/app/profile/edit-profile/edit-profile.component.ts b/Mohem/src/app/profile/edit-profile/edit-profile.component.ts index 61b0d210..db8b9fa7 100644 --- a/Mohem/src/app/profile/edit-profile/edit-profile.component.ts +++ b/Mohem/src/app/profile/edit-profile/edit-profile.component.ts @@ -113,6 +113,10 @@ private handlePerformanceAppraisalResult(result){ this.sharedData.setSharedData(this.performanceData, PerformanceAppraisalResponse.PERFORMANCE_DATA); //localStorage.setItem("performanceData", this.performanceData) this.cs.openPerformanceevaluation(); + }else{ + let msg: string = this.ts.trPK("userProfile", "no-appraisal"); + this.cs.presentAlert(msg); + } } } diff --git a/Mohem/src/assets/localization/i18n.json b/Mohem/src/assets/localization/i18n.json index 532df045..dae52095 100644 --- a/Mohem/src/assets/localization/i18n.json +++ b/Mohem/src/assets/localization/i18n.json @@ -938,6 +938,10 @@ "en": "Performance", "ar": "الاداء" }, + "no-appraisal": { + "en": "No Performance Evaluation", + "ar": "لايوجد تقييم" + }, "changepicture":{ "en":"Change Picture", "ar":"تغيير الصوره" From 1b875b8bc452fc1d29521d39798aecbbc438de5e Mon Sep 17 00:00:00 2001 From: ashwaq Date: Sun, 15 Mar 2020 10:46:53 +0300 Subject: [PATCH 07/17] fix replacment inif --- .../replacement-list.component.ts | 27 ++++++++++--------- 1 file changed, 15 insertions(+), 12 deletions(-) diff --git a/Mohem/src/app/vacation-rule/replacement-list/replacement-list.component.ts b/Mohem/src/app/vacation-rule/replacement-list/replacement-list.component.ts index 731fe21d..b583fae8 100644 --- a/Mohem/src/app/vacation-rule/replacement-list/replacement-list.component.ts +++ b/Mohem/src/app/vacation-rule/replacement-list/replacement-list.component.ts @@ -31,10 +31,12 @@ export class ReplacementListComponent implements OnInit { active: any; isSelect: boolean =false; searchKeyEnter: boolean = false; + request: ReplacementServiceRequest; constructor(public vacationRuleService: VacationRuleServiceService, public ts: TranslatorService, public cs: CommonService, public modalController: ModalController) { } ngOnInit() { + this.request = new ReplacementServiceRequest(); } @@ -79,15 +81,15 @@ export class ReplacementListComponent implements OnInit { this.P_SEARCH_EMAIL_ADDRESS = ""; } - const request = new ReplacementServiceRequest(); - request.P_SEARCH_USER_NAME = this.P_SEARCH_USER_NAME; - request.P_SEARCH_EMPLOYEE_DISPLAY_NAME = this.P_SEARCH_EMPLOYEE_DISPLAY_NAME; - request.P_SEARCH_EMAIL_ADDRESS = this.P_SEARCH_EMAIL_ADDRESS; - request.P_PAGE_NUM = this.P_PAGE_NUM; - request.P_PAGE_LIMIT = this.P_PAGE_LIMIT; - request.P_SELECTED_EMPLOYEE_NUMBER = this.selEmp; + // const request = new ReplacementServiceRequest(); + this.request.P_SEARCH_USER_NAME = this.P_SEARCH_USER_NAME; + this.request.P_SEARCH_EMPLOYEE_DISPLAY_NAME = this.P_SEARCH_EMPLOYEE_DISPLAY_NAME; + this.request.P_SEARCH_EMAIL_ADDRESS = this.P_SEARCH_EMAIL_ADDRESS; + this.request.P_PAGE_NUM = this.P_PAGE_NUM; + this.request.P_PAGE_LIMIT = this.P_PAGE_LIMIT; + this.request.P_SELECTED_EMPLOYEE_NUMBER = this.selEmp; - this.vacationRuleService.getReplacementList(request). + this.vacationRuleService.getReplacementList(this.request). subscribe((result: any) => { this.handleReplacment(result); }); @@ -167,13 +169,14 @@ export class ReplacementListComponent implements OnInit { if (!this.IsReachEnd) { - const request = new ReplacementServiceRequest(); - request.P_PAGE_NUM = this.P_PAGE_NUM; - request.P_PAGE_LIMIT = this.P_PAGE_LIMIT; + ///const request = new ReplacementServiceRequest(); + console.log(this.request.P_SEARCH_USER_NAME + "-" + this.request.P_SEARCH_EMAIL_ADDRESS + "-" + this.request.P_SEARCH_EMPLOYEE_DISPLAY_NAME ) + this.request.P_PAGE_NUM = this.P_PAGE_NUM; + this.request.P_PAGE_LIMIT = this.P_PAGE_LIMIT; // request.P_SELECTED_EMPLOYEE_NUMBER=this.selEmp; - this.vacationRuleService.getReplacementList(request). + this.vacationRuleService.getReplacementList(this.request). subscribe((result: any) => { if (this.cs.validResponse(result)) { if (this.cs.hasData(result.ReplacementList)) { From 18f54941ee1b8a158c019f609fa8fd5725eaf461 Mon Sep 17 00:00:00 2001 From: ashwaq Date: Sun, 15 Mar 2020 12:04:37 +0300 Subject: [PATCH 08/17] fix update/continue notification + action name --- .../submit-absence.component.ts | 5 ++- .../src/app/eit/add-eit/add-eit.component.ts | 10 ++++-- .../confirm-add-eit.component.ts | 7 ++-- .../app/eit/eit-list/eit-list.component.html | 4 +-- .../eit-update-list.component.html | 35 ++++++++++++++----- .../eit-update-list.component.scss | 17 +++++++++ .../eit-update-list.component.ts | 17 +++++---- .../services/common/common.service.ts | 4 ++- .../worklist-main-mr.component.ts | 20 +++++++---- .../worklist-main-po.component.html | 2 +- .../worklist-main-po.component.ts | 8 +++++ .../worklist-main-pr.component.html | 2 +- .../worklist-main-pr.component.ts | 7 ++++ .../worklist-main.component.html | 2 +- .../worklist-main.component.scss | 1 + .../worklist-main/worklist-main.component.ts | 18 ++++++++-- 16 files changed, 124 insertions(+), 35 deletions(-) diff --git a/Mohem/src/app/absence/submit-absence/submit-absence.component.ts b/Mohem/src/app/absence/submit-absence/submit-absence.component.ts index cd019974..ffe60b9f 100644 --- a/Mohem/src/app/absence/submit-absence/submit-absence.component.ts +++ b/Mohem/src/app/absence/submit-absence/submit-absence.component.ts @@ -27,6 +27,7 @@ import {ReplacementListComponent} from "../../vacation-rule/replacement-list/rep import {ReplacmentResponse} from "../models/replacment-response"; import { AbsenceResponse } from '../models/absence.response'; import { AbsenceReplacementListComponent } from '../absence-replacement-list/absence-replacement-list.component'; +import { AbsenceNotificatonBodyResponse } from 'src/app/notification/models/AbsenceNotificationBodyRes'; @Component({ selector: "app-submit-absence", templateUrl: "./submit-absence.component.html", @@ -88,6 +89,8 @@ export class SubmitAbsenceComponent implements OnInit { ) { ////*new add*///// /**********resubmit************ */ + this.getPassNotificationDetails = this.common.sharedService.getSharedData(AbsenceNotificatonBodyResponse.NOT_WORKLIST, true); + this.getPassdirfromNotifiPage = this.common.sharedService.getSharedData('dirfromNotificationPage'); //this.getPassNotificationDetails = this.common.sharedService.getSharedData(AbsenceNotificatonBodyResponse.NOT_WORKLIST, true); // this.getPassdirfromNotifiPage = this.navParams.get('dirfromNotificationPage'); if (this.getPassdirfromNotifiPage) { @@ -97,7 +100,7 @@ export class SubmitAbsenceComponent implements OnInit { this.notificationId = this.getPassNotificationDetails.NOTIFICATION_ID; this.selEmp = this.getPassNotificationDetails.SELECTED_EMPLOYEE_NUMBER; this.respID = -999; - //this.submitAbsObjList = this.navParams.get('submitAbsObjList'); + this.submitAbsObjList = this.common.sharedService.getSharedData('submitAbsObjList'); } else { this.action = "CREATE"; this.selEmp = this.common.sharedService.getSharedData( diff --git a/Mohem/src/app/eit/add-eit/add-eit.component.ts b/Mohem/src/app/eit/add-eit/add-eit.component.ts index 81cc100e..409d2ef9 100644 --- a/Mohem/src/app/eit/add-eit/add-eit.component.ts +++ b/Mohem/src/app/eit/add-eit/add-eit.component.ts @@ -21,6 +21,8 @@ import { DatePicker } from "@ionic-native/date-picker/ngx"; import { EIT_ACTION } from "../models/submit.eit.action"; import { AddEitResponse } from "../models/add.eit.response"; import { element } from '@angular/core/src/render3'; +// import { EITNotificatonBodyResponse } from 'src/app/notification/models/EITNotificationBodyRes'; +import { EITNotificatonBodyResponse } from "../models/EITNotificationBodyRes"; @Component({ selector: "app-add-eit", @@ -87,6 +89,8 @@ export class AddEitComponent implements OnInit { false ); this.addEITData = this.cs.sharedService.getSharedData("AddEITData", false); + console.log("addEITData: " + this.addEITData); + console.log("dirfromNotificationPage: " + this.addEITData.dirfromNotificationPage); this.eitRequest = new EitRequest(); @@ -94,7 +98,7 @@ export class AddEitComponent implements OnInit { ////*new add*///// /**********resubmit************ */ - // this.getPassNotificationDetails = this.cs.sharedService.getSharedData(EITNotificatonBodyResponse.NOT_WORKLIST, true); + this.getPassNotificationDetails = this.cs.sharedService.getSharedData(EITNotificatonBodyResponse.NOT_WORKLIST, false);//WARINING this.getPassdirfromNotifiPage = this.addEITData.dirfromNotificationPage; if (this.getPassdirfromNotifiPage) { this.functionName = this.getPassNotificationDetails.FUNCTION_NAME; //;this.getPassNotificationDetails.NOTIFICATION_NAME; @@ -1551,6 +1555,7 @@ export class AddEitComponent implements OnInit { validateEITTransaction() { // let EITTransactionValues:any= []; + this.arrValues = this.getElementsValues(); if (this.arrValues) { this.eitRequest = { @@ -1582,7 +1587,8 @@ export class AddEitComponent implements OnInit { data.eitRequest = this.eitRequest; data.updated = this.updatedValues; // this.viewCtrl.dismiss(data); - this.closemodal(); + this.modalController.dismiss(data); + // this.closemodal(); } else { this.submitEit(); // this.navCtrl.push("ConfirmAddEitPage"); 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 608e2308..ea71f13d 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 @@ -76,11 +76,12 @@ export class ConfirmAddEitComponent implements OnInit { this.eitRequest = this.cs.sharedService.getSharedData(EitRequest.SHARED_DATA, false); this.isResubmitEIT = this.cs.sharedService.getSharedData('confirmAddEITData', false).isResubmit; if (this.isResubmitEIT) { - this.getPassNotificationDetails = this.cs.sharedService.getSharedData(EITNotificatonBodyResponse.NOT_WORKLIST, true); + this.getPassNotificationDetails = this.cs.sharedService.getSharedData(EITNotificatonBodyResponse.NOT_WORKLIST, false); //WARINING ** // console.log("this.getPassNotificationDetails: " + this.getPassNotificationDetails); this.P_TransactionID = this.cs.sharedService.getSharedData("TransactionIDResubmit", true); - let notification = this.cs.sharedService.getSharedData(EITNotificatonBodyResponse.NOT_WORKLIST, true); - this.itemKey = notification.ITEM_KEY; + // let notification = this.cs.sharedService.getSharedData(EITNotificatonBodyResponse.NOT_WORKLIST, true); + + this.itemKey = this.getPassNotificationDetails.ITEM_KEY; this.pActionMode = "RESUBMIT"; this.menuType = "E"; this.respID = -999; diff --git a/Mohem/src/app/eit/eit-list/eit-list.component.html b/Mohem/src/app/eit/eit-list/eit-list.component.html index 36b2b14c..84a09573 100644 --- a/Mohem/src/app/eit/eit-list/eit-list.component.html +++ b/Mohem/src/app/eit/eit-list/eit-list.component.html @@ -121,7 +121,7 @@ --> @@ -201,7 +201,7 @@ --> - +
diff --git a/Mohem/src/app/eit/eit-update-list/eit-update-list.component.html b/Mohem/src/app/eit/eit-update-list/eit-update-list.component.html index 5c562226..5ea12523 100644 --- a/Mohem/src/app/eit/eit-update-list/eit-update-list.component.html +++ b/Mohem/src/app/eit/eit-update-list/eit-update-list.component.html @@ -1,5 +1,5 @@ - + {{'eit, update-title' | translate}} @@ -11,34 +11,51 @@ -
{{'workListMain, notfDetails' | translate}}
+
{{'worklistMain, notfDetails' | translate}}
- +
+ + + -
+ +
- - - - + + +
+ +
+
+ +
+ + + + + + +
- + {{ 'general, next' | translate }}
\ No newline at end of file diff --git a/Mohem/src/app/eit/eit-update-list/eit-update-list.component.scss b/Mohem/src/app/eit/eit-update-list/eit-update-list.component.scss index e69de29b..8b091c54 100644 --- a/Mohem/src/app/eit/eit-update-list/eit-update-list.component.scss +++ b/Mohem/src/app/eit/eit-update-list/eit-update-list.component.scss @@ -0,0 +1,17 @@ +.addEitOkButton{ + white-space: normal !important; + text-transform: capitalize !important; + min-height: 45px !important; + min-width: 5px !important; + margin: 8px !important; + background-color: #22c6b3; + width: 80% !important; + color: white!important; + border-radius: 16px !important; + } + + .editIconDiv{ + right: 10px; + position: absolute; + top: 10px; + } \ No newline at end of file diff --git a/Mohem/src/app/eit/eit-update-list/eit-update-list.component.ts b/Mohem/src/app/eit/eit-update-list/eit-update-list.component.ts index 7218ba91..6a8681bf 100644 --- a/Mohem/src/app/eit/eit-update-list/eit-update-list.component.ts +++ b/Mohem/src/app/eit/eit-update-list/eit-update-list.component.ts @@ -25,8 +25,8 @@ export class EitUpdateListComponent implements OnInit { private descFlex: string; constructor(public cs: CommonService, public eitService: EitService, public modalController: ModalController) { - this.notificationBodyRes = this.cs.sharedService.getSharedData(EITNotificatonBodyResponse.SHARED_DATA, true); - let notification = this.cs.sharedService.getSharedData(EITNotificatonBodyResponse.NOT_WORKLIST, true); + this.notificationBodyRes = this.cs.sharedService.getSharedData(EITNotificatonBodyResponse.SHARED_DATA, false); + let notification = this.cs.sharedService.getSharedData(EITNotificatonBodyResponse.NOT_WORKLIST, false); this.itemKey = notification.ITEM_KEY; this.notificationId = notification.NOTIFICATION_ID; this.functionName = notification.FUNCTION_NAME; @@ -35,7 +35,7 @@ export class EitUpdateListComponent implements OnInit { this.fillEitTransactionTable(); } - ngOnInit() { } + ngOnInit() { console.log("ngOnInit");} async updateEitNot(index) { let item = this.notificationBodyRes[index].Collection_Notification; @@ -46,10 +46,15 @@ export class EitUpdateListComponent implements OnInit { modal.onDidDismiss() .then((data: any) => { + console.log("data" + data); + console.log("data" + data.data.updated); + console.log("data" + data.data.eitRequest.EITTransactionTBL); + + if (data) { - this.updatedData = this.updatedData ? this.updatedData.concat(data.updated) : data.updated; - this.notificationBodyRes[index].Collection_Notification = data.updated; - this.updateTransactionList(data.eitRequest.EITTransactionTBL); + this.updatedData = this.updatedData ? this.updatedData.concat(data.data.updated) : data.data.updated; + this.notificationBodyRes[index].Collection_Notification = data.data.updated; + this.updateTransactionList(data.data.eitRequest.EITTransactionTBL); } }); diff --git a/Mohem/src/app/hmg-common/services/common/common.service.ts b/Mohem/src/app/hmg-common/services/common/common.service.ts index 08163c91..5516192d 100644 --- a/Mohem/src/app/hmg-common/services/common/common.service.ts +++ b/Mohem/src/app/hmg-common/services/common/common.service.ts @@ -1212,7 +1212,9 @@ public getMonthNameAr(value: number): string { this.nav.navigateForward(["/profile/performanceevaluation"]); } - + public eitUpdate() { + this.nav.navigateForward(["/eit/eit-update-list"]); + } public navigatePage(path) { this.nav.navigateForward([path]); } diff --git a/Mohem/src/app/notification/worklist-main-mr/worklist-main-mr.component.ts b/Mohem/src/app/notification/worklist-main-mr/worklist-main-mr.component.ts index f6a26e04..53e565e9 100644 --- a/Mohem/src/app/notification/worklist-main-mr/worklist-main-mr.component.ts +++ b/Mohem/src/app/notification/worklist-main-mr/worklist-main-mr.component.ts @@ -99,6 +99,7 @@ export class WorklistMainMRComponent implements OnInit { approveDis: boolean = false; rejectDis: boolean = false; requestDis: boolean = false; + moreDisabled: boolean = true; @@ -264,15 +265,22 @@ export class WorklistMainMRComponent implements OnInit { this.common.sharedService.setSharedData(this.notificationButtonRes, "passActionMore"); console.log("test" + this.notificationButtonRes.length); for (let i = 0; i < this.notificationButtonRes.length; i++) { - if (this.notificationButtonRes[i].BUTTON_ACTION == "APPROVE") { + if (this.notificationButtonRes[i].BUTTON_ACTION == "APPROVED" ) { this.approveDis = true; } else - if (this.notificationButtonRes[i].BUTTON_ACTION == "REJECT") { + if (this.notificationButtonRes[i].BUTTON_ACTION == "REJECTED" ) { this.rejectDis = true; } else if (this.notificationButtonRes[i].BUTTON_ACTION == "REQUEST_INFO") { this.requestDis = true; } // if result == null + else if( + this.notificationButtonRes[i].BUTTON_ACTION != "APPROVED" && this.notificationButtonRes[i].BUTTON_ACTION != "REJECTED" && this.notificationButtonRes[i].BUTTON_ACTION != "REQUEST_INFO") + { + this.moreDisabled = false; + + } + } // valid it } // if result == null @@ -356,8 +364,8 @@ export class WorklistMainMRComponent implements OnInit { this.P_RESPOND_ATTRIBUTES_TBL.push(obj); } if ( - ButtonAction == "APPROVE" || - ButtonAction == "REJECT" || + ButtonAction == "APPROVED" || + ButtonAction == "REJECTED" || ButtonAction == "DEL" || ButtonAction == "CLOSE" ) { @@ -373,10 +381,10 @@ export class WorklistMainMRComponent implements OnInit { ); ///////////////////////////////////////////// - if (ButtonAction == "APPROVE") { + if (ButtonAction == "APPROVED") { this.confirmMsg = this.ts.trPK('worklistMain', 'approveMsg') } - else if (ButtonAction == "REJECT") { + else if (ButtonAction == "REJECTED") { this.confirmMsg = this.ts.trPK('worklistMain', 'rejectMsg') } diff --git a/Mohem/src/app/notification/worklist-main-po/worklist-main-po.component.html b/Mohem/src/app/notification/worklist-main-po/worklist-main-po.component.html index 09677388..9aaf82aa 100644 --- a/Mohem/src/app/notification/worklist-main-po/worklist-main-po.component.html +++ b/Mohem/src/app/notification/worklist-main-po/worklist-main-po.component.html @@ -796,7 +796,7 @@ Skip - + More diff --git a/Mohem/src/app/notification/worklist-main-po/worklist-main-po.component.ts b/Mohem/src/app/notification/worklist-main-po/worklist-main-po.component.ts index 17440190..9495adab 100644 --- a/Mohem/src/app/notification/worklist-main-po/worklist-main-po.component.ts +++ b/Mohem/src/app/notification/worklist-main-po/worklist-main-po.component.ts @@ -115,6 +115,7 @@ export class WorklistMainPoComponent implements OnInit { approveDis: boolean = false; rejectDis: boolean = false; requestDis: boolean = false; + moreDisabled: boolean = true; constructor( @@ -305,6 +306,13 @@ export class WorklistMainPoComponent implements OnInit { if (this.notificationButtonRes[i].BUTTON_ACTION == "REQUEST_INFO") { this.requestDis = true; } // if result == null + else if ( + this.notificationButtonRes[i].BUTTON_ACTION != "APPROVE" && this.notificationButtonRes[i].BUTTON_ACTION != "REJECT" && this.notificationButtonRes[i].BUTTON_ACTION != "REQUEST_INFO") + { + this.moreDisabled = false; + + } + } // valid it } // valid it diff --git a/Mohem/src/app/notification/worklist-main-pr/worklist-main-pr.component.html b/Mohem/src/app/notification/worklist-main-pr/worklist-main-pr.component.html index bcec9dc7..ad5f9853 100644 --- a/Mohem/src/app/notification/worklist-main-pr/worklist-main-pr.component.html +++ b/Mohem/src/app/notification/worklist-main-pr/worklist-main-pr.component.html @@ -508,7 +508,7 @@ Skip - + More diff --git a/Mohem/src/app/notification/worklist-main-pr/worklist-main-pr.component.ts b/Mohem/src/app/notification/worklist-main-pr/worklist-main-pr.component.ts index acc3c674..665be0cd 100644 --- a/Mohem/src/app/notification/worklist-main-pr/worklist-main-pr.component.ts +++ b/Mohem/src/app/notification/worklist-main-pr/worklist-main-pr.component.ts @@ -100,6 +100,7 @@ export class WorklistMainPRComponent implements OnInit { approveDis: boolean; rejectDis: boolean; requestDis: boolean; + moreDisabled: boolean = true; constructor( @@ -307,6 +308,12 @@ export class WorklistMainPRComponent implements OnInit { if (this.notificationButtonRes[i].BUTTON_ACTION == "REQUEST_INFO") { this.requestDis = true; } // if result == null + else if ( + this.notificationButtonRes[i].BUTTON_ACTION != "APPROVE" && this.notificationButtonRes[i].BUTTON_ACTION != "REJECT" && this.notificationButtonRes[i].BUTTON_ACTION != "REQUEST_INFO") + { + this.moreDisabled = false; + + } } // valid it } } // valid it diff --git a/Mohem/src/app/notification/worklist-main/worklist-main.component.html b/Mohem/src/app/notification/worklist-main/worklist-main.component.html index 61c26a72..d5c3dbae 100644 --- a/Mohem/src/app/notification/worklist-main/worklist-main.component.html +++ b/Mohem/src/app/notification/worklist-main/worklist-main.component.html @@ -68,7 +68,7 @@
Employee will also on leave
- + diff --git a/Mohem/src/app/notification/worklist-main/worklist-main.component.scss b/Mohem/src/app/notification/worklist-main/worklist-main.component.scss index 7fe45a26..6ee10295 100644 --- a/Mohem/src/app/notification/worklist-main/worklist-main.component.scss +++ b/Mohem/src/app/notification/worklist-main/worklist-main.component.scss @@ -185,6 +185,7 @@ --background: transparent; margin-left: -15px; margin-right: 6px; + margin-bottom:8px; } .status{ text-align: center; diff --git a/Mohem/src/app/notification/worklist-main/worklist-main.component.ts b/Mohem/src/app/notification/worklist-main/worklist-main.component.ts index f739d41c..0c839614 100644 --- a/Mohem/src/app/notification/worklist-main/worklist-main.component.ts +++ b/Mohem/src/app/notification/worklist-main/worklist-main.component.ts @@ -94,6 +94,7 @@ export class WorklistMainComponent implements OnInit { rejectDis: boolean = false; requestDis: boolean = false; moreDisabled: boolean = true; + dirfromNotificationPage: boolean = false; constructor( public worklistService: WorklistService, @@ -310,7 +311,7 @@ export class WorklistMainComponent implements OnInit { if (this.notificationButtonRes[i].BUTTON_ACTION == "REQUEST_INFO") { this.requestDis = true; } // if result == null - else ( + else if( this.notificationButtonRes[i].BUTTON_ACTION != "APPROVED" && this.notificationButtonRes[i].BUTTON_ACTION != "REJECTED" && this.notificationButtonRes[i].BUTTON_ACTION != "REQUEST_INFO") { this.moreDisabled = false; @@ -543,6 +544,8 @@ export class WorklistMainComponent implements OnInit { EITNotificatonBodyResponse.NOT_WORKLIST ); // this.navCtrl.push("EitUpdateListPage"); + this.common.eitUpdate();// must be test + } else if (this.getPassNotificationDetails.REQUEST_TYPE == "ABSENCE") { this.common.sharedService.setSharedData( this.notificationBodyRes, @@ -556,7 +559,18 @@ export class WorklistMainComponent implements OnInit { // dirfromNotificationPage: true, // submitAbsObjList: this.notificationBodyRes[0].Collection_Notification // }); - this.common.openConfirmAbsece(); + //this.common.openConfirmAbsece(); + this.dirfromNotificationPage=true, + this.common.sharedService.setSharedData( + this.dirfromNotificationPage, + "dirfromNotificationPage" + ); + this.common.sharedService.setSharedData( + this.notificationBodyRes[0].Collection_Notification, + "submitAbsObjList" + ); + + this.common.openSubmitAbsencePage(); } } else if (this.notificationButtonRes.length > 0 && !ButtonAction) { From 043b57383b93c00f07344fe59d46a3fbff8901e5 Mon Sep 17 00:00:00 2001 From: "Fatimah.Alshammari" Date: Sun, 15 Mar 2020 15:37:40 +0300 Subject: [PATCH 09/17] edit issues --- .../src/app/absence/home/home.component.html | 38 +++++----------- .../src/app/absence/home/home.component.scss | 43 +++++++++++++++++-- Mohem/src/app/absence/home/home.component.ts | 14 +++--- .../edit-profile/edit-profile.component.ts | 2 +- .../src/app/profile/home/home.component.html | 12 +++++- .../performance-evaluation.component.html | 23 ++++++++-- .../performance-evaluation.component.scss | 6 ++- .../performance-evaluation.component.ts | 4 +- .../profile-image.component.html | 11 +++-- .../profile-image.component.scss | 6 ++- .../vacation-type.component.html | 8 ++-- Mohem/src/assets/localization/i18n.json | 16 +++++++ 12 files changed, 126 insertions(+), 57 deletions(-) diff --git a/Mohem/src/app/absence/home/home.component.html b/Mohem/src/app/absence/home/home.component.html index 86fd1dcc..1c00a688 100644 --- a/Mohem/src/app/absence/home/home.component.html +++ b/Mohem/src/app/absence/home/home.component.html @@ -55,12 +55,12 @@
-

{{totalnumber}}

+ - - {{ts.trPK('absenceList','totalNumber')}} +
@@ -68,13 +68,7 @@
-
+
@@ -84,37 +78,25 @@
-
+
- + - +
-
+
- + - +
diff --git a/Mohem/src/app/absence/home/home.component.scss b/Mohem/src/app/absence/home/home.component.scss index 670bd6c2..ecc1c20a 100644 --- a/Mohem/src/app/absence/home/home.component.scss +++ b/Mohem/src/app/absence/home/home.component.scss @@ -195,17 +195,27 @@ margin-top: -13px; margin-top: -3px; } -.blue-label{ +.red-label{ font-size: 12px; margin-top: -13px; } - .blue-amount{ + .red-amount{ font-size: 17px; font-family: WorkSans-Bold; - margin-top: -4px; + margin-top: -3px; } + .orng-label{ + font-size: 12px; + margin-top: -13px; + } + + .orng-amount{ + font-size: 17px; + font-family: WorkSans-Bold; + margin-top: -3px; + } .contentEit:before { position: absolute; content: ""; @@ -215,4 +225,31 @@ margin-top: -13px; left: 0; top: 0px; z-index: 1; + } + .green{ + position: relative; + left: 82%; + bottom: 128px; + color: black; + background-color: #1FA269; + width: 13%; + height: 6px; + } + .red{ + position: relative; + left: 59%; + bottom: 131px; + color: black; + background-color: #CB3232; + width: 13%; + height: 6px; + } + .orng{ + position: relative; + left: 82%; + bottom: 80px; + color: black; + background-color: #DDB017; + width: 13%; + height: 6px; } \ No newline at end of file diff --git a/Mohem/src/app/absence/home/home.component.ts b/Mohem/src/app/absence/home/home.component.ts index 05b25d8b..4340f0c9 100644 --- a/Mohem/src/app/absence/home/home.component.ts +++ b/Mohem/src/app/absence/home/home.component.ts @@ -107,10 +107,10 @@ export class HomeComponent implements OnInit { this.data = { // labels: ['earingTotal', 'deductionTotal'], datasets: [ - { data: [this.accrualNet,this.accrualUsed,this.accrualYearly], + { data: [this.accrualNet,this.accrualYearly,this.accrualUsed], backgroundColor: [ - '#DDB017', - '#094875', + '#1FA269', + '#DDB017', '#CB3232',], borderWidth: 2 } @@ -262,11 +262,11 @@ createAbsence() { this.data = { // labels: ['earingTotal', 'deductionTotal'], datasets: [ - { data: [this.accrualNet,this.accrualUsed,this.accrualYearly], + { data: [this.accrualNet,this.accrualYearly,this.accrualUsed], backgroundColor: [ - '#DDB017', - '#094875', - '#CB3232',], + '#1FA269', + '#DDB017', + '#CB3232',], borderWidth: 2 } ] diff --git a/Mohem/src/app/profile/edit-profile/edit-profile.component.ts b/Mohem/src/app/profile/edit-profile/edit-profile.component.ts index db8b9fa7..e13b05eb 100644 --- a/Mohem/src/app/profile/edit-profile/edit-profile.component.ts +++ b/Mohem/src/app/profile/edit-profile/edit-profile.component.ts @@ -107,7 +107,7 @@ private handlePerformanceAppraisalResult(result){ this.performanceData=[]; for(let i=0;i --> + + + {{ts.trPK('userProfile','title')}} + + + + +
- +
diff --git a/Mohem/src/app/profile/performance-evaluation/performance-evaluation.component.html b/Mohem/src/app/profile/performance-evaluation/performance-evaluation.component.html index 3d11570b..4215ff2a 100644 --- a/Mohem/src/app/profile/performance-evaluation/performance-evaluation.component.html +++ b/Mohem/src/app/profile/performance-evaluation/performance-evaluation.component.html @@ -1,12 +1,27 @@ + + + {{ts.trPK('userProfile','performance')}} + + + + + + + +
- +
- +
@@ -15,7 +30,7 @@
-

Performance Evaluation

+

{{ts.trPK('userProfile','performance-evaluation')}}

diff --git a/Mohem/src/app/profile/performance-evaluation/performance-evaluation.component.scss b/Mohem/src/app/profile/performance-evaluation/performance-evaluation.component.scss index aee2712f..2e9a2658 100644 --- a/Mohem/src/app/profile/performance-evaluation/performance-evaluation.component.scss +++ b/Mohem/src/app/profile/performance-evaluation/performance-evaluation.component.scss @@ -125,12 +125,14 @@ font-size: 28px !important; font-weight: bold !important; margin-top: 7px !important; - margin-left: 72px !important; + margin-left: 90px !important; + } .percentage{ - font-size: 15px !important; + font-size: 20px !important; margin-top: 15px !important; + margin-left: -7px; } diff --git a/Mohem/src/app/profile/performance-evaluation/performance-evaluation.component.ts b/Mohem/src/app/profile/performance-evaluation/performance-evaluation.component.ts index efc55d7b..6a462682 100644 --- a/Mohem/src/app/profile/performance-evaluation/performance-evaluation.component.ts +++ b/Mohem/src/app/profile/performance-evaluation/performance-evaluation.component.ts @@ -68,7 +68,9 @@ export class PerformanceEvaluationComponent implements OnInit { console.log( this.performanceData[0].color) } - +ngAfterViewInit(){ + document.querySelector(".gauge >text").remove(); +} getProfile() { console.log("getProfile"); diff --git a/Mohem/src/app/profile/profile-image/profile-image.component.html b/Mohem/src/app/profile/profile-image/profile-image.component.html index 04bfb165..59845218 100644 --- a/Mohem/src/app/profile/profile-image/profile-image.component.html +++ b/Mohem/src/app/profile/profile-image/profile-image.component.html @@ -1,18 +1,21 @@ - - + + {{ts.trPK('userProfile','changepicture')}} + + + - +
diff --git a/Mohem/src/app/profile/profile-image/profile-image.component.scss b/Mohem/src/app/profile/profile-image/profile-image.component.scss index c4bcb781..6bfd9ea8 100644 --- a/Mohem/src/app/profile/profile-image/profile-image.component.scss +++ b/Mohem/src/app/profile/profile-image/profile-image.component.scss @@ -45,4 +45,8 @@ width: 234px; //box-shadow: 0px 0px 0px 10px #8c8c8c; -} \ No newline at end of file +} + +.header-toolbar-new{ + --background: #22c6b3; + } \ No newline at end of file diff --git a/Mohem/src/app/vacation-rule/vacation-type/vacation-type.component.html b/Mohem/src/app/vacation-rule/vacation-type/vacation-type.component.html index b526fb7f..b30a2627 100644 --- a/Mohem/src/app/vacation-rule/vacation-type/vacation-type.component.html +++ b/Mohem/src/app/vacation-rule/vacation-type/vacation-type.component.html @@ -31,8 +31,8 @@
-
- +
+
@@ -57,7 +57,7 @@
- +
@@ -91,7 +91,7 @@
- +
diff --git a/Mohem/src/assets/localization/i18n.json b/Mohem/src/assets/localization/i18n.json index dae52095..a50b4002 100644 --- a/Mohem/src/assets/localization/i18n.json +++ b/Mohem/src/assets/localization/i18n.json @@ -1068,6 +1068,22 @@ "en": "Vacation Rule", "ar": "قواعد الإجازات" }, + "apply-for-vacation-rule": { + "en": "Apply for vacation Rule", + "ar": "التقدم بطلب اجازه" + }, + "step-1": { + "en": "Step 1", + "ar": "الخطوه الاولى" + }, + "step-2": { + "en": "Step 2", + "ar": "الخطوه الثانيه" + }, + "step-3": { + "en": "Step 3", + "ar": "الخطوه الثالثه" + }, "ruleName": { "en": "Rule Name", "ar": "اسم القاعدة" From 7c4d3327d61aaa8a352570e15d82b144a1f50a2a Mon Sep 17 00:00:00 2001 From: enadhilal Date: Mon, 16 Mar 2020 11:29:51 +0300 Subject: [PATCH 10/17] fixing menu and scrolling in EIT --- Mohem/src/app/app.component.html | 159 +++++++++++++++++- .../authentication/login/login.component.html | 4 +- .../authentication/login/login.component.ts | 29 +++- .../src/app/eit/add-eit/add-eit.component.ts | 8 +- .../app/eit/eit-list/eit-list.component.ts | 13 +- Mohem/src/app/eit/home/home.component.html | 3 +- Mohem/src/assets/localization/i18n.json | 6 +- 7 files changed, 200 insertions(+), 22 deletions(-) diff --git a/Mohem/src/app/app.component.html b/Mohem/src/app/app.component.html index a8762509..36557be0 100644 --- a/Mohem/src/app/app.component.html +++ b/Mohem/src/app/app.component.html @@ -3,7 +3,163 @@ - + + + +
+
+ + + + +
+
+
+ +
+
+
+ +
+
+ + +
+
+ + +

{{User_name_Emp}}

+ + +

{{User_Job_name}}

+ +
+ + +
+ + + + + + + + + + + + + + + +
+ + + +
+ + + + +
+ + + + + + + + + {{ts.trPK('userProfile','title')}} + + + + + + + + + + {{ts.trPK('login','changepassword')}} + + {{notBadge}} + + + + + + + + + + {{ts.trPK('myTeam','myTeam-header')}} + + + + + + +
+ +

{{CompanyImageDescription}}

+
+ +
+
+
@@ -157,7 +313,6 @@

{{companyDesc}}

- diff --git a/Mohem/src/app/authentication/login/login.component.html b/Mohem/src/app/authentication/login/login.component.html index 2dd41792..159c97af 100644 --- a/Mohem/src/app/authentication/login/login.component.html +++ b/Mohem/src/app/authentication/login/login.component.html @@ -62,8 +62,8 @@ {{ts.trPK('login','signup')}}
- - + +
diff --git a/Mohem/src/app/authentication/login/login.component.ts b/Mohem/src/app/authentication/login/login.component.ts index aa8ad0a2..c1dd4c25 100644 --- a/Mohem/src/app/authentication/login/login.component.ts +++ b/Mohem/src/app/authentication/login/login.component.ts @@ -93,6 +93,14 @@ export class LoginComponent implements OnInit, OnDestroy { } ngOnInit() { + console.log("ENAD TEST!!!") + if (TranslatorService.CURRENT_LANGUAGE == TranslatorService.EN) { + this.language = "US"; + } else { + this.language = "AR"; + } + this.ts.switchLanguage(); + this.currentLang = TranslatorService.getCurrentLanguageCode(); // this.deviceToken= this.cs.sharedService.getSharedData(AuthenticationService.DEVICE_TOKEN, false); // console.log("get deviceToken login"+ this.deviceToken) @@ -178,18 +186,25 @@ export class LoginComponent implements OnInit, OnDestroy { ngOnDestroy(): void { this.backClicked(); } - public changeLanguage() { - this.ts.switchLanguage(); - if (TranslatorService.CURRENT_LANGUAGE == TranslatorService.EN) { - this.language = "US"; - } else { - this.language = "AR"; + + public changeLanguage(langNumber) { + if(this.currentLang == langNumber){ + return; + }else{ + this.ts.switchLanguage(); + if (TranslatorService.CURRENT_LANGUAGE == TranslatorService.EN) { + this.language = "US"; + } else { + this.language = "AR"; + } + this.currentLang = TranslatorService.getCurrentLanguageCode(); } - this.currentLang = TranslatorService.getCurrentLanguageCode(); } + private forgetPasswordPage() { this.cs.openUserForgot(); } + private hideSplashScreen(stopLoading = false) { // this.splash.hide(); if (stopLoading) { diff --git a/Mohem/src/app/eit/add-eit/add-eit.component.ts b/Mohem/src/app/eit/add-eit/add-eit.component.ts index 81cc100e..f9101271 100644 --- a/Mohem/src/app/eit/add-eit/add-eit.component.ts +++ b/Mohem/src/app/eit/add-eit/add-eit.component.ts @@ -1176,7 +1176,7 @@ export class AddEitComponent implements OnInit { let numbervalue: any = 0; let dateValue: any = null; let transNo: number = this.comtransNo; - let textValue = ""; + let textValue : any; // if(this.ExtraObj.transactionNo) // transNo=this.ExtraObj.transactionNo; for (let i = 0; i < this.eitResponse.length; i++) { @@ -1230,7 +1230,11 @@ export class AddEitComponent implements OnInit { } else { elem.classList.remove("requiredClassElm"); } - if (elemVal) varcharValue = elemVal; + if (elemVal != 'null'){ + varcharValue = elemVal; + } else{ + elemVal = null; + } valuseArr.push({ TRANSACTION_NUMBER: transNo, NAME: this.eitResponse[i].APPLICATION_COLUMN_NAME, diff --git a/Mohem/src/app/eit/eit-list/eit-list.component.ts b/Mohem/src/app/eit/eit-list/eit-list.component.ts index 92e41259..2576093b 100644 --- a/Mohem/src/app/eit/eit-list/eit-list.component.ts +++ b/Mohem/src/app/eit/eit-list/eit-list.component.ts @@ -141,12 +141,15 @@ export class EitListComponent implements OnInit { this.P_PAGE_NUM++; this.EITTransactionsListObj.P_PAGE_NUM = this.P_PAGE_NUM; result.GetEITTransactionList.forEach(vr => { - if (vr.Collection_Transaction[0].ROW_NUM == vr.Collection_Transaction[0].NO_OF_ROWS) { - this.IsReachEnd = true; - } else { - this.IsReachEnd = false; + console.log(vr.length); + if(vr.length && vr.length != 0){ + if (vr.Collection_Transaction[0].ROW_NUM == vr.Collection_Transaction[0].NO_OF_ROWS) { + this.IsReachEnd = true; + } else { + this.IsReachEnd = false; + } + this.getResEITTransactionList.push(vr); } - this.getResEITTransactionList.push(vr); }); } else { this.IsReachEnd = true; diff --git a/Mohem/src/app/eit/home/home.component.html b/Mohem/src/app/eit/home/home.component.html index 7591dd7e..5008b103 100644 --- a/Mohem/src/app/eit/home/home.component.html +++ b/Mohem/src/app/eit/home/home.component.html @@ -64,7 +64,8 @@ {{menuItem.PROMPT}} - + + diff --git a/Mohem/src/assets/localization/i18n.json b/Mohem/src/assets/localization/i18n.json index fc8c4bf8..abca23ca 100644 --- a/Mohem/src/assets/localization/i18n.json +++ b/Mohem/src/assets/localization/i18n.json @@ -160,15 +160,15 @@ }, "check-user-text1":{ "en":"Please Enter your Employee ID, A ", - "ar":"" + "ar":"يرجى ادخال رقم الموظف " }, "check-user-text2":{ "en":"login Code ", - "ar":"" + "ar":"رمز تسجيل الدخول" }, "check-user-text3":{ "en":"will be sent to your mobile number", - "ar":"" + "ar":"سيتم ارساله الى رقم هاتفك" } }, "verificationcode": { From d4ef8bf7ec7d99a15ed5f664c66fc0fe242b01dd Mon Sep 17 00:00:00 2001 From: ashwaq Date: Mon, 16 Mar 2020 14:24:24 +0300 Subject: [PATCH 11/17] fix po attachment + Mo Action --- .../absence-confirm.component.scss | 6 +++--- .../submit-absence/submit-absence.component.ts | 10 +++++++++- .../services/connector/connector.service.ts | 2 +- .../worklist-main-mr.component.html | 9 ++++----- .../worklist-main-mr.component.ts | 18 +++++++++--------- .../worklist-main/worklist-main.component.ts | 4 ---- Mohem/src/theme/worklist.scss | 8 ++++---- 7 files changed, 30 insertions(+), 27 deletions(-) diff --git a/Mohem/src/app/absence/absence-confirm/absence-confirm.component.scss b/Mohem/src/app/absence/absence-confirm/absence-confirm.component.scss index 96965e58..fb652af8 100644 --- a/Mohem/src/app/absence/absence-confirm/absence-confirm.component.scss +++ b/Mohem/src/app/absence/absence-confirm/absence-confirm.component.scss @@ -186,7 +186,7 @@ ion-card-content.confirm-details{ .timeline .timeline-item { - width: 40px; + // width: 40px; } @@ -199,8 +199,8 @@ ion-card-content.confirm-details{ .empImge{ border-radius: 50%; - width:100%; - height: 100%; + width:60px; + height: 60px; border: #dedede solid 1px; } diff --git a/Mohem/src/app/absence/submit-absence/submit-absence.component.ts b/Mohem/src/app/absence/submit-absence/submit-absence.component.ts index ffe60b9f..9513fa16 100644 --- a/Mohem/src/app/absence/submit-absence/submit-absence.component.ts +++ b/Mohem/src/app/absence/submit-absence/submit-absence.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit, ElementRef } from "@angular/core"; +import { Component, OnInit, ElementRef, ChangeDetectorRef } from "@angular/core"; import { CommonService } from "src/app/hmg-common/services/common/common.service"; import { TranslatorService } from "src/app/hmg-common/services/translator/translator.service"; import { MenuService } from "src/app/hmg-common/services/menu/menuservice.service"; @@ -85,6 +85,7 @@ export class SubmitAbsenceComponent implements OnInit { public datePicker: DatePicker, public ts: TranslatorService, private elementRef: ElementRef, + private changeDetectorRef: ChangeDetectorRef ) { ////*new add*///// @@ -101,6 +102,7 @@ export class SubmitAbsenceComponent implements OnInit { this.selEmp = this.getPassNotificationDetails.SELECTED_EMPLOYEE_NUMBER; this.respID = -999; this.submitAbsObjList = this.common.sharedService.getSharedData('submitAbsObjList'); + console.log() } else { this.action = "CREATE"; this.selEmp = this.common.sharedService.getSharedData( @@ -172,6 +174,7 @@ export class SubmitAbsenceComponent implements OnInit { } } calcDay() { + console.log("calcDay" ); let msg: string = ""; if ( this.startDate == undefined || @@ -263,10 +266,13 @@ export class SubmitAbsenceComponent implements OnInit { } public onTypeAbsenceChange() { + console.log("this.absenceType: "+ this.absenceType); if (this.absenceType) { let obj: any = this.absenceTypeList.find( s => s.ABSENCE_ATTENDANCE_TYPE_ID == this.absenceType ); + console.log("obj : "+ obj); + if (obj) this.absenceTypeName = obj.DESC_FLEX_CONTEXT_CODE; else this.absenceTypeName = null; this.getAbsenceDffStructure(); @@ -1141,6 +1147,8 @@ export class SubmitAbsenceComponent implements OnInit { this.action = this.submitAbsObjList[i].ACTION; if (this.submitAbsObjList[i].SEGMENT_NAME == "ABSENCE_TYPE") { this.absenceType = val; + this.changeDetectorRef.detectChanges(); + } if (this.submitAbsObjList[i].SEGMENT_NAME == "DESC_FLEX_CONTEXT_CODE") { this.absenceTypeName = val; 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 1335e79d..a494567f 100644 --- a/Mohem/src/app/hmg-common/services/connector/connector.service.ts +++ b/Mohem/src/app/hmg-common/services/connector/connector.service.ts @@ -21,7 +21,7 @@ export class ConnectorService { headers: new HttpHeaders({ 'Content-Type': 'application/json' }) }; public static retryTimes = 0; - public static timeOut = 30 * 1000; + public static timeOut = 120 * 1000; // public static host = 'http://10.50.100.113:6060/'; // development service public static host = 'https://uat.hmgwebservices.com/'; diff --git a/Mohem/src/app/notification/worklist-main-mr/worklist-main-mr.component.html b/Mohem/src/app/notification/worklist-main-mr/worklist-main-mr.component.html index 266ae61b..73eb40a0 100644 --- a/Mohem/src/app/notification/worklist-main-mr/worklist-main-mr.component.html +++ b/Mohem/src/app/notification/worklist-main-mr/worklist-main-mr.component.html @@ -8,7 +8,7 @@ - +
{{getPassNotificationDetails.SUBJECT}}
@@ -659,13 +659,12 @@ - + Approve - + Reject @@ -679,7 +678,7 @@ Skip - + More diff --git a/Mohem/src/app/notification/worklist-main-mr/worklist-main-mr.component.ts b/Mohem/src/app/notification/worklist-main-mr/worklist-main-mr.component.ts index 101757c6..dcc0410d 100644 --- a/Mohem/src/app/notification/worklist-main-mr/worklist-main-mr.component.ts +++ b/Mohem/src/app/notification/worklist-main-mr/worklist-main-mr.component.ts @@ -400,15 +400,15 @@ export class WorklistMainMRComponent implements OnInit { this.confirmMsg = this.ts.trPK('worklistMain', 'closeMsg') } - this.openApplyModal(this.WorkListActionObj); - - // this.common.confirmAlertDialogAction( - // () => { - // this.applyAction(this.WorkListActionObj); - // }, this.ts.trPK('general', 'ok'), - // () => { }, this.ts.trPK('general', 'cancel'), - // this.ts.trPK('vacation-rule', 'confirmation'), - // this.confirmMsg); + // this.openApplyModal(this.WorkListActionObj); + + this.common.confirmAlertDialogAction( + () => { + this.applyAction(this.WorkListActionObj); + }, this.ts.trPK('general', 'ok'), + () => { }, this.ts.trPK('general', 'cancel'), + this.ts.trPK('vacation-rule', 'confirmation'), + this.confirmMsg); ////////////////////////////////////////////////////////// diff --git a/Mohem/src/app/notification/worklist-main/worklist-main.component.ts b/Mohem/src/app/notification/worklist-main/worklist-main.component.ts index bd24c4f9..d800c8da 100644 --- a/Mohem/src/app/notification/worklist-main/worklist-main.component.ts +++ b/Mohem/src/app/notification/worklist-main/worklist-main.component.ts @@ -547,10 +547,6 @@ export class WorklistMainComponent implements OnInit { ); // this.navCtrl.push("EitUpdateListPage"); this.common.eitUpdate();// must be test -<<<<<<< HEAD -======= - ->>>>>>> a0e265ba550a4baab02eceba5e138cf08c3efe21 } else if (this.getPassNotificationDetails.REQUEST_TYPE == "ABSENCE") { this.common.sharedService.setSharedData( this.notificationBodyRes, diff --git a/Mohem/src/theme/worklist.scss b/Mohem/src/theme/worklist.scss index eee25155..eb1d83b5 100644 --- a/Mohem/src/theme/worklist.scss +++ b/Mohem/src/theme/worklist.scss @@ -232,7 +232,7 @@ ion-label.labelValue.sc-ion-label-md-h.sc-ion-label-md-s.md.hydrated .timeline .timeline-item { - width: 40px; + // width: 40px; } @@ -548,9 +548,9 @@ left: 66px; height:70px } .empImge{ - border-radius: 50%; - width:100%; - height: 100%; + border-radius: 50% !important; + width: 60px !important; + height: 60px !important; border: #dedede solid 1px; } From ec609c57ea7ee6ffc0118e871efe1ba392c4f2c7 Mon Sep 17 00:00:00 2001 From: enadhilal Date: Mon, 16 Mar 2020 15:17:36 +0300 Subject: [PATCH 12/17] btn on EIT --- Mohem/src/app/eit/eit-list/eit-list.component.html | 4 ++-- Mohem/src/app/eit/eit-list/eit-list.component.scss | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Mohem/src/app/eit/eit-list/eit-list.component.html b/Mohem/src/app/eit/eit-list/eit-list.component.html index ddf3476d..b8c2c570 100644 --- a/Mohem/src/app/eit/eit-list/eit-list.component.html +++ b/Mohem/src/app/eit/eit-list/eit-list.component.html @@ -225,9 +225,9 @@ - -
+
+ diff --git a/Mohem/src/app/eit/eit-list/eit-list.component.scss b/Mohem/src/app/eit/eit-list/eit-list.component.scss index 2dfdf5be..97adb72c 100644 --- a/Mohem/src/app/eit/eit-list/eit-list.component.scss +++ b/Mohem/src/app/eit/eit-list/eit-list.component.scss @@ -68,7 +68,7 @@ h4 { right: 8%; position: fixed; color: white; - bottom: 5%; + bottom: 0; border-radius: 50%; z-index: 999; -webkit-box-shadow: 2px -1px 13px 0px rgba(0,0,0,0.59); From 02be9dbbe6fb563546a4345b3d28d00ae3181a8f Mon Sep 17 00:00:00 2001 From: enadhilal Date: Mon, 16 Mar 2020 15:49:12 +0300 Subject: [PATCH 13/17] btn on absence --- Mohem/src/app/absence/home/home.component.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Mohem/src/app/absence/home/home.component.html b/Mohem/src/app/absence/home/home.component.html index 9d2845aa..aca3a594 100644 --- a/Mohem/src/app/absence/home/home.component.html +++ b/Mohem/src/app/absence/home/home.component.html @@ -230,10 +230,10 @@ -
+ @@ -119,14 +129,7 @@ --> - - - - - - {{ts.trPK('myTeam','myTeam-header')}} - - +