From 2740c529ecdba5f64d4267c9bfad2ff2a3372d5c Mon Sep 17 00:00:00 2001
From: Hillel Coren <hillelcoren@gmail.com>
Date: Tue, 19 Dec 2017 10:14:26 +0200
Subject: [PATCH] Working on task kanban

---
 app/Http/Controllers/TaskKanbanController.php |  51 +++++++
 resources/views/tasks/kanban.blade.php        | 125 ++++++++----------
 routes/web.php                                |   3 +
 3 files changed, 111 insertions(+), 68 deletions(-)

diff --git a/app/Http/Controllers/TaskKanbanController.php b/app/Http/Controllers/TaskKanbanController.php
index e93b854127a2..5a3d599f208d 100644
--- a/app/Http/Controllers/TaskKanbanController.php
+++ b/app/Http/Controllers/TaskKanbanController.php
@@ -48,4 +48,55 @@ class TaskKanbanController extends BaseController
         return view('tasks.kanban', $data);
     }
 
+    /**
+     * @return \Illuminate\Http\RedirectResponse
+     */
+    public function storeStatus()
+    {
+        return $this->saveStatus();
+    }
+
+    /**
+     * @param $publicId
+     *
+     * @return \Illuminate\Http\RedirectResponse
+     */
+    public function updateStatus($publicId)
+    {
+        return $this->saveStatus($publicId);
+    }
+
+    /**
+     * @param bool $publicId
+     *
+     * @return \Illuminate\Http\RedirectResponse
+     */
+    private function saveStatus($publicId = false)
+    {
+        if ($publicId) {
+            $status = TaskStatus::scope($publicId)->firstOrFail();
+        } else {
+            $status = TaskStatus::createNew();
+        }
+
+        $status->name = request('name');
+        $status->save();
+
+        return response()->json($status);
+    }
+
+    /**
+     * @return \Illuminate\Http\RedirectResponse
+     */
+    public function deleteStatus($publicId)
+    {
+        $status = TaskStatus::scope($publicId)->first();
+
+        if ($status) {
+            $status->delete();
+        }
+
+        return response()->json(['message' => RESULT_SUCCESS]);
+    }
+
 }
diff --git a/resources/views/tasks/kanban.blade.php b/resources/views/tasks/kanban.blade.php
index 8142d7c397aa..ee06f345f611 100644
--- a/resources/views/tasks/kanban.blade.php
+++ b/resources/views/tasks/kanban.blade.php
@@ -170,12 +170,16 @@
             for (var i=0; i<tasks.length; i++) {
                 var task = tasks[i];
                 var taskModel = new TaskModel(task);
+                var statusModel = false;
                 if (task.task_status) {
                     var statusModel = statusMap[task.task_status.public_id];
-                } else {
-                    var statusModel = self.statuses()[0];
                 }
-                statusModel.tasks.push(taskModel);
+                if (! statusModel) {
+                    statusModel = self.statuses()[0];
+                }
+                if (statusModel) {
+                    statusModel.tasks.push(taskModel);
+                }
             }
 
             self.startAddStatus = function() {
@@ -188,11 +192,41 @@
             }
 
             self.completeAddStatus = function() {
-                self.is_adding_status(false);
                 var statusModel = new StatusModel({
                     name: self.new_status()
                 })
-                self.statuses.push(statusModel);
+
+                var url = '{{ url('/task_statuses') }}';
+                var data = 'name=' + encodeURIComponent(statusModel.name());
+                self.ajax('post', url, data, function(response) {
+                    statusModel.public_id(response.public_id);
+                    self.statuses.push(statusModel);
+                    self.is_adding_status(false);
+                })
+            }
+
+            self.ajax = function(method, url, data, callback) {
+                model.is_sending_request(true);
+                $.ajax({
+                    type: method,
+                    url: url,
+                    data: data,
+                    dataType: 'json',
+                    accepts: {
+                        json: 'application/json'
+                    },
+                    success: function(response) {
+                        callback(response);
+                    },
+                    error: function(error) {
+                        console.log('error');
+                        console.log(error);
+                    },
+                }).always(function() {
+                    setTimeout(function() {
+                        model.is_sending_request(false);
+                    }, 1000);
+                });
             }
 
             self.onDragged = function() {
@@ -217,21 +251,6 @@
                 self.is_header_hovered(false);
             }
 
