Difference between revisions of "learn:schedule-nextweek"

@@ Line 30: / Line 30: @@
 <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' 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}}
 </td>
 <td style="width: 14%">
@@ Line 75: / Line 71: @@
      |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' AND NOT ResAbbrev='-'|default={{:schtableempty}}
+     |where=YEAR(Date)={{#time: Y|{{Timezone}}}} AND scheduleCallConference.WeekNumber='{{#expr: {{#time: W|{{Timezone}}}} + 1 }}' AND scheduleCallConference.DayNumber='7' AND NOT ResAbbrev='-'|default={{:schtableempty}}
      |format=template|order by = sort ASC|template=schtableconfcallLeft}}
 </td>