Skip to content
Snippets Groups Projects
Commit d52ca395 authored by Jorrit Schaap's avatar Jorrit Schaap
Browse files

Task #9607: apply convertNullToUndefined for all loaded tasks

parent 3caf2f1c
No related branches found
No related tags found
No related merge requests found
...@@ -386,6 +386,9 @@ angular.module('raeApp').factory("dataService", ['$http', '$q', function($http, ...@@ -386,6 +386,9 @@ angular.module('raeApp').factory("dataService", ['$http', '$q', function($http,
if(task) { if(task) {
task.starttime = self.convertDatestringToLocalUTCDate(task.starttime); task.starttime = self.convertDatestringToLocalUTCDate(task.starttime);
task.endtime = self.convertDatestringToLocalUTCDate(task.endtime); 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)) { if(!self.taskDict.hasOwnProperty(task.id)) {
self.tasks.push(task); self.tasks.push(task);
...@@ -427,6 +430,9 @@ angular.module('raeApp').factory("dataService", ['$http', '$q', function($http, ...@@ -427,6 +430,9 @@ angular.module('raeApp').factory("dataService", ['$http', '$q', function($http,
var task = result.tasks[i]; var task = result.tasks[i];
task.starttime = self.convertDatestringToLocalUTCDate(task.starttime); task.starttime = self.convertDatestringToLocalUTCDate(task.starttime);
task.endtime = self.convertDatestringToLocalUTCDate(task.endtime); 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); var newTaskDict = self.toIdBasedDict(result.tasks);
...@@ -462,6 +468,9 @@ angular.module('raeApp').factory("dataService", ['$http', '$q', function($http, ...@@ -462,6 +468,9 @@ angular.module('raeApp').factory("dataService", ['$http', '$q', function($http,
var task = result.tasks[i]; var task = result.tasks[i];
task.starttime = self.convertDatestringToLocalUTCDate(task.starttime); task.starttime = self.convertDatestringToLocalUTCDate(task.starttime);
task.endtime = self.convertDatestringToLocalUTCDate(task.endtime); 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); var newTaskDict = self.toIdBasedDict(result.tasks);
...@@ -827,6 +836,9 @@ angular.module('raeApp').factory("dataService", ['$http', '$q', function($http, ...@@ -827,6 +836,9 @@ angular.module('raeApp').factory("dataService", ['$http', '$q', function($http,
if(!task) { if(!task) {
changedTask.starttime = self.convertDatestringToLocalUTCDate(changedTask.starttime); changedTask.starttime = self.convertDatestringToLocalUTCDate(changedTask.starttime);
changedTask.endtime = self.convertDatestringToLocalUTCDate(changedTask.endtime); 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.tasks.push(changedTask);
self.taskDict[changedTask.id] = changedTask; self.taskDict[changedTask.id] = changedTask;
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment