diff --git a/app/Domain/Tickets/Hxcontrollers/TicketColumn.php b/app/Domain/Tickets/Hxcontrollers/TicketColumn.php index b9931aba4..fda6cebde 100644 --- a/app/Domain/Tickets/Hxcontrollers/TicketColumn.php +++ b/app/Domain/Tickets/Hxcontrollers/TicketColumn.php @@ -31,7 +31,7 @@ public function get($params): void { // $ticketId = (int) ($params['id']); $statusKey = (int) ($params['status']); - $allTickets = $this->ticketService->getAll(['status' => $statusKey]); + $allTickets = $this->ticketService->getAll($params); $ticketTypeIcons = $this->ticketService->getTypeIcons(); $priorities = $this->ticketService->getPriorityLabels(); $efforts = $this->ticketService->getEffortLabels(); diff --git a/app/Domain/Tickets/Templates/includes/ticketFilterHx.blade.php b/app/Domain/Tickets/Templates/includes/ticketFilterHx.blade.php new file mode 100644 index 000000000..50044189a --- /dev/null +++ b/app/Domain/Tickets/Templates/includes/ticketFilterHx.blade.php @@ -0,0 +1,266 @@ +get('groupByOptions'); +$sortBy = $tpl->get('sortOptions'); +$searchCriteria = $tpl->get('searchCriteria'); +$statusLabels = $tpl->get('allTicketStates'); +$taskToggle = $tpl->get('enableTaskTypeToggle'); + +?> +
+ + + + + + + + {{ __('popover.filter') }} + + + + + {{-- @dispatchTplEvent('filters.beforeFirstBarField') --}} + +
+ + {{ __('label.user') }} + All + Users + @foreach ($tpl->get('users') as $userRow) + + {{ sprintf(__('text.full_name'), e($userRow['firstname']), e($userRow['lastname'])) }} + + @endforeach + +
+ +
+ + {{ __('label.milestone') }} + + {{ __('label.all_milestones') }} + + @foreach ($tpl->get('milestones') as $milestoneRow) + + {{ $tpl->escape($milestoneRow->headline) }} + + @endforeach + +
+ +
+ + {{ __('label.todo_type') }} + + {{ __('label.all_types') }} + + @foreach ($tpl->get('types') as $type) + + {{ $type }} + + @endforeach + +
+ +
+ + {{ __('label.todo_priority') }} + + {{ __('label.all_priorities') }} + + @foreach ($tpl->get('priorities') as $priorityKey => $priorityValue) + + {{ $priorityValue }} + + @endforeach + +
+ +
+ + {{ __('label.todo_status') }} + + {{ __('label.all_statuses') }} + + + {{ __('label.not_done') }} + + @foreach ($statusLabels as $key => $label) + + {{ $tpl->escape($label['name']) }} + + @endforeach + +
+ +
+ +
+ +
+ + {{ __('buttons.search') }} + +
+ +
+
+ + + + + + + {{ __('popover.group_by') }} + + @if ($searchCriteria['groupBy'] !== 'all' && $searchCriteria['groupBy'] !== '') + 1 + @endif + + + + @foreach ($groupBy as $input) + + + + + + + @endforeach + + + + + {{-- @if ($currentRoute !== 'tickets.roadmap' && $currentRoute != 'tickets.showProjectCalendar') + + + {{ __('popover.group_by') }} + + @if ($searchCriteria['groupBy'] !== 'all' && $searchCriteria['groupBy'] !== '') + 1 + @endif + + + + + @foreach ($groupBy as $input) + + + + + + + @endforeach + + + @endif --}} + + @if (isset($taskToggle) && $taskToggle === true) +
+ +
+ @endif + + +
+ + @php + $tpl->dispatchTplEvent('filters.beforeBar'); + $tpl->dispatchTplEvent('filters.beforeFormClose'); + @endphp + +
+ + diff --git a/app/Domain/Tickets/Templates/showKanban.blade.php b/app/Domain/Tickets/Templates/showKanban.blade.php index 2e94fa33f..0db9f85f2 100644 --- a/app/Domain/Tickets/Templates/showKanban.blade.php +++ b/app/Domain/Tickets/Templates/showKanban.blade.php @@ -25,7 +25,7 @@
@include('tickets::includes.ticketNewBtn') - @include('tickets::includes.ticketFilter') + @include('tickets::includes.ticketFilterHx')