jjsm01/kimai2
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Order quick entries by project name (#3488)

Browse Source
This commit is contained in:
Kevin Papst
2022-08-27 17:11:48 +02:00
committed by GitHub
parent c3a43fe677
commit 7c3a08057d
1 changed files with 16 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/Controller/QuickEntryController.php
View File

@@ -120,6 +120,7 @@ class QuickEntryController extends AbstractController
$beginTime = $this->configuration->getTimesheetDefaultBeginTime(); $beginTime = $this->configuration->getTimesheetDefaultBeginTime();
// fill all rows and columns to make sure we do not have missing records
/** @var QuickEntryModel[] $models */ /** @var QuickEntryModel[] $models */
$models = []; $models = [];
foreach ($rows as $id => $row) { foreach ($rows as $id => $row) {
@@ -168,6 +169,9 @@ class QuickEntryController extends AbstractController
} }
} }
// sort rows by projects - make it configurable in the future
uasort($models, [$this, 'sortByProjectName']);
$formModel = new QuickEntryWeek($startWeek, $models); $formModel = new QuickEntryWeek($startWeek, $models);
$form = $this->createForm(QuickEntryForm::class, $formModel, [ $form = $this->createForm(QuickEntryForm::class, $formModel, [
@@ -225,8 +229,19 @@ class QuickEntryController extends AbstractController
return $this->render('quick-entry/index.html.twig', [ return $this->render('quick-entry/index.html.twig', [
'days' => $week, 'days' => $week,
'week' => $rows,
'form' => $form->createView(), 'form' => $form->createView(),
]); ]);
} }
private function sortByProjectName(QuickEntryModel $a, QuickEntryModel $b): int
{
$aName = $a->getProject() !== null ? $a->getProject()->getName() : null;
$bName = $b->getProject() !== null ? $b->getProject()->getName() : null;
if ($aName === null || $bName === null) {
return -1;
}
return strcmp($aName, $bName);
}
} }