completed location for cloud solutions mohemm

MOE_DEV_NEW_TEMPORARY_DESIGN
umasoodch 5 years ago
parent 85b5416703
commit a813addd92

@ -1,5 +1,5 @@
<?xml version='1.0' encoding='utf-8'?>
<widget id="hmg.cloudSolutions.mohem" version="2.0" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
<widget id="hmg.cloudSolutions.mohem" version="2.4" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
<name>MOHEMM</name>
<description>an app created by cloud Solutions</description>
<author email="eservicescs@cloudsolution-sa.com" href="http://cloudsolution-sa.com">Cloud Solutions</author>

@ -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;

@ -110,7 +110,7 @@
left: 59%;
bottom: 73px;
color: black;
background-color: #094875;
background-color: #269DB8;
width: 16%;
height: 6px;">
<ion-col>
@ -155,7 +155,7 @@
<div>
<ion-row>
<ion-col class="colBold">
<label style="color:#094875;font-weight: bold;" class="label" for="">{{ts.trPK('absenceList','startDate')}} </label>
<label style="color:#269DB8;font-weight: bold;" class="label" for="">{{ts.trPK('absenceList','startDate')}} </label>
<br>
<label class="label" style="color:black;" for=""> {{item.START_DATE}}</label>
<br>
@ -164,7 +164,7 @@
</ion-row>
<ion-row>
<ion-col class="colBold">
<label style="color:#094875;font-weight: bold;" class="label" for="">{{ts.trPK('absenceList','endDate')}}</label>
<label style="color:#269DB8;font-weight: bold;" class="label" for="">{{ts.trPK('absenceList','endDate')}}</label>
<br>
<label class="label" style="color:black;" for=""> {{item.END_DATE}}</label>
<br>
@ -173,7 +173,7 @@
</ion-row>
<ion-row>
<ion-col class="colBold">
<label style="color:#094875;font-weight: bold;" class="label" for="">{{ts.trPK('absenceList','absenceType')}} </label>
<label style="color:#269DB8;font-weight: bold;" class="label" for="">{{ts.trPK('absenceList','absenceType')}} </label>
<br>
<label class="label" style="color:black;" for="">{{item.ABSENCE_TYPE}}</label>
<br>
@ -182,7 +182,7 @@
</ion-row>
<ion-row>
<ion-col class="colBold">
<label style="color:#094875;font-weight: bold;" class="label" for="">{{ts.trPK('absenceList','absenceCategory')}}</label>
<label style="color:#269DB8;font-weight: bold;" class="label" for="">{{ts.trPK('absenceList','absenceCategory')}}</label>
<br>
<label class="label" style="color:black;" for="">{{item.ABSENCE_CATEGORY}}</label>
<br>
@ -191,7 +191,7 @@
</ion-row>
<ion-row>
<ion-col class="colBold">
<label style="color:#094875;font-weight: bold;" class="label" for="">{{ts.trPK('absenceList','days')}}</label>
<label style="color:#269DB8;font-weight: bold;" class="label" for="">{{ts.trPK('absenceList','days')}}</label>
<br>
<label class="label" style="color:black;" for="">{{item.ABSENCE_DAYS}}</label>
<br>
@ -200,7 +200,7 @@
</ion-row>
<ion-row>
<ion-col class="colBold">
<label style="color:#094875;font-weight: bold;" class="label" for="">{{ts.trPK('absenceList','hours')}}</label>
<label style="color:#269DB8;font-weight: bold;" class="label" for="">{{ts.trPK('absenceList','hours')}}</label>
<br>
<label class="label" style="color:black;" for="">{{item.ABSENCE_HOURS}}</label>
<br>
@ -209,7 +209,7 @@
</ion-row>
<ion-row>
<ion-col class="colBold">
<label style="color:#094875;font-weight: bold;" for="">{{ts.trPK('absenceList','approvalStatus')}}</label>
<label style="color:#269DB8;font-weight: bold;" for="">{{ts.trPK('absenceList','approvalStatus')}}</label>
<br>
<label class="label" style="color:black;" for="">{{item.APPROVAL_STATUS}}</label>
<br>
@ -218,7 +218,7 @@
</ion-row>
<ion-row>
<ion-col class="colBold">
<label style="color:#094875;font-weight: bold;" for="">{{ts.trPK('absenceList','absenceStatus')}}</label>
<label style="color:#269DB8;font-weight: bold;" for="">{{ts.trPK('absenceList','absenceStatus')}}</label>
<br>
<label class="label" style="color:black;" for="">{{item.ABSENCE_STATUS}}</label>
<br>

