diff --git a/Mohem/src/app/attendance-tracking/home/home.component.html b/Mohem/src/app/attendance-tracking/home/home.component.html
index 93afa6d3..e9b87275 100644
--- a/Mohem/src/app/attendance-tracking/home/home.component.html
+++ b/Mohem/src/app/attendance-tracking/home/home.component.html
@@ -63,27 +63,27 @@
-
+
{{ts.trPK('attendance-tracking','shift-time')}}
{{attendanceTrackingList.P_SHT_NAME}}
-
+
{{ts.trPK('attendance-tracking','check-in')}}
{{attendanceTrackingList.P_SWIPE_IN | slice:0:-3}}
-
+
{{ts.trPK('attendance-tracking','check-out')}}
{{attendanceTrackingList.P_SWIPE_OUT | slice:0:-3}}
-
+
{{ts.trPK('attendance-tracking','late-in')}}
{{attendanceTrackingList.P_LATE_IN_HOURS | slice:0:-3}}
-
+
{{ts.trPK('attendance-tracking','regular')}}
{{attendanceTrackingList.P_SCHEDULED_HOURS | slice:0:-3}}
diff --git a/Mohem/src/app/attendance-tracking/home/home.component.scss b/Mohem/src/app/attendance-tracking/home/home.component.scss
index f92e8d05..1211aa37 100644
--- a/Mohem/src/app/attendance-tracking/home/home.component.scss
+++ b/Mohem/src/app/attendance-tracking/home/home.component.scss
@@ -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;
}
diff --git a/Mohem/src/app/home/home.page.html b/Mohem/src/app/home/home.page.html
index dc681d97..5587119a 100644
--- a/Mohem/src/app/home/home.page.html
+++ b/Mohem/src/app/home/home.page.html
@@ -57,7 +57,9 @@
-
+
+
+
{{'home,time-left' | translate}}
-
+
-
diff --git a/Mohem/src/app/home/home.page.scss b/Mohem/src/app/home/home.page.scss
index e14c5e3d..849965c9 100644
--- a/Mohem/src/app/home/home.page.scss
+++ b/Mohem/src/app/home/home.page.scss
@@ -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;