Difference between revisions of "learn:currentweek"

@@ Line 75: / Line 75: @@
 <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=YEAR(Date)={{#time: Y|{{Timezone}}}} AND 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>
@@ Line 87: / Line 87: @@
 {{#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='{{#time:N|now}}' 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|{{#explode:TaskAbbreviation|,|1}}}}|format=template|template=schtable}}
 |}}
@@ Line 93: / Line 93: @@
 <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=YEAR(Date)={{#time: Y|{{Timezone}}}} AND 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>