Difference between revisions of "learn:schedule-currentweek"

@@ Line 45: / Line 45: @@
      |where=YEAR(Date)='{{#var:Monday}}' AND scheduleCallConference.WeekNumber='{{#expr: {{#timel: W|{{Timezone}}}} - 0 }}' AND scheduleCallConference.DayNumber='1' AND NOT ResAbbrev='-' AND NOT TaskAbbrev IN ('Call: Autopsy', 'Call: Junior CP', 'Call: BB/CP', 'HP Journal Club')|default={{:schtableempty}}
      |format=template|order by = sort ASC|template=schtableconfcallLeft}}
-{{#cargo_query: tables= conferenceMPR,residentMGH |join on=conferenceMPR.ResAbbrev=residentMGH.copath_id |fields=conferenceMPR.ResAbbrev,conferenceMPR.Color,residentMGH.full_name,conferenceMPR.TaskAbbrev |where=YEAR(conferenceMPR.Date)='{{#timel: Y|now}}' AND conferenceMPR.WeekNumber='{{#expr: {{#timel: W|now}} - 1 }}'|default= |format=template|template=schtableconfcallLeft}}
+{{#cargo_query: tables= conferenceMPR,residentMGH |join on=conferenceMPR.ResAbbrev=residentMGH.copath_id |fields=conferenceMPR.ResAbbrev,conferenceMPR.Color,residentMGH.full_name,conferenceMPR.TaskAbbrev |where=YEAR(conferenceMPR.Date)='{{#timel: Y|now}}' AND conferenceMPR.WeekNumber='{{#expr: {{#timel: W|now}} - 1 }}' AND NOT TaskAbbrev='Outs'|default= |format=template|template=schtableconfcallLeft}}
+{{#cargo_query: tables=scheduleCallConference,facultyMGH
+    |join on=scheduleCallConference.ResAbbrev=facultyMGH.copath_id
+    |fields=
+scheduleCallConference.ResAbbrev,
+scheduleCallConference.Color,
+facultyMGH.fullname,
+scheduleCallConference.TaskAbbrev,
+scheduleCallConference.Sort,
+scheduleCallConference.Notes
+    |where=YEAR(Date)='{{#var:Friday}}' AND scheduleCallConference.WeekNumber='{{#expr: {{#timel: W|{{Timezone}}}} - 0 }}' AND scheduleCallConference.DayNumber='2' AND NOT ResAbbrev='-' AND TaskAbbrev='Outs'|default={{:schtableempty}}
+    |format=template|order by = Sort ASC|template=schtableconfcallLeftOuts}}
 </td>
 <td style="width: 14%">
@@ Line 220: / Line 231: @@
 |fields=GROUP_CONCAT(scheduleFACservice.StaffAbbrev),scheduleFACservice.Color,GROUP_CONCAT(scheduleFACservice.StaffFullName)
 |group by=scheduleFACservice.Color
-|where=YEAR(Date)='{{#var:Monday}}' AND scheduleFACservice.TaskAbbrev='{{#explode:TaskAbbreviation|,|0}}' AND scheduleFACservice.DayNumber='1' AND NOT ResAbbrev='-' AND NOT TaskAbbrev='Outs'|default={{:schtableempty}}
+|where=YEAR(Date)='{{#var:Monday}}' AND scheduleFACservice.TaskAbbrev='{{#explode:TaskAbbreviation|,|0}}' AND scheduleFACservice.DayNumber='1' AND scheduleFACservice.WeekNumber='{{#expr: {{#timel: W|{{Timezone}}}} - 0}}'
-    |format=template|order by = Sort ASC|template=schtableconfcallLeft}}
+|default={{schtableempty|{{#explode:TaskAbbreviation|,|1}}}}|format=template|template=schtable}}
-{{#cargo_query: tables=scheduleCallConference,facultyMGH
+|}}
-    |join on=scheduleCallConference.ResAbbrev=facultyMGH.copath_id
-    |fields=
-scheduleCallConference.ResAbbrev,
-scheduleCallConference.Color,
-facultyMGH.fullname,
-scheduleCallConference.TaskAbbrev,
-scheduleCallConference.Sort,
-scheduleCallConference.Notes
-    |where=YEAR(Date)='{{#var:Friday}}' AND scheduleCallConference.WeekNumber='{{#expr: {{#timel: W|{{Timezone}}}} - 0 }}' AND scheduleCallConference.DayNumber='1' AND NOT ResAbbrev='-' AND TaskAbbrev='Outs'|default={{:schtableempty}}
-    |format=template|order by = Sort ASC|template=schtableconfcallLeftOuts}}
 </td>
 <td style="width: 10%">