Difference between revisions of "learn:schedule-nextweek"

@@ Line 106: / Line 106: @@
 |fields=GROUP_CONCAT(DISTINCT scheduleRESservice.ResAbbrev),scheduleRESservice.Color,GROUP_CONCAT(DISTINCT residentMGH.full_name)
 |group by=scheduleRESservice.WeekNumber
-|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}}
+|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 114: / 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}}|group by=scheduleRESservice.WeekNumber,scheduleRESservice.ResAbbrev|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%">
@@ Line 122: / Line 122: @@
 |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|group by=scheduleFELLservice.WeekNumber|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>