From f8b06be7004925c0c1b76716a3289fae45c804b4 Mon Sep 17 00:00:00 2001
From: "Patrik J. Braun" <bra.patrik@gmail.com>
Date: Tue, 24 Dec 2019 00:44:32 +0100
Subject: [PATCH] improving task ui

---
 .../progress.tasks.settings.component.html    |  3 +-
 .../progress.tasks.settings.component.ts      | 32 ++++++++++++++++---
 2 files changed, 28 insertions(+), 7 deletions(-)

diff --git a/src/frontend/app/ui/settings/tasks/progress/progress.tasks.settings.component.html b/src/frontend/app/ui/settings/tasks/progress/progress.tasks.settings.component.html
index 9fa616bf..0f81db95 100644
--- a/src/frontend/app/ui/settings/tasks/progress/progress.tasks.settings.component.html
+++ b/src/frontend/app/ui/settings/tasks/progress/progress.tasks.settings.component.html
@@ -22,8 +22,7 @@
         aria-valuemax="100"
         style="min-width: 2em;"
         [style.width.%]="(progress.progress/(progress.left+progress.progress))*100">
-        {{progress.progress}}
-        /{{progress.progress + progress.left}}
+        {{progress.progress}}/{{progress.progress + progress.left}}
       </div>
       <div
         *ngIf="progress.progress + progress.left === 0"
diff --git a/src/frontend/app/ui/settings/tasks/progress/progress.tasks.settings.component.ts b/src/frontend/app/ui/settings/tasks/progress/progress.tasks.settings.component.ts
index ec451a68..f264ffe3 100644
--- a/src/frontend/app/ui/settings/tasks/progress/progress.tasks.settings.component.ts
+++ b/src/frontend/app/ui/settings/tasks/progress/progress.tasks.settings.component.ts
@@ -1,21 +1,22 @@
-import {Component, Input} from '@angular/core';
+import {Component, Input, OnChanges, OnDestroy} from '@angular/core';
 import {TaskProgressDTO, TaskState} from '../../../../../../common/entities/settings/TaskProgressDTO';
+import {Subscription, timer} from 'rxjs';
 
 @Component({
   selector: 'app-settings-tasks-progress',
   templateUrl: './progress.tasks.settings.component.html',
   styleUrls: ['./progress.tasks.settings.component.css']
 })
-export class TasksProgressComponent {
+export class TasksProgressComponent implements OnDestroy, OnChanges {
 
   @Input() progress: TaskProgressDTO;
   TaskState = TaskState;
+  timeCurrentCopy: number;
+  private timerSub: Subscription;
 
   constructor() {
-
   }
 
-
   get TimeAll(): number {
     if (!this.progress) {
       return 0;
@@ -35,9 +36,30 @@ export class TasksProgressComponent {
     if (!this.progress) {
       return 0;
     }
-    return (this.progress.time.current - this.progress.time.start);
+    return (this.timeCurrentCopy - this.progress.time.start);
   }
 
+  ngOnChanges(): void {
+    if (!this.progress) {
+      return;
+    }
+    this.timeCurrentCopy = this.progress.time.current;
+    if (!this.timerSub) {
+      this.timerSub = timer(0, 1000).subscribe(() => {
+        if (this.progress) {
+          this.timeCurrentCopy += 1000;
+        }
+      });
+    }
+  }
+
+  ngOnDestroy(): void {
+    if (this.timerSub) {
+      this.timerSub.unsubscribe();
+    }
+  }
+
+
 }