Merge 25.3 to develop

Author: labkey-teamcity

WNPRC_EHR/resources/queries/study/bloodDrawChanges.sql

@@ -15,7 +15,7 @@
  */
 --this query is designed to return any dates when allowable blood draw volume changes
 --this includes dates of blood draws, plus the date those draws drop off
-PARAMETERS(DATE_INTERVAL INTEGER DEFAULT 30)
+PARAMETERS(DATE_INTERVAL INTEGER DEFAULT 31)
 
 SELECT
   b2.id,

WNPRC_EHR/resources/queries/study/currentBloodDraws.query.xml

@@ -16,6 +16,20 @@
                     </column>
                     <column columnName="status">
                         <columnTitle>Status</columnTitle>
+                        <conditionalFormats>
+                            <conditionalFormat>
+                                <filters>
+                                    <filter operator="eq" value="Request: Pending"/>
+                                </filters>
+                                <backgroundColor>FFA500</backgroundColor>
+                            </conditionalFormat>
+                            <conditionalFormat>
+                                <filters>
+                                    <filter operator="eq" value="Request: Approved"/>
+                                </filters>
+                                <backgroundColor>FBEC5D</backgroundColor>
+                            </conditionalFormat>
+                        </conditionalFormats>
                         <fk>
                             <fkDbSchema>core</fkDbSchema>
                             <fkTable>qcstate</fkTable>
@@ -69,6 +83,7 @@
                     </column>
                     <column columnName="allowableBlood">
                         <columnTitle>Volume Available Today (mL)</columnTitle>
+                        <url>/WNPRC/EHR/ehr-animalHistory.view#subjects:${Id}&amp;inputType:singleSubject&amp;showReport:1&amp;activeReport:BloodSummary</url>
                         <description>This shows the amount of blood remaining today. It includes blood draws that happened 30 days in the past up to today.</description>
                         <conditionalFormats>
                             <conditionalFormat>
@@ -77,12 +92,18 @@
                                 </filters>
                                 <backgroundColor>FF0000</backgroundColor>
                             </conditionalFormat>
+                            <conditionalFormat>
+                                <filters>
+                                    <filter operator="gte" value="0"/>
+                                </filters>
+                                <backgroundColor>f3ee99</backgroundColor>
+                            </conditionalFormat>
                         </conditionalFormats>
                     </column>
                     <column columnName="allowableBloodIncludingFutureDraws">
-                        <columnTitle>Volume Remaining After All Draws (mL)</columnTitle>
+                        <columnTitle>Volume Available Including Next 30 days (mL)</columnTitle>
                         <url>/WNPRC/EHR/ehr-animalHistory.view#subjects:${Id}&amp;inputType:singleSubject&amp;showReport:1&amp;activeReport:BloodSummary</url>
-                        <description>This column shows the amount of blood remaining for the animal while considering future draws. It includes approved blood draws 30 days into the future and past blood draws 30 days in the past.</description>
+                        <description>This column shows the amount of blood remaining for future blood draws and also 30 days into the past.</description>
                     </column>
                 </columns>
             </table>

WNPRC_EHR/resources/queries/study/currentBloodDraws.sql

@@ -27,14 +27,17 @@ SELECT
     t.mostRecentWeightDate,
     t.death,
     cast(round(t.allowableBlood,1) as numeric) as maxAllowableBlood,
-    cast(t.bloodPrevious as double) as bloodPrevious,
-    cast((t.allowableBlood - t.bloodPrevious) as double) as allowablePrevious,
+    round(cast(t.bloodPrevious as double),1) as bloodPrevious,
+    round(cast((t.allowableBlood - t.bloodPrevious) as double),1) as allowablePrevious,
 
-    cast(t.bloodFuture as double) as bloodFuture,
+    round(cast(t.bloodFuture as double),1) as bloodFuture,
     cast((t.allowableBlood - t.bloodFuture) as double) as allowableFuture,
 
     ROUND(CAST((t.allowableBlood - t.bloodPrevious) AS double),1)  as allowableBlood,
-    ROUND(CAST((t.allowableBlood - t.bloodPrevious - t.bloodFuture) AS double),1) as allowableBloodIncludingFutureDraws,
+    CASE
+        WHEN t.date < CURDATE() THEN NULL
+        ELSE ROUND(CAST((t.allowableBlood - t.bloodFuture - t.bloodPrevious) AS double),1)
+    END AS allowableBloodIncludingFutureDraws,
     t.minDate,
     t.maxDate
 

WNPRC_EHR/resources/views/wnprcUnits.html

@@ -158,13 +158,14 @@
         sections: [
             {header: 'Misc. Pages',
             items: [
-                {name: 'Change WNPRC Password', url: 'https://www.mynetid.wisc.edu/recover/pwdreset'},
                 {name: 'Employee List', url: '<%=contextPath%>' + '/WNPRC/EHR/query-executeQuery.view?schemaName=study&query.queryName=EmployeeList'},
                 {name: 'View My Requirement Status', url: '<%=contextPath%>' + '/WNPRC/WNPRC_Units/Animal_Services/Compliance_Training/Public/EHR_ComplianceDB-My_Requirements.view'},
                 {name: 'View/Download PDFs of Signs, Posters and Guides', url: '<%=contextPath%>' + '/WNPRC/WNPRC_Units/Animal_Services/Compliance_Training/Public/query-executeQuery.view?schemaName=lists&query.queryName=Signs'},
                 {name: 'Download Paper Forms', url: '<%=contextPath%>' + '/WNPRC/WNPRC_Units/Animal_Services/Compliance_Training/Public/list-grid.view?listId=1399'},
                 {name: 'PowerDMS', url: 'https://go.wisc.edu/mkg850'},
-                {name: 'Sample Manager', url: ' https://ehr.primate.wisc.edu/samplemanager/SampleManager/app.view#/home'}
+                {name: 'Sample Manager', url: ' https://ehr.primate.wisc.edu/samplemanager/SampleManager/app.view#/home'},
+                {name: 'Emergency Contacts', url: 'https://go.wisc.edu/62ke03'},
+                {name: 'Vet Emergency Contacts', url: 'https://go.wisc.edu/gdtw22'}
             ]}
         ]
     });

WNPRC_EHR/resources/web/wnprc_ehr/wnprcReports.js

@@ -669,7 +669,7 @@ EHR.reports.currentBloodDraws = function(panel, tab) {
         schemaName: 'study',
         queryName: 'currentBloodDraws',
         title: "Current Blood " + title,
-        parameters: {'interval': '30'},
+        parameters: {'DATE_INTERVAL': '31'},
         filters: filterArray.nonRemovable,
         removeableFilters: filterArray.removable
     });