@ -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;
// }

@ -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;

@ -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;

@ -1,3 +1,3 @@
.header-toolbar-new{
--background: #65C399;
--background: #269DB8;
}

@ -64,7 +64,7 @@
<!-- <p class="companyTxt">{{companyDesc}}</p> -->
</div>
<div class="menuFooter" >
<div> <img src="../assets/imgs/CS.png" class="CompanyImg" ></div>
<div> <img src="../assets/imgs/CSLogo.png" class="CompanyImg" ></div>
<p class="companyTxt">{{companyDesc}}</p>
</div>
</ion-content>
@ -155,7 +155,7 @@
<!-- <p class="companyTxt">{{companyDesc}}</p> -->
</div>
<div class="menuFooter">
<div> <img src="../assets/imgs/CS.png" class="CompanyImg" ></div>
<div> <img src="../assets/imgs/CSLogo.png" class="CompanyImg" ></div>
<p class="companyTxt">{{companyDesc}}</p>
</div>
</ion-content>

@ -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;

@ -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

@ -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'));
}
}

@ -44,14 +44,14 @@
left: 79%;
bottom: 35px;
color: black;
background-color: #65C399;
background-color: #269DB8;
width: 20%; height: 6px;">
</div>
<div style="position: relative;
left: 79%;
bottom: 20px;
color: black;
background-color: #094875;
background-color: #269DB8;
width: 20%; height: 6px;">
</div>

@ -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;

@ -50,9 +50,9 @@ public data = {
backgroundColor: [
'#65C399',
'#269DB8',
'#094875',
'#269DB8',
],
borderWidth: 2

@ -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;

@ -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;

@ -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;

@ -223,7 +223,7 @@
<ion-row *ngIf="item.DISPLAY_FLAG != 'N' " class="">
<ion-col class="" *ngIf="item.SEGMENT_PROMPT!=''">
<label style="color:#094875;font-weight: bold;" class="label" for="">{{item.SEGMENT_PROMPT}} </label>
<label style="color:#269DB8;font-weight: bold;" class="label" for="">{{item.SEGMENT_PROMPT}} </label>
<br>
<label class="label" style="color:black;" for="">{{item.SEGMENT_VALUE_DSP}} </label>
<br>

@ -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;

@ -100,7 +100,7 @@ export class EitListComponent implements OnInit {
{ data: [this.accrualNetInfants, this.accrualUNetChild, this.accrualNetAdult],
backgroundColor: [
'#1FA269',
'#65C399',
'#269DB8',
'#3CB9D5', ],
borderWidth: 2
}

@ -29,7 +29,7 @@
<div *ngFor="let notificationBody of item.Collection_Notification ">
<ion-row *ngIf=" notificationBody.DISPLAY_FLAG != 'N' ">
<ion-col class="colBold">
<label style="color:#094875;font-weight: bold;" class="label" for="">{{notificationBody.SEGMENT_PROMPT}}</label>
<label style="color:#269DB8;font-weight: bold;" class="label" for="">{{notificationBody.SEGMENT_PROMPT}}</label>
<!-- </ion-col>
<ion-col class="colBold"> -->
<br>

@ -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;

@ -13,7 +13,7 @@ ion-item.custCollabs.item.item-block.item-ios {
}
.header-toolbar-new{
--background: #65C399;
--background: #269DB8;
}
ion-item.item.item-block {

@ -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;

@ -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'));
}
});
}

@ -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';

@ -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;

@ -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;

@ -94,7 +94,7 @@ export class DateInfoModalComponent implements OnInit {
{
data: [this.percChart],
backgroundColor: [
'#094875'
'#269DB8'
],
borderWidth: 2
}]

@ -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;

@ -22,5 +22,5 @@
line-height: 46px;
}
.header-toolbar-new {
--background: #65C399;
--background: #269DB8;
}

@ -4,6 +4,6 @@
ion-menu-button {
font-size: 0.8cm;
color: white;
background: #65C399;
background: #269DB8;
margin: 0 auto;
}

@ -8,7 +8,7 @@
<ion-grid>
<ion-row>
<ion-col class="colPad">
<ion-img class="centerDiv" src="../assets/imgs/CS.png"></ion-img>
<ion-img class="centerDiv" src="../assets/imgs/CSLogo.png"></ion-img>
</ion-col>
</ion-row>
<ion-row>

