fixed attendance issues ios and android

mekawy-issues
Salman Afzal 6 years ago
parent 2386ea258d
commit 9ff40c0e1e

@ -63,27 +63,27 @@
</div>
<ion-grid>
<ion-row class="rowBorder">
<ion-col [size]="12" class="colBorder" style="border-right: none;">
<ion-col [size]="12" class="colBorder-generic" style="border-right: none;">
<ion-label class="shift-title">{{ts.trPK('attendance-tracking','shift-time')}}</ion-label>
<ion-label class="shift-text shift-title">{{attendanceTrackingList.P_SHT_NAME}} </ion-label>
</ion-col>
</ion-row>
<ion-row class="rowBorder">
<ion-col [size]="6" class="colBorder">
<ion-col [size]="6" class="colBorder-generic">
<ion-label class="shift-title"> {{ts.trPK('attendance-tracking','check-in')}}</ion-label>
<ion-label class="shift-text shift-title">{{attendanceTrackingList.P_SWIPE_IN | slice:0:-3}}</ion-label>
</ion-col>
<ion-col [size]="6" class="colBorder" style="border-right: none;">
<ion-col [size]="6" class="colBorder-generic" [ngClass]=" direction === 'en' ? 'colBorder-generic-en' : 'colBorder-generic-ar'">
<ion-label class="shift-title"> {{ts.trPK('attendance-tracking','check-out')}}</ion-label>
<ion-label class="shift-text shift-title">{{attendanceTrackingList.P_SWIPE_OUT | slice:0:-3}}</ion-label>
</ion-col>
</ion-row>
<ion-row style="text-align: center">
<ion-col [size]="6" class="colBorder">
<ion-col [size]="6" class="colBorder-generic">
<ion-label class="shift-title"> {{ts.trPK('attendance-tracking','late-in')}}</ion-label>
<ion-label class="shift-text shift-title">{{attendanceTrackingList.P_LATE_IN_HOURS | slice:0:-3}}</ion-label>
</ion-col>
<ion-col [size]="6" class="colBorder" style="border-right: none;">
<ion-col [size]="6" class="colBorder-generic" [ngClass]=" direction === 'en' ? 'colBorder-generic-en' : 'colBorder-generic-ar'">
<ion-label class="shift-title"> {{ts.trPK('attendance-tracking','regular')}}</ion-label>
<ion-label class="shift-text shift-title">{{attendanceTrackingList.P_SCHEDULED_HOURS | slice:0:-3}} </ion-label>
</ion-col>

@ -49,12 +49,15 @@ ion-grid {
margin-top: -40px;
border: solid 5px #053c63;
}
.colBorder{
.colBorder-generic{
padding: 20px 0px;
text-align: center;
}
.colBorder:nth-child(1){
.colBorder-generic-en{
border-left: var(--lightblue) solid 1px;
}
.colBorder-generic-ar{
border-right: var(--lightblue) solid 1px;
}

@ -57,7 +57,9 @@
</ion-row>
</ion-grid>
<div class="fixed-shift-timer" *ngIf="isCheckedIn" (click)="openattentracking()">
</ion-content>
<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'"
@ -81,8 +83,7 @@
[renderOnClick]="false">
</circle-progress>
</div>
<div class="fixed-shift-timer" *ngIf="isCheckedIn === false">
<div class="fixed-shift-timer" [ngClass]=" direction === 'en' ? 'fixed-shift-time-en' : 'fixed-shift-time-ar'" *ngIf="isCheckedIn === false">
<fab-button (trigger)="getDeviceLocation()"></fab-button>
<page-trailer [small] = "true"></page-trailer>
</div>
</ion-content>

@ -100,10 +100,17 @@ ion-label{
margin: 0 !important;
width: 100% !important;
}
.fixed-shift-time-en {
right: 20px;
}
.fixed-shift-time-ar {
left: 20px;
}
.fixed-shift-timer{
position: fixed;
bottom: 20px;
right: 20px;
z-index: 2;
span.subTitle {
position: absolute;

Loading…
Cancel
Save