diff --git a/SAS/ResourceAssignment/ResourceAssignmentEditor/lib/static/app/controllers/datacontroller.js b/SAS/ResourceAssignment/ResourceAssignmentEditor/lib/static/app/controllers/datacontroller.js index 32e58d35e4ad27336823a7f2217e167f46d7fee9..78ca930a725f0e6ff487c276c6dffe2b48eb336e 100644 --- a/SAS/ResourceAssignment/ResourceAssignmentEditor/lib/static/app/controllers/datacontroller.js +++ b/SAS/ResourceAssignment/ResourceAssignmentEditor/lib/static/app/controllers/datacontroller.js @@ -386,6 +386,9 @@ angular.module('raeApp').factory("dataService", ['$http', '$q', function($http, if(task) { task.starttime = self.convertDatestringToLocalUTCDate(task.starttime); task.endtime = self.convertDatestringToLocalUTCDate(task.endtime); + task.ingest_status = self.convertNullToUndefined(task.ingest_status); + task.disk_usage = self.convertNullToUndefined(task.disk_usage); + task.disk_usage_readable = self.convertNullToUndefined(task.disk_usage_readable); if(!self.taskDict.hasOwnProperty(task.id)) { self.tasks.push(task); @@ -427,6 +430,9 @@ angular.module('raeApp').factory("dataService", ['$http', '$q', function($http, var task = result.tasks[i]; task.starttime = self.convertDatestringToLocalUTCDate(task.starttime); task.endtime = self.convertDatestringToLocalUTCDate(task.endtime); + task.ingest_status = self.convertNullToUndefined(task.ingest_status); + task.disk_usage = self.convertNullToUndefined(task.disk_usage); + task.disk_usage_readable = self.convertNullToUndefined(task.disk_usage_readable); } var newTaskDict = self.toIdBasedDict(result.tasks); @@ -462,6 +468,9 @@ angular.module('raeApp').factory("dataService", ['$http', '$q', function($http, var task = result.tasks[i]; task.starttime = self.convertDatestringToLocalUTCDate(task.starttime); task.endtime = self.convertDatestringToLocalUTCDate(task.endtime); + task.ingest_status = self.convertNullToUndefined(task.ingest_status); + task.disk_usage = self.convertNullToUndefined(task.disk_usage); + task.disk_usage_readable = self.convertNullToUndefined(task.disk_usage_readable); } var newTaskDict = self.toIdBasedDict(result.tasks); @@ -827,6 +836,9 @@ angular.module('raeApp').factory("dataService", ['$http', '$q', function($http, if(!task) { changedTask.starttime = self.convertDatestringToLocalUTCDate(changedTask.starttime); changedTask.endtime = self.convertDatestringToLocalUTCDate(changedTask.endtime); + changedTask.ingest_status = self.convertNullToUndefined(changedTask.ingest_status); + changedTask.disk_usage = self.convertNullToUndefined(changedTask.disk_usage); + changedTask.disk_usage_readable = self.convertNullToUndefined(changedTask.disk_usage_readable); self.tasks.push(changedTask); self.taskDict[changedTask.id] = changedTask; }