xuthus/pigallery2
1
0
Fork 0
mirror of https://github.com/xuthus83/pigallery2.git synced 2025-01-14 14:43:17 +08:00
Code Actions Projects Activity

improving task ui

Browse Source
This commit is contained in:
Patrik J. Braun 2019-12-24 00:44:32 +01:00
parent d38d0f01bf
commit f8b06be700
2 changed files with 28 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/frontend/app/ui/settings/tasks/progress/progress.tasks.settings.component.html
View File

@ -22,8 +22,7 @@
aria-valuemax="100" aria-valuemax="100"
style="min-width: 2em;" style="min-width: 2em;"
[style.width.%]="(progress.progress/(progress.left+progress.progress))*100"> [style.width.%]="(progress.progress/(progress.left+progress.progress))*100">
{{progress.progress}} {{progress.progress}}/{{progress.progress + progress.left}}
/{{progress.progress + progress.left}}
</div> </div>
<div <div
*ngIf="progress.progress + progress.left === 0" *ngIf="progress.progress + progress.left === 0"

32
src/frontend/app/ui/settings/tasks/progress/progress.tasks.settings.component.ts
View File

@ -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 {TaskProgressDTO, TaskState} from '../../../../../../common/entities/settings/TaskProgressDTO';
import {Subscription, timer} from 'rxjs';
@Component({ @Component({
selector: 'app-settings-tasks-progress', selector: 'app-settings-tasks-progress',
templateUrl: './progress.tasks.settings.component.html', templateUrl: './progress.tasks.settings.component.html',
styleUrls: ['./progress.tasks.settings.component.css'] styleUrls: ['./progress.tasks.settings.component.css']
}) })
export class TasksProgressComponent { export class TasksProgressComponent implements OnDestroy, OnChanges {
@Input() progress: TaskProgressDTO; @Input() progress: TaskProgressDTO;
TaskState = TaskState; TaskState = TaskState;
timeCurrentCopy: number;
private timerSub: Subscription;
constructor() { constructor() {
} }
get TimeAll(): number { get TimeAll(): number {
if (!this.progress) { if (!this.progress) {
return 0; return 0;
@ -35,9 +36,30 @@ export class TasksProgressComponent {
if (!this.progress) { if (!this.progress) {
return 0; 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();
}
}
} }