Make it possible to disable chores/tasks/batteries due soon filters/highlighting (closes #1485)

This commit is contained in:
Bernd Bestel
2022-01-23 19:20:23 +01:00
parent 04a3069294
commit cf52e5ec96
11 changed files with 26 additions and 12 deletions

View File

@@ -38,7 +38,7 @@
<div id="info-due-soon-batteries"
data-status-filter="duesoon"
data-next-x-days="{{ $nextXDays }}"
class="warning-message status-filter-message responsive-button"></div>
class="warning-message status-filter-message responsive-button @if($nextXDays == 0) d-none @endif"></div>
<div class="float-right">
<a class="btn btn-sm btn-outline-info d-md-none mt-1"
data-toggle="collapse"
@@ -79,7 +79,9 @@
<option value="all">{{ $__t('All') }}</option>
<option value="overdue">{{ $__t('Overdue') }}</option>
<option value="duetoday">{{ $__t('Due today') }}</option>
@if($nextXDays > 0)
<option value="duesoon">{{ $__t('Due soon') }}</option>
@endif
</select>
</div>
</div>

View File

@@ -20,8 +20,9 @@
'id' => 'batteries_due_soon_days',
'additionalAttributes' => 'data-setting-key="batteries_due_soon_days"',
'label' => 'Due soon days',
'min' => 1,
'additionalCssClasses' => 'user-setting-control'
'min' => 0,
'additionalCssClasses' => 'user-setting-control',
'hint' => $__t('Set to 0 to hide due soon filters/highlighting')
))
<a href="{{ $U('/batteriesoverview') }}"

View File

@@ -38,7 +38,7 @@
<div id="info-due-soon-chores"
data-status-filter="duesoon"
data-next-x-days="{{ $nextXDays }}"
class="warning-message status-filter-message responsive-message mr-2"></div>
class="warning-message status-filter-message responsive-message mr-2 @if($nextXDays == 0) d-none @endif"></div>
@if(GROCY_FEATURE_FLAG_CHORES_ASSIGNMENTS)
<div id="info-assigned-to-me-chores"
data-user-filter="xx{{ GROCY_USER_ID }}xx"
@@ -84,7 +84,9 @@
<option value="all">{{ $__t('All') }}</option>
<option value="overdue">{{ $__t('Overdue') }}</option>
<option value="duetoday">{{ $__t('Due today') }}</option>
@if($nextXDays > 0)
<option value="duesoon">{{ $__t('Due soon') }}</option>
@endif
</select>
</div>
</div>

View File

@@ -16,12 +16,14 @@
<div class="row">
<div class="col-lg-6 col-12">
<h4 class="mt-2">{{ $__t('Chores overview') }}</h4>
@include('components.numberpicker', array(
'id' => 'chores_due_soon_days',
'additionalAttributes' => 'data-setting-key="chores_due_soon_days"',
'label' => 'Due soon days',
'min' => 1,
'additionalCssClasses' => 'user-setting-control'
'min' => 0,
'additionalCssClasses' => 'user-setting-control',
'hint' => $__t('Set to 0 to hide due soon filters/highlighting')
))
<a href="{{ $U('/choresoverview') }}"

View File

@@ -38,7 +38,7 @@
<div id="info-due-soon-tasks"
data-status-filter="duesoon"
data-next-x-days="{{ $nextXDays }}"
class="warning-message status-filter-message responsive-button mr-2"></div>
class="warning-message status-filter-message responsive-button @if($nextXDays == 0) d-none @endif"></div>
<div class="float-right">
<a class="btn btn-sm btn-outline-info d-md-none mt-1"
data-toggle="collapse"
@@ -79,7 +79,9 @@
<option value="all">{{ $__t('All') }}</option>
<option value="overdue">{{ $__t('Overdue') }}</option>
<option value="duetoday">{{ $__t('Due today') }}</option>
@if($nextXDays > 0)
<option value="duesoon">{{ $__t('Due soon') }}</option>
@endif
</select>
</div>
</div>

View File

@@ -20,8 +20,9 @@
'id' => 'tasks_due_soon_days',
'additionalAttributes' => 'data-setting-key="tasks_due_soon_days"',
'label' => 'Due soon days',
'min' => 1,
'additionalCssClasses' => 'user-setting-control'
'min' => 0,
'additionalCssClasses' => 'user-setting-control',
'hint' => $__t('Set to 0 to hide due soon filters/highlighting')
))
<a href="{{ $U('/tasks') }}"