diff --git a/Mohem/src/app/absence/absence-confirm/absence-confirm.component.html b/Mohem/src/app/absence/absence-confirm/absence-confirm.component.html index d54f2c4e..2439bfae 100644 --- a/Mohem/src/app/absence/absence-confirm/absence-confirm.component.html +++ b/Mohem/src/app/absence/absence-confirm/absence-confirm.component.html @@ -109,7 +109,7 @@
-
+
- {{ts.trPK('absenceList','absenceList')}} + {{ts.trPK('home','leave-balance')}} @@ -55,26 +55,20 @@
-

{{totalnumber}}

+ - {{ts.trPK('absenceList','totalNumber')}} +
- +
-
+
@@ -84,13 +78,7 @@
-
+
@@ -101,13 +89,7 @@
-
+
diff --git a/Mohem/src/app/absence/home/home.component.scss b/Mohem/src/app/absence/home/home.component.scss index 670bd6c2..49b358e9 100644 --- a/Mohem/src/app/absence/home/home.component.scss +++ b/Mohem/src/app/absence/home/home.component.scss @@ -15,7 +15,7 @@ right: 8%; position: fixed; color: white; - bottom: 20%; + bottom: 5%; border-radius: 50%; z-index: 999; -webkit-box-shadow: 2px -1px 13px 0px rgba(0,0,0,0.59); @@ -137,6 +137,17 @@ // padding-top: 29px; margin-left: -70px !important; } +.today-graph-ar{ + display: block !important; + height: 196px; + width: 385px; + padding-left: 51px; + /* margin-left: -70px !important; */ + font-size: 14px; + margin-left: -48px; + margin-right: 63px; + margin-bottom: -30px; +} .headerGrid{ background-color: white !important; @@ -215,4 +226,65 @@ margin-top: -13px; left: 0; top: 0px; z-index: 1; - } \ No newline at end of file + } + .div-green{ + position: relative; + left: 82%; + bottom: 128px; + color: black; + background-color: #1FA269; + width: 13%; + height: 6px; + } + .div-green-ar{ + position: relative; + bottom: 59px; + color: black; + background-color: #1FA269; + width: 13%; + height: 6px; + right: 9px; + + } + .div-red-ar{ + position: relative; + bottom: 131px; + color: black; + background-color: #CB3232; + // background-color: #094875; + // background-color: #DDB017; + width: 13%; + height: 6px; + right: 78px; + } + .div-red{ + position: relative; + left: 59%; + bottom: 131px; + color: black; + background-color: #CB3232; + // background-color: #094875; + width: 13%; + height: 6px; + } + + .div-orng{ + position: relative; + left: 82%; + bottom: 80px; + color: black; + // background-color: #CB3232; + background-color: #DDB017; + width: 13%; + height: 6px; + } + .div-orng-ar{ + position: relative; + bottom: 139px; + color: black; + // background-color: #CB3232; + background-color: #DDB017; + width: 13%; + height: 6px; + right: 10px; + } \ 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..1856df8d 100644 --- a/Mohem/src/app/absence/home/home.component.ts +++ b/Mohem/src/app/absence/home/home.component.ts @@ -39,6 +39,7 @@ export class HomeComponent implements OnInit { ACCRUAL_USED_ENTITLEMENT: any; ACCRUAL_YEARLY_ENTITLEMENT: any; totalnumber: any; + public direction: string; public options = { cutoutPercentage: 80, @@ -56,6 +57,7 @@ export class HomeComponent implements OnInit { public accrualService: AccrualService, public authService: AuthenticationService ) { + this.direction = TranslatorService.getCurrentDirection(); // this.userData =this.common.sharedService.getSharedData(AuthenticatedUser.SHARED_DATA,false); } @@ -107,10 +109,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 +264,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/absence/submit-absence-modal/submit-absence-modal.component.html b/Mohem/src/app/absence/submit-absence-modal/submit-absence-modal.component.html index 917ed98c..7e996546 100644 --- a/Mohem/src/app/absence/submit-absence-modal/submit-absence-modal.component.html +++ b/Mohem/src/app/absence/submit-absence-modal/submit-absence-modal.component.html @@ -10,21 +10,21 @@ --> -

Confirmation

+

{{'eit,confirmation' | translate}}

- No Attachment + {{'eit,no-attachment' | translate}}
- No Note + {{'eit,no-note' | translate}}
- Are you sure you want to submit + {{'eit,submit' | translate}} {{ts.trPK('general','ok')}} diff --git a/Mohem/src/app/accrual-balances/services/accrual.service.ts b/Mohem/src/app/accrual-balances/services/accrual.service.ts index c7b6c198..d99a0c5b 100644 --- a/Mohem/src/app/accrual-balances/services/accrual.service.ts +++ b/Mohem/src/app/accrual-balances/services/accrual.service.ts @@ -12,14 +12,23 @@ export class AccrualService { public con: ConnectorService, public authService: AuthenticationService ) {} - public getAccrualBalances(balance: any, onError?: any, errorLabel?: string) { + public getAccrualBalances(balance: any, onError?: any, errorLabel?: string, isPostNoLoad = false) { const request = balance; this.authService.authenticateRequest(request); - return this.con.post( - AccrualService.GET_ACCRUAL_BALANCE, - request, - onError, - errorLabel - ); + if (isPostNoLoad) { + return this.con.postNoLoad( + AccrualService.GET_ACCRUAL_BALANCE, + request, + onError, + errorLabel + ); + } else { + return this.con.post( + AccrualService.GET_ACCRUAL_BALANCE, + request, + onError, + errorLabel + ); + } } } diff --git a/Mohem/src/app/app.component.html b/Mohem/src/app/app.component.html index 42371b1a..a8762509 100644 --- a/Mohem/src/app/app.component.html +++ b/Mohem/src/app/app.component.html @@ -12,15 +12,19 @@
-
+

+
+
+ +
-
+

{{User_name_Emp}}

