diff --git a/Mohem/src/app/app.component.ts b/Mohem/src/app/app.component.ts index 28f84927..7378cfea 100644 --- a/Mohem/src/app/app.component.ts +++ b/Mohem/src/app/app.component.ts @@ -29,6 +29,10 @@ export class AppComponent implements OnInit, AfterViewInit { companyDesc: string = "Powered By Cloud Solutions"; public direction = "ltr"; User_Job_name: string; + requestGetLoginInfo: { + DeviceType: string; DeviceToken: string; //this.deviceToken + }; + user: boolean; constructor( public ts: TranslatorService, private cs: CommonService, @@ -71,6 +75,7 @@ export class AppComponent implements OnInit, AfterViewInit { } private startReceivingPushService() { + console.log("platform.ready") this.pushService.startReceiving(); } subscribeEvents() { @@ -159,6 +164,7 @@ export class AppComponent implements OnInit, AfterViewInit { closeMenu(){ this.menu.toggle(); } - + + } 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 ef0cdcd7..29eb0d85 100644 --- a/Mohem/src/app/authentication/change-password/change-password.component.html +++ b/Mohem/src/app/authentication/change-password/change-password.component.html @@ -1,5 +1,5 @@ - + diff --git a/Mohem/src/app/authentication/check-user/check-user.component.ts b/Mohem/src/app/authentication/check-user/check-user.component.ts index f0bd66a9..5e9f5dab 100644 --- a/Mohem/src/app/authentication/check-user/check-user.component.ts +++ b/Mohem/src/app/authentication/check-user/check-user.component.ts @@ -78,6 +78,7 @@ export class CheckUserComponent implements OnInit { console.log(result); this.loginData.LogInTokenID = result.LogInTokenID; this.loginData.P_USER_NAME = this.P_USER_NAME; + // this.loginData.EMPLOYEE_NAME=result.MemberLoginList[0].EMPLOYEE_NAME; this.sharedData.setSharedData(this.loginData, AuthenticationService.LOGIN_DATA); this.sharedData.setSharedData(true,Password.IS_FORGET_PSW); this.cs.stopLoading(); diff --git a/Mohem/src/app/authentication/confirm-login/confirm-login.component.html b/Mohem/src/app/authentication/confirm-login/confirm-login.component.html index ba09e11a..931f7349 100644 --- a/Mohem/src/app/authentication/confirm-login/confirm-login.component.html +++ b/Mohem/src/app/authentication/confirm-login/confirm-login.component.html @@ -1,5 +1,5 @@ - + @@ -28,7 +28,10 @@ -

{{empname}}

+

{{ts.trPK('login','verify-login-with')}}

- +
@@ -19,7 +19,7 @@
- + @@ -30,12 +30,12 @@ - +

{{ts.trPK('login','login')}}

-
+
- 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 4a8ce8aa..a71d4621 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 @@ -89,7 +89,7 @@ export class WorklistMainPRComponent implements OnInit { closeMsg: string; truncating: boolean; orgNote: any; - lines_note_limit: any = 15; + lines_note_limit: any = 24; selectedIndex: any; showLessBtn: boolean; showMoreBtn: boolean; 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 c120b383..0d87349f 100644 --- a/Mohem/src/app/notification/worklist-main/worklist-main.component.html +++ b/Mohem/src/app/notification/worklist-main/worklist-main.component.html @@ -1,5 +1,5 @@ - + {{ts.trPK('worklistMain','title')}} @@ -75,8 +75,13 @@
-
+ + + +
@@ -377,7 +382,7 @@ - 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 a152e092..813ab8cb 100644 --- a/Mohem/src/app/notification/worklist-main/worklist-main.component.scss +++ b/Mohem/src/app/notification/worklist-main/worklist-main.component.scss @@ -92,12 +92,12 @@ .rowBorder{ - border-bottom: solid 0.03cm var(--grayBG); + border-bottom: solid 0.02cm var(--grayBG); } .colBorder{ - border-right: solid 0.03cm var(--grayBG); + border-right: solid 0.02cm var(--grayBG); } @@ -183,7 +183,7 @@ // border: var(--cusgray) 1px solid !important; --background: transparent; margin-left: -15px; - margin-right: 7px; + margin-right: 6px; } .status{ text-align: center; @@ -231,7 +231,7 @@ color: white; .subOrdinateDiv{ z-index: 4; - margin-left: -44px; + margin-left: -32px; position: absolute; top: -2px; } @@ -244,7 +244,7 @@ color: white; } .subOrdinateRow{ - margin-left: 40px; + margin-left: 55px; } .label{ 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 ff2de615..938e09aa 100644 --- a/Mohem/src/app/notification/worklist-main/worklist-main.component.ts +++ b/Mohem/src/app/notification/worklist-main/worklist-main.component.ts @@ -78,7 +78,7 @@ export class WorklistMainComponent implements OnInit { P_PAGE_LIMIT: number = 100; notificationCount: any; activeSegment: any = "info"; - lines_note_limit: any = 15; + lines_note_limit: any = 24; attachmentRes: any; private WorkListActionHistoryObj: WorkListActionHistoryRequest; IsReachEnd: boolean = false; @@ -401,6 +401,7 @@ export class WorklistMainComponent implements OnInit { obj.ATTRIBUTE_TEXT_VALUE = this.selEmployeeID; this.P_RESPOND_ATTRIBUTES_TBL.push(obj); } + if ( ButtonAction == "APPROVED" || ButtonAction == "REJECTED" || @@ -410,7 +411,7 @@ export class WorklistMainComponent implements OnInit { this.WorkListActionObj.P_FORWARD_TO_USER_NAME = ""; this.WorkListActionObj.P_ACTION_MODE = ButtonAction; this.WorkListActionObj.P_COMMENTS = ""; - this.WorkListActionObj.RespondAttributeList = this.P_RESPOND_ATTRIBUTES_TBL; + // this.WorkListActionObj.RespondAttributeList = this.P_RESPOND_ATTRIBUTES_TBL; this.common.sharedService.setSharedData( this.getPassNotificationDetails, @@ -420,6 +421,7 @@ export class WorklistMainComponent implements OnInit { ButtonAction, WorklistMainComponent.PASS_ACTION_MODE ); + this.common.sharedService.setSharedData( this.P_RESPOND_ATTRIBUTES_TBL, WorklistMainComponent.PASS_RES_ATTR @@ -450,11 +452,14 @@ export class WorklistMainComponent implements OnInit { this.ts.trPK('vacation-rule', 'confirmation'), this.confirmMsg) - // this.openApplyModal(this.WorkListActionObj); + // this.openApplyModal(this.WorkListActionObj); } + + + if (ButtonAction == "RFC") { // alert("Return For Correction"); this.WorkListActionObj.P_ACTION_MODE = ButtonAction; @@ -614,6 +619,10 @@ export class WorklistMainComponent implements OnInit { } this.notificationDynamicFields(result.NotificationGetRespondAttributesList); this.notificationDynamicAttributeArr = result.NotificationGetRespondAttributesList; + this.common.sharedService.setSharedData( + this.notificationDynamicAttributeArr, + "notificationDynamicAttributeArr" + ); if (result.P_Schema) this.schemaNotific = JSON.parse(result.P_Schema); } // valid it } // End handleWorkListButtonsResult @@ -701,6 +710,7 @@ export class WorklistMainComponent implements OnInit { } handleWorkListActionHistoryResult(result) { + console.log( "1"+ this.IsReachEnd); if (this.common.validResponse(result)) { if (this.common.hasData(result.GetActionHistoryList)) { this.actionHistoryRes = result.GetActionHistoryList; @@ -711,8 +721,12 @@ export class WorklistMainComponent implements OnInit { let lastitem = result.GetActionHistoryList[lastItemIndex]; if (lastitem.NO_OF_ROWS == lastitem.ROW_NUM) { this.IsReachEnd = true; + console.log( "2"+ this.IsReachEnd); + } else { this.IsReachEnd = false; + console.log( "3"+ this.IsReachEnd); + } } this.turnCateFun(this.actionHistoryRes); @@ -944,6 +958,40 @@ export class WorklistMainComponent implements OnInit { + loadMoreActionHistory() { + console.log("doInfinite action history MR"); + + if (!this.IsReachEnd) { + this.worklistService.getActionHistory(this.WorkListActionHistoryObj). + subscribe((result: any) => { + if (this.common.validResponse(result)) { + if (result.GetActionHistoryList != undefined) { + this.P_PAGE_NUM++; + this.WorkListActionHistoryObj.P_PAGE_NUM = this.P_PAGE_NUM; + + (result.GetActionHistoryList).forEach(element => { + if (element.ROW_NUM == element.NO_OF_ROWS) { + this.IsReachEnd = true; + } else { + this.IsReachEnd = false; + } + this.actionHistoryRes.push(element); + }, (Error) => console.log(Error), () => + //infiniteScroll.target.complete() + console.log("TEST")); + }// 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/assets/localization/i18n.json b/Mohem/src/assets/localization/i18n.json index e77f027b..9ffa093b 100644 --- a/Mohem/src/assets/localization/i18n.json +++ b/Mohem/src/assets/localization/i18n.json @@ -1782,19 +1782,20 @@ "ar":"العناصر المطلوبة" }, "approveMsg":{ - "en": "Are you sure to approve this request ?", + + "en": "

Are you sure to Approve this request ?

", "ar":"العناصر المطلوبة" }, "rejectMsg":{ - "en": "Are you sure to reject this request?", + "en": "

Are you sure to Reject this request ?

", "ar":"العناصر المطلوبة" }, "delMsg":{ - "en": "Are you sure to delete this request?", + "en": "

Are you sure to Delete this request ?

", "ar":"العناصر المطلوبة" }, "closeMsg":{ - "en": "Are you sure to close this request?", + "en": "

Are you sure to Close this request ?

", "ar":"العناصر المطلوبة" }, "Supplier":{ diff --git a/Mohem/src/theme/styles.scss b/Mohem/src/theme/styles.scss index 809593a0..cc1f0c05 100644 --- a/Mohem/src/theme/styles.scss +++ b/Mohem/src/theme/styles.scss @@ -862,13 +862,13 @@ color: var(--dark); } .checkOutOkBtn{ - margin-left: 55px !important; - margin-right: 55px !important; + /* margin-left: 50px !important; */ + /* margin-right: 55px !important; */ margin-top: 10px !important; - margin-bottom: 10px !important; + /* margin-bottom: 10px !important; */ border-radius: 5px !important; - height: 32px !important; - min-height: 30px !important; + height: 40px !important; + min-height: 40px !important; background: var(--lightblue) !important; -webkit-box-flex: 1; flex: 1 1 auto; @@ -876,17 +876,19 @@ color: var(--dark); border-right: 0.55px solid rgba(var(--ion-text-color-rgb, 0, 0, 0), 0.2); color: white !important; border: none !important; + width: 80%; + --background: var(--lightblue) !important; } .checkOutCancelBtn{ - margin-left: 55px !important; - margin-right: 55px !important; - margin-top: 10px !important; - margin-bottom: 10px !important; + /* margin-left: 55px !important; */ + /* margin-right: 55px !important; */ + /* margin-top: 10px !important; */ + /* margin-bottom: 10px !important; */ border-radius: 5px !important; - height: 32px !important; - min-height: 30px !important; + height: 40px !important; + min-height: 40px !important; background: var(--darkblue) !important; -webkit-box-flex: 1; flex: 1 1 auto; @@ -894,6 +896,8 @@ color: var(--dark); border-right: 0.55px solid rgba(var(--ion-text-color-rgb, 0, 0, 0), 0.2); color: white !important; border: none !important; + width: 80%; + --background: var(--darkblue) !important; } .buttonClassWhite { @@ -1002,40 +1006,9 @@ border:0px margin-top: 10px; } -.checkOutOkBtn{ - margin-left: 55px !important; - margin-right: 55px !important; - margin-top: 10px !important; - margin-bottom: 10px !important; - border-radius: 5px !important; - height: 32px !important; - min-height: 30px !important; - background: var(--lightblue) !important; - -webkit-box-flex: 1; - flex: 1 1 auto; - border-top: 0.55px solid rgba(var(--ion-text-color-rgb, 0, 0, 0), 0.2); - border-right: 0.55px solid rgba(var(--ion-text-color-rgb, 0, 0, 0), 0.2); - color: white !important; - border: none !important; -} -.checkOutCancelBtn{ - margin-left: 55px !important; - margin-right: 55px !important; - margin-top: 10px !important; - margin-bottom: 10px !important; - border-radius: 5px !important; - height: 32px !important; - min-height: 30px !important; - background: var(--darkblue) !important; - -webkit-box-flex: 1; - flex: 1 1 auto; - border-top: 0.55px solid rgba(var(--ion-text-color-rgb, 0, 0, 0), 0.2); - border-right: 0.55px solid rgba(var(--ion-text-color-rgb, 0, 0, 0), 0.2); - color: white !important; - border: none !important; -} + .more-modal { background: rgba(0, 0, 0, 0.5) !important; @@ -1093,6 +1066,17 @@ border:0px height: 0px !important; display: none !important; } -.header-toolbar-new{ +.header-toolbar-new { --background: #22c6b3; + background: #22c6b3; } + +.boldText{ + color: var(--dark) !important; + font-weight: bold; + font-size: 20px; +} +.boldP{ + + font-size: 20px; +} \ No newline at end of file diff --git a/Mohem/src/theme/worklist.scss b/Mohem/src/theme/worklist.scss index fc5b409a..fcc772cf 100644 --- a/Mohem/src/theme/worklist.scss +++ b/Mohem/src/theme/worklist.scss @@ -206,7 +206,7 @@ ion-label.labelValue.sc-ion-label-md-h.sc-ion-label-md-s.md.hydrated } .timeline .timeline-thumb.timeline-icon { - height: 70px; + height: 67px; // text-align: center; // color: white; // border: 5px solid #CBD0D3; @@ -442,11 +442,11 @@ left: 66px; .rowBorder{ - border-bottom: solid 0.03cm var(--grayBG); + border-bottom: solid 0.02cm var(--grayBG); } .colBorder{ - border-right: solid 0.03cm var(--grayBG); + border-right: solid 0.02cm var(--grayBG); } @@ -543,6 +543,13 @@ left: 66px; height: 80px; border: #dedede solid 1px; } + .empImgeSub{ + border-radius: 50%; + width: 85px; + height: 85px; + border: #dedede solid 1px; + + } ion-card{ color:black !important; @@ -550,4 +557,17 @@ left: 66px; .line{ padding-bottom:87px; + } + + ion-segment-button ion-label { + max-width: 100px; + overflow: hidden; + padding: 10px; + font-size: 14px; + color: black !important; + } + + .colItems ion-label { + color: black !important; + } \ No newline at end of file