Difference between revisions of "Residents Room"

@@ Line 193: / Line 193: @@
 {{#cargo_query: tables=scheduleRESservice,residentMGH
 |join on=scheduleRESservice.ResAbbrev=residentMGH.copath_id
-|fields=scheduleRESservice.ResAbbrev,scheduleRESservice.Color,residentMGH.full_name
+|fields=scheduleRESservice.ResAbbrev,scheduleRESservice.Color,residentMGH.full_name|group by=scheduleRESservice.WeekNumber,scheduleRESservice.ResAbbrev
 |where=YEAR(Date)={{#time: Y|{{Timezone}}}} AND scheduleRESservice.WeekNumber='{{#expr: {{#time: W|{{Timezone}}}} + 0 }}' AND scheduleRESservice.TaskAbbrev='VAC'|default={{:schtableempty}}|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;HG,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;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}}}} - 0 }}' 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>