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

Finish first version of tasks feature

Browse Source
This commit is contained in:
Bernd Bestel
2018-09-23 19:26:13 +02:00
parent f85a67a1ff
commit 06f25b7006
16 changed files with 239 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
views/components/datetimepicker.blade.php
View File

@@ -3,6 +3,7 @@
@endpush
@php if(!isset($isRequired)) { $isRequired = true; } @endphp
@php if(!isset($initialValue)) { $initialValue = ''; } @endphp
<div class="form-group">
<label for="{{ $id }}">{{ $L($label) }} <span class="small text-muted"><time id="datetimepicker-timeago" class="timeago timeago-contextual"></time>@if(!empty($hint))<br>{{ $L($hint) }}@endif</span></label>
@@ -11,6 +12,7 @@
<input type="text" @if($isRequired) required @endif class="form-control datetimepicker-input"
data-target="#{{ $id }}" data-format="{{ $format }}"
data-init-with-now="{{ BoolToString($initWithNow) }}"
data-init-value="{{ $initialValue }}"
data-limit-end-to-now="{{ BoolToString($limitEndToNow) }}"
data-limit-start-to-now="{{ BoolToString($limitStartToNow) }}"
data-next-input-selector="{{ $nextInputSelector }}" />

1
views/components/userpicker.blade.php
View File

@@ -4,6 +4,7 @@
@php if(empty($prefillByUsername)) { $prefillByUsername = ''; } @endphp
@php if(empty($prefillByUserId)) { $prefillByUserId = ''; } @endphp
@php if(!isset($nextInputSelector)) { $nextInputSelector = ''; } @endphp
<div class="form-group" data-next-input-selector="{{ $nextInputSelector }}" data-prefill-by-username="{{ $prefillByUsername }}" data-prefill-by-user-id="{{ $prefillByUserId }}">
<label for="user_id">{{ $L($label) }}</label>

15
views/taskform.blade.php
View File

@@ -48,7 +48,7 @@
'limitEndToNow' => false,
'limitStartToNow' => false,
'invalidFeedback' => $L('A due date is required'),
'nextInputSelector' => '',
'nextInputSelector' => 'category_id',
'additionalCssClasses' => 'date-only-datetimepicker',
'isRequired' => false
))
@@ -63,6 +63,19 @@
</select>
</div>
@php
$initUserId = GROCY_USER_ID;
if ($mode == 'edit')
{
$initUserId = $task->assigned_to_user_id;
}
@endphp
@include('components.userpicker', array(
'label' => 'Assigned to',
'users' => $users,
'prefillByUserId' => $initUserId
))
<button id="save-task-button" type="submit" class="btn btn-success">{{ $L('Save') }}</button>
</form>

22
views/tasks.blade.php
View File

@@ -33,6 +33,14 @@
<label for="search">{{ $L('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 d-flex align-items-end">
<div class="form-check">
<input class="form-check-input" type="checkbox" id="show-done-tasks">
<label class="form-check-label" for="show-done-tasks">
{{ $L('Show done tasks') }}
</label>
</div>
</div>
</div>
<div class="row">
@@ -41,16 +49,17 @@
<thead>
<tr>
<th>#</th>
<th>{{ $L('Aufgabe') }}</th>
<th>{{ $L('Task') }}</th>
<th>{{ $L('Due') }}</th>
<th class="d-none">Hidden category</th>
<th>{{ $L('Assigned to') }}</th>
</tr>
</thead>
<tbody>
@foreach($tasks as $task)
<tr id="task-{{ $task->id }}-row" class="@if($task->due_date < date('Y-m-d')) table-danger @elseif($task->due_date < date('Y-m-d', strtotime("+$nextXDays days"))) table-warning @endif">
<tr id="task-{{ $task->id }}-row" class="@if($task->done == 1) text-muted @endif @if(!empty($task->due_date) && $task->due_date < date('Y-m-d')) table-danger @elseif(!empty($task->due_date) && $task->due_date < date('Y-m-d', strtotime("+$nextXDays days"))) table-warning @endif">
<td class="fit-content">
<a class="btn btn-success btn-sm do-task-button" href="#" data-toggle="tooltip" title="{{ $L('Mark task "#1" as completed', $task->name) }}"
<a class="btn btn-success btn-sm do-task-button @if($task->done == 1) disabled @endif" href="#" data-toggle="tooltip" title="{{ $L('Mark task "#1" as completed', $task->name) }}"
data-task-id="{{ $task->id }}"
data-task-name="{{ $task->name }}">
<i class="fas fa-check"></i>
@@ -64,7 +73,7 @@
<i class="fas fa-edit"></i>
</a>
</td>
<td>
<td id="task-{{ $task->id }}-name" class="@if($task->done == 1) text-strike-through @endif">
{{ $task->name }}
</td>
<td>
@@ -72,7 +81,10 @@
<time class="timeago timeago-contextual" datetime="{{ $task->due_date }}"></time>
</td>
<td class="d-none">
@if($task->category_id !== null) <span>{{ FindObjectInArrayByPropertyValue($taskCategories, 'id', $task->category_id)->name }}</span> @else <span class="font-italic font-weight-light">{{ $L('Uncategorized') }}</span>@endif
@if($task->category_id != null) <span>{{ FindObjectInArrayByPropertyValue($taskCategories, 'id', $task->category_id)->name }}</span> @else <span class="font-italic font-weight-light">{{ $L('Uncategorized') }}</span>@endif
</td>
<td>
@if($task->assigned_to_user_id != null) <span>{{ GetUserDisplayName(FindObjectInArrayByPropertyValue($users, 'id', $task->assigned_to_user_id)) }}</span> @endif
</td>
</tr>
@endforeach