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

template fixes + bug fixes + style fixes

Browse Source
This commit is contained in:
Dennis Eichhorn 2024-04-02 21:40:48 +00:00
parent ad45c634c6
commit 6378eed239
4 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Controller/BackendController.php
View File

@ -88,7 +88,7 @@ final class BackendController extends Controller implements DashboardElementInte
->where('status', TaskStatus::OPEN) ->where('status', TaskStatus::OPEN)
->sort('createdAt', OrderType::DESC) ->sort('createdAt', OrderType::DESC)
->query($openQuery) ->query($openQuery)
->execute(); ->executeGetArray();
$view->data['open'] = $open; $view->data['open'] = $open;
@ -114,7 +114,7 @@ final class BackendController extends Controller implements DashboardElementInte
->where('status', TaskStatus::OPEN) ->where('status', TaskStatus::OPEN)
->where('createdBy', $response->header->account, '=') ->where('createdBy', $response->header->account, '=')
->sort('createdAt', OrderType::DESC) ->sort('createdAt', OrderType::DESC)
->execute(); ->executeGetArray();
$view->data['given'] = $given; $view->data['given'] = $given;
@ -183,10 +183,10 @@ final class BackendController extends Controller implements DashboardElementInte
} }
if ($request->getData('ptype') === 'p') { if ($request->getData('ptype') === 'p') {
$view->data['tasks'] = $mapperQuery->where('id', $request->getDataInt('id') ?? 0, '<') $view->data['tasks'] = $mapperQuery->where('id', $request->getDataInt('offset') ?? 0, '<')
->executeGetArray(); ->executeGetArray();
} elseif ($request->getData('ptype') === 'n') { } elseif ($request->getData('ptype') === 'n') {
$view->data['tasks'] = $mapperQuery->where('id', $request->getDataInt('id') ?? 0, '>') $view->data['tasks'] = $mapperQuery->where('id', $request->getDataInt('offset') ?? 0, '>')
->executeGetArray(); ->executeGetArray();
} else { } else {
$view->data['tasks'] = $mapperQuery->where('id', 0, '>') $view->data['tasks'] = $mapperQuery->where('id', 0, '>')
@ -315,7 +315,7 @@ final class BackendController extends Controller implements DashboardElementInte
->with('reminderBy') ->with('reminderBy')
->where('task', $task->id) ->where('task', $task->id)
->where('seenBy', $request->header->account) ->where('seenBy', $request->header->account)
->execute(); ->executeGetArray();
foreach ($taskSeen as $unseen) { foreach ($taskSeen as $unseen) {
// Shows all reminders // Shows all reminders

4
Controller/SearchController.php
View File

@ -65,7 +65,7 @@ final class SearchController extends Controller
->sort('taskElements/createdAt', OrderType::ASC) ->sort('taskElements/createdAt', OrderType::ASC)
->limit(8) ->limit(8)
//->limit(1, 'taskElements') //->limit(1, 'taskElements')
->execute(); ->executeGetArray();
$results = []; $results = [];
$count = 0; $count = 0;
@ -132,7 +132,7 @@ final class SearchController extends Controller
->sort('taskElements/createdAt', OrderType::ASC) ->sort('taskElements/createdAt', OrderType::ASC)
->limit(8) ->limit(8)
//->limit(1, 'taskElements') //->limit(1, 'taskElements')
->execute(); ->executeGetArray();
$results = []; $results = [];
$count = 0; $count = 0;

4
Theme/Backend/task-list.tpl.php
View File

@ -19,8 +19,8 @@ use phpOMS\Uri\UriFactory;
/** @var \Modules\Tasks\Models\Task[] $tasks */ /** @var \Modules\Tasks\Models\Task[] $tasks */
$tasks = $this->data['tasks'] ?? []; $tasks = $this->data['tasks'] ?? [];
$previous = empty($tasks) ? 'task/dashboard' : 'task/dashboard?{?}&id=' . \reset($tasks)->id . '&ptype=p'; $previous = empty($tasks) ? 'task/dashboard' : 'task/dashboard?{?}&offset=' . \reset($tasks)->id . '&ptype=p';
$next = empty($tasks) ? 'task/dashboard' : 'task/dashboard?{?}&id=' . \end($tasks)->id . '&ptype=n'; $next = empty($tasks) ? 'task/dashboard' : 'task/dashboard?{?}&offset=' . \end($tasks)->id . '&ptype=n';
echo $this->data['nav']->render(); ?> echo $this->data['nav']->render(); ?>

2
tests/Models/TaskMapperTest.php
View File

@ -139,7 +139,7 @@ final class TaskMapperTest extends \PHPUnit\Framework\TestCase
#[\PHPUnit\Framework\Attributes\Group('module')] #[\PHPUnit\Framework\Attributes\Group('module')]
public function testNewest() : void public function testNewest() : void
{ {
$newest = TaskMapper::getAll()->sort('id', OrderType::DESC)->limit(1)->execute(); $newest = TaskMapper::getAll()->sort('id', OrderType::DESC)->limit(1)->executeGetArray();
self::assertCount(1, $newest); self::assertCount(1, $newest);
} }