Difference between revisions of "learn:schedule-nextweek"

@@ Line 1: / Line 1: @@
-{{DISPLAYTITLE:Next Week (Week {{#expr: {{#time: W|{{Timezone}}}} + 1 }} of {{#time: Y|{{Timezone}}}})}}<center>{{ColorText|Call & Conferences||#30705d|5|}}</center><p></p>
+{{varScheduleYearNW}}{{DISPLAYTITLE:Next Week (Week {{formatnum:{{#expr:{{#timel: W|now +1 week}}}}}} of {{#var:MondayNW}})}}
+<center>{{#css: a.glyphicon.glyphicon-arrow-left { font-size: 1.7em; } }}{{#tag: htmltag||tagname="a"|href="https://learn.mghpathology.org/index.php/learn:schedule-currentweek"|class="glyphicon glyphicon-arrow-left" }} </center>
+<center>{{ColorText|Call & Conference||#30705d|5|}}</center><p></p>
 <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}}}} + 1 }}' AND scheduleFACservice.TaskAbbrev='BR1' |format=template|template=datedisplayfac}}
+{{scheduleNWcallheader|1|Monday}}
 </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}}}} + 1 }}' AND scheduleFACservice.TaskAbbrev='BR1' |format=template|template=datedisplayfac}}
+{{scheduleNWcallheader|2|Tuesday}}
 </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}}}} + 1 }}' AND scheduleFACservice.TaskAbbrev='BR1' |format=template|template=datedisplayfac}}
+{{scheduleNWcallheader|3|Wednesday}}
 </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}}}} + 1 }}' AND scheduleFACservice.TaskAbbrev='BR1' |format=template|template=datedisplayfac}}
+{{scheduleNWcallheader|4|Thursday}}
 </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}}}} + 1 }}' AND scheduleFACservice.TaskAbbrev='BR1' |format=template|template=datedisplayfac}}
+{{scheduleNWcallheader|5|Friday}}
 </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}}}} + 1 }}' AND scheduleFACservice.TaskAbbrev='BR1' |format=template|template=datedisplayfac}}
+{{scheduleNWcallheader|6|Saturday}}
 </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}}}} + 1 }}' AND scheduleFACservice.TaskAbbrev='BR1' |format=template|template=datedisplayfac}}
+{{scheduleNWcallheader|7|Sunday}}
 </td>
 </tr>
 <tr>
 <td style="width: 14%">
-{{#cargo_query: tables=scheduleCallConference,residentMGH
+{{scheduleNWcall|1|Monday}}
-    |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'|default={{:schtableempty}}
-    |format=template|order by = sort ASC|template=schtableconfcallLeft}}
 </td>
 <td style="width: 14%">
-{{#cargo_query: tables=scheduleCallConference,residentMGH
+{{scheduleNWcall|2|Tuesday}}
-    |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='2'|default={{:schtableempty}}
-    |format=template|order by = sort ASC|template=schtableconfcallLeft}}
 </td>
 <td style="width: 14%">
-{{#cargo_query: tables=scheduleCallConference,residentMGH
+{{scheduleNWcall|3|Wednesday}}
-    |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='3'|default={{:schtableempty}}
-    |format=template|order by = sort ASC|template=schtableconfcallLeft}}
 </td>
 <td style="width: 14%">
-{{#cargo_query: tables=scheduleCallConference,residentMGH
+{{scheduleNWcall|4|Thursday}}
-    |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='4'|default={{:schtableempty}}
-    |format=template|order by = sort ASC|template=schtableconfcallLeft}}
 </td>
 <td style="width: 14%">
-{{#cargo_query: tables=scheduleCallConference,residentMGH
+{{scheduleNWcall|5|Friday}}
-    |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='5'|default={{:schtableempty}}
-    |format=template|order by = sort ASC|template=schtableconfcallLeft}}
 </td>
 <td style="width: 14%">
-{{#cargo_query: tables=scheduleCallConference,residentMGH
+{{scheduleNWcall|6|Saturday}}
-    |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='6'|default={{:schtableempty}}
-    |format=template|order by = sort ASC|template=schtableconfcallLeft}}
 </td>
 <td style="width: 14%">
-{{#cargo_query: tables=scheduleCallConference,residentMGH
+{{scheduleNWcall|7|Sunday}}
-    |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='0'|default={{:schtableempty}}
-    |format=template|order by = sort ASC|template=schtableconfcallLeft}}
 </td>
 </tr>
@@ Line 80: / Line 55: @@
 <hr>
 <center>{{ColorText|Service Schedule||#30705d|5|}}</center>
-<center>{{#tag: htmltag||tagname="a"|href="https://learn.mghpathology.org/index.php/learn:schedule-currentweek"|class="glyphicon glyphicon-arrow-left" }} </center>
+<p></p>
 <center><table class='table borderless'>
 <tr>
@@ Line 95: / Line 70: @@
 </td>
 <td class='align-bottom' colspan="1">
-<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}}}} + 1 }}' AND scheduleFACservice.TaskAbbrev='BR1' |format=template|template=datedisplaycurrent}}<p></p></center>
+{{scheduleNWserviceheader|1|Monday}}
 </td>
 <td class='align-bottom' colspan="1">
