Skip to content

Commit d319f9a

Browse files
author
Iurii Karpov
committed
Fix tasks export
1 parent 7f010b7 commit d319f9a

1 file changed

Lines changed: 33 additions & 8 deletions

File tree

‎src/components/tasks/TasksListComponent.vue‎

Lines changed: 33 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,19 @@
2323
>
2424
{{ allSelected ? 'Deselect all' : 'Select all' }}
2525
</button>
26+
<button
27+
v-if="selected.filter(Boolean).length > 0"
28+
@click="showProcessModal"
29+
type="button"
30+
class="rounded-md bg-green-600 px-3 py-1.5 text-sm font-medium text-white hover:bg-green-700"
31+
>
32+
Process ({{ selected.filter(Boolean).length }})
33+
</button>
2634
<span
2735
v-if="selected.filter(Boolean).length > 0"
2836
class="text-sm text-gray-500 dark:text-gray-400"
2937
>
30-
Selected: {{ selected.filter(Boolean).length }} of {{ tasks.length }}
38+
{{ selectedSummary }}
3139
</span>
3240
</div>
3341

@@ -519,6 +527,26 @@
519527
this.selected.every(Boolean)
520528
);
521529
},
530+
selectedSummary() {
531+
const tasks = this.getSelectedTasks();
532+
if (!tasks.length) return '';
533+
const totalSeconds = tasks.reduce((s, t) => s + (t.common_time || 0), 0);
534+
const totalHours = (totalSeconds / 3600).toFixed(1);
535+
let overtimeSeconds = 0;
536+
for (const task of tasks) {
537+
const expected = this.getApproximatelyTime(task);
538+
const actual = task.common_time || 0;
539+
if (expected > 0 && actual > expected) {
540+
overtimeSeconds += actual - expected;
541+
}
542+
}
543+
const overtimeHours = (overtimeSeconds / 3600).toFixed(1);
544+
let text = `${tasks.length} of ${this.tasks.length} · ${totalHours}h`;
545+
if (overtimeSeconds > 0) {
546+
text += ` · +${overtimeHours}h overtime`;
547+
}
548+
return text;
549+
},
522550
taskComputedData() {
523551
return this.tasks.reduce((acc, task) => {
524552
acc[task.id] = {
@@ -841,12 +869,7 @@
841869
: !v && this.selected[i],
842870
);
843871
844-
this.isShowSelectedTasksCommonTime =
845-
this.selected.filter(Boolean).length >= 1;
846872
this.selecting = [];
847-
if (this.isShowSelectedTasksCommonTime) {
848-
this.countTimeForModal();
849-
}
850873
},
851874
countTimeForModal() {
852875
const time = this.getSelectedTasks().reduce(
@@ -892,14 +915,16 @@
892915
);
893916
}
894917
},
918+
showProcessModal() {
919+
this.countTimeForModal();
920+
this.isShowSelectedTasksCommonTime = true;
921+
},
895922
selectAll() {
896923
if (this.allSelected) {
897924
this.selected = [];
898925
this.isShowSelectedTasksCommonTime = false;
899926
} else {
900927
this.selected = this.tasks.map(() => true);
901-
this.isShowSelectedTasksCommonTime = this.selected.length > 0;
902-
this.countTimeForModal();
903928
}
904929
},
905930
onPageChange(page: number) {

0 commit comments

Comments
 (0)