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 1/2] 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;
 

From 6a01863ea6f67f55fd104d7a9502aa4047e1a16e Mon Sep 17 00:00:00 2001
From: sparks-alec <sparks.alec@gmail.com>
Date: Wed, 30 Nov 2022 03:14:18 -0500
Subject: [PATCH 2/2] new group cue icon

---
 plugins/qlab/img/new_group_arrow.png | Bin 0 -> 1982 bytes
 plugins/qlab/styles.css              |   2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)
 create mode 100644 plugins/qlab/img/new_group_arrow.png

diff --git a/plugins/qlab/img/new_group_arrow.png b/plugins/qlab/img/new_group_arrow.png
new file mode 100644
index 0000000000000000000000000000000000000000..29a4b337d1b3d209bb85b3896c70d851dce63fa9
GIT binary patch
literal 1982
zcmah~Yj6`)6i!NjQY@6ABMkW1F1CO+*-hF&yC&_#q>tDJLK91YDsDG7$-*X^?rzAo
z%B$2uM4=9r*2)Yp0yBs_9O(>$2#T%r2U?iQ2o)K556Tou#DQ_7-rba>0n{Ix?782$
z-~G<H=bR1O=ai(TOi58F6sguyO9lKN3!miVQScYb8@W!Q7zt=+l~83XCn(mZAzf?@
z(1^YO#1#rdp%@^kr9ePxfQR-Q(OX|0LlN3#MCa>mxGi7?Ub?iN1CIJRPO5$>mG43e
z3sMXs0SSCSAQ92W_<2G!qB1W5-=$>?MPwIYsS&NR*%33#0YtCSYjCt61u<|gH&J0J
z9@-2oBkC1|0D)nlP)HNX(XgBc)8^;rW4I2}>D16e&DZ$_QdIl-X%a=0!vc7UqXPoX
z`VonftYL$K5k(=643WF27<VAZF*37@!T<w&z%THaR-?s+`vZ}VtMT(g>4J&FBm}zS
z3GM>z{ug%%dCWcFWd)Y^vVoYWgd<|`V;f<*pS(pR15a|c+5X$z=Sv8K7mAj_#0_0S
zf~JQD@Xopbz$yUG20028ErZ#cCMQnH3t^{4z*Jdim{cC#h7r|j9|0E(1M}jTnPphc
z0c#K#(OG(Zj$VeO<PlaM=>hX;m*9=j#n;P$-y;E0DtTSf#ssBec+F44XmoL^syJpu
zXX~)2IC<BCCql8CAY_3y)&=$D$b@moYBt+B)=e`ID=$G{_aV7uvJbp20`8&Rbrw>9
zs1Ao!tktS>a3`Ka;Ij!muEzBQj>o-W*SJW5{6BxG_7Q`NA_Q7sfNVv3!NdqrD{3;d
z)BprS`aMQeRJ(wi3^D>*;Gj4F{D=b<A`(}HkkHcT^E6r=VzL=9shJphh+VcG(i^aZ
zvkfp(n~f-?d4c8XhRJb&+C({WPa=q1X#`10*JMNk9P0{Fz$K>v1{Otm)-8lc4wyW!
z$c(7T?WW;{)**JOdk`H|io-#YKp64@NEZ+2(KKVjV|l2}fIX%@8v3xg0{2DN;Jku^
z4~tDcXvAhG@WX-0!O3`I(()?`g>n%MD<f7B3dM{Me9d#qlIEp%^?XRSSsD*^H*7C@
zX;b_8gSjKuSC>0X9aFc?8nvYN<8T_f@DJs}(fxg@<*SyosK2$XOm5ir`eLLR0f&2b
z7w;L}8o3;}@K);x;qKE_r|&3dY-aZDbYDHw5j;2eZb75Aam9N#PU<dy+P*9KXh-D7
z=QGB9wKa{+oVt3=?=RnXzWCFIwdUCukKNxevHMzfao@JEZqv`J(laVUKF96nYS;Bv
zbe1%vw$4>~stZ`KxkFX^zPRe@-Ryy!+827SP4!i0-#oDY+0H+|sir|#Xm+dU9SAkf
z>fNEuwigawr}n;`v<RO!>O|I4SIFMIdHGo>-4l8~Q8mp#J5#dg^wW`B4-D*}vaK%T
z(48Y)i+;V-Tv-@7GB9)D&LroaT|eC2TDkLZPhVSQ^*C<Z^<Qc)6e|ZaPhHs%nOD0d
zD|q&A%VK6_QdcfDv&4LJ2mE-A36w72;rDK$^e7eWTPDNBHmk+toZQlKO1q?iOl!P2
z{Wqn`HzI#^sC$Ac^PR30_2Fks4QW<(Kt1cmP1X1evGM%zR}bD#?X&2v_Mg1ne`mbW
z^!=9Y8;inui(B<yti`g+I**<?`PaR#kGS6$d-yEbI8m4qNy5YvpSxGotXDQ=Ub?;h
zbZ*Ci<LQOscZV!Ye;b?R`)r`e8ou`+a;g2??vM6wEQr`ArS?ugzGk3X(x|W&&9Urz
I<;{kF0O}~JkpKVy

literal 0
HcmV?d00001

diff --git a/plugins/qlab/styles.css b/plugins/qlab/styles.css
index 9fc38f0..715abf7 100644
--- a/plugins/qlab/styles.css
+++ b/plugins/qlab/styles.css
@@ -157,7 +157,7 @@ tr.playback-position .q-gray-text {
 }
 .group-arrow {
   width: 13px;
-  background-image: url('img/arrow-down.png');
+  background-image: url('img/new_group_arrow.png');
   background-position: center;
   background-repeat: no-repeat;
 }