kenmirrors/grocy
1
0
Fork 0
mirror of https://github.com/grocy/grocy.git synced 2025-10-12 16:44:55 +00:00
Code Issues Projects Releases Wiki Activity

Continue working on tasks feature

Browse Source
This commit is contained in:
Bernd Bestel
2018-09-23 09:22:54 +02:00
parent 6fe0100927
commit f85a67a1ff
17 changed files with 370 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
views/tasks.blade.php
View File

@@ -6,12 +6,23 @@
@push('pageScripts')
<script src="{{ $U('/node_modules/jquery-ui-dist/jquery-ui.min.js?v=', true) }}{{ $version }}"></script>
<script src="{{ $U('/node_modules/datatables.net-rowgroup/js/dataTables.rowGroup.min.js?v=', true) }}{{ $version }}"></script>
<script src="{{ $U('/node_modules/datatables.net-rowgroup-bs4/js/rowGroup.bootstrap4.min.js?v=', true) }}{{ $version }}"></script>
@endpush
@push('pageStyles')
<link href="{{ $U('/node_modules/datatables.net-rowgroup-bs4/css/rowGroup.bootstrap4.min.css?v=', true) }}{{ $version }}" rel="stylesheet">
@endpush
@section('content')
<div class="row">
<div class="col">
<h1>@yield('title')</h1>
<h1>
@yield('title')
<a class="btn btn-outline-dark responsive-button" href="{{ $U('/task/new') }}">
<i class="fas fa-plus"></i> {{ $L('Add') }}
</a>
</h1>
<p id="info-due-tasks" data-next-x-days="{{ $nextXDays }}" class="btn btn-lg btn-warning no-real-button responsive-button mr-2"></p>
<p id="info-overdue-tasks" class="btn btn-lg btn-danger no-real-button responsive-button"></p>
</div>
@@ -32,19 +43,22 @@
<th>#</th>
<th>{{ $L('Aufgabe') }}</th>
<th>{{ $L('Due') }}</th>
<th class="d-none">Hidden category</th>
</tr>
</thead>
<tbody>
@foreach($tasks as $task)
<tr id="task-{{ $task->id }}-row" class="@if($task->due < date('Y-m-d H:i:s')) table-danger @elseif($task->due < date('Y-m-d H:i:s', strtotime("+$nextXDays days"))) table-warning @endif">
<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">
<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) }}"
data-task-id="{{ $task->id }}">
data-task-id="{{ $task->id }}"
data-task-name="{{ $task->name }}">
<i class="fas fa-check"></i>
</a>
<a class="btn btn-success btn-sm start-task-button" href="#" data-toggle="tooltip" title="{{ $L('Start task "#1"', $task->name) }}"
data-task-id="{{ $task->id }}">
<i class="fas fa-play"></i>
<a class="btn btn-sm btn-danger delete-task-button" href="#"
data-task-id="{{ $task->id }}"
data-task-name="{{ $task->name }}">
<i class="fas fa-trash"></i>
</a>
<a class="btn btn-info btn-sm" href="{{ $U('/task/') }}{{ $task->id }}">
<i class="fas fa-edit"></i>
@@ -54,8 +68,11 @@
{{ $task->name }}
</td>
<td>
<span>{{ $task->due }}</span>
<time class="timeago timeago-contextual" datetime="{{ $task->due }}"></time>
<span>{{ $task->due_date }}</span>
<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
</td>
</tr>
@endforeach