From b2e41cf7ad6e19304120fe30441a3770281c2004 Mon Sep 17 00:00:00 2001 From: Teresita de Jesus Guerrero Vela Date: Fri, 13 Jan 2017 12:28:23 -0600 Subject: [PATCH] Code is not picking the last update date - fix - Sorted dates to pick up the last one - Changed url on grunt file for development environment config Signed-off-by: Teresita de Jesus Guerrero Vela --- .../common/models/userStory.js | 20 +++++++++---------- dashboard-project-app/Gruntfile.js | 2 +- 2 files changed, 10 insertions(+), 12 deletions(-) diff --git a/dashboard-project-api/common/models/userStory.js b/dashboard-project-api/common/models/userStory.js index affb5e4..c439b37 100644 --- a/dashboard-project-api/common/models/userStory.js +++ b/dashboard-project-api/common/models/userStory.js @@ -71,11 +71,11 @@ module.exports = function(UserStory) { }) blueprintsResume.percentage = (blueprintsResume.completed/blueprintsResume.total)*100; - + return blueprintsResume; } - //get the field lastupdated for a usterStory + //get the field lastupdated for a usterStory var getLastUpdated = function(userStory, cb){ var Patch = app.models.Patch; var lastUpdate = ''; @@ -83,12 +83,10 @@ module.exports = function(UserStory) { Patch.latestUpdate(userStory.source, function (err, response, next) { response = JSON.parse(response.substring(5)); - console.log('response', response); - if(response.length > 0){ lastUpdate = response.map( function each (element){ return element.updated - }).sort().shift(); + }).sort().pop(); var arrayLastUpdate = lastUpdate.split(' '); lastUpdate = arrayLastUpdate[0]; @@ -103,7 +101,7 @@ module.exports = function(UserStory) { // Parse data from userStory var parseUserStory = function(userStory, callback){ - + async.waterfall([function(cb){ getLastUpdated(userStory, cb) @@ -115,7 +113,7 @@ module.exports = function(UserStory) { userStory.completed = getbluePrintResume(userStory); cb(null, userStory); - + },function(userStory, cb){ var tasksName = userStory.tasks; @@ -292,7 +290,7 @@ module.exports = function(UserStory) { } - + UserStory.on('attached',function(){ @@ -300,7 +298,7 @@ module.exports = function(UserStory) { var userStory = getFileById(id); parseUserStory(userStory, cb); - + };//end find by id UserStory.find = function(params, cb){ @@ -313,7 +311,7 @@ module.exports = function(UserStory) { async.waterfall([function(cb){ getLastUpdated(userStory, cb) },function(lastUpdated, cb){ - + var itemResult = { completed: getbluePrintResume(userStory), dateCreated: userStory.date, @@ -323,7 +321,7 @@ module.exports = function(UserStory) { }; cb(null, itemResult); - + }],function(err,result){ callback( err, result); }) diff --git a/dashboard-project-app/Gruntfile.js b/dashboard-project-app/Gruntfile.js index 0d476bc..749bb6b 100755 --- a/dashboard-project-app/Gruntfile.js +++ b/dashboard-project-app/Gruntfile.js @@ -314,7 +314,7 @@ module.exports = function (grunt) { development: { constants: function() { var config = require('./' + grunt.config.get('ngconstant.options.configPath')) - config.apiBaseUrl = 'http://localhost:3004'; + config.apiBaseUrl = 'http://localhost:3004/api'; return { appConfig : config}; } },