fixed timer issues

6 years ago · 561428ee62
parent 9ff40c0e1e
commit 561428ee62
2 changed files with 7 additions and 2 deletions
--- a/Mohem/src/app/attendance-tracking/home/home.component.ts
+++ b/Mohem/src/app/attendance-tracking/home/home.component.ts
@ -99,8 +99,11 @@ export class HomeComponent implements OnInit {
    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.displayTime = '00:00:00';
+      this.percent = 100;
    }
 }

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