-<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}}}} + 1 }}' AND scheduleFACservice.TaskAbbrev='BR1' |format=template|template=datedisplaycurrent}}<p></p></center>
+{{scheduleNWserviceheader|2|Tuesday}}
 </td>
 <td class='align-bottom' colspan="1">
-<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}}}} + 1 }}' AND scheduleFACservice.TaskAbbrev='BR1' |format=template|template=datedisplaycurrent}}<p></p></center>
+{{scheduleNWserviceheader|3|Wednesday}}
 </td>
 <td class='align-bottom' colspan="1">
-<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}}}} + 1 }}' AND scheduleFACservice.TaskAbbrev='BR1' |format=template|template=datedisplaycurrent}}<p></p></center>
+{{scheduleNWserviceheader|4|Thursday}}
 </td>
 <td colspan="1">
-<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}}}} + 1 }}' AND scheduleFACservice.TaskAbbrev='BR1' |format=template|template=datedisplaycurrent}}<p></p></center>
+{{scheduleNWserviceheader|5|Friday}}
 </td>
 <td colspan="1">
-<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}}}} + 1 }}' AND scheduleFACservice.TaskAbbrev='BR1' |format=template|template=datedisplaycurrent}}<p></p></center>
+{{scheduleNWserviceheader|6|Saturday}}
 </td>
 <td colspan="1">
-<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}}}} + 1 }}' AND scheduleFACservice.TaskAbbrev='BR1' |format=template|template=datedisplaycurrent}}<p></p></center>
+{{scheduleNWserviceheader|7|Sunday}}
 </td>
 </tr>
@@ Line 126: / Line 101: @@
 <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)
-|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}}
+|group by=scheduleRESservice.WeekNumber
+|where=YEAR(Date)='{{#var:MondayNW}}' AND scheduleRESservice.WeekNumber='{{formatnum:{{#expr:{{#timel: W|now +1 week}}}}}}' AND scheduleRESservice.TaskAbbrev='{{#explode:TaskAbbreviation|,|0}}'|default={{schtableempty|{{#explode:TaskAbbreviation|,|1}}}}|format=template|template=schtableres}}
 |}}
 <br>
@@ Line 138: / Line 114: @@
 |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)='{{#var:MondayNW}}' AND scheduleRESservice.WeekNumber='{{formatnum:{{#expr:{{#timel: W|now +1 week}}}}}}' 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)='{{#var:MondayNW}}' AND scheduleFELLservice.WeekNumber='{{formatnum:{{#expr:{{#timel: W|now +1 week}}}}}}' AND scheduleFELLservice.TaskAbbrev='{{#explode:TaskAbbreviation|,|0}}' |format=template|group by=scheduleFELLservice.WeekNumber|default={{schtableempty|{{#explode:TaskAbbreviation|,|1}}}}|template=schtableres}}
 |}}
 </td>
@@ Line 153: / Line 129: @@
 </td>
 <td style="width: 10%">
-<table class='scheduletable'><tr><td bgcolor="#FFFFFF"><center>'''{{ColorText|{{#tip-text:A|Attending}}||#000000|}}'''</center></td></tr></table>
+{{scheduleNWservice|1|Monday}}
-{{#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=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}}
-|}}
 </td>
 <td style="width: 10%">
-<table class='scheduletable'><tr><td bgcolor="#FFFFFF"><center>'''{{ColorText|{{#tip-text:A|Attending}}||#000000|}}'''</center></td></tr></table>
+{{scheduleNWservice|2|Tuesday}}
-{{#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=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}}
-|}}
 </td>
 <td style="width: 10%">
-<table class='scheduletable'><tr><td bgcolor="#FFFFFF"><center>'''{{ColorText|{{#tip-text:A|Attending}}||#000000|}}'''</center></td></tr></table>
+{{scheduleNWservice|3|Wednesday}}
-{{#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=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}}
-|}}
 </td>
 <td style="width: 10%">
-<table class='scheduletable'><tr><td bgcolor="#FFFFFF"><center>'''{{ColorText|{{#tip-text:A|Attending}}||#000000|}}'''</center></td></tr></table>
+{{scheduleNWservice|4|Thursday}}
-{{#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=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}}
-|}}
 </td>
 <td style="width: 10%">
-<table class='scheduletable'><tr><td bgcolor="#FFFFFF"><center>'''{{ColorText|{{#tip-text:A|Attending}}||#000000|}}'''</center></td></tr></table>
+{{scheduleNWservice|5|Friday}}
-{{#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=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}}
-|}}
 </td>
 <td style="width: 10%">
-<table class='scheduletable'><tr><td bgcolor="#FFFFFF"><center>'''{{ColorText|{{#tip-text:A|Attending}}||#000000|}}'''</center></td></tr></table>
+{{scheduleNWservice|6|Saturday}}
-{{#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=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}}
-|}}
 </td>
 <td style="width: 10%">
-<table class='scheduletable'><tr><td bgcolor="#FFFFFF"><center>'''{{ColorText|{{#tip-text:A|Attending}}||#000000|}}'''</center></td></tr></table>
+{{scheduleNWservice|7|Sunday}}
-{{#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=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}}
-|}}
 </td>
 </tr>
 </table>
 </center>