From 9d8d9ca9b684c131a024c445efff2d984afeb8aa Mon Sep 17 00:00:00 2001 From: ohsudev Date: Tue, 6 Jan 2026 23:57:52 -0800 Subject: [PATCH 1/6] Created a new program to modify every active compliance requirement names onto the new set of predefined name. --- .../sqlserver/onprc_ehr-25.003-25.004.sql | 95 +++++++++++++++++++ .../org/labkey/onprc_ehr/ONPRC_EHRModule.java | 2 +- 2 files changed, 96 insertions(+), 1 deletion(-) create mode 100644 onprc_ehr/resources/schemas/dbscripts/sqlserver/onprc_ehr-25.003-25.004.sql diff --git a/onprc_ehr/resources/schemas/dbscripts/sqlserver/onprc_ehr-25.003-25.004.sql b/onprc_ehr/resources/schemas/dbscripts/sqlserver/onprc_ehr-25.003-25.004.sql new file mode 100644 index 000000000..4eefc2aae --- /dev/null +++ b/onprc_ehr/resources/schemas/dbscripts/sqlserver/onprc_ehr-25.003-25.004.sql @@ -0,0 +1,95 @@ + +CREATE TABLE [dbo].[RequirementName_Convert]( + [searchid] [smallint] IDENTITY(100,1) NOT NULL, + [PreviousDesignation] [nvarchar](255) NULL, + [afterName] [nvarchar](255) NULL, + [FileName] [nvarchar](255) NULL + ) ON [PRIMARY] + GO + + +/* +** +** Created by Date Comment +** +** +** Blasa 1/6/2026 Convert Compliance Requirement Names to its new predefined names. +*/ + + +CREATE Procedure sp_Compliance_requirementname_Update_Process + + + + +AS + +DECLARE + + @SearchKey Int, + @TempsearchKey Int, + @Code varchar(500) +Begin + + + + ---Initial Values + set @TempSearchkey = 0 + set @Searchkey = 0 + + + +select top 1 @Searchkey= searchid from requirementname_Convert +order by searchid + + + While @TempSearchKey < @SearchKey + +BEGIN + +select top 1 @Code=PreviousDesignation from requirementname_Convert +order by searchid + If @@Error <> 0 + GoTo Err_Proc + +Update ss +set ss.RequirementName = '' + trim(jj.aftername) + ' ' + trim(jj.filename) + '' + + from ehr_Compliancedb.Requirements ss, requirementname_Convert jj where ss.RequirementName like '' + trim(@code) + '%' + And jj.PreviousDesignation like '' + trim(@code) + '%' + + If @@Error <> 0 + GoTo Err_Proc + +----- Process the next data record + +Set @TempSearchkey = @SearchKey + + +Select top 1 @Code=PreviousDesignation from requirementname_Convert +Where searchid > @TempSearchkey + +order by searchid + + If @@Error <> 0 + GoTo Err_Proc + + +END ---(While) + + + +RETURN 0 + + + Err_Proc: + + + RETURN 1 + + +END + +GO + + diff --git a/onprc_ehr/src/org/labkey/onprc_ehr/ONPRC_EHRModule.java b/onprc_ehr/src/org/labkey/onprc_ehr/ONPRC_EHRModule.java index a8164a775..2ccd34657 100644 --- a/onprc_ehr/src/org/labkey/onprc_ehr/ONPRC_EHRModule.java +++ b/onprc_ehr/src/org/labkey/onprc_ehr/ONPRC_EHRModule.java @@ -124,7 +124,7 @@ public String getName() @Override public @Nullable Double getSchemaVersion() { - return 25.003; + return 25.004; } @Override From 4826df3034e63e509154459116518e628dfc8d67 Mon Sep 17 00:00:00 2001 From: ohsudev Date: Wed, 7 Jan 2026 21:55:55 -0800 Subject: [PATCH 2/6] Created a new reporting program called "Tissue Distribution by AnimalID per Calendar". --- .../sqlserver/onprc_ehr-25.003-25.004.sql | 72 +++++++++++++++---- 1 file changed, 59 insertions(+), 13 deletions(-) diff --git a/onprc_ehr/resources/schemas/dbscripts/sqlserver/onprc_ehr-25.003-25.004.sql b/onprc_ehr/resources/schemas/dbscripts/sqlserver/onprc_ehr-25.003-25.004.sql index 4eefc2aae..cbeafafcc 100644 --- a/onprc_ehr/resources/schemas/dbscripts/sqlserver/onprc_ehr-25.003-25.004.sql +++ b/onprc_ehr/resources/schemas/dbscripts/sqlserver/onprc_ehr-25.003-25.004.sql @@ -1,9 +1,9 @@ -CREATE TABLE [dbo].[RequirementName_Convert]( - [searchid] [smallint] IDENTITY(100,1) NOT NULL, - [PreviousDesignation] [nvarchar](255) NULL, - [afterName] [nvarchar](255) NULL, - [FileName] [nvarchar](255) NULL +CREATE TABLE onprc_ehr.RequirementName_Convert( + searchid integer IDENTITY(100,1) NOT NULL, + PreviousDesignation varchar(255) NULL, + afterName varchar(255) NULL, + FileName varchar(1000) NULL ) ON [PRIMARY] GO @@ -39,36 +39,82 @@ Begin -select top 1 @Searchkey= searchid from requirementname_Convert +select top 1 @Searchkey= searchid from onprc_ehr.requirementname_Convert order by searchid - While @TempSearchKey < @SearchKey - +While @TempSearchKey < @SearchKey BEGIN -select top 1 @Code=PreviousDesignation from requirementname_Convert -order by searchid +select top 1 @Code=PreviousDesignation from onprc_ehr.requirementname_Convert + Where searchid = @Searchkey + If @@Error <> 0 GoTo Err_Proc + ------Process Requirement Names + Update ss set ss.RequirementName = '' + trim(jj.aftername) + ' ' + trim(jj.filename) + '' - from ehr_Compliancedb.Requirements ss, requirementname_Convert jj where ss.RequirementName like '' + trim(@code) + '%' + from ehr_Compliancedb.Requirements ss, onprc_ehr.requirementname_Convert jj where ss.RequirementName like '' + trim(@code) + '%' And jj.PreviousDesignation like '' + trim(@code) + '%' If @@Error <> 0 GoTo Err_Proc +------Process Completion Dates + +Update ss +set ss.RequirementName = '' + trim(jj.aftername) + ' ' + trim(jj.filename) + '' + + from ehr_Compliancedb.CompletionDates ss, onprc_ehr.requirementname_Convert jj where ss.RequirementName like '' + trim(@code) + '%' + And jj.PreviousDesignation like '' + trim(@code) + '%' + + If @@Error <> 0 + GoTo Err_Proc + +------Process Requirements for Employees + +Update ss +set ss.RequirementName = '' + trim(jj.aftername) + ' ' + trim(jj.filename) + '' + + from ehr_Compliancedb.RequirementsPerEmployee ss, onprc_ehr.requirementname_Convert jj where ss.RequirementName like '' + trim(@code) + '%' + And jj.PreviousDesignation like '' + trim(@code) + '%' + + If @@Error <> 0 + GoTo Err_Proc + +-----Process Requirements per Categories + +Update ss +set ss.RequirementName = '' + trim(jj.aftername) + ' ' + trim(jj.filename) + '' + + from ehr_Compliancedb.RequirementsPerCategory ss, onprc_ehr.requirementname_Convert jj where ss.RequirementName like '' + trim(@code) + '%' + And jj.PreviousDesignation like '' + trim(@code) + '%' + + If @@Error <> 0 + GoTo Err_Proc + +-----Process Employee Requirements Exemptions + +Update ss +set ss.RequirementName = '' + trim(jj.aftername) + ' ' + trim(jj.filename) + '' + + from ehr_Compliancedb.EmployeeRequirementExemptions ss, onprc_ehr.requirementname_Convert jj where ss.RequirementName like '' + trim(@code) + '%' + And jj.PreviousDesignation like '' + trim(@code) + '%' + + If @@Error <> 0 + GoTo Err_Proc + + ----- Process the next data record Set @TempSearchkey = @SearchKey -Select top 1 @Code=PreviousDesignation from requirementname_Convert +select top 1 @Searchkey= searchid from onprc_ehr.requirementname_Convert Where searchid > @TempSearchkey - order by searchid If @@Error <> 0 From d0b24846548326a98e7e884feb53b0454f7b723c Mon Sep 17 00:00:00 2001 From: ohsudev Date: Wed, 7 Jan 2026 22:04:23 -0800 Subject: [PATCH 3/6] Created a new reporting program called "Tissue Distribution by AnimalID per Calendar". --- .../dbscripts/sqlserver/onprc_ehr-25.003-25.004.sql | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/onprc_ehr/resources/schemas/dbscripts/sqlserver/onprc_ehr-25.003-25.004.sql b/onprc_ehr/resources/schemas/dbscripts/sqlserver/onprc_ehr-25.003-25.004.sql index cbeafafcc..c36317eec 100644 --- a/onprc_ehr/resources/schemas/dbscripts/sqlserver/onprc_ehr-25.003-25.004.sql +++ b/onprc_ehr/resources/schemas/dbscripts/sqlserver/onprc_ehr-25.003-25.004.sql @@ -58,7 +58,7 @@ Update ss set ss.RequirementName = '' + trim(jj.aftername) + ' ' + trim(jj.filename) + '' from ehr_Compliancedb.Requirements ss, onprc_ehr.requirementname_Convert jj where ss.RequirementName like '' + trim(@code) + '%' - And jj.PreviousDesignation like '' + trim(@code) + '%' + And jj.PreviousDesignation like '' + trim(@code) + '%' If @@Error <> 0 GoTo Err_Proc @@ -69,7 +69,7 @@ Update ss set ss.RequirementName = '' + trim(jj.aftername) + ' ' + trim(jj.filename) + '' from ehr_Compliancedb.CompletionDates ss, onprc_ehr.requirementname_Convert jj where ss.RequirementName like '' + trim(@code) + '%' - And jj.PreviousDesignation like '' + trim(@code) + '%' + And jj.PreviousDesignation like '' + trim(@code) + '%' If @@Error <> 0 GoTo Err_Proc @@ -80,7 +80,7 @@ Update ss set ss.RequirementName = '' + trim(jj.aftername) + ' ' + trim(jj.filename) + '' from ehr_Compliancedb.RequirementsPerEmployee ss, onprc_ehr.requirementname_Convert jj where ss.RequirementName like '' + trim(@code) + '%' - And jj.PreviousDesignation like '' + trim(@code) + '%' + And jj.PreviousDesignation like '' + trim(@code) + '%' If @@Error <> 0 GoTo Err_Proc @@ -91,7 +91,7 @@ Update ss set ss.RequirementName = '' + trim(jj.aftername) + ' ' + trim(jj.filename) + '' from ehr_Compliancedb.RequirementsPerCategory ss, onprc_ehr.requirementname_Convert jj where ss.RequirementName like '' + trim(@code) + '%' - And jj.PreviousDesignation like '' + trim(@code) + '%' + And jj.PreviousDesignation like '' + trim(@code) + '%' If @@Error <> 0 GoTo Err_Proc @@ -102,7 +102,7 @@ Update ss set ss.RequirementName = '' + trim(jj.aftername) + ' ' + trim(jj.filename) + '' from ehr_Compliancedb.EmployeeRequirementExemptions ss, onprc_ehr.requirementname_Convert jj where ss.RequirementName like '' + trim(@code) + '%' - And jj.PreviousDesignation like '' + trim(@code) + '%' + And jj.PreviousDesignation like '' + trim(@code) + '%' If @@Error <> 0 GoTo Err_Proc From 040ae7f3092fdeb8e352360d7ff59b9332b6e780 Mon Sep 17 00:00:00 2001 From: ohsudev Date: Thu, 8 Jan 2026 08:33:30 -0800 Subject: [PATCH 4/6] Created a new reporting program called "Tissue Distribution by AnimalID per Calendar". --- .../schemas/dbscripts/sqlserver/onprc_ehr-25.003-25.004.sql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/onprc_ehr/resources/schemas/dbscripts/sqlserver/onprc_ehr-25.003-25.004.sql b/onprc_ehr/resources/schemas/dbscripts/sqlserver/onprc_ehr-25.003-25.004.sql index c36317eec..fe67622d4 100644 --- a/onprc_ehr/resources/schemas/dbscripts/sqlserver/onprc_ehr-25.003-25.004.sql +++ b/onprc_ehr/resources/schemas/dbscripts/sqlserver/onprc_ehr-25.003-25.004.sql @@ -74,7 +74,7 @@ set ss.RequirementName = '' + trim(jj.aftername) + ' ' + trim(jj.filename) + '' If @@Error <> 0 GoTo Err_Proc -------Process Requirements for Employees +------Process Requirements per Employees Update ss set ss.RequirementName = '' + trim(jj.aftername) + ' ' + trim(jj.filename) + '' From 5a319da02af8bac718cfa9c462bbc5e1f2992e59 Mon Sep 17 00:00:00 2001 From: ohsudev Date: Thu, 8 Jan 2026 10:27:20 -0800 Subject: [PATCH 5/6] Modified Compliance Requirement names to have the names translated to its new naming conversion. --- onprc_ehr/resources/schemas/onprc_ehr.xml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/onprc_ehr/resources/schemas/onprc_ehr.xml b/onprc_ehr/resources/schemas/onprc_ehr.xml index 875814163..298c65edc 100644 --- a/onprc_ehr/resources/schemas/onprc_ehr.xml +++ b/onprc_ehr/resources/schemas/onprc_ehr.xml @@ -1471,4 +1471,13 @@ + + + + + + + +
+ From 0a81e69454240e9fae2258bc947b8d7067c9fcb5 Mon Sep 17 00:00:00 2001 From: ohsudev Date: Fri, 9 Jan 2026 10:01:13 -0800 Subject: [PATCH 6/6] Modified Complinace Requirement name program updates. --- .../schemas/dbscripts/sqlserver/onprc_ehr-25.003-25.004.sql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/onprc_ehr/resources/schemas/dbscripts/sqlserver/onprc_ehr-25.003-25.004.sql b/onprc_ehr/resources/schemas/dbscripts/sqlserver/onprc_ehr-25.003-25.004.sql index fe67622d4..ac8027b7d 100644 --- a/onprc_ehr/resources/schemas/dbscripts/sqlserver/onprc_ehr-25.003-25.004.sql +++ b/onprc_ehr/resources/schemas/dbscripts/sqlserver/onprc_ehr-25.003-25.004.sql @@ -17,7 +17,7 @@ CREATE TABLE onprc_ehr.RequirementName_Convert( */ -CREATE Procedure sp_Compliance_requirementname_Update_Process +CREATE Procedure onprc_ehr.sp_Compliance_requirementname_Update_Process