Difference between revisions of "scheduleNow"

@@ Line 12: / Line 12: @@
 |7=
 {{:scheduleDictionaryAPempty}}
-|{{#arraymap: AUT,AEAAAA;BR1,FF7E46;BR2,FF7E46;BST,E2EFDA;CV,7AD062;RP,FFFF8D;CA,04AAD1;CB,04AAD1;CC,04AAD1;DPA,EDB1FF;DPB,EDB1FF;DPC,EDB1FF;FS-S,CCECFF;FS-J,CCECFF;HN1,04E489;HN2,04E489;GI1,FFC30F;GI2,FFC30F;GI3,FFC30F;GI4,FFC30F;GUL,4FA4FF;GUS,4FA4FF;GYL,CD5EB6;GYS,CD5EB6;OB,CD5EB6;HPA,92E2AF;HPB,92E2AF;HG,92E2AF;NP,FCE4D6;PP,7AD062;GR-S,B8A315;AP CHIEF,B39BE9;CP CHIEF,B39BE9;|;|TaskAbbreviation|
+|{{#arraymap:{{scheduleDictionaryAPresident}}|;|TaskAbbreviation|
 {{#cargo_query: tables=scheduleRESservice,residentMGH
 |join on=scheduleRESservice.ResAbbrev=residentMGH.copath_id
 |fields=
 GROUP_CONCAT(DISTINCT scheduleRESservice.ResAbbrev)
-,scheduleRESservice.Color
+,scheduleRESservice.TaskAbbrev
 ,GROUP_CONCAT(DISTINCT residentMGH.full_name)
 ,pageid
@@ Line 31: / Line 31: @@
 |7=
 {{:scheduleDictionaryAPempty}}
-|{{#arraymap: AUT,AEAAAA;BR1,FF7E46;BR2,FF7E46;BST,E2EFDA;CV,7AD062;RP,FFFF8D;CA,04AAD1;CB,04AAD1;CC,04AAD1;DPA,EDB1FF;DPB,EDB1FF;DPC,EDB1FF;FS-S,CCECFF;FS-J,CCECFF;HN1,04E489;HN2,04E489;GI1,FFC30F;GI2,FFC30F;GI3,FFC30F;GI4,FFC30F;GUL,4FA4FF;GUS,4FA4FF;GYL,CD5EB6;GYS,CD5EB6;OB,CD5EB6;HPA,92E2AF;HPB,92E2AF;HG,92E2AF;NP,FCE4D6;PP,7AD062;|;|TaskAbbreviation|
+|{{#arraymap:{{scheduleDictionaryAPresident}}|;|TaskAbbreviation|
 {{#cargo_query: tables=scheduleFELLservice,residentMGH
 |join on=scheduleFELLservice.FellAbbrev=residentMGH.copath_id
-|fields=scheduleFELLservice.FellAbbrev,scheduleFELLservice.Color,residentMGH.full_name,residentMGH.pageid
+|fields=scheduleFELLservice.FellAbbrev,scheduleFELLservice.TaskAbbrev,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
 |group by=scheduleFELLservice.WeekNumber|default={{schtableempty|{{#explode:TaskAbbreviation|,|1}}}}|template=schtableres}}
@@ Line 53: / Line 53: @@
 <table class='scheduletable'><tr><td bgcolor="#f5f5f5"><center>'''{{ColorText|{{#tip-text:Attending|Attending}}||#000000|}}'''<sup>[1]</sup></center></td></tr></table>
 }}
-{{#arraymap: {{scheduleDictionaryAPfaculty}}|;|TaskAbbreviation|
+{{#arraymap:{{scheduleDictionaryAPfaculty}}|;|TaskAbbreviation|
 {{#cargo_query: table=scheduleFACservice
 |fields=GROUP_CONCAT(scheduleFACservice.StaffAbbrev),scheduleFACservice.TaskAbbrev,GROUP_CONCAT(scheduleFACservice.StaffFullName)