mirror of
https://github.com/grocy/grocy.git
synced 2025-04-28 17:23:56 +00:00
05aceb72ae
- Only refresh contextual number/datetime info/formatting where needed (closes #513) - Also refresh correlated stock journal entries on undo (closes #471) - Prefill "New amount" with the current stock amount on the inventory page (closes #434) - Ensure that the location_id of the stock and stock_log tables is never empty after migration 95 (references #421) - Load initial values of the /stockedit form server side to improve loading performance (references #421) - Use more or less the same input ordering as on the purchase page for the /stockedit page (references #421) - Also display the "Compact view" button on the shopping list page when FEATURE_FLAG_SHOPPINGLIST_MULTIPLE_LISTS is disabled (references #453) - Ensure that the currently active sidebar menu item is visible - Optimized sidebar menu item grouping/spacing - Properly order the API documentation route groups and put the "by-barcode" routes into a separate group - Updated dependencies - Pulled translations from Transifex - Prepared changelog for next release
79 lines
2.8 KiB
PHP
79 lines
2.8 KiB
PHP
@extends('layout.default')
|
|
|
|
@section('title', $__t('Chores journal'))
|
|
@section('activeNav', 'choresjournal')
|
|
@section('viewJsName', 'choresjournal')
|
|
|
|
@section('content')
|
|
<div class="row">
|
|
<div class="col">
|
|
<h1>@yield('title')</h1>
|
|
</div>
|
|
</div>
|
|
|
|
<div class="row my-3">
|
|
<div class="col-xs-12 col-md-6 col-xl-3">
|
|
<label for="search">{{ $__t('Search') }}</label> <i class="fas fa-search"></i>
|
|
<input type="text" class="form-control" id="search">
|
|
</div>
|
|
<div class="col-xs-12 col-md-6 col-xl-3">
|
|
<label for="chore-filter">{{ $__t('Filter by chore') }}</label> <i class="fas fa-filter"></i>
|
|
<select class="form-control" id="chore-filter">
|
|
<option value="all">{{ $__t('All') }}</option>
|
|
@foreach($chores as $chore)
|
|
<option value="{{ $chore->id }}">{{ $chore->name }}</option>
|
|
@endforeach
|
|
</select>
|
|
</div>
|
|
</div>
|
|
|
|
<div class="row">
|
|
<div class="col">
|
|
<table id="chores-journal-table" class="table table-sm table-striped dt-responsive">
|
|
<thead>
|
|
<tr>
|
|
<th class="border-right"></th>
|
|
<th>{{ $__t('Chore') }}</th>
|
|
<th>{{ $__t('Tracked time') }}</th>
|
|
@if(GROCY_FEATURE_FLAG_CHORES_ASSIGNMENTS)
|
|
<th>{{ $__t('Done by') }}</th>
|
|
@endif
|
|
</tr>
|
|
</thead>
|
|
<tbody class="d-none">
|
|
@foreach($choresLog as $choreLogEntry)
|
|
<tr id="chore-execution-{{ $choreLogEntry->id }}-row" class="@if($choreLogEntry->undone == 1) text-muted @endif">
|
|
<td class="fit-content border-right">
|
|
<a class="btn btn-secondary btn-sm undo-chore-execution-button @if($choreLogEntry->undone == 1) disabled @endif" href="#" data-execution-id="{{ $choreLogEntry->id }}" data-toggle="tooltip" data-placement="left" title="{{ $__t('Undo chore execution') }}">
|
|
<i class="fas fa-undo"></i>
|
|
</a>
|
|
</td>
|
|
<td>
|
|
<span class="name-anchor @if($choreLogEntry->undone == 1) text-strike-through @endif">{{ FindObjectInArrayByPropertyValue($chores, 'id', $choreLogEntry->chore_id)->name }}</span>
|
|
@if($choreLogEntry->undone == 1)
|
|
<br>
|
|
{{ $__t('Undone on') . ' ' . $choreLogEntry->undone_timestamp }}
|
|
<time class="timeago timeago-contextual" datetime="{{ $choreLogEntry->undone_timestamp }}"></time>
|
|
@endif
|
|
</td>
|
|
<td>
|
|
<span>{{ $choreLogEntry->tracked_time }}</span>
|
|
<time class="timeago timeago-contextual @if(FindObjectInArrayByPropertyValue($chores, 'id', $choreLogEntry->chore_id)->track_date_only == 1) timeago-date-only @endif" datetime="{{ $choreLogEntry->tracked_time }}"></time>
|
|
</td>
|
|
@if(GROCY_FEATURE_FLAG_CHORES_ASSIGNMENTS)
|
|
<td>
|
|
@if ($choreLogEntry->done_by_user_id !== null && !empty($choreLogEntry->done_by_user_id))
|
|
{{ GetUserDisplayName(FindObjectInArrayByPropertyValue($users, 'id', $choreLogEntry->done_by_user_id)) }}
|
|
@else
|
|
{{ $__t('Unknown') }}
|
|
@endif
|
|
</td>
|
|
@endif
|
|
</tr>
|
|
@endforeach
|
|
</tbody>
|
|
</table>
|
|
</div>
|
|
</div>
|
|
@stop
|