diff --git a/Mohem/resources/android/icon/drawable-hdpi-icon.png b/Mohem/resources/android/icon/drawable-hdpi-icon.png index 52836c3f..54b41f12 100644 Binary files a/Mohem/resources/android/icon/drawable-hdpi-icon.png and b/Mohem/resources/android/icon/drawable-hdpi-icon.png differ diff --git a/Mohem/resources/android/icon/drawable-ldpi-icon.png b/Mohem/resources/android/icon/drawable-ldpi-icon.png index 8fc379ef..fdeb5010 100644 Binary files a/Mohem/resources/android/icon/drawable-ldpi-icon.png and b/Mohem/resources/android/icon/drawable-ldpi-icon.png differ diff --git a/Mohem/resources/android/icon/drawable-mdpi-icon.png b/Mohem/resources/android/icon/drawable-mdpi-icon.png index 0ade9487..c5d8acd0 100644 Binary files a/Mohem/resources/android/icon/drawable-mdpi-icon.png and b/Mohem/resources/android/icon/drawable-mdpi-icon.png differ diff --git a/Mohem/resources/android/icon/drawable-xhdpi-icon.png b/Mohem/resources/android/icon/drawable-xhdpi-icon.png index 92c4139f..a081a5e2 100644 Binary files a/Mohem/resources/android/icon/drawable-xhdpi-icon.png and b/Mohem/resources/android/icon/drawable-xhdpi-icon.png differ diff --git a/Mohem/resources/android/icon/drawable-xxhdpi-icon.png b/Mohem/resources/android/icon/drawable-xxhdpi-icon.png index 2d82d78e..d5bd60f8 100644 Binary files a/Mohem/resources/android/icon/drawable-xxhdpi-icon.png and b/Mohem/resources/android/icon/drawable-xxhdpi-icon.png differ diff --git a/Mohem/resources/android/icon/drawable-xxxhdpi-icon.png b/Mohem/resources/android/icon/drawable-xxxhdpi-icon.png index 526f775d..dcc4243a 100644 Binary files a/Mohem/resources/android/icon/drawable-xxxhdpi-icon.png and b/Mohem/resources/android/icon/drawable-xxxhdpi-icon.png differ diff --git a/Mohem/resources/android/splash/drawable-land-hdpi-screen.png b/Mohem/resources/android/splash/drawable-land-hdpi-screen.png index 1332bc2a..6ceacd3d 100644 Binary files a/Mohem/resources/android/splash/drawable-land-hdpi-screen.png and b/Mohem/resources/android/splash/drawable-land-hdpi-screen.png differ diff --git a/Mohem/resources/android/splash/drawable-land-ldpi-screen.png b/Mohem/resources/android/splash/drawable-land-ldpi-screen.png index b78e93c2..4830cce5 100644 Binary files a/Mohem/resources/android/splash/drawable-land-ldpi-screen.png and b/Mohem/resources/android/splash/drawable-land-ldpi-screen.png differ diff --git a/Mohem/resources/android/splash/drawable-land-mdpi-screen.png b/Mohem/resources/android/splash/drawable-land-mdpi-screen.png index e3ab5a74..29eaf4a8 100644 Binary files a/Mohem/resources/android/splash/drawable-land-mdpi-screen.png and b/Mohem/resources/android/splash/drawable-land-mdpi-screen.png differ diff --git a/Mohem/resources/android/splash/drawable-land-xhdpi-screen.png b/Mohem/resources/android/splash/drawable-land-xhdpi-screen.png index ce6751f9..d2d6b7a7 100644 Binary files a/Mohem/resources/android/splash/drawable-land-xhdpi-screen.png and b/Mohem/resources/android/splash/drawable-land-xhdpi-screen.png differ diff --git a/Mohem/resources/android/splash/drawable-land-xxhdpi-screen.png b/Mohem/resources/android/splash/drawable-land-xxhdpi-screen.png index 7cb6c5d4..ec997a22 100644 Binary files a/Mohem/resources/android/splash/drawable-land-xxhdpi-screen.png and b/Mohem/resources/android/splash/drawable-land-xxhdpi-screen.png differ diff --git a/Mohem/resources/android/splash/drawable-land-xxxhdpi-screen.png b/Mohem/resources/android/splash/drawable-land-xxxhdpi-screen.png index 5c8d7780..2c09f3e7 100644 Binary files a/Mohem/resources/android/splash/drawable-land-xxxhdpi-screen.png and b/Mohem/resources/android/splash/drawable-land-xxxhdpi-screen.png differ diff --git a/Mohem/resources/android/splash/drawable-port-hdpi-screen.png b/Mohem/resources/android/splash/drawable-port-hdpi-screen.png index 8c6d2884..379f33a8 100644 Binary files a/Mohem/resources/android/splash/drawable-port-hdpi-screen.png and b/Mohem/resources/android/splash/drawable-port-hdpi-screen.png differ diff --git a/Mohem/resources/android/splash/drawable-port-ldpi-screen.png b/Mohem/resources/android/splash/drawable-port-ldpi-screen.png index 3d032253..0109bce7 100644 Binary files a/Mohem/resources/android/splash/drawable-port-ldpi-screen.png and b/Mohem/resources/android/splash/drawable-port-ldpi-screen.png differ diff --git a/Mohem/resources/android/splash/drawable-port-mdpi-screen.png b/Mohem/resources/android/splash/drawable-port-mdpi-screen.png index 7bdff474..07c3fa0f 100644 Binary files a/Mohem/resources/android/splash/drawable-port-mdpi-screen.png and b/Mohem/resources/android/splash/drawable-port-mdpi-screen.png differ diff --git a/Mohem/resources/android/splash/drawable-port-xhdpi-screen.png b/Mohem/resources/android/splash/drawable-port-xhdpi-screen.png index ea1e6d1b..35840dd2 100644 Binary files a/Mohem/resources/android/splash/drawable-port-xhdpi-screen.png and b/Mohem/resources/android/splash/drawable-port-xhdpi-screen.png differ diff --git a/Mohem/resources/android/splash/drawable-port-xxhdpi-screen.png b/Mohem/resources/android/splash/drawable-port-xxhdpi-screen.png index ae12e6d7..8e9472c2 100644 Binary files a/Mohem/resources/android/splash/drawable-port-xxhdpi-screen.png and b/Mohem/resources/android/splash/drawable-port-xxhdpi-screen.png differ diff --git a/Mohem/resources/android/splash/drawable-port-xxxhdpi-screen.png b/Mohem/resources/android/splash/drawable-port-xxxhdpi-screen.png index 61b334b0..92207066 100644 Binary files a/Mohem/resources/android/splash/drawable-port-xxxhdpi-screen.png and b/Mohem/resources/android/splash/drawable-port-xxxhdpi-screen.png differ diff --git a/Mohem/resources/icon.png b/Mohem/resources/icon.png index 47451444..090a851a 100644 Binary files a/Mohem/resources/icon.png and b/Mohem/resources/icon.png differ diff --git a/Mohem/resources/splash.png b/Mohem/resources/splash.png index d2ffd7ad..ba3cdeaf 100644 Binary files a/Mohem/resources/splash.png and b/Mohem/resources/splash.png differ diff --git a/Mohem/src/app/absence/home/home.component.ts b/Mohem/src/app/absence/home/home.component.ts index 83a36c88..adf9377e 100644 --- a/Mohem/src/app/absence/home/home.component.ts +++ b/Mohem/src/app/absence/home/home.component.ts @@ -263,8 +263,8 @@ export class HomeComponent implements OnInit { this.balance = result.GetAccrualBalancesList; } if (this.balance) { - this.accrualNet = this.balance[1].ACCRUAL_NET_ENTITLEMENT; - this.accrualUsed = this.balance[1].ACCRUAL_USED_ENTITLEMENT; + this.accrualNet = this.balance[0].ACCRUAL_NET_ENTITLEMENT; + this.accrualUsed = this.balance[0].ACCRUAL_USED_ENTITLEMENT; // this.accrualYearly = this.balance[0].ACCRUAL_YEARLY_ENTITLEMENT; // this.totalnumber= this.accrualNet + this.accrualUsed + this.accrualYearly; this.totalnumber = this.accrualNet + this.accrualUsed; diff --git a/Mohem/src/app/app.component.html b/Mohem/src/app/app.component.html index 24aa65f7..e50ad5b4 100644 --- a/Mohem/src/app/app.component.html +++ b/Mohem/src/app/app.component.html @@ -99,7 +99,7 @@ --> - + @@ -136,9 +136,20 @@ --> +
+ + +
+ + - + + + @@ -252,7 +263,7 @@ {{ts.trPK('myTeam','help')}}
--> - - - + + @@ -315,9 +321,18 @@ +
+ + +
+ + - + diff --git a/Mohem/src/app/app.component.scss b/Mohem/src/app/app.component.scss index 75d57e83..32a3b0d3 100644 --- a/Mohem/src/app/app.component.scss +++ b/Mohem/src/app/app.component.scss @@ -81,9 +81,9 @@ hr { .logout { - background-color: #99B8C6; + background-color: #c2a16b; border: none; - color: #004D71; + color: #000000; text-align: center; text-decoration: none; display: inline-block; @@ -99,9 +99,9 @@ hr { } .logout-ar { - background-color: #99B8C6; + background-color: #c2a16b; border: none; - color: #004D71; + color: #000000; text-align: center; text-decoration: none; display: inline-block; @@ -293,7 +293,7 @@ button.menu-item.item.item-block.item-ios { .TxtPlace { font-size: 20px; - color: #004D71; + color: #000000; font-weight: bold; text-overflow: ellipsis; overflow: hidden; @@ -305,7 +305,7 @@ button.menu-item.item.item-block.item-ios { .TxtPlaces { font-size: 14px; - color: #004D71; + color: #000000; font-weight: bold; // font-family: 'Inter' !important; text-overflow: ellipsis; @@ -321,8 +321,6 @@ button.menu-item.item.item-block.item-ios { text-align: center; margin: auto; width: 100%; - position: absolute; - top: 40px } @@ -332,10 +330,17 @@ button.menu-item.item.item-block.item-ios { margin: auto; } -.menuFooter .CompanyImg { - width: 65%; - height: 60%; - margin-bottom: -21px; +// .menuFooter .CompanyImg { + // width: 65%; + // height: 60%; + // margin-bottom: -21px; +// } + + +.menuFooter .CompanyImg{ + width: 80%; + height: 80%; + margin-bottom: -21px; } .logoImgWithMyTeam { @@ -351,7 +356,7 @@ button.menu-item.item.item-block.item-ios { .companyTxt { font-size: 12px; - color: #004D71; + color: #000000; text-align: center; font-family: 'Inter' !important; } @@ -363,13 +368,13 @@ ion-thumbnail.menu-thumb { } .changepassword { - color: black !important; + color: #85836f !important; font-weight: bolder !important; } .profile { - color: #5C6F79 !important; + color: #85836f !important; font-weight: bolder !important; } diff --git a/Mohem/src/app/app.component.ts b/Mohem/src/app/app.component.ts index 065f6413..826e5546 100644 --- a/Mohem/src/app/app.component.ts +++ b/Mohem/src/app/app.component.ts @@ -29,7 +29,7 @@ export class AppComponent implements OnInit { menuSide = 'left'; notBadge: number; companyUrl = '../assets/imgs/CSLogo.png'; - companyDesc = ''; + companyDesc = 'Powered By Cloud Solutions'; direction = 'ltr'; User_Job_name: string; public logoutFlage: any = false; @@ -156,7 +156,7 @@ export class AppComponent implements OnInit { localStorage.setItem("digitalIDUser", JSON.stringify(user)); this.digitalIDUser = user//JSON.stringify(user); this.companyUrl = user.CompanyImageURL ? user.CompanyImageURL : '../assets/imgs/CSLogo.png'; - this.companyDesc = user.CompanyImageDescription ? user.CompanyImageDescription : ''; + this.companyDesc = user.CompanyImageDescription ? user.CompanyImageDescription : 'Powered By Cloud Solutions'; this.User_name_Emp = user.EMPLOYEE_DISPLAY_NAME; @@ -205,9 +205,10 @@ export class AppComponent implements OnInit { this.user_image = user.EMPLOYEE_IMAGE ? 'data:image/png;base64,' + user.EMPLOYEE_IMAGE : '../assets/imgs/profile.png'; } // this.User_Job_name = user.JOB_NAME; - let jobTitle = user.POSITION_NAME; + // let jobTitle = user.POSITION_NAME; // if (jobTitle && jobTitle.length > 1) { - this.User_Job_name = jobTitle; + // this.User_Job_name = jobTitle; + this.User_Job_name = user.JOB_NAME; // } //erm channel // if (!CommonService.SKIP) diff --git a/Mohem/src/app/app.module.ts b/Mohem/src/app/app.module.ts index 4f196c0f..bce56c04 100644 --- a/Mohem/src/app/app.module.ts +++ b/Mohem/src/app/app.module.ts @@ -8,16 +8,16 @@ import { StatusBar } from '@ionic-native/status-bar/ngx'; import { AppComponent } from './app.component'; import { AppRoutingModule } from './app-routing.module'; import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; -// import { ZBar } from '@ionic-native/zbar/ngx'; -// import { Geolocation } from '@ionic-native/geolocation/ngx'; +import { ZBar } from '@ionic-native/zbar/ngx'; +import { Geolocation } from '@ionic-native/geolocation/ngx'; import {Camera, CameraOptions, PictureSourceType} from '@ionic-native/Camera/ngx'; import { FilePath } from '@ionic-native/file-path/ngx'; import { File } from '@ionic-native/file/ngx'; import { Base64 } from '@ionic-native/base64/ngx'; import { FirebaseX } from '@ionic-native/firebase-x/ngx'; import { NgCalendarModule } from 'ionic2-calendar'; -// import { NFC, Ndef} from "@ionic-native/nfc/ngx" -// import { WifiWizard2 } from "@ionic-native/wifi-wizard-2/ngx"; +import { NFC, Ndef} from "@ionic-native/nfc/ngx" +import { WifiWizard2 } from "@ionic-native/wifi-wizard-2/ngx"; import { DigitalIdComponent } from './authentication/digital-id/digital-id.component'; import { BusinessCardComponent } from './authentication/business-card/business-card.component'; import { AppUpdateComponent } from './authentication/app-update/app-update.component'; @@ -38,17 +38,17 @@ import { AppUpdateComponent } from './authentication/app-update/app-update.compo providers: [ StatusBar, SplashScreen, - // ZBar, - // Geolocation, + ZBar, + Geolocation, Camera, File, FilePath, Base64, FirebaseX, { provide: RouteReuseStrategy, useClass: IonicRouteStrategy }, - // NFC, - // Ndef, - // WifiWizard2 + NFC, + Ndef, + WifiWizard2 ], bootstrap: [AppComponent] }) diff --git a/Mohem/src/app/attendance/home/home.component.ts b/Mohem/src/app/attendance/home/home.component.ts index fb096330..384e7ba2 100644 --- a/Mohem/src/app/attendance/home/home.component.ts +++ b/Mohem/src/app/attendance/home/home.component.ts @@ -1,6 +1,6 @@ import { Component, OnInit } from '@angular/core'; -// import { Geolocation } from '@ionic-native/geolocation/ngx'; -// import { ZBar, ZBarOptions } from '@ionic-native/zbar/ngx'; +import { Geolocation } from '@ionic-native/geolocation/ngx'; +import { ZBar, ZBarOptions } from '@ionic-native/zbar/ngx'; import { TranslatorService } from 'src/app/hmg-common/services/translator/translator.service'; diff --git a/Mohem/src/app/authentication/confirm-login/confirm-login.component.ts b/Mohem/src/app/authentication/confirm-login/confirm-login.component.ts index d4f09373..ee3a2805 100644 --- a/Mohem/src/app/authentication/confirm-login/confirm-login.component.ts +++ b/Mohem/src/app/authentication/confirm-login/confirm-login.component.ts @@ -376,7 +376,7 @@ export class ConfirmLoginComponent implements OnInit { request.activationCode = ''; request.P_USER_NAME = data.P_USER_NAME; request.MobileNumber = data.MobileNumber; - request.IsDeviceNFC = this.isNFCAvailable; + request.IsDeviceNFC = true; this.authService.checkSMS(request, () => { }, this.ts.trPK('general', 'ok')) .subscribe((result: SMSCheckResponse) => { if (this.cs.validResponse(result)) { diff --git a/Mohem/src/app/authentication/digital-id/digital-id.component.scss b/Mohem/src/app/authentication/digital-id/digital-id.component.scss index fe2a0924..717d10cb 100644 --- a/Mohem/src/app/authentication/digital-id/digital-id.component.scss +++ b/Mohem/src/app/authentication/digital-id/digital-id.component.scss @@ -1,6 +1,6 @@ .button-login{ - --background: #c1272d !important; - background: #c1272d !important; + --background: #34b9c1 !important; + background: #34b9c1 !important; white-space: normal; color: var(--light); text-transform: capitalize; diff --git a/Mohem/src/app/authentication/login/login.component.scss b/Mohem/src/app/authentication/login/login.component.scss index a412acd4..5b0ea5fe 100644 --- a/Mohem/src/app/authentication/login/login.component.scss +++ b/Mohem/src/app/authentication/login/login.component.scss @@ -321,7 +321,7 @@ img.centerDiv { .companyTxt { font-size: 12px; - color: #004D71; + color: #000000; text-align: center; font-family: 'Inter' !important; } \ No newline at end of file diff --git a/Mohem/src/app/authentication/sms-page/sms-page.page.ts b/Mohem/src/app/authentication/sms-page/sms-page.page.ts index bd96f4d1..d8642295 100644 --- a/Mohem/src/app/authentication/sms-page/sms-page.page.ts +++ b/Mohem/src/app/authentication/sms-page/sms-page.page.ts @@ -415,7 +415,7 @@ export class SmsPageComponent implements OnInit { request.MobileNumber = data.MobileNumber; - request.IsDeviceNFC = this.isNFCAvailable; + request.IsDeviceNFC = true; request.P_PASSWORD = localStorage.getItem('password'); 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 b717c960..5567702d 100644 --- a/Mohem/src/app/eit/eit-list/eit-list.component.scss +++ b/Mohem/src/app/eit/eit-list/eit-list.component.scss @@ -348,6 +348,6 @@ z-index: 1; .terms { text-align: center; - color: #004D71; + color: #000000; font-weight: bold; } \ No newline at end of file diff --git a/Mohem/src/app/hmg-common/hmg-common.module.ts b/Mohem/src/app/hmg-common/hmg-common.module.ts index 939b1c78..eec9b2dd 100644 --- a/Mohem/src/app/hmg-common/hmg-common.module.ts +++ b/Mohem/src/app/hmg-common/hmg-common.module.ts @@ -99,7 +99,7 @@ import { ConfirmLoginComponent } from '../authentication/confirm-login/confirm-l import { WelcomeComponent } from './ui/welcome-login/welcome.component' import { FabButtonComponent } from './ui/fab-button/fab-button.component' import { AttendScanService } from './services/attend-services/attend-scan.service'; -// import { BarcodeScanner } from '@ionic-native/barcode-scanner/ngx'; +import { BarcodeScanner } from '@ionic-native/barcode-scanner/ngx'; import { NgCircleProgressModule } from 'ng-circle-progress'; import { CardFilterComponent } from './ui/card-filter/card-filter.component'; import { EmployeeInformationComponent } from './ui/employee-information/employee-information.component'; @@ -109,7 +109,7 @@ import { NgCalendarModule } from 'ionic2-calendar'; import { DateInfoModalComponent } from './ui/circle-calendar/date-info-modal/date-info-modal.component'; import { ChartModule } from 'primeng/chart'; import { GenericHeaderComponent } from './ui/generic-header/generic-header.component'; -// import { BackgroundGeolocation } from '@ionic-native/background-geolocation/ngx'; +import { BackgroundGeolocation } from '@ionic-native/background-geolocation/ngx'; import { AttendanceOptionsComponent } from '../home/attendance-options/attendance-options.component'; import { CardCalendarComponent } from './ui/card-calendar/card-calendar.component'; import { WorklistSettingComponent } from '../notification/worklist-setting/worklist-setting.component'; @@ -318,8 +318,8 @@ import { SanitizeHtmlPipe } from '../itemforsale/services/domsafe'; File, MenuService, OpenNativeSettings, - // BarcodeScanner, - // BackgroundGeolocation, + BarcodeScanner, + BackgroundGeolocation, FileOpener, FilePath, FileChooser, diff --git a/Mohem/src/app/hmg-common/hmg_utils.ts b/Mohem/src/app/hmg-common/hmg_utils.ts index cf15a655..66fe7725 100644 --- a/Mohem/src/app/hmg-common/hmg_utils.ts +++ b/Mohem/src/app/hmg-common/hmg_utils.ts @@ -1,9 +1,9 @@ import { Injectable } from "@angular/core"; -// import { BackgroundGeolocation } from '@ionic-native/background-geolocation/ngx'; +import { BackgroundGeolocation } from '@ionic-native/background-geolocation/ngx'; import { CommonService } from "src/app/hmg-common/services/common/common.service"; import { TranslatorService } from "src/app/hmg-common/services/translator/translator.service"; import { DevicePermissionsService } from 'src/app/hmg-common/services/device-permissions/device-permissions.service'; -// import { Geolocation } from '@ionic-native/geolocation/ngx'; +import { Geolocation } from '@ionic-native/geolocation/ngx'; import { Platform } from "@ionic/angular"; declare const cordova: any; @@ -13,10 +13,10 @@ declare const cordova: any; }) export class HMGUtils { constructor( - // public backgroundGeolocation: BackgroundGeolocation, + public backgroundGeolocation: BackgroundGeolocation, public common: CommonService, public ts: TranslatorService, - // private geolocation: Geolocation, + private geolocation: Geolocation, public platform: Platform, public devicePermissionsService:DevicePermissionsService, ) { } @@ -26,11 +26,11 @@ export class HMGUtils { this.devicePermissionsService.requestLocationAutherization().then( async granted => { if(granted == true) { if (this.platform.is('android')) { - if ((await this.isHuaweiDevice())) { - this.getHMSLocation(callBack); - } else { + // if ((await this.isHuaweiDevice())) { + // this.getHMSLocation(callBack); + // } else { this.getGMSLocation(callBack); - } + // } } else { this.getIOSLocation(callBack); } @@ -98,32 +98,32 @@ export class HMGUtils { } private getGMSLocation(callBack: Function) { - // this.backgroundGeolocation.getCurrentLocation({ timeout: 10000, enableHighAccuracy: true, maximumAge: 3000 }).then((resp) => { - // if (resp && (resp.latitude && resp.longitude)) { - // const isFakeLocation = resp.isFromMockProvider || resp.mockLocationsEnabled; - // const lat = resp.latitude; - // const long = resp.longitude; - // callBack({"latitude":lat, "longitude":long, "isfake":isFakeLocation}) - // } else { - // this.common.presentAlert(this.ts.trPK('home', 'position-error')); - // } - // }, (error) => { - // this.common.presentAlert(this.ts.trPK('home', 'position-error')); - // }); + this.backgroundGeolocation.getCurrentLocation({ timeout: 10000, enableHighAccuracy: true, maximumAge: 3000 }).then((resp) => { + if (resp && (resp.latitude && resp.longitude)) { + const isFakeLocation = resp.isFromMockProvider || resp.mockLocationsEnabled; + const lat = resp.latitude; + const long = resp.longitude; + callBack({"latitude":lat, "longitude":long, "isfake":isFakeLocation}) + } else { + this.common.presentAlert(this.ts.trPK('home', 'position-error')); + } + }, (error) => { + this.common.presentAlert(this.ts.trPK('home', 'position-error')); + }); } private getIOSLocation(callBack: Function) { - // this.geolocation.getCurrentPosition({ maximumAge: 3000, timeout: 10000, enableHighAccuracy: true }).then(resp => { - // if (resp && resp.coords.latitude && resp.coords.longitude) { - // const lat = resp.coords.latitude; - // const long = resp.coords.longitude; - // callBack({"latitude":lat, "longitude":long, "isfake":false}) - // } else { - // this.common.presentAlert(this.ts.trPK('home', 'position-error')); - // } - // }).catch(error => { - // this.common.presentAlert(this.ts.trPK('home', 'position-error')); - // }); + this.geolocation.getCurrentPosition({ maximumAge: 3000, timeout: 10000, enableHighAccuracy: true }).then(resp => { + if (resp && resp.coords.latitude && resp.coords.longitude) { + const lat = resp.coords.latitude; + const long = resp.coords.longitude; + callBack({"latitude":lat, "longitude":long, "isfake":false}) + } else { + this.common.presentAlert(this.ts.trPK('home', 'position-error')); + } + }).catch(error => { + this.common.presentAlert(this.ts.trPK('home', 'position-error')); + }); } diff --git a/Mohem/src/app/hmg-common/services/attend-services/attend-scan.service.ts b/Mohem/src/app/hmg-common/services/attend-services/attend-scan.service.ts index 1b74485b..29c24f36 100644 --- a/Mohem/src/app/hmg-common/services/attend-services/attend-scan.service.ts +++ b/Mohem/src/app/hmg-common/services/attend-services/attend-scan.service.ts @@ -2,10 +2,10 @@ import { Injectable } from '@angular/core'; // import { DevicePermissionsService } from '../device-permissions/device-permissions.service'; import { DomSanitizer } from '@angular/platform-browser'; import { SharedDataService } from '../shared-data-service/shared-data.service'; -// import { BarcodeScanner } from '@ionic-native/barcode-scanner/ngx'; +import { BarcodeScanner } from '@ionic-native/barcode-scanner/ngx'; import { AttendanceService } from 'src/app/home/services/attendance.services'; -// import { ZBar } from '@ionic-native/zbar/ngx'; -// import { Geolocation } from '@ionic-native/geolocation/ngx'; +import { ZBar } from '@ionic-native/zbar/ngx'; +import { Geolocation } from '@ionic-native/geolocation/ngx'; import { attendanceSwipeScannerRequest } from 'src/app/home/models/attendanceSwipe.Request'; import { AuthenticatedUser } from '../authentication/models/authenticated-user'; import { CommonService } from '../common/common.service'; @@ -14,7 +14,7 @@ import { Response } from 'src/app/hmg-common/services/models/response'; import { Camera, CameraOptions, PictureSourceType} from '@ionic-native/Camera/ngx'; import { DevicePermissionsService } from '../../services/device-permissions/device-permissions.service'; import { Device } from '@ionic-native/device/ngx'; -// import { BackgroundGeolocation } from '@ionic-native/background-geolocation/ngx'; +import { BackgroundGeolocation } from '@ionic-native/background-geolocation/ngx'; import { Platform } from '@ionic/angular'; import { ModalController } from '@ionic/angular'; import { FirebaseX } from '@ionic-native/firebase-x/ngx'; @@ -37,17 +37,17 @@ export class AttendScanService { public collection = 'CS'; constructor(private device: Device, - // private zbar: ZBar, - // private geolocation: Geolocation, + private zbar: ZBar, + private geolocation: Geolocation, private attendance_service: AttendanceService, - // private barcodeScanner: BarcodeScanner, + private barcodeScanner: BarcodeScanner, private cameraController: Camera, public sharedData: SharedDataService, private sanitizer: DomSanitizer, private permissions: DevicePermissionsService, public common: CommonService, public ts: TranslatorService, - // public backgroundGeolocation: BackgroundGeolocation, + public backgroundGeolocation: BackgroundGeolocation, public platform: Platform, public modalController: ModalController, public firebasex: FirebaseX, @@ -135,22 +135,22 @@ export class AttendScanService { } scanCode() { - // this.barcodeScanner - // .scan() - // .then(barcodeData => { - // if (!barcodeData.cancelled) { - // this.scannedResult = barcodeData; - // this.deviceID = this.device.uuid; - // if (this.isFakeLocationUsed) { - // this.fakeSwipeAttendance(); - // } else { - // this.swipeAttendance(); - // } - // } - // }) - // .catch(err => { - // console.log('Error', err); - // }); + this.barcodeScanner + .scan() + .then(barcodeData => { + if (!barcodeData.cancelled) { + this.scannedResult = barcodeData; + this.deviceID = this.device.uuid; + if (this.isFakeLocationUsed) { + this.fakeSwipeAttendance(); + } else { + this.swipeAttendance(); + } + } + }) + .catch(err => { + console.log('Error', err); + }); } fakeSwipeAttendance() { diff --git a/Mohem/src/app/hmg-common/services/common/common.service.ts b/Mohem/src/app/hmg-common/services/common/common.service.ts index 4839c726..aaa04ffe 100644 --- a/Mohem/src/app/hmg-common/services/common/common.service.ts +++ b/Mohem/src/app/hmg-common/services/common/common.service.ts @@ -1213,6 +1213,9 @@ export class CommonService { public openEITPage() { this.nav.navigateForward(['/eit/homepage']); } + public openSITPage() { + this.nav.navigateForward(['/sit/homepage']); + } public openMyTeamPage() { this.nav.navigateForward(['/my-team/home']); } 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 d274a104..c4cea209 100644 --- a/Mohem/src/app/hmg-common/services/connector/connector.service.ts +++ b/Mohem/src/app/hmg-common/services/connector/connector.service.ts @@ -30,6 +30,10 @@ export class ConnectorService { // public static host = 'https://uat.hmgwebservices.com/'; // public static host = 'https://hmgwebservices.com/'; public static host = 'https://erpuat.sfh.med.sa/'; //UAR SFHP + // public static host = 'http://10.201.204.124:6085/'; //UAR SFHP + // public static host = 'https://uat.hmgwebservices.com/'; + + diff --git a/Mohem/src/app/hmg-common/ui/circle-calendar/circle-calendar.component.scss b/Mohem/src/app/hmg-common/ui/circle-calendar/circle-calendar.component.scss index 4028fcab..c524056e 100644 --- a/Mohem/src/app/hmg-common/ui/circle-calendar/circle-calendar.component.scss +++ b/Mohem/src/app/hmg-common/ui/circle-calendar/circle-calendar.component.scss @@ -119,7 +119,7 @@ background-color: #db5b6a !important; } .bt{ - background-color: #004D71 !important; + background-color: #000000 !important; } .holiday{ background-color: #43a6a0 !important; diff --git a/Mohem/src/app/hmg-common/ui/services-button/services-button.component.scss b/Mohem/src/app/hmg-common/ui/services-button/services-button.component.scss index 6c273a47..ba13a4eb 100644 --- a/Mohem/src/app/hmg-common/ui/services-button/services-button.component.scss +++ b/Mohem/src/app/hmg-common/ui/services-button/services-button.component.scss @@ -21,7 +21,7 @@ .iconBox img { margin: 0px auto 10px !important; display: block; - width: 35px; + width: 30px; height: 33px; // max-width: 35%; } @@ -35,7 +35,7 @@ font-size: 8px; text-align: center; margin-top: 10px; - color: #004D71; + color: #000000; font-weight: bold; letter-spacing: 0px; } \ No newline at end of file diff --git a/Mohem/src/app/hmg-common/ui/stats-button/stats-button.component.html b/Mohem/src/app/hmg-common/ui/stats-button/stats-button.component.html index e2a6c0ed..006091bb 100644 --- a/Mohem/src/app/hmg-common/ui/stats-button/stats-button.component.html +++ b/Mohem/src/app/hmg-common/ui/stats-button/stats-button.component.html @@ -5,8 +5,8 @@
-
+
{{statsValue}} -

{{returnTitle(title)}}

+

{{returnTitle(title)}}

\ No newline at end of file diff --git a/Mohem/src/app/hmg-common/ui/stats-button/stats-button.component.scss b/Mohem/src/app/hmg-common/ui/stats-button/stats-button.component.scss index e4b3a074..e9d4cb74 100644 --- a/Mohem/src/app/hmg-common/ui/stats-button/stats-button.component.scss +++ b/Mohem/src/app/hmg-common/ui/stats-button/stats-button.component.scss @@ -36,7 +36,7 @@ span { font-size: 25px; font-weight: bold; - color: #004D71; + color: #000000; text-align: center; display: block; } @@ -47,7 +47,7 @@ ion-app[dir="rtl"] .titleBox { } .pClass { - // color: #004D71; + // color: #000000; // width: 85%; // margin-top: 5px; // font-weight: bold; @@ -56,7 +56,7 @@ ion-app[dir="rtl"] .titleBox { // font-size: 15px !important; - color: #004D71; + color: #000000; width: 100%; margin-top: 5px; font-weight: bold; @@ -67,7 +67,7 @@ ion-app[dir="rtl"] .titleBox { } .iconFab { - margin-left: -20px; + // margin-left: -20px; margin-top: 10px; width: 100px; height: 70px; diff --git a/Mohem/src/app/home/home.page.html b/Mohem/src/app/home/home.page.html index bae37b5d..09e5a195 100644 --- a/Mohem/src/app/home/home.page.html +++ b/Mohem/src/app/home/home.page.html @@ -9,10 +9,15 @@ + + + + - { + const request = WorkListBodyRequest; + this.authService.authenticateRequest(request); + return this.api.post( + WorklistMainService.getSITNotificationBody, + request, + onError, + errorLabel + ); + } + public getStampMSNotificationBody( WorkListBodyRequest: any, onError?: any, diff --git a/Mohem/src/app/notification/worklist-main/worklist-main.component.ts b/Mohem/src/app/notification/worklist-main/worklist-main.component.ts index ebfdf160..74e08e0b 100644 --- a/Mohem/src/app/notification/worklist-main/worklist-main.component.ts +++ b/Mohem/src/app/notification/worklist-main/worklist-main.component.ts @@ -227,7 +227,6 @@ export class WorklistMainComponent implements OnInit { ); console.log(this.selectedFilter); if (this.selectedFilter === 'HRSSA' || this.selectedFilter === 'STAMP') { - console.log("ENAD") this.arr_hr_req_only = []; this.sortRequests(); } @@ -274,8 +273,8 @@ export class WorklistMainComponent implements OnInit { this.getAttachmentNotification(this.WorkListAttachObj); this.getActionHistory(this.WorkListActionHistoryObj); - if (this.getPassNotificationDetails.REQUEST_TYPE == "EIT") { - this.getEITNotificationDetails(this.WorkListBodyObj); + if (this.getPassNotificationDetails.REQUEST_TYPE == "SIT") { + this.getSITNotificationDetails(this.WorkListBodyObj); } else if (this.getPassNotificationDetails.REQUEST_TYPE == "ABSENCE") { this.getAbsenceNotificationDetails(this.WorkListBodyObj); } else if (this.getPassNotificationDetails.REQUEST_TYPE == "PO") { @@ -307,6 +306,15 @@ export class WorklistMainComponent implements OnInit { } } + getSITNotificationDetails(notificationBodyObj) { + this.notificationBodyRes = [] + this.worklistMainService + .getSITNotificationBody(notificationBodyObj) + .subscribe((result: EITNotificatonBodyResponse) => { + this.handleWorkListBodyResult(result, "SIT"); + }); + } + getStampMSNotification(notificationBodyObj) { this.worklistMainService .getStampMSNotificationBody(notificationBodyObj) diff --git a/Mohem/src/app/payslip/home/home.component.html b/Mohem/src/app/payslip/home/home.component.html index 25848f2d..1f75bfa5 100644 --- a/Mohem/src/app/payslip/home/home.component.html +++ b/Mohem/src/app/payslip/home/home.component.html @@ -3,153 +3,37 @@ [headerText]="'payslip,monthly-payslip' | translate"> - - -
- -
- - - - - -
-
- - -
- - - - - - - -

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

-

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

-
- - - -
- -
- - - - - - - - -
- -
- - - -
-

{{GetSummaryOfPaymentList.TOTAL_PAY_AMOUNT}}

- - - {{ts.trPK('payslip','total')}}
{{ts.trPK('payslip','salary')}}
-
- - -
-
- - - - - - - - -
-
- - - - - - - - -
-
-
-
-
-
-
diff --git a/Mohem/src/app/payslip/home/home.component.scss b/Mohem/src/app/payslip/home/home.component.scss index e7e4305c..3f11c246 100644 --- a/Mohem/src/app/payslip/home/home.component.scss +++ b/Mohem/src/app/payslip/home/home.component.scss @@ -430,4 +430,123 @@ background-color: #29B5BF; width: 15%; height: 6px; +} + + +.display-created{ + display: inline-block; + + color:#000; +} +#containerDiv{ + margin-top:20px; +} +.padding{ + padding-left:5px; + padding-right: 5px; +} +.bold{ + font-weight: bold; + font-size: 16px; +} +.color-black{ + color:#000; +} +.date-en{ + position: absolute; + font-size: 14px; + padding: 10px; + right:0; + width: 100px; + color:#969696; + margin: -8px; +} +.date-ar{ + position: absolute; + font-size: 14px; + padding: 10px; + left: 10px; + width: 100px; + color:#969696; + margin: -8px; +} +.transaction-list{ + margin-top:20px; +} +.date-container{ + margin:0px 20px; +} + +.label{ + font-size: 16px; + // margin-left: 15px; + color: #a2a5a6 !important; + display: block; + overflow: hidden; + -webkit-box-flex: 1; + -webkit-flex: 1; + -ms-flex: 1; + flex: 1; + /* font-size: inherit; */ + // text-overflow: ellipsis; + // white-space: nowrap; + white-space: normal; + // padding-top: 10px; + padding: 5px 0px; + padding-left: 10px !important; + margin: 10px auto; + :root[dir="ltr"]{ + font-family: var(--fontFamilySemiBoldEN) !important; + } + :root[dir="rtl"]{ + font-family: var(--fontFamilyIOSAR) !important; + font-weight: bold; + } + + +} + +.Field-en{ +border-radius: 30px; +border: 1px solid #a2a5a6!important; +margin-bottom: 15px; +padding-left: 20px !important; +padding-top: 6px !important; +color: #999999 !important; +} + +.Field-ar{ +border-radius: 30px; +border: 1px solid #a2a5a6!important; +margin-bottom: 20px; +padding-right: 20px !important; +padding-top: 6px !important; +color: #999999 !important; +} +select{ + width: 300px !important; + border: none !important; +} +.padding_date{ + padding-left:5px !important; +} +.date-icon{ + font-size: 20px; + left: -1px; + position: relative; + top: 2px; +} +ion-card{ + padding: 20px 10px 20px 10px; + border-radius: 11px; + box-shadow: 0px 1px 2px 1px #ccc; +} +.display-inline{ + display:inline-block; + +} +.red{ +color:#CA3332; +font-weight: 600; +margin:0px 5px; } \ 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 22657215..40a21fef 100644 --- a/Mohem/src/app/payslip/home/home.component.ts +++ b/Mohem/src/app/payslip/home/home.component.ts @@ -42,6 +42,8 @@ export class HomeComponent implements OnInit { sliderOne: any; payslipIndex: any; data: any; + public paySlipYearsData: any; + public paySlipMonthsData: any; public direction: string; @ViewChild('slides') slides: IonSlides; @ViewChild('slideWithNav') slideWithNav: IonSlides; @@ -52,6 +54,9 @@ export class HomeComponent implements OnInit { autoplay: true }; public userData: any; + public selectedYear: any; + public selectedMonth: any; + @ViewChild(IonInfiniteScroll) infiniteScroll: IonInfiniteScroll; public options = { @@ -61,8 +66,6 @@ export class HomeComponent implements OnInit { }; gaugeType = "full"; - // gaugeValue = 11.200; - // gaugeLabel = ""; constructor( @@ -74,9 +77,7 @@ export class HomeComponent implements OnInit { public cs: CommonService, - ) { - this.direction = TranslatorService.getCurrentDirection(); - } + ) {} ngOnInit() { @@ -84,128 +85,37 @@ export class HomeComponent implements OnInit { this.userData = this.common.sharedService.getSharedData(AuthenticatedUser.SHARED_DATA, false); this.getPayslip(); - // this.getProfile(); - } - - - ngOnChanges(changes: SimpleChanges): void { - if (changes.inputData.currentValue) { - // update this.data here - - // then chart is getting updated - setTimeout(() => { - this.chart.reinit(); - }, 100); - } } - slideNext(object, slideView) { - if (this.payslipIndex != 0) { - this.payslipIndex = this.payslipIndex - 1; - this.showInfo(); - } - } - slidePrev(object, slideView) { - if (this.payslipIndex < this.GetPayslipList.length - 1) { - // console.log(this.payslipIndex); - this.payslipIndex = this.payslipIndex + 1; - this.showInfo(); + public callPayslipData() { + console.log(this.selectedYear); + console.log(this.selectedMonth); + if (this.selectedYear && this.selectedMonth) { + this.getDeduction(); + this.getEarings(); } } - - - getPayslip() { this.respID = -999; - const request = { - P_SELECTED_EMPLOYEE_NUMBER: this.userData.EMPLOYEE_NUMBER,//'125346',//this.selEmp, - P_MENU_TYPE: "E",// 'E',//this.selMenu.List_Menu.MENU_TYPE, - P_SELECTED_RESP_ID: this.respID//"-999" //this.respID, - // P_PAGE_NUM: this.P_PAGE_NUM, - // P_PAGE_LIMIT: this.P_PAGE_LIMIT - }; - this.payslipService.getPayslip(request, () => { }, this.ts.trPK('general', 'retry')).subscribe((result) => { - this.handleRespondGetPayslipResult(result); + const request = {}; + this.payslipService.getPayslipPeriods(request, () => { }, this.ts.trPK('general', 'retry')).subscribe((result) => { + this.handleRespondGetPayslipResult(result.GetPayslipPeriodsList); } ); } handleRespondGetPayslipResult(result) { - if (result.GetPayslipList != null) { - this.GetPayslipList = result.GetPayslipList; - this.firstPayslip = this.GetPayslipList[0] - this.defultSelected = this.firstPayslip.PAYSLIP_CHOICE - } - this.showPaySlip = this.GetPayslipList[0]; - this.payslipIndex = 0; - this.getAllPayslipData(this.GetPayslipList[0].ACTION_CONTEXT_ID); - } - - showInfo() { - - //console.log(event.detail.value); - //const index = parseInt(event.detail.value); - this.showPaySlip = this.GetPayslipList[this.payslipIndex]; - this.ActionContextID = this.GetPayslipList[this.payslipIndex].ACTION_CONTEXT_ID; - this.getAllPayslipData(this.ActionContextID); - } - - getAllPayslipData(ActionContextID) { - this.common.sharedService.setSharedData(ActionContextID, HomeComponent.ACTION_CONTEXT_ID); - this.getSummeryOfPayment(ActionContextID); - this.getPaymentInfo(ActionContextID); - this.getDeduction(ActionContextID); - this.getEarings(ActionContextID); - } - - getSummeryOfPayment(ActionContextID) { - const request = { - P_ACTION_CONTEXT_ID: ActionContextID, - }; - - this.payslipService.getSummeryOFPayment(request, () => { }, this.ts.trPK('general', 'retry')).subscribe((result) => { - this.handleSummeryOfPaymentResult(result); - } - ); - } - - handleSummeryOfPaymentResult(result) { - if (result.GetSummaryOfPaymentList != null) { - this.GetSummaryOfPaymentList = result.GetSummaryOfPaymentList[0]; - this.earingTotal = this.GetSummaryOfPaymentList.TOTAL_EARNINGS_AMOUNT; - this.deductionTotal = this.GetSummaryOfPaymentList.TOTAL_DEDUCTIONS_AMOUNT; - this.data = { - - labels: ['earingTotal', 'deductionTotal'], - datasets: [ - { - data: [this.earingTotal, this.deductionTotal], - backgroundColor: [ - '#43A6A0', - '#29B5BF',], - borderWidth: 2 - } - ] - }; + if (result != null) { + this.paySlipYearsData = result.GetPayslipsYearList; + this.paySlipMonthsData = result.GetPayslipsMonthList } } - getPaymentInfo(ActionContextID) { - const request = { - P_ACTION_CONTEXT_ID: ActionContextID, - }; - - this.payslipService.getPaymentInfo(request, () => { }, this.ts.trPK('general', 'retry')).subscribe((result) => { - this.handleGetPaymentInfoResult(result); - } - ); - } - handleGetPaymentInfoResult(result) { if (result.GetPaymentInformationList != null) { this.GetPaymentInformationList = result.GetPaymentInformationList; @@ -214,22 +124,17 @@ export class HomeComponent implements OnInit { openEarings() { this.common.openEarningsPage(); - } openDeductions() { this.common.openDeductionsPage(); } - getEarings(ActionContextID) { - console.log("getEarings"); - - // this.deductionReq.P_ACTION_CONTEXT_ID=ActionContextID; - // this.deductionReq.P_PAGE_NUM=1; - // this.deductionReq.P_PAGE_LIMIT=100; + getEarings() { const request = { - P_ACTION_CONTEXT_ID: ActionContextID, P_PAGE_NUM: 1, - P_PAGE_LIMIT: 100 + P_PAGE_LIMIT: 100, + P_MON: this.selectedMonth, + P_YEAR: this.selectedYear } this.doinfinitEarReq = request; this.payslipService.getEarings(request, () => { }, this.ts.trPK('general', 'retry')).subscribe((result) => { @@ -242,22 +147,16 @@ export class HomeComponent implements OnInit { if (result.GetEarningsList != null) { this.GetEarningsList = result.GetEarningsList; } - - - } - getDeduction(ActionContextID) { + getDeduction() { console.log("getDeduction"); const request = { - P_ACTION_CONTEXT_ID: ActionContextID, P_PAGE_NUM: 1, - P_PAGE_LIMIT: 100 + P_PAGE_LIMIT: 100, + P_MON: this.selectedMonth, + P_YEAR: this.selectedYear } - // this.deductionReq.P_ACTION_CONTEXT_ID=ActionContextID; - // this.deductionReq.P_PAGE_NUM=1; - // this.deductionReq.P_PAGE_LIMIT=100; - this.doinfiniteDedReq = request; this.payslipService.getDeduction(request, () => { }, this.ts.trPK('general', 'retry')).subscribe((result) => { this.handleGetDeductionResult(result); @@ -271,68 +170,4 @@ export class HomeComponent implements OnInit { } } - - doInfiniteDeduction(infiniteScroll) { - //this.pageNum= this.pageNum + 1; - - if (!this.IsReachEnd) { - this.payslipService.getDeduction(this.doinfiniteDedReq).subscribe( - (result: any) => { - if (this.common.validResponse(result)) { - this.doinfiniteDedReq.P_PAGE_NUM++; - if (this.common.hasData(result.GetDeductionsList)) { - result.GetDeductionsList.forEach(element => { - if (element.ROW_NUM == element.NO_OF_ROWS) { - this.IsReachEnd = true; - } else { - this.IsReachEnd = false; - } - this.GetDeductionsList.push(element); - }); - } // if list length >0 - else { - this.IsReachEnd = true; - } - } // if response == 1 - //this.pageNum++; - this.infiniteScroll.complete(); - } - ); - } else { - if (this.infiniteScroll) this.infiniteScroll.complete(); - } - } //end infiniteScroll - - - doInfiniteEarning(infiniteScroll) { - //this.pageNum= this.pageNum + 1; - - if (!this.IsReachEnd) { - this.payslipService.getEarings(this.doinfinitEarReq).subscribe( - (result: any) => { - if (this.common.validResponse(result)) { - this.doinfinitEarReq.P_PAGE_NUM++; - if (this.common.hasData(result.GetEarningsList)) { - result.GetEarningsList.forEach(element => { - if (element.ROW_NUM == element.NO_OF_ROWS) { - this.IsReachEnd = true; - } else { - this.IsReachEnd = false; - } - this.GetEarningsList.push(element); - }); - } // if list length >0 - else { - this.IsReachEnd = true; - } - } // if response == 1 - //this.pageNum++; - this.infiniteScroll.complete(); - } - ); - } else { - if (this.infiniteScroll) this.infiniteScroll.complete(); - } - } - } diff --git a/Mohem/src/app/payslip/service/payslip.service.ts b/Mohem/src/app/payslip/service/payslip.service.ts index db3b0fa7..53868d0c 100644 --- a/Mohem/src/app/payslip/service/payslip.service.ts +++ b/Mohem/src/app/payslip/service/payslip.service.ts @@ -8,7 +8,7 @@ import { Observable } from 'rxjs'; providedIn: 'root' }) export class PayslipService { - public static getPayslip ="Services/ERP.svc/REST/GET_PAYSLIP"; + public static getPayslipPeriods ="Services/ERP.svc/REST/GET_PAYSLIP_PERIODS"; public static getSummaryOFPayment ="Services/ERP.svc/REST/GET_SUMMARY_OF_PAYMENT"; public static getPaymentInfo ="Services/ERP.svc/REST/GET_PAYMENT_INFORMATION"; public static getEarnings ="Services/ERP.svc/REST/GET_EARNINGS"; @@ -20,10 +20,10 @@ export class PayslipService { ) { } -public getPayslip(PayslipRequest: any , onError?: any,errorLabel?: string): Observable { +public getPayslipPeriods(PayslipRequest: any , onError?: any,errorLabel?: string): Observable { const request = PayslipRequest; this.authService.authenticateRequest(request); - return this.api.post(PayslipService.getPayslip, request, onError, errorLabel); + return this.api.post(PayslipService.getPayslipPeriods, request, onError, errorLabel); } public getSummeryOFPayment(PayslipRequest: any, onError?: any,errorLabel?: string): Observable { const request = PayslipRequest; diff --git a/Mohem/src/app/profile/home/home.component.scss b/Mohem/src/app/profile/home/home.component.scss index 0b6b0ff3..561311d1 100644 --- a/Mohem/src/app/profile/home/home.component.scss +++ b/Mohem/src/app/profile/home/home.component.scss @@ -1315,7 +1315,7 @@ $actionBtnSize: 36px; .name { text-align: center; letter-spacing: -0.84px; - color: #004D71; + color: #000000; opacity: 1; font-weight: bold; line-height: 21px; @@ -1328,7 +1328,7 @@ $actionBtnSize: 36px; font-size: 13px; line-height: 6px; letter-spacing: -0.52px; - color: #004D71; + color: #000000; opacity: 1; font-family: 'Inter' !important; } @@ -1337,7 +1337,7 @@ $actionBtnSize: 36px; .subTitle { text-align: center; letter-spacing: -0.52px; - color: #004D71; + color: #000000; opacity: 1; font-weight: bold; font-size: 16px; @@ -1372,7 +1372,7 @@ $actionBtnSize: 36px; line-height: 30px; font-size: 20px; letter-spacing: -0.8px; - color: #004D71; + color: #000000; font-weight: bold; opacity: 1; margin-top: 12px; @@ -1385,7 +1385,7 @@ $actionBtnSize: 36px; line-height: 30px; font-size: 20px; letter-spacing: -0.8px; - color: #004D71; + color: #000000; font-weight: bold; opacity: 1; margin-top: -3px; @@ -1411,7 +1411,7 @@ $actionBtnSize: 36px; line-height: 20px; font-size: 16px; letter-spacing: -0.64px; - color: #004D71; + color: #000000; font-weight: bold; opacity: 1; } @@ -1423,7 +1423,7 @@ $actionBtnSize: 36px; line-height: 30px; font-size: 20px; letter-spacing: -0.8px; - color: #004D71; + color: #000000; font-weight: bold; opacity: 1; margin-top: 12px; @@ -1436,7 +1436,7 @@ $actionBtnSize: 36px; line-height: 30px; font-size: 20px; letter-spacing: -0.8px; - color: #004D71; + color: #000000; font-weight: bold; opacity: 1; margin-top: -3px; @@ -1461,7 +1461,7 @@ $actionBtnSize: 36px; line-height: 20px; font-size: 16px; letter-spacing: -0.64px; - color: #004D71; + color: #000000; font-weight: bold; opacity: 1; font-family: 'Inter' !important; diff --git a/Mohem/src/app/profile/home/home.component.ts b/Mohem/src/app/profile/home/home.component.ts index 02f49b68..8d98a3e5 100644 --- a/Mohem/src/app/profile/home/home.component.ts +++ b/Mohem/src/app/profile/home/home.component.ts @@ -132,25 +132,45 @@ export class HomeComponent implements OnInit { let personalInformationChildren: any; let personalInfoNestedChildren: any; - console.log(this.menuEntries); - - //if (this.targetValue === 'sideMenu') { - for (let i = 0; i < this.menuEntries.length; i++) { - if (this.menuEntries[i].MENU_NAME === 'XXX_EMP_PROFILE_SS') { - personalInformationChildren = this.menuEntries[i].children; - for (let j = 0; j < personalInformationChildren.length; j++) { - if (personalInformationChildren[j].REQUEST_TYPE === 'BASIC_DETAILS') { - this.basicDetailsSubMenu = personalInformationChildren[j]; - } - if (personalInformationChildren[j].REQUEST_TYPE === 'ADDRESS') { - this.addressSubMenu = personalInformationChildren[j]; - } - if (personalInformationChildren[j].REQUEST_TYPE === 'CONTACT') { - this.dependentDetails = personalInformationChildren[j]; - } - if (personalInformationChildren[j].REQUEST_TYPE === 'PHONE_NUMBERS') { - this.phoneSubMenu = personalInformationChildren[j]; + if (this.targetValue === 'sideMenu') { + for (let i = 0; i < this.menuEntries.length; i++) { + if (this.menuEntries[i].MENU_NAME === 'MBL_E_HR_SS') { + personalInformationChildren = this.menuEntries[i].children; + for (let j = 0; j < personalInformationChildren.length; j++) { + if (personalInformationChildren[j].MENU_NAME = 'MBL_PERINFO_SS' && personalInformationChildren[j].ENTRY_SEQUENCE === 5) { + personalInfoNestedChildren = personalInformationChildren[j].children; + for (let k = 0; k < personalInfoNestedChildren.length; k++) { + if (personalInfoNestedChildren[k].REQUEST_TYPE === 'BASIC_DETAILS') { + this.basicDetailsSubMenu = personalInfoNestedChildren[k]; + } + if (personalInfoNestedChildren[k].REQUEST_TYPE === 'ADDRESS') { + this.addressSubMenu = personalInfoNestedChildren[k]; + } + if (personalInfoNestedChildren[k].REQUEST_TYPE === 'CONTACT') { + this.dependentDetails = personalInfoNestedChildren[k]; + } + if (personalInfoNestedChildren[k].REQUEST_TYPE === 'PHONE_NUMBERS') { + this.phoneSubMenu = personalInfoNestedChildren[k]; + } } + } + } + } + } + } else { + const menuEntriesLocalArray: any = this.menuEntries.children; + for (let i = 0; i < menuEntriesLocalArray.length; i++) { + if (menuEntriesLocalArray[i].REQUEST_TYPE === 'BASIC_DETAILS') { + this.basicDetailsSubMenu = menuEntriesLocalArray[i]; + } + if (menuEntriesLocalArray[i].REQUEST_TYPE === 'ADDRESS') { + this.addressSubMenu = menuEntriesLocalArray[i]; + } + if (menuEntriesLocalArray[i].REQUEST_TYPE === 'CONTACT') { + this.dependentDetails = menuEntriesLocalArray[i]; + } + if (menuEntriesLocalArray[i].REQUEST_TYPE === 'PHONE_NUMBERS') { + this.phoneSubMenu = menuEntriesLocalArray[i]; } } } diff --git a/Mohem/src/app/uI-elements/date-time.input.ts b/Mohem/src/app/uI-elements/date-time.input.ts index c0715a89..a4f2b528 100644 --- a/Mohem/src/app/uI-elements/date-time.input.ts +++ b/Mohem/src/app/uI-elements/date-time.input.ts @@ -53,7 +53,7 @@ export class DateTimeInput extends UiElement { "" + " " + this.label + "" + // "
" + this.value + "
" + - "" + + "" + // " "+ // " "+ // " "+ diff --git a/Mohem/src/app/uI-elements/date.input.ts b/Mohem/src/app/uI-elements/date.input.ts index 2ad766e6..2b33aacd 100644 --- a/Mohem/src/app/uI-elements/date.input.ts +++ b/Mohem/src/app/uI-elements/date.input.ts @@ -50,7 +50,7 @@ export class DateInput extends UiElement { "" + " " + this.label + "" + // "
" + this.value + "
" + - "" + + "" + // " "+ // " "+ // " "+ diff --git a/Mohem/src/app/uI-elements/number.input.ts b/Mohem/src/app/uI-elements/number.input.ts index 2406b8c1..f60a51a6 100644 --- a/Mohem/src/app/uI-elements/number.input.ts +++ b/Mohem/src/app/uI-elements/number.input.ts @@ -31,7 +31,7 @@ export class NumberInput extends UiElement { " " + "" + this.label + "" + - " " + + " " + "
" + "
"; diff --git a/Mohem/src/app/uI-elements/text.input.ts b/Mohem/src/app/uI-elements/text.input.ts index 21cecf47..d66c7646 100644 --- a/Mohem/src/app/uI-elements/text.input.ts +++ b/Mohem/src/app/uI-elements/text.input.ts @@ -28,7 +28,7 @@ export class TextInput extends UiElement { // "
" + "" + " " + this.label + "" + - " " + + " " + "
" + "
"; diff --git a/Mohem/src/app/uI-elements/time.input.ts b/Mohem/src/app/uI-elements/time.input.ts index f51973be..6f81bc26 100644 --- a/Mohem/src/app/uI-elements/time.input.ts +++ b/Mohem/src/app/uI-elements/time.input.ts @@ -46,7 +46,7 @@ export class TimeInput extends UiElement { const template = "" + " " + this.label + "" + - "" + + "" + "
" + "
" return template; diff --git a/Mohem/src/assets/icon/new-design/leave_balance.png b/Mohem/src/assets/icon/new-design/leave_balance.png index 2cda716b..c915cc7e 100644 Binary files a/Mohem/src/assets/icon/new-design/leave_balance.png and b/Mohem/src/assets/icon/new-design/leave_balance.png differ diff --git a/Mohem/src/assets/icon/new-design/vacation_rules.png b/Mohem/src/assets/icon/new-design/vacation_rules.png index 22f602e0..28d464a8 100644 Binary files a/Mohem/src/assets/icon/new-design/vacation_rules.png and b/Mohem/src/assets/icon/new-design/vacation_rules.png differ diff --git a/Mohem/src/assets/icon/new-design/vacation_rules_icon.png b/Mohem/src/assets/icon/new-design/vacation_rules_icon.png index 22f602e0..28d464a8 100644 Binary files a/Mohem/src/assets/icon/new-design/vacation_rules_icon.png and b/Mohem/src/assets/icon/new-design/vacation_rules_icon.png differ diff --git a/Mohem/src/assets/icon/new-design/work_list.png b/Mohem/src/assets/icon/new-design/work_list.png index cc256591..6b7b2dd6 100644 Binary files a/Mohem/src/assets/icon/new-design/work_list.png and b/Mohem/src/assets/icon/new-design/work_list.png differ diff --git a/Mohem/src/assets/imgs/PharmacyLOGO.png b/Mohem/src/assets/imgs/PharmacyLOGO.png deleted file mode 100644 index 530fe49b..00000000 Binary files a/Mohem/src/assets/imgs/PharmacyLOGO.png and /dev/null differ diff --git a/Mohem/src/assets/imgs/SFH-AR.png b/Mohem/src/assets/imgs/SFH-AR.png new file mode 100644 index 00000000..cf23790c Binary files /dev/null and b/Mohem/src/assets/imgs/SFH-AR.png differ diff --git a/Mohem/src/assets/imgs/SFH-EN.png b/Mohem/src/assets/imgs/SFH-EN.png new file mode 100644 index 00000000..5af0a031 Binary files /dev/null and b/Mohem/src/assets/imgs/SFH-EN.png differ diff --git a/Mohem/src/assets/imgs/profile-header.png b/Mohem/src/assets/imgs/profile-header.png index 96fd3b38..be375ace 100644 Binary files a/Mohem/src/assets/imgs/profile-header.png and b/Mohem/src/assets/imgs/profile-header.png differ diff --git a/Mohem/src/assets/imgs/profile.png b/Mohem/src/assets/imgs/profile.png new file mode 100644 index 00000000..8413eaa4 Binary files /dev/null and b/Mohem/src/assets/imgs/profile.png differ diff --git a/Mohem/src/assets/imgs/profile.svg b/Mohem/src/assets/imgs/profile.svg deleted file mode 100644 index 735b72f7..00000000 --- a/Mohem/src/assets/imgs/profile.svg +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - - - - - diff --git a/Mohem/src/assets/localization/i18n.json b/Mohem/src/assets/localization/i18n.json index 3c5b1d00..605b4e07 100644 --- a/Mohem/src/assets/localization/i18n.json +++ b/Mohem/src/assets/localization/i18n.json @@ -249,6 +249,14 @@ } }, "general": { + "select-year": { + "en": "Select Year", + "ar": "حدد السنة" + }, + "select-month": { + "en": "Select Month", + "ar": "اختر الشهر" + }, "current": { "en": "Current", "ar": "تيار" diff --git a/Mohem/src/theme/styles.scss b/Mohem/src/theme/styles.scss index 67125b05..698b9e39 100644 --- a/Mohem/src/theme/styles.scss +++ b/Mohem/src/theme/styles.scss @@ -1430,7 +1430,7 @@ div.no-dataDiv { .active-Segment { border-radius: 25px !important; // font-size: 0.3cm !important; - background: #004C70 !important; + background: #c2a16b !important; color: var(--light) !important; font-weight: bold !important; text-transform: none; @@ -1659,7 +1659,7 @@ div.no-dataDiv { color: #fff !important; &:before { - background-color: #004D71 !important; + background-color: #000000 !important; } } @@ -1920,7 +1920,7 @@ ion-app[dir="rtl"] { } .ion-color-secondary { - --ion-color-base: #004D71 !important; + --ion-color-base: #000000 !important; } ion-app[dir="ltr"] {