kenmirrors/grocy
1
0
Fork 0
mirror of https://github.com/grocy/grocy.git synced 2025-08-20 04:12:59 +00:00
Code Issues Projects Releases Wiki Activity

Make it possible to manually re-assign chores (closes #1492, references #1830)

Browse Source
This commit is contained in:
Bernd Bestel
2022-04-03 13:56:14 +02:00
parent a5294262e6
commit 3efecb8bed
8 changed files with 232 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
views/choresoverview.blade.php
View File

@@ -165,7 +165,7 @@
<i class="fas fa-ellipsis-v"></i>
</button>
<div class="table-inline-menu dropdown-menu dropdown-menu-right">
<a class="dropdown-item reschedule-chore-button @if(FindObjectInArrayByPropertyValue($chores, 'id', $curentChoreEntry->chore_id)->period_type == \Grocy\Services\ChoresService::CHORE_PERIOD_TYPE_MANUALLY) disabled @endif"
<a class="dropdown-item reschedule-chore-button"
data-chore-id="{{ $curentChoreEntry->chore_id }}"
type="button"
href="#">
@@ -210,16 +210,18 @@
{{ FindObjectInArrayByPropertyValue($chores, 'id', $curentChoreEntry->chore_id)->name }}
</td>
<td>
@if(FindObjectInArrayByPropertyValue($chores, 'id', $curentChoreEntry->chore_id)->period_type !== \Grocy\Services\ChoresService::CHORE_PERIOD_TYPE_MANUALLY)
@if(!empty($curentChoreEntry->next_estimated_execution_time))
<span id="chore-{{ $curentChoreEntry->chore_id }}-next-execution-time">{{ $curentChoreEntry->next_estimated_execution_time }}</span>
<time id="chore-{{ $curentChoreEntry->chore_id }}-next-execution-time-timeago"
class="timeago timeago-contextual @if($curentChoreEntry->track_date_only == 1) timeago-date-only @endif"
datetime="{{ $curentChoreEntry->next_estimated_execution_time }}"></time>
@else
<span>-</span>
<span id="chore-{{ $curentChoreEntry->chore_id }}-next-execution-time">-</span>
<time id="chore-{{ $curentChoreEntry->chore_id }}-next-execution-time-timeago"
class="timeago timeago-contextual @if($curentChoreEntry->track_date_only == 1) timeago-date-only @endif"></time>
@endif
@if($curentChoreEntry->is_rescheduled == 1)
<span id="chore-{{ $curentChoreEntry->chore_id }}-reschedule-icon"
<span id="chore-{{ $curentChoreEntry->chore_id }}-rescheduled-icon"
class="text-muted"
data-toggle="tooltip"
title="{{ $__t('Rescheduled') }}">
@@ -228,10 +230,16 @@
@endif
</td>
<td>
@if(!empty($curentChoreEntry->last_tracked_time))
<span id="chore-{{ $curentChoreEntry->chore_id }}-last-tracked-time">{{ $curentChoreEntry->last_tracked_time }}</span>
<time id="chore-{{ $curentChoreEntry->chore_id }}-last-tracked-time-timeago"
class="timeago timeago-contextual @if($curentChoreEntry->track_date_only == 1) timeago-date-only @endif"
datetime="{{ $curentChoreEntry->last_tracked_time }}"></time>
@else
<span id="chore-{{ $curentChoreEntry->chore_id }}-last-tracked-time">-</span>
<time id="chore-{{ $curentChoreEntry->chore_id }}-last-tracked-time-timeago"
class="timeago timeago-contextual @if($curentChoreEntry->track_date_only == 1) timeago-date-only @endif"></time>
@endif
</td>
<td class="@if(!GROCY_FEATURE_FLAG_CHORES_ASSIGNMENTS) d-none @endif">
@@ -241,6 +249,14 @@
@else
<span>-</span>
@endif
@if($curentChoreEntry->is_reassigned == 1)
<span id="chore-{{ $curentChoreEntry->chore_id }}-reassigned-icon"
class="text-muted"
data-toggle="tooltip"
title="{{ $__t('Reassigned') }}">
<i class="fas fa-exchange-alt"></i>
</span>
@endif
</span>
</td>
<td id="chore-{{ $curentChoreEntry->chore_id }}-due-filter-column"
@@ -309,6 +325,11 @@
'invalidFeedback' => $__t('This can only be in the future')
))
@include('components.userpicker', array(
'label' => 'Assigned to',
'users' => $users
))
</form>
</div>
<div class="modal-footer">