Mirrors/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2024-09-20 00:11:35 +02:00
Code Issues Releases Activity

Working on task kanban

Browse Source
This commit is contained in:
Hillel Coren 2017-12-18 23:28:07 +02:00
parent c10635123e
commit 1ca6808ab2
3 changed files with 54 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/Ninja/Repositories/TaskRepository.php
View File

@ -5,6 +5,7 @@ namespace App\Ninja\Repositories;
use App\Models\Client;
use App\Models\Project;
use App\Models\Task;
use App\Models\TaskStatus;
use Auth;
use Session;
use DB;
@ -161,6 +162,12 @@ class TaskRepository extends BaseRepository
if (isset($data['description'])) {
$task->description = trim($data['description']);
}
if (isset($data['task_status_id'])) {
$task->task_status_id = $data['task_status_id'] ? TaskStatus::getPrivateId($data['task_status_id']) : null;
}
if (isset($data['task_status_sort_order'])) {
$task->task_status_sort_order = $data['task_status_sort_order'];
}
if (isset($data['time_log'])) {
$timeLog = json_decode($data['time_log']);

2
resources/lang/en/texts.php
View File

@ -2490,7 +2490,7 @@ $LANG = array(
'clear' => 'Clear',
'warn_payment_gateway' => 'Note: accepting online payments requires a payment gateway, :link to add one.',
'task_rate' => 'Task Rate',
'task_rate_help' => 'Set the default <b>rate for invoiced tasks</b>.',
'task_rate_help' => 'Set the default rate for invoiced tasks.',
'past_due' => 'Past Due',
'document' => 'Document',
'invoice_or_expense' => 'Invoice/Expense',

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

@ -50,7 +50,7 @@
}
.kanban-column-row {
margin-bottom: -8px;
margin-bottom: -12px;
}
.kanban-column-row .fa-circle {
@ -59,6 +59,10 @@
padding-right: 8px;
}
.kanban-column-row .panel {
word-break: break-all;
}
.kanban-column-row .view div {
padding: 8px;
}
@ -144,6 +148,7 @@
self.is_adding_status = ko.observable(false);
self.new_status = ko.observable('');
self.filter = ko.observable('');
self.is_sending_request = ko.observable(false);
for (var i=0; i<statuses.length; i++) {
var status = statuses[i];
@ -198,6 +203,7 @@
function StatusModel(data) {
var self = this;
self.name = ko.observable();
self.public_id = ko.observable();
self.is_editing_status = ko.observable(false);
self.is_header_hovered = ko.observable(false);
self.tasks = ko.observableArray();
@ -252,13 +258,38 @@
}
self.saveNewTask = function() {
var description = self.new_task.description();
var task = self.new_task;
var description = (task.description() || '').trim();
if (! description) {
return false;
}
var task = new TaskModel({
description: description
description: description,
task_status_id: self.public_id(),
task_status_sort_order: self.tasks.length,
})
$.ajax({
dataType: 'json',
type: 'post',
data: task.toData(),
url: '{{ url('/tasks') }}',
accepts: {
json: 'application/json'
},
success: function(response) {
task.public_id(response.public_id);
},
error: function(error) {
console.log('error');
console.log(error);
},
}).always(function() {
setTimeout(function() {
model.is_sending_request(false);
}, 1000);
});
self.tasks.push(task);
self.new_task.reset();
self.endStatusEdit();
@ -278,6 +309,8 @@
self.is_editing_task = ko.observable(false);
self.project = ko.observable();
self.client = ko.observable();
self.task_status_id = ko.observable();
self.task_status_sort_order = ko.observable();
self.projectColor = ko.computed(function() {
if (! self.project()) {
@ -306,6 +339,12 @@
}
self.toData = function() {
return 'description=' + encodeURIComponent(self.description()) +
'&task_status_id=' + self.task_status_id() +
'&task_status_sort_order=' + self.task_status_sort_order();
}
self.matchesFilter = function(filter) {
if (filter) {
filter = filter.toLowerCase();
@ -408,8 +447,12 @@
}
$(function() {
toastr.options.timeOut = 3000;
toastr.options.positionClass = 'toast-bottom-right';
window.model = new ViewModel();
ko.applyBindings(model);
$('.kanban').show();
});