Difference between revisions of "Residents Room"

@@ Line 180: / Line 180: @@
 <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;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|
+{{#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;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=GROUP_CONCAT(scheduleRESservice.ResAbbrev),scheduleRESservice.Color,GROUP_CONCAT(residentMGH.full_name),residentMGH.pageid
+|fields=GROUP_CONCAT(DISTINCT scheduleRESservice.ResAbbrev),scheduleRESservice.Color,GROUP_CONCAT(DISTINCT residentMGH.full_name),residentMGH.pageid
 |group by=scheduleRESservice.WeekNumber
-|where=YEAR(Date)={{#time: Y|{{Timezone}}}} AND scheduleRESservice.WeekNumber='{{#expr: {{#time: W|{{Timezone}}}} - 0 }}' AND scheduleRESservice.TaskAbbrev='{{#explode:TaskAbbreviation|,|0}}'|default={{schtableempty|{{#explode:TaskAbbreviation|,|1}}}}|format=template|template=schtableres}}
+|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}}
 |}}
 <br>