-            /*
-            self.inputValue = ko.computed({
-                read: function () {
-                    return self.is_blank() ? '' : self.name();
-                },
-                write: function(value) {
-                    self.name(value);
-                    if (self.is_blank()) {
-                        self.is_blank(false);
-                        model.statuses.push(new StatusModel());
-                    }
-                }
-            });
-            */
-
             self.startStatusEdit = function() {
                 self.is_editing_status(true);
             }
@@ -246,7 +265,10 @@
 
             self.archiveStatus = function() {
                 sweetConfirm(function() {
-                    window.model.statuses.remove(self);
+                    var url = '{{ url('/task_statuses') }}/' + self.public_id();
+                    model.ajax('delete', url, null, function(response) {
+                        model.statuses.remove(self);
+                    })
                 }, "{{ trans('texts.archive_status')}}");
             }
 
@@ -269,30 +291,14 @@
                     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();
+                var url = '{{ url('/tasks') }}';
+                var data = task.toData();
+                model.ajax('post', url, data, function(response) {
+                    task.public_id(response.public_id);
+                    self.tasks.push(task);
+                    self.new_task.reset();
+                    self.endStatusEdit();
+                })
             }
 
             if (data) {
@@ -393,29 +399,12 @@
                 if (! description) {
                     return false;
                 }
-                $.ajax({
-                    dataType: 'json',
-                    type: 'put',
-                    data: self.toData(),
-                    url: '{{ url('/tasks') }}/' + self.public_id(),
-                    accepts: {
-                        json: 'application/json'
-                    },
-                    success: function(response) {
-                        console.log('success');
-                        console.log(response);
-                    },
-                    error: function(error) {
-                        console.log('error');
-                        console.log(error);
-                    },
-                }).always(function() {
-                    setTimeout(function() {
-                        model.is_sending_request(false);
-                    }, 1000);
-                });
 
-                self.endTaskEdit();
+                var url = '{{ url('/tasks') }}/' + self.public_id();
+                var data = self.toData();
+                model.ajax('put', url, data, function(response) {
+                    self.endTaskEdit();
+                });
             }
 
             self.viewTask = function() {
@@ -532,7 +521,7 @@
                 </div>
 
                 <div class="kanban-column-row" data-bind="css: { editing: new_task.is_editing_task }, with: new_task">
-                    <div data-bind="event: { click: startTaskEdit }" style="padding-bottom:6px">
+                    <div data-bind="event: { click: startEditTask }" style="padding-bottom:6px">
                         <a href="#" class="view text-muted" style="font-size:13px" data-bind="visible: is_blank">
                             {{ trans('texts.new_task') }}...
                         </a>
diff --git a/routes/web.php b/routes/web.php
index 7dfe98d1acbf..26ac453c79c5 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -144,6 +144,9 @@ Route::group(['middleware' => ['lookup:user', 'auth:user']], function () {
 
     Route::get('time_tracker', 'TimeTrackerController@index');
     Route::get('tasks/kanban', 'TaskKanbanController@index');
+    Route::post('task_statuses', 'TaskKanbanController@storeStatus');
+    Route::put('task_statuses/{task_status_id}', 'TaskKanbanController@updateStatus');
+    Route::delete('task_statuses/{task_status_id}', 'TaskKanbanController@deleteStatus');
     Route::resource('tasks', 'TaskController');
     Route::get('api/tasks/{client_id?}', 'TaskController@getDatatable');
     Route::get('tasks/create/{client_id?}/{project_id?}', 'TaskController@create');