Difference between revisions of "learn:nextweekinap"

@@ Line 17: / Line 17: @@
 <tr>
 <td style="width: 11%">
-{{#cargo_query: tables=scheduleFACservice |fields=scheduleFACservice.Date |where=YEAR(Date)='2024' AND scheduleFACservice.DayNumber='5' AND scheduleFACservice.WeekNumber='{{#expr: {{#timel: W|{{Timezone}}}} - 0 }}' AND scheduleFACservice.TaskAbbrev='BR1' AND scheduleFACservice.Date > '2024-02-01'|format=template|template=datedisplayfac|limit=1|more results text=}}
+{{#cargo_query: tables=scheduleFACservice |fields=scheduleFACservice.Date |where=YEAR(Date)='{{#var:Friday}}' AND scheduleFACservice.DayNumber='5' AND scheduleFACservice.WeekNumber='{{#expr: {{#timel: W|{{Timezone}}}} - 0 }}' AND scheduleFACservice.TaskAbbrev='BR1' |format=template|template=datedisplayfac|limit=1|more results text=}}
 <br>
 {{#cargo_query: tables=scheduleCallConference,residentMGH
@@ Line 26: / Line 26: @@
 </td>
 <td style="width: 12%">
-{{#vardefine:saturdayDate|{{#time: Y-m-d|{{#cargo_query: tables=scheduleFACservice |fields=scheduleFACservice.Date |where=YEAR(Date)='{{#var:Saturday}}' AND scheduleFACservice.DayNumber='6' AND scheduleFACservice.WeekNumber='{{#expr: {{#timel: W|{{Timezone}}}} - 0 }}' AND scheduleFACservice.TaskAbbrev='BR1'|no html|limit=1|more results text=|order by=scheduleFACservice.Date DESC}}}}}}{{#cargo_query: tables=scheduleFACservice |fields=scheduleFACservice.Date |where=YEAR(Date)='{{#var:Saturday}}' AND scheduleFACservice.DayNumber='6' AND scheduleFACservice.WeekNumber='{{#expr: {{#timel: W|{{Timezone}}}} - 0 }}' AND scheduleFACservice.TaskAbbrev='BR1' AND scheduleFACservice.Date > '2024-02-01'|format=template|template=datedisplayfac|limit=1|more results text=|order by=scheduleFACservice.Date DESC}}
+{{#vardefine:saturdayDate|{{#time: Y-m-d|{{#cargo_query: tables=scheduleFACservice |fields=scheduleFACservice.Date |where=YEAR(Date)='{{#var:Saturday}}' AND scheduleFACservice.DayNumber='6' AND scheduleFACservice.WeekNumber='{{#expr: {{#timel: W|{{Timezone}}}} - 0 }}' AND scheduleFACservice.TaskAbbrev='BR1'|no html|limit=1|more results text=|order by=scheduleFACservice.Date DESC}}}}}}{{#cargo_query: tables=scheduleFACservice |fields=scheduleFACservice.Date |where=YEAR(Date)='{{#var:Saturday}}' AND scheduleFACservice.DayNumber='6' AND scheduleFACservice.WeekNumber='{{#expr: {{#timel: W|{{Timezone}}}} - 0 }}' AND scheduleFACservice.TaskAbbrev='BR1' |format=template|template=datedisplayfac|limit=1|more results text=|order by=scheduleFACservice.Date DESC}}
 <br>
 {{#cargo_query: tables=scheduleCallConference,residentMGH
      |join on=scheduleCallConference.ResAbbrev=residentMGH.copath_id
      |fields=scheduleCallConference.ResAbbrev,scheduleCallConference.Color,residentMGH.full_name,scheduleCallConference.TaskAbbrev,scheduleCallConference.Sort=sort
-     |where=Date='{{#var:saturdayDate}}' AND NOT ResAbbrev='-'|default={{:schtableempty}} AND scheduleCallConference.Date > '2024-02-02'
+     |where=Date='{{#var:saturdayDate}}' AND NOT ResAbbrev='-'|default={{:schtableempty}}
      |format=template|order by = sort ASC|template=schtableconfcallLeft}}
 </td>
 <td style="width: 11%">
-{{#cargo_query: tables=scheduleFACservice |fields=scheduleFACservice.Date |where=YEAR(Date)='{{#var:Sunday}}' AND scheduleFACservice.DayNumber='7' AND scheduleFACservice.WeekNumber='{{#expr: {{#timel: W|{{Timezone}}}} - 0 }}' AND scheduleFACservice.TaskAbbrev='BR1' AND scheduleFACservice.Date > '2024-02-01'|format=template|template=datedisplayfac|limit=1|more results text=|order by=scheduleFACservice.Date DESC}}
+{{#cargo_query: tables=scheduleFACservice |fields=scheduleFACservice.Date |where=YEAR(Date)='{{#var:Sunday}}' AND scheduleFACservice.DayNumber='7' AND scheduleFACservice.WeekNumber='{{#expr: {{#timel: W|{{Timezone}}}} - 0 }}' AND scheduleFACservice.TaskAbbrev='BR1' |format=template|template=datedisplayfac|limit=1|more results text=|order by=scheduleFACservice.Date DESC}}
 <br>
 {{#cargo_query: tables=scheduleCallConference,residentMGH
      |join on=scheduleCallConference.ResAbbrev=residentMGH.copath_id
      |fields=scheduleCallConference.ResAbbrev,scheduleCallConference.Color,residentMGH.full_name,scheduleCallConference.TaskAbbrev,scheduleCallConference.Sort=sort
-     |where=YEAR(Date)='{{#var:Sunday}}' AND scheduleCallConference.WeekNumber='{{#expr: {{#timel: W|{{Timezone}}}} - 0 }}' AND scheduleCallConference.DayNumber='7' AND NOT ResAbbrev='-' AND scheduleCallConference.Date > '2024-02-02'|default={{:schtableempty}}
+     |where=YEAR(Date)='{{#var:Sunday}}' AND scheduleCallConference.WeekNumber='{{#expr: {{#timel: W|{{Timezone}}}} - 0 }}' AND scheduleCallConference.DayNumber='7' AND NOT ResAbbrev='-'|default={{:schtableempty}}
      |format=template|order by = sort ASC|template=schtableconfcallLeft}}
 </td>
@@ Line 102: / Line 102: @@
 </td>
 <td style="width: 9%">
-<table class='scheduletable'><tr><td bgcolor="#FFFFFF"><center>{{#cargo_query: tables=scheduleFACservice |fields=scheduleFACservice.Date |where=YEAR(Date)='{{#var:Saturday}}' AND scheduleFACservice.DayNumber='6' AND scheduleFACservice.WeekNumber='{{#expr: {{#timel: W|{{Timezone}}}} + 0 }}' AND scheduleFACservice.TaskAbbrev='BR1' AND scheduleFACservice.Date > '2024-02-01'|format=template|template=datedisplaycurrent|limit=1|more results text=|order by=scheduleFACservice.Date DESC}}</center><br></td></tr></table>
+<table class='scheduletable'><tr><td bgcolor="#FFFFFF"><center>{{#cargo_query: tables=scheduleFACservice |fields=scheduleFACservice.Date |where=YEAR(Date)='{{#var:Saturday}}' AND scheduleFACservice.DayNumber='6' AND scheduleFACservice.WeekNumber='{{#expr: {{#timel: W|{{Timezone}}}} + 0 }}' AND scheduleFACservice.TaskAbbrev='BR1' |format=template|template=datedisplaycurrent|limit=1|more results text=|order by=scheduleFACservice.Date DESC}}</center><br></td></tr></table>
 {{#arraymap:{{scheduleDictionaryAPfaculty}}|;|TaskAbbreviation|
 {{#cargo_query: table=scheduleFACservice,facultyMGH|join on=scheduleFACservice.StaffAbbrev=facultyMGH.copath_id
 |fields=GROUP_CONCAT(scheduleFACservice.StaffAbbrev),scheduleFACservice.TaskAbbrev,GROUP_CONCAT(scheduleFACservice.StaffFullName),facultyMGH.pageid
 |group by=scheduleFACservice.Color
-|where=Date='{{#var:saturdayDate}}' AND scheduleFACservice.TaskAbbrev='{{#explode:TaskAbbreviation|,|0}}' AND scheduleFACservice.Date > '2024-02-01'
+|where=Date='{{#var:saturdayDate}}' AND scheduleFACservice.TaskAbbrev='{{#explode:TaskAbbreviation|,|0}}'
 |default={{schtableempty|{{#explode:TaskAbbreviation|,|2}}}}|format=template|template=scheduleResident}}
 |}}
 </td>
 <td style="width: 9%">
-<table class='scheduletable'><tr><td bgcolor="#FFFFFF"><center>{{#cargo_query: tables=scheduleFACservice |fields=scheduleFACservice.Date |where=YEAR(Date)='{{#var:Sunday}}' AND scheduleFACservice.DayNumber='7' AND scheduleFACservice.WeekNumber='{{#expr: {{#timel: W|{{Timezone}}}} + 0 }}' AND scheduleFACservice.TaskAbbrev='BR1' AND scheduleFACservice.Date > '2024-02-01'|format=template|template=datedisplaycurrent|limit=1|more results text=|order by=scheduleFACservice.Date DESC}}</center><br></td></tr></table>
+<table class='scheduletable'><tr><td bgcolor="#FFFFFF"><center>{{#cargo_query: tables=scheduleFACservice |fields=scheduleFACservice.Date |where=YEAR(Date)='{{#var:Sunday}}' AND scheduleFACservice.DayNumber='7' AND scheduleFACservice.WeekNumber='{{#expr: {{#timel: W|{{Timezone}}}} + 0 }}' AND scheduleFACservice.TaskAbbrev='BR1' |format=template|template=datedisplaycurrent|limit=1|more results text=|order by=scheduleFACservice.Date DESC}}</center><br></td></tr></table>
 {{#arraymap:{{scheduleDictionaryAPfaculty}}|;|TaskAbbreviation|
 {{#cargo_query: table=scheduleFACservice,facultyMGH|join on=scheduleFACservice.StaffAbbrev=facultyMGH.copath_id