From 066e6b90202c89d0fd8d0746ff6806e22e265f32 Mon Sep 17 00:00:00 2001 From: Qun Huang Date: Sun, 28 Aug 2016 15:12:12 +0800 Subject: [PATCH 1/2] show blank submitted date if null --- src/app/filters.js | 6 +++++- src/app/work/project.list.controller.js | 2 +- src/app/work/projects.html | 7 ++++++- 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/src/app/filters.js b/src/app/filters.js index 09d6778..96c4b06 100644 --- a/src/app/filters.js +++ b/src/app/filters.js @@ -42,7 +42,11 @@ angular.module('supportAdminApp') }; }) .filter('fmtDate', function () { - return function (date) { + return function (date, blankOnNull) { + if (blankOnNull && !date) { + return ''; + } + date = date ? new Date(date) : new Date(); var yyyy = date.getFullYear(); var mm = _.padStart(date.getMonth() + 1, 2, '0'); diff --git a/src/app/work/project.list.controller.js b/src/app/work/project.list.controller.js index 4f0a91d..831de12 100644 --- a/src/app/work/project.list.controller.js +++ b/src/app/work/project.list.controller.js @@ -81,7 +81,7 @@ module.controller('ProjectListCtrl', [ function (projects) { - var MAX_BATCH_SIZE = 100; + var MAX_BATCH_SIZE = 50; // Collects copilot and owner's ids from the loaded project objects. // The resulting 'queue' array will hold unique user ids to be diff --git a/src/app/work/projects.html b/src/app/work/projects.html index cf73d8b..5758062 100644 --- a/src/app/work/projects.html +++ b/src/app/work/projects.html @@ -153,7 +153,12 @@

Projects

{{proj.copilotId === 'unassigned' ? proj.copilotId : ''}} - {{proj.submittedAt | fmtDate}} + + + {{proj.submittedAt | fmtDate: true }} + {{proj.status | capitalize }} {{proj.currentStep}} From 2240e366605ecee0bb8e86ace9ca1b15f9d74810 Mon Sep 17 00:00:00 2001 From: ajefts Date: Mon, 29 Aug 2016 14:41:34 -0400 Subject: [PATCH 2/2] Update project.list.controller.js fixing the max batch size so we don't revert the previous fix. --- src/app/work/project.list.controller.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/work/project.list.controller.js b/src/app/work/project.list.controller.js index 831de12..4f0a91d 100644 --- a/src/app/work/project.list.controller.js +++ b/src/app/work/project.list.controller.js @@ -81,7 +81,7 @@ module.controller('ProjectListCtrl', [ function (projects) { - var MAX_BATCH_SIZE = 50; + var MAX_BATCH_SIZE = 100; // Collects copilot and owner's ids from the loaded project objects. // The resulting 'queue' array will hold unique user ids to be