Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-07-09 03:14:30 -04:00
Code Issues Packages Projects Releases Wiki Activity

Working on task kanban

Browse Source
This commit is contained in:
Hillel Coren 2017-12-17 22:41:36 +02:00
parent 9030ee7db0
commit 23b3f95265
2 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2618,6 +2618,7 @@ $LANG = array(
'ready_to_do' => 'Ready to do', 'ready_to_do' => 'Ready to do',
'in_progress' => 'In progress', 'in_progress' => 'In progress',
'add_status' => 'Add status', 'add_status' => 'Add status',
'archive_status' => 'Archive Status',
); );

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

@ -7,9 +7,11 @@
.kanban { .kanban {
overflow-x: auto; overflow-x: auto;
white-space: nowrap; white-space: nowrap;
min-height: 540px;
} }
.kanban-column { .kanban-column {
background-color: #EAEAEA;
padding: 10px; padding: 10px;
height: 100%; height: 100%;
width: 230px; width: 230px;
@ -204,7 +206,9 @@
} }
self.archiveStatus = function() { self.archiveStatus = function() {
window.model.statuses.remove(self); sweetConfirm(function() {
window.model.statuses.remove(self);
}, "{{ trans('texts.archive_status')}}");
} }
self.cancelNewTask = function() { self.cancelNewTask = function() {
@ -226,7 +230,6 @@
if (data) { if (data) {
ko.mapping.fromJS(data, {}, this); ko.mapping.fromJS(data, {}, this);
self.tasks.push(new TaskModel({description:'testing'}));
} else { } else {
self.name('{{ trans('texts.add_status') }}...'); self.name('{{ trans('texts.add_status') }}...');
self.is_blank(true); self.is_blank(true);
@ -235,6 +238,7 @@
function TaskModel(data) { function TaskModel(data) {
var self = this; var self = this;
self.public_id = ko.observable(0);
self.description = ko.observable(''); self.description = ko.observable('');
self.description.orig = ko.observable(''); self.description.orig = ko.observable('');
self.is_blank = ko.observable(false); self.is_blank = ko.observable(false);
@ -247,7 +251,6 @@
} }
var projectId = self.project().public_id(); var projectId = self.project().public_id();
var colorNum = (projectId-1) % 8; var colorNum = (projectId-1) % 8;
console.log('project-group' + (colorNum+1));
return 'project-group' + (colorNum+1); return 'project-group' + (colorNum+1);
}) })
@ -275,10 +278,15 @@
self.endEdit(); self.endEdit();
} }
self.saveEditTask = function(task) { self.saveEditTask = function() {
self.endEdit(); self.endEdit();
} }
self.viewTask = function() {
//console.log();
window.open('{{ url('/tasks') }}/' + self.public_id() + '/edit', '_blank');
}
self.reset = function() { self.reset = function() {
self.endEdit(); self.endEdit();
self.description(''); self.description('');
@ -352,6 +360,9 @@
<button type='button' class='btn btn-default btn-sm' data-bind="click: cancelEditTask"> <button type='button' class='btn btn-default btn-sm' data-bind="click: cancelEditTask">
{{ trans('texts.cancel') }} {{ trans('texts.cancel') }}
</button> </button>
<button type='button' class='btn btn-primary btn-sm' data-bind="click: viewTask">
{{ trans('texts.view') }}
</button>
<button type='button' class='btn btn-success btn-sm' data-bind="click: saveEditTask"> <button type='button' class='btn btn-success btn-sm' data-bind="click: saveEditTask">
{{ trans('texts.save') }} {{ trans('texts.save') }}
</button> </button>