Jingga/oms-Tasks
1
0
Fork 0
mirror of https://github.com/Karaka-Management/oms-Tasks.git synced 2026-01-10 15:18:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

improve task element listing in task

Browse Source
This commit is contained in:
Dennis Eichhorn 2020-06-10 22:13:29 +02:00
parent 7a7a99f18b
commit cc94670c6f
3 changed files with 20 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Controller/BackendController.php
View File

@ -142,7 +142,7 @@ final class BackendController extends Controller implements DashboardElementInte
$head = $response->get('Content')->getData('head');
$head->addAsset(AssetType::CSS, '/Modules/Tasks/Theme/Backend/css/styles.css');
$task = TaskMapper::get((int) $request->getData('id'), RelationType::ALL, 3);
$task = TaskMapper::get((int) $request->getData('id'), RelationType::ALL, 4);
$accountId = $request->getHeader()->getAccount();
if (!($task->getCreatedBy()->getId() === $accountId

2
Theme/Backend/css/styles.css
View File

@ -17,7 +17,7 @@
}
.tag.task-status-3 {
background: #f1c40f;
background: #ffd321;
}
.tag.task-status-4 {

22
Theme/Backend/task-single.tpl.php
View File

@ -169,8 +169,22 @@ echo $this->getData('nav')->render(); ?>
</template>
<?php endif; ?>
<?php $c = 0; $previous = null;
foreach ($elements as $key => $element) : ++$c;
if ($element->getDescription() !== '') : ?>
foreach ($elements as $key => $element) : ++$c; ?>
<?php if (($c === 1 && $element->getStatus() !== TaskStatus::OPEN)
|| ($previous !== null && $element->getStatus() !== $previous->getStatus())
) : ?>
<section class="box wf-100">
<div class="inner">
Status change by <?= $this->printHtml($element->getCreatedBy()->getName1()); ?>
on <?= $this->printHtml($element->getCreatedAt()->format('Y-m-d H:i')); ?>
to <span class="tag task-status-<?= $this->printHtml($element->getStatus()); ?>">
<?= $this->getHtml('S' . $element->getStatus()) ?>
</span>
</div>
</section>
<?php endif; ?>
<?php if ($element->getDescription() !== '') : ?>
<section id="taskelmenet-<?= $c; ?>" class="portlet taskElement"
data-update-content="#elements"
data-update-element=".taskElement .taskElement-content"
@ -263,8 +277,8 @@ echo $this->getData('nav')->render(); ?>
<?php endforeach; ?>
</div>
</section>
<?php endif; $previous = $element; ?>
<?php endforeach; ?>
<?php endif; ?>
<?php $previous = $element; endforeach; ?>
</div>
</div>