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

Squashed commit

Browse Source 
Updated dependencies
Added the possibility to skip chore schedules (closes #1486)
Show the meal plan section on the corresponding calendar events (closes #1582)
Make it possible to define a time for meal plan sections and use that time for the corresponding calendar events (references #1582)
Added a changelog template
Make it possible to toggle the meal plan calendar view on bigger screens (closes #1678)
This commit is contained in:
Bernd Bestel
2022-02-08 18:08:26 +01:00
parent 4279bf6445
commit 66cf7e4ffa
27 changed files with 556 additions and 301 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
views/choresjournal.blade.php
View File

@@ -102,7 +102,7 @@
<tbody class="d-none">
@foreach($choresLog as $choreLogEntry)
<tr id="chore-execution-{{ $choreLogEntry->id }}-row"
class="@if($choreLogEntry->undone == 1) text-muted @endif">
class="@if($choreLogEntry->undone == 1) text-muted @endif @if($choreLogEntry->skipped == 1) font-italic @endif">
<td class="fit-content border-right">
<a class="btn btn-secondary btn-xs undo-chore-execution-button permission-CHORE_UNDO_EXECUTION @if($choreLogEntry->undone == 1) disabled @endif"
href="#"
@@ -126,6 +126,9 @@
<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>
@if($choreLogEntry->skipped == 1)
<span class="text-muted">{{ $__t('Skipped') }}</span>
@endif
</td>
@if(GROCY_FEATURE_FLAG_CHORES_ASSIGNMENTS)
<td>

9
views/choresoverview.blade.php
View File

@@ -149,6 +149,15 @@
data-chore-name="{{ FindObjectInArrayByPropertyValue($chores, 'id', $curentChoreEntry->chore_id)->name }}">
<i class="fas fa-play"></i>
</a>
<a class="btn btn-secondary btn-sm track-chore-button skip permission-CHORE_TRACK_EXECUTION @if(FindObjectInArrayByPropertyValue($chores, 'id', $curentChoreEntry->chore_id)->period_type == \Grocy\Services\ChoresService::CHORE_PERIOD_TYPE_MANUALLY) disabled @endif"
href="#"
data-toggle="tooltip"
data-placement="left"
title="{{ $__t('Skip next chore schedule') }}"
data-chore-id="{{ $curentChoreEntry->chore_id }}"
data-chore-name="{{ FindObjectInArrayByPropertyValue($chores, 'id', $curentChoreEntry->chore_id)->name }}">
<i class="fas fa-forward"></i>
</a>
<div class="dropdown d-inline-block">
<button class="btn btn-sm btn-light text-secondary"
type="button"

5
views/choretracking.blade.php
View File

@@ -63,8 +63,9 @@
'entity' => 'chores_log'
))
<button id="save-choretracking-button"
class="btn btn-success">{{ $__t('OK') }}</button>
<button class="btn btn-success save-choretracking-button">{{ $__t('OK') }}</button>
<button class="btn btn-secondary save-choretracking-button skip">{{ $__t('Skip') }}</button>
</form>
</div>

18
views/mealplan.blade.php
View File

@@ -36,12 +36,20 @@
.fc-axis div {
transform: translateX(-50%) translateY(-50%) rotate(-90deg);
font-weight: bold;
font-size: 1.8em;
font-size: 1.75em;
letter-spacing: 0.1em;
position: absolute;
top: 50%;
left: 0;
margin-left: 15px;
margin-left: 17px;
min-width: 100px;
line-height: 0.55;
text-align: center;
}
.fc-axis .small {
font-size: 60%;
letter-spacing: normal;
}
.fc-content-skeleton {
@@ -112,9 +120,11 @@
<div class="col">
<div class="calendar"
data-section-id="{{ $mealplanSection->id }}"
data-section-name="{{ $mealplanSection->name }}"
data-section-name="{{ $mealplanSection->name }}<br><span class='small text-muted'>{{ $mealplanSection->time_info }}</span>"
data-primary-section="{{ BoolToString($loop->first) }}"
{{-- $loop->last doesn't work however, is always null... --}}
{{--
$loop->last doesn't work however, is always null...
--}}
data-last-section="{{ BoolToString(array_values(array_slice($usedMealplanSections->fetchAll(), -1))[0]->id == $mealplanSection->id) }}">
</div>
</div>

9
views/mealplansectionform.blade.php
View File

@@ -53,6 +53,15 @@
'hint' => $__t('Sections will be ordered by that number on the meal plan')
))
<div class="form-group">
<label for="time_info">{{ $__t('Time') }}</label>
<input type="time"
class="form-control"
id="time_info"
name="time_info"
value="@if($mode == 'edit'){{ $mealplanSection->time_info }}@endif">
</div>
<button id="save-mealplansection-button"
class="btn btn-success">{{ $__t('Save') }}</button>

4
views/mealplansections.blade.php
View File

@@ -75,6 +75,7 @@
</th>
<th>{{ $__t('Name') }}</th>
<th>{{ $__t('Sort number') }}</th>
<th>{{ $__t('Time') }}</th>
</tr>
</thead>
<tbody class="d-none">
@@ -102,6 +103,9 @@
<td>
{{ $mealplanSection->sort_number }}
</td>
<td>
{{ $mealplanSection->time_info }}
</td>
</tr>
@endforeach
</tbody>