Task #8887: don't show single rootnode

SAS/ResourceAssignment/ResourceAssignmentEditor/lib/static/app/controllers/ganttresourcecontroller.js

@@ -174,11 +174,24 @@ ganttResourceControllerMod.controller('GanttResourceController', ['$scope', 'dat
         //build tree of resourceGroups
         //note that one resourceGroup can be a child of multiple parents
         if(resourceGroupMemberships.hasOwnProperty('groups')) {
+            var rootGroupIds = [];
+
             for(var groupId in resourceGroupMemberships.groups) {
                 if(resourceGroupMemberships.groups[groupId].parent_ids.length == 0) {
-                    //resourceGroup is a root item (no parents)
-                    //so start creating a ganttRow tree for this root and all its descendants
-                    createGanttRowTree(groupId, null);
+                    rootGroupIds.push(groupId);
+                }
+            }
+
+            if(rootGroupIds.length == 1)
+            {
+                //don't show single rootnode
+                var rootChildGroupIds = resourceGroupMemberships.groups[rootGroupIds[0]].child_ids;
+                for(var i = 0; i < rootChildGroupIds.length; i++) {
+                    createGanttRowTree(rootChildGroupIds[i], null);
+                }
+            } else {
+                for(var i = 0; i < rootGroupIds.length; i++) {
+                    createGanttRowTree(rootGroupIds[i], null);
                 }
             }
         }
@@ -357,27 +370,29 @@ ganttResourceControllerMod.controller('GanttResourceController', ['$scope', 'dat
                 }
 
                 var ganttRows = resourceGroup2GanttRows[groupId];
-                for(var ganttRow of ganttRows) {
-                    for(var taskId in aggregatedClaims) {
-                        var aggClaimForTask = aggregatedClaims[taskId];
-                        var task = taskDict[taskId];
-                        if(task) {
-                            var claimTask = {
-                                id: 'aggregatedClaimForTask_' + taskId + '_' + ganttRow.id,
-                                name: task.name,
-                                from: aggClaimForTask.starttime,
-                                to: aggClaimForTask.endtime,
-                                color: self.resourceClaimStatusColors[aggClaimForTask.status],
-                                classes: 'claim-task-status-' + task.status,
-                                raTask: task,
-                                movable: $.inArray(task.status_id, editableTaskStatusIds) > -1
-                            };
-
-                            if(task.id == dataService.selected_task_id) {
-                                claimTask.classes += ' claim-selected-task';
-                            }
+                if(ganttRows) {
+                    for(var ganttRow of ganttRows) {
+                        for(var taskId in aggregatedClaims) {
+                            var aggClaimForTask = aggregatedClaims[taskId];
+                            var task = taskDict[taskId];
+                            if(task) {
+                                var claimTask = {
+                                    id: 'aggregatedClaimForTask_' + taskId + '_' + ganttRow.id,
+                                    name: task.name,
+                                    from: aggClaimForTask.starttime,
+                                    to: aggClaimForTask.endtime,
+                                    color: self.resourceClaimStatusColors[aggClaimForTask.status],
+                                    classes: 'claim-task-status-' + task.status,
+                                    raTask: task,
+                                    movable: $.inArray(task.status_id, editableTaskStatusIds) > -1
+                                };
 
-                            ganttRow.tasks.push(claimTask);
+                                if(task.id == dataService.selected_task_id) {
+                                    claimTask.classes += ' claim-selected-task';
+                                }
+
+                                ganttRow.tasks.push(claimTask);
+                            }
                         }
                     }
                 }