Merge 24.11 to 25.3

Author: labkey-teamcity

onprc_billing/resources/queries/onprc_billing/ogasynchIR.sql

@@ -4,35 +4,20 @@ SELECT ogasynch.lastIndexed,
        ogasynch.modified,
        ogasynch.created,
        ogasynch.createdBy,
-      /* ogasynch."ADFM EMP NUM",
-       ogasynch."ADFM FULL NAME",
-       ogasynch."ADFM LAST NAME",
-       ogasynch."ADFM FIRST NAME",
-       ogasynch."PI EMP NUM",
-       ogasynch."PI FULL NAME",
-       ogasynch."PI LAST NAME",
-       ogasynch."PI FIRST NAME",
-       ogasynch."PDFM EMP NUM",
-       ogasynch."PDFM FULL NAME",
-       ogasynch."PDFM LAST NAME",
-       ogasynch."PDFM FIRST NAME",*/
        ogasynch."AGENCY AWARD NUMBER",
        ogasynch."OGA AWARD NUMBER",
        ogasynch."OGA AWARD TYPE",
        ogasynch."OGA PROJECT NUMBER",
        ogasynch.ALIAS,
        ogasynch."ALIAS ENABLED FLAG",
        ogasynch."ALIAS ENABLED FLAG_MVIndicator",
-
        ogasynch.faRate,
        ogasynch.Key,
        ogasynch.ORIGINATING_AGENCY_AWARD_NUM,
        ogasynch.oga_award_start_Date,
        ogasynch.oga_award_end_date,
        ir.IndirectRate AS IndirectRate -- Retrieve from the `indirectRate` tab
-/*  Case When ogasynch.oga_award_start_Date >= '2024-07-01' then .475
-       else .47
-      End as IndirectRate
-*/
+
 FROM ogasynch LEFT JOIN indirectRates ir
-    ON ogasynch.oga_award_start_Date BETWEEN ir.StartDate AND ir.EndDate
+        ON ogasynch.oga_award_start_Date >= ir.StartDate
+        AND (ogasynch.oga_award_start_Date <= ir.EndDate OR ir.EndDate IS NULL);

onprc_billing/resources/schemas/dbscripts/sqlserver/onprc_billing-25.005-25.006.sql

@@ -0,0 +1,4 @@
+--This update allows the endDate field to be NULL
+--Revised 2025-06-30
+ALTER TABLE onprc_billing.IndirectRates
+ALTER COLUMN EndDate DATETIME NULL;

onprc_billing/src/org/labkey/onprc_billing/ONPRC_BillingModule.java

@@ -83,7 +83,7 @@ public String getName()
     @Override
     public @Nullable Double getSchemaVersion()
     {
-        return 25.005;
+        return 25.006;
     }
 
     @Override

onprc_ehr/resources/web/onprc_ehr/panel/ExamCasesHousingDataEntryPanel.js

@@ -0,0 +1,104 @@
+/*
+ * Copyright (c) 2014 LabKey Corporation
+ *
+ * Licensed under the Apache License, Version 2.0: http://www.apache.org/licenses/LICENSE-2.0
+ */
+
+//Created: 2-4-2021  R.Blasa
+
+Ext4.define('ONPRC_EHR.panel.ExamCasesHousingDataEntryPanel', {
+    extend: 'EHR.panel.TaskDataEntryPanel',
+
+
+   onBeforeSubmit: function(btn){
+       if (!btn || !btn.targetQC || ['Completed', 'Review Required'].indexOf(btn.targetQC) == -1){
+           return;
+       }
+
+       var store = this.storeCollection.getClientStoreByName('Clinical Remarks');
+       LDK.Assert.assertNotEmpty('Unable to find clinical remarks store', store);
+
+       var ids = [];
+       store.each(function(r){
+           if (r.get('Id'))
+               ids.push(r.get('Id'))
+       }, this);
+       ids = Ext4.unique(ids);
+
+       if (!ids.length)
+           return;
+
+       EHR.DemographicsCache.getDemographics(ids, function(ids, idMap){
+           var missingCases = [];
+           Ext4.Array.forEach(ids, function(id){
+               if (idMap[id]){
+                   var cases = idMap[id].getActiveCases();
+                   if (!cases || !cases.length){
+                       missingCases.push(id);
+                   }
+                   else {
+                       var found = false;
+                       Ext4.Array.forEach(cases, function(c){
+                           if (c.category == 'Clinical' && c.isActive){
+                               found = true;
+                           }
+                       }, this);
+
+                       if (!found){
+                           missingCases.push(id);
+                       }
+                   }
+               }
+           }, this);
+
+           if (missingCases.length){
+               Ext4.Msg.confirm('No Case', 'There is no active clinical case for this animal, do you want to continue anyway?', function(val){
+                   if (val == 'yes'){
+                       this.onSubmit(btn, true);
+                   }
+                   else {
+
+                   }
+               }, this);
+           }
+           else {
+               this.onSubmit(btn, true);
+           }
+       }, this);
+
+       return false;
+    },
+
+    onStoreCollectionCommitComplete: function(sc, extraContext){
+        if (Ext4.Msg.isVisible())
+            Ext4.Msg.hide();
+
+
+        var store = sc.getClientStoreByName('housing');
+        LDK.Assert.assertNotEmpty('Unable to find housing store in HousingDataEntryPanel', store);
+
+        if (extraContext && extraContext.successURL  && store.getCount() > 0){
+            Ext4.Msg.confirm('Success', 'Do you want to view the room layout now?  This will allow you to verify and/or change dividers', function(val){
+                window.onbeforeunload = Ext4.emptyFn;
+                if (val == 'yes'){
+
+                    var rooms = [];
+                    store.each(function(r){
+                        if (r.get('room') && rooms.indexOf(r.get('room')) == -1){
+                            rooms.push(r.get('room'));
+                        }
+                    }, this);
+                    window.location = LABKEY.ActionURL.buildURL('onprc_ehr', 'printRoom', null, {rooms: rooms});
+
+                }
+                else {
+                    window.location = extraContext.successURL;
+                }
+            }, this);
+
+            return;
+        }
+
+        this.callParent(arguments);
+    }
+    });

onprc_ehr/src/org/labkey/onprc_ehr/dataentry/ClinicalReportFormType.java

@@ -96,14 +96,11 @@ public ClinicalReportFormType(DataEntryFormContext ctx, Module owner)
         //  Modified: 10-5-2017  R.Blasa  reinstalled 2-12-21
         addClientDependency(ClientDependency.supplierFromPath("onprc_ehr/model/sources/ClinicalReport.js"));
 
-        //Added 4-3-2015 Blasa
-        addClientDependency(ClientDependency.supplierFromPath("onprc_ehr/panel/HousingDataEntryPanel.js"));
-        setJavascriptClass("ONPRC_EHR.panel.HousingDataEntryPanel");
 
-        //  Added: 2-4-2021  R.Blasa
-        addClientDependency(ClientDependency.supplierFromPath("onprc_ehr/panel/ExamCasesDataEntryPanel.js"));
+        //  Added: 7-22-2025  R.Blasa
+        addClientDependency(ClientDependency.supplierFromPath("onprc_ehr/panel/ExamCasesHousingDataEntryPanel.js"));
         setDisplayReviewRequired(true);
-        setJavascriptClass("ONPRC_EHR.panel.ExamCasesDataEntryPanel");
+        setJavascriptClass("ONPRC_EHR.panel.ExamCasesHousingDataEntryPanel");
     }
 
     @Override

onprc_ehr/src/org/labkey/onprc_ehr/query/ONPRC_EHRTriggerHelper.java

@@ -2411,7 +2411,7 @@ public void sendProjectNotifications(Integer projectid)
             //Create header information on the report
 
             html.append("<table border=1 style='border-collapse: collapse;'>");
-            html.append("<tr style='font-weight: bold;'><td>Center Project</td><td>Iacuc Protocol</td><td> Investigator</td><td>  Project Start Date</td><td>  Previous End Date</td><td>  Project End Date</td></tr>\n");
+            html.append("<tr style='font-weight: bold;'><td>Center Project</td><td>Project ID</td><td>Iacuc Protocol</td><td> Investigator</td><td>  Project Start Date</td><td>  Project Previous End Date</td><td>  Project End Date</td></tr>\n");
             ts.forEach(new Selector.ForEachBlock<ResultSet>()
                        {
 
@@ -2429,7 +2429,7 @@ public void exec(ResultSet rs) throws SQLException
                                {
                                    for (String Investname : ret2)
                                    {
-                                       html.append("<tr><td>" + PageFlowUtil.filter(rs.getString("name"))  + "</td><td>" + PageFlowUtil.filter(rs.getString("protocolID"))  + "</td><td>   " + PageFlowUtil.filter(Investname) + "   </td><td>" +  PageFlowUtil.filter(rs.getString("startdate")) + "</td><td>" +  PageFlowUtil.filter(rs.getString("previousdate")) + "</td><td>" +  PageFlowUtil.filter(rs.getString("enddate")) + "</td></tr>\n");
+                                       html.append("<tr><td>" + PageFlowUtil.filter(rs.getString("name"))  + "</td><td>" + PageFlowUtil.filter(rs.getString("project"))  + "</td><td>" + PageFlowUtil.filter(rs.getString("protocolID"))  + "</td><td>   " + PageFlowUtil.filter(Investname) + "   </td><td>" +  PageFlowUtil.filter(rs.getString("startdate")) + "</td><td>" +  PageFlowUtil.filter(rs.getString("previousdate")) + "</td><td>" +  PageFlowUtil.filter(rs.getString("enddate")) + "</td></tr>\n");
                                        break;
 
                                    }