mirror of
https://github.com/Karaka-Management/oms-Tasks.git
synced 2026-01-11 15:38:40 +00:00
code fixes
This commit is contained in:
parent
f6a19bab02
commit
7808452b02
|
|
@ -25,10 +25,8 @@ use Modules\Media\Models\Reference;
|
||||||
use Modules\Media\Models\ReferenceMapper;
|
use Modules\Media\Models\ReferenceMapper;
|
||||||
use Modules\Notification\Models\Notification;
|
use Modules\Notification\Models\Notification;
|
||||||
use Modules\Notification\Models\NotificationMapper;
|
use Modules\Notification\Models\NotificationMapper;
|
||||||
use Modules\Notification\Models\NotificationStatus;
|
|
||||||
use Modules\Notification\Models\NotificationType;
|
use Modules\Notification\Models\NotificationType;
|
||||||
use Modules\Profile\Models\ProfileMapper;
|
use Modules\Profile\Models\ProfileMapper;
|
||||||
use Modules\Tasks\Models\DutyType;
|
|
||||||
use Modules\Tasks\Models\PermissionCategory;
|
use Modules\Tasks\Models\PermissionCategory;
|
||||||
use Modules\Tasks\Models\Task;
|
use Modules\Tasks\Models\Task;
|
||||||
use Modules\Tasks\Models\TaskElement;
|
use Modules\Tasks\Models\TaskElement;
|
||||||
|
|
@ -133,7 +131,7 @@ final class ApiController extends Controller
|
||||||
*/
|
*/
|
||||||
public function createTaskReminderFromRequest(RequestAbstract $request) : array
|
public function createTaskReminderFromRequest(RequestAbstract $request) : array
|
||||||
{
|
{
|
||||||
/** @var AccountRelation[] $responsible */
|
/** @var \Modules\Tasks\Models\AccountRelation[] $responsible */
|
||||||
$responsible = TaskMapper::getResponsible((int) $request->getData('id'));
|
$responsible = TaskMapper::getResponsible((int) $request->getData('id'));
|
||||||
|
|
||||||
$reminder = [];
|
$reminder = [];
|
||||||
|
|
@ -176,7 +174,10 @@ final class ApiController extends Controller
|
||||||
$task = $this->createTaskFromRequest($request);
|
$task = $this->createTaskFromRequest($request);
|
||||||
$this->createModel($request->header->account, $task, TaskMapper::class, 'task', $request->getOrigin());
|
$this->createModel($request->header->account, $task, TaskMapper::class, 'task', $request->getOrigin());
|
||||||
|
|
||||||
$this->createNotifications(\reset($task->taskElements), NotificationType::CREATE, $request);
|
$first = \reset($task->taskElements);
|
||||||
|
if ($first !== false) {
|
||||||
|
$this->createNotifications($first, NotificationType::CREATE, $request);
|
||||||
|
}
|
||||||
|
|
||||||
if (!empty($request->files)
|
if (!empty($request->files)
|
||||||
|| !empty($request->getDataJson('media'))
|
|| !empty($request->getDataJson('media'))
|
||||||
|
|
@ -187,6 +188,19 @@ final class ApiController extends Controller
|
||||||
$this->createStandardCreateResponse($request, $response, $task);
|
$this->createStandardCreateResponse($request, $response, $task);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Create notifications for users.
|
||||||
|
*
|
||||||
|
* This is usually called when creating a task or adding a new child element.
|
||||||
|
*
|
||||||
|
* @param TaskElement $ele Task element
|
||||||
|
* @param int $type Notification type (e.g. new, new child element, ...)
|
||||||
|
* @param RequestAbstract $request Request that caused this notification to get created
|
||||||
|
*
|
||||||
|
* @return void
|
||||||
|
*
|
||||||
|
* @since 1.0.0
|
||||||
|
*/
|
||||||
private function createNotifications(TaskElement $ele, int $type, RequestAbstract $request) : void
|
private function createNotifications(TaskElement $ele, int $type, RequestAbstract $request) : void
|
||||||
{
|
{
|
||||||
$accChecked = [];
|
$accChecked = [];
|
||||||
|
|
|
||||||
|
|
@ -126,7 +126,6 @@ final class BackendController extends Controller implements DashboardElementInte
|
||||||
->execute();
|
->execute();
|
||||||
}
|
}
|
||||||
|
|
||||||
/** @var \Modules\Tasks\Models\TaskSeen[] $unread */
|
|
||||||
$view->data['unread'] = TaskMapper::getUnread($request->header->account);
|
$view->data['unread'] = TaskMapper::getUnread($request->header->account);
|
||||||
|
|
||||||
return $view;
|
return $view;
|
||||||
|
|
@ -195,6 +194,8 @@ final class BackendController extends Controller implements DashboardElementInte
|
||||||
}
|
}
|
||||||
|
|
||||||
$view->data['task_media'] = [];
|
$view->data['task_media'] = [];
|
||||||
|
|
||||||
|
/** @var \Modules\Tasks\Models\Task $task */
|
||||||
foreach ($view->data['tasks'] as $task) {
|
foreach ($view->data['tasks'] as $task) {
|
||||||
$view->data['task_media'][$task->id] = TaskMapper::has()
|
$view->data['task_media'][$task->id] = TaskMapper::has()
|
||||||
->with('files')
|
->with('files')
|
||||||
|
|
@ -203,7 +204,6 @@ final class BackendController extends Controller implements DashboardElementInte
|
||||||
->execute();
|
->execute();
|
||||||
}
|
}
|
||||||
|
|
||||||
/** @var \Modules\Tasks\Models\TaskSeen[] $unread */
|
|
||||||
$view->data['unread'] = TaskMapper::getUnread($request->header->account);
|
$view->data['unread'] = TaskMapper::getUnread($request->header->account);
|
||||||
|
|
||||||
return $view;
|
return $view;
|
||||||
|
|
@ -321,7 +321,7 @@ final class BackendController extends Controller implements DashboardElementInte
|
||||||
// Shows all reminders
|
// Shows all reminders
|
||||||
if ($unseen->reminderBy !== null
|
if ($unseen->reminderBy !== null
|
||||||
&& ($unseen->reminderAt?->getTimestamp() ?? 0) < $request->header->getRequestTime()
|
&& ($unseen->reminderAt?->getTimestamp() ?? 0) < $request->header->getRequestTime()
|
||||||
&& ($unseen->reminderAt?->getTimestamp() ?? 0) > ($unseen->seenAt?->getTimestamp() ?? 0) - 300
|
&& ($unseen->reminderAt?->getTimestamp() ?? 0) > $unseen->seenAt->getTimestamp() - 300
|
||||||
) {
|
) {
|
||||||
$reminderStatus[] = $unseen;
|
$reminderStatus[] = $unseen;
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -428,6 +428,13 @@ class Task implements \JsonSerializable
|
||||||
return $this->taskElements[$id] ?? new NullTaskElement();
|
return $this->taskElements[$id] ?? new NullTaskElement();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Get accounts that are responsible for this task
|
||||||
|
*
|
||||||
|
* @return Account[]
|
||||||
|
*
|
||||||
|
* @since 1.0.0
|
||||||
|
*/
|
||||||
public function getResponsible() : array
|
public function getResponsible() : array
|
||||||
{
|
{
|
||||||
$responsible = [];
|
$responsible = [];
|
||||||
|
|
@ -482,6 +489,17 @@ class Task implements \JsonSerializable
|
||||||
return $this->toArray();
|
return $this->toArray();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Create a new task from a task template.
|
||||||
|
*
|
||||||
|
* A task template is a normal task with the type of TEMPLATE.
|
||||||
|
*
|
||||||
|
* @param self $task Task to "clone"
|
||||||
|
*
|
||||||
|
* @return self
|
||||||
|
*
|
||||||
|
* @since 1.0.0
|
||||||
|
*/
|
||||||
public static function fromTemplate(self $task) : self
|
public static function fromTemplate(self $task) : self
|
||||||
{
|
{
|
||||||
$now = new \DateTimeImmutable('now');
|
$now = new \DateTimeImmutable('now');
|
||||||
|
|
|
||||||
|
|
@ -411,7 +411,7 @@ final class TaskMapper extends DataMapperFactory
|
||||||
->innerJoin(AccountRelationMapper::TABLE)
|
->innerJoin(AccountRelationMapper::TABLE)
|
||||||
->on(TaskElementMapper::TABLE . '.' . TaskElementMapper::PRIMARYFIELD, '=', AccountRelationMapper::TABLE . '.task_account_task_element')
|
->on(TaskElementMapper::TABLE . '.' . TaskElementMapper::PRIMARYFIELD, '=', AccountRelationMapper::TABLE . '.task_account_task_element')
|
||||||
->leftJoin(TaskSeenMapper::TABLE)
|
->leftJoin(TaskSeenMapper::TABLE)
|
||||||
->on(TaskMapper::TABLE . '.' . TaskMapper::PRIMARYFIELD, '=', TaskSeenMapper::TABLE . '.task_seen_task')
|
->on(self::TABLE . '.' . self::PRIMARYFIELD, '=', TaskSeenMapper::TABLE . '.task_seen_task')
|
||||||
->where(self::TABLE . '.task_status', '=', TaskStatus::OPEN)
|
->where(self::TABLE . '.task_status', '=', TaskStatus::OPEN)
|
||||||
->andWhere(AccountRelationMapper::TABLE . '.task_account_account', '=', $user)
|
->andWhere(AccountRelationMapper::TABLE . '.task_account_account', '=', $user)
|
||||||
->andWhere(TaskSeenMapper::TABLE . '.task_seen_task', '=', null);
|
->andWhere(TaskSeenMapper::TABLE . '.task_seen_task', '=', null);
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue
Block a user