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

fix templates

Browse Source
This commit is contained in:
Dennis Eichhorn 2024-04-17 17:45:07 +00:00
parent 98d1d5404a
commit 4cc1911a74
3 changed files with 39 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
Admin/Install/attributes.json
View File

@ -33,6 +33,19 @@
"default_value": "", "default_value": "",
"values": [] "values": []
}, },
{
"name": "bill",
"l11n": {
"en": "Bill",
"de": "Beleg"
},
"value_type": "int",
"is_custom_allowed": true,
"validation_pattern": "",
"is_required": false,
"default_value": "",
"values": []
},
{ {
"name": "lot_external", "name": "lot_external",
"l11n": { "l11n": {
@ -102,7 +115,7 @@
{ {
"name": "measure", "name": "measure",
"l11n": { "l11n": {
"en": "measure", "en": "Measure",
"de": "Maßnahme" "de": "Maßnahme"
}, },
"value_type": 1, "value_type": 1,

10
Controller/ApiController.php
View File

@ -197,7 +197,7 @@ final class ApiController extends Controller
* *
* @since 1.0.0 * @since 1.0.0
*/ */
private function createNotifications(TaskElement $ele, int $type, RequestAbstract $request) : void public function createNotifications(TaskElement $ele, int $type, RequestAbstract $request) : void
{ {
$accChecked = []; $accChecked = [];
$grpChecked = []; $grpChecked = [];
@ -239,7 +239,9 @@ final class ApiController extends Controller
$notification->type = $type; $notification->type = $type;
$notification->category = PermissionCategory::TASK; $notification->category = PermissionCategory::TASK;
$notification->element = $task->id; $notification->element = $task->id;
$notification->redirect = '{/base}/task/view?{?}&id=' . $element->task; $notification->redirect = empty($task->redirect)
? '{/base}/task/view?{?}&id=' . $element->task
: $task->redirect;
$this->createModel($request->header->account, $notification, NotificationMapper::class, 'notification', $request->getOrigin()); $this->createModel($request->header->account, $notification, NotificationMapper::class, 'notification', $request->getOrigin());
$accChecked[] = $rel->relation->id; $accChecked[] = $rel->relation->id;
@ -277,7 +279,9 @@ final class ApiController extends Controller
$notification->type = $type; $notification->type = $type;
$notification->category = PermissionCategory::TASK; $notification->category = PermissionCategory::TASK;
$notification->element = $task->id; $notification->element = $task->id;
$notification->redirect = '{/base}/task/view?{?}&id=' . $element->task; $notification->redirect = empty($task->redirect)
? '{/base}/task/view?{?}&id=' . $element->task
: $task->redirect;
$this->createModel($request->header->account, $notification, NotificationMapper::class, 'notification', $request->getOrigin()); $this->createModel($request->header->account, $notification, NotificationMapper::class, 'notification', $request->getOrigin());
$accChecked[] = $account->id; $accChecked[] = $account->id;

34
Controller/BackendController.php
View File

@ -162,17 +162,11 @@ final class BackendController extends Controller implements DashboardElementInte
$view->setTemplate('/Modules/Tasks/Theme/Backend/task-list'); $view->setTemplate('/Modules/Tasks/Theme/Backend/task-list');
$view->data['nav'] = $this->app->moduleManager->get('Navigation')->createNavigationMid(1001101001, $request, $response); $view->data['nav'] = $this->app->moduleManager->get('Navigation')->createNavigationMid(1001101001, $request, $response);
if ($isModerator) { $mapperQuery = $isModerator
$mapperQuery = TaskMapper::getAll() ? TaskMapper::getAll()
->with('tags') : TaskMapper::getAnyRelatedToUser($request->header->account);
->with('tags/title')
->with('createdBy') $view->data['tasks'] = $mapperQuery
->where('status', TaskStatus::OPEN, '!=')
->where('type', TaskType::SINGLE)
->sort('createdAt', OrderType::DESC)
->limit(25);
} else {
$mapperQuery = TaskMapper::getAnyRelatedToUser($request->header->account)
->with('tags') ->with('tags')
->with('tags/title') ->with('tags/title')
->with('createdBy') ->with('createdBy')
@ -180,19 +174,13 @@ final class BackendController extends Controller implements DashboardElementInte
->where('type', TaskType::SINGLE) ->where('type', TaskType::SINGLE)
->where('tags/title/language', $response->header->l11n->language) ->where('tags/title/language', $response->header->l11n->language)
->sort('createdAt', OrderType::DESC) ->sort('createdAt', OrderType::DESC)
->limit(25); ->limit(25)
} ->paginate(
'id',
if ($request->getData('ptype') === 'p') { $request->getData('ptype'),
$view->data['tasks'] = $mapperQuery->where('id', $request->getDataInt('offset') ?? 0, '<') $request->getDataInt('offset')
)
->executeGetArray(); ->executeGetArray();
} elseif ($request->getData('ptype') === 'n') {
$view->data['tasks'] = $mapperQuery->where('id', $request->getDataInt('offset') ?? 0, '>')
->executeGetArray();
} else {
$view->data['tasks'] = $mapperQuery->where('id', 0, '>')
->executeGetArray();
}
$view->data['task_media'] = []; $view->data['task_media'] = [];