Difference between revisions of "learn:currentweek"

@@ Line 1: / Line 1: @@
-{{DISPLAYTITLE:Current Week ({{#time: W|{{Timezone}}}})}}<center>{{ColorText|Call & Conferences||#30705d|5|}}</center><p></p>
+{{DISPLAYTITLE:Current Week (Week {{#time: W|{{Timezone}}}} of {{#time: Y|{{Timezone}}}})}}<center>{{ColorText|Call & Conferences||#30705d|5|}}</center><p></p>
-{{:CurrentWeekConfCall}}
+<table class='table borderless'>
+<tr>
+<td style="width: 14%">
+{{#cargo_query: tables=scheduleFACservice |fields=scheduleFACservice.Date |where=YEAR(Date)={{#time: Y|{{Timezone}}}} AND scheduleFACservice.DayNumber='1' AND scheduleFACservice.WeekNumber='{{#expr: {{#time: W|{{Timezone}}}} - 0 }}' AND scheduleFACservice.TaskAbbrev='BR1' |format=template|template=datedisplayfac}}
+</td>
+<td style="width: 14%">
+{{#cargo_query: tables=scheduleFACservice |fields=scheduleFACservice.Date |where=YEAR(Date)={{#time: Y|{{Timezone}}}} AND scheduleFACservice.DayNumber='2' AND scheduleFACservice.WeekNumber='{{#expr: {{#time: W|{{Timezone}}}} - 0 }}' AND scheduleFACservice.TaskAbbrev='BR1' |format=template|template=datedisplayfac}}
+</td>
+<td style="width: 14%">
+{{#cargo_query: tables=scheduleFACservice |fields=scheduleFACservice.Date |where=YEAR(Date)={{#time: Y|{{Timezone}}}} AND scheduleFACservice.DayNumber='3' AND scheduleFACservice.WeekNumber='{{#expr: {{#time: W|{{Timezone}}}} - 0 }}' AND scheduleFACservice.TaskAbbrev='BR1' |format=template|template=datedisplayfac}}
+</td>
+<td style="width: 14%">
+{{#cargo_query: tables=scheduleFACservice |fields=scheduleFACservice.Date |where=YEAR(Date)={{#time: Y|{{Timezone}}}} AND scheduleFACservice.DayNumber='4' AND scheduleFACservice.WeekNumber='{{#expr: {{#time: W|{{Timezone}}}} - 0 }}' AND scheduleFACservice.TaskAbbrev='BR1' |format=template|template=datedisplayfac}}
+</td>
+<td style="width: 14%">
+{{#cargo_query: tables=scheduleFACservice |fields=scheduleFACservice.Date |where=YEAR(Date)={{#time: Y|{{Timezone}}}} AND scheduleFACservice.DayNumber='5' AND scheduleFACservice.WeekNumber='{{#expr: {{#time: W|{{Timezone}}}} - 0 }}' AND scheduleFACservice.TaskAbbrev='BR1' |format=template|template=datedisplayfac}}
+</td>
+<td style="width: 14%">
+{{#cargo_query: tables=scheduleFACservice |fields=scheduleFACservice.Date |where=YEAR(Date)={{#time: Y|{{Timezone}}}} AND scheduleFACservice.DayNumber='6' AND scheduleFACservice.WeekNumber='{{#expr: {{#time: W|{{Timezone}}}} - 0 }}' AND scheduleFACservice.TaskAbbrev='BR1' |format=template|template=datedisplayfac}}
+</td>
+<td style="width: 14%">
+{{#cargo_query: tables=scheduleFACservice |fields=scheduleFACservice.Date |where=YEAR(Date)={{#time: Y|{{Timezone}}}} AND scheduleFACservice.DayNumber='7' AND scheduleFACservice.WeekNumber='{{#expr: {{#time: W|{{Timezone}}}} - 0 }}' AND scheduleFACservice.TaskAbbrev='BR1' |format=template|template=datedisplayfac}}
+</td>
+</tr>
+<tr>
+<td style="width: 14%">
+{{#cargo_query: tables=scheduleCallConference,residentMGH
+    |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}}}} - 0 }}' AND scheduleCallConference.DayNumber='1'|default={{:schtableempty}}
+    |format=template|order by = sort ASC|template=schtableconfcallLeft}}
+</td>
+<td style="width: 14%">
+{{#cargo_query: tables=scheduleCallConference,residentMGH
+    |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}}}} - 0 }}' AND scheduleCallConference.DayNumber='2'|default={{:schtableempty}}
+    |format=template|order by = sort ASC|template=schtableconfcallLeft}}
+</td>
+<td style="width: 14%">
+{{#cargo_query: tables=scheduleCallConference,residentMGH
+    |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}}}} - 0 }}' AND scheduleCallConference.DayNumber='3'|default={{:schtableempty}}
+    |format=template|order by = sort ASC|template=schtableconfcallLeft}}
+</td>
+<td style="width: 14%">
+{{#cargo_query: tables=scheduleCallConference,residentMGH
+    |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}}}} - 0 }}' AND scheduleCallConference.DayNumber='4'|default={{:schtableempty}}
+    |format=template|order by = sort ASC|template=schtableconfcallLeft}}
+</td>
+<td style="width: 14%">
+{{#cargo_query: tables=scheduleCallConference,residentMGH
+    |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}}}} - 0 }}' AND scheduleCallConference.DayNumber='5'|default={{:schtableempty}}
+    |format=template|order by = sort ASC|template=schtableconfcallLeft}}
+</td>
+<td style="width: 14%">
+{{#cargo_query: tables=scheduleCallConference,residentMGH
+    |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}}}} - 0 }}' AND scheduleCallConference.DayNumber='6'|default={{:schtableempty}}
+    |format=template|order by = sort ASC|template=schtableconfcallLeft}}
+</td>
+<td style="width: 14%">
+{{#cargo_query: tables=scheduleCallConference,residentMGH
+    |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}}}} - 0 }}' AND scheduleCallConference.DayNumber='0'|default={{:schtableempty}}
+    |format=template|order by = sort ASC|template=schtableconfcallLeft}}
+</td>
+</tr>
+</table>
 <hr>
 <center>{{ColorText|Service Schedule||#30705d|5|}}</center>
@@ Line 18: / Line 96: @@
 </td>
 <td class='align-bottom' colspan="1">
-<center>{{#cargo_query: tables=scheduleFACservice |fields=scheduleFACservice.Date |where=scheduleFACservice.DayNumber='1' AND scheduleFACservice.WeekNumber='{{#expr: {{#time: W|{{Timezone}}}} + 0 }}' AND scheduleFACservice.TaskAbbrev='BR1' |format=template|template=datedisplaycurrent}}<p></p></center>
+<center>{{#cargo_query: tables=scheduleFACservice |fields=scheduleFACservice.Date |where=YEAR(Date)={{#time: Y|{{Timezone}}}} AND scheduleFACservice.DayNumber='1' AND scheduleFACservice.WeekNumber='{{#expr: {{#time: W|{{Timezone}}}} + 0 }}' AND scheduleFACservice.TaskAbbrev='BR1' |format=template|template=datedisplaycurrent}}<p></p></center>
 </td>
 <td class='align-bottom' colspan="1">
-<center>{{#cargo_query: tables=scheduleFACservice |fields=scheduleFACservice.Date |where=scheduleFACservice.DayNumber='2' AND scheduleFACservice.WeekNumber='{{#expr: {{#time: W|{{Timezone}}}} + 0 }}' AND scheduleFACservice.TaskAbbrev='BR1' |format=template|template=datedisplaycurrent}}<p></p></center>
+<center>{{#cargo_query: tables=scheduleFACservice |fields=scheduleFACservice.Date |where=YEAR(Date)={{#time: Y|{{Timezone}}}} AND scheduleFACservice.DayNumber='2' AND scheduleFACservice.WeekNumber='{{#expr: {{#time: W|{{Timezone}}}} + 0 }}' AND scheduleFACservice.TaskAbbrev='BR1' |format=template|template=datedisplaycurrent}}<p></p></center>
 </td>
 <td class='align-bottom' colspan="1">
-<center>{{#cargo_query: tables=scheduleFACservice |fields=scheduleFACservice.Date |where=scheduleFACservice.DayNumber='3' AND scheduleFACservice.WeekNumber='{{#expr: {{#time: W|{{Timezone}}}} + 0 }}' AND scheduleFACservice.TaskAbbrev='BR1' |format=template|template=datedisplaycurrent}}<p></p></center>
+<center>{{#cargo_query: tables=scheduleFACservice |fields=scheduleFACservice.Date |where=YEAR(Date)={{#time: Y|{{Timezone}}}} AND scheduleFACservice.DayNumber='3' AND scheduleFACservice.WeekNumber='{{#expr: {{#time: W|{{Timezone}}}} + 0 }}' AND scheduleFACservice.TaskAbbrev='BR1' |format=template|template=datedisplaycurrent}}<p></p></center>
 </td>
 <td class='align-bottom' colspan="1">
-<center>{{#cargo_query: tables=scheduleFACservice |fields=scheduleFACservice.Date |where=scheduleFACservice.DayNumber='4' AND scheduleFACservice.WeekNumber='{{#expr: {{#time: W|{{Timezone}}}} + 0 }}' AND scheduleFACservice.TaskAbbrev='BR1' |format=template|template=datedisplaycurrent}}<p></p></center>
+<center>{{#cargo_query: tables=scheduleFACservice |fields=scheduleFACservice.Date |where=YEAR(Date)={{#time: Y|{{Timezone}}}} AND scheduleFACservice.DayNumber='4' AND scheduleFACservice.WeekNumber='{{#expr: {{#time: W|{{Timezone}}}} + 0 }}' AND scheduleFACservice.TaskAbbrev='BR1' |format=template|template=datedisplaycurrent}}<p></p></center>
 </td>
 <td colspan="1">
-<center>{{#cargo_query: tables=scheduleFACservice |fields=scheduleFACservice.Date |where=scheduleFACservice.DayNumber='5' AND scheduleFACservice.WeekNumber='{{#expr: {{#time: W|{{Timezone}}}} + 0 }}' AND scheduleFACservice.TaskAbbrev='BR1' |format=template|template=datedisplaycurrent}}<p></p></center>
+<center>{{#cargo_query: tables=scheduleFACservice |fields=scheduleFACservice.Date |where=YEAR(Date)={{#time: Y|{{Timezone}}}} AND scheduleFACservice.DayNumber='5' AND scheduleFACservice.WeekNumber='{{#expr: {{#time: W|{{Timezone}}}} + 0 }}' AND scheduleFACservice.TaskAbbrev='BR1' |format=template|template=datedisplaycurrent}}<p></p></center>
 </td>
 <td colspan="1">
-<center>{{#cargo_query: tables=scheduleFACservice |fields=scheduleFACservice.Date |where=scheduleFACservice.DayNumber='6' AND scheduleFACservice.WeekNumber='{{#expr: {{#time: W|{{Timezone}}}} + 0 }}' AND scheduleFACservice.TaskAbbrev='BR1' |format=template|template=datedisplaycurrent}}<p></p></center>
+<center>{{#cargo_query: tables=scheduleFACservice |fields=scheduleFACservice.Date |where=YEAR(Date)={{#time: Y|{{Timezone}}}} AND scheduleFACservice.DayNumber='6' AND scheduleFACservice.WeekNumber='{{#expr: {{#time: W|{{Timezone}}}} + 0 }}' AND scheduleFACservice.TaskAbbrev='BR1' |format=template|template=datedisplaycurrent}}<p></p></center>
 </td>
 <td colspan="1">
-<center>{{#cargo_query: tables=scheduleFACservice |fields=scheduleFACservice.Date |where=scheduleFACservice.DayNumber='7' AND scheduleFACservice.WeekNumber='{{#expr: {{#time: W|{{Timezone}}}} + 0 }}' AND scheduleFACservice.TaskAbbrev='BR1' |format=template|template=datedisplaycurrent}}<p></p></center>
+<center>{{#cargo_query: tables=scheduleFACservice |fields=scheduleFACservice.Date |where=YEAR(Date)={{#time: Y|{{Timezone}}}} AND scheduleFACservice.DayNumber='7' AND scheduleFACservice.WeekNumber='{{#expr: {{#time: W|{{Timezone}}}} + 0 }}' AND scheduleFACservice.TaskAbbrev='BR1' |format=template|template=datedisplaycurrent}}<p></p></center>
 </td>
 </tr>
@@ Line 42: / Line 120: @@
 <td style="width: 10%">
 <table class='scheduletable'><tr><td bgcolor="#FFFFFF"><center>{{ColorText|'''Service'''||#000000|}}</center></td></tr></table>
-{{:schtablemobile}}
+{{:schtablemobile2}}
 </td>
 <td style="width: 5%">
@@ Line 49: / Line 127: @@
 <td style="width: 10%">
 <table class='scheduletable'><tr><td bgcolor="#FFFFFF"><center>'''{{ColorText|{{#tip-text:Resident|Resident}}||#000000|}}'''</center></td></tr></table>
-{{#arraymap: AUT,BR1,BR2,BST,CV,CA,CB,CC,DPA,DPB,DPC,FZ,HN1,HN2,GI1,GI2,GI3,GUL,GUS,GYL,GYS,HPA,HPB,NP,OB,PP,RP,AP CHIEF,FZ,FZ-S,FZ-J,GR-S|,|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;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|
 {{#cargo_query: tables=scheduleRESservice,residentMGH
 |join on=scheduleRESservice.ResAbbrev=residentMGH.copath_id
 |fields=scheduleRESservice.ResAbbrev,scheduleRESservice.Color,residentMGH.full_name,residentMGH.pageid
-|where=scheduleRESservice._pageName='RESservice-2019-2020' AND scheduleRESservice.WeekNumber='{{#expr: {{#time: W|{{Timezone}}}} + 0 }}' AND scheduleRESservice.TaskAbbrev='TaskAbbreviation'|default={{:schtableempty}}|format=template|template=schtableres}}
+|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}}
 |}}
 <br>
+<table class='scheduletable'>
+<td bgcolor="#FFFFFF"><center>'''{{ColorText|{{#tip-text:VAC|Vacation}}||#000000|}}'''</center></td></table>
 {{#cargo_query: tables=scheduleRESservice,residentMGH
 |join on=scheduleRESservice.ResAbbrev=residentMGH.copath_id
 |fields=scheduleRESservice.ResAbbrev,scheduleRESservice.Color,residentMGH.full_name
-|where=scheduleRESservice.WeekNumber='{{#expr: {{#time: W|{{Timezone}}}} + 0 }}' AND scheduleRESservice.TaskAbbrev='VAC'|default={{:schtableempty}}|format=template|template=schtable}}
+|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,BR1,BR2,BST,CV,CA,CB,CC,DPA,DPB,DPC,FS,HN1,HN2,GI1,GI2,GI3,GUL,GUS,GYL,GYS,HPA,HPB,NP,OB,PP,RP,AP CHIEF,FS,FZ-S,FZ-J|,|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;HI,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=scheduleFELLservice.WeekNumber='{{#expr: {{#time: W|{{Timezone}}}} + 0 }}' AND scheduleFELLservice.TaskAbbrev='TaskAbbreviation' |format=template|template=schtableres}}
+|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}}
 |}}
 </td>
@@ Line 75: / Line 155: @@
 <td style="width: 10%">
 <table class='scheduletable'><tr><td bgcolor="#FFFFFF"><center>'''{{ColorText|{{#tip-text:A|Attending}}||#000000|}}'''</center></td></tr></table>
-{{#arraymap: AUT,BR1,BR2,BST,CV,CA,CB,CC,DPA,DPB,DPC,Frozen Section,HN1,HN2,GI1,GI2,GI3,GUL,GUS,GYL,GYS,HPA,HPB,NP,OB,PP,RP|,|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;HI,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
-|where=scheduleFACservice.TaskAbbrev='TaskAbbreviation' AND scheduleFACservice.DayNumber='1' AND scheduleFACservice.WeekNumber='{{#expr: {{#time: W|{{Timezone}}}} + 0}}'
+|where=YEAR(Date)={{#time: Y|{{Timezone}}}} AND scheduleFACservice.TaskAbbrev='{{#explode:TaskAbbreviation|,|0}}' AND scheduleFACservice.DayNumber='1' AND scheduleFACservice.WeekNumber='{{#expr: {{#time: W|{{Timezone}}}} - 0}}'
-|default={{:schtableempty}}|format=template|template=schtable}}
+|default={{schtableempty|{{#explode:TaskAbbreviation|,|1}}}}|format=template|template=schtable}}
 |}}
 </td>
 <td style="width: 10%">
 <table class='scheduletable'><tr><td bgcolor="#FFFFFF"><center>'''{{ColorText|{{#tip-text:A|Attending}}||#000000|}}'''</center></td></tr></table>
-{{#arraymap: AUT,BR1,BR2,BST,CV,CA,CB,CC,DPA,DPB,DPC,Frozen Section,HN1,HN2,GI1,GI2,GI3,GUL,GUS,GYL,GYS,HPA,HPB,NP,OB,PP,RP|,|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;HI,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
-|where=scheduleFACservice.TaskAbbrev='TaskAbbreviation' AND scheduleFACservice.DayNumber='2' AND scheduleFACservice.WeekNumber='{{#expr: {{#time: W|{{Timezone}}}} + 0}}'
+|where=YEAR(Date)={{#time: Y|{{Timezone}}}} AND scheduleFACservice.TaskAbbrev='{{#explode:TaskAbbreviation|,|0}}' AND scheduleFACservice.DayNumber='2' AND scheduleFACservice.WeekNumber='{{#expr: {{#time: W|{{Timezone}}}} - 0}}'
-|default={{:schtableempty}}|format=template|template=schtable}}
+|default={{schtableempty|{{#explode:TaskAbbreviation|,|1}}}}|format=template|template=schtable}}
 |}}
 </td>
 <td style="width: 10%">
 <table class='scheduletable'><tr><td bgcolor="#FFFFFF"><center>'''{{ColorText|{{#tip-text:A|Attending}}||#000000|}}'''</center></td></tr></table>
-{{#arraymap: AUT,BR1,BR2,BST,CV,CA,CB,CC,DPA,DPB,DPC,Frozen Section,HN1,HN2,GI1,GI2,GI3,GUL,GUS,GYL,GYS,HPA,HPB,NP,OB,PP,RP|,|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;HI,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
-|where=scheduleFACservice.TaskAbbrev='TaskAbbreviation' AND scheduleFACservice.DayNumber='3' AND scheduleFACservice.WeekNumber='{{#expr: {{#time: W|{{Timezone}}}} + 0}}'
+|where=YEAR(Date)={{#time: Y|{{Timezone}}}} AND scheduleFACservice.TaskAbbrev='{{#explode:TaskAbbreviation|,|0}}' AND scheduleFACservice.DayNumber='3' AND scheduleFACservice.WeekNumber='{{#expr: {{#time: W|{{Timezone}}}} - 0}}'
-|default={{:schtableempty}}|format=template|template=schtable}}
+|default={{schtableempty|{{#explode:TaskAbbreviation|,|1}}}}|format=template|template=schtable}}
 |}}
 </td>
 <td style="width: 10%">
 <table class='scheduletable'><tr><td bgcolor="#FFFFFF"><center>'''{{ColorText|{{#tip-text:A|Attending}}||#000000|}}'''</center></td></tr></table>
-{{#arraymap: AUT,BR1,BR2,BST,CV,CA,CB,CC,DPA,DPB,DPC,Frozen Section,HN1,HN2,GI1,GI2,GI3,GUL,GUS,GYL,GYS,HPA,HPB,NP,OB,PP,RP|,|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;HI,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
-|where=scheduleFACservice.TaskAbbrev='TaskAbbreviation' AND scheduleFACservice.DayNumber='4' AND scheduleFACservice.WeekNumber='{{#expr: {{#time: W|{{Timezone}}}} + 0}}'
+|where=YEAR(Date)={{#time: Y|{{Timezone}}}} AND scheduleFACservice.TaskAbbrev='{{#explode:TaskAbbreviation|,|0}}' AND scheduleFACservice.DayNumber='4' AND scheduleFACservice.WeekNumber='{{#expr: {{#time: W|{{Timezone}}}} - 0}}'
-|default={{:schtableempty}}|format=template|template=schtable}}
+|default={{schtableempty|{{#explode:TaskAbbreviation|,|1}}}}|format=template|template=schtable}}
 |}}
 </td>
 <td style="width: 10%">
 <table class='scheduletable'><tr><td bgcolor="#FFFFFF"><center>'''{{ColorText|{{#tip-text:A|Attending}}||#000000|}}'''</center></td></tr></table>
-{{#arraymap: AUT,BR1,BR2,BST,CV,CA,CB,CC,DPA,DPB,DPC,Frozen Section,HN1,HN2,GI1,GI2,GI3,GUL,GUS,GYL,GYS,HPA,HPB,NP,OB,PP,RP|,|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;HI,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
-|where=scheduleFACservice.TaskAbbrev='TaskAbbreviation' AND scheduleFACservice.DayNumber='5' AND scheduleFACservice.WeekNumber='{{#expr: {{#time: W|{{Timezone}}}} + 0}}'
+|where=YEAR(Date)={{#time: Y|{{Timezone}}}} AND scheduleFACservice.TaskAbbrev='{{#explode:TaskAbbreviation|,|0}}' AND scheduleFACservice.DayNumber='5' AND scheduleFACservice.WeekNumber='{{#expr: {{#time: W|{{Timezone}}}} - 0}}'
-|default={{:schtableempty}}|format=template|template=schtable}}
+|default={{schtableempty|{{#explode:TaskAbbreviation|,|1}}}}|format=template|template=schtable}}
 |}}
 </td>
 <td style="width: 10%">
 <table class='scheduletable'><tr><td bgcolor="#FFFFFF"><center>'''{{ColorText|{{#tip-text:A|Attending}}||#000000|}}'''</center></td></tr></table>
-{{#arraymap: AUT,BR1,BR2,BST,CV,CA,CB,CC,DPA,DPB,DPC,Frozen Section,HN1,HN2,GI1,GI2,GI3,GUL,GUS,GYL,GYS,HPA,HPB,NP,OB,PP,RP|,|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;HI,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
-|where=scheduleFACservice.TaskAbbrev='TaskAbbreviation' AND scheduleFACservice.DayNumber='6' AND scheduleFACservice.WeekNumber='{{#expr: {{#time: W|{{Timezone}}}} + 0}}'
+|where=YEAR(Date)={{#time: Y|{{Timezone}}}} AND scheduleFACservice.TaskAbbrev='{{#explode:TaskAbbreviation|,|0}}' AND scheduleFACservice.DayNumber='6' AND scheduleFACservice.WeekNumber='{{#expr: {{#time: W|{{Timezone}}}} - 0}}'
-|default={{:schtableempty}}|format=template|template=schtable}}
+|default={{schtableempty|{{#explode:TaskAbbreviation|,|1}}}}|format=template|template=schtable}}
 |}}
 </td>
 <td style="width: 10%">
 <table class='scheduletable'><tr><td bgcolor="#FFFFFF"><center>'''{{ColorText|{{#tip-text:A|Attending}}||#000000|}}'''</center></td></tr></table>
-{{#arraymap: AUT,BR1,BR2,BST,CV,CA,CB,CC,DPA,DPB,DPC,Frozen Section,HN1,HN2,GI1,GI2,GI3,GUL,GUS,GYL,GYS,HPA,HPB,NP,OB,PP,RP|,|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;HI,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
-|where=scheduleFACservice.TaskAbbrev='TaskAbbreviation' AND scheduleFACservice.DayNumber='7' AND scheduleFACservice.WeekNumber='{{#expr: {{#time: W|{{Timezone}}}} + 0}}'
+|where=YEAR(Date)={{#time: Y|{{Timezone}}}} AND scheduleFACservice.TaskAbbrev='{{#explode:TaskAbbreviation|,|0}}' AND scheduleFACservice.DayNumber='7' AND scheduleFACservice.WeekNumber='{{#expr: {{#time: W|{{Timezone}}}} - 0}}'
-|default={{:schtableempty}}|format=template|template=schtable}}
+|default={{schtableempty|{{#explode:TaskAbbreviation|,|1}}}}|format=template|template=schtable}}
 |}}
 </td>