Fix alignment of parallel timetable blocks

fixes indico#2999
mic4ael · Oct 31, 2017 · 72aca9d · 72aca9d
1 parent 6ee796f
commit 72aca9d
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git a/indico/htdocs/js/indico/modules/timetable/timetable/Draw.js b/indico/htdocs/js/indico/modules/timetable/timetable/Draw.js
@@ -993,7 +993,6 @@ type("TimetableDrawer", ["IWidget", "DroppableTimetableMixin"],
              this._blockMap = {};
 
              each(blocks, function(blockData) {
-
                  var nCol = self.layoutChooser.get().getNumColumnsForGroup(groups[blockData.group]);
                  self.maxCol = ((self.maxCol == null) || (self.maxCol < nCol)) ? nCol : self.maxCol;
 

diff --git a/indico/htdocs/js/indico/modules/timetable/timetable/Layout.js b/indico/htdocs/js/indico/modules/timetable/timetable/Layout.js
@@ -164,7 +164,8 @@ type("TimetableLayoutManager", [],
                  }
 
                  if (exists(lastAssigned[getLastAssignedId(block)])) {
-                     lastAssign(block);
+                     assigned[block.assigned] = block;
+                     lastAssign(block, block.assigned);
                  } else {
                      // This block has never been assigned before. Just update the lastAssigned.
                      lastAssign(block, block.assigned);
@@ -351,7 +352,6 @@ type("CompactLayoutManager", ["IncrementalLayoutManager"],
                      block = self.getBlock(algData.blocks, point[0]);
 
                      block.end = algData.topPx;
-
                      if (algData.assigned[block.assigned]) {
                          algData.active--;
                          // this means it has been started in a previous timeslot
@@ -402,7 +402,7 @@ type("CompactLayoutManager", ["IncrementalLayoutManager"],
                  algData.grid.push([startMin/60%24, algData.topPx]);
              }
 
-             if (!algData.active) {
+             if (algData.active === 0) {
                  if (algData.currentGroup.length > 0) {
                      algData.groups.push([algData.currentGroup, keys(algData.assigned).length]);
                      algData.currentGroup = [];
@@ -419,8 +419,8 @@ type("CompactLayoutManager", ["IncrementalLayoutManager"],
                      block = self.getBlock(algData.blocks, point[0]);
                      block.sessionId = point[2];
                      block.sessionSlotId = point[3];
-
                      block.start = algData.topPx;
+
                      algData.active++;
                      self.assign(algData.assigned, block);
                      algData.currentGroup.push(block);
@@ -471,7 +471,6 @@ type("ProportionalLayoutManager", ["IncrementalLayoutManager"],
              var smallBlocks = [];
 
              each(points, function(point) {
-
                  if (point[1] == 'end') {
                      block = self.getBlock(algData.blocks, point[0]);