Jingga/oms-Tasks
1
0
Fork 0
mirror of https://github.com/Karaka-Management/oms-Tasks.git synced 2026-01-11 07:38:39 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix responsible

Browse Source
This commit is contained in:
Dennis Eichhorn 2024-02-05 01:07:27 +00:00
parent 854cad4c1d
commit f524e490f4
3 changed files with 35 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Controller/BackendController.php
View File

@ -136,6 +136,9 @@ final class BackendController extends Controller implements DashboardElementInte
->with('createdBy') ->with('createdBy')
->with('tags') ->with('tags')
->with('tags/title') ->with('tags/title')
->with('taskElements')
->with('taskElements/accRelation')
->with('taskElements/accRelation/relation')
->where('tags/title/language', $response->header->l11n->language) ->where('tags/title/language', $response->header->l11n->language)
->where('type', TaskType::SINGLE) ->where('type', TaskType::SINGLE)
->where('status', TaskStatus::OPEN) ->where('status', TaskStatus::OPEN)

25
Models/Task.php
View File

@ -428,6 +428,31 @@ class Task implements \JsonSerializable
return $this->taskElements[$id] ?? new NullTaskElement(); return $this->taskElements[$id] ?? new NullTaskElement();
} }
public function getResponsible() : array
{
$responsible = [];
foreach ($this->taskElements as $element) {
if (empty($element->accRelation)) {
continue;
}
$first = true;
foreach ($element->accRelation as $accRel) {
if ($accRel->duty === DutyType::TO) {
if ($first) {
$responsible = [];
}
$responsible[] = $accRel->relation;
$first = false;
}
}
}
return $responsible;
}
/** /**
* {@inheritdoc} * {@inheritdoc}
*/ */

20
Theme/Backend/task-dashboard.tpl.php
View File

@ -161,24 +161,18 @@ echo $this->data['nav']->render(); ?>
</span> </span>
</a> </a>
<?php endforeach; ?> <?php endforeach; ?>
<td data-label="<?= $this->getHtml('Creator'); ?>"> <td><?php $responsibles = $task->getResponsible();
<a class="content" href="<?= UriFactory::build('{/base}/profile/view?{?}&for=' . $task->createdBy->id); ?>"> foreach ($responsibles as $responsible) : ?>
<?= $this->printHtml($this->renderUserName( <a class="content" href="<?= UriFactory::build('{/base}/profile/view?for=' . $responsible->id); ?>">
'%3$s %2$s %1$s', <?= $this->printHtml($responsible->name1); ?> <?= $this->printHtml($responsible->name2); ?>
[ </a>
$task->createdBy->name1, <?php endforeach; ?>
$task->createdBy->name2,
$task->createdBy->name3,
$task->createdBy->login ?? '',
])
); ?>
</a>
<td data-label="<?= $this->getHtml('Created'); ?>"> <td data-label="<?= $this->getHtml('Created'); ?>">
<a href="<?= $url; ?>"><?= $this->printHtml($task->createdAt->format('Y-m-d H:i')); ?></a> <a href="<?= $url; ?>"><?= $this->printHtml($task->createdAt->format('Y-m-d H:i')); ?></a>
<?php endforeach; if ($c == 0) : ?> <?php endforeach; if ($c == 0) : ?>
<tr><td colspan="7" class="empty"><?= $this->getHtml('Empty', '0', '0'); ?> <tr><td colspan="7" class="empty"><?= $this->getHtml('Empty', '0', '0'); ?>
<?php endif; ?> <?php endif; ?>
</table> </table>
</div> </div>
</div> </div>
</div> </div>