kenmirrors/grocy
1
0
Fork 0
mirror of https://github.com/grocy/grocy.git synced 2025-04-29 01:32:38 +00:00
Code Issues Projects Releases Wiki Activity

Clear manually rescheduled date on chore execution (references #1830)

Browse Source
This commit is contained in:
Bernd Bestel 2022-03-27 16:11:16 +02:00
parent f41a219760
commit acebed5aae
No known key found for this signature in database
GPG Key ID: 71BD34C0D4891300
3 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
public/viewjs/choresoverview.js
View File

@ -156,6 +156,8 @@ $(document).on('click', '.track-chore-button', function(e)
$('#chore-' + choreId + '-next-execution-assigned-user').text(result.next_execution_assigned_user.display_name); $('#chore-' + choreId + '-next-execution-assigned-user').text(result.next_execution_assigned_user.display_name);
} }
$('#chore-' + choreId + '-reschedule-icon').remove();
Grocy.FrontendHelpers.EndUiBusy(); Grocy.FrontendHelpers.EndUiBusy();
toastr.success(__t('Tracked execution of chore %1$s on %2$s', choreName, trackedTime)); toastr.success(__t('Tracked execution of chore %1$s on %2$s', choreName, trackedTime));
RefreshStatistics(); RefreshStatistics();

7
services/ChoresService.php
View File

@ -205,6 +205,13 @@ class ChoresService extends BaseService
$this->getStockService()->ConsumeProduct($chore->product_id, $chore->product_amount, false, StockService::TRANSACTION_TYPE_CONSUME, 'default', null, null, $transactionId, true); $this->getStockService()->ConsumeProduct($chore->product_id, $chore->product_amount, false, StockService::TRANSACTION_TYPE_CONSUME, 'default', null, null, $transactionId, true);
} }
if (!empty($chore->rescheduled_date))
{
$chore->update([
'rescheduled_date' => null
]);
}
return $lastInsertId; return $lastInsertId;
} }

3
views/choresoverview.blade.php
View File

@ -219,7 +219,8 @@
<span>-</span> <span>-</span>
@endif @endif
@if($curentChoreEntry->is_rescheduled == 1) @if($curentChoreEntry->is_rescheduled == 1)
<span class="text-muted" <span id="chore-{{ $curentChoreEntry->chore_id }}-reschedule-icon"
class="text-muted"
data-toggle="tooltip" data-toggle="tooltip"
title="{{ $__t('Rescheduled') }}"> title="{{ $__t('Rescheduled') }}">
<i class="far fa-clock"></i> <i class="far fa-clock"></i>