Skip to content

[bot] Fast-forward for 25.11.18 #1729

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
github-actions merged 19 commits into from
May 25, 2026
Merged

[bot] Fast-forward for 25.11.18 #1729

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
a8f66cd
25.11 fb clinpath panic notifications (#1680)
Ohsudev Apr 7, 2026
eb90751
Created a coded version of "BCS Score" managed view. (#1679)
Ohsudev Apr 7, 2026
01f1e80
Update search behavior for restricted issues. (#1672)
labkey-klum Apr 8, 2026
6c6dafe
Fix PI-purchased NHP flag date check (#1684)
brentlogan Apr 8, 2026
84b46c4
Modified grid report to only show non-blank cage location. (#1695)
Ohsudev Apr 20, 2026
53d6828
Modified demographics program to allow weight values to be rounded to…
Ohsudev Apr 22, 2026
3ddbdc5
Created a new program to update JMAc animal group's removal date. (#1…
Ohsudev Apr 22, 2026
dd09a04
25.11 fb room layout issues (#1700)
Ohsudev Apr 27, 2026
440b17b
25.11 fb clinical template (#1699)
Ohsudev Apr 27, 2026
706b762
Update dates for columns (#1697)
brentlogan Apr 30, 2026
d93aea1
Prevent submit before validation complete (#1683)
labkey-bpatel Apr 30, 2026
b4eb275
Modified Print mode Cage Layout to prevent (#1706)
Ohsudev May 6, 2026
eaf335e
Project enddate validation. (#1705)
kollil May 12, 2026
d577409
25.11 fb caging notification updates (#1701)
Ohsudev May 13, 2026
c5e045a
Modified Compliance Public reports (#1717)
Ohsudev May 13, 2026
4a44b4e
Removed "Behaviors"as a BSU Observation category selection item. (#1718)
Ohsudev May 13, 2026
3ab53f1
Modified Compliance PUblic Employees reports so that training require…
Ohsudev May 19, 2026
13ea546
25.11 fb demographics parentage updates (#1685)
Ohsudev May 20, 2026
a1de14b
Disable Id on Exam forms when case created. (#1707)
labkey-martyp May 20, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 25 additions & 0 deletions ...EHR_ComplianceDB/resources/queries/EmployeeData/ComplianceProcedureRecentTests/.qview.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
<customView xmlns="http://labkey.org/data/xml/queryCustomView" label="All">
<columns>
<column name="email"/>
<column name="employeeid"/>
<column name="lastname"/>
<column name="firstname"/>
<column name="host"/>
<column name="unit"/>
<column name="category"/>
<column name="requirementname"/>
<column name="trackingflag"/>
<column name="times_completed"/>
<column name="expired_period"/>
<column name="new_expired_period"/>
<column name="mostrecentcompleted_date"/>
<column name="comment"/>
<column name="months_until_renewal"/>
<column name="snooze_date"/>
</columns>
<sorts>
<sort column="lastname" descending="false"/>
<sort column="firstName" descending="false"/>
<sort column="requirementname" descending="false"/>
</sorts>
</customView>
16 changes: 16 additions & 0 deletions ONPRC_EHR_ComplianceDB/resources/views/employeeDetailsPublic.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
<script type="text/javascript" nonce="<%=scriptNonce%>">

Ext4.onReady(function (){
if (!LABKEY.ActionURL.getParameter('employeeid')){
alert('Must Provide An Employee Id');
return;
}

var webpart = <%=webpartContext%>;
Ext4.create('EHR_ComplianceDB.panel.EmployeeDetailsPanel', {
employeeId: LABKEY.ActionURL.getParameter('employeeid'),
schemaName: 'EmployeeData'
}).render(webpart.wrapperDivId);
});

</script>
7 changes: 7 additions & 0 deletions ONPRC_EHR_ComplianceDB/resources/views/employeeDetailsPublic.view.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
<view xmlns="http://labkey.org/data/xml/view" title="Employee Details" frame="none">
<dependencies>
<dependency path="Ext4"/>
<dependency path="LDK/LDKApi"/>
<dependency path="ehr_complianceDB/panel/EmployeeDetailsPanel.js"/>
</dependencies>
</view>
50 changes: 29 additions & 21 deletions onprc_billing/resources/queries/onprc_billing/leaseFees.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,8 +56,7 @@ When a5.id is not Null
then (Select c.rowid from Site.{substitutePath moduleProperty('ONPRC_Billing','BillingContainer')}.onprc_billing.chargeableItems c where c.itemCode = 'ONR41')
When (a4.id is not null and (TIMESTAMPDIFF('SQL_TSI_Day',a.date,a.projectedRelease)) <=14 and a.endDate is null and a.ageAtTime.AgeAtTimeYearsRounded < 1)
then (Select c.rowid from Site.{substitutePath moduleProperty('ONPRC_Billing','BillingContainer')}.onprc_billing.chargeableItems c where c.itemCode = 'ONR44')
WHEN (a.duration <= CAST(javaConstant('org.labkey.onprc_billing.ONPRC_BillingManager.DAY_LEASE_MAX_DURATION') as INTEGER) AND a.enddate IS NOT NULL AND a.assignCondition = a.releaseCondition) THEN (SELECT rowid FROM onprc_billing_public.chargeableItems ci WHERE ci.active = true AND ci.name = javaConstant('org.labkey.onprc_billing.ONPRC_BillingManager.DAY_LEASE_NAME'))
WHEN (a.duration <= CAST(javaConstant('org.labkey.onprc_billing.ONPRC_BillingManager.DAY_LEASE_MAX_DURATION') as INTEGER) AND a.enddate IS NOT NULL AND a.assignCondition = a.releaseCondition) THEN (SELECT rowid FROM onprc_billing_public.chargeableItems ci WHERE ci.active = true AND ci.name = javaConstant('org.labkey.onprc_billing.ONPRC_BillingManager.DAY_LEASE_NAME'))
WHEN (a.duration <= CAST(javaConstant('org.labkey.onprc_billing.ONPRC_BillingManager.DAY_LEASE_MAX_DURATION') as INTEGER) AND a.enddate IS NOT NULL AND a.assignCondition = a.releaseCondition) THEN (SELECT rowid FROM onprc_billing_public.chargeableItems ci WHERE ci.active = true AND ci.name = javaConstant('org.labkey.onprc_billing.ONPRC_BillingManager.DAY_LEASE_NAME'))
WHEN a2.id IS NOT NULL THEN (SELECT rowid FROM onprc_billing_public.chargeableItems ci WHERE (ci.startDate <= a.date and ci.endDate >= a.date) AND ci.name = javaConstant('org.labkey.onprc_billing.ONPRC_BillingManager.TMB_LEASE_NAME'))
ELSE lf.chargeId
END as chargeId,
Expand All @@ -81,7 +80,8 @@ CASE
where b.id = a.id and a1.project.protocol = a2.project.protocol) > 0 THEN 0

WHEN (a.duration = 0 AND a.enddate IS NOT NULL AND a.assignCondition = a.releaseCondition) THEN 1
WHEN (fl.id Is Not Null) THEN 0
-- Exempt PI-purchased NHPs from lease fees
WHEN (fl.id IS NOT NULL) THEN 0
--This will check for infants born to resource moms and will not charge

WHEN (a.duration <= CAST(javaConstant('org.labkey.onprc_billing.ONPRC_BillingManager.DAY_LEASE_MAX_DURATION') as INTEGER) AND a.enddate IS NOT NULL AND a.assignCondition = a.releaseCondition) THEN a.duration
Expand Down Expand Up @@ -139,21 +139,20 @@ LEFT JOIN onprc_billing.leaseFeeDefinition lf ON (
AND lf.active = true
)



--adds the reasearch owned animal exemption
LEFT JOIN study.flags fl on
(a.id = fl.id
and fl.flag.code = 4034
and (a.date >= fl.date and a.date <=COALESCE(fl.enddate,Now()) ))

-- Add PI-purchased NHP flag data
LEFT JOIN study.flags fl
ON (a.id = fl.id
AND fl.flag.code = 4034
AND a.date BETWEEN CAST(fl.date AS DATE) AND COALESCE(fl.enddate, now())
)

WHERE CAST(a.datefinalized AS DATE) >= CAST(STARTDATE as DATE) AND CAST(a.datefinalized AS DATE) <= CAST(ENDDATE as DATE)
AND a.qcstate.publicdata = true --and a.participantID.demographics.species.common not in ('Rabbit','Guinea Pigs')


--add setup fees for all starts, except day leases aznd sla
-- Add lease setup fees for all lease starts, except day leases, PI-purchased NHPs, and sla
UNION ALL

SELECT
a.id,
a.date,
Expand All @@ -168,7 +167,7 @@ SELECT
' ' as ESPFAnimal,
'Lease Setup Fees' as category,
(SELECT rowid FROM onprc_billing_public.chargeableItems ci WHERE ci.active = true AND ci.name = javaConstant('org.labkey.onprc_billing.ONPRC_BillingManager.LEASE_SETUP_FEES')) as chargeId,
1 as quantity,
1 AS quantity,
cast(null as integer) as leaseCharge1,
cast(null as integer) as leaseCharge2,
a.objectid as sourceRecord,
Expand All @@ -179,11 +178,19 @@ SELECT

FROM study.assignment a

-- Add PI-purchased NHP flag data
LEFT JOIN study.flags fl
ON (a.id = fl.id
AND fl.flag.code = 4034
AND a.date BETWEEN CAST(fl.date AS DATE) AND COALESCE(fl.enddate, now())
)

WHERE CAST(a.datefinalized AS DATE) >= CAST(STARTDATE as DATE) AND CAST(a.datefinalized AS DATE) <= CAST(ENDDATE as DATE)
AND a.qcstate.publicdata = true
--only charge setup fee for leases >24H. note: duration assumes today as end, so exclude null enddates
AND ((a.duration > CAST(javaConstant('org.labkey.onprc_billing.ONPRC_BillingManager.DAY_LEASE_MAX_DURATION') as INTEGER)) OR ( a.assignCondition != a.releaseCondition AND a.enddate IS NULL))
and a.id.demographics.species Not IN ('Rabbit','Guinea Pigs')
AND fl.id IS NULL -- Exempt PI-purchased NHPs from lease setup fees

--add released animals that need adjustments
UNION ALL
Expand All @@ -208,9 +215,9 @@ a5.id as ESPFAnimal,
--////This selectes the charge ID to be used
(SELECT max(rowid) as rowid FROM onprc_billing_public.chargeableItems ci WHERE ci.name = javaConstant('org.labkey.onprc_billing.ONPRC_BillingManager.LEASE_FEE_ADJUSTMENT') and ci.active = true) as chargeId,
CASE
when (fl.id Is Not Null) then 0
else 1
end as quantity,
WHEN (fl.id IS NOT NULL) THEN 0 -- Exempt PI-purchased NHPs from lease fees
ELSE 1
END AS quantity,
lf2.chargeId as leaseCharge1,
lf.chargeId as leaseCharge2,
a.objectid as sourceRecord,
Expand Down Expand Up @@ -248,11 +255,12 @@ LEFT join assignment_U42ESPF a5 on
and a5.dateonly <=a.dateOnly
AND a5.endDateCoalesced >= a.dateOnly)

--adds the reasearch owned animal exemption
LEFT JOIN study.flags fl on
(a.id = fl.id
and fl.flag.code = 4034
and (a.date >= fl.date and a.date <=COALESCE(fl.enddate,Now()) ))
-- Add PI-purchased NHP flag data
LEFT JOIN study.flags fl
ON (a.id = fl.id
AND fl.flag.code = 4034
AND a.date BETWEEN CAST(fl.date AS DATE) AND COALESCE(fl.enddate, now())
)

WHERE a.releaseCondition != a.projectedReleaseCondition
and (A.id != A5.id or A5.id is Null)
Expand Down
19 changes: 9 additions & 10 deletions onprc_billingpublic/resources/queries/onprc_billing_public/NIHIndustryRates/.qview.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,52 +6,51 @@
<column name="Name"/>
<column name = "CurrentYear">
<properties>
<property name="columnTitle" value="YR66: Current Year"/>
<property name="columnTitle" value="YR67: Current Year"/>
</properties>
</column>

<column name = "year1">
<properties>
<property name="columnTitle" value="YR67: 5/1/26-4/30/27"/>
<property name="columnTitle" value="YR68: 5/1/27-4/30/28"/>
</properties>
</column>
<column name = "year2">
<properties>
<property name="columnTitle" value="YR68: 5/1/27-4/30/28"/>
<property name="columnTitle" value="YR69: 5/1/28-4/30/29"/>
</properties>
</column>
<column name = "year3">
<properties>
<property name="columnTitle" value="YR69: 5/1/28-4/30/29"/>
<property name="columnTitle" value="YR70: 5/1/29-4/30/30"/>
</properties>
</column>
<column name = "year4">
<properties>
<property name="columnTitle" value="YR70: 5/1/29-4/30/30"/>
<property name="columnTitle" value="YR71: 5/1/30-4/30/31"/>
</properties>
</column>
<column name = "year5">
<properties>
<property name="columnTitle" value="YR71: 5/1/30-4/30/31"/>
<property name="columnTitle" value="YR72: 5/1/31-4/30/32"/>
</properties>
</column>
<column name = "year6">
<properties>
<property name="columnTitle" value="YR72: 5/1/31-4/30/32"/>
<property name="columnTitle" value="YR73: 5/1/32-4/30/33"/>
</properties>
</column>
<column name = "year7">
<properties>
<property name="columnTitle" value="YR73: 5/1/32-4/30/33"/>
<property name="columnTitle" value="YR74: 5/1/33-4/30/34"/>
</properties>
</column>
<column name = "year8">
<properties>
<property name="columnTitle" value="YR74: 5/1/33-4/30/34"/>
<property name="columnTitle" value="YR74: 5/1/34-4/30/35"/>
</properties>
</column>


<column name = "DatePosted">
<properties>
<property name="columnTitle" value="Date Calculated"/>
Expand Down
19 changes: 9 additions & 10 deletions onprc_billingpublic/resources/queries/onprc_billing_public/NIHRateSheet/.qview.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,52 +6,51 @@
<column name="Name"/>
<column name = "UnitCost">
<properties>
<property name="columnTitle" value="YR66: Current Year"/>
<property name="columnTitle" value="YR67: Current Year"/>
</properties>
</column>

<column name = "year1">
<properties>
<property name="columnTitle" value="YR67: 5/1/26-4/30/27"/>
<property name="columnTitle" value="YR68: 5/1/27-4/30/28"/>
</properties>
</column>
<column name = "year2">
<properties>
<property name="columnTitle" value="YR68: 5/1/27-4/30/28"/>
<property name="columnTitle" value="YR69: 5/1/28-4/30/29"/>
</properties>
</column>
<column name = "year3">
<properties>
<property name="columnTitle" value="YR69: 5/1/28-4/30/29"/>
<property name="columnTitle" value="YR70: 5/1/29-4/30/30"/>
</properties>
</column>
<column name = "year4">
<properties>
<property name="columnTitle" value="YR70: 5/1/29-4/30/30"/>
<property name="columnTitle" value="YR71: 5/1/30-4/30/31"/>
</properties>
</column>
<column name = "year5">
<properties>
<property name="columnTitle" value="YR71: 5/1/30-4/30/31"/>
<property name="columnTitle" value="YR72: 5/1/31-4/30/32"/>
</properties>
</column>
<column name = "year6">
<properties>
<property name="columnTitle" value="YR72: 5/1/31-4/30/32"/>
<property name="columnTitle" value="YR73: 5/1/32-4/30/33"/>
</properties>
</column>
<column name = "year7">
<properties>
<property name="columnTitle" value="YR73: 5/1/32-4/30/33"/>
<property name="columnTitle" value="YR74: 5/1/33-4/30/34"/>
</properties>
</column>
<column name = "year8">
<properties>
<property name="columnTitle" value="YR74: 5/1/33-4/30/34"/>
<property name="columnTitle" value="YR74: 5/1/34-4/30/35"/>
</properties>
</column>


<column name = "DatePosted">
<properties>
<property name="columnTitle" value="Date Calculated"/>
Expand Down
19 changes: 9 additions & 10 deletions onprc_billingpublic/resources/queries/onprc_billing_public/NIHRates_ReducedFA/.qview.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,52 +6,51 @@
<column name="Name"/>
<column name = "CurrentYear">
<properties>
<property name="columnTitle" value="YR66: Current Year"/>
<property name="columnTitle" value="YR67: Current Year"/>
</properties>
</column>

<column name = "year1">
<properties>
<property name="columnTitle" value="YR67: 5/1/26-4/30/27"/>
<property name="columnTitle" value="YR68: 5/1/27-4/30/28"/>
</properties>
</column>
<column name = "year2">
<properties>
<property name="columnTitle" value="YR68: 5/1/27-4/30/28"/>
<property name="columnTitle" value="YR69: 5/1/28-4/30/29"/>
</properties>
</column>
<column name = "year3">
<properties>
<property name="columnTitle" value="YR69: 5/1/28-4/30/29"/>
<property name="columnTitle" value="YR70: 5/1/29-4/30/30"/>
</properties>
</column>
<column name = "year4">
<properties>
<property name="columnTitle" value="YR70: 5/1/29-4/30/30"/>
<property name="columnTitle" value="YR71: 5/1/30-4/30/31"/>
</properties>
</column>
<column name = "year5">
<properties>
<property name="columnTitle" value="YR71: 5/1/30-4/30/31"/>
<property name="columnTitle" value="YR72: 5/1/31-4/30/32"/>
</properties>
</column>
<column name = "year6">
<properties>
<property name="columnTitle" value="YR72: 5/1/31-4/30/32"/>
<property name="columnTitle" value="YR73: 5/1/32-4/30/33"/>
</properties>
</column>
<column name = "year7">
<properties>
<property name="columnTitle" value="YR73: 5/1/32-4/30/33"/>
<property name="columnTitle" value="YR74: 5/1/33-4/30/34"/>
</properties>
</column>
<column name = "year8">
<properties>
<property name="columnTitle" value="YR74: 5/1/33-4/30/34"/>
<property name="columnTitle" value="YR74: 5/1/34-4/30/35"/>
</properties>
</column>


<column name = "DatePosted">
<properties>
<property name="columnTitle" value="Date Calculated"/>
Expand Down
Loading
Loading