diff --git a/public/index.html b/public/index.html index 5240672..b060c9e 100644 --- a/public/index.html +++ b/public/index.html @@ -34,6 +34,7 @@ + diff --git a/public/sections/todo/directives/create/todo.create.modal.directive.js b/public/sections/todo/directives/create/todo.create.modal.directive.js index b745946..e46150a 100644 --- a/public/sections/todo/directives/create/todo.create.modal.directive.js +++ b/public/sections/todo/directives/create/todo.create.modal.directive.js @@ -2,60 +2,61 @@ angular.module('todoApp') .directive('myTodoCreateModal', myTodoCreateModal) .directive('myTodoCreateModalBtn', myTodoCreateModalBtn); -function myTodoCreateModal(){ +function myTodoCreateModal() { return { - scope : { - todoModalId : '@', - onSuccess : '&' + scope: { + todoModalId: '@', + onSuccess: '&' }, - templateUrl : 'sections/todo/directives/create/todo.create.modal.html', - controller : ['$scope', 'Todo', myTodoCreateModalController] + templateUrl: 'sections/todo/directives/create/todo.create.modal.html', + controller: ['$scope', 'Todo', myTodoCreateModalController] } } -function myTodoCreateModalBtn(){ +function myTodoCreateModalBtn() { return { - scope : { - todoModalId : '@', - classes : '@?' + scope: { + todoModalId: '@', + classes: '@?' }, - transclude : true, - templateUrl : 'sections/todo/directives/create/todo.create.modal.btn.html', - controller : ['$scope', myTodoCreateModalBtnController] + transclude: true, + templateUrl: 'sections/todo/directives/create/todo.create.modal.btn.html', + controller: ['$scope', myTodoCreateModalBtnController] } } -function myTodoCreateModalBtnController($scope){ +function myTodoCreateModalBtnController($scope) { $scope.openModal = openModal; - function openModal(){ + function openModal() { $('#' + $scope.todoModalId).openModal(); } } -function myTodoCreateModalController($scope, Todo){ - +function myTodoCreateModalController($scope, Todo) { + $scope.create = create; $scope.todo = { - name : '' + name: '' }; - function refreshTodo(){ + function refreshTodo() { $scope.todo.name = ''; } - function create(){ - console.log($scope.todo) - Todo.save($scope.todo, function(data){ - if($scope.onSuccess){ + function create() { + var todo = $scope.todo; + + Todo.save(todo, function (data) { + if ($scope.onSuccess) { $scope.onSuccess(data); } refreshTodo(); Materialize.toast('The Task was created succesful !', 4000) - }, function(err){ - Materialize.toast('There was an Error: ' + err, 4000); - }); + }, handleError); } + + } diff --git a/public/sections/todo/directives/detail/todo.detail.modal.directive.js b/public/sections/todo/directives/detail/todo.detail.modal.directive.js index a3bb6e4..e30ea54 100644 --- a/public/sections/todo/directives/detail/todo.detail.modal.directive.js +++ b/public/sections/todo/directives/detail/todo.detail.modal.directive.js @@ -43,7 +43,7 @@ function myTodoDetailModalController($scope, Todo) { $scope.onSuccess(); } Materialize.toast('The Task "' + doc.name + '" was updated succesful', 4000); - }) + }, handleError); } function initMaterializeDesign() { diff --git a/public/sections/todo/directives/editcolor/todo.editcolor.modal.directive.js b/public/sections/todo/directives/editcolor/todo.editcolor.modal.directive.js index 9dfedb9..081d562 100644 --- a/public/sections/todo/directives/editcolor/todo.editcolor.modal.directive.js +++ b/public/sections/todo/directives/editcolor/todo.editcolor.modal.directive.js @@ -27,7 +27,7 @@ function myTodoEditColorModaController($scope, Todo){ } Materialize.toast('The Color was Updated for Task: ' + doc.name, 4000) closeModal(); - }); + }, handleError); } function closeModal(){ diff --git a/public/sections/todo/todo.controller.js b/public/sections/todo/todo.controller.js index 3d753a2..356326a 100644 --- a/public/sections/todo/todo.controller.js +++ b/public/sections/todo/todo.controller.js @@ -9,6 +9,7 @@ function TodoController($scope, Todo) { self.refreshList = refreshList; self.openEditModal = openEditModal; self.openDetailModal = openDetailModal; + self.deleteTodo = deleteTodo; refreshList(); @@ -28,6 +29,12 @@ function TodoController($scope, Todo) { self.todoToDetailId = todo._id; } + function deleteTodo(todo) { + Todo.delete({id : todo._id}, function(){ + Materialize.toast('Task deleted', 4000); + refreshList(); + }, handleError); + } } diff --git a/public/sections/todo/todo.html b/public/sections/todo/todo.html index e643993..faada7e 100644 --- a/public/sections/todo/todo.html +++ b/public/sections/todo/todo.html @@ -10,6 +10,7 @@

TODO's List

{{todo.name}} edit + delete diff --git a/public/sections/todo/todo.state.js b/public/sections/todo/todo.state.js index 8db6fbb..4566e19 100644 --- a/public/sections/todo/todo.state.js +++ b/public/sections/todo/todo.state.js @@ -8,7 +8,6 @@ function TodoStateConfig($stateProvider) { parent : 'app', templateUrl : 'sections/todo/todo.html', controller : 'TodoController as ctrl' - }); } \ No newline at end of file diff --git a/public/utils.js b/public/utils.js new file mode 100644 index 0000000..36d01c0 --- /dev/null +++ b/public/utils.js @@ -0,0 +1,3 @@ +function handleError(err) { + Materialize.toast('There was an Error: ' + err.data, 4000); +} \ No newline at end of file