Skip to content

25.7 fb lease fees cte #1559

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

Open
jonesgaohsu wants to merge 46 commits into
base: release25.7-SNAPSHOT
Choose a base branch
from
Open

25.7 fb lease fees cte #1559

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
46 commits
Select commit Hold shift + click to select a range
29c3fe3
Update of Lease Fee queries to use CTEs for cleaner and easlier to r…
jonesgaohsu Nov 17, 2025
15fbe3d
Update of Lease Fee queries to use CTEs for cleaner and easlier to r…
jonesgaohsu Nov 18, 2025
f8b0a3d
Update of Lease Fee queries to use CTEs for cleaner and easlier to r…
jonesgaohsu Nov 19, 2025
861d293
This is the working copy of a new Lease Fee query using CTEs based on…
jonesgaohsu Nov 22, 2025
9094ee5
This is the working copy of a new Lease Fee query using CTEs based on…
jonesgaohsu Nov 22, 2025
f4db589
This is the working copy of a new Lease Fee query using CTEs based on…
jonesgaohsu Nov 24, 2025
8187d4b
Update on CTE Testing Solid to Point indicated in Code
jonesgaohsu Nov 24, 2025
3536ead
Update of LeaseFee Processing using CTEs
jonesgaohsu Dec 1, 2025
126474e
Old LeaseFee Foles
jonesgaohsu Dec 1, 2025
f3c0879
Changes to Lease Fees using CTEs for clarification
jonesgaohsu Dec 1, 2025
e3915b0
Merge branch 'refs/heads/release25.7-SNAPSHOT' into 25.7_fb_LeaseFeesCTE
jonesgaohsu Dec 15, 2025
83e1dd4
Update of Lease Fees with CTE adjustments for Day lease in LEase Type
jonesgaohsu Dec 15, 2025
1297cc1
Update of Lease Fees with CTE adjustments for Day lease in LEase Type
jonesgaohsu Dec 15, 2025
0d335a2
Update of Lease Fees with CTE adjustments for Day lease in LEase Type
jonesgaohsu Dec 15, 2025
1948065
Update of Lease Fees with CTE adjustments for Day lease in LEase Type
jonesgaohsu Dec 15, 2025
47a2c10
Update of Lease Fees with CTE adjustments for Day lease in LEase Type
jonesgaohsu Dec 15, 2025
7e3fe7d
New QUery to Match fields in leaseFeeRates query. Dropping old CTE le…
jonesgaohsu Dec 16, 2025
5fd3654
Update of Lease Fee Rates to using CTEs and eliminate the mutltiple q…
jonesgaohsu Dec 19, 2025
99d1afc
Update removing use of Select * as it is not a recommended method
jonesgaohsu Dec 22, 2025
05ab92f
Updated to incldue a credit account field in the final output. WIll n…
jonesgaohsu Dec 24, 2025
53095e9
Update to Finance to include table for projects receiving credit for …
jonesgaohsu Dec 24, 2025
97f80c9
Update to Finance Management html to point to the correct tbale for P…
jonesgaohsu Dec 26, 2025
77d015d
Correction of issue in onprc_billing.xml and finance managment
jonesgaohsu Dec 29, 2025
44d74d5
Removed undefined fields from onprc_billing.xml
jonesgaohsu Dec 29, 2025
431cff6
Removed undefined fields from onprc_billing.xml
jonesgaohsu Dec 29, 2025
49112d4
Removed undefined fields from onprc_billing.xml
jonesgaohsu Dec 29, 2025
7fdd419
Added a linked schema to allow Finacne to view LEase Fee Eligibility
jonesgaohsu Dec 31, 2025
d6f9f87
Added new Table to hold Projects that can receive income
jonesgaohsu Jan 15, 2026
44f672d
Update of QUery to filter to active only
jonesgaohsu Jan 16, 2026
f730453
Update of Finance Management page
jonesgaohsu Jan 17, 2026
27dbcda
Update for Lease Fee Rates to add Table to manage who can receive Lea…
jonesgaohsu Jan 26, 2026
eab8e88
Update of QUery to expose Project details in the form display
jonesgaohsu Jan 27, 2026
51a6eea
Merge branch 'refs/heads/release25.7-SNAPSHOT' into 25.7_fb_LeaseFeesCTE
jonesgaohsu Jan 27, 2026
b8ad202
Cleanup to insure all files neeeded are inluded
jonesgaohsu Jan 27, 2026
ada294d
Cleanup to insure all files neeeded are inluded
jonesgaohsu Jan 28, 2026
d453b79
Update of Finance Management page
jonesgaohsu Jan 28, 2026
798af31
Added Missing html for Finance Management
jonesgaohsu Jan 29, 2026
dd30d92
Update of Finance Management page
jonesgaohsu Jan 29, 2026
974c2e0
Update of Finance Management page
jonesgaohsu Jan 29, 2026
99a4d1d
Merge branch 'release25.7-SNAPSHOT' into 25.7_fb_LeaseFeesCTE
jonesgaohsu Jan 29, 2026
416301e
Adding dataset for Lease Fee Revenut Projects
jonesgaohsu Jan 29, 2026
1a263bc
Adding dataset for Lease Fee Revenut Projects
jonesgaohsu Jan 30, 2026
121fe64
Update on SmSSQL Scipt as it was not loading
jonesgaohsu Jan 30, 2026
12a8c7f
Merge branch 'refs/heads/release25.7-SNAPSHOT' into 25.7_fb_LeaseFeesCTE
jonesgaohsu Feb 9, 2026
d539950
Cleanup of Feature BRanch to remove old query
jonesgaohsu Feb 20, 2026
8835704
Cleanup of Feature BRanch to remove old query
jonesgaohsu Feb 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
10 changes: 10 additions & 0 deletions onprc_billing/resources/queries/onprc_billing/LeaseFeeIncomeRevenueAlias.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
Select
i.rowID,
i.project,
i.startDate,
i.enddate,
i.comment,
p.account
from projectLeaseIncomeEligibility i
left join projectAccountHistory p on i.project = p.project
where p.isActive = true
366 changes: 0 additions & 366 deletions onprc_billing/resources/queries/onprc_billing/leaseFeeRates.sql
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion onprc_billing/resources/queries/onprc_billing/leasefee_rateData.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ Case
When (l.leaseType = 'Day Lease Research Assignment P51 NHP NC' ) then 90
When (l.leaseType = 'DualAssignedESPF' and l.daylease <> 'yes' and l.leasetype = lf.chargeID.name) then null
when (l.leasetype = 'Animal Lease Fee - TMB') and l.daylease <> 'yes' then 1552

When (l.leaseType = 'TMB Adult Day Lease' and l.leasetype = lf.chargeID.name) then 90
When (l.leaseType = 'TMB No Charge' and l.leasetype = lf.chargeID.name) then Null
When (l.leaseType = 'TMB Full P 51 Rate Lease' and l.leasetype = lf.chargeID.name) then
Expand Down
Loading