From 26ed323bb48f2fa423d1a633cf97408286b762d8 Mon Sep 17 00:00:00 2001
From: sparks-alec <sparks.alec@gmail.com>
Date: Wed, 30 Nov 2022 02:52:57 -0500
Subject: [PATCH] fix group cue border drawing

---
 plugins/qlab/cue.ejs | 35 ++++++++++++++++++++---------------
 plugins/qlab/main.js | 27 +++++++++++++++++++++++----
 2 files changed, 43 insertions(+), 19 deletions(-)

diff --git a/plugins/qlab/cue.ejs b/plugins/qlab/cue.ejs
index 12fcbc7..27810ca 100644
--- a/plugins/qlab/cue.ejs
+++ b/plugins/qlab/cue.ejs
@@ -29,26 +29,31 @@
   <td><center><%= cue.number || "&nbsp;" %></center></td>
 
 
+  <% for(let i=0; i<cue.nestedGroupModes.length; i++){ %>
 
+      <% if(cue.cues && cue.cues.length==0 && i==cue.nestedGroupModes.length-1){ %>
+        <td class="gMode-<%= cue.nestedGroupModes[i] %> gLeft gBot gTop group-arrow"></td>
+      
+      <% }else if(cue.cues && i==cue.nestedGroupModes.length-1){ %>
+        <td class="gMode-<%= cue.nestedGroupModes[i] %> gLeft gTop group-arrow"></td>
 
-  <% for(let i=cue.nestedGroupModes.length; i>0; i--){ %>
+      <% }else if(cue.nestedGroupPosition[i]<=0){ %>
+        <% if(i<cue.nestedGroupModes.length-1){ %>
+          <td class="gMode-<%= cue.nestedGroupModes[i] %> gLeft gBot"></td>
 
-    <% if(cue.type=="Group" && i==1 && cue.cues.length==0){ %>
-      <td class="gMode-<%= cue.nestedGroupModes[i-1] %> gLeft gTop gBot group-arrow"></td>
+        <% }else{ %>
+          <td class="gMode-<%= cue.nestedGroupModes[i] %> gBot"></td>
 
-    <% }else if(cue.type=="Group" && i==1){ %>
-      <td class="gMode-<%= cue.nestedGroupModes[i-1] %> gLeft gTop group-arrow"></td>
+        <% } %>
 
-    <% }else if(cue.nestedGroupPosition[i-1]==0 && cue.nestedGroupPosition[i-2]==0){ %>
-      <td class="gMode-<%= cue.nestedGroupModes[i-1] %> gLeft gBot"></td>
+      <% }else if(i<cue.nestedGroupModes.length-1){ %>
+        <td class="gMode-<%= cue.nestedGroupModes[i] %> gLeft"></td>
 
-    <% }else if(i==1 && cue.nestedGroupPosition[i]==0){ %>
-      <td class="gMode-<%= cue.nestedGroupModes[i] %> gBot"></td>
+      <% }else{ %>
+        <td class="gMode-<%= cue.nestedGroupModes[i] %>"></td>
 
-    <% }else{ %>
-      <td class="gMode-<%= cue.nestedGroupModes[i-1] %> gLeft"></td>
-
-    <% } %>
+      <% } %>
+      
 
   <% } %>
 
@@ -67,10 +72,10 @@
     <% } %>
 
   <% }else if(cue.nestedGroupPosition[1]==0){ %>
-    <td colspan="<%= 11-cue.nestedGroupModes.length %>" class="cue-name gMode-<%= cue.nestedGroupModes[1] %> gBot gRight"><%= cue.listName %></td>
+    <td colspan="<%= 11-cue.nestedGroupModes.length %>" class="cue-name gMode-<%= cue.nestedGroupModes[cue.nestedGroupModes.length-1] %> gBot gRight"><%= cue.listName %></td>
 
   <% }else{ %>
-    <td colspan="<%= 11-cue.nestedGroupModes.length %>" class="cue-name gMode-<%= cue.nestedGroupModes[1] %> gRight"><%= cue.listName %></td>
+    <td colspan="<%= 11-cue.nestedGroupModes.length %>" class="cue-name gMode-<%= cue.nestedGroupModes[cue.nestedGroupModes.length-1] %> gRight"><%= cue.listName %></td>
 
   <% } %>
 
diff --git a/plugins/qlab/main.js b/plugins/qlab/main.js
index e001cde..0e3c9c1 100644
--- a/plugins/qlab/main.js
+++ b/plugins/qlab/main.js
@@ -140,19 +140,38 @@ exports.data = function data(_device, oscData) {
     cue.postWaitElapsed = cueValues.postWaitElapsed;
 
     const nestedGroupModes = [];
-    const nestedGroupPosition = [0];
+    const nestedGroupPosition = [];
 
 
     let obj = cue;
+    let sum = 0;
+
+    if(obj.cues){
+      sum+=obj.cues.length;
+    }
 
     while(obj.parent !== "[root group of cue lists]"){
-      nestedGroupModes.push(obj.groupMode);
 
       let pos = _.findIndex(workspace.cues[obj.parent].cues, {uniqueID: obj.uniqueID});
-      pos = Math.abs(pos - workspace.cues[obj.parent].cues.length) - 1;
-      nestedGroupPosition.push(pos)
+      pos = Math.abs(pos - workspace.cues[obj.parent].cues.length)-1;
+
+      if(obj.cues === undefined){
+        sum += pos;
+      }
+
+      nestedGroupPosition.unshift(sum);
+
+      if(obj.cues){
+        sum+=pos;
+        nestedGroupModes.unshift(obj.groupMode);
+      }else{
+        nestedGroupModes.unshift(workspace.cues[obj.parent].groupMode);
+      }
+      
       obj = workspace.cues[obj.parent];
+
     }
+
     cue.nestedGroupModes = nestedGroupModes;
     cue.nestedGroupPosition = nestedGroupPosition;