From f2a471f2858f30c1eaa23fd41c2c1b745b8af8b5 Mon Sep 17 00:00:00 2001 From: Viridiana J Amezcua Orona Date: Mon, 17 Oct 2016 16:46:51 -0500 Subject: [PATCH 1/6] - Title from description field - Show number of blueprints completed instead of percentage - Refactor code Signed-off-by: Viridiana J Amezcua Orona --- .../common/models/userStory.js | 458 +++++++----------- .../controllers/projectDetail.controller.js | 4 +- .../client/app/projectDetail/projectDetail.js | 6 - .../app/projectDetail/views/quickResume.html | 10 +- .../controllers/projectList.controller.js | 18 +- .../app/projectList/views/projectList.html | 2 +- dashboard-project-app/client/index.html | 8 +- 7 files changed, 211 insertions(+), 295 deletions(-) diff --git a/dashboard-project-api/common/models/userStory.js b/dashboard-project-api/common/models/userStory.js index 1bf804f..affb5e4 100644 --- a/dashboard-project-api/common/models/userStory.js +++ b/dashboard-project-api/common/models/userStory.js @@ -8,77 +8,19 @@ module.exports = function(UserStory) { var async = require("async"); var htmlparser = require("htmlparser"); var cheerio = require('cheerio'); + const SPEC_URL = "http://specs.openstack.org/openstack/openstack-user-stories/user-stories/proposed/"; var blueprintsResume = []; - var getAllfiles = function(getPercentage){ - + var getAllfiles = function(){ return fs.readdirSync(route) .map(function(file){ var route = "../tracker/" + file ; - var data = JSON.parse(fs.readFileSync(route)); - var parsedData; - - if(getPercentage){ - parsedData = getTotalPercentage(data); - data.blueprintList = parsedData; - } - - return data; + var userStory = JSON.parse(fs.readFileSync(route)); + return userStory; }); - - } - - //get completed percentage of all the userstories - var getTotalPercentage = function(userStory){ - - blueprintsResume.completed = 0; - blueprintsResume.total = 0; - var blueprintList = []; - - userStory.tasks.forEach(function (taskName, index, array) { - - var task = userStory.tasks_status[taskName]; - - task.projects.forEach(function (projectName, index, array) { - - var blueprints = task.projects_status[projectName].blueprints; - var blueprintNames = Object.keys(blueprints); - blueprintList.push(blueprintNames); - - blueprintNames.forEach(function (blueprintName, index, array) { - - if (blueprints[blueprintName] == 'completed') - blueprintsResume.completed = blueprintsResume.completed + 1; - - blueprintsResume.total = blueprintsResume.total + 1; - - }) - - }) - - }) - - var finalPercentage = Math.round((blueprintsResume.completed*100)/blueprintsResume.total) - blueprintList.push([{percentage:(finalPercentage)}]); - return blueprintList; - - } - - //get completed percentage of a User story - var getPercentage = function(blueprints){ - var total = blueprints.length; - var complete = 0; - - blueprints.forEach(function(element, index, array) { - - if(element == 'completed') - complete = complete + 1; - }) - return Math.round((complete*100)/total); - } var getFileById = function(id){ @@ -99,163 +41,95 @@ module.exports = function(UserStory) { }; - var getDetailedUri = function(source) { - var base = 'http://specs.openstack.org/openstack/openstack-user-stories/user-stories/proposed/'; + //get all the completed blueprints + var getbluePrintResume = function(userStory){ + var blueprintsResume = { + completed: 0, + total: 0 + } - return base + source + '.html'; + userStory.tasks.forEach(function (taskName, index, array) { - } + var task = userStory.tasks_status[taskName]; - var parseUserStory = function(id){ - var data = []; - return function(callback){ - var file = getFileById(id); + task.projects.forEach(function (projectName, index, array) { - var Patch = app.models.Patch; + var blueprints = task.projects_status[projectName].blueprints; + var blueprintNames = Object.keys(blueprints); - Patch.latestUpdate(file.source, function(err, response) { + blueprintNames.forEach(function (blueprintName, index, array) { - var lastUpdate = ''; + if (blueprints[blueprintName] == 'completed') + blueprintsResume.completed = blueprintsResume.completed + 1; - if(response){ - response = JSON.parse(response.substring(5)); - response.forEach( function each (element){ - data.push( - { - latestDate: element.updated, - }); - }); + blueprintsResume.total = blueprintsResume.total + 1; - data = data.sort(); - lastUpdate = data.shift(); + }) - if(lastUpdate){ - lastUpdate = lastUpdate.latestDate; - } - } - - var userStory = { - title:file.description, - description:'', - status:file.status, - showDetailedUri:getDetailedUri(file.source), - submittedBy:file.submitted_by.name, - submittedByEmail:file.submitted_by.email, - createdOn:file.date, - updatedOn:lastUpdate, - id:file.id, - percentageComplete:'' - }; - callback(null, userStory, file.tasks, file.tasks_status); + }) }) - } + blueprintsResume.percentage = (blueprintsResume.completed/blueprintsResume.total)*100; + + return blueprintsResume; } + //get the field lastupdated for a usterStory + var getLastUpdated = function(userStory, cb){ + var Patch = app.models.Patch; + var lastUpdate = ''; - var getTaskDescription = function(task, callback){ + Patch.latestUpdate(userStory.source, function (err, response, next) { + response = JSON.parse(response.substring(5)); - var Rst = app.models.Rst; - var spec = task['cross-project spec'] + '.rst' + console.log('response', response); - Rst.list(spec, function(err, data){ + if(response.length > 0){ + lastUpdate = response.map( function each (element){ + return element.updated + }).sort().shift(); + var arrayLastUpdate = lastUpdate.split(' '); + lastUpdate = arrayLastUpdate[0]; - var html_content = markdown.toHTML(data); - var $ = cheerio.load(html_content); - - var index = null; - //Find the title - var description = $('h1').each(function(i, elem) { - if(elem.children[0].data == 'Problem description'){ - index = i; - } - }); - - //get Text description - if(index != null){ - description = $($('h1')[index]).next().text() - }else{ - description = ''; } - callback(null, description); + cb(null, lastUpdate) }) } - var getUriTask = function(spec){ - var base = 'https://github.com/openstack/openstack-specs/blob/master/specs/'; - return base + spec + '.rst'; - } + // Parse data from userStory + var parseUserStory = function(userStory, callback){ + + async.waterfall([function(cb){ - var parseTask = function(originalTask, callback){ + getLastUpdated(userStory, cb) - getTaskDescription(originalTask, function(err, description){ - originalTask.description = description; - originalTask.url = getUriTask(originalTask['cross-project spec']); - originalTask.xp_status = originalTask.xp_status; - callback(null, originalTask) - }) + },function(lastUpdated, cb){ + userStory.updatedOn = lastUpdated; + userStory.showDetailedUri = SPEC_URL + userStory.source + '.html'; + userStory.createdOn = userStory.date; + userStory.completed = getbluePrintResume(userStory); - } + cb(null, userStory); + + },function(userStory, cb){ + var tasksName = userStory.tasks; + var tasks = userStory.tasks_status; - var parseProject = function(originalProject, callback){ - - var urlArray = originalProject.spec.split('/'); - var nameArray = urlArray[urlArray.length-1].split('.') - originalProject.spec_name = nameArray[0]; - - callback(null, originalProject) - } - - - var parseBlueprint = function(originalBlueprint, blueprintName, projectName, callback){ - var Blueprint = app.models.Blueprint; - var Patch = app.models.Patch; - - var status = originalBlueprint; - - Blueprint.url(projectName, blueprintName, function(err, uri){ - - blueprintsResume.push(status) - - blueprintsResume.complete = blueprintsResume.total +1 ; - - - Patch.list(blueprintName, function(err, response) { - - var data = []; - - response = JSON.parse(response.substring(5)); - - response.forEach(function each(element) { - data.push( - { - url: "https://review.openstack.org/#/c/" + element._number, - name: element.subject - }); - }); - - originalBlueprint = { - name: blueprintName.replace(/-/g, " "), - uri: uri, - status: status, - review_link:data - } - callback(null, originalBlueprint) + parseTasks(userStory, tasksName, tasks, cb) + }],function(err,userStory){ + callback(null, userStory); }) - - }) - } - //TODO: APPLY async.waterfall + //?? var parseTasks = function(userStory, tasksNames, tasks, callback) { //get tasks var tmpTasks = {}; @@ -308,7 +182,7 @@ module.exports = function(UserStory) { userStory.tasks = tasksNames; userStory.tasks_status = tmpTasks; - userStory.percentageComplete = getPercentage(blueprintsResume) + //userStory.percentageComplete = getPercentage(blueprintsResume) callback(null, userStory); @@ -316,104 +190,146 @@ module.exports = function(UserStory) { } + +//? + + var getTaskDescription = function(task, callback){ + + var Rst = app.models.Rst; + var spec = task['cross-project spec'] + '.rst' + + Rst.list(spec, function(err, data){ + + var html_content = markdown.toHTML(data); + var $ = cheerio.load(html_content); + + var index = null; + //Find the title + var description = $('h1').each(function(i, elem) { + if(elem.children[0].data == 'Problem description'){ + index = i; + } + }); + + //get Text description + if(index != null){ + description = $($('h1')[index]).next().text() + }else{ + description = ''; + } + + callback(null, description); + + }) + + } +//? + var getUriTask = function(spec){ + var base = 'https://github.com/openstack/openstack-specs/blob/master/specs/'; + + return base + spec + '.rst'; + } +//? + var parseTask = function(originalTask, callback){ + + getTaskDescription(originalTask, function(err, description){ + originalTask.description = description; + originalTask.url = getUriTask(originalTask['cross-project spec']); + callback(null, originalTask) + }) + + } +//? + + var parseProject = function(originalProject, callback){ + + var urlArray = originalProject.spec.split('/'); + var nameArray = urlArray[urlArray.length-1].split('.') + originalProject.spec_name = nameArray[0]; + + callback(null, originalProject) + } + +//? + var parseBlueprint = function(originalBlueprint, blueprintName, projectName, callback){ + var Blueprint = app.models.Blueprint; + var Patch = app.models.Patch; + + var status = originalBlueprint; + + Blueprint.url(projectName, blueprintName, function(err, uri){ + + blueprintsResume.push(status) + + blueprintsResume.complete = blueprintsResume.total +1 ; + + + Patch.list(blueprintName, function(err, response) { + + var data = []; + + response = JSON.parse(response.substring(5)); + + response.forEach(function each(element) { + data.push( + { + url: "https://review.openstack.org/#/c/" + element._number, + name: element.subject + }); + }); + + originalBlueprint = { + name: blueprintName.replace(/-/g, " "), + uri: uri, + status: status, + review_link:data + } + callback(null, originalBlueprint) + + }) + + }) + + } + + + UserStory.on('attached',function(){ UserStory.findById = function(id, params, cb){ - async.waterfall([ - parseUserStory(id), - parseTasks - ], function (err, result) { - cb(null,result) - }); - - }; + var userStory = getFileById(id); + parseUserStory(userStory, cb); + + };//end find by id UserStory.find = function(params, cb){ - var Patch = app.models.Patch; - //get all files - var userStories = getAllfiles(true); - var percentage; - var blueprintKeys; - var dateList = []; - //var response = userStories; + var userStories = getAllfiles(); - var result; + async.mapSeries(userStories, parse, cb); - // looking dates - var lookingDates = function (id, blueprintKeys) { - blueprintKeys.forEach(function each (key) { - var data = []; - Patch.latestUpdate(key, function (err, response, next) { + function parse(userStory, callback) { - response = JSON.parse(response.substring(5)); - async.waterfall([ - function createOutput(next){ - response.forEach( function each (element){ - data.push( - { - latestDate: element.updated, - }); - }); - next(); - }, - function sendData (next) { - data = data.sort(); - var lastUpdate = data.shift(); - if(lastUpdate !== undefined) { - dateList.push({ - id: id, - value: lastUpdate.latestDate - }); - } - next; - } - ], next); - }); - }); + async.waterfall([function(cb){ + getLastUpdated(userStory, cb) + },function(lastUpdated, cb){ + + var itemResult = { + completed: getbluePrintResume(userStory), + dateCreated: userStory.date, + lastUpdate: lastUpdated, + userStory: userStory.description, + id:userStory.id + }; + + cb(null, itemResult); + + }],function(err,result){ + callback( err, result); + }) } + };//End find - function keysrt(key,asc) { - return function(a,b){ - return asc ? ~~(a[key] < b[key]) : ~~(a[key] > b[key]); - } - } - - async.waterfall ([ - function readStories (next) { - userStories.forEach (function eachStory (story, x) { - //console.log(story.blueprintList); - //TODO change the array of percentage - percentage = (story.blueprintList).pop(); - blueprintKeys = story.blueprintList; - result = lookingDates((story.id), blueprintKeys); - story.percentage = percentage[0].percentage; - }); - next(); - }, - function resumeDate (next){ - setTimeout(function(){ - dateList = dateList.sort(keysrt('value')); - userStories.forEach (function eachStory (story) { - dateList.forEach (function eachDate (dateElement){ - if(dateElement.id === story.id){ - story.latestUpdate = dateList - } - }); - }); - cb(null,userStories); - }, 1000); - - next; - }, - function sendResult(next){ - //cb(null,userStories); - next; - } - ]); - - - } }) }; diff --git a/dashboard-project-app/client/app/projectDetail/controllers/projectDetail.controller.js b/dashboard-project-app/client/app/projectDetail/controllers/projectDetail.controller.js index 48ab848..0d8817d 100755 --- a/dashboard-project-app/client/app/projectDetail/controllers/projectDetail.controller.js +++ b/dashboard-project-app/client/app/projectDetail/controllers/projectDetail.controller.js @@ -2,8 +2,8 @@ (function(){ angular.module('dashboardProjectApp') - .controller('projectDetailController', ['$scope','$state', 'UserStory'/*, 'tasksService', 'tasks', 'task'*/, - function($scope, $state, UserStory/*, tasksService, tasks, task*/) { + .controller('projectDetailController', ['$scope','$state', 'UserStory', + function($scope, $state, UserStory) { $scope.taskId = $state.params.id; $scope.openTasks = {}; diff --git a/dashboard-project-app/client/app/projectDetail/projectDetail.js b/dashboard-project-app/client/app/projectDetail/projectDetail.js index eb6dfac..1d06e3b 100755 --- a/dashboard-project-app/client/app/projectDetail/projectDetail.js +++ b/dashboard-project-app/client/app/projectDetail/projectDetail.js @@ -6,12 +6,6 @@ angular.module('dashboardProjectApp') $stateProvider .state('projectDetail', { url: '/projectDetail/:id', - /* resolve: { - userStory: ['userStoryService', - function(userStoryService) { - return userStoryService.getTasks(); - }] - },*/ templateUrl: 'app/projectDetail/views/projectDetail.html', controller: 'projectDetailController' }) diff --git a/dashboard-project-app/client/app/projectDetail/views/quickResume.html b/dashboard-project-app/client/app/projectDetail/views/quickResume.html index 8d288d3..986d0a3 100755 --- a/dashboard-project-app/client/app/projectDetail/views/quickResume.html +++ b/dashboard-project-app/client/app/projectDetail/views/quickResume.html @@ -4,7 +4,7 @@
- {{userStory.title}} + {{userStory.description}} {{userStory.status | removeDashes | capitalize}} @@ -30,8 +30,8 @@
Submitted by - - {{userStory.submittedBy}} + + {{userStory.submitted_by.name}}
@@ -48,8 +48,8 @@
- {{userStory.percentageComplete}}% Complete + aria-valuenow="{{userStory.completed.percentage}}" aria-valuemin="0" aria-valuemax="100" style="width: {{userStory.completed.percentage}}%"> + {{userStory.completed.completed}} / {{userStory.completed.total}} Blueprints completed
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 514ea3a..2914c6c 100755 --- a/dashboard-project-app/client/app/projectList/controllers/projectList.controller.js +++ b/dashboard-project-app/client/app/projectList/controllers/projectList.controller.js @@ -12,20 +12,26 @@ angular.module('dashboardProjectApp').controller('projectListCtrl', function( new Promise(function(resolve, reject) { var stringDate, realDate; + userStories.forEach(function each (story) { - if(story.latestUpdate !== undefined) { - lastUpdate = moment(story.latestUpdate[0].value).format("MM-DD-YYYY"); + + console.log('userStories', story); + if(story.lastUpdate !== '') { + lastUpdate = moment(story.lastUpdate, "YYYY-MM-DD").format("MM-DD-YYYY"); } else { - lastUpdate = moment(story.date, "DD-MM-YYYY").format("MM-DD-YYYY"); + lastUpdate = moment(story.dateCreated, "DD-MM-YYYY").format("MM-DD-YYYY"); } data.push( { - userStory: story.id+'-'+story.description, - dateCreated: moment(story.date, "DD-MM-YYYY").format("MM-DD-YYYY"), + userStory: story.id+'-'+story.userStory, + dateCreated: moment(story.dateCreated, "DD-MM-YYYY").format("MM-DD-YYYY"), lastUpdate: lastUpdate, - completed: story.percentage + progressPercentage: story.completed.percentage, + progressLabel: story.completed.completed + ' / ' + story.completed.total } ) + + console.log('data', data); resolve(data); }); }) diff --git a/dashboard-project-app/client/app/projectList/views/projectList.html b/dashboard-project-app/client/app/projectList/views/projectList.html index 814bca9..0fc1d47 100755 --- a/dashboard-project-app/client/app/projectList/views/projectList.html +++ b/dashboard-project-app/client/app/projectList/views/projectList.html @@ -18,7 +18,7 @@ User Story Date Created Last Update - % Completed + Blueprints Completed diff --git a/dashboard-project-app/client/index.html b/dashboard-project-app/client/index.html index 7183ec9..704cfda 100755 --- a/dashboard-project-app/client/index.html +++ b/dashboard-project-app/client/index.html @@ -65,13 +65,13 @@ var story = value.split("-"); return '' + story[1] + ''; } - function progressBar(value, row) { + function progressBar(percentage, row) { return '
'+ '
'+ - ''+value+'%' + + 'role="progressbar" aria-valuenow="'+percentage+'" aria-valuemin="0"' + + 'aria-valuemax="100" style="width: '+percentage+'%">'+ + ''+row.progressLabel+'' + '
' + '
'; } 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 2/6] 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}; } }, From ac20d7759b742f2afd11d24e58b997cdb6fbf36e Mon Sep 17 00:00:00 2001 From: Viridiana J Amezcua Orona Date: Mon, 16 Jan 2017 11:21:03 -0600 Subject: [PATCH 3/6] Add validation and return error the the tracker does not existe --- dashboard-project-api/common/models/userStory.js | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/dashboard-project-api/common/models/userStory.js b/dashboard-project-api/common/models/userStory.js index affb5e4..fb2cf99 100644 --- a/dashboard-project-api/common/models/userStory.js +++ b/dashboard-project-api/common/models/userStory.js @@ -32,11 +32,8 @@ module.exports = function(UserStory) { return item.id == id; }) - if(file.length > 0){ - file = file[0]; - }else{ - file = 'The file with id: '+ id +' does not exist.' - } + file = (file.length > 0)?file[0]:null; + return file; }; @@ -299,7 +296,13 @@ module.exports = function(UserStory) { UserStory.findById = function(id, params, cb){ var userStory = getFileById(id); - parseUserStory(userStory, cb); + + if(userStory){ + parseUserStory(userStory, cb); + }else{ + cb('File does not exist', null); + } + };//end find by id From eb9b195bf998959ec0d48af5dd9bdd5f3be5a1e9 Mon Sep 17 00:00:00 2001 From: Viridiana J Amezcua Orona Date: Mon, 16 Jan 2017 11:22:09 -0600 Subject: [PATCH 4/6] Add 404 page and route --- .../client/app/projectDetail/projectDetail.js | 18 ++++++++++--- .../projectDetail/styles/projectDetail.css | 26 +++++++++++++++++++ .../app/projectDetail/views/notFound.html | 18 +++++++++++++ 3 files changed, 59 insertions(+), 3 deletions(-) create mode 100644 dashboard-project-app/client/app/projectDetail/views/notFound.html diff --git a/dashboard-project-app/client/app/projectDetail/projectDetail.js b/dashboard-project-app/client/app/projectDetail/projectDetail.js index 1d06e3b..2984880 100755 --- a/dashboard-project-app/client/app/projectDetail/projectDetail.js +++ b/dashboard-project-app/client/app/projectDetail/projectDetail.js @@ -1,13 +1,25 @@ 'use strict'; angular.module('dashboardProjectApp') - .config(function ($stateProvider) { + .config(function ($stateProvider, $urlRouterProvider) { + $stateProvider - .state('projectDetail', { + + .state('error', { + url: '/projectDetail/notFound/:id', + templateUrl: 'app/projectDetail/views/notFound.html', + controller: function($scope, $state){ + $scope.id = $state.params.id; + } + }) + + + .state('projectDetail', { url: '/projectDetail/:id', templateUrl: 'app/projectDetail/views/projectDetail.html', controller: 'projectDetailController' - }) + }) + }); diff --git a/dashboard-project-app/client/app/projectDetail/styles/projectDetail.css b/dashboard-project-app/client/app/projectDetail/styles/projectDetail.css index 7099c66..f0568b5 100755 --- a/dashboard-project-app/client/app/projectDetail/styles/projectDetail.css +++ b/dashboard-project-app/client/app/projectDetail/styles/projectDetail.css @@ -42,3 +42,29 @@ table tr.separator { height: 30px; } +.big-title{ + font-size: 80px; + text-align: center; + padding-top: 40px; + font-weight: bolder; + color: #767676; +} + +.big-subtitle{ + text-align: center; + font-size: 22px; + font-weight: normal; + color: #767676; +} + +.focus-title{ + font-weight: bolder; + color: #414141; +} + +.middle-subtitle{ + text-align: center; + font-size: 16px; + padding-top: 10px; + color: #767676; +} \ No newline at end of file diff --git a/dashboard-project-app/client/app/projectDetail/views/notFound.html b/dashboard-project-app/client/app/projectDetail/views/notFound.html new file mode 100644 index 0000000..9a4aba6 --- /dev/null +++ b/dashboard-project-app/client/app/projectDetail/views/notFound.html @@ -0,0 +1,18 @@ +
+ +
+ 404 +
+ +
+ The Tracker with Id {{id}} does not exist. Are you sure it is spelled correctly? +
+ +
+ You can try return to the list of trackers and look for it +
+ + +
+ + From 2f990f850b94199483aa29191c17513c3ac4e1b0 Mon Sep 17 00:00:00 2001 From: Viridiana J Amezcua Orona Date: Mon, 16 Jan 2017 11:23:07 -0600 Subject: [PATCH 5/6] Redirect to 404 page when server returns not found error --- .../controllers/projectDetail.controller.js | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/dashboard-project-app/client/app/projectDetail/controllers/projectDetail.controller.js b/dashboard-project-app/client/app/projectDetail/controllers/projectDetail.controller.js index 0d8817d..7f41e70 100755 --- a/dashboard-project-app/client/app/projectDetail/controllers/projectDetail.controller.js +++ b/dashboard-project-app/client/app/projectDetail/controllers/projectDetail.controller.js @@ -2,8 +2,8 @@ (function(){ angular.module('dashboardProjectApp') - .controller('projectDetailController', ['$scope','$state', 'UserStory', - function($scope, $state, UserStory) { + .controller('projectDetailController', ['$scope','$state', 'UserStory', '$location', + function($scope, $state, UserStory, $location) { $scope.taskId = $state.params.id; $scope.openTasks = {}; @@ -39,6 +39,7 @@ $scope.actualProject = {}; function getFile() { + UserStory.findById({id:$scope.taskId}, function success(userStory) { $scope.userStory = userStory; @@ -48,6 +49,8 @@ $scope.actualProject[key] = $scope.userStory.tasks_status[key].projects[0] } + }, function onError(error){ + $location.path('/projectDetail/notFound/' + $scope.taskId); }); }; @@ -55,7 +58,6 @@ $scope.actualProject[idTask] = keyProject } - getFile(); $scope.showMore = function(key){ $scope.showText[key] = true; @@ -69,13 +71,15 @@ window.location.href = "mailto:" + email + "?subject=Mail to " + email; } + getFile(); }]) .filter('capitalize', function() { return function(input) { return (!!input) ? input.charAt(0).toUpperCase() + input.substr(1).toLowerCase() : ''; } - }).filter('removeDashes', function() { + }) + .filter('removeDashes', function() { return function(string) { if (!angular.isString(string)) { From d3561377bb36a4b774c7b83102cd0efb15752078 Mon Sep 17 00:00:00 2001 From: Teresita de Jesus Guerrero Vela Date: Thu, 19 Jan 2017 15:40:57 -0600 Subject: [PATCH 6/6] Extremely long strings displayed on UserStory table - fix String name limited to show 50 characters on table - Tooltip added to show full text on detail view Signed-off-by: Teresita de Jesus Guerrero Vela --- .../controllers/projectDetail.controller.js | 36 ++++++++++++------- .../app/projectDetail/views/quickResume.html | 4 +-- .../app/projectList/styles/projectList.css | 6 ++++ 3 files changed, 32 insertions(+), 14 deletions(-) diff --git a/dashboard-project-app/client/app/projectDetail/controllers/projectDetail.controller.js b/dashboard-project-app/client/app/projectDetail/controllers/projectDetail.controller.js index 7f41e70..a4f0dc9 100755 --- a/dashboard-project-app/client/app/projectDetail/controllers/projectDetail.controller.js +++ b/dashboard-project-app/client/app/projectDetail/controllers/projectDetail.controller.js @@ -1,5 +1,5 @@ 'use strict'; -(function(){ +(function () { angular.module('dashboardProjectApp') .controller('projectDetailController', ['$scope','$state', 'UserStory', '$location', @@ -39,19 +39,30 @@ $scope.actualProject = {}; function getFile() { + UserStory.findById({id:$scope.taskId}, + function success(userStory) { + $scope.userStory = userStory; - UserStory.findById({id:$scope.taskId}, - function success(userStory) { - $scope.userStory = userStory; + // Formating User Story name + if ((userStory.description).length > 100) { + $scope.userStory.shortDescription = userStory. + description.substr(0,50) + " ..."; + } + else { + $scope.userStory.shortDescription = userStory. + description; + } - $scope.userStory.updatedOn = moment($scope.userStory.updatedOn).format("MM-DD-YYYY"); - for(var key in $scope.userStory.tasks_status) { - $scope.actualProject[key] = $scope.userStory.tasks_status[key].projects[0] + $scope.userStory.updatedOn = moment($scope.userStory. + updatedOn).format("MM-DD-YYYY"); + for(var key in $scope.userStory.tasks_status) { + $scope.actualProject[key] = $scope.userStory. + tasks_status[key].projects[0] + } + }, function onError(error){ + $location.path('/projectDetail/notFound/' + $scope.taskId); } - - }, function onError(error){ - $location.path('/projectDetail/notFound/' + $scope.taskId); - }); + ); }; $scope.selectProject = function(keyProject, idTask){ @@ -76,7 +87,8 @@ }]) .filter('capitalize', function() { return function(input) { - return (!!input) ? input.charAt(0).toUpperCase() + input.substr(1).toLowerCase() : ''; + return (!!input) ? input.charAt(0).toUpperCase() + input.substr(1). + toLowerCase() : ''; } }) .filter('removeDashes', function() { diff --git a/dashboard-project-app/client/app/projectDetail/views/quickResume.html b/dashboard-project-app/client/app/projectDetail/views/quickResume.html index 986d0a3..6d50670 100755 --- a/dashboard-project-app/client/app/projectDetail/views/quickResume.html +++ b/dashboard-project-app/client/app/projectDetail/views/quickResume.html @@ -3,8 +3,8 @@
-
- {{userStory.description}} +
+ {{userStory.shortDescription}} {{userStory.status | removeDashes | capitalize}} diff --git a/dashboard-project-app/client/app/projectList/styles/projectList.css b/dashboard-project-app/client/app/projectList/styles/projectList.css index 6f8a01c..4d94561 100755 --- a/dashboard-project-app/client/app/projectList/styles/projectList.css +++ b/dashboard-project-app/client/app/projectList/styles/projectList.css @@ -23,3 +23,9 @@ .fixed-table-toolbar .bars, .fixed-table-toolbar .search, .fixed-table-toolbar .columns{ margin-bottom: 25px; } +.fixed-table-container tbody td { + max-width:200px; /* Customise it accordingly */ + white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; +}