From a813addd921875d80cb2b38df08b54b60e97585a Mon Sep 17 00:00:00 2001 From: umasoodch Date: Thu, 17 Dec 2020 16:56:56 +0300 Subject: [PATCH] completed location for cloud solutions mohemm --- Mohem/config.xml | 2 +- .../absence-confirm.component.scss | 4 +- .../src/app/absence/home/home.component.html | 18 +++--- .../src/app/absence/home/home.component.scss | 12 ++-- .../submit-absence-modal.component.scss | 4 +- .../submit-absence.component.scss | 4 +- .../view-attachments.component.scss | 2 +- Mohem/src/app/app.component.html | 4 +- Mohem/src/app/app.component.scss | 4 +- Mohem/src/app/app.component.ts | 4 +- .../home/home.component.ts | 2 +- .../monthly-attendance.component.html | 4 +- .../monthly-attendance.component.scss | 10 ++-- .../monthly-attendance.component.ts | 4 +- .../authentication/login/login.component.scss | 4 +- .../app/eit/add-eit/add-eit.component.scss | 4 +- .../confirm-add-eit.component.scss | 4 +- .../app/eit/eit-list/eit-list.component.html | 2 +- .../app/eit/eit-list/eit-list.component.scss | 18 +++--- .../app/eit/eit-list/eit-list.component.ts | 2 +- .../eit-update-list.component.html | 2 +- .../eit-update-list.component.scss | 2 +- Mohem/src/app/eit/home/home.component.scss | 2 +- .../submit-eit-modal.component.scss | 4 +- .../attend-services/attend-scan.service.ts | 52 +++++++++++++----- .../authentication/authentication.service.ts | 2 +- .../circle-calendar.component.scss | 8 +-- .../date-info-modal.component.scss | 2 +- .../date-info-modal.component.ts | 2 +- .../file-uploder-profile.component.scss | 6 +- .../generic-header.component.scss | 2 +- .../ui/nav-buttons/nav-buttons.component.scss | 2 +- Mohem/src/app/hmg-common/ui/sms/sms.page.html | 2 +- Mohem/src/app/home/home.page.html | 2 +- Mohem/src/app/home/home.page.scss | 10 ++-- Mohem/src/app/home/home.page.ts | 36 ++++++++---- .../app/home/services/attendance.services.ts | 6 ++ .../my-team/details/details.component.scss | 16 +++--- .../app/my-team/details/details.component.ts | 4 +- .../src/app/my-team/home/home.component.scss | 4 +- Mohem/src/app/my-team/home/home.component.ts | 2 +- .../app/notification/home/home.component.scss | 6 +- .../work-list-attach-view.component.scss | 2 +- .../work-list-replacement-itg.component.html | 2 +- .../src/app/payslip/home/home.component.scss | 18 +++--- Mohem/src/app/payslip/home/home.component.ts | 4 +- .../edit-profile/edit-profile.component.scss | 10 ++-- .../src/app/profile/home/home.component.scss | 2 +- .../performance-evaluation.component.scss | 2 +- .../performance-evaluation.component.ts | 2 +- .../profile-image.component.scss | 4 +- .../time-card-details.component.scss | 22 ++++---- .../time-card-details.component.ts | 4 +- Mohem/src/assets/icon/login/lock.png | Bin 2333 -> 2362 bytes Mohem/src/assets/imgs/menu_mohemm_logo.png | Bin 20289 -> 7448 bytes Mohem/src/assets/localization/i18n.json | 6 +- Mohem/src/theme/styles.scss | 12 ++-- Mohem/src/theme/variables.scss | 4 +- 58 files changed, 212 insertions(+), 168 deletions(-) diff --git a/Mohem/config.xml b/Mohem/config.xml index 70b638f5..c862fe5e 100644 --- a/Mohem/config.xml +++ b/Mohem/config.xml @@ -1,5 +1,5 @@ - + MOHEMM an app created by cloud Solutions Cloud Solutions diff --git a/Mohem/src/app/absence/absence-confirm/absence-confirm.component.scss b/Mohem/src/app/absence/absence-confirm/absence-confirm.component.scss index 7b3eaa1f..8cdb50a6 100644 --- a/Mohem/src/app/absence/absence-confirm/absence-confirm.component.scss +++ b/Mohem/src/app/absence/absence-confirm/absence-confirm.component.scss @@ -257,7 +257,7 @@ ion-card-content.confirm-details{ } .header-toolbar-new{ - --background: #65C399; + --background: #269DB8; } .confirmEitOkButton{ @@ -266,7 +266,7 @@ ion-card-content.confirm-details{ min-height: 45px !important; min-width: 5px !important; margin: 8px !important; - --background: #65C399; + --background: #269DB8; width: 80% !important; color: white!important; border-radius: 16px !important; diff --git a/Mohem/src/app/absence/home/home.component.html b/Mohem/src/app/absence/home/home.component.html index 8447e812..cb229b7b 100644 --- a/Mohem/src/app/absence/home/home.component.html +++ b/Mohem/src/app/absence/home/home.component.html @@ -110,7 +110,7 @@ left: 59%; bottom: 73px; color: black; - background-color: #094875; + background-color: #269DB8; width: 16%; height: 6px;"> @@ -155,7 +155,7 @@
- +

@@ -164,7 +164,7 @@
- +

@@ -173,7 +173,7 @@
- +

@@ -182,7 +182,7 @@
- +

@@ -191,7 +191,7 @@
- +

@@ -200,7 +200,7 @@
- +

@@ -209,7 +209,7 @@
- +

@@ -218,7 +218,7 @@
- +

diff --git a/Mohem/src/app/absence/home/home.component.scss b/Mohem/src/app/absence/home/home.component.scss index 6f6728ed..a3f81d81 100644 --- a/Mohem/src/app/absence/home/home.component.scss +++ b/Mohem/src/app/absence/home/home.component.scss @@ -9,7 +9,7 @@ } .addClass{ - background-color: #094875; + background-color: #269DB8; width: 80px; height: 80px; right: 8%; @@ -47,7 +47,7 @@ margin-top: 0; margin-bottom: 0; /* border-radius: 12px !important; */ - background: #094875; + background: #269DB8; border-bottom: 1px solid #a7a4a4; border-top: 1px solid #cac8c8; margin-left: -13px; @@ -57,7 +57,7 @@ .header-div { - background-color: #65C399; + background-color: #269DB8; text-transform: capitalize; height: 160px; /* position: relative; */ @@ -66,7 +66,7 @@ } .header-toolbar-new{ - --background: #65C399; + --background: #269DB8; } @@ -242,7 +242,7 @@ margin-top: -13px; .contentEit:before { position: absolute; content: ""; - // background: #65C399; + // background: #269DB8; height: 140px; width: 100%; left: 0; @@ -285,7 +285,7 @@ margin-top: -13px; // bottom: 146px; // color: black; // background-color: #CB3232; -// // background-color: #094875; +// // background-color: #269DB8; // width: 11%; // height: 6px; // } diff --git a/Mohem/src/app/absence/submit-absence-modal/submit-absence-modal.component.scss b/Mohem/src/app/absence/submit-absence-modal/submit-absence-modal.component.scss index 1253a5da..5a81509a 100644 --- a/Mohem/src/app/absence/submit-absence-modal/submit-absence-modal.component.scss +++ b/Mohem/src/app/absence/submit-absence-modal/submit-absence-modal.component.scss @@ -32,7 +32,7 @@ min-height: 45px !important; min-width: 5px !important; margin: 8px !important; - --background:: #65C399; + --background:: #269DB8; width: 100% !important; color: white!important; border-radius: 16px !important; @@ -43,7 +43,7 @@ min-height: 45px !important; min-width: 5px !important; margin: 8px !important; - --background:: #094875; + --background:: #269DB8; width: 100% !important; color: white!important; border-radius: 16px !important; diff --git a/Mohem/src/app/absence/submit-absence/submit-absence.component.scss b/Mohem/src/app/absence/submit-absence/submit-absence.component.scss index 945d7e68..deb4981b 100644 --- a/Mohem/src/app/absence/submit-absence/submit-absence.component.scss +++ b/Mohem/src/app/absence/submit-absence/submit-absence.component.scss @@ -5,7 +5,7 @@ } .header-toolbar-new{ - --background: #65C399; + --background: #269DB8; } .confirmEitOkButton{ @@ -14,7 +14,7 @@ min-height: 45px !important; min-width: 5px !important; margin: 8px !important; - --background: #65C399; + --background: #269DB8; width: 80% !important; color: white!important; border-radius: 16px !important; diff --git a/Mohem/src/app/absence/view-attachments/view-attachments.component.scss b/Mohem/src/app/absence/view-attachments/view-attachments.component.scss index c8b999eb..1e941e1b 100644 --- a/Mohem/src/app/absence/view-attachments/view-attachments.component.scss +++ b/Mohem/src/app/absence/view-attachments/view-attachments.component.scss @@ -1,3 +1,3 @@ .header-toolbar-new{ - --background: #65C399; + --background: #269DB8; } \ No newline at end of file diff --git a/Mohem/src/app/app.component.html b/Mohem/src/app/app.component.html index fc438362..abbe1186 100644 --- a/Mohem/src/app/app.component.html +++ b/Mohem/src/app/app.component.html @@ -64,7 +64,7 @@
@@ -155,7 +155,7 @@ diff --git a/Mohem/src/app/app.component.scss b/Mohem/src/app/app.component.scss index b768bcbc..220c3a9c 100644 --- a/Mohem/src/app/app.component.scss +++ b/Mohem/src/app/app.component.scss @@ -75,7 +75,7 @@ header .logout{ - background-color:#65C399; + background-color:#269DB8; border: none; color:white; // padding: 20px; @@ -94,7 +94,7 @@ padding: 6px 24px; } .logout-ar{ - background-color: #65C399; + background-color: #269DB8; border: none; color: white; text-align: center; diff --git a/Mohem/src/app/app.component.ts b/Mohem/src/app/app.component.ts index caa016df..28334dde 100644 --- a/Mohem/src/app/app.component.ts +++ b/Mohem/src/app/app.component.ts @@ -29,7 +29,7 @@ export class AppComponent implements OnInit, AfterViewInit { user_image: any = '../assets/imgs/profile.png'; menuSide = 'left'; notBadge: number; - companyUrl = '../assets/imgs/CS.png'; + companyUrl = '../assets/imgs/CSLogo.png'; companyDesc = 'Powered By Cloud Solutions'; direction = 'ltr'; User_Job_name: string; @@ -122,7 +122,7 @@ export class AppComponent implements OnInit, AfterViewInit { if (user) { this.companyUrl = user.CompanyImageURL ? user.CompanyImageURL - : '../assets/imgs/CS.png'; + : '../assets/imgs/CSLogo.png'; this.companyDesc = user.CompanyImageDescription ? user.CompanyImageDescription diff --git a/Mohem/src/app/attendance-tracking/home/home.component.ts b/Mohem/src/app/attendance-tracking/home/home.component.ts index 77d0a16e..eed62d2f 100644 --- a/Mohem/src/app/attendance-tracking/home/home.component.ts +++ b/Mohem/src/app/attendance-tracking/home/home.component.ts @@ -135,6 +135,6 @@ export class HomeComponent implements OnInit { }, this.ts.trPK('general', 'ok'), () => {}, this.ts.trPK('general', 'cancel'), this.ts.trPK('vacation-rule', 'confirmation'), - this.ts.trPK('attendance-tracking', 'confirm-alert1') + this.ts.trPK('attendance-tracking', 'confirm-alert2')); + this.ts.trPK('attendance-tracking', 'confirm-alert1')); } } diff --git a/Mohem/src/app/attendance/monthly-attendance/monthly-attendance.component.html b/Mohem/src/app/attendance/monthly-attendance/monthly-attendance.component.html index 9e3d4134..ae5467ea 100644 --- a/Mohem/src/app/attendance/monthly-attendance/monthly-attendance.component.html +++ b/Mohem/src/app/attendance/monthly-attendance/monthly-attendance.component.html @@ -44,14 +44,14 @@ left: 79%; bottom: 35px; color: black; - background-color: #65C399; + background-color: #269DB8; width: 20%; height: 6px;">
diff --git a/Mohem/src/app/attendance/monthly-attendance/monthly-attendance.component.scss b/Mohem/src/app/attendance/monthly-attendance/monthly-attendance.component.scss index 08de2bcf..dccd6552 100644 --- a/Mohem/src/app/attendance/monthly-attendance/monthly-attendance.component.scss +++ b/Mohem/src/app/attendance/monthly-attendance/monthly-attendance.component.scss @@ -2,7 +2,7 @@ --background: #f0efef; } .header-div { - background: #65C399; + background: #269DB8; color: var(--light); text-transform: capitalize; display: block; @@ -24,7 +24,7 @@ .navbar{ font-size: 10px !important; - --background: #65C399 !important; + --background: #269DB8 !important; color: aliceblue !important; // margin-top: 10px !important; @@ -34,7 +34,7 @@ // margin-left:330px !important; margin-top: 0px !important; font-size: 35px !important; - background: #65C399; + background: #269DB8; color: aliceblue; margin-left: 0px !important; @@ -45,7 +45,7 @@ margin-left:100px !important; margin-top: 0px !important; font-size: 23px !important; - background: #65C399 !important; + background: #269DB8 !important; color: aliceblue !important; } @@ -139,7 +139,7 @@ height: 250px !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, (--primary) 0%, var(--secondary) 36%,var(--secondary) 59%, var(--customnavy) 100%); - background: #65C399; + background: #269DB8; // background: linear-gradient(90deg, #85C48D 0%, #85C48D 13%, #2BB5C6 98%, #2BB5C6 100%); color:var(--light); text-transform: capitalize; diff --git a/Mohem/src/app/attendance/monthly-attendance/monthly-attendance.component.ts b/Mohem/src/app/attendance/monthly-attendance/monthly-attendance.component.ts index 4b3f01ac..044998c5 100644 --- a/Mohem/src/app/attendance/monthly-attendance/monthly-attendance.component.ts +++ b/Mohem/src/app/attendance/monthly-attendance/monthly-attendance.component.ts @@ -50,9 +50,9 @@ public data = { backgroundColor: [ - '#65C399', + '#269DB8', - '#094875', + '#269DB8', ], borderWidth: 2 diff --git a/Mohem/src/app/authentication/login/login.component.scss b/Mohem/src/app/authentication/login/login.component.scss index da05689e..080bb5d5 100644 --- a/Mohem/src/app/authentication/login/login.component.scss +++ b/Mohem/src/app/authentication/login/login.component.scss @@ -158,7 +158,7 @@ img.centerDiv { } .middle-circle { position: relative; - background:var(--darkblue) !important; + background:#1a586d !important; border-radius: 50%; height: 160px; width: 170px; @@ -166,7 +166,7 @@ img.centerDiv { } .last-circle { position: inherit; - background: var(--lightblue) !important; + background: #65C399 !important; border-radius: 50%; height: 166px; width: 140px; 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 b1a550c8..00701426 100644 --- a/Mohem/src/app/eit/add-eit/add-eit.component.scss +++ b/Mohem/src/app/eit/add-eit/add-eit.component.scss @@ -25,7 +25,7 @@ ion-label { .header-toolbar-new{ - --background: #65C399; + --background: #269DB8; } .addEitOkButton{ white-space: normal !important; @@ -33,7 +33,7 @@ ion-label { min-height: 45px !important; min-width: 5px !important; margin: 8px !important; - background-color: #65C399; + background-color: #269DB8; width: 80% !important; color: white!important; border-radius: 16px !important; diff --git a/Mohem/src/app/eit/confirm-add-eit/confirm-add-eit.component.scss b/Mohem/src/app/eit/confirm-add-eit/confirm-add-eit.component.scss index a412c465..22672913 100644 --- a/Mohem/src/app/eit/confirm-add-eit/confirm-add-eit.component.scss +++ b/Mohem/src/app/eit/confirm-add-eit/confirm-add-eit.component.scss @@ -227,7 +227,7 @@ } .header-toolbar-new{ - --background: #65C399; + --background: #269DB8; } .title{ margin-top: -37px; @@ -243,7 +243,7 @@ min-height: 45px !important; min-width: 5px !important; margin: 8px !important; - background-color: #65C399; + background-color: #269DB8; width: 80% !important; color: white!important; border-radius: 16px !important; diff --git a/Mohem/src/app/eit/eit-list/eit-list.component.html b/Mohem/src/app/eit/eit-list/eit-list.component.html index f8192efd..261eb065 100644 --- a/Mohem/src/app/eit/eit-list/eit-list.component.html +++ b/Mohem/src/app/eit/eit-list/eit-list.component.html @@ -223,7 +223,7 @@ - +

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 85ec5859..c1c3c196 100644 --- a/Mohem/src/app/eit/eit-list/eit-list.component.scss +++ b/Mohem/src/app/eit/eit-list/eit-list.component.scss @@ -52,7 +52,7 @@ h4 { margin-top: 0; margin-bottom: 0; /* border-radius: 12px !important; */ - background: #094875; + background: #269DB8; border-bottom: 1px solid #a7a4a4; border-top: 1px solid #cac8c8; margin-left: -13px; @@ -69,7 +69,7 @@ h4 { .header-div { - background-color: #65C399; + background-color: #269DB8; text-transform: capitalize; height: 160px; // position: relative; @@ -78,11 +78,11 @@ h4 { } .header-toolbar-new{ - --background: #65C399; + --background: #269DB8; } .addClass{ - background-color: #094875; + background-color: #269DB8; width: 80px; height: 80px; right: 8%; @@ -99,7 +99,7 @@ h4 { .contentEit:before { position: absolute; content: ""; -// background: #65C399; +// background: #269DB8; height: 140px; width: 100%; left: 0; @@ -119,7 +119,7 @@ z-index: 1; .content:before { position: absolute; content: ""; -background: #65C399; +background: #269DB8; height: 140px; width: 100%; left: 0; @@ -221,7 +221,7 @@ z-index: 1; } .blue-dote{ - background-color: #65C399; + background-color: #269DB8; width: 12px; height: 12px; border-radius: 50% !important; @@ -294,7 +294,7 @@ z-index: 1; } .child-dote{ - background-color: #65C399; + background-color: #269DB8; width: 15px; height: 15px; border-radius: 50% !important; @@ -303,7 +303,7 @@ z-index: 1; margin-right: 5px; } .child-dote-ar{ - background-color: #65C399; + background-color: #269DB8; width: 15px; height: 15px; border-radius: 50% !important; 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 678c7915..ab521197 100644 --- a/Mohem/src/app/eit/eit-list/eit-list.component.ts +++ b/Mohem/src/app/eit/eit-list/eit-list.component.ts @@ -100,7 +100,7 @@ export class EitListComponent implements OnInit { { data: [this.accrualNetInfants, this.accrualUNetChild, this.accrualNetAdult], backgroundColor: [ '#1FA269', - '#65C399', + '#269DB8', '#3CB9D5', ], borderWidth: 2 } diff --git a/Mohem/src/app/eit/eit-update-list/eit-update-list.component.html b/Mohem/src/app/eit/eit-update-list/eit-update-list.component.html index 5ea12523..1fb0a2cd 100644 --- a/Mohem/src/app/eit/eit-update-list/eit-update-list.component.html +++ b/Mohem/src/app/eit/eit-update-list/eit-update-list.component.html @@ -29,7 +29,7 @@
- +
diff --git a/Mohem/src/app/eit/eit-update-list/eit-update-list.component.scss b/Mohem/src/app/eit/eit-update-list/eit-update-list.component.scss index b8ff9967..f4ce5a98 100644 --- a/Mohem/src/app/eit/eit-update-list/eit-update-list.component.scss +++ b/Mohem/src/app/eit/eit-update-list/eit-update-list.component.scss @@ -4,7 +4,7 @@ min-height: 45px !important; min-width: 5px !important; margin: 8px !important; - background-color: #65C399; + background-color: #269DB8; width: 80% !important; color: white!important; border-radius: 16px !important; diff --git a/Mohem/src/app/eit/home/home.component.scss b/Mohem/src/app/eit/home/home.component.scss index 3ac9e0f9..546cdfd0 100644 --- a/Mohem/src/app/eit/home/home.component.scss +++ b/Mohem/src/app/eit/home/home.component.scss @@ -13,7 +13,7 @@ ion-item.custCollabs.item.item-block.item-ios { } .header-toolbar-new{ - --background: #65C399; + --background: #269DB8; } ion-item.item.item-block { diff --git a/Mohem/src/app/eit/submit-eit-modal/submit-eit-modal.component.scss b/Mohem/src/app/eit/submit-eit-modal/submit-eit-modal.component.scss index 1253a5da..5a81509a 100644 --- a/Mohem/src/app/eit/submit-eit-modal/submit-eit-modal.component.scss +++ b/Mohem/src/app/eit/submit-eit-modal/submit-eit-modal.component.scss @@ -32,7 +32,7 @@ min-height: 45px !important; min-width: 5px !important; margin: 8px !important; - --background:: #65C399; + --background:: #269DB8; width: 100% !important; color: white!important; border-radius: 16px !important; @@ -43,7 +43,7 @@ min-height: 45px !important; min-width: 5px !important; margin: 8px !important; - --background:: #094875; + --background:: #269DB8; width: 100% !important; color: white!important; border-radius: 16px !important; 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 8ea1471a..e73824fb 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 @@ -29,6 +29,8 @@ export class AttendScanService { deviceID: string; scannedResult: any; userData: any = {}; + public isFakeLocationUsed = false; + constructor(private device: Device, private zbar: ZBar, private geolocation: Geolocation, @@ -47,6 +49,7 @@ export class AttendScanService { } getDeviceLocation() { + this.isFakeLocationUsed = false; const isVirtual = this.device.isVirtual; if (isVirtual === true) { alert('emulater>>>>>>>' + isVirtual); @@ -59,14 +62,12 @@ export class AttendScanService { this.backgroundGeolocation.getCurrentLocation({ timeout: 10000, enableHighAccuracy: true, maximumAge: 3000 }).then((resp) => { if (this.platform.is('android')) { if (resp && (resp.latitude && resp.longitude)) { - console.log(resp); if (resp.isFromMockProvider || resp.mockLocationsEnabled) { - this.common.presentAlert(this.ts.trPK('home', 'fake-location')); - } else { - this.lat = resp.latitude; - this.longt = resp.longitude; - this.attendance(); + this.isFakeLocationUsed = true; } + this.lat = resp.latitude; + this.longt = resp.longitude; + this.attendance(); } } else { if (resp && (resp.latitude && resp.longitude)) { @@ -96,16 +97,37 @@ 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); + }); + } - public scanCode() { - this.barcodeScanner.scan().then(barcodeData => { - if (!barcodeData.cancelled) { - this.scannedResult = barcodeData; - this.deviceID = this.device.uuid; - this.swipeAttendance(); - } - }).catch(err => { - console.log('Error', err); + fakeSwipeAttendance() { + const request: any = {}; + request.Latitude = this.lat; + request.Longitude = this.longt; + request.QRValue = this.scannedResult.text; + request.UID = this.deviceID; + request.EmployeeID = this.userData.EMPLOYEE_NUMBER; + this.attendance_service.fakeAttendanceSwipeScanner(request, () => {console.log('Error inside in swipe attendance');}) + .subscribe((result: Response) => { + if (this.common.validResponse(result)) { + this.common.presentAlert(this.ts.trPK('home', 'fake-location')); + } }); } diff --git a/Mohem/src/app/hmg-common/services/authentication/authentication.service.ts b/Mohem/src/app/hmg-common/services/authentication/authentication.service.ts index 5fd50d8c..dcaf4d87 100644 --- a/Mohem/src/app/hmg-common/services/authentication/authentication.service.ts +++ b/Mohem/src/app/hmg-common/services/authentication/authentication.service.ts @@ -125,7 +125,7 @@ export class AuthenticationService { } public setPublicFields(request: Request): Request { - request.VersionID = 2.1;//2.0,1.4 + request.VersionID = 2.2; request.Channel = 31; request.LanguageID = TranslatorService.getCurrentLanguageCode(); //request.IPAdress = '10.10.10.10'; 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 d6c4a4be..2bf170c9 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 @@ -8,14 +8,14 @@ .navbar{ font-size: 10px !important; - --background: #65C399 !important; + --background: #269DB8 !important; color: aliceblue !important; } .menu { margin-top: 0px !important; font-size: 35px !important; - background: #65C399; + background: #269DB8; color: aliceblue; margin-left: 0px !important; @@ -25,7 +25,7 @@ margin-left:100px !important; margin-top: 0px !important; font-size: 23px !important; - background: #65C399 !important; + background: #269DB8 !important; color: aliceblue !important; } @@ -92,7 +92,7 @@ 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, (--primary) 0%, var(--secondary) 36%,var(--secondary) 59%, var(--customnavy) 100%); - background: #65C399; + background: #269DB8; // background: linear-gradient(90deg, #85C48D 0%, #85C48D 13%, #2BB5C6 98%, #2BB5C6 100%); color:var(--light); text-transform: capitalize; 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 585627d0..f0dc7258 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 @@ -191,7 +191,7 @@ height: 360px !important; .p5{ font-size: 14px; text-align: center; - background-color: #094875; + background-color: #269DB8; color: white; margin-top: -13px; margin-bottom: -3px; 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 1b25ee4e..56f31536 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 @@ -94,7 +94,7 @@ export class DateInfoModalComponent implements OnInit { { data: [this.percChart], backgroundColor: [ - '#094875' + '#269DB8' ], borderWidth: 2 }] diff --git a/Mohem/src/app/hmg-common/ui/file-uploder-profile/file-uploder-profile.component.scss b/Mohem/src/app/hmg-common/ui/file-uploder-profile/file-uploder-profile.component.scss index 9210cb05..dc77de05 100644 --- a/Mohem/src/app/hmg-common/ui/file-uploder-profile/file-uploder-profile.component.scss +++ b/Mohem/src/app/hmg-common/ui/file-uploder-profile/file-uploder-profile.component.scss @@ -10,8 +10,8 @@ .btnImge{ // button{ border-color:transparent !important; - --background: #65C399 !important; - background: #65C399 !important; + --background: #269DB8 !important; + background: #269DB8 !important; height: 57px !important; width: 60px !important; @@ -21,7 +21,7 @@ } //test .changeIcon{ - background: #65C399 !important; + background: #269DB8 !important; border-radius: 50% !important; width: 73px; height: 55px; diff --git a/Mohem/src/app/hmg-common/ui/generic-header/generic-header.component.scss b/Mohem/src/app/hmg-common/ui/generic-header/generic-header.component.scss index 8f5ef95d..a8495839 100644 --- a/Mohem/src/app/hmg-common/ui/generic-header/generic-header.component.scss +++ b/Mohem/src/app/hmg-common/ui/generic-header/generic-header.component.scss @@ -22,5 +22,5 @@ line-height: 46px; } .header-toolbar-new { - --background: #65C399; + --background: #269DB8; } \ No newline at end of file diff --git a/Mohem/src/app/hmg-common/ui/nav-buttons/nav-buttons.component.scss b/Mohem/src/app/hmg-common/ui/nav-buttons/nav-buttons.component.scss index 43d3f25b..a9861567 100644 --- a/Mohem/src/app/hmg-common/ui/nav-buttons/nav-buttons.component.scss +++ b/Mohem/src/app/hmg-common/ui/nav-buttons/nav-buttons.component.scss @@ -4,6 +4,6 @@ ion-menu-button { font-size: 0.8cm; color: white; - background: #65C399; + background: #269DB8; margin: 0 auto; } \ No newline at end of file diff --git a/Mohem/src/app/hmg-common/ui/sms/sms.page.html b/Mohem/src/app/hmg-common/ui/sms/sms.page.html index dce4f537..c0f8d8b6 100644 --- a/Mohem/src/app/hmg-common/ui/sms/sms.page.html +++ b/Mohem/src/app/hmg-common/ui/sms/sms.page.html @@ -8,7 +8,7 @@ - + diff --git a/Mohem/src/app/home/home.page.html b/Mohem/src/app/home/home.page.html index d79d925b..05491459 100644 --- a/Mohem/src/app/home/home.page.html +++ b/Mohem/src/app/home/home.page.html @@ -64,7 +64,7 @@
{{'home,time-left' | translate}} { if (this.platform.is('android')) { if (resp && (resp.latitude && resp.longitude)) { - console.log(resp); if (resp.isFromMockProvider || resp.mockLocationsEnabled) { - this.common.presentAlert(this.ts.trPK('home', 'fake-location')); - } else { - this.lat = resp.latitude; - this.longt = resp.longitude; - this.attendance(); + this.isFakeLocationUsed = true; } + this.lat = resp.latitude; + this.longt = resp.longitude; + this.attendance(); } } else { if (resp && (resp.latitude && resp.longitude)) { @@ -507,7 +506,11 @@ export class HomePage implements OnInit { if (!barcodeData.cancelled) { this.scannedResult = barcodeData; this.deviceID = this.device.uuid; - this.swipeAttendance(); + if (this.isFakeLocationUsed) { + this.fakeSwipeAttendance(); + } else { + this.swipeAttendance(); + } } }) .catch(err => { @@ -515,6 +518,21 @@ export class HomePage implements OnInit { }); } + fakeSwipeAttendance() { + const request: any = {}; + request.Latitude = this.lat; + request.Longitude = this.longt; + request.QRValue = this.scannedResult.text; + request.UID = this.deviceID; + request.EmployeeID = this.userData.EMPLOYEE_NUMBER; + this.attendanceService.fakeAttendanceSwipeScanner(request, () => {console.log('Error inside in swipe attendance');}) + .subscribe((result: Response) => { + if (this.common.validResponse(result)) { + this.common.presentAlert(this.ts.trPK('home', 'fake-location')); + } + }); + } + swipeAttendance() { const request: attendanceSwipeScannerRequest = new attendanceSwipeScannerRequest(); request.Latitude = this.lat; @@ -531,9 +549,6 @@ export class HomePage implements OnInit { this.common.presentAlert(this.ts.trPK('home', 'swipeAlertSuccess')); this.showAttendanceTracking(); } - // else { - // this.common.presentAlert(this.ts.trPK('home', 'swipeAlertFailed')); - // } }); } @@ -720,6 +735,7 @@ openattentracking() { openStatsButton(link: any) { // tslint:disable-next-line: triple-equals if (link == '0') { + this.isFakeLocationUsed = false; this.getDeviceLocation(); // tslint:disable-next-line: triple-equals } else if (link == '1') { diff --git a/Mohem/src/app/home/services/attendance.services.ts b/Mohem/src/app/home/services/attendance.services.ts index 9c0e71d0..e7b05b8d 100644 --- a/Mohem/src/app/home/services/attendance.services.ts +++ b/Mohem/src/app/home/services/attendance.services.ts @@ -8,6 +8,8 @@ import { attendanceSwipeScannerRequest } from '../models/attendanceSwipe.Request }) export class AttendanceService { public AttendanceSwipeURL : string ='Services/SWP.svc/REST/AuthenticateAndSwipeUser'; + public FakeAttendanceSwipeURL : string ='Services/SWP.svc/REST/CreateIssueInfo'; + constructor( public con: ConnectorService, public authService: AuthenticationService @@ -17,4 +19,8 @@ export class AttendanceService { this.authService.authenticateRequest(request); return this.con.post(this.AttendanceSwipeURL,request,onError,errorLabel); } + public fakeAttendanceSwipeScanner(request, onError?: any, errorLabel?: string): Observable { + this.authService.authenticateRequest(request); + return this.con.post(this.FakeAttendanceSwipeURL,request,onError,errorLabel); + } } \ No newline at end of file diff --git a/Mohem/src/app/my-team/details/details.component.scss b/Mohem/src/app/my-team/details/details.component.scss index df918ed7..136a9943 100644 --- a/Mohem/src/app/my-team/details/details.component.scss +++ b/Mohem/src/app/my-team/details/details.component.scss @@ -20,7 +20,7 @@ ion-title{ .contentBg:before { position: absolute; content: ""; - background: #65C399; + background: #269DB8; height: 140px; width: 100%; left: 0; @@ -89,7 +89,7 @@ ion-title{ border-radius: $actionBtnSize; margin: 0 auto; display: block; - background-color: #65C399; + background-color: #269DB8; line-height: $actionBtnSize; margin-bottom: 3px; img{ @@ -130,7 +130,7 @@ ion-title{ .active-Segment { font-size: 0.3cm !important; - background: #65C399 !important; + background: #269DB8 !important; text-transform: none; --color-checked: none; border-radius: 100px; @@ -162,7 +162,7 @@ ion-title{ } .search-dropdown{ - background: #65C399; + background: #269DB8; ion-select { .select-text{ margin-left: -10px; @@ -223,7 +223,7 @@ ion-title{ .activeArrow{ height: 20px; width: 20px; - color: #65C399; + color: #269DB8; } .disabledArrow{ height: 20px; @@ -234,7 +234,7 @@ ion-title{ .activeArrow-ar{ height: 20px; width: 20px; - color: #65C399; + color: #269DB8; margin-right: 275px; } .disabledArrow-ar{ @@ -389,13 +389,13 @@ ion-title{ } .green-label-container{ - border-top: 5px solid #65C399; + border-top: 5px solid #269DB8; padding: 1px 0px; margin: 15px 0px } .blue-label-container{ - border-top: 5px solid #094875; + border-top: 5px solid #292F42; padding: 1px 0px; margin: 15px 0px } diff --git a/Mohem/src/app/my-team/details/details.component.ts b/Mohem/src/app/my-team/details/details.component.ts index 91805532..42f15451 100644 --- a/Mohem/src/app/my-team/details/details.component.ts +++ b/Mohem/src/app/my-team/details/details.component.ts @@ -280,8 +280,8 @@ export class DetailsComponent implements OnInit { { data: [this.absentDays, this.attendedDays], backgroundColor: [ - '#094875', - '#65C399' + '#269DB8', + '#269DB8' ], borderWidth: 2 }] diff --git a/Mohem/src/app/my-team/home/home.component.scss b/Mohem/src/app/my-team/home/home.component.scss index 735f5987..ded6a0aa 100644 --- a/Mohem/src/app/my-team/home/home.component.scss +++ b/Mohem/src/app/my-team/home/home.component.scss @@ -18,7 +18,7 @@ ion-title{ .contentBg:before { position: absolute; content: ""; - background: #65C399; + background: #269DB8; height: 140px; width: 100%; left: 0; @@ -89,7 +89,7 @@ ion-content { } } .search-dropdown{ - background: #65C399; + background: #269DB8; ion-select { .select-text{ margin-left: -10px; diff --git a/Mohem/src/app/my-team/home/home.component.ts b/Mohem/src/app/my-team/home/home.component.ts index 1dab5abb..edc30021 100644 --- a/Mohem/src/app/my-team/home/home.component.ts +++ b/Mohem/src/app/my-team/home/home.component.ts @@ -39,7 +39,7 @@ export class HomeComponent implements OnInit { { data: [100], backgroundColor: [ - '#65C399' + '#269DB8' ], borderWidth: 5 }] diff --git a/Mohem/src/app/notification/home/home.component.scss b/Mohem/src/app/notification/home/home.component.scss index 88200d03..8ed6074c 100644 --- a/Mohem/src/app/notification/home/home.component.scss +++ b/Mohem/src/app/notification/home/home.component.scss @@ -246,7 +246,7 @@ height: 100%; .contentBg:before { position: absolute; content: ""; -background: #65C399; +background: #269DB8; height: 140px; width: 100%; left: 0; @@ -381,7 +381,7 @@ left: -35px; border-radius: 50%; width: 15px; height: 15px; -background-color: #38c9b3; +background-color: #269db8; top: 1px; } @@ -448,7 +448,7 @@ border-radius: 15px; .text-span-active{ font-size: 12px; color: #888; -background-color:#65C399; +background-color:#269DB8; width: 93%; height: 30px; border: 1px solid; diff --git a/Mohem/src/app/notification/work-list-attach-view/work-list-attach-view.component.scss b/Mohem/src/app/notification/work-list-attach-view/work-list-attach-view.component.scss index c8b999eb..1e941e1b 100644 --- a/Mohem/src/app/notification/work-list-attach-view/work-list-attach-view.component.scss +++ b/Mohem/src/app/notification/work-list-attach-view/work-list-attach-view.component.scss @@ -1,3 +1,3 @@ .header-toolbar-new{ - --background: #65C399; + --background: #269DB8; } \ No newline at end of file diff --git a/Mohem/src/app/notification/work-list-replacement-itg/work-list-replacement-itg.component.html b/Mohem/src/app/notification/work-list-replacement-itg/work-list-replacement-itg.component.html index a03ddca2..70329cb2 100644 --- a/Mohem/src/app/notification/work-list-replacement-itg/work-list-replacement-itg.component.html +++ b/Mohem/src/app/notification/work-list-replacement-itg/work-list-replacement-itg.component.html @@ -1,5 +1,5 @@ - + {{ 'vacation-rule, search-employee' | translate}} diff --git a/Mohem/src/app/payslip/home/home.component.scss b/Mohem/src/app/payslip/home/home.component.scss index 0abf02aa..5b6eeb2b 100644 --- a/Mohem/src/app/payslip/home/home.component.scss +++ b/Mohem/src/app/payslip/home/home.component.scss @@ -70,14 +70,14 @@ } .header-toolbar-new{ - --background: #65C399; + --background: #269DB8; } .colorBG{ --background: #f0efef; } .header-div { - background-color: #65C399; + background-color: #269DB8; text-transform: capitalize; height: 119px; position: relative; @@ -320,7 +320,7 @@ margin-top: 0; margin-bottom: 0; /* border-radius: 12px !important; */ - background: #094875; + background: #269DB8; border-bottom: 1px solid #a7a4a4; border-top: 1px solid #cac8c8; margin-left: -13px; @@ -368,7 +368,7 @@ left: 83%; bottom: 117px; color: black; - background-color: #65C399; + background-color: #269DB8; width: 16%; height: 6px; } @@ -377,13 +377,13 @@ // left: 77%; // bottom: 117px; // color: black; - // background-color: #65C399; + // background-color: #269DB8; // width: 20%; height: 6px; position: relative; left: 4%; bottom: 117px; color: black; - background-color: #65C399; + background-color: #269DB8; width: 15%; height: 6px; } @@ -394,7 +394,7 @@ left: 83%; bottom: 67px; color: black; - background-color: #094875; + background-color: #269DB8; width: 16%; height: 6px; } @@ -403,13 +403,13 @@ // left: 77%; // bottom: 67px; // color: black; - // background-color: #094875; + // background-color: #269DB8; // width: 20%; height: 6px; position: relative; left: 4%; bottom: 67px; color: black; - background-color: #094875; + background-color: #269DB8; width: 15%; 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 51f8016c..8be10fe1 100644 --- a/Mohem/src/app/payslip/home/home.component.ts +++ b/Mohem/src/app/payslip/home/home.component.ts @@ -239,8 +239,8 @@ slidePrev(object, slideView) { datasets: [ { data: [this.earingTotal,this.deductionTotal], backgroundColor: [ - '#65C399', - '#094875', ], + '#269DB8', + '#269DB8', ], borderWidth: 2 } ] 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 432f0612..ccb2a610 100644 --- a/Mohem/src/app/profile/edit-profile/edit-profile.component.scss +++ b/Mohem/src/app/profile/edit-profile/edit-profile.component.scss @@ -9,14 +9,14 @@ } .header-toolbar-new{ - --background: #65C399; + --background: #269DB8; } .colorBG{ --background: #f0efef; } .header-div{ text-transform: capitalize; - background: #65C399; + background: #269DB8; display: block; position: relative; height: 113px; @@ -78,7 +78,7 @@ .gridService{ - // background-color: #094875; + // background-color: #269DB8; margin-top: 87px; border-radius: 10px; margin-bottom: -49px; @@ -88,7 +88,7 @@ } .columns{ margin: 10px; - background: #094875; + background: #269DB8; border-radius: 27px; padding-left: 30px; padding-right: 6px; @@ -97,7 +97,7 @@ } .columns-ar{ margin: 10px; - background: #094875; + background: #269DB8; border-radius: 27px; padding-left: 7px; padding-right: 3px; diff --git a/Mohem/src/app/profile/home/home.component.scss b/Mohem/src/app/profile/home/home.component.scss index ab1cf255..d60f3b9c 100644 --- a/Mohem/src/app/profile/home/home.component.scss +++ b/Mohem/src/app/profile/home/home.component.scss @@ -7,7 +7,7 @@ ion-col.colBold, ion-col.colBold > label{ } .header-div{ text-transform: capitalize; - background: #65C399; + background: #269DB8; display: block; position: relative; height: 160px; 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 1c96ac08..c824c8a6 100644 --- a/Mohem/src/app/profile/performance-evaluation/performance-evaluation.component.scss +++ b/Mohem/src/app/profile/performance-evaluation/performance-evaluation.component.scss @@ -6,7 +6,7 @@ } .header-div{ text-transform: capitalize; - background: #65C399; + background: #269DB8; display: block; position: relative; height: 160px; 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 2b08b130..a755c831 100644 --- a/Mohem/src/app/profile/performance-evaluation/performance-evaluation.component.ts +++ b/Mohem/src/app/profile/performance-evaluation/performance-evaluation.component.ts @@ -46,7 +46,7 @@ export class PerformanceEvaluationComponent implements OnInit { colorScheme = { - domain: ['#65C399', '#094875', '#3CB9D5', '#1FA269', '#0D155E'] + domain: ['#269DB8', '#269DB8', '#3CB9D5', '#1FA269', '#0D155E'] }; ngOnInit() { diff --git a/Mohem/src/app/profile/profile-image/profile-image.component.scss b/Mohem/src/app/profile/profile-image/profile-image.component.scss index 1f9d686b..c686e7e3 100644 --- a/Mohem/src/app/profile/profile-image/profile-image.component.scss +++ b/Mohem/src/app/profile/profile-image/profile-image.component.scss @@ -9,7 +9,7 @@ // border-radius: 50% !important; // } .header-toolbar-new{ - --background: #65C399; + --background: #269DB8; } .imgCircle{ @@ -50,5 +50,5 @@ width: 234px; } .header-toolbar-new{ - --background: #65C399; + --background: #269DB8; } \ No newline at end of file diff --git a/Mohem/src/app/time-card/time-card-details/time-card-details.component.scss b/Mohem/src/app/time-card/time-card-details/time-card-details.component.scss index ba490355..ef433546 100644 --- a/Mohem/src/app/time-card/time-card-details/time-card-details.component.scss +++ b/Mohem/src/app/time-card/time-card-details/time-card-details.component.scss @@ -185,7 +185,7 @@ // .header-div { -// background-color: #65C399; +// background-color: #269DB8; // text-transform: capitalize; // height: 180px; // position: relative; @@ -214,7 +214,7 @@ // .navbar{ // font-size: 10px !important; -// --background: #65C399 !important; +// --background: #269DB8 !important; // color: aliceblue !important; // // margin-top: 10px !important; @@ -224,7 +224,7 @@ // // margin-left:330px !important; // margin-top: 0px !important; // font-size: 35px !important; -// background: #65C399; +// background: #269DB8; // color: aliceblue; // margin-left: 0px !important; @@ -235,7 +235,7 @@ // margin-left:100px !important; // margin-top: 0px !important; // font-size: 23px !important; -// background: #65C399 !important; +// background: #269DB8 !important; // color: aliceblue !important; // } @@ -374,7 +374,7 @@ // 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, (--primary) 0%, var(--secondary) 36%,var(--secondary) 59%, var(--customnavy) 100%); -// background: #65C399; +// background: #269DB8; // // background: linear-gradient(90deg, #85C48D 0%, #85C48D 13%, #2BB5C6 98%, #2BB5C6 100%); // color:var(--light); // text-transform: capitalize; @@ -508,7 +508,7 @@ ion-title{ .contentBg:before { position: absolute; content: ""; -background: #65C399; +background: #269DB8; height: 140px; width: 100%; left: 0; @@ -577,7 +577,7 @@ $actionBtnSize : 36px; border-radius: $actionBtnSize; margin: 0 auto; display: block; - background-color: #65C399; + background-color: #269DB8; line-height: $actionBtnSize; margin-bottom: 3px; img{ @@ -617,7 +617,7 @@ $actionBtnSize : 36px; .active-Segment { font-size: 0.3cm !important; - background: #65C399 !important; + background: #269DB8 !important; text-transform: none; --color-checked: none; border-radius: 100px; @@ -649,7 +649,7 @@ $actionBtnSize : 36px; } .search-dropdown{ - background: #65C399; + background: #269DB8; ion-select { .select-text{ margin-left: -10px; @@ -864,13 +864,13 @@ $actionBtnSize : 36px; } .green-label-container{ - border-top: 5px solid #65C399; + border-top: 5px solid #269DB8; padding: 1px 0px; margin: 15px 0px } .blue-label-container{ - border-top: 5px solid #094875; + border-top: 5px solid #292F42; padding: 1px 0px; margin: 15px 0px } diff --git a/Mohem/src/app/time-card/time-card-details/time-card-details.component.ts b/Mohem/src/app/time-card/time-card-details/time-card-details.component.ts index ca5aabc3..638d68e0 100644 --- a/Mohem/src/app/time-card/time-card-details/time-card-details.component.ts +++ b/Mohem/src/app/time-card/time-card-details/time-card-details.component.ts @@ -184,8 +184,8 @@ export class TimeCardDetailsComponent implements OnInit { { data: [this.absentDays, this.attendedDays], backgroundColor: [ - '#094875', - '#65C399' + '#269DB8', + '#269DB8' ], borderWidth: 2 }] diff --git a/Mohem/src/assets/icon/login/lock.png b/Mohem/src/assets/icon/login/lock.png index eb5bea3523de18e8265a8ede972d12415f30a603..c2092651b8c5e92bdae2c90afcefbff9fb9369c9 100644 GIT binary patch literal 2362 zcmbVO3se(V8jeEbA;>DiqNi}isk^m8GLt9C90P=eM=U`KQ9vjcBoi_d0xF(` zJ?r}DDec-?7F+}Y*<}~?w5dwz@ljn^U1=#U+Knh}MeQz{`a)DH?hTI|>v6Z+&N=hn zJNJI~e|-1<|1;aNGSfnX7YB1VoKQ`=Ivb1@@NN&B17u_8DKi*?Z0Y$7hch?a`_AIj z?T+GbxRI1DkImC&U<7U9<9fQ7P6SHQUv zEvmJtNE4O5!A|CE$kY)VN(i|gPE3GSlw&}Fg=BH4++wyeSh)h8)Qf?+cNu}9NeEk_ zfR$c@P@XmmQqgu2lJZd=fucevUd|Ut#bTK(4ich56hY$=0m>5!F;t34M9}mD18a7@ z0n1jWPTK-s3fRQ5HVi?WPAA_f;?s5`B9P1F2r5K`LLNZymMYHxBWc>fLg8AXXClPSS&sh44YC0!k8xHxoAdLVIz@jlA#@T zf=np`ZocS^#)hfvB+k-y9Zj2OE-GurWk@LGqtLQk%BrWG%*#(5Ak{caDq!!e@dQGi zAYLaBU=kT7mc*hW3`M7)T3SyTDxM3KW1{avLCWZH7XLx8p1=&W-GYOFDGP2S5u4Qr zLp~ZY6>X;Nz%cMm^z^z$rOL9?2FeUJnC!GbIKuS@87#H(U)Bu7-#S$Ja6-jugL@JY`GNC~%D4sd5rU{2P1!m6cf8_a9 zb_$drZvM%7yoKq_9W0$b=1x$GFpVY(C%hXS1U`nmi zL;|J%BQK_43~gYYxSdoQ0b4(qcL;DE@fPe<9LTdFPVPNb+%s^{F}zb>s{$XsW=C2< zhqHrLHo~rH<8b`WXw*twx%=j&6Q#}Q!tT=dl7ikz3TX1j^7sio(Y5nFaja_c>+%zQ zz&#Z$i(VRi5N$p?{MKv4(x$PPCnudNg@W(m?!}$%w?4T(mYLtsy`o0`X6KQ??hw(P zYnz`8PfT2>g|Ci=oV;ZdLlHy2+LHdz_SU)jB>|Rvdw^p{;OMd4g|TOo>Myhxg)1Nb znHxiVO{K=di4&*3rquP;Pj;;T%br{9yyn%OUxoxTL8}j%k~hA(J>ug5D(UZo#?}*A zMRCm$L9aacqT<7?YnFMAZ3##%5XPDcI0Ydu&9}U=ekd*HAA89y;|JGQ?iRZ~OqE^k zVTr}L)$b*?lqG)KvuXdmkLJ1i>i!nr;`~`>57AZnrC^=0iQDl8>$fkmKeZNn`BFX9 zU2^nNY(`7tU%%;bN9@xSezIYS zA1VCo=XdH>Ql^UI#j4;u(~%uw*Qa@NcQ`6r7rM^MzR3M_*8baZ+>UuR!5^wyH{~~m zUHQGgc<8J4G0CoW?hBl-M`}&guAcUG|F%%Ha_7R1%g2e^Z9T)rKc?w}#Y64ObGJqo z54Ww{R(3HjcJ6@Ntuq~coZl4Hdzc={X?nLI;!0-4rsbz=bf$pTU!PdQjPg>?rTYVUSO702Oo zFSs1xuaBRIag8qc_mQ1*T%+*g4C|!JS1aAK#FYbAxUSJV-Pc`~Lx;jmBiBz7H*PmR z_-LT!4pK$Dvo3J(?%9MJ`Y$(VdkgoBm1eG+%`5gq=byIwRdqVo>cZ+i9=xdA=cg_5 ztbRMx^k~l8v3ZJd4BfjeXHw#L=*fnQ1hnspYPdut*Of}X;Lsk3Q1`lW7uTR>@{$dTcuE9RE z@}CD{EdPp6R_5qD1Vb~^ UIf1vle@7fmN~U^$^7`uk08mYN7XSbN literal 2333 zcmb`JYdjNd1I9PPCPU0=Eyo;lh>+tlk{L=)u?`Gn3q2!*tQ-(MLc-jUc2onSV01#W$Nhhuca+M6? z=bnX(jsUI!uRGaT0xJ69v)qf(Wp~>v4h{efZUzB>iFm-iy(e73xB>up3VHq|frY&P z=H$I{Ljfqwon_meM7o3n=gC;7F+*sy@|W$4k+DA^=qrM^mwr_aYAdLA2ghcJ-+2rO zj%A8l6q0u0<~?WZyTJ{Q3VRk-FvNkv_au+Ll*6NulMyPNQc6y+dje!vUHMu(wBSFY1)pn2Eqh67Q^m7vow@|yHtU!ztlaR5 z0Kmn}#zH=Tolt{T1E?3ri#h9}#?KUNoB31Wo)P?Dt<68vM|+m@(4{>Zl2djvxl#SC zf&(2Ra6q#~nb3ETAO`R1y@W;?gOPS3lHnI<>!TSHd_V}+)&u@xXp4aWP}=4sFsn-; z<~<)iffPh8NQ_!X-YKSy73}CE=AJY)=taie-zGj+&5aZgZjB@pD3=6^aZgzxEjo$H zvsSvM$ER(Q#EPLYl;&qLdFxwBh;ZUerL$f8H^=_LBkG-}>>lelWPKvL;;8I{yRP9R;OyVju z8eeiT#((HQ1iDoezB*+4xOq@?)TEA|9%AxLL}`X)s&VtL>5V2=0^J~;n!kUh{p7cj zXxFT9WVL>Lag-ZMy7Syu(9ZE$u|I--NO*&_{%+a*;T(M2^Wt|dtE|wrD zsxWu4o>TPkWsZGhT!Nf-kXe6z9f%!&-?ezmure={H0?JrwlzbA^YIg37|X7A?_XYI zoApNA+kVv`)s{1|uwS}2-C=Qv9nPz{eM4>q*w_7R;diFgx6gc-bzk%nE6#BuK>is= zTqMHS4>+MB+x9X@az=qyhso@10@2!gOc~GnJ$@oPbj9V2d+1RDiw=vKAiLl z`(3u@6J>rDIG0}!2_o#SaUDj)nvair8D$=ls`^; zUeDloi!eIV$fB$-Bz}&~bnCu3tJT~htfNIMOYxtj2cG@vtJK#)wh~A8YhH$ElLp@l zs3+D+e22qMhgM4%c7zaX;AE@)XP4glewT&WAE6e}m{ap`3?s}2hmlt~GtIm^tBMMe z!DP6z=l?KJ z#^Mi`t!S0kL1R{KVP&W!4^5NjwULgCrhu|>9<|U!ro6eFi+*&r4y$4};<6)HPhW$k5v*5}tXHy61}5Po zVJw5OmT`#{N)s$iek4SHBBX&#I2G?=eLBJIEPt-N71i>oqMtpJ@OEpQV5j9?vAWs! z_IU><$BXnzs{Xfjhlh^m`FH0;+oX#QPVDHXjglvxJm@hqzhey}=eaLr!`El|>#Nk= zoojo4%GCcPFr1+Q>8xTFF~@-svE^N@a0&dt$f$~0SXuR{O|%VpZ241{^SF)dVG6bp zv5o&xBV2_R5Fo0J*^mxXK8N*G#dO4?lc_&8;)eQBrpIqj;JPmrB;Qca z*VG@2v+wO3@@eCoFH!Wr4B`^#&TWEJ+IaUfk+=elf>#SK$FZ1R0X(iGd|w_a$gIKm z#IcxY#1FZF|8j9JJD!mmaiOH!Rk( zn8N?iG3g!4dn7;yhI81w(*AqjHCbMNJ3>Eo-SHb@;E_@JM>S2zqg0Pst7Str@&P zjotdibPHNDsCM5=vY&tYhfQ(zSm>I;bLs!KVQVc;)P>dT#M-Bgm88yze-ee8oD*vs z8Y@e!xh!E-`iAGRl(u8`0i|qJDz?fjcrAgfgu-#(kKVs1CW`+ENK`LA_^sG{cixW^vMKYoj5VM WljSw-=+(6MO|i8;eX_#REB0@h-B9lU diff --git a/Mohem/src/assets/imgs/menu_mohemm_logo.png b/Mohem/src/assets/imgs/menu_mohemm_logo.png index 005db9ec708bd83278d343b16e19082420629a1b..5536c07e274c6df66a968e6195f578f3a5750c97 100644 GIT binary patch literal 7448 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 RbN_c~Z{uWLe$Y4dKLDoXdJ_Nu literal 20289 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 diff --git a/Mohem/src/assets/localization/i18n.json b/Mohem/src/assets/localization/i18n.json index 88342a0a..077bf19d 100644 --- a/Mohem/src/assets/localization/i18n.json +++ b/Mohem/src/assets/localization/i18n.json @@ -878,8 +878,8 @@ }, "home": { "fake-location": { - "en": "We traced out that you may be using fake location! Please do not try this and if not then please try again.", - "ar": "لقد توصلنا إلى أنك ربما تستخدم موقعًا مزيفًا! من فضلك لا تحاول هذا وإذا لم يكن كذلك يرجى المحاولة مرة أخرى." + "en": "We traced out that you try to use a fake location! This is considered a violation, and HR has been notified.", + "ar": ".لقد تتبعنا أنك تحاول استخدام موقع مزيف! يعتبر هذا مخالفة وقد تم إخطار الموارد البشرية" }, "position-error": { "en": "Error getting your location. Please try again!", @@ -2604,7 +2604,7 @@ "ar": "احصائيات الحضور" }, "confirm-alert1": { - "en": "Are you sure, you want to", + "en": "Are you sure, you want to swipe?", "ar": "هل أنت متأكد أنك تريد التمرير؟" }, "confirm-alert2": { diff --git a/Mohem/src/theme/styles.scss b/Mohem/src/theme/styles.scss index b2cddf6a..983a2d04 100644 --- a/Mohem/src/theme/styles.scss +++ b/Mohem/src/theme/styles.scss @@ -1322,7 +1322,7 @@ border:0px --background: #094773 !important; } .header-toolbar-new { - --background: #65C399; + --background: #269DB8; } @@ -1340,7 +1340,7 @@ border:0px // margin-left:0; // } // .search-dropdown{ -// background: #65C399; +// background: #269DB8; // ion-select { // .select-text{ // margin-left: -10px; @@ -1413,7 +1413,7 @@ border:0px &.present { color:#fff !important; &:before { - background-color: #65C399 !important; + background-color: #269DB8 !important; } } @@ -1421,7 +1421,7 @@ border:0px &.absent { color:#fff !important; &:before { - background-color:#1a586d !important; + background-color:#292F42 !important; } } @@ -1473,7 +1473,7 @@ border:0px // border-radius: 50%; // } // .absent::after{ -// background: #094875; +// background: #269DB8; // } // .present::after{ @@ -1522,7 +1522,7 @@ table.monthview-datetable th small { top: auto; bottom: -8px; .swiper-pagination-bullet-active { - background: #094875; + background: #269DB8; } } diff --git a/Mohem/src/theme/variables.scss b/Mohem/src/theme/variables.scss index 0297d1fd..963c1e72 100644 --- a/Mohem/src/theme/variables.scss +++ b/Mohem/src/theme/variables.scss @@ -69,8 +69,8 @@ --red:#BE1E2D; --blue:#223262; --cyanblue:#1b75bc; - --newgreen:#65C399; - --darkblue:#094875; + --newgreen:#269DB8; + --darkblue:#269DB8; --lightblue:#3cb9d5; --newred:#cb3232; // $font-family-base: $fontFamilyMediumEN !default;