Merge 25.3 to develop

Author: labkey-teamcity

WNPRC_EHR/src/org/labkey/wnprc_ehr/pages/dataentry/NecropsySchedule.jsp

@@ -12,11 +12,17 @@
 <%@ page import="org.labkey.webutils.api.json.JsonUtils" %>
 <%@ page import="org.labkey.wnprc_ehr.WNPRC_EHRController" %>
 <%@ page import="java.util.List" %>
+<%@ page import="org.labkey.api.view.template.ClientDependencies" %>
 <%@ page extends="org.labkey.api.jsp.JspBase" %>
 
+<%!
+    @Override
+    public void addClientDependencies(ClientDependencies dependencies)
+    {
+        dependencies.add("fullcalendar");
+    }
+%>
 <script src="https://code.jquery.com/jquery-1.12.4.min.js" integrity="sha256-ZosEbRLbNQzLpnKIkEdrPv7lOy9C27hHQ+Xp8a4MxAQ=" crossorigin="anonymous"></script>
-<link rel='stylesheet' href='https://cdnjs.cloudflare.com/ajax/libs/fullcalendar/2.6.0/fullcalendar.css' />
-<script src='https://cdnjs.cloudflare.com/ajax/libs/fullcalendar/2.6.0/fullcalendar.min.js'></script>
 <%--<script src='https://cdnjs.cloudflare.com/ajax/libs/fullcalendar/2.6.0/fullcalendar.js'></script>--%>
 <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.6/css/bootstrap.min.css">
 <%--<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.6/css/bootstrap.css">--%>
@@ -327,26 +333,34 @@
         var necropsySuiteLookup = <%=necropsySuiteLookup%>;
         WebUtils.VM.necropsySuiteLookup = necropsySuiteLookup;
 
-        var $calendar = $('#calendar');
         $(document).ready(function() {
-            $calendar.fullCalendar({
-                header: {
-                    left: 'prev,next today',
+            let calendarEl = document.getElementById('calendar');
+            calendar = new FullCalendar.Calendar(calendarEl, {
+                themeSystem: 'bootstrap',
+                height: 800,
+                initialView: 'dayGridMonth',
+                headerToolbar: {
+                    left: 'prev,next,today',
                     center: 'title',
-                    right: 'month,agendaWeek'
+                    right: 'dayGridMonth,timeGridWeek,timeGridDay'
                 },
-                events: function(startMoment, endMoment, timezone, callback) {
+                eventSources: [{
+                events:  function (fetchInfo, callback) {
+                    console.log(" startStr " + fetchInfo.startStr);
+                    console.log(" endtStr " + moment(fetchInfo.startStr).format( "YYYY-MM-DD"));
+
                     WebUtils.API.selectRows("study", "Necropsy Schedule", {
-                        "date~gte": startMoment.format('Y-MM-DD'),
-                        "date~lte": endMoment.format('Y-MM-DD')
+                        "date~gte":  moment(fetchInfo.startStr).format( "YYYY-MM-DD"),
+                        "date~lte": moment(fetchInfo.endStr).format( "YYYY-MM-DD")
                     }).then(function(data) {
                         var events = data.rows;
 
                         callback(events.map(function(row) {
                             var eventObj = {
                                 title: row.animalid,
                                 start: row.date,
-                                rawRowData: row
+                                rawRowData: row,
+                                display: 'block'
                             };
 
                             if (row.location in necropsySuiteLookup) {
@@ -356,9 +370,9 @@
                             return eventObj;
                         }))
                     })
-                },
+                }}],
                 eventClick: function(calEvent, jsEvent, view) {
-                    jQuery.each(calEvent.rawRowData, function(key, value) {
+                    jQuery.each(calEvent.event.extendedProps.rawRowData, function(key, value) {
                         if (key in WebUtils.VM.taskDetails) {
                             if (key == "date") {
                                 value = displayDate(value);
@@ -367,7 +381,8 @@
                         }
                     });
                 }
-            })
+        },);
+            calendar.render()
         });
 
 
@@ -670,6 +685,7 @@
                     rowsToUpdate[0] = rowsToUpdate[0].map(function(row) {
                         row.performedby = pathologistLookup[form.pathologist];
                         row.assistant   = pathologistLookup[form.assistant];
+                        row.location = form.location;
 
                         return row;
                     });
@@ -682,7 +698,7 @@
                     ]);
                 }).then(function() {
                     // Refresh the calendar view.
-                    $calendar.fullCalendar('refetchEvents');
+                    calendar.refetchEvents();
 
                     WebUtils.VM.pendingRequestTable.rows.remove(WebUtils.VM.requestRowInForm);
 

docker/ehrcron/scripts/automaticAlerts/automaticAlerts.cron

@@ -19,14 +19,3 @@ MAIL_SERVER=mailserver
 #---------------------------------------------------------------------------------------
 #Min   Hour     Day   Month   Weekday   User   Command
 #---------------------------------------------------------------------------------------
-0      10       *     *       *         root   $ALERT_DIR/adminAlerts.pl > /dev/null
-5      7-17     *     *       *         root   $ALERT_DIR/clinpathAbnormalResultAlerts.pl > /dev/null
-0      11,13,16 *     *       *         root   $ALERT_DIR/clinpathAlerts.pl > /dev/null
-00     10       *     *       *         root   $ALERT_DIR/clinpathResultAlerts.pl > /dev/null
-12     6        *     *       *         root   $ALERT_DIR/largeInfantAlerts.pl > /dev/null
-15     9        *     *       *         root   $ALERT_DIR/overdueWeightAlerts.pl > /dev/null
-25     7-17     *     *       *         root   $ALERT_DIR/siteErrorAlerts.pl > /dev/null
-0      6,10,13  *     *       *         root   $ALERT_DIR/treatmentAlerts.pl > /dev/null
-0      15,17,19 *     *       *         root   $ALERT_DIR/treatmentAlerts.pl > /dev/null
-30     13,20    *     *       *         root   $ALERT_DIR/treatmentAlerts.pl > /dev/null
-10     15       *     *       *         root   $ALERT_DIR/weightAlerts.pl > /dev/null