Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Dashboard widget fix #2839

Merged
merged 3 commits into from
Dec 16, 2024
Merged

Dashboard widget fix #2839

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a2f815c
fix dashboard widget
muhtasimhafiz Nov 29, 2024
56408bc
Merge branch '4.0-dev' into dashboard-widget-fix
muhtasimhafiz Nov 29, 2024
5dc63ad
Merge branch '4.0-dev' into dashboard-widget-fix
marcelfolaron Dec 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion app/Domain/Tickets/Templates/includes/ticketFilter.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,7 +179,8 @@
</x-global::actions.dropdown>
@endif --}}

@if(isset($taskToggle) && $taskToggle === true)
@if (isset($taskToggle) && $taskToggle === true)

<div class="" style="float:right; margin-left:5px;">
<x-global::forms.checkbox labelText="Show Tasks" labelPosition="right" name="showTasks" value="true"
:checked="($tpl->get('showTasks') === 'true')" id="taskTypeToggle" class="toggle" onchange="jQuery('#ticketSearch').submit();" />
Expand Down
41 changes: 20 additions & 21 deletions app/Domain/Widgets/Templates/partials/myToDos.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,13 @@ class="btn btn-primary"
onclick="jQuery('#ticket_new').toggle('fast', function() { jQuery(this).find('input[name=headline]').focus(); });">
<i class="fa fa-plus"></i> Add To-Do
</a>
<div class="btn-group left">
<button class="btn btn-link dropdown-toggle f-right" type="button" data-toggle="dropdown">{!! __("links.group_by") !!}: {{ __('groupByLabel.'.$groupBy) }}</button>
<ul class="dropdown-menu">
<li><span class="radio">
<div class="flex align-center justify-end">
<x-global::actions.dropdown contentRole="ghost">
<x-slot name="labelText">
{!! __("links.group_by") !!}: {{ __('groupByLabel.'.$groupBy) }}
</x-slot>
<x-slot name="menu">
<li><span>
<input type="radio" name="groupBy"
@if($groupBy == "time") checked='checked' @endif
value="time" id="groupByDate"
Expand All @@ -39,7 +42,7 @@ class="btn btn-primary"
/>
<label for="groupByDate">{!! __("label.dates") !!}</label></span></li>
<li>
<span class="radio">
<span>
<input type="radio"
name="groupBy"
@if($groupBy == "project") checked='checked' @endif
Expand All @@ -55,7 +58,7 @@ class="btn btn-primary"
</span>
</li>
<li>
<span class="radio">
<span>
<input type="radio"
name="groupBy"
@if($groupBy == "priority") checked='checked' @endif
Expand All @@ -70,18 +73,14 @@ class="btn btn-primary"
<label for="groupByPriority">{!! __("label.priority") !!}</label>
</span>
</li>

</ul>
</div>
<div class="btn-group left ">
<button class="btn btn-link dropdown-toggle f-right" type="button" data-toggle="dropdown">
{!! __("links.filter") !!}
@if($projectFilter != '')
<span class='badge badge-primary'>1</span>
@endif
</button>
<ul class="dropdown-menu">
<li
</x-slot>
</x-global::actions.dropdown>
<x-global::actions.dropdown contentRole="ghost">
<x-slot name="labelText">
{!! __("links.filter") !!}
</x-slot>
<x-slot name="menu">
<li
@if($projectFilter == '')
class='active'
@endif
Expand Down Expand Up @@ -113,8 +112,8 @@ class='active'
>{{ $project['name'] }}</a></li>
@endforeach
@endif

</ul>
</x-slot>
</x-global::actions.dropdown>
</div>

@dispatchEvent("afterTodoWidgetGroupByDropdown")
Expand Down Expand Up @@ -219,7 +218,7 @@ class="w-full"
@foreach ($ticketGroup['tickets'] as $row)

<li class="ui-state-default" id="ticket_{{ $row['id'] }}" >
<div class="ticketBox fixed priority-border-{{ $row['priority'] }}" data-val="{{ $row['id'] }}">
<div class="ticketBox priority-border-{{ $row['priority'] }}" data-val="{{ $row['id'] }}">
<div class="row">
<div class="col-md-8 titleContainer">
<small>{{ $row['projectName'] }}</small><br />
Expand Down
Loading