@ -64,7 +64,7 @@
<div class="fixed-shift-timer" [ngClass]=" direction === 'en' ? 'fixed-shift-time-en' : 'fixed-shift-time-ar'" *ngIf="isCheckedIn" (click)="openattentracking()">
<span class="subTitle"> {{'home,time-left' | translate}} </span>
<circle-progress
[backgroundColor]= "'#094875'"
[backgroundColor]= "'#292F42'"
[percent]="percent"
[radius]="50"
[outerStrokeWidth]="2"

@ -4,7 +4,7 @@ ion-row {
}
.header-toolbar-new{
--background: #65C399;
--background: #269DB8;
}
.profile-image-container{
position: relative;
@ -50,7 +50,7 @@ ion-label{
.contentBg:before {
position: absolute;
content: "";
background: #65C399;
background: #269DB8;
height: 100px;
width: 100%;
left: 0;
@ -66,7 +66,7 @@ ion-label{
}
.attendance-module{
border-radius: 20px;
background-color: #094875;
background-color: #292F42;
padding: 10px;
color: white;
width: 100%;
@ -89,7 +89,7 @@ ion-label{
ion-button{
border-radius: 10px;
padding: 10px;
background: #3CB9DF;
background: #269db8;
--background: transparent;
--box-shadow: none !important;
height: auto;
@ -134,7 +134,7 @@ ion-label{
// z-index: 2;
// height: 112px;
// width: 112px;
// background-color: #094875;
// background-color: #269DB8;
// border-radius: 50%;
// display: inline-block;
// img {

@ -62,6 +62,7 @@ export class HomePage implements OnInit {
missingSwipeRequestObject: any;
public isShow = false;
public showVcationRule = false;
public isFakeLocationUsed = false;
public statsButtons = [
{
title: this.ts.trPK('attendance-tracking', 'title'),
@ -248,14 +249,12 @@ export class HomePage implements OnInit {
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)) {
@ -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') {

@ -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<any> {
this.authService.authenticateRequest(request);
return this.con.post(this.FakeAttendanceSwipeURL,request,onError,errorLabel);
}
}

@ -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
}

@ -280,8 +280,8 @@ export class DetailsComponent implements OnInit {
{
data: [this.absentDays, this.attendedDays],
backgroundColor: [
'#094875',
'#65C399'
'#269DB8',
'#269DB8'
],
borderWidth: 2
}]

@ -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;

@ -39,7 +39,7 @@ export class HomeComponent implements OnInit {
{
data: [100],
backgroundColor: [
'#65C399'
'#269DB8'
],
borderWidth: 5
}]

@ -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;

@ -1,3 +1,3 @@
.header-toolbar-new{
--background: #65C399;
--background: #269DB8;
}

@ -1,5 +1,5 @@
<ion-header>
<ion-toolbar style="--background: #65C399;">
<ion-toolbar style="--background: #269DB8;">
<!-- <nav-buttons></nav-buttons> -->
<ion-title color="light">{{ 'vacation-rule, search-employee' | translate}}</ion-title>
<ion-buttons slot="primary">

@ -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;
}

@ -239,8 +239,8 @@ slidePrev(object, slideView) {
datasets: [
{ data: [this.earingTotal,this.deductionTotal],
backgroundColor: [
'#65C399',
'#094875', ],
'#269DB8',
'#269DB8', ],
borderWidth: 2
}
]

@ -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;

@ -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;

@ -6,7 +6,7 @@
}
.header-div{
text-transform: capitalize;
background: #65C399;
background: #269DB8;
display: block;
position: relative;
height: 160px;

@ -46,7 +46,7 @@ export class PerformanceEvaluationComponent implements OnInit {
colorScheme = {
domain: ['#65C399', '#094875', '#3CB9D5', '#1FA269', '#0D155E']
domain: ['#269DB8', '#269DB8', '#3CB9D5', '#1FA269', '#0D155E']
};
ngOnInit() {

@ -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;
}

@ -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
}

@ -184,8 +184,8 @@ export class TimeCardDetailsComponent implements OnInit {
{
data: [this.absentDays, this.attendedDays],
backgroundColor: [
'#094875',
'#65C399'
'#269DB8',
'#269DB8'
],
borderWidth: 2
}]

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.3 KiB

After

Width:  |  Height:  |  Size: 2.3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 20 KiB

After

Width:  |  Height:  |  Size: 7.3 KiB

@ -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": {

@ -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;
}
}

@ -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;

Loading…
Cancel
Save