-
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;
diff --git a/Mohem/src/app/home/home.page.ts b/Mohem/src/app/home/home.page.ts
index f7c64378..5a84eeae 100644
--- a/Mohem/src/app/home/home.page.ts
+++ b/Mohem/src/app/home/home.page.ts
@@ -580,8 +580,10 @@ convertAndAssignTime(data) {
this.scheduledTime = this.convertInSeconds(data.P_SCHEDULED_HOURS.split(':'));
this.spentHours = this.convertInSeconds(data.P_SPENT_HOURS.split(':'));
this.isCheckedIn = this.spentHours === 0 ? false : true;
- if (this.isCheckedIn) {
+ if (this.isCheckedIn && this.remainingTime != 0) {
this.initTimer();
+ } else if (this.isCheckedIn && this.remainingTime === 0) {
+ this.percent = 100;
}
}
diff --git a/Mohem/src/app/notification/home/home.component.html b/Mohem/src/app/notification/home/home.component.html
index ebd99437..124e0f0b 100644
--- a/Mohem/src/app/notification/home/home.component.html
+++ b/Mohem/src/app/notification/home/home.component.html
@@ -10,7 +10,7 @@
+
{{newWorkListResponse.length + ITGCount}} {{ts.trPK('work-list','of')}}
0 && selectedFilter !== 'ALL' && itemType !== ''">{{newWorkListResponse.length}} {{ts.trPK('work-list','of')}}
{{totalRequestCount}}
@@ -18,11 +18,11 @@
0 && selectedFilter !== 'ALL' && itemType !== ''">{{newWorkListResponse[0].NO_OF_ROWS}}
{{ts.trPK('work-list','total')}}
{{ts.trPK('work-list','open-reqest')}}
-
-
+
+