Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-07-07 18:44:28 -04:00
Code Issues Packages Projects Releases Wiki Activity

Clean up kanban

Browse Source
This commit is contained in:
Hillel Coren 2017-12-26 15:59:37 +02:00
parent e336b6b117
commit 25f21eb7d8
4 changed files with 27 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/Http/Controllers/TaskKanbanController.php
View File

@ -79,13 +79,16 @@ class TaskKanbanController extends BaseController
} }
$data = [ $data = [
'showBreadcrumbs' => false,
'title' => trans('texts.kanban'), 'title' => trans('texts.kanban'),
'statuses' => $statuses, 'statuses' => $statuses,
'tasks' => $tasks, 'tasks' => $tasks,
'clients' => $clients, 'clients' => $clients,
'projects' => $projects, 'projects' => $projects,
'clientPublicId' => $clientPublicId, 'clientPublicId' => $clientPublicId,
'client' => $clientPublicId ? Client::scope($clientPublicId)->first() : null,
'projectPublicId' => $projectPublicId, 'projectPublicId' => $projectPublicId,
'project' => $projectPublicId ? Project::scope($projectPublicId)->first() : null,
]; ];
return view('tasks.kanban', $data); return view('tasks.kanban', $data);

5
app/Models/Project.php
View File

@ -81,6 +81,11 @@ class Project extends EntityModel
$query->whereBetween('due_date', [$startDate, $endDate]); $query->whereBetween('due_date', [$startDate, $endDate]);
}); });
} }
public function getDisplayName()
{
return $this->name;
}
} }
Project::creating(function ($project) { Project::creating(function ($project) {

4
resources/views/projects/show.blade.php
View File

@ -59,7 +59,9 @@
<div class="row"> <div class="row">
<div class="col-md-3"> <div class="col-md-3">
<h3>{{ trans('texts.details') }}</h3> <h3>{{ trans('texts.details') }}</h3>
{{ trans('texts.client') }}: {!! $project->client->present()->link !!}<br/> <h4>
{!! $project->client->present()->link !!}<br/>
</h4>
@if ($project->due_date) @if ($project->due_date)
{{ trans('texts.due_date') . ': ' . Utils::fromSqlDate($project->due_date) }}<br/> {{ trans('texts.due_date') . ': ' . Utils::fromSqlDate($project->due_date) }}<br/>
@endif @endif

16
resources/views/tasks/kanban.blade.php
View File

@ -134,6 +134,7 @@
@section('content') @section('content')
<script type="text/javascript"> <script type="text/javascript">
var statuses = {!! $statuses !!}; var statuses = {!! $statuses !!};
@ -678,6 +679,21 @@
</script> </script>
<ol class="breadcrumb">
@if ($project)
<li>{!! link_to('/projects', trans('texts.projects')) !!}</li>
<li>{!! $project->present()->link !!}</li>
@elseif ($client)
<li>{!! link_to('/tasks', trans('texts.tasks')) !!}</li>
<li>{!! $client->present()->link !!}</li>
@else
<li>{!! link_to('/tasks', trans('texts.tasks')) !!}</li>
@endif
<li class="active">{{ trans('texts.kanban') }}</li>
</ol>
<div class="kanban" style="display: none"> <div class="kanban" style="display: none">
<div data-bind="sortable: { data: statuses, as: 'status', afterMove: onStatusDragged, allowDrop: true, connectClass: 'connect-column' }" style="float:left"> <div data-bind="sortable: { data: statuses, as: 'status', afterMove: onStatusDragged, allowDrop: true, connectClass: 'connect-column' }" style="float:left">
<div class="well kanban-column"> <div class="well kanban-column">