Difference between revisions of "Residents Room"

@@ Line 19: / Line 19: @@
      |join on=scheduleCallConference.ResAbbrev=residentMGH.copath_id
      |fields=scheduleCallConference.ResAbbrev,scheduleCallConference.Color,residentMGH.full_name,scheduleCallConference.TaskAbbrev
-     |where=scheduleCallConference.WeekNumber='{{#expr: {{#time: W|{{Timezone}}}} - 0 }}' AND scheduleCallConference.DayNumber='{{#expr: {{#time: N|{{Timezone}}}} - 0 }}' AND scheduleCallConference.Type='Conference' AND NOT scheduleCallConference.ResAbbrev='-' AND NOT TaskAbbrev='HP Journal Club'|default={{schedule-emptycell|fffff4|-}}
+     |where=YEAR(Date)='{{#timel: Y|now}}' AND scheduleCallConference.WeekNumber='{{#expr: {{#timel: W|{{Timezone}}}} - 0 }}' AND scheduleCallConference.DayNumber='{{#expr: {{#timel: N|{{Timezone}}}} - 0 }}' AND scheduleCallConference.Type='Conference' AND NOT scheduleCallConference.ResAbbrev='-' AND NOT TaskAbbrev='HP Journal Club' AND NOT TaskAbbrev='Outs'|default={{schedule-emptycell|fffff4|-}}
      |format=template|template=schtableconf}}
