From 12694a9fc27908aef83aea97286f2c28507c4cc3 Mon Sep 17 00:00:00 2001 From: Ohsudev <76500320+Ohsudev@users.noreply.github.com> Date: Mon, 15 Nov 2021 20:55:32 -0800 Subject: [PATCH 1/4] Created a version of BSU age class --- ehr/resources/web/ehr/panel/AnimalGroupDetailsPanel.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ehr/resources/web/ehr/panel/AnimalGroupDetailsPanel.js b/ehr/resources/web/ehr/panel/AnimalGroupDetailsPanel.js index 100bf018c..19b8133b8 100644 --- a/ehr/resources/web/ehr/panel/AnimalGroupDetailsPanel.js +++ b/ehr/resources/web/ehr/panel/AnimalGroupDetailsPanel.js @@ -94,13 +94,13 @@ Ext4.define('EHR.panel.AnimalGroupDetailsPanel', { html: '', style: 'padding-bottom: 20px;' }); - + //Modified: 11-26-2021 R.Blasa var fieldKey = 'Id/animalGroupsPivoted/' + this.groupRow.getDisplayValue('name') + '::valueField'; toAdd.push({ xtype: 'ldk-webpartpanel', title: 'Group Overview', items: [{ - xtype: 'ehr-populationpanel', + xtype: 'onprc_ehr-populationpanel', filterArray: [ LABKEY.Filter.create('calculated_status', 'Alive', LABKEY.Filter.Types.EQUAL), LABKEY.Filter.create(fieldKey, 'yes', LABKEY.Filter.Types.EQUAL) From 154e3fb9dd2f9ec9e1abc93edb3cfbe7bfd55fd3 Mon Sep 17 00:00:00 2001 From: Ohsudev <76500320+Ohsudev@users.noreply.github.com> Date: Mon, 15 Nov 2021 22:17:21 -0800 Subject: [PATCH 2/4] Adding files for the Compliance input screens project that have missing files after committing feature branch into default branch. Tested default build on Prime UAT, and it generated errors. --- .../EHR_ComplianceDB-12.40-12.41.sql | 22 +++++ .../EHR_ComplianceDB-12.40-12.41.sql | 24 +++++ .../resources/schemas/ehr_compliancedb.xml | 91 +++++++++++++++++++ .../EHR_ComplianceDBModule.java | 2 +- .../web/ehr/panel/AnimalGroupDetailsPanel.js | 4 +- 5 files changed, 140 insertions(+), 3 deletions(-) create mode 100644 EHR_ComplianceDB/resources/schemas/dbscripts/postgresql/EHR_ComplianceDB-12.40-12.41.sql create mode 100644 EHR_ComplianceDB/resources/schemas/dbscripts/sqlserver/EHR_ComplianceDB-12.40-12.41.sql diff --git a/EHR_ComplianceDB/resources/schemas/dbscripts/postgresql/EHR_ComplianceDB-12.40-12.41.sql b/EHR_ComplianceDB/resources/schemas/dbscripts/postgresql/EHR_ComplianceDB-12.40-12.41.sql new file mode 100644 index 000000000..5c3400225 --- /dev/null +++ b/EHR_ComplianceDB/resources/schemas/dbscripts/postgresql/EHR_ComplianceDB-12.40-12.41.sql @@ -0,0 +1,22 @@ +ALTER TABLE ehr_compliancedb.RequirementsPerCategory add COLUMN trackingflag varchar(100); + +ALTER TABLE ehr_compliancedb.RequirementsPerCategory add COLUMN objectid ENTITYID; + +ALTER TABLE ehr_compliancedb.RequirementsPerCategory add COLUMN taskid ENTITYID; + +CREATE TABLE ehr_compliancedb.EmployeePerUnit +( + RowId SERIAL NOT NULL, + EmployeeId varchar(255) not null, + unit varchar(255) null, + category varchar(255) null, + Container ENTITYID NOT NULL, + CreatedBy USERID, + Created timestamp, + ModifiedBy USERID, + Modified timestamp, + taskid entityid, + objectid entityid, + + CONSTRAINT PK_EmployeePerUnits PRIMARY KEY (RowId) +); diff --git a/EHR_ComplianceDB/resources/schemas/dbscripts/sqlserver/EHR_ComplianceDB-12.40-12.41.sql b/EHR_ComplianceDB/resources/schemas/dbscripts/sqlserver/EHR_ComplianceDB-12.40-12.41.sql new file mode 100644 index 000000000..10eab9291 --- /dev/null +++ b/EHR_ComplianceDB/resources/schemas/dbscripts/sqlserver/EHR_ComplianceDB-12.40-12.41.sql @@ -0,0 +1,24 @@ + +ALTER TABLE ehr_compliancedb.RequirementsPerCategory add trackingflag varchar(100); + +ALTER TABLE ehr_compliancedb.RequirementsPerCategory add objectid ENTITYID; + +ALTER TABLE ehr_compliancedb.RequirementsPerCategory add taskid ENTITYID; + + +CREATE TABLE ehr_compliancedb.EmployeePerUnit +( + RowId INT IDENTITY(1,1) NOT NULL, + EmployeeId varchar(255) not null, + unit varchar(255) null, + category varchar(255) null, + Container ENTITYID NOT NULL, + CreatedBy USERID, + Created datetime, + ModifiedBy USERID, + Modified datetime, + taskid entityid, + objectid entityid + + CONSTRAINT PK_EmployeePerUnits PRIMARY KEY (RowId) +); diff --git a/EHR_ComplianceDB/resources/schemas/ehr_compliancedb.xml b/EHR_ComplianceDB/resources/schemas/ehr_compliancedb.xml index a2f83fe82..3b3cfabec 100644 --- a/EHR_ComplianceDB/resources/schemas/ehr_compliancedb.xml +++ b/EHR_ComplianceDB/resources/schemas/ehr_compliancedb.xml @@ -420,6 +420,21 @@ true true + + true + true + false + + + false + true + true + + + false + true + true + @@ -804,4 +819,80 @@
+ + DETAILED + + Requirements Per Employee + rowid + + + true + true + Key + + + Employee Id + + ehr_compliancedb + employees + employeeid + + + + Unit + + ehr_compliancedb + unit_names + unit + + + + Unit + + ehr_compliancedb + employeecategory + categoryname + + + + false + true + + core + containers + entityid + + + + false + true + true + + + false + true + true + + + false + true + true + + + false + true + true + + + false + true + true + + + false + true + true + + +
\ No newline at end of file diff --git a/EHR_ComplianceDB/src/org/labkey/ehr_compliancedb/EHR_ComplianceDBModule.java b/EHR_ComplianceDB/src/org/labkey/ehr_compliancedb/EHR_ComplianceDBModule.java index ed0734f0c..77df98be7 100644 --- a/EHR_ComplianceDB/src/org/labkey/ehr_compliancedb/EHR_ComplianceDBModule.java +++ b/EHR_ComplianceDB/src/org/labkey/ehr_compliancedb/EHR_ComplianceDBModule.java @@ -49,7 +49,7 @@ public String getName() @Override public @Nullable Double getSchemaVersion() { - return 12.40; + return 12.41; } @Override diff --git a/ehr/resources/web/ehr/panel/AnimalGroupDetailsPanel.js b/ehr/resources/web/ehr/panel/AnimalGroupDetailsPanel.js index 19b8133b8..100bf018c 100644 --- a/ehr/resources/web/ehr/panel/AnimalGroupDetailsPanel.js +++ b/ehr/resources/web/ehr/panel/AnimalGroupDetailsPanel.js @@ -94,13 +94,13 @@ Ext4.define('EHR.panel.AnimalGroupDetailsPanel', { html: '', style: 'padding-bottom: 20px;' }); - //Modified: 11-26-2021 R.Blasa + var fieldKey = 'Id/animalGroupsPivoted/' + this.groupRow.getDisplayValue('name') + '::valueField'; toAdd.push({ xtype: 'ldk-webpartpanel', title: 'Group Overview', items: [{ - xtype: 'onprc_ehr-populationpanel', + xtype: 'ehr-populationpanel', filterArray: [ LABKEY.Filter.create('calculated_status', 'Alive', LABKEY.Filter.Types.EQUAL), LABKEY.Filter.create(fieldKey, 'yes', LABKEY.Filter.Types.EQUAL) From 142bcbf87abb3db6f4917da89ad1f4ecef1a410e Mon Sep 17 00:00:00 2001 From: Josh Eckels Date: Tue, 16 Nov 2021 08:16:12 -0800 Subject: [PATCH 3/4] Update EHR_ComplianceDB/resources/schemas/dbscripts/sqlserver/EHR_ComplianceDB-12.40-12.41.sql --- .../dbscripts/sqlserver/EHR_ComplianceDB-12.40-12.41.sql | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/EHR_ComplianceDB/resources/schemas/dbscripts/sqlserver/EHR_ComplianceDB-12.40-12.41.sql b/EHR_ComplianceDB/resources/schemas/dbscripts/sqlserver/EHR_ComplianceDB-12.40-12.41.sql index 10eab9291..48721e927 100644 --- a/EHR_ComplianceDB/resources/schemas/dbscripts/sqlserver/EHR_ComplianceDB-12.40-12.41.sql +++ b/EHR_ComplianceDB/resources/schemas/dbscripts/sqlserver/EHR_ComplianceDB-12.40-12.41.sql @@ -9,9 +9,9 @@ ALTER TABLE ehr_compliancedb.RequirementsPerCategory add taskid ENTITYID; CREATE TABLE ehr_compliancedb.EmployeePerUnit ( RowId INT IDENTITY(1,1) NOT NULL, - EmployeeId varchar(255) not null, - unit varchar(255) null, - category varchar(255) null, + EmployeeId nvarchar(255) not null, + unit nvarchar(255) null, + category nvarchar(255) null, Container ENTITYID NOT NULL, CreatedBy USERID, Created datetime, From d9396749ea4dea1b662fd386e4cb71bf65d0ed75 Mon Sep 17 00:00:00 2001 From: Josh Eckels Date: Tue, 16 Nov 2021 08:16:17 -0800 Subject: [PATCH 4/4] Update EHR_ComplianceDB/resources/schemas/dbscripts/sqlserver/EHR_ComplianceDB-12.40-12.41.sql --- .../dbscripts/sqlserver/EHR_ComplianceDB-12.40-12.41.sql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/EHR_ComplianceDB/resources/schemas/dbscripts/sqlserver/EHR_ComplianceDB-12.40-12.41.sql b/EHR_ComplianceDB/resources/schemas/dbscripts/sqlserver/EHR_ComplianceDB-12.40-12.41.sql index 48721e927..434f06971 100644 --- a/EHR_ComplianceDB/resources/schemas/dbscripts/sqlserver/EHR_ComplianceDB-12.40-12.41.sql +++ b/EHR_ComplianceDB/resources/schemas/dbscripts/sqlserver/EHR_ComplianceDB-12.40-12.41.sql @@ -1,5 +1,5 @@ -ALTER TABLE ehr_compliancedb.RequirementsPerCategory add trackingflag varchar(100); +ALTER TABLE ehr_compliancedb.RequirementsPerCategory add trackingflag nvarchar(100); ALTER TABLE ehr_compliancedb.RequirementsPerCategory add objectid ENTITYID;