Difference between revisions of "learn:schedule-previousweek"

@@ Line 1: / Line 1: @@
 {{DISPLAYTITLE:Previous Week (Week {{#expr: {{#time: W|{{Timezone}}}} - 1 }} of {{#time: Y|{{Timezone}}}})}}
-<center>{{#tag: htmltag||tagname="a"|href="https://learn.mghpathology.org/index.php/learn:schedule-currentweek"|class="glyphicon glyphicon-arrow-right" }}</center>
+<center>{{#css: a.glyphicon.glyphicon-arrow-right { font-size: 1.7em; } }} {{#tag: htmltag||tagname="a"|href="https://learn.mghpathology.org/index.php/learn:schedule-currentweek"|class="glyphicon glyphicon-arrow-right" }}</center>
-<center>{{ColorText|Call & Conferences||#30705d|5|}}</center><p></p>
+<center>{{ColorText|Call & Conference||#30705d|5|}}</center><p></p>
 <table class='table borderless'>
@@ Line 33: / Line 33: @@
      |join on=scheduleCallConference.ResAbbrev=residentMGH.copath_id
      |fields=scheduleCallConference.ResAbbrev,scheduleCallConference.Color,residentMGH.full_name,scheduleCallConference.TaskAbbrev,scheduleCallConference.Sort=sort
-     |where=YEAR(Date)={{#time: Y|{{Timezone}}}} AND scheduleCallConference.WeekNumber='{{#expr: {{#time: W|{{Timezone}}}} - 1 }}' AND scheduleCallConference.DayNumber='1' AND NOT ResAbbrev='-' AND NOT TaskAbbrev='Call: Autopsy' AND NOT TaskAbbrev='Call: Junior CP' AND NOT TaskAbbrev='Call: BB/CP'|default={{:schtableempty}}
+     |where=YEAR(Date)={{#time: Y|{{Timezone}}}} AND scheduleCallConference.WeekNumber='{{#expr: {{#time: W|{{Timezone}}}} - 1 }}' AND scheduleCallConference.DayNumber='1' AND NOT ResAbbrev='-'  AND NOT TaskAbbrev IN ('Call: Autopsy', 'Call: Junior CP', 'Call: BB/CP', 'HP Journal Club')|default={{:schtableempty}}
      |format=template|order by = sort ASC|template=schtableconfcallLeft}}
 </td>
@@ Line 84: / Line 84: @@
 <hr>
 <center>{{ColorText|Service Schedule||#30705d|5|}}</center>
+<p></p>
 <table class='table borderless'>
 <tr>
@@ Line 130: / Line 130: @@
 <td style="width: 10%">
 <table class='scheduletable'><tr><td bgcolor="#FFFFFF"><center>'''{{ColorText|{{#tip-text:Resident|Resident}}||#000000|}}'''</center></td></tr></table>
-{{#arraymap: AUT,AEAAAA;BR1,FF7E46;BR2,FF7E46;BST,E2EFDA;CV,7AD062;CA,04AAD1;CB,04AAD1;CC,04AAD1;DPA,EDB1FF;DPB,EDB1FF;DPC,EDB1FF;HN1,04E489;HN2,04E489;GI1,FFC30F;GI2,FFC30F;GI3,FFC30F;GUL,4FA4FF;GUS,4FA4FF;GYL,CD5EB6;GYS,CD5EB6;HPA,92E2AF;HPB,92E2AF;HI,92E2AF;NP,FCE4D6;OB,CD5EB6;PP,7AD062;RP,FFFF8D;FS-S,CCECFF;FS-J,CCECFF;GR-S,B8A315;AP CHIEF,B39BE9;CP CHIEF,B39BE9;|;|TaskAbbreviation|
+{{#arraymap: AUT,AEAAAA;BR1,FF7E46;BR2,FF7E46;BST,E2EFDA;CV,7AD062;CA,04AAD1;CB,04AAD1;CC,04AAD1;DPA,EDB1FF;DPB,EDB1FF;DPC,EDB1FF;HN1,04E489;HN2,04E489;GI1,FFC30F;GI2,FFC30F;GI3,FFC30F;GI4,FFC30F;GUL,4FA4FF;GUS,4FA4FF;GYL,CD5EB6;GYS,CD5EB6;HPA,92E2AF;HPB,92E2AF;HG,92E2AF;NP,FCE4D6;OB,CD5EB6;PP,7AD062;RP,FFFF8D;FS-S,CCECFF;FS-J,CCECFF;GR-S,B8A315;AP CHIEF,B39BE9;CP CHIEF,B39BE9;|;|TaskAbbreviation|
 {{#cargo_query: tables=scheduleRESservice,residentMGH
 |join on=scheduleRESservice.ResAbbrev=residentMGH.copath_id
-|fields=scheduleRESservice.ResAbbrev,scheduleRESservice.Color,residentMGH.full_name,residentMGH.pageid
+|fields=GROUP_CONCAT(DISTINCT scheduleRESservice.ResAbbrev),scheduleRESservice.Color,GROUP_CONCAT(DISTINCT residentMGH.full_name)
+|group by=scheduleRESservice.WeekNumber
 |where=YEAR(Date)={{#time: Y|{{Timezone}}}} AND scheduleRESservice.WeekNumber='{{#expr: {{#time: W|{{Timezone}}}} - 1 }}' AND scheduleRESservice.TaskAbbrev='{{#explode:TaskAbbreviation|,|0}}'|default={{schtableempty|{{#explode:TaskAbbreviation|,|1}}}}|format=template|template=schtableres}}
 |}}
@@ Line 142: / Line 143: @@
 |join on=scheduleRESservice.ResAbbrev=residentMGH.copath_id
 |fields=scheduleRESservice.ResAbbrev,scheduleRESservice.Color,residentMGH.full_name
-|where=YEAR(Date)={{#time: Y|{{Timezone}}}} AND scheduleRESservice.WeekNumber='{{#expr: {{#time: W|{{Timezone}}}} - 1 }}' AND scheduleRESservice.TaskAbbrev='VAC'|default={{:schtableempty}}|format=template|template=schtable}}
+|where=YEAR(Date)={{#time: Y|{{Timezone}}}} AND scheduleRESservice.WeekNumber='{{#expr: {{#time: W|{{Timezone}}}} - 1 }}' AND scheduleRESservice.TaskAbbrev='VAC'|default={{:schtableempty}}|group by=scheduleRESservice.WeekNumber,scheduleRESservice.ResAbbrev|format=template|template=schtable}}
 </td>
 <td style="width: 10%">
 <table class='scheduletable'><tr><td bgcolor="#FFFFFF"><center>'''{{ColorText|{{#tip-text:Fellow|Fellow / Elective-Resident}}||#000000|}}'''</center></td></tr></table>
-{{#arraymap: AUT,AEAAAA;BR1,FF7E46;BR2,FF7E46;BST,E2EFDA;CV,7AD062;CA,04AAD1;CB,04AAD1;CC,04AAD1;DPA,EDB1FF;DPB,EDB1FF;DPC,EDB1FF;HN1,04E489;HN2,04E489;GI1,FFC30F;GI2,FFC30F;GI3,FFC30F;GUL,4FA4FF;GUS,4FA4FF;GYL,CD5EB6;GYS,CD5EB6;HPA,92E2AF;HPB,92E2AF;HI,92E2AF;NP,FCE4D6;OB,CD5EB6;PP,7AD062;RP,FFFF8D;FS-S,CCECFF;FS-J,CCECFF;|;|TaskAbbreviation|
+{{#arraymap: AUT,AEAAAA;BR1,FF7E46;BR2,FF7E46;BST,E2EFDA;CV,7AD062;CA,04AAD1;CB,04AAD1;CC,04AAD1;DPA,EDB1FF;DPB,EDB1FF;DPC,EDB1FF;HN1,04E489;HN2,04E489;GI1,FFC30F;GI2,FFC30F;GI3,FFC30F;GI4,FFC30F;GUL,4FA4FF;GUS,4FA4FF;GYL,CD5EB6;GYS,CD5EB6;HPA,92E2AF;HPB,92E2AF;HG,92E2AF;NP,FCE4D6;OB,CD5EB6;PP,7AD062;RP,FFFF8D;FS-S,CCECFF;FS-J,CCECFF;|;|TaskAbbreviation|
 {{#cargo_query: tables=scheduleFELLservice,residentMGH
 |join on=scheduleFELLservice.FellAbbrev=residentMGH.copath_id
 |fields=scheduleFELLservice.FellAbbrev,scheduleFELLservice.Color,residentMGH.full_name,residentMGH.pageid
-|where=YEAR(Date)={{#time: Y|{{Timezone}}}} AND scheduleFELLservice.WeekNumber='{{#expr: {{#time: W|{{Timezone}}}} - 1 }}' AND scheduleFELLservice.TaskAbbrev='{{#explode:TaskAbbreviation|,|0}}' |format=template|default={{schtableempty|{{#explode:TaskAbbreviation|,|1}}}}|template=schtableres}}
+|where=YEAR(Date)={{#time: Y|{{Timezone}}}} AND scheduleFELLservice.WeekNumber='{{#expr: {{#time: W|{{Timezone}}}} - 1 }}' AND scheduleFELLservice.TaskAbbrev='{{#explode:TaskAbbreviation|,|0}}' |format=template|group by=scheduleFELLservice.WeekNumber|default={{schtableempty|{{#explode:TaskAbbreviation|,|1}}}}|template=schtableres}}
 |}}
 </td>
@@ Line 158: / Line 159: @@
 <td style="width: 10%">
 <table class='scheduletable'><tr><td bgcolor="#FFFFFF"><center>'''{{ColorText|{{#tip-text:A|Attending}}||#000000|}}'''</center></td></tr></table>
-{{#arraymap: AUT,AEAAAA;BR1,FF7E46;BR2,FF7E46;BST,E2EFDA;CV,7AD062;CA,04AAD1;CB,04AAD1;CC,04AAD1;DPA,EDB1FF;DPB,EDB1FF;DPC,EDB1FF;HN1,04E489;HN2,04E489;GI1,FFC30F;GI2,FFC30F;GI3,FFC30F;GUL,4FA4FF;GUS,4FA4FF;GYL,CD5EB6;GYS,CD5EB6;HPA,92E2AF;HPB,92E2AF;HI,92E2AF;NP,FCE4D6;OB,CD5EB6;PP,7AD062;RP,FFFF8D;FROZEN SECTION,CCECFF;FROZEN SECTION,CCECFF;|;|TaskAbbreviation|
+{{#arraymap: AUT,AEAAAA;BR1,FF7E46;BR2,FF7E46;BST,E2EFDA;CV,7AD062;CA,04AAD1;CB,04AAD1;CC,04AAD1;DPA,EDB1FF;DPB,EDB1FF;DPC,EDB1FF;HN1,04E489;HN2,04E489;GI1,FFC30F;GI2,FFC30F;GI3,FFC30F;GI4,FFC30F;GUL,4FA4FF;GUS,4FA4FF;GYL,CD5EB6;GYS,CD5EB6;HPA,92E2AF;HPB,92E2AF;HG,92E2AF;NP,FCE4D6;OB,CD5EB6;PP,7AD062;RP,FFFF8D;FROZEN SECTION,CCECFF;FROZEN SECTION,CCECFF;|;|TaskAbbreviation|
 {{#cargo_query: table=scheduleFACservice
-|fields=scheduleFACservice.StaffAbbrev,scheduleFACservice.Color,scheduleFACservice.StaffFullName
+|fields=GROUP_CONCAT(scheduleFACservice.StaffAbbrev),scheduleFACservice.Color,GROUP_CONCAT(scheduleFACservice.StaffFullName)
+|group by=scheduleFACservice.Color
 |where=YEAR(Date)={{#time: Y|{{Timezone}}}} AND scheduleFACservice.TaskAbbrev='{{#explode:TaskAbbreviation|,|0}}' AND scheduleFACservice.DayNumber='1' AND scheduleFACservice.WeekNumber='{{#expr: {{#time: W|{{Timezone}}}} - 1}}'
 |default={{schtableempty|{{#explode:TaskAbbreviation|,|1}}}}|format=template|template=schtable}}
@@ Line 167: / Line 169: @@
 <td style="width: 10%">
 <table class='scheduletable'><tr><td bgcolor="#FFFFFF"><center>'''{{ColorText|{{#tip-text:A|Attending}}||#000000|}}'''</center></td></tr></table>
-{{#arraymap: AUT,AEAAAA;BR1,FF7E46;BR2,FF7E46;BST,E2EFDA;CV,7AD062;CA,04AAD1;CB,04AAD1;CC,04AAD1;DPA,EDB1FF;DPB,EDB1FF;DPC,EDB1FF;HN1,04E489;HN2,04E489;GI1,FFC30F;GI2,FFC30F;GI3,FFC30F;GUL,4FA4FF;GUS,4FA4FF;GYL,CD5EB6;GYS,CD5EB6;HPA,92E2AF;HPB,92E2AF;HI,92E2AF;NP,FCE4D6;OB,CD5EB6;PP,7AD062;RP,FFFF8D;FROZEN SECTION,CCECFF;FROZEN SECTION,CCECFF;|;|TaskAbbreviation|
+{{#arraymap: AUT,AEAAAA;BR1,FF7E46;BR2,FF7E46;BST,E2EFDA;CV,7AD062;CA,04AAD1;CB,04AAD1;CC,04AAD1;DPA,EDB1FF;DPB,EDB1FF;DPC,EDB1FF;HN1,04E489;HN2,04E489;GI1,FFC30F;GI2,FFC30F;GI3,FFC30F;GI4,FFC30F;GUL,4FA4FF;GUS,4FA4FF;GYL,CD5EB6;GYS,CD5EB6;HPA,92E2AF;HPB,92E2AF;HG,92E2AF;NP,FCE4D6;OB,CD5EB6;PP,7AD062;RP,FFFF8D;FROZEN SECTION,CCECFF;FROZEN SECTION,CCECFF;|;|TaskAbbreviation|
 {{#cargo_query: table=scheduleFACservice
-|fields=scheduleFACservice.StaffAbbrev,scheduleFACservice.Color,scheduleFACservice.StaffFullName
+|fields=GROUP_CONCAT(scheduleFACservice.StaffAbbrev),scheduleFACservice.Color,GROUP_CONCAT(scheduleFACservice.StaffFullName)
+|group by=scheduleFACservice.Color
 |where=YEAR(Date)={{#time: Y|{{Timezone}}}} AND scheduleFACservice.TaskAbbrev='{{#explode:TaskAbbreviation|,|0}}' AND scheduleFACservice.DayNumber='2' AND scheduleFACservice.WeekNumber='{{#expr: {{#time: W|{{Timezone}}}} - 1}}'
 |default={{schtableempty|{{#explode:TaskAbbreviation|,|1}}}}|format=template|template=schtable}}
@@ Line 176: / Line 179: @@
 <td style="width: 10%">
 <table class='scheduletable'><tr><td bgcolor="#FFFFFF"><center>'''{{ColorText|{{#tip-text:A|Attending}}||#000000|}}'''</center></td></tr></table>
-{{#arraymap: AUT,AEAAAA;BR1,FF7E46;BR2,FF7E46;BST,E2EFDA;CV,7AD062;CA,04AAD1;CB,04AAD1;CC,04AAD1;DPA,EDB1FF;DPB,EDB1FF;DPC,EDB1FF;HN1,04E489;HN2,04E489;GI1,FFC30F;GI2,FFC30F;GI3,FFC30F;GUL,4FA4FF;GUS,4FA4FF;GYL,CD5EB6;GYS,CD5EB6;HPA,92E2AF;HPB,92E2AF;HI,92E2AF;NP,FCE4D6;OB,CD5EB6;PP,7AD062;RP,FFFF8D;FROZEN SECTION,CCECFF;FROZEN SECTION,CCECFF;|;|TaskAbbreviation|
+{{#arraymap: AUT,AEAAAA;BR1,FF7E46;BR2,FF7E46;BST,E2EFDA;CV,7AD062;CA,04AAD1;CB,04AAD1;CC,04AAD1;DPA,EDB1FF;DPB,EDB1FF;DPC,EDB1FF;HN1,04E489;HN2,04E489;GI1,FFC30F;GI2,FFC30F;GI3,FFC30F;GI4,FFC30F;GUL,4FA4FF;GUS,4FA4FF;GYL,CD5EB6;GYS,CD5EB6;HPA,92E2AF;HPB,92E2AF;HG,92E2AF;NP,FCE4D6;OB,CD5EB6;PP,7AD062;RP,FFFF8D;FROZEN SECTION,CCECFF;FROZEN SECTION,CCECFF;|;|TaskAbbreviation|
 {{#cargo_query: table=scheduleFACservice
-|fields=scheduleFACservice.StaffAbbrev,scheduleFACservice.Color,scheduleFACservice.StaffFullName
+|fields=GROUP_CONCAT(scheduleFACservice.StaffAbbrev),scheduleFACservice.Color,GROUP_CONCAT(scheduleFACservice.StaffFullName)
+|group by=scheduleFACservice.Color
 |where=YEAR(Date)={{#time: Y|{{Timezone}}}} AND scheduleFACservice.TaskAbbrev='{{#explode:TaskAbbreviation|,|0}}' AND scheduleFACservice.DayNumber='3' AND scheduleFACservice.WeekNumber='{{#expr: {{#time: W|{{Timezone}}}} - 1}}'
 |default={{schtableempty|{{#explode:TaskAbbreviation|,|1}}}}|format=template|template=schtable}}
@@ Line 185: / Line 189: @@
 <td style="width: 10%">
 <table class='scheduletable'><tr><td bgcolor="#FFFFFF"><center>'''{{ColorText|{{#tip-text:A|Attending}}||#000000|}}'''</center></td></tr></table>
-{{#arraymap: AUT,AEAAAA;BR1,FF7E46;BR2,FF7E46;BST,E2EFDA;CV,7AD062;CA,04AAD1;CB,04AAD1;CC,04AAD1;DPA,EDB1FF;DPB,EDB1FF;DPC,EDB1FF;HN1,04E489;HN2,04E489;GI1,FFC30F;GI2,FFC30F;GI3,FFC30F;GUL,4FA4FF;GUS,4FA4FF;GYL,CD5EB6;GYS,CD5EB6;HPA,92E2AF;HPB,92E2AF;HI,92E2AF;NP,FCE4D6;OB,CD5EB6;PP,7AD062;RP,FFFF8D;FROZEN SECTION,CCECFF;FROZEN SECTION,CCECFF;|;|TaskAbbreviation|
+{{#arraymap: AUT,AEAAAA;BR1,FF7E46;BR2,FF7E46;BST,E2EFDA;CV,7AD062;CA,04AAD1;CB,04AAD1;CC,04AAD1;DPA,EDB1FF;DPB,EDB1FF;DPC,EDB1FF;HN1,04E489;HN2,04E489;GI1,FFC30F;GI2,FFC30F;GI3,FFC30F;GI4,FFC30F;GUL,4FA4FF;GUS,4FA4FF;GYL,CD5EB6;GYS,CD5EB6;HPA,92E2AF;HPB,92E2AF;HG,92E2AF;NP,FCE4D6;OB,CD5EB6;PP,7AD062;RP,FFFF8D;FROZEN SECTION,CCECFF;FROZEN SECTION,CCECFF;|;|TaskAbbreviation|
 {{#cargo_query: table=scheduleFACservice
-|fields=scheduleFACservice.StaffAbbrev,scheduleFACservice.Color,scheduleFACservice.StaffFullName
+|fields=GROUP_CONCAT(scheduleFACservice.StaffAbbrev),scheduleFACservice.Color,GROUP_CONCAT(scheduleFACservice.StaffFullName)
+|group by=scheduleFACservice.Color
 |where=YEAR(Date)={{#time: Y|{{Timezone}}}} AND scheduleFACservice.TaskAbbrev='{{#explode:TaskAbbreviation|,|0}}' AND scheduleFACservice.DayNumber='4' AND scheduleFACservice.WeekNumber='{{#expr: {{#time: W|{{Timezone}}}} - 1}}'
 |default={{schtableempty|{{#explode:TaskAbbreviation|,|1}}}}|format=template|template=schtable}}
@@ Line 194: / Line 199: @@
 <td style="width: 10%">
 <table class='scheduletable'><tr><td bgcolor="#FFFFFF"><center>'''{{ColorText|{{#tip-text:A|Attending}}||#000000|}}'''</center></td></tr></table>
-{{#arraymap: AUT,AEAAAA;BR1,FF7E46;BR2,FF7E46;BST,E2EFDA;CV,7AD062;CA,04AAD1;CB,04AAD1;CC,04AAD1;DPA,EDB1FF;DPB,EDB1FF;DPC,EDB1FF;HN1,04E489;HN2,04E489;GI1,FFC30F;GI2,FFC30F;GI3,FFC30F;GUL,4FA4FF;GUS,4FA4FF;GYL,CD5EB6;GYS,CD5EB6;HPA,92E2AF;HPB,92E2AF;HI,92E2AF;NP,FCE4D6;OB,CD5EB6;PP,7AD062;RP,FFFF8D;FROZEN SECTION,CCECFF;FROZEN SECTION,CCECFF;|;|TaskAbbreviation|
+{{#arraymap: AUT,AEAAAA;BR1,FF7E46;BR2,FF7E46;BST,E2EFDA;CV,7AD062;CA,04AAD1;CB,04AAD1;CC,04AAD1;DPA,EDB1FF;DPB,EDB1FF;DPC,EDB1FF;HN1,04E489;HN2,04E489;GI1,FFC30F;GI2,FFC30F;GI3,FFC30F;GI4,FFC30F;GUL,4FA4FF;GUS,4FA4FF;GYL,CD5EB6;GYS,CD5EB6;HPA,92E2AF;HPB,92E2AF;HG,92E2AF;NP,FCE4D6;OB,CD5EB6;PP,7AD062;RP,FFFF8D;FROZEN SECTION,CCECFF;FROZEN SECTION,CCECFF;|;|TaskAbbreviation|
 {{#cargo_query: table=scheduleFACservice
-|fields=scheduleFACservice.StaffAbbrev,scheduleFACservice.Color,scheduleFACservice.StaffFullName
+|fields=GROUP_CONCAT(scheduleFACservice.StaffAbbrev),scheduleFACservice.Color,GROUP_CONCAT(scheduleFACservice.StaffFullName)
+|group by=scheduleFACservice.Color
 |where=YEAR(Date)={{#time: Y|{{Timezone}}}} AND scheduleFACservice.TaskAbbrev='{{#explode:TaskAbbreviation|,|0}}' AND scheduleFACservice.DayNumber='5' AND scheduleFACservice.WeekNumber='{{#expr: {{#time: W|{{Timezone}}}} - 1}}'
 |default={{schtableempty|{{#explode:TaskAbbreviation|,|1}}}}|format=template|template=schtable}}
@@ Line 203: / Line 209: @@
 <td style="width: 10%">
 <table class='scheduletable'><tr><td bgcolor="#FFFFFF"><center>'''{{ColorText|{{#tip-text:A|Attending}}||#000000|}}'''</center></td></tr></table>
-{{#arraymap: AUT,AEAAAA;BR1,FF7E46;BR2,FF7E46;BST,E2EFDA;CV,7AD062;CA,04AAD1;CB,04AAD1;CC,04AAD1;DPA,EDB1FF;DPB,EDB1FF;DPC,EDB1FF;HN1,04E489;HN2,04E489;GI1,FFC30F;GI2,FFC30F;GI3,FFC30F;GUL,4FA4FF;GUS,4FA4FF;GYL,CD5EB6;GYS,CD5EB6;HPA,92E2AF;HPB,92E2AF;HI,92E2AF;NP,FCE4D6;OB,CD5EB6;PP,7AD062;RP,FFFF8D;FROZEN SECTION,CCECFF;FROZEN SECTION,CCECFF;|;|TaskAbbreviation|
+{{#arraymap: AUT,AEAAAA;BR1,FF7E46;BR2,FF7E46;BST,E2EFDA;CV,7AD062;CA,04AAD1;CB,04AAD1;CC,04AAD1;DPA,EDB1FF;DPB,EDB1FF;DPC,EDB1FF;HN1,04E489;HN2,04E489;GI1,FFC30F;GI2,FFC30F;GI3,FFC30F;GI4,FFC30F;GUL,4FA4FF;GUS,4FA4FF;GYL,CD5EB6;GYS,CD5EB6;HPA,92E2AF;HPB,92E2AF;HG,92E2AF;NP,FCE4D6;OB,CD5EB6;PP,7AD062;RP,FFFF8D;FROZEN SECTION,CCECFF;FROZEN SECTION,CCECFF;|;|TaskAbbreviation|
 {{#cargo_query: table=scheduleFACservice
-|fields=scheduleFACservice.StaffAbbrev,scheduleFACservice.Color,scheduleFACservice.StaffFullName
+|fields=GROUP_CONCAT(scheduleFACservice.StaffAbbrev),scheduleFACservice.Color,GROUP_CONCAT(scheduleFACservice.StaffFullName)
+|group by=scheduleFACservice.Color
 |where=YEAR(Date)={{#time: Y|{{Timezone}}}} AND scheduleFACservice.TaskAbbrev='{{#explode:TaskAbbreviation|,|0}}' AND scheduleFACservice.DayNumber='6' AND scheduleFACservice.WeekNumber='{{#expr: {{#time: W|{{Timezone}}}} - 1}}'
 |default={{schtableempty|{{#explode:TaskAbbreviation|,|1}}}}|format=template|template=schtable}}
@@ Line 212: / Line 219: @@
 <td style="width: 10%">
 <table class='scheduletable'><tr><td bgcolor="#FFFFFF"><center>'''{{ColorText|{{#tip-text:A|Attending}}||#000000|}}'''</center></td></tr></table>
-{{#arraymap: AUT,AEAAAA;BR1,FF7E46;BR2,FF7E46;BST,E2EFDA;CV,7AD062;CA,04AAD1;CB,04AAD1;CC,04AAD1;DPA,EDB1FF;DPB,EDB1FF;DPC,EDB1FF;HN1,04E489;HN2,04E489;GI1,FFC30F;GI2,FFC30F;GI3,FFC30F;GUL,4FA4FF;GUS,4FA4FF;GYL,CD5EB6;GYS,CD5EB6;HPA,92E2AF;HPB,92E2AF;HI,92E2AF;NP,FCE4D6;OB,CD5EB6;PP,7AD062;RP,FFFF8D;FROZEN SECTION,CCECFF;FROZEN SECTION,CCECFF;|;|TaskAbbreviation|
+{{#arraymap: AUT,AEAAAA;BR1,FF7E46;BR2,FF7E46;BST,E2EFDA;CV,7AD062;CA,04AAD1;CB,04AAD1;CC,04AAD1;DPA,EDB1FF;DPB,EDB1FF;DPC,EDB1FF;HN1,04E489;HN2,04E489;GI1,FFC30F;GI2,FFC30F;GI3,FFC30F;GI4,FFC30F;GUL,4FA4FF;GUS,4FA4FF;GYL,CD5EB6;GYS,CD5EB6;HPA,92E2AF;HPB,92E2AF;HG,92E2AF;NP,FCE4D6;OB,CD5EB6;PP,7AD062;RP,FFFF8D;FROZEN SECTION,CCECFF;FROZEN SECTION,CCECFF;|;|TaskAbbreviation|
 {{#cargo_query: table=scheduleFACservice
-|fields=scheduleFACservice.StaffAbbrev,scheduleFACservice.Color,scheduleFACservice.StaffFullName
+|fields=GROUP_CONCAT(scheduleFACservice.StaffAbbrev),scheduleFACservice.Color,GROUP_CONCAT(scheduleFACservice.StaffFullName)
+|group by=scheduleFACservice.Color
 |where=YEAR(Date)={{#time: Y|{{Timezone}}}} AND scheduleFACservice.TaskAbbrev='{{#explode:TaskAbbreviation|,|0}}' AND scheduleFACservice.DayNumber='7' AND scheduleFACservice.WeekNumber='{{#expr: {{#time: W|{{Timezone}}}} - 1}}'
 |default={{schtableempty|{{#explode:TaskAbbreviation|,|1}}}}|format=template|template=schtable}}