@@ -62,7 +66,7 @@
-->
- +
diff --git a/Mohem/src/app/app.component.scss b/Mohem/src/app/app.component.scss index e2901722..5b3cf302 100644 --- a/Mohem/src/app/app.component.scss +++ b/Mohem/src/app/app.component.scss @@ -17,6 +17,16 @@ header margin-top: -24px !important; margin-bottom: 11px; } + +.mohemmLogo-ar{ + + max-width: 46% !important; + border: 0 !important; + margin-right: 70px !important; + margin-top: -24px !important; + margin-bottom: 11px; +} + .closeIcon{ height: 10px !important; @@ -84,6 +94,22 @@ padding: 6px 24px; } +.logout-ar{ + background-color: #22C6B3; + border: none; + color: white; + text-align: center; + text-decoration: none; + display: inline-block; + font-size: 12px; + margin-right: 95px !important; + margin-top: 15px !important; + margin-bottom: 20px !important; + border-radius: 30px; + height: 26px; + padding: 6px 24px; +} + .menuImg{ width: 105px !important; height: 105px !important; diff --git a/Mohem/src/app/attendance/models/attendanceSwipe.Request.ts b/Mohem/src/app/attendance/models/attendanceSwipe.Request.ts new file mode 100644 index 00000000..b08ad177 --- /dev/null +++ b/Mohem/src/app/attendance/models/attendanceSwipe.Request.ts @@ -0,0 +1,25 @@ +import { Request } from 'src/app/hmg-common/services/models/request'; + +export class attendanceSwipeScannerRequest extends Request{ + public static SHARED_DATA = 'attendanceSwipeScanner-request'; + public P_USER_NAME:string; + public P_PASSWORD: string; + public UserName: string; + public CompanyID:number; + public BranchID: number; + public UID:string; + public Latitude:number; + public Longitude:number; + public QRValue: string; + public MemberID:number; + public EmployeeID: number; + public IPAdress: string; + public UserID: string; +} + + + + + + + diff --git a/Mohem/src/app/attendance/services/attendance.service.ts b/Mohem/src/app/attendance/services/attendance.service.ts index e69de29b..b987954a 100644 --- a/Mohem/src/app/attendance/services/attendance.service.ts +++ b/Mohem/src/app/attendance/services/attendance.service.ts @@ -0,0 +1,20 @@ +import { Injectable } from "@angular/core"; +import { Observable } from "rxjs"; +import { ConnectorService } from "src/app/hmg-common/services/connector/connector.service"; +import { AuthenticationService } from "src/app/hmg-common/services/authentication/authentication.service"; +import { attendanceSwipeScannerRequest } from '../models/attendanceSwipe.Request'; +@Injectable({ + providedIn: "root" +}) +export class AttendanceService { + public AttendanceSwipeURL : string ='Services/SWP.svc/REST/AuthenticateAndSwipeUser'; + constructor( + public con: ConnectorService, + public authService: AuthenticationService + ) {} + public attendanceSwipeScanner(attendanceSwipeScanner: attendanceSwipeScannerRequest, onError?: any, errorLabel?: string): Observable { + const request = attendanceSwipeScanner; + this.authService.authenticateRequest(request); + return this.con.post(this.AttendanceSwipeURL,request,onError,errorLabel); + } +} 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..939e66ba 100644 --- a/Mohem/src/app/authentication/change-password/change-password.component.html +++ b/Mohem/src/app/authentication/change-password/change-password.component.html @@ -1,7 +1,7 @@ - + {{'changePassword,changePassword' | translate}} diff --git a/Mohem/src/app/authentication/check-user/check-user.component.html b/Mohem/src/app/authentication/check-user/check-user.component.html index 766c4349..ba3aec50 100644 --- a/Mohem/src/app/authentication/check-user/check-user.component.html +++ b/Mohem/src/app/authentication/check-user/check-user.component.html @@ -1,7 +1,7 @@ - + {{'login,forgot-password' | translate}} 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 5ab6a2b0..0e57adf1 100644 --- a/Mohem/src/app/authentication/confirm-login/confirm-login.component.html +++ b/Mohem/src/app/authentication/confirm-login/confirm-login.component.html @@ -1,7 +1,7 @@ - + {{'login,verify-login' | translate}} diff --git a/Mohem/src/app/authentication/forgot/forgot.component.html b/Mohem/src/app/authentication/forgot/forgot.component.html index 1e052198..f363261d 100644 --- a/Mohem/src/app/authentication/forgot/forgot.component.html +++ b/Mohem/src/app/authentication/forgot/forgot.component.html @@ -1,7 +1,7 @@ - + {{'login,forgot-password' | translate}} diff --git a/Mohem/src/app/authentication/login/login.component.html b/Mohem/src/app/authentication/login/login.component.html index da7aec7e..2dd41792 100644 --- a/Mohem/src/app/authentication/login/login.component.html +++ b/Mohem/src/app/authentication/login/login.component.html @@ -62,10 +62,10 @@ {{ts.trPK('login','signup')}}
- - - + + +
diff --git a/Mohem/src/app/authentication/sms-page/sms-page.page.html b/Mohem/src/app/authentication/sms-page/sms-page.page.html index f2811d6a..0f83c9d6 100644 --- a/Mohem/src/app/authentication/sms-page/sms-page.page.html +++ b/Mohem/src/app/authentication/sms-page/sms-page.page.html @@ -1,7 +1,7 @@ - + {{'verificationcode,verificationcode' | translate}} diff --git a/Mohem/src/app/eit/add-eit/add-eit.component.scss b/Mohem/src/app/eit/add-eit/add-eit.component.scss index 08f5fd5c..22988b18 100644 --- a/Mohem/src/app/eit/add-eit/add-eit.component.scss +++ b/Mohem/src/app/eit/add-eit/add-eit.component.scss @@ -23,6 +23,7 @@ ion-label { padding-left: 10px; } + .header-toolbar-new{ --background: #22c6b3; } diff --git a/Mohem/src/app/eit/confirm-add-eit/confirm-add-eit.component.html b/Mohem/src/app/eit/confirm-add-eit/confirm-add-eit.component.html index aa9cf636..a1a18349 100644 --- a/Mohem/src/app/eit/confirm-add-eit/confirm-add-eit.component.html +++ b/Mohem/src/app/eit/confirm-add-eit/confirm-add-eit.component.html @@ -104,7 +104,7 @@
-
+
+ {{headerTitle}} - {{headerTitle}} + -
+
@@ -26,7 +27,7 @@
- +
@@ -38,7 +39,7 @@
- +
@@ -54,7 +55,7 @@
-
+


@@ -62,7 +63,7 @@
-
+


@@ -71,7 +72,7 @@
-
+


@@ -131,7 +132,7 @@
- + @@ -220,11 +221,11 @@
- + - +
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 c2b03032..2dfdf5be 100644 --- a/Mohem/src/app/eit/eit-list/eit-list.component.scss +++ b/Mohem/src/app/eit/eit-list/eit-list.component.scss @@ -63,17 +63,28 @@ h4 { .addClass{ background-color: #094875; - width: 80px; - height: 80px; - right: 8%; - position: fixed; - color: white; - bottom: 20%; - border-radius: 50%; - z-index: 999; - -webkit-box-shadow: 2px -1px 13px 0px rgba(0,0,0,0.59); - -moz-box-shadow: 2px -1px 13px 0px rgba(0,0,0,0.59); - box-shadow: 2px -1px 13px 0px rgba(0,0,0,0.59); + width: 80px; + height: 80px; + right: 8%; + position: fixed; + color: white; + bottom: 5%; + border-radius: 50%; + z-index: 999; + -webkit-box-shadow: 2px -1px 13px 0px rgba(0,0,0,0.59); + -moz-box-shadow: 2px -1px 13px 0px rgba(0,0,0,0.59); + box-shadow: 2px -1px 13px 0px rgba(0,0,0,0.59); +} + +.contentEit:before { + position: absolute; +content: ""; +// background: #22c6b3; +height: 140px; +width: 100%; +left: 0; +top: 0px; +z-index: 1; } .hrClass{ @@ -160,6 +171,11 @@ z-index: 1; margin-left: 7px !important; margin-right: 42px; } + .green-label-ar{ + font-size: 15px !important; + margin-left: 7px !important; + margin-right: 15px; + } .blue-label{ font-size: 15px !important; margin-left: 7px !important; @@ -170,6 +186,11 @@ z-index: 1; margin-left: 7px !important; margin-right: -26px; } + .light-label-ar{ + font-size: 15px !important; + margin-right: 7px !important; + margin-left: -26px; + } .light-dote{ background-color: #3CB9D5; @@ -241,6 +262,16 @@ z-index: 1; margin-left: -17px; margin-right: 5px; } + + .adult-dote-ar{ + background-color: #3CB9D5; + width: 15px; + height: 15px; + border-radius: 50% !important; + display: inline-block; + margin-right: 0px; + margin-left: 5px; + } .child-dote{ background-color: #22C6B3; @@ -251,6 +282,15 @@ z-index: 1; margin-left: -17px; margin-right: 5px; } + .child-dote-ar{ + background-color: #22C6B3; + width: 15px; + height: 15px; + border-radius: 50% !important; + display: inline-block; + margin-right: 1px; + margin-left: 5px; + } .infants-dote{ background-color: #1FA269; width: 15px; @@ -261,4 +301,14 @@ z-index: 1; margin-right: 5px; // margin-bottom: 6px; } - \ No newline at end of file + + .infants-dote-ar{ + background-color: #1FA269; + width: 15px; + height: 15px; + border-radius: 50% !important; + display: inline-block; + margin-right: 1px; + margin-left: 5px; + } + 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 cf6bbe83..92e41259 100644 --- a/Mohem/src/app/eit/eit-list/eit-list.component.ts +++ b/Mohem/src/app/eit/eit-list/eit-list.component.ts @@ -52,10 +52,12 @@ export class EitListComponent implements OnInit { gaugeType = "full"; accrualBalancesList: any; common: any; + direction: string; // gaugeValue = 11.200; // gaugeLabel = ""; constructor(private cs: CommonService, private EITService: EitService, private ts: TranslatorService, private modalCtrl: ModalController) { + this.direction = TranslatorService.getCurrentLanguageName() this.selMenu = this.cs.sharedService.getSharedData(MenuResponse.SHARED_DATA, false); this.selEmp = this.cs.sharedService.getSharedData(MenuResponse.SHARED_SEL_EMP, false); this.respID = this.cs.sharedService.getSharedData(MenuResponse.SHARED_SEL_RESP_ID, false); diff --git a/Mohem/src/app/eit/home/home.component.html b/Mohem/src/app/eit/home/home.component.html index 28c4956e..7591dd7e 100644 --- a/Mohem/src/app/eit/home/home.component.html +++ b/Mohem/src/app/eit/home/home.component.html @@ -2,6 +2,7 @@ {{headerTitle}} + @@ -24,7 +25,7 @@ {{menuItem.PROMPT}} - + @@ -36,7 +37,7 @@  {{subPage.PROMPT}} - + diff --git a/Mohem/src/app/eit/home/home.component.scss b/Mohem/src/app/eit/home/home.component.scss index cc7f2852..ccda4466 100644 --- a/Mohem/src/app/eit/home/home.component.scss +++ b/Mohem/src/app/eit/home/home.component.scss @@ -66,3 +66,17 @@ ion-icon::before { // border-bottom: 1px solid #dedede; // } + +.span-arrow-en{ + float: right; + font-size: 25px; + color: grey; + transform: rotate(0deg); +} + +.span-arrow-ar{ + float: left; + font-size: 25px; + color: grey; + transform: rotate(180deg); +} diff --git a/Mohem/src/app/eit/home/home.component.ts b/Mohem/src/app/eit/home/home.component.ts index 2f250a21..a4ae5018 100644 --- a/Mohem/src/app/eit/home/home.component.ts +++ b/Mohem/src/app/eit/home/home.component.ts @@ -16,9 +16,11 @@ export class HomeComponent implements OnInit { selMenu: MenuResponse = new MenuResponse(); // Selected Side Menu selectedMenu: any; + direction: string; pageType :string; constructor(private cs: CommonService, private ts: TranslatorService) { + this.direction = TranslatorService.getCurrentLanguageName() this.menu = this.cs.sharedService.getSharedData('menuEntries', false); this.pageType = this.cs.sharedService.getSharedData('homemenuentries', false); this.selMenu = this.cs.sharedService.getSharedData(MenuResponse.SHARED_DATA, false); diff --git a/Mohem/src/app/eit/services/eit.service.ts b/Mohem/src/app/eit/services/eit.service.ts index c88b7401..9063a6ff 100644 --- a/Mohem/src/app/eit/services/eit.service.ts +++ b/Mohem/src/app/eit/services/eit.service.ts @@ -27,18 +27,22 @@ export class EitService { public static deleteAttach = 'Services/ERP.svc/REST/DELETE_ATTACHMENT'; public static getApproversList = 'Services/ERP.svc/REST/GET_APPROVERS_LIST'; public static addAttachment = 'Services/ERP.svc/REST/ADD_ATTACHMENT'; - public static cancelHRTransaction = 'Services/ERP.svc/REST/CANCEL_HR_TRANSACTION' + public static cancelHRTransaction = 'Services/ERP.svc/REST/CANCEL_HR_TRANSACTION'; public static getAttach = 'Services/ERP.svc/REST/GET_ATTACHMENTS'; constructor(public authService: AuthenticationService, public con: ConnectorService) { } - public getMenuEntries(menuEntries: any, onError?: any, errorLabel?: string): Observable { + public getMenuEntries(menuEntries: any, onError?: any, errorLabel?: string, isPostNoLoad = false): Observable { const request = menuEntries; this.authService.authenticateRequest(request); - console.log(request); - return this.con.post(EitService.getMenuEntries, request, onError, errorLabel); + if (isPostNoLoad) { + return this.con.postNoLoad(EitService.getMenuEntries, request, onError, errorLabel); + } else { + return this.con.post(EitService.getMenuEntries, request, onError, errorLabel); + } } + // tslint:disable-next-line: no-shadowed-variable public getEITTransactionsList(EITTransactionsRequest: EITTransactionsRequest, onError?: any, errorLabel?: string): Observable { const request = EITTransactionsRequest; this.authService.authenticateRequest(request); @@ -78,9 +82,9 @@ export class EitService { public getApproversList(abProcess: any, onError?: any, errorLabel?: string): Observable { const request = abProcess; - request.P_AME_TRANSACTION_TYPE = "SSHRMS"; + request.P_AME_TRANSACTION_TYPE = 'SSHRMS'; request.P_PAGE_NUM = 1; - request.P_PAGE_LIMIT = 1000;//check later on + request.P_PAGE_LIMIT = 1000; // check later on this.authService.authenticateRequest(request); return this.con.post(EitService.getApproversList, request, onError, errorLabel); } diff --git a/Mohem/src/app/eit/submit-eit-modal/submit-eit-modal.component.html b/Mohem/src/app/eit/submit-eit-modal/submit-eit-modal.component.html index 2a19db89..4bbf7b6b 100644 --- a/Mohem/src/app/eit/submit-eit-modal/submit-eit-modal.component.html +++ b/Mohem/src/app/eit/submit-eit-modal/submit-eit-modal.component.html @@ -10,21 +10,21 @@ --> -

Confirmation

+

{{'eit,confirmation' | translate}}

- No Attachment + {{'eit,no-attachment' | translate}}
- No Note + {{'eit,no-note' | translate}}
- Are you sure you want to submit + {{'eit,submit' | translate}} {{ts.trPK('general','ok')}} 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 adb01bad..1335e79d 100644 --- a/Mohem/src/app/hmg-common/services/connector/connector.service.ts +++ b/Mohem/src/app/hmg-common/services/connector/connector.service.ts @@ -1,31 +1,31 @@ -import { Injectable } from "@angular/core"; +import { Injectable } from '@angular/core'; import { HttpClient, HttpHeaders, HttpErrorResponse -} from "@angular/common/http"; -import { Observable, throwError, TimeoutError } from "rxjs"; -import { catchError, retry, tap, timeout } from "rxjs/operators"; -import { CommonService } from "../common/common.service"; -//import { Response } from "../models/response"; +} from '@angular/common/http'; +import { Observable, throwError, TimeoutError } from 'rxjs'; +import { catchError, retry, tap, timeout } from 'rxjs/operators'; +import { CommonService } from '../common/common.service'; +// import { Response } from "../models/response"; import { Response } from 'src/app/hmg-common/services/models/response'; @Injectable({ - providedIn: "root" + providedIn: 'root' }) export class ConnectorService { /* connection configuration settings */ static httpOptions = { - headers: new HttpHeaders({ "Content-Type": "application/json" }) + headers: new HttpHeaders({ 'Content-Type': 'application/json' }) }; public static retryTimes = 0; public static timeOut = 30 * 1000; // public static host = 'http://10.50.100.113:6060/'; // development service -public static host = "https://uat.hmgwebservices.com/"; - //public static host = 'https://hmgwebservices.com/'; +public static host = 'https://uat.hmgwebservices.com/'; + // public static host = 'https://hmgwebservices.com/'; // public static host = 'http://10.50.100.198:6060/'; // public static host = 'http://10.50.100.113:6060/'; // development service /* public static host = 'http://10.50.100.198:6060/'; @@ -64,17 +64,33 @@ public static host = "https://uat.hmgwebservices.com/"; ); } - public postNoLoad(service: string, data: any, onError: any): Observable { + // public postNoLoad(service: string, data: any, onError: any): Observable { + // return this.httpClient + // .post( + // ConnectorService.host + service, + // data, + // ConnectorService.httpOptions + // ) + // .pipe( + // retry(ConnectorService.retryTimes), + // tap(() => {}, () => {}) + // ); + // } + + public postNoLoad(service: string, data: any, onError: any, errorLabel?: string): Observable { return this.httpClient - .post( + .post( ConnectorService.host + service, data, - ConnectorService.httpOptions - ) - .pipe( - retry(ConnectorService.retryTimes), - tap(() => {}, () => {}) - ); + ConnectorService.httpOptions) + .pipe( + timeout(ConnectorService.timeOut), + retry(ConnectorService.retryTimes), + tap((res) => { + this.handleResponse(res, onError, errorLabel, true); + }, (error) => { + this.handleError(error, onError, errorLabel, true); + })); } // absolute url connection @@ -133,7 +149,10 @@ public static host = "https://uat.hmgwebservices.com/"; } */ - public handleError(error: any, onError: any, errorLabel: string) { + public handleError(error: any, onError: any, errorLabel: string, isPostNoLoad = false) { + // if (!isPostNoLoad) { + // this.cs.stopLoading(); + // } this.cs.stopLoading(); if (error instanceof TimeoutError) { this.cs.showConnectionTimeout(onError, errorLabel); @@ -142,20 +161,19 @@ public static host = "https://uat.hmgwebservices.com/"; } } - public handleResponse(result: Response, onError: any, errorLabel: string) { - this.cs.stopLoading(); + public handleResponse(result: Response, onError: any, errorLabel: string, isPostNoLoad = false) { + if (!isPostNoLoad) { + this.cs.stopLoading(); + } if (!this.cs.validResponse(result)) { - // not authorized - console.log(result.MessageStatus); - console.log("erroe"); - if (result.IsAuthenticated == false) { + if (result.IsAuthenticated === false) { this.cs.presentAcceptDialog(result.ErrorEndUserMessage, () => { this.cs.sharedService.clearAll(); this.cs.openLogin(); }); return false; } else if (result.ErrorType === 2 || result.ErrorType === 4) { - //console.log("error expired"); + // console.log("error expired"); } else { this.cs.showErrorMessageDialog( onError, diff --git a/Mohem/src/app/hmg-common/services/dashbored/dashbored.service.ts b/Mohem/src/app/hmg-common/services/dashbored/dashbored.service.ts index 587aeee6..fb532437 100644 --- a/Mohem/src/app/hmg-common/services/dashbored/dashbored.service.ts +++ b/Mohem/src/app/hmg-common/services/dashbored/dashbored.service.ts @@ -34,7 +34,7 @@ export class DashboredService { public authService: AuthenticationService, ) { } - public getOrganizationSalaries(onError ?: any ,oerrorLable ?: any): Observable{ + public getOrganizationSalaries(onError ?: any , oerrorLable ?: any): Observable{ const request = new Request(); this.authService.authenticateRequest(request); return this.con.post( @@ -42,21 +42,20 @@ export class DashboredService { request, onError, oerrorLable - );} + ); + } - public getOpenMissingSwipes(onError ?: any, oerrorLable ?: any): Observable { + public getOpenMissingSwipes(onError ?: any, oerrorLable ?: any, isPostNoLoad = false): Observable { const request = new Request(); this.authService.authenticateRequest(request); - return this.con.post( - DashboredService.openMissingSwipesUrl, - request, - onError, - oerrorLable - ); + if (isPostNoLoad) { + return this.con.postNoLoad(DashboredService.openMissingSwipesUrl, request, onError, oerrorLable); + } else { + return this.con.post( DashboredService.openMissingSwipesUrl, request, onError, oerrorLable); + } } - - public getPerformanceAppraisal(onError ?: any ,oerrorLable ?: any): Observable{ + public getPerformanceAppraisal(onError ?: any , oerrorLable ?: any): Observable{ const request = new Request(); this.authService.authenticateRequest(request); return this.con.post( @@ -66,30 +65,47 @@ export class DashboredService { oerrorLable ); } -public getAttendanceTracking(selectedEmployee: any, onError ?: any , oerrorLable ?: any): Observable{ +// tslint:disable-next-line: max-line-length +public getAttendanceTracking(selectedEmployee: any, onError ?: any , oerrorLable ?: any, isPostNoLoad = false): Observable{ const request = selectedEmployee; this.authService.authenticateRequest(request); - return this.con.post( - DashboredService.attendancetrackingUrl, - request, - onError, - oerrorLable - ); + if (isPostNoLoad) { + return this.con.postNoLoad( + DashboredService.attendancetrackingUrl, + request, + onError, + oerrorLable + ); + } else { + return this.con.post( + DashboredService.attendancetrackingUrl, + request, + onError, + oerrorLable + ); + } } public getOpenPeriodDates( onError?: any, errorLabel?: string): Observable { const request = new Request(); this.authService.authenticateRequest(request); return this.con.post(DashboredService.getOpenPeriodDates, request, onError, errorLabel); } - public getOpenNotifications( onError?: any, errorLabel?: string): Observable { + public getOpenNotifications( onError?: any, errorLabel?: string, isPostNoLoad = false): Observable { + console.log(isPostNoLoad); const request = new Request(); this.authService.authenticateRequest(request); - return this.con.post(DashboredService.getOpenNotifications, request, onError, errorLabel); + if (isPostNoLoad) { + return this.con.postNoLoad(DashboredService.getOpenNotifications, request, onError, errorLabel); + } else { + return this.con.post(DashboredService.getOpenNotifications, request, onError, errorLabel); + } } - public getSubordinatesLeaves( req: GetSubordinatesLeavesRequest,onError?: any, errorLabel?: string): Observable { + // tslint:disable-next-line: max-line-length + public getSubordinatesLeaves( req: GetSubordinatesLeavesRequest, onError?: any, errorLabel?: string): Observable { this.authService.authenticateRequest(req); return this.con.post(DashboredService.getSubordinatesLeaves, req, onError, errorLabel); } + // tslint:disable-next-line: max-line-length public getSubordinatesAttStatus( req: GetSubordinatesAttdStatusRequest, onError?: any, errorLabel?: string): Observable { this.authService.authenticateRequest(req); return this.con.post(DashboredService.getSubordinatesAttStatus, req, onError, errorLabel); diff --git a/Mohem/src/app/hmg-common/services/menu/menuservice.service.ts b/Mohem/src/app/hmg-common/services/menu/menuservice.service.ts index 68487c69..e8b16739 100644 --- a/Mohem/src/app/hmg-common/services/menu/menuservice.service.ts +++ b/Mohem/src/app/hmg-common/services/menu/menuservice.service.ts @@ -1,51 +1,55 @@ import {Injectable} from '@angular/core'; -import {Http, Response, Headers, } from "@angular/http"; -import {AuthenticationService} from "../authentication/authentication.service"; +import {Http, Response, Headers, } from '@angular/http'; +import {AuthenticationService} from '../authentication/authentication.service'; import { Observable } from 'rxjs'; import {MenuEntries} from './models/menu-entries.request'; import { Request } from 'src/app/hmg-common/services/models/request'; -//import {Request} from '../models/request'; -import {MenuResponse} from './models/menu-response' +// import {Request} from '../models/request'; +import {MenuResponse} from './models/menu-response'; import { ConnectorService } from '../connector/connector.service'; @Injectable() export class MenuService { - public static getMenu ='Services/ERP.svc/REST/GET_MENU'; + public static getMenu = 'Services/ERP.svc/REST/GET_MENU'; public static getMenuEntries = 'Services/ERP.svc/REST/GET_MENU_ENTRIES'; public static getMyTeam = 'Services/ERP.svc/REST/GET_EMPLOYEE_SUBORDINATES'; - public static getNotCount='Services/ERP.svc/REST/GET_OPEN_NOTIFICATIONS_NUM'; - public static disableSession="Services/ERP.svc/REST/DisableSession"; - public static detectLanguage='Services/ERP.svc/REST/Get_LanguageAvailable'; + public static getNotCount = 'Services/ERP.svc/REST/GET_OPEN_NOTIFICATIONS_NUM'; + public static disableSession = 'Services/ERP.svc/REST/DisableSession'; + public static detectLanguage = 'Services/ERP.svc/REST/Get_LanguageAvailable'; constructor( public authService: AuthenticationService, - public con:ConnectorService - + public con: ConnectorService + ) { } - - public getMenu(onError?: any, errorLabel?: string): Observable { + + public getMenu(onError?: any, errorLabel?: string, isPostNoLoad = false): Observable { const request = new Request(); this.authService.authenticateRequest(request); - return this.con.post(MenuService.getMenu, request, onError, errorLabel); + if (isPostNoLoad) { + return this.con.postNoLoad(MenuService.getMenu, request, onError, errorLabel); + } else { + return this.con.post(MenuService.getMenu, request, onError, errorLabel); + } } - public getMenuEntires(menuEntries:any, onError?: any, errorLabel?: string): Observable { + public getMenuEntires(menuEntries: any, onError?: any, errorLabel?: string): Observable { const request = menuEntries; this.authService.authenticateRequest(request); return this.con.post(MenuService.getMenuEntries, request, onError, errorLabel); } - public getNotificationCount(req:any, onError?: any, errorLabel?: string): Observable { + public getNotificationCount(req: any, onError?: any, errorLabel?: string): Observable { const request = req; this.authService.authenticateRequest(request); return this.con.post(MenuService.getNotCount, request, onError, errorLabel); } - public disableSession(req:any, onError?: any, errorLabel?: string): Observable { + public disableSession(req: any, onError?: any, errorLabel?: string): Observable { const request = req; this.authService.authenticateRequest(request); return this.con.post(MenuService.disableSession, request, onError, errorLabel); - } + } - public getAppLanguages(req:any, onError?: any, errorLabel?: string): Observable { + public getAppLanguages(req: any, onError?: any, errorLabel?: string): Observable { const request = req; this.authService.authenticateRequest(request); return this.con.post(MenuService.detectLanguage, request, onError, errorLabel); - } -} \ No newline at end of file + } +} diff --git a/Mohem/src/app/hmg-common/services/push/push.service.ts b/Mohem/src/app/hmg-common/services/push/push.service.ts index c1b5ed3f..eeb2a7a7 100644 --- a/Mohem/src/app/hmg-common/services/push/push.service.ts +++ b/Mohem/src/app/hmg-common/services/push/push.service.ts @@ -183,11 +183,11 @@ export class PushService { request.DeviceType = this.getDeviceType(); const user = this.authService.getAuthenticatedUser(); // request.PatientMobileNumber = user.MobileNo; - //request.NationalID = user.IdentificationNo; + // request.NationalID = user.IdentificationNo; request.Gender = user.Gender; request.PatientID = user.PatientID; // request.PatientOutSA = user.PatientOutSA ? 1 : 0; - //request.LoginType = user.biometricEnabled ? 2 : 1; // 1 sms , 2 touch id + // request.LoginType = user.biometricEnabled ? 2 : 1; // 1 sms , 2 touch id request.MACAddress = '00:00:00:00:00:00'; return this.con.postNoLoad(PushService.loggedInUserURL, request , () => { }).subscribe((result: Response) => { diff --git a/Mohem/src/app/hmg-common/ui/card-filter/card-filter.component.html b/Mohem/src/app/hmg-common/ui/card-filter/card-filter.component.html index 3865efe3..94ab6876 100644 --- a/Mohem/src/app/hmg-common/ui/card-filter/card-filter.component.html +++ b/Mohem/src/app/hmg-common/ui/card-filter/card-filter.component.html @@ -3,3 +3,5 @@ {{value}} {{text}}
+ + diff --git a/Mohem/src/app/hmg-common/ui/circle-calendar/date-info-modal/date-info-modal.component.html b/Mohem/src/app/hmg-common/ui/circle-calendar/date-info-modal/date-info-modal.component.html index 1715fb1c..046d138b 100644 --- a/Mohem/src/app/hmg-common/ui/circle-calendar/date-info-modal/date-info-modal.component.html +++ b/Mohem/src/app/hmg-common/ui/circle-calendar/date-info-modal/date-info-modal.component.html @@ -8,9 +8,9 @@

{{percentage}}

- Completed



+ {{ts.trPK('attendance','completed')}}



- +
@@ -35,7 +35,9 @@ - + + +

{{shiftTime}}

{{ts.trPK('attendance-tracking','shift-time')}}

@@ -50,7 +52,7 @@
- +

{{startDate}}

{{ts.trPK('attendance-tracking','check-in')}}

@@ -65,13 +67,12 @@
- +

{{lateIn}}

{{ts.trPK('attendance-tracking','late-in')}}

-

{{excess}}

@@ -79,7 +80,7 @@
- +

{{shortage}}

{{ts.trPK('attendance-tracking','shortage')}}

diff --git a/Mohem/src/app/hmg-common/ui/circle-calendar/date-info-modal/date-info-modal.component.scss b/Mohem/src/app/hmg-common/ui/circle-calendar/date-info-modal/date-info-modal.component.scss index 7f648459..096e04ab 100644 --- a/Mohem/src/app/hmg-common/ui/circle-calendar/date-info-modal/date-info-modal.component.scss +++ b/Mohem/src/app/hmg-common/ui/circle-calendar/date-info-modal/date-info-modal.component.scss @@ -23,12 +23,57 @@ } } +.result-text-container-ar { + padding: 0; + margin: 0; + position: absolute; + left: 38%; + top: 67%; + display: block; + text-align: center; + -webkit-transform: translate(-50%, -50%); + transform: translate(-50%, -50%); + + h2 { + + font-size: 25px; + + // font-family: WorkSans-Bold; + font-weight: bold; + + margin: 0 auto; + + line-height: 36px; + + } + + span { + + width: 125px; + + display: block; + + margin: 0 auto; + + font-size: 12px; + + font-family: workSans-Regular; + color: rgb(163, 163, 163) !important; + } +} .today-graph{ display: block; height: 127px; width: 270px; margin-left: -60px; } +.today-graph-ar{ + display: block; + height: 127px; + width: 270px; + /* margin-left: -61px; */ + margin-right: -18px; +} .amountlabel{ color: black !important; font-weight: bold !important; @@ -54,10 +99,13 @@ height: 360px !important; } .liftcol{ - // padding-top: 1px !important; - // padding-bottom: 1px !important; border-right: 1px solid rgb(163, 163, 163) !important; } + .liftcol-ar{ + + border-left: 1px solid rgb(163, 163, 163) !important; + } + .rightcol{ @@ -74,6 +122,12 @@ height: 360px !important; border-radius: 10px; margin-bottom:10px; } + .div-ar{ + border: 1px solid #a3a3a3 !important; + border-radius: 9px; + width: 264%; + margin-right: -302px; + } .p0{ margin-bottom: -13px !important; color: black !important; @@ -114,8 +168,23 @@ height: 360px !important; display: block; width: 100%; } - .p4{ - margin-bottom: 56px !important; + + .p2-ar{ font-weight: bold !important; + font-size: 17px !important; + margin-bottom: 43px !important; + margin-top: 0px !important; + color: black !important; + font-weight: bold !important; + margin-right: 33px; + } + .p3-ar{ /* margin-bottom: -72px !important; */ + color: black !important; + font-weight: bold !important; + font-size: 19px; + margin-top: -43px; + margin-right: 27px; + } + .p4{ margin-bottom: 56px !important; margin-top: -26px !important; color: black !important; } @@ -133,4 +202,19 @@ height: 360px !important; padding-bottom: 21px; border-bottom-left-radius: 5px; border-bottom-right-radius: 5px; - } \ No newline at end of file + } + .col{ + border-bottom: 1px solid rgb(204, 204, 204); + border-right: 1px solid rgb(204, 204, 204); + flex: 0 0 calc(calc(6 / var(--ion-grid-columns, 12)) * 100%); + width: calc(calc(6 / var(--ion-grid-columns, 12)) * 100%); + max-width: calc(calc(6 / var(--ion-grid-columns, 12)) * 100%); + } + .col-ar{ + border-bottom: 1px solid rgb(204, 204, 204); + border-left: 1px solid rgb(204, 204, 204); + flex: 0 0 calc(calc(6 / var(--ion-grid-columns, 12)) * 100%); + width: calc(calc(6 / var(--ion-grid-columns, 12)) * 100%); + max-width: calc(calc(6 / var(--ion-grid-columns, 12)) * 100%); + } + \ No newline at end of file diff --git a/Mohem/src/app/hmg-common/ui/circle-calendar/date-info-modal/date-info-modal.component.ts b/Mohem/src/app/hmg-common/ui/circle-calendar/date-info-modal/date-info-modal.component.ts index 1cc15754..f40342f9 100644 --- a/Mohem/src/app/hmg-common/ui/circle-calendar/date-info-modal/date-info-modal.component.ts +++ b/Mohem/src/app/hmg-common/ui/circle-calendar/date-info-modal/date-info-modal.component.ts @@ -36,7 +36,7 @@ export class DateInfoModalComponent implements OnInit { nameMonth: any; nameDay: any; public weekDaysEn = ['Sunday', 'Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', 'Saturday']; - + public direction: string; public options = { cutoutPercentage: 85, tooltips: { enabled: false }, @@ -52,7 +52,9 @@ export class DateInfoModalComponent implements OnInit { public modalController: ModalController, public navParams: NavParams, public ts: TranslatorService - ) { } + ) { + this.direction = TranslatorService.getCurrentDirection(); + } ngOnInit() { console.log(this.TODAYDATE); diff --git a/Mohem/src/app/hmg-common/ui/services-button/services-button.component.html b/Mohem/src/app/hmg-common/ui/services-button/services-button.component.html index cd667c87..3bb77db7 100644 --- a/Mohem/src/app/hmg-common/ui/services-button/services-button.component.html +++ b/Mohem/src/app/hmg-common/ui/services-button/services-button.component.html @@ -1,7 +1,11 @@
- - + + + + + +

{{title}}

diff --git a/Mohem/src/app/hmg-common/ui/services-button/services-button.component.ts b/Mohem/src/app/hmg-common/ui/services-button/services-button.component.ts index bdc3b3b1..5b1d9f4c 100644 --- a/Mohem/src/app/hmg-common/ui/services-button/services-button.component.ts +++ b/Mohem/src/app/hmg-common/ui/services-button/services-button.component.ts @@ -17,6 +17,9 @@ export class ServicesButtonComponent implements OnInit { @Input() disabled = false; public direction: string; public style: any; + + public myTeamIcon="assets/icon/new-design/leave_balance.png"; + public vacationRuleIcon="assets/icon/new-design/vacation_rules_icon.png" constructor( public ts: TranslatorService ) {} diff --git a/Mohem/src/app/home/home.page.html b/Mohem/src/app/home/home.page.html index a9ac7a02..76e163fa 100644 --- a/Mohem/src/app/home/home.page.html +++ b/Mohem/src/app/home/home.page.html @@ -1,9 +1,11 @@ - DASHBOARD -
- + {{'home,dashboard' | translate}} +
+
+
+
@@ -40,10 +42,10 @@ -

Monthly Attendance

- View your Monthly Time Sheet - - View Detail +

{{'home,monthly-attendance' | translate}}

+ {{'home,monthly-time-sheet-view' | translate}} + + {{'home,view-detail' | translate}}
@@ -65,18 +67,19 @@ + [title]="vacationRuleTitle" + > - +
- Time Left Today + {{'home,time-left' | translate}} { this.userImage = this.sanitizer.bypassSecurityTrustUrl( 'data:Image/*;base64,' + displayImg ); - console.log('html saved img: ' + this.userImage); }); } ngOnInit() { - this.menu.enable(true) - + this.direction = TranslatorService.getCurrentLanguageName(); + // this.getUserDetails(); + // this.getCount(); + // this.events.subscribe('getNotCount', badge => { + // this.notBadge = badge; + // }); + this.myTeamTitle= this.ts.trPK('myTeam','myTeam-header'); + this.vacationRuleTitle = this.ts.trPK('vacation-rule','vacationRule'); + // this.myTeamIcon="assets/icon/new-design/leave_balance.png"; + // this.vacationRuleIcon="assets/icon/new-design/vacation_rules_icon.png" + this.common.startLoading(); + this.menu.enable(true); // this.getUserDetails(); // this.getCount(); this.events.subscribe('getNotCount', badge => { @@ -182,6 +171,7 @@ export class HomePage implements OnInit { } ionViewWillEnter() { + this.common.startLoading(); this.remainingTime = 0; this.displayTime = '00:00:00'; this.runTimer = false; @@ -320,9 +310,9 @@ export class HomePage implements OnInit { this.userData, AuthenticatedUser.SHARED_DATA ); - if(this.common.getUpdateImage().status){ - this.userImage =this.sanitizer.bypassSecurityTrustUrl("data:image/png;base64,"+this.common.getUpdateImage().img); - }else{ + if (this.common.getUpdateImage().status) { + this.userImage = this.sanitizer.bypassSecurityTrustUrl('data:image/png;base64,' + this.common.getUpdateImage().img); + } else { this.userImage = user.EMPLOYEE_IMAGE ? 'data:image/png;base64,' + user.EMPLOYEE_IMAGE : this.userImage; @@ -341,6 +331,7 @@ export class HomePage implements OnInit { this.showOpenMissingSwipes(); this.showAttendanceTracking(); this.getAccrualBalance(); + // this.common.stopLoading(); } public Vacation_Rule() { @@ -348,7 +339,7 @@ export class HomePage implements OnInit { } private getMenu() { - this.menuService.getMenu().subscribe((result: MenuResponse) => { + this.menuService.getMenu('', '', this.isPostNoLoad).subscribe((result: MenuResponse) => { this.handleMenuResult(result); }); } @@ -356,7 +347,6 @@ export class HomePage implements OnInit { private handleMenuResult(result) { if (this.common.validResponse(result)) { if (this.common.hasData(result.List_Menu)) { - console.log('list menu'); this.menuList = result.List_Menu; this.getMenuDetails(); } @@ -376,15 +366,15 @@ export class HomePage implements OnInit { const selMenu: MenuResponse = new MenuResponse(); selMenu.List_Menu = item; selMenu.userid = this.userData.EMPLOYEE_NUMBER; - console.log("menu: " + selMenu.List_Menu); this.common.sharedService.setSharedData(selMenu, MenuResponse.SHARED_DATA); this.getMenuEntries(item); - for(let i=0;i { this.handleMenuEntiresResult(result); }); @@ -446,9 +435,8 @@ export class HomePage implements OnInit { sortMenuEntires(list) { const tree = this.common.list_to_tree(list); this.menuEntries = tree; - console.log(this.menuEntries); - this.common.sharedService.setSharedData(tree, "menuEntries"); - this.common.sharedService.setSharedData("home", "homemenuentries"); + this.common.sharedService.setSharedData(tree, 'menuEntries'); + this.common.sharedService.setSharedData('home', 'homemenuentries'); // this.common.navigateForward("/eit/homepage"); // this.common.openEITPage(); } @@ -456,24 +444,26 @@ export class HomePage implements OnInit { private handleMenuEntiresResult(result) { if (this.common.validResponse(result)) { if (this.common.hasData(result.GetMenuEntriesList)) { - for(let i=0;i { - console.log("Error", err); + console.log('Error', err); }); } @@ -513,14 +503,13 @@ export class HomePage implements OnInit { request.QRValue = this.scannedResult.text; request.UID = this.deviceID; request.UserName = this.userData.EMPLOYEE_NUMBER; - console.log(JSON.stringify(request)); this.attendanceService .attendanceSwipeScanner(request, () => { - console.log("Error inside in swipe attendance"); + console.log('Error inside in swipe attendance'); }) .subscribe((result: Response) => { if (this.common.validResponse(result)) { - this.common.presentAlert(this.ts.trPK("home", "swipeAlertSuccess")); + this.common.presentAlert(this.ts.trPK('home', 'swipeAlertSuccess')); this.showAttendanceTracking(); } // else { @@ -533,8 +522,7 @@ export class HomePage implements OnInit { this.common.openProfile(); } - /*************************************Dashboards Services**********************************************************8 */ - + // Dashboard Services showOrganizationSalaries() { this.DS.getOrganizationSalaries().subscribe( (result: OrganizationSalariesResponse) => {} @@ -542,10 +530,10 @@ export class HomePage implements OnInit { } showOpenMissingSwipes() { - this.DS.getOpenMissingSwipes().subscribe( + this.DS.getOpenMissingSwipes('', '', this.isPostNoLoad).subscribe( (result: OpenMissingSwipesResponse) => { if (this.common.validResponse(result)) { - const key = "GetOpenMissingSwipesList"; + const key = 'GetOpenMissingSwipesList'; this.statsButtons[1].statsValue = Math.floor(result[key].P_OPEN_MISSING_SWIPES); } } @@ -567,7 +555,6 @@ export class HomePage implements OnInit { } convertAndAssignTime(data) { - console.log(data); this.remainingTime = this.convertInSeconds(data.P_REMAINING_HOURS.split(':')); this.scheduledTime = this.convertInSeconds(data.P_SCHEDULED_HOURS.split(':')); this.spentHours = this.convertInSeconds(data.P_SPENT_HOURS.split(':')); @@ -581,7 +568,7 @@ showAttendanceTracking() { const request = { P_SELECTED_EMPLOYEE_NUMBER: this.userData.EMPLOYEE_NUMBER }; - this.DS.getAttendanceTracking(request).subscribe((result: AttendanceTrackingResponse) => { + this.DS.getAttendanceTracking(request, '', '', this.isPostNoLoad).subscribe((result: AttendanceTrackingResponse) => { if (this.common.validResponse(result)) { const key = 'GetAttendanceTrackingList'; this.convertAndAssignTime(result[key]); @@ -598,10 +585,7 @@ openPeriodDateDashbored() { } openNotificationsDashbored() { - // work list - this.DS.getOpenNotifications(() => { - console.log("Error "); - }).subscribe((result: GetOpenNotificationsResponse) => { + this.DS.getOpenNotifications('', '', this.isPostNoLoad).subscribe((result: GetOpenNotificationsResponse) => { if (this.common.validResponse(result)) { const key = 'P_OPEN_NTF_NUMBER'; this.countAllNotification = result[key]; @@ -615,18 +599,19 @@ openPeriodDateDashbored() { } ITGCountAllNotification() { - this.workListService.getITGDetails().subscribe((result: any) => { + this.workListService.getITGDetails('', '', this.isPostNoLoad).subscribe((result: any) => { this.statsButtons[0].statsValue = Math.floor(this.countAllNotification + result.TotalCount); + this.common.stopLoading(); }); } getSubordinatesLeaves() { const request: GetSubordinatesLeavesRequest = new GetSubordinatesLeavesRequest(); - request.P_DATE_FROM = "/Date(1578603600000+0300)/"; // test - request.P_DATE_TO = "/Date(1576011600000+0300)/"; // test + request.P_DATE_FROM = '/Date(1578603600000+0300)/'; // test + request.P_DATE_TO = '/Date(1576011600000+0300)/'; // test this.DS.getSubordinatesLeaves(request, () => { - console.log("Error "); + console.log('Error '); }).subscribe((result: GetSubordinatesLeavesResponse) => { if (this.common.validResponse(result)) { console.log('response'); @@ -637,10 +622,10 @@ openPeriodDateDashbored() { getSubordinatesAttStatus() { const request: GetSubordinatesAttdStatusRequest = new GetSubordinatesAttdStatusRequest(); - request.P_SCHEDULE_DATE_FROM = "/Date(1578603600000+0300)/"; // test - request.P_SCHEDULE_DATE_TO = "/Date(1576011600000+0300)/"; // test + request.P_SCHEDULE_DATE_FROM = '/Date(1578603600000+0300)/'; // test + request.P_SCHEDULE_DATE_TO = '/Date(1576011600000+0300)/'; // test this.DS.getSubordinatesAttStatus(request, () => { - console.log("Error "); + console.log('Error '); }).subscribe((result: GetSubordinatesAttdStatusResponse) => { if (this.common.validResponse(result)) { console.log('response'); @@ -650,7 +635,7 @@ getSubordinatesAttStatus() { } openPage(subMenu) { - console.log("openPage"); + console.log(subMenu); let selMenu: MenuResponse = new MenuResponse(); selMenu = this.common.sharedService.getSharedData( MenuResponse.SHARED_DATA, @@ -681,41 +666,28 @@ getSubordinatesAttStatus() { const day = today.getDate(); const month = today.getMonth() + 1; const year = today.getFullYear(); - const todayDate = month + "/" + day + "/" + year; + const todayDate = month + '/' + day + '/' + year; const effectiveDate = todayDate; const request = { P_SELECTED_EMPLOYEE_NUMBER: this.userData.EMPLOYEE_NUMBER, P_EFFECTIVE_DATE: effectiveDate }; - this.accrualService.getAccrualBalances(request).subscribe((result: any) => { + this.accrualService.getAccrualBalances(request, '', '', this.isPostNoLoad).subscribe((result: any) => { if (this.common.validResponse(result)) { let totalTicketsLeft = 0; this.accrualBalancesList = result.GetAccrualBalancesList; for (const accrualBalance of result.GetAccrualBalancesList) { - if ( - accrualBalance.ACCURAL_PLAN_NAME === - "HMG Annual Vacation Accrual Plan" - ) { + if (accrualBalance.ACCURAL_PLAN_NAME === 'HMG Annual Vacation Accrual Plan') { this.statsButtons[2].statsValue = Math.floor(accrualBalance.ACCRUAL_NET_ENTITLEMENT); - this.common.sharedService.setSharedData( - accrualBalance, - "leaveAccrualBalance" - ); - this.common.sharedService.setSharedData( - request, - "leaveAccrualBalanceDate" - ); - this.common.sharedService.setSharedData( - this.accrualBalancesList, - "tickitsbalance" - ); + this.common.sharedService.setSharedData(accrualBalance, 'leaveAccrualBalance'); + this.common.sharedService.setSharedData(request, 'leaveAccrualBalanceDate'); + this.common.sharedService.setSharedData(this.accrualBalancesList, 'tickitsbalance'); } else { - totalTicketsLeft = - totalTicketsLeft + accrualBalance.ACCRUAL_NET_ENTITLEMENT; + totalTicketsLeft = totalTicketsLeft + accrualBalance.ACCRUAL_NET_ENTITLEMENT; } } - this.statsButtons[3].statsValue = Math.floor(totalTicketsLeft); + this.statsButtons[3].statsValue = Math.floor(totalTicketsLeft); } }); } @@ -730,14 +702,18 @@ openProfilePage() { openStatsButton(link: any) { - // console.log(link); - if (link == "1") { + // tslint:disable-next-line: triple-equals + if (link == '1') { + this.common.startLoading(); this.common.openNotificationPage(); - } else if (link == "2") { + // tslint:disable-next-line: triple-equals + } else if (link == '2') { this.openPage(this.missingSwipeRequestObject); - } else if (link == "3") { + // tslint:disable-next-line: triple-equals + } else if (link == '3') { this.openPage(this.leaveRequestObject); - } else if (link =="4") { + // tslint:disable-next-line: triple-equals + } else if (link == '4') { this.openPage(this.ticketRequestObject); } } diff --git a/Mohem/src/app/my-team/home/home.component.html b/Mohem/src/app/my-team/home/home.component.html index 76a56be7..73b200a7 100644 --- a/Mohem/src/app/my-team/home/home.component.html +++ b/Mohem/src/app/my-team/home/home.component.html @@ -1,9 +1,10 @@ + {{ts.trPK('myTeam','myTeam-header')}} - + + - {{ts.trPK('myTeam','myTeam-header')}} @@ -57,7 +58,7 @@
- Clear Search + {{ts.trPK('work-list','clear-search')}} diff --git a/Mohem/src/app/my-team/home/home.component.scss b/Mohem/src/app/my-team/home/home.component.scss index 650979e9..e9b398a2 100644 --- a/Mohem/src/app/my-team/home/home.component.scss +++ b/Mohem/src/app/my-team/home/home.component.scss @@ -3,13 +3,14 @@ ion-title{ position: absolute; top: 0; text-align: center; - left: 15%; - right: 15%; + left: 4%; + right: 4%; font-size: 0.42cm; font-weight: bold; height: 100%; } + .contentBg{ padding: 0px 20px; } diff --git a/Mohem/src/app/notification/home/home.component.html b/Mohem/src/app/notification/home/home.component.html index c3c49c4a..f7ddcbba 100644 --- a/Mohem/src/app/notification/home/home.component.html +++ b/Mohem/src/app/notification/home/home.component.html @@ -3,24 +3,23 @@ - WORK LIST + {{ts.trPK('home','worklist')}} -
- Open Request Analysis + {{ts.trPK('work-list','open-analysis')}}
- {{newWorkListResponse.length + ITGCount}} of + {{newWorkListResponse.length + ITGCount}} {{ts.trPK('work-list','of')}} {{newWorkListResponse.length}} of

{{totalRequestCount}}

{{newWorkListResponse[0].NO_OF_ROWS + ITGCount}}

{{newWorkListResponse[0].NO_OF_ROWS}}

- TOTAL
OPEN REQUEST
+ {{ts.trPK('work-list','total')}}
{{ts.trPK('work-list','open-reqest')}}
@@ -42,17 +41,14 @@ - Clear Search + {{ts.trPK('work-list','clear-search')}} - Advanced Search + {{ts.trPK('work-list','advanced-search')}} - @@ -67,16 +63,15 @@
-
+
- {{formattedData.date}} + {{formattedData.date}}

{{workList.SUBJECT}}

-
@@ -98,9 +93,8 @@
-
- No Data Available + {{ts.trPK('work-list','No-data-available')}}
@@ -108,6 +102,4 @@ - - diff --git a/Mohem/src/app/notification/home/home.component.scss b/Mohem/src/app/notification/home/home.component.scss index 9c0e235d..a8b8716b 100644 --- a/Mohem/src/app/notification/home/home.component.scss +++ b/Mohem/src/app/notification/home/home.component.scss @@ -1,421 +1,459 @@ +.bar-stable { + background-color: var(--cusgray) !important; + } + .tabs{ + background-color: var(--cusgray) !important; + } + .icon-size-lg { + font-size: 40px; + } + + /*Timeline*/ + + .pos-absolute-right { + position: absolute; + right: 8px; + } + + .timelineMain { + position: relative; + margin: 15px 0 0 0; + } + + .timelineMain:before { + + content: ''; + position: absolute; + top: 0; + bottom: 0; + width: 1.5%; + height: 99%; + background: #e4e4e4; + z-index: 1; + /* margin-left: -10px; */ + /* z-index: 1; */ + } + + .timelineMain .timelineMain-thumb { + + border-radius: 500px; + width: 50px; + z-index: 2; + position: absolute; + // :root[dir="ltr"]{ + // left: 37px; + // } + // :root[dir="rtl"]{ + // right: 37px; + // } + width: 50px; + float: right; + top: 0px; + } + + .timelineMain .timelineMain-thumb.timelineMain-icon { + height: 50px; + // text-align: center; + // color: white; + // border: 5px solid #CBD0D3; + transform: scale(0.3); + } + - .bar-stable { - background-color: var(--cusgray) !important; - } - .tabs{ - background-color: var(--cusgray) !important; - } - .icon-size-lg { - font-size: 40px; - } - - /*Timeline*/ - - .pos-absolute-right { - position: absolute; - right: 8px; - } - - .timelineMain { - position: relative; - margin: 15px 0 0 0; - } - - .timelineMain:before { - - content: ''; - position: absolute; - top: 0; - bottom: 0; - width: 1.5%; - height: 99%; - background: #e4e4e4; - z-index: 1; - /* margin-left: -10px; */ - /* z-index: 1; */ - } - - .timelineMain .timelineMain-thumb { - - border-radius: 500px; - width: 50px; - z-index: 2; + + .timelineMain .timelineMain-item { + width: 50px; + + } + + .timelineMain .timelineMain-stats { + position: relative; + font-size: 12px; + color: var(--darkgray); + + } + + + .divider-title { + background: #e4e4e4; + padding: 5px 15px; + } + + + .color-red { + color: var(--danger) !important; + } + + .bg-color-dot { + // background-color: #ff3b30 !important; + background: var(--primary); + background: -moz-linear-gradient(45deg, var(--primary) 0%, var(--secondary) 36%,var(--secondary) 59%, var(--customnavy) 100%); + background: -webkit-linear-gradient(45deg, var(--primary) 0%, var(--secondary) 36%,var(--secondary) 59%, var(--customnavy) 100%); + background: linear-gradient(45deg, var(--primary) 0%, var(--secondary) 36%,var(--secondary) 59%, var(--customnavy) 100%); + + + } + +.notification-list{ +background: none; +ion-item{ + // margin-top: 5px; + // margin-bottom: 5px; + + background-color: transparent; + .item-date{ + width: 100%; + font-size: 16px; + font-weight: bold; + + text-align: start; + padding: 0; + margin: 0; + position: absolute; + left: 0; + top: 12%; + } + ion-label , [item-end]{ + + white-space: normal; + font-size: 14px; + padding-top: 15%; // :root[dir="ltr"]{ - // left: 37px; + // margin-left: 10px; // } // :root[dir="rtl"]{ - // right: 37px; + // margin-right: 10px; // } - width: 50px; - float: right; - top: 0px; - } - - .timelineMain .timelineMain-thumb.timelineMain-icon { - height: 50px; - // text-align: center; - // color: white; - // border: 5px solid #CBD0D3; - transform: scale(0.3); - } - - - - .timelineMain .timelineMain-item { - width: 50px; - - } - - .timelineMain .timelineMain-stats { - position: relative; - font-size: 12px; - color: var(--darkgray); - - } - - - .divider-title { - background: #e4e4e4; - padding: 5px 15px; - } - - - .color-red { - color: var(--danger) !important; - } - - .bg-color-dot { - // background-color: #ff3b30 !important; - background: var(--primary); - background: -moz-linear-gradient(45deg, var(--primary) 0%, var(--secondary) 36%,var(--secondary) 59%, var(--customnavy) 100%); - background: -webkit-linear-gradient(45deg, var(--primary) 0%, var(--secondary) 36%,var(--secondary) 59%, var(--customnavy) 100%); - background: linear-gradient(45deg, var(--primary) 0%, var(--secondary) 36%,var(--secondary) 59%, var(--customnavy) 100%); - - - } - -.notification-list{ - background: none; - ion-item{ - // margin-top: 5px; - // margin-bottom: 5px; - - background-color: transparent; - .item-date{ - width: 100%; - font-size: 16px; - font-weight: bold; - - text-align: start; - padding: 0; - margin: 0; - - position: absolute; - left: 0; - top: 12%; - } - ion-label , [item-end]{ - white-space: normal; - font-size: 14px; - padding-top: 15%; - // :root[dir="ltr"]{ - // margin-left: 10px; - // } - // :root[dir="rtl"]{ - // margin-right: 10px; - // } - - } - } + +} } .input-wrapper { - --flex:none; +--flex:none; } ion-input ,ion-datetime{ - border-bottom: #dedede 1px solid; +border-bottom: #dedede 1px solid; } .left { - --background: #f0efef; - .timelineMain:before{ - left: 21px; +--background: #f0efef; +.timelineMain:before{ +left: 21px; +} +.notification-list ion-item{ + padding-left: 3px; + margin-left: -12%; +} +.timelineMain-thumb{ + left: 9%; + top: 30%; +} + +} +.right { + --background: #f0efef; +.timelineMain:before{ + right: 62px; } .notification-list ion-item{ - padding-left: 3px; - margin-left: -12%; + padding-right: 3px; } .timelineMain-thumb{ - left: 9%; - top: 30%; + right: 37px; } - -} -.right { - --background: #f0efef; - .timelineMain:before{ - right: 62px; - } - .notification-list ion-item{ - padding-right: 3px; - } - .timelineMain-thumb{ - right: 37px; - } } .menuList{ - margin-left: -40px; - height: 160%; - padding-top: 370%; - } - .colorBG{ - --background: #f0efef; - } +margin-left: -40px; +height: 160%; +padding-top: 370%; +} +.colorBG{ +--background: #f0efef; +} .menuListCol{ - padding-left: 50px; - margin-left: -33px; +padding-left: 50px; +margin-left: -33px; } .menuListItem{ - padding-top: 9%; - margin: -20%; - padding-left: 13%; +padding-top: 9%; +margin: -20%; +padding-left: 13%; } .menuListBtn{ - width: 100%; - background: white; - --background: white; +width: 100%; +background: white; +--background: white; } .activeTabMenu{ - --background: #ff726f; +--background: #ff726f; } .notifincationList{ - margin-left: 5%; - margin-top: 6%; +margin-left: 5%; +margin-top: 6%; } .itemListNotification{ - padding-bottom: 18px; +padding-bottom: 18px; } .footerSearchBtn{ - padding: 0px !important; - background: #f0efef !important; +padding: 0px !important; +background: #f0efef !important; } .viewAndSearch{ - margin-bottom: 13px; +margin-bottom: 13px; } .toSearchBtn{ - margin-top: 4%; +margin-top: 4%; } .emptyItem{ - white-space: normal; - padding-left: 10%; +white-space: normal; +padding-left: 10%; } ///////////////////////////////////////////NEW DESIGN///////////////////////////////////// .profile-image-container{ - position: relative; - z-index: 999; - img { - width: 32px; - float: right; - border-radius: 20px; - height: 32px; - margin-right: 10px; - } +position: relative; +z-index: 999; +img { + width: 32px; + float: right; + border-radius: 20px; + height: 32px; + margin-right: 10px; +} } ion-title{ - color: white; - position: absolute; - top: 0; - text-align: center; - left: 15%; - right: 15%; - font-size: 0.42cm; - font-weight: bold; - height: 100%; +color: white; +position: absolute; +top: 0; +text-align: center; +left: 15%; +right: 15%; +font-size: 0.42cm; +font-weight: bold; +height: 100%; } .contentBg:before { - position: absolute; - content: ""; - background: #22c6b3; - height: 140px; - width: 100%; - left: 0; - top: 0px; - z-index: 1; +position: absolute; +content: ""; +background: #22c6b3; +height: 140px; +width: 100%; +left: 0; +top: 0px; +z-index: 1; } ion-content { - --ion-background-color: whitesmoke; +--ion-background-color: whitesmoke; } .request-heading { - span { - text-align: center; - display: block; - padding-top: 8px; - font-family: workSans-Regular; - } +span { + text-align: center; + display: block; + padding-top: 8px; + font-family: workSans-Regular; +} } .result-graph { - position: relative; - background: white; - margin-right: 20px; - margin-left: 20px; - margin-top: 20px; - padding-bottom: 20px; - border-radius: 20px; - z-index: 1; - } - .result-text-container { - padding: 0; - margin: 0; - position: absolute; - left: 50%; - top: 50%; +position: relative; +background: white; +margin-right: 20px; +margin-left: 20px; +margin-top: 20px; +padding-bottom: 20px; +border-radius: 20px; +z-index: 1; +} +.result-text-container { +padding: 0; +margin: 0; +position: absolute; +left: 50%; +top: 50%; +display: block; +text-align: center; +transform: translate(-50%, -50%); +h2 { + font-size: 38px; + font-family: WorkSans-Bold; + margin: 0 auto; + line-height: 36px; +} +span { + width: 125px; display: block; - text-align: center; - transform: translate(-50%, -50%); - h2 { - font-size: 38px; - font-family: WorkSans-Bold; - margin: 0 auto; - line-height: 36px; - } - span { - width: 125px; - display: block; - margin: 0 auto; - font-size: 12px; - font-family: workSans-Regular; - } - } - .today-graph { - width: 100%; - max-height: 4cm; - } + margin: 0 auto; + font-size: 12px; + font-family: workSans-Regular; +} +} +.today-graph { +width: 100%; +max-height: 4cm; +} - .swiper-container { - margin: 0 !important; - width: 100% !important; - } +.swiper-container { +margin: 0 !important; +width: 100% !important; +} .filters-row { - margin-top: 10px; - margin-left: 20px; +margin-top: 10px; +margin-left: 20px; } .work-list-container { +position: relative; +padding-left: 60px; +clear: both; +min-height: 200px; +margin-bottom: 80px; +padding-top: 15px; +} +.work-list-container:before{ +content: ""; +position: absolute; +height: 100%; +width: 4px; +left: 30px; +top: 15px; +background-color: #dddddd; +} +.work-list-container-ar { position: relative; padding-left: 60px; clear: both; min-height: 200px; margin-bottom: 80px; padding-top: 15px; -} -.work-list-container:before{ + } + .work-list-container-ar:before{ content: ""; position: absolute; height: 100%; width: 4px; left: 30px; top: 15px; + right: 6px; background-color: #dddddd; -} + } .search-container{ - margin-top: 15px; - display: block; - padding: 0 20px; - position: relative; - z-index: 99; - ion-col{ - background: white; - border-radius: 12px; - padding-right: 10px; - flex: none; - ion-icon{ - margin-right: 3px; - font-size: 14px; - margin-left: 3px; - vertical-align: middle; - } - span{ - font-size: 12px; - vertical-align: middle; - } +margin-top: 15px; +display: block; +padding: 0 20px; +position: relative; +z-index: 99; +ion-col{ + background: white; + border-radius: 12px; + padding-right: 10px; + flex: none; + ion-icon{ + margin-right: 3px; + font-size: 14px; + margin-left: 3px; + vertical-align: middle; + } + span{ + font-size: 12px; + vertical-align: middle; } } +} .date-span { - position: relative; - display: block; - margin-bottom: 10px; +position: relative; +display: block; +margin-bottom: 10px; } .date-span:before{ - content: ""; - position: absolute; - left: -35px; - border-radius: 50%; - width: 15px; - height: 15px; - background-color: #38c9b3; - top: 1px; +content: ""; +position: absolute; +left: -35px; +border-radius: 50%; +width: 15px; +height: 15px; +background-color: #38c9b3; +top: 1px; } -.date-data{ - background-color: white; - padding: 1px; - border-radius: 20px; - font-family: WorkSans-Regular; - padding-left: 15px; - margin-right: 20px; - margin-bottom: 15px; - p{ - font-size: 14px; + +.date-span-ar{ + position: relative; + display: block; + margin-bottom: 10px; + /* margin-top: 10px; */ + margin-right: 30px; + } + .date-span-ar:before{ + content: ""; + position: absolute; + right: -29px; + border-radius: 50%; + width: 15px; + height: 15px; + background-color: #38c9b3; + top: 1px; } + + + +.date-data{ +background-color: white; +padding: 1px; +border-radius: 20px; +font-family: WorkSans-Regular; +padding-left: 15px; +margin-right: 20px; +margin-bottom: 15px; +p{ + font-size: 14px; +} } .no-data-available { - background: white; - font-family: WorkSans-Regular; - padding: 30px; - position: absolute; - left: 85px; - top: 50px; +background: white; +font-family: WorkSans-Regular; +padding: 30px; +position: absolute; +left: 85px; +top: 50px; } .disable-filter { - pointer-events: none; - opacity: .3; +pointer-events: none; +opacity: .3; } .total-result { - margin-top: 55px; - padding-left: 20px; - color: #888; - font-size: 15px; +margin-top: 55px; +padding-left: 20px; +color: #888; +font-size: 15px; } .text-span{ - font-size: 14px; - color: #888; - background-color: white; - width: 93%; - height: 30px; - border: 1px solid; - border-radius: 15px; +font-size: 14px; +color: #888; +background-color: white; +width: 93%; +height: 30px; +border: 1px solid; +border-radius: 15px; } .text-span-active{ - font-size: 14px; - color: #888; - background-color:#22c6b3; - width: 93%; - height: 30px; - border: 1px solid; - border-radius: 15px; +font-size: 14px; +color: #888; +background-color:#22c6b3; +width: 93%; +height: 30px; +border: 1px solid; +border-radius: 15px; } .slideCss{ - width: 200px !important; -} +width: 200px !important; +} \ No newline at end of file diff --git a/Mohem/src/app/notification/home/home.component.ts b/Mohem/src/app/notification/home/home.component.ts index 7884835f..91d0f40a 100644 --- a/Mohem/src/app/notification/home/home.component.ts +++ b/Mohem/src/app/notification/home/home.component.ts @@ -49,7 +49,8 @@ export class HomeComponent implements OnInit { public noData = false; public isITG = false; public isSearch = false; - public direction = 'ltr'; + // public direction = 'ltr'; + public direction: string; public ITGCount = 0; public ITGSegment: { name: string, code: any, data: any, style: boolean, names?: any }[] = []; public ITGAllItem: any = []; @@ -75,6 +76,7 @@ export class HomeComponent implements OnInit { public totalMR = 0; public showChart = false; + public isPostNoLoad = true; public options = { cutoutPercentage: 80, tooltips: { enabled: false }, @@ -173,6 +175,9 @@ export class HomeComponent implements OnInit { this.worklistNotifications = this.common.sharedService.getSharedData('worklistNotifications', false); } ngOnInit() { + this.direction = TranslatorService.getCurrentLanguageName(); + this.worklistNotifications = this.common.sharedService.getSharedData('worklistNotifications', false); + this.common.startLoading(); this.openNotificationsDashboard(); } @@ -184,7 +189,7 @@ export class HomeComponent implements OnInit { } openNotificationsDashboard() { - this.DS.getOpenNotifications().subscribe((result: GetOpenNotificationsResponse) => { + this.DS.getOpenNotifications('', '', this.isPostNoLoad).subscribe((result: GetOpenNotificationsResponse) => { if (this.common.validResponse(result)) { this.worklistNotifications = result; this.totalRequestCount = this.worklistNotifications.P_OPEN_NTF_NUMBER; @@ -265,6 +270,7 @@ export class HomeComponent implements OnInit { modal.onDidDismiss().then(result => { if (result.data) { if (result.data.notificationType !== '' || result.data.selectedValue !== '' || result.data.itemType !== '') { + this.common.startLoading(); this.showSearchButton = true; this.itemType = result.data.itemType; this.notificationType = result.data.notificationType; @@ -282,6 +288,7 @@ export class HomeComponent implements OnInit { if (this.itemType !== '') { this.disableFilters(); } + this.isPostNoLoad = false; this.getAllPushNotificationFun(); } } @@ -305,7 +312,7 @@ export class HomeComponent implements OnInit { this.WorkListObj.P_SEARCH_SENT_DATE = ''; this.WorkListObj.P_SEARCH_SUBJECT = ''; } - this.WorklistService.getWorkList(this.WorkListObj).subscribe((result) => { + this.WorklistService.getWorkList(this.WorkListObj, '', '', this.isPostNoLoad).subscribe((result) => { if (this.common.validResponse(result)) { this.handleWorkListResult(result.GetWorkList); } @@ -421,6 +428,7 @@ export class HomeComponent implements OnInit { this.showFormattedData = this.sortArray(categorizedWorkListResponse); this.allFormattedData = this.showFormattedData; this.common.sharedService.setSharedData(this.newWorkListResponse, HomeComponent.NOTIFICATION_ARR); + this.common.stopLoading(); } else { this.newWorkListResponse = []; } @@ -458,8 +466,10 @@ export class HomeComponent implements OnInit { } clearSearch() { + this.common.startLoading(); this.itemType = ''; this.selectedFilter = 'ALL'; + this.isPostNoLoad = true; this.disableFilters(); this.resetData(); this.getAllPushNotificationFun(); 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..55721b2a 100644 --- a/Mohem/src/app/notification/service/work-list.main.service.ts +++ b/Mohem/src/app/notification/service/work-list.main.service.ts @@ -240,19 +240,27 @@ export class WorklistMainService { ); } - public getITGCount( onError?: any, errorLabel?: string): Observable { - const request = new Request; - console.log(request) + public getITGCount( onError?: any, errorLabel?: string, isPostNoLoad = false): Observable { + const request = new Request(); this.authService.authenticateRequest(request); - return this.api.post( - WorklistMainService.getITGFormTaskCount, - request, - onError, - errorLabel - ); + if (isPostNoLoad) { + return this.api.postNoLoad( + WorklistMainService.getITGFormTaskCount, + request, + onError, + errorLabel + ); + } else { + return this.api.post( + WorklistMainService.getITGFormTaskCount, + request, + onError, + errorLabel + ); + } } - public getITGFormDetails(request:itgRequest, onError?: any, errorLabel?: string): Observable { + public getITGFormDetails(request: itgRequest, onError?: any, errorLabel?: string): Observable { this.authService.authenticateRequest(request); request.EmployeeNumber = request.P_USER_NAME; console.log(request); @@ -266,16 +274,25 @@ export class WorklistMainService { - public getITGDetails( onError?: any, errorLabel?: string): Observable { - const request = new Request; - console.log(request) + public getITGDetails( onError?: any, errorLabel?: string, isPostNoLoad = false): Observable { + const request = new Request(); + console.log(request); this.authService.authenticateRequest(request); - return this.api.post( - WorklistMainService.getITGFormTaskDetails, - request, - onError, - errorLabel - ); + if (isPostNoLoad) { + return this.api.postNoLoad( + WorklistMainService.getITGFormTaskDetails, + request, + onError, + errorLabel + ); + } else { + return this.api.post( + WorklistMainService.getITGFormTaskDetails, + request, + onError, + errorLabel + ); + } } diff --git a/Mohem/src/app/notification/service/worklist.service.ts b/Mohem/src/app/notification/service/worklist.service.ts index 6dce8f24..2c719e86 100644 --- a/Mohem/src/app/notification/service/worklist.service.ts +++ b/Mohem/src/app/notification/service/worklist.service.ts @@ -22,10 +22,14 @@ export class WorklistService { ) { } - public getWorkList(WorkListReq: any, onError?: any, errorLabel?: string): Observable { + public getWorkList(WorkListReq: any, onError?: any, errorLabel?: string, isPostNoLoad = false): Observable { const request = WorkListReq; this.authService.authenticateRequest(request); - return this.api.post(WorklistService.getWorkList, request, onError, errorLabel); + if (isPostNoLoad) { + return this.api.postNoLoad(WorklistService.getWorkList, request, onError, errorLabel); + } else { + return this.api.post(WorklistService.getWorkList, request, onError, errorLabel); + } } public getReplacmentEmployeeList(ReplacmentEmployeeRequest: any, onError?: any, errorLabel?: string): Observable { diff --git a/Mohem/src/app/notification/work-list-main-itg/work-list-main-itg.component.html b/Mohem/src/app/notification/work-list-main-itg/work-list-main-itg.component.html index fa90523a..41f21f98 100644 --- a/Mohem/src/app/notification/work-list-main-itg/work-list-main-itg.component.html +++ b/Mohem/src/app/notification/work-list-main-itg/work-list-main-itg.component.html @@ -75,7 +75,7 @@
+ [class]="direction == 'en'? 'timeline-thumb-en timeline-icon': 'timeline-thumb-ar timeline-icon'">

{{approvalInfo.Action}}

diff --git a/Mohem/src/app/notification/work-list-main-itg/work-list-main-itg.component.ts b/Mohem/src/app/notification/work-list-main-itg/work-list-main-itg.component.ts index f0c54c8b..189a7245 100644 --- a/Mohem/src/app/notification/work-list-main-itg/work-list-main-itg.component.ts +++ b/Mohem/src/app/notification/work-list-main-itg/work-list-main-itg.component.ts @@ -52,6 +52,7 @@ export class WorkListMainItgComponent implements OnInit { public ExchangeServerDBSelected: any; public actionBTN: { name: string, image: string, isAvailable: boolean }[] = []; index2: number; + direction: string; constructor( public common: CommonService, public ts: TranslatorService, @@ -59,6 +60,7 @@ export class WorkListMainItgComponent implements OnInit { public modalCtrl: ModalController) { } ngOnInit() { + this.direction = TranslatorService.getCurrentLanguageName() this.request_info = this.common.sharedService.getSharedData(HomeComponent.REQUSET_INFO); this.request_name = this.common.sharedService.getSharedData(HomeComponent.REQUSET_NAME); this.all_request = this.common.sharedService.getSharedData(HomeComponent.ALL_REQUEST); diff --git a/Mohem/src/app/notification/worklist-advanced-search/worklist-advanced-search.component.html b/Mohem/src/app/notification/worklist-advanced-search/worklist-advanced-search.component.html index e0b313d3..63dd8f94 100644 --- a/Mohem/src/app/notification/worklist-advanced-search/worklist-advanced-search.component.html +++ b/Mohem/src/app/notification/worklist-advanced-search/worklist-advanced-search.component.html @@ -1,14 +1,14 @@
-

Advanced Search

+

{{ts.trPK('general','sadvanced-search')}}

- {{ts.trPK('worklist','view')}} - {{ts.trPK('worklist','view')}} + {{ts.trPK('worklist','openNot')}} {{ts.trPK('worklist','fyi')}} @@ -19,8 +19,8 @@ - {{ts.trPK('worklist','searchby')}} - {{ts.trPK('worklist','searchby')}} + {{ts.trPK('worklist','from')}} {{ts.trPK('worklist','subject')}} @@ -32,7 +32,7 @@
- {{ts.trPK('worklist','sent')}} + {{ts.trPK('worklist','sent')}} @@ -46,7 +46,7 @@
- Item Type + {{ts.trPK('vacation-rule','itemType')}} HR @@ -57,7 +57,7 @@
- SEARCH + {{ts.trPK('searchForReplacment','search')}}
diff --git a/Mohem/src/app/notification/worklist-advanced-search/worklist-advanced-search.component.scss b/Mohem/src/app/notification/worklist-advanced-search/worklist-advanced-search.component.scss index 36f26405..f842613c 100644 --- a/Mohem/src/app/notification/worklist-advanced-search/worklist-advanced-search.component.scss +++ b/Mohem/src/app/notification/worklist-advanced-search/worklist-advanced-search.component.scss @@ -18,7 +18,7 @@ .search-container { margin-right: 15px; margin-left: 15px; - padding-bottom: 100px; + // padding-bottom: 100px; margin-top: 5px; ion-item{ border: 2px solid #eaeaea; @@ -37,4 +37,10 @@ span{ color: white; } +} +.custom-width{ + max-width: 100% !important; +} +.enable-overflow{ + overflow: visible !important; } \ No newline at end of file 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 b1175b4f..bc353e33 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 @@ -456,7 +456,7 @@
--> -
+
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..17fdaffe 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; + direction: string; @@ -113,7 +114,7 @@ export class WorklistMainMRComponent implements OnInit { private modalCtrl: ModalController, public worklistService: WorklistService ) { - + this.direction = TranslatorService.getCurrentLanguageName() //this.getPassNotificationDetails = this.common.sharedService.getSharedData('passNotificationInfo'); this.WorkListActionHistoryObj = new WorkListActionHistoryRequest(); this.WorkListActionHistoryObj.P_PAGE_NUM = this.P_PAGE_NUM; 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..0daad28e 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 @@ -594,7 +594,7 @@
--> -
+
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..c09b1ab0 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; + direction: string; constructor( @@ -128,6 +129,7 @@ export class WorklistMainPoComponent implements OnInit { private modalCtrl: ModalController, public worklistService: WorklistService, ) { + this.direction = TranslatorService.getCurrentLanguageName() this.WorkListActionHistoryObj = new WorkListActionHistoryRequest(); this.WorkListActionHistoryObj.P_PAGE_NUM = this.P_PAGE_NUM; this.WorkListActionHistoryObj.P_PAGE_LIMIT = this.P_PAGE_LIMIT; 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..9d065530 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 @@ -307,7 +307,7 @@
--> -
+
-
+
{{currentMonth}}

-->
- + + + + + + + +

{{ (showPaySlip.PAYSLIP_CHOICE)?.substring(15,23) }}

+
+ + + +
@@ -78,7 +91,7 @@ [value]="gaugeValue" [label]="gaugeLabel"> --> -
+
-
+

{{GetSummaryOfPaymentList.TOTAL_PAY_AMOUNT}}

@@ -98,12 +111,7 @@
-
+
@@ -113,12 +121,7 @@
-
+
@@ -138,9 +141,9 @@ -
{{ts.trPK('payslip','summary-payment')}}
- -
+ +
+
{{ts.trPK('payslip','summary-payment')}}
@@ -201,8 +204,8 @@
-
{{ts.trPK('payslip','earnings')}}
+
{{ts.trPK('payslip','earnings')}}
@@ -224,8 +227,8 @@
-
{{ts.trPK('payslip','deductions')}}
+
{{ts.trPK('payslip','deductions')}}
@@ -247,14 +250,9 @@
- - + +
{{ts.trPK('payslip','payment-information')}}
@@ -314,4 +312,5 @@
+
\ No newline at end of file diff --git a/Mohem/src/app/payslip/home/home.component.scss b/Mohem/src/app/payslip/home/home.component.scss index 11086df0..2436b969 100644 --- a/Mohem/src/app/payslip/home/home.component.scss +++ b/Mohem/src/app/payslip/home/home.component.scss @@ -117,6 +117,15 @@ --background: transparent !important; + } + .activeArrow-ar{ + height: 26px; + width: 26px; + color: white; + background: transparent !important; + --background: transparent !important; + margin-right: 25px; + } .slidbtn{ background: transparent; @@ -131,12 +140,27 @@ background: transparent !important; --background: transparent !important; } + .disabledArrow-ar{ + height: 26px; + width: 26px; + color: #908d8d; + background: transparent !important; + --background: transparent !important; + margin-right: 3px; + margin-left: -124px; + } .result-graph{ font-size: 14px; margin-left: -48px; margin-right: 3px; } + + .result-graph-ar{ + font-size: 14px; + margin-right: -48px; + margin-left: 3px; + } .headerGrid{ background-color: white !important; border: 1px solid #cac8c8 !important; @@ -150,6 +174,37 @@ padding-right: 21px; } + + .result-text-container-ar { + padding: 0; + margin: 0; + position: absolute; + left: 54%; + top: 50%; + display: block; + text-align: center; + transform: translate(-50%, -50%); + + h2 { + + font-size: 25px; + font-family: WorkSans-Bold; + margin: 0 auto; + line-height: 36px; + + } + + span { + + width: 125px; + display: block; + margin: 0 auto; + font-size: 15px; + font-family: workSans-Regular; + } + } + + .result-text-container { padding: 0; margin: 0; @@ -267,4 +322,36 @@ margin-top: -13px; margin-left: 58px; margin-bottom: 12px; padding-right: 5px; +} +.div-green{ + position: relative; + left: 77%; + bottom: 117px; + color: black; + background-color: #22c6b3; + width: 20%; height: 6px; +} +.div-green-ar{ + position: relative; + // left: 77%; + bottom: 117px; + color: black; + background-color: #22c6b3; + width: 20%; height: 6px; +} +.div-blue{ + position: relative; + left: 77%; + bottom: 67px; + color: black; + background-color: #094875; + width: 20%; height: 6px; +} +.div-blue-ar{ + position: relative; + // left: 77%; + bottom: 67px; + color: black; + background-color: #094875; + width: 20%; height: 6px; } \ No newline at end of file diff --git a/Mohem/src/app/payslip/home/home.component.ts b/Mohem/src/app/payslip/home/home.component.ts index 8f826d99..b43a3bc6 100644 --- a/Mohem/src/app/payslip/home/home.component.ts +++ b/Mohem/src/app/payslip/home/home.component.ts @@ -42,6 +42,7 @@ export class HomeComponent implements OnInit { sliderOne: any; payslipIndex :any; data:any; + public direction: string; @ViewChild('slides') slides: IonSlides; @ViewChild('slideWithNav') slideWithNav: IonSlides; @ViewChild('chart') chart: UIChart; @@ -57,6 +58,7 @@ export class HomeComponent implements OnInit { tooltips: { enabled: false }, legend: { display: false }}; gaugeType = "full"; + // gaugeValue = 11.200; // gaugeLabel = ""; @@ -70,10 +72,13 @@ export class HomeComponent implements OnInit { public cs: CommonService, - ) {} + ) { + this.direction = TranslatorService.getCurrentDirection(); + } ngOnInit() { + this.direction = TranslatorService.getCurrentLanguageName() // this.selEmp = this.common.sharedService.getSharedData( // MenuResponse.SHARED_SEL_EMP, // false 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..47abf5dd 100644 --- a/Mohem/src/app/profile/edit-profile/edit-profile.component.html +++ b/Mohem/src/app/profile/edit-profile/edit-profile.component.html @@ -1,7 +1,7 @@
- +

{{ts.trPK('userProfile','title')}}

@@ -26,16 +26,16 @@
- -
+ +
- -
+ +
- -
+ +
@@ -47,7 +47,7 @@
-

Years of Services

+

{{ts.trPK('userProfile','Years of Services')}}

@@ -58,7 +58,7 @@ {{ts.trPK('userProfile','edit-profile')}} - + @@ -69,7 +69,7 @@ {{ts.trPK('userProfile','performance-evaluation')}} - +
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..2fa4ab18 100644 --- a/Mohem/src/app/profile/edit-profile/edit-profile.component.scss +++ b/Mohem/src/app/profile/edit-profile/edit-profile.component.scss @@ -106,6 +106,18 @@ font-size: 12px; color: white; } + .service-ar{ + font-size: 28px; + color: white; + letter-spacing: 1px; + font-weight: bold; + margin-right: 26px; + } + .services-ar{ + font-size: 14px; + color: white; + margin-right: 25px; + } .list{ margin-left: 14px; @@ -150,4 +162,14 @@ margin-top: 4px; } - \ No newline at end of file + .arrow{ + width: 20px; + height: 22px !important; + } + .arrow-ar{ + float: left; + font-size: 25px; + color: grey; + -webkit-transform: rotate(180deg); + transform: rotate(180deg); + } \ No newline at end of file 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..e57431f8 100644 --- a/Mohem/src/app/profile/edit-profile/edit-profile.component.ts +++ b/Mohem/src/app/profile/edit-profile/edit-profile.component.ts @@ -21,7 +21,7 @@ export class EditProfileComponent implements OnInit { User_name_Emp: string = ""; User_Job_name: string; - + public direction: string; private menu: MenuController; setImage:any; // imageSrc: any = "../assets/imgs/profile.png"; @@ -44,6 +44,7 @@ export class EditProfileComponent implements OnInit { ) { + this.direction = TranslatorService.getCurrentDirection(); this.events.subscribe("img-change", displayImg => { console.log("app compont: "+displayImg); this.user_image = this.sanitizer.bypassSecurityTrustUrl("data:Image/*;base64,"+displayImg); @@ -107,7 +108,7 @@ private handlePerformanceAppraisalResult(result){ this.performanceData=[]; for(let i=0;i --> + + + {{ts.trPK('userProfile','title')}} + + + + +
- +
@@ -32,7 +40,7 @@
-
+
diff --git a/Mohem/src/app/profile/home/home.component.scss b/Mohem/src/app/profile/home/home.component.scss index 4be2aac3..c508d39d 100644 --- a/Mohem/src/app/profile/home/home.component.scss +++ b/Mohem/src/app/profile/home/home.component.scss @@ -50,6 +50,11 @@ ion-col.colBold, ion-col.colBold > label{ top: 80%; left: 65%; } + .changeImgBtn-ar{ + position: absolute; + top: 80%; + left: 74%; + } .profileImg{ width: 160px; height: 160px; diff --git a/Mohem/src/app/profile/home/home.component.ts b/Mohem/src/app/profile/home/home.component.ts index 25192f94..6b1903bb 100644 --- a/Mohem/src/app/profile/home/home.component.ts +++ b/Mohem/src/app/profile/home/home.component.ts @@ -14,6 +14,7 @@ export class HomeComponent implements OnInit { personalInfo: any; setImage:any; imageSrc: any = "../assets/imgs/profile.png"; + public direction: string; // user_image: any = "../assets/imgs/profile.png"; constructor( public ts: TranslatorService, @@ -24,7 +25,7 @@ export class HomeComponent implements OnInit { ) { - + this.direction = TranslatorService.getCurrentDirection(); this.events.subscribe("img-change", displayImg => { // alert("1 - profile home : "+displayImg); //this.user_image = "data:image/png;base64"+displayImg; 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..16e9298b 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,22 @@ + + + + {{ts.trPK('userProfile','performance')}} + + + + + +
- +
- +
@@ -15,12 +25,12 @@
-

Performance Evaluation

- -
+

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

+
- + @@ -55,11 +65,11 @@

- - + +
- - + +
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..03f9c6c2 100644 --- a/Mohem/src/app/profile/performance-evaluation/performance-evaluation.component.scss +++ b/Mohem/src/app/profile/performance-evaluation/performance-evaluation.component.scss @@ -76,6 +76,19 @@ text-align: center; margin-left: 74px; } + .Text-ar{ + margin: 0; + padding: 0; + text-align: center; + font-weight: bolder; + color: black; + font-size: 16px; + margin-top: 5px; + margin-bottom: 10px; + text-align: center; + + margin-right: 131px; + } .leftgrid{ margin-left: 10px; @@ -120,19 +133,37 @@ margin-top: -7px !important; font-weight: bold !important; } +.label-ar{ + font-size: 15px !important; + margin-top: -7px !important; + font-weight: bold !important; +} .labelvalue{ - font-size: 28px !important; + font-size: 25px !important; font-weight: bold !important; margin-top: 7px !important; - margin-left: 72px !important; + margin-left: 90px !important; + +} +.labelvalue-ar{ + + font-size: 24px !important; + font-weight: bold !important; + /* margin-top: 7px !important; */ + margin-right: 19px !important; } + .percentage{ - font-size: 15px !important; + font-size: 19px !important; margin-top: 15px !important; } +.percentage-ar{ + font-size: 19px !important; + margin-right: -54px; +} .gauge{ transform: translate(-24px, -65px); @@ -140,5 +171,11 @@ margin-top: -20px; } +.gauge-ar{ + transform: translate(-24px, -65px); + margin-bottom: -187px; + margin-top: -20px; + margin-right: -56px; +} 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..9c0807ed 100644 --- a/Mohem/src/app/profile/performance-evaluation/performance-evaluation.component.ts +++ b/Mohem/src/app/profile/performance-evaluation/performance-evaluation.component.ts @@ -19,56 +19,61 @@ import { AuthenticatedUser } from "src/app/hmg-common/services/authentication/mo export class PerformanceEvaluationComponent implements OnInit { personalInfo: any; user_image: any = "../assets/imgs/profile.png"; - setImage:any; + setImage: any; view: any = [380, 450]; - public performanceData: any=[]; + public performanceData: any = []; public length; + public direction: string; + // public showText:boolean =false; - - constructor( public ts: TranslatorService, + constructor(public ts: TranslatorService, public cs: CommonService, - public DS :DashboredService, + public DS: DashboredService, public authService: AuthenticationService, - // private events: Events, - // private sanitizer: DomSanitizer, - - ) { - - // this.events.subscribe("img-change", displayImg => { - // console.log("app compont: "+displayImg); - // this.user_image = this.sanitizer.bypassSecurityTrustUrl("data:Image/*;base64,"+displayImg); - - // }); - - - } + // private events: Events, + // private sanitizer: DomSanitizer, + + ) { + this.direction = TranslatorService.getCurrentDirection(); + // this.events.subscribe("img-change", displayImg => { + // console.log("app compont: "+displayImg); + // this.user_image = this.sanitizer.bypassSecurityTrustUrl("data:Image/*;base64,"+displayImg); + // }); + + + } + + + colorScheme = { + domain: ['#22C6B3', '#094875', '#3CB9D5', '#1FA269', '#0D155E'] + }; - colorScheme = { - domain: ['#22C6B3', '#094875','#3CB9D5','#1FA269','#0D155E'] - }; - ngOnInit() { + this.getProfile(); - + this.performanceData = this.cs.sharedService.getSharedData( PerformanceAppraisalResponse.PERFORMANCE_DATA, true ); console.log(this.performanceData.length); - //i % 2 == 0 - this.length=this.performanceData.length; + //i % 2 == 0 + this.length = this.performanceData.length; - for(let i=0;i text").remove(); + } getProfile() { console.log("getProfile"); @@ -78,11 +83,12 @@ export class PerformanceEvaluationComponent implements OnInit { if (user) { this.personalInfo = user; this.user_image = user.EMPLOYEE_IMAGE - ? "data:image/png;base64," + user.EMPLOYEE_IMAGE - : "../assets/imgs/profile.png"; - + ? "data:image/png;base64," + user.EMPLOYEE_IMAGE + : "../assets/imgs/profile.png"; + + + } + }); + } - }}); -} - } 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..22e79717 100644 --- a/Mohem/src/app/profile/profile-image/profile-image.component.html +++ b/Mohem/src/app/profile/profile-image/profile-image.component.html @@ -1,9 +1,11 @@ - + + {{ts.trPK('userProfile','changepicture')}} - + + - {{ts.trPK('userProfile','changepicture')}} +