Merge pull request #3430 from FinnStutzenstein/AgendaFix

Fixed projecting subitems

openslides/agenda/static/js/agenda/projector.js

@@ -82,25 +82,27 @@ angular.module('OpenSlidesApp.agenda.projector', ['OpenSlidesApp.agenda'])
             return Agenda.lastModified();
         }, function () {
             if ($scope.element.id) {
-                $scope.rootItem = Agenda.get($scope.element.id);
+                var tree = AgendaTree.getTree(Agenda.getAll());
-                var tree = AgendaTree.getFlatTree(Agenda.getAll());
+
-                var startIndex = tree.indexOf($scope.rootItem);
+                var getRootNode = function (node) {
-                tree = tree.slice(startIndex);
+                    if (node.id == $scope.element.id) {
-                // define delta to move the whole subtree to level 0
+                        return node;
-                var parentCountDelta = 0;
-                if (tree[0]) {
-                    parentCountDelta = tree[0].parentCount;
                     }
-                $scope.items = [];
+                    for (var i = 0; i < node.children.length; i++) {
-                for (var i = 1; i < tree.length; i++) {
+                        var result = getRootNode(node.children[i]);
-                    if (tree[i].parentCount - parentCountDelta <= 0) {
+                        if (result) {
-                        break;
+                            return result;
                         }
-                    var item = tree[i];
-                    // move rootItem (and all childs) to level 0
-                    item.parentCount = item.parentCount - parentCountDelta;
-                    $scope.items.push(item);
                     }
+                    return false;
+                };
+                _.forEach(tree, function (node) {
+                    var result = getRootNode(node);
+                    if (result) {
+                        $scope.rootItem = result.item;
+                        $scope.tree = result.children;
+                    }
+                });
             } else if ($scope.element.tree) {
                 items = _.filter(Agenda.getAll(), function (item) {
                     return item.type === 1;

openslides/agenda/static/templates/agenda/slide-item-list.html

@@ -2,7 +2,7 @@
   <h1 ng-if="!element.id" translate>Agenda</h1>
   <h1 ng-if="element.id">{{ rootItem.getTitle() }}</h1>
 
-  <div class="agendalist">
+  <div class="agendalist" ng-class="{'spacer-left-lg': element.id}">
     <table class="agendalist-table">
       <tr ng-repeat="node in tree" ng-include="'projector_agenda_renderer.html'"></tr>
     </table>

openslides/core/static/css/projector.css

@@ -408,6 +408,9 @@ tr.elected td {
 .spacer {
     margin-top: 10px;
 }
+.spacer-left-lg {
+    margin-left: 20px;
+}
 
 .agendalist-table td {
     vertical-align: top;