+{{#cargo_query: tables=dziOrder,scheduleCallConference,facultyMGH|join on=scheduleCallConference.ResAbbrev=dziOrder.requested_by,dziOrder.requested_by=facultyMGH._pageName|fields=scheduleCallConference.TaskAbbrev,scheduleCallConference.Hour,scheduleCallConference.Notes,scheduleCallConference.ResAbbrev,scheduleCallConference.Color,dziOrder._pageTitle,facultyMGH.fullname|where=dziOrder.presentation_date='{{#timel: Y/m/d|}}' AND scheduleCallConference.Date='{{#timel: Y/m/d|}}' AND scheduleCallConference.TaskAbbrev='Outs'|default={{schedule-emptycell|fffff4|-}}
+|group by=dziOrder.class_type|
+    |format=template|template=schtableconfOuts}}
 <br>
 <table class='scheduletable'><tr><td bgcolor="#FFFFFF"><center>{{ColorText|'''CALL'''||#000000|}}</center></td></tr></table>
-{{#switch: {{#time: N|{{Timezone}}}}|6=
+{{#switch: {{#timel: N|{{Timezone}}}}|6=
 {{#cargo_query: tables= scheduleCallConference,residentMGH
      |join on= scheduleCallConference.ResAbbrev=residentMGH.copath_id
      |fields= scheduleCallConference.ResAbbrev, scheduleCallConference.Color,residentMGH.full_name, scheduleCallConference.TaskAbbrev=Conf
-     |where=scheduleCallConference.WeekNumber='{{#expr: {{#time: W|{{Timezone}}}} - 0 }}' AND scheduleCallConference.DayNumber='{{#expr: {{#time: N|{{Timezone}}}} + 0 }}' AND scheduleCallConference.Type='Call' AND NOT scheduleCallConference.ResAbbrev='-' AND NOT scheduleCallConference.TaskAbbrev='Call: Junior CP'|order by= scheduleCallConference.Sort DESC|default={{:schtableempty}}
+     |where=YEAR(Date)='{{#timel: Y|now}}' AND scheduleCallConference.WeekNumber='{{#expr: {{#timel: W|{{Timezone}}}} - 0 }}' AND scheduleCallConference.DayNumber='{{#expr: {{#timel: N|{{Timezone}}}} + 0 }}' AND scheduleCallConference.Type='Call' AND NOT scheduleCallConference.ResAbbrev='-' AND NOT scheduleCallConference.TaskAbbrev='Call: Junior CP'|order by= scheduleCallConference.Sort DESC|default={{:schtableempty}}
      |format=template|template=schtableconf}}
 |7=
@@ Line 33: / Line 36: @@
      |join on= scheduleCallConference.ResAbbrev=residentMGH.copath_id
      |fields= scheduleCallConference.ResAbbrev, scheduleCallConference.Color,residentMGH.full_name, scheduleCallConference.TaskAbbrev=Conf
-     |where= scheduleCallConference.WeekNumber='{{#expr: {{#time: W|{{Timezone}}}} - 0 }}' AND scheduleCallConference.DayNumber='0' AND scheduleCallConference.Type='Call' AND NOT scheduleCallConference.ResAbbrev='-' AND NOT scheduleCallConference.TaskAbbrev='Call: Junior CP' AND NOT scheduleCallConference.TaskAbbrev='Call: Autopsy'|order by= scheduleCallConference.Sort DESC|default={{:schtableempty}}
+     |where=YEAR(Date)='{{#timel: Y|now}}' AND  scheduleCallConference.WeekNumber='{{#expr: {{#timel: W|{{Timezone}}}} - 0 }}' AND scheduleCallConference.DayNumber='0' AND scheduleCallConference.Type='Call' AND NOT scheduleCallConference.ResAbbrev='-' AND NOT scheduleCallConference.TaskAbbrev='Call: Junior CP' AND NOT scheduleCallConference.TaskAbbrev='Call: Autopsy'|order by= scheduleCallConference.Sort DESC|default={{:schtableempty}}
      |format=template|template=schtableconf}}
 |
@@ Line 39: / Line 42: @@
      |join on= scheduleCallConference.ResAbbrev=residentMGH.copath_id
      |fields= scheduleCallConference.ResAbbrev, scheduleCallConference.Color,residentMGH.full_name, scheduleCallConference.TaskAbbrev=Conf
-     |where= scheduleCallConference.WeekNumber='{{#expr: {{#time: W|{{Timezone}}}} - 0 }}' AND scheduleCallConference.DayNumber='{{#expr: {{#time: N|{{Timezone}}}} + 0 }}' AND scheduleCallConference.Type='Call' AND NOT scheduleCallConference.ResAbbrev='-' AND NOT scheduleCallConference.TaskAbbrev='Call: Junior CP' AND NOT scheduleCallConference.TaskAbbrev='Call: Autopsy'|order by= scheduleCallConference.Sort DESC|default={{:schtableempty}}
+     |where=YEAR(Date)='{{#timel: Y|now}}' AND  scheduleCallConference.WeekNumber='{{#expr: {{#timel: W|{{Timezone}}}} - 0 }}' AND scheduleCallConference.DayNumber='{{#expr: {{#timel: N|{{Timezone}}}} + 0 }}' AND scheduleCallConference.Type='Call' AND NOT scheduleCallConference.ResAbbrev='-' AND NOT scheduleCallConference.TaskAbbrev='Call: Junior CP' AND NOT scheduleCallConference.TaskAbbrev='Call: Autopsy'|order by= scheduleCallConference.Sort DESC|default={{:schtableempty}}
      |format=template|template=schtableconf}}
 }}
@@ Line 47: / Line 50: @@
 |join on=scheduleRESservice.ResAbbrev=residentMGH.copath_id
 |fields=scheduleRESservice.ResAbbrev,scheduleRESservice.Color,residentMGH.full_name
-|where=scheduleRESservice.WeekNumber='{{#expr: {{#time: W|{{Timezone}}}} - 0 }}' AND scheduleRESservice.TaskAbbrev='VAC'|group by=scheduleRESservice.WeekNumber,scheduleRESservice.ResAbbrev|default={{schedule-emptycell|fffff4|-}}|format=template|template=schtable}}
+|where=YEAR(Date)='{{#timel: Y|now}}' AND scheduleRESservice.WeekNumber='{{#expr: {{#timel: W|{{Timezone}}}} - 0 }}' AND scheduleRESservice.TaskAbbrev='VAC'|group by=scheduleRESservice.WeekNumber,scheduleRESservice.ResAbbrev|default={{schedule-emptycell|fffff4|-}}|format=template|template=schtable}}
 </td>
 <td style="width: 45%">