Skip to content

Commit b708d45

Browse files
committed
worksheet dailychart board
1 parent d5ea1bd commit b708d45

File tree

2 files changed

+8
-4
lines changed

2 files changed

+8
-4
lines changed

apps/Worksheets/Controllers/Boards/DailyChart.php

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -81,14 +81,15 @@ public function prepareView(): void
8181
if (!isset($sortedWorkDays[$year][$month][$date]["tasks"][$activity->TASK->id])) {
8282
$sortedWorkDays[$year][$month][$date]["tasks"][$activity->TASK->id] = $activity->TASK->toArray();
8383
$sortedWorkDays[$year][$month][$date]["tasks"][$activity->TASK->id]['_WORKED_HOURS'] = 0;
84+
$sortedWorkDays[$year][$month][$date]["tasks"][$activity->TASK->id]['_DESCRIPTIONS'] = [];
8485
}
8586
$sortedWorkDays[$year][$month][$date]["tasks"][$activity->TASK->id]['_WORKED_HOURS'] += (float) $activity->worked_hours;
87+
$sortedWorkDays[$year][$month][$date]["tasks"][$activity->TASK->id]['_DESCRIPTIONS'][] = $activity->description;
8688

87-
if (isset($sortedWorkDays[$year][$month][$date]["hours"])) {
88-
$sortedWorkDays[$year][$month][$date]["hours"] += (float) $activity->worked_hours;
89-
} else {
90-
$sortedWorkDays[$year][$month][$date]["hours"] = (float) $activity->worked_hours;
89+
if (!isset($sortedWorkDays[$year][$month][$date]["hours"])) {
90+
$sortedWorkDays[$year][$month][$date]["hours"] = 0;
9191
}
92+
$sortedWorkDays[$year][$month][$date]["hours"] += (float) $activity->worked_hours;
9293
}
9394

9495
$this->viewParams["worksheet"] = $sortedWorkDays;

apps/Worksheets/Views/Boards/DailyChart.twig

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,9 @@
4545
<div class="bg-primary" style="display:block;height:2px;width:{{ task._WORKED_HOURS/2 }}em"></div>
4646
<b>{{ task._WORKED_HOURS }} h</b>
4747
<b>{{ task.PROJECTS[0].identifier }} {{ task.PROJECTS[0].title }}</b> [{{ task.identifier }}] {{ task.title }}
48+
{% for d in task._DESCRIPTIONS %}
49+
<div class="text-gray-400 pl-2">• {{ d }}</div>
50+
{% endfor %}
4851
</span>
4952
</a>
5053
{% endfor %}

0 commit comments

Comments
 (0)