From a51cb39d60e64a42d584c2e75561762a582773e4 Mon Sep 17 00:00:00 2001 From: sudheesh001 Date: Tue, 31 Mar 2015 11:18:06 +0530 Subject: [PATCH] Fixes #18 Delete functionality for sprints, sprints can be deleted before / after archiving --- app/js/controllers.js | 4 ++++ app/js/services.js | 9 +++++++++ app/views/sprint.html | 1 + server/db/sprint.js | 4 ++++ server/routes/dbController.js | 2 ++ 5 files changed, 20 insertions(+) diff --git a/app/js/controllers.js b/app/js/controllers.js index adc314a..1d07d78 100644 --- a/app/js/controllers.js +++ b/app/js/controllers.js @@ -161,6 +161,10 @@ angular.module('myApp.controllers', []) $scope.m = data }); + $scope.delete = sprintService.delete($routeParams.id, function (data) { + $scope.m = data + }); + $scope.getBugs = function() { $scope.bugs = []; bzService.getBugs($scope.m.whiteboard, function (data) { diff --git a/app/js/services.js b/app/js/services.js index ec7a6cb..991c15a 100644 --- a/app/js/services.js +++ b/app/js/services.js @@ -45,6 +45,15 @@ angular.module('myApp.services', ['ngResource']) .success(cb); }; }; + service.delete = function(id, cb) { + return function() { + $http + .put('/api/sprint/' +id, { + deletion: true + }) + .success(cb); + }; + }; return service; } ]) diff --git a/app/views/sprint.html b/app/views/sprint.html index 601805f..ce8d2cd 100644 --- a/app/views/sprint.html +++ b/app/views/sprint.html @@ -21,6 +21,7 @@

Archive this Sprint + Delete Sprint
diff --git a/server/db/sprint.js b/server/db/sprint.js index 0153d46..7e258e0 100644 --- a/server/db/sprint.js +++ b/server/db/sprint.js @@ -28,6 +28,10 @@ module.exports = function(sequelize, t) { archived: { type: t.BOOLEAN, default: 0 + }, + deletion: { + type: t.BOOLEAN, + default: 0 } }); }; diff --git a/server/routes/dbController.js b/server/routes/dbController.js index 4e1cdb8..a9a10d6 100644 --- a/server/routes/dbController.js +++ b/server/routes/dbController.js @@ -7,6 +7,7 @@ module.exports = function(db) { var archivedStatus = req.query.archived || null; var limit = req.query.limit || 30; var order = req.query.order || 'dueDate'; + var deleted = null ; if(archivedStatus !== null) { db.sprint @@ -24,6 +25,7 @@ module.exports = function(db) { db.sprint .findAll({ limit: limit, + where: {deletion: deleted}, order: order }) .success(function(data) {