diff --git a/dashboard-project-app/client/app/projectList/controllers/projectList.controller.js b/dashboard-project-app/client/app/projectList/controllers/projectList.controller.js index 2914c6c..60f5f22 100755 --- a/dashboard-project-app/client/app/projectList/controllers/projectList.controller.js +++ b/dashboard-project-app/client/app/projectList/controllers/projectList.controller.js @@ -1,41 +1,41 @@ 'use strict'; -angular.module('dashboardProjectApp').controller('projectListCtrl', function( +angular.module('dashboardProjectApp').controller('projectListCtrl', function ( $scope, UserStory -){ +) { var data = []; var lastUpdate; function getFiles() { UserStory.find( - function success(userStories, fillTable) { - new Promise(function(resolve, reject) { - var stringDate, realDate; + function success(userStories) { + new Promise(function(resolve) { - userStories.forEach(function each (story) { - console.log('userStories', story); if(story.lastUpdate !== '') { - lastUpdate = moment(story.lastUpdate, "YYYY-MM-DD").format("MM-DD-YYYY"); + lastUpdate = moment(story.lastUpdate, + "YYYY-MM-DD").format("MM-DD-YYYY"); } else { - lastUpdate = moment(story.dateCreated, "DD-MM-YYYY").format("MM-DD-YYYY"); + lastUpdate = moment(story.dateCreated, + "DD-MM-YYYY").format("MM-DD-YYYY"); } data.push( { userStory: story.id+'-'+story.userStory, - dateCreated: moment(story.dateCreated, "DD-MM-YYYY").format("MM-DD-YYYY"), + dateCreated: moment(story.dateCreated, + "DD-MM-YYYY").format("MM-DD-YYYY"), lastUpdate: lastUpdate, progressPercentage: story.completed.percentage, - progressLabel: story.completed.completed + ' / ' + story.completed.total + progressLabel: story.completed.completed + ' / ' + + story.completed.total } ) - console.log('data', data); resolve(data); }); }) - .then(function(result) { + .then(function() { $(function () { $('#table').bootstrapTable({ data: data @@ -43,6 +43,6 @@ angular.module('dashboardProjectApp').controller('projectListCtrl', function( }); }); }); - }; + } getFiles(); });