diff --git a/ONPRC_EHR_ComplianceDB/resources/queries/onprc_ehr_compliancedb/SciShield_Data.query.xml b/ONPRC_EHR_ComplianceDB/resources/queries/onprc_ehr_compliancedb/SciShield_Data.query.xml
new file mode 100644
index 000000000..42fcbbe45
--- /dev/null
+++ b/ONPRC_EHR_ComplianceDB/resources/queries/onprc_ehr_compliancedb/SciShield_Data.query.xml
@@ -0,0 +1,11 @@
+
+
+
+
+
+
+
diff --git a/ONPRC_EHR_ComplianceDB/resources/queries/onprc_ehr_compliancedb/SciShield_Data/.qview.xml b/ONPRC_EHR_ComplianceDB/resources/queries/onprc_ehr_compliancedb/SciShield_Data/.qview.xml
new file mode 100644
index 000000000..46970d7de
--- /dev/null
+++ b/ONPRC_EHR_ComplianceDB/resources/queries/onprc_ehr_compliancedb/SciShield_Data/.qview.xml
@@ -0,0 +1,20 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/ONPRC_EHR_ComplianceDB/resources/queries/onprc_ehr_compliancedb/SciShield_Reference_Data.query.xml b/ONPRC_EHR_ComplianceDB/resources/queries/onprc_ehr_compliancedb/SciShield_Reference_Data.query.xml
new file mode 100644
index 000000000..80f362c0a
--- /dev/null
+++ b/ONPRC_EHR_ComplianceDB/resources/queries/onprc_ehr_compliancedb/SciShield_Reference_Data.query.xml
@@ -0,0 +1,34 @@
+
+
+
+
+ SciShield Reference Data
+
+
+
+ true
+
+
+ Value
+
+
+ End Date
+
+
+
+ Column Name
+
+
+
+ Label
+
+
+
+ Sort Order
+
+
+
+
+
+
+
diff --git a/ONPRC_EHR_ComplianceDB/resources/schemas/dbscripts/sqlserver/onprc_ehr_compliancedb-0.000-24.000.sql b/ONPRC_EHR_ComplianceDB/resources/schemas/dbscripts/sqlserver/onprc_ehr_compliancedb-0.000-24.000.sql
new file mode 100644
index 000000000..2ada5c5ca
--- /dev/null
+++ b/ONPRC_EHR_ComplianceDB/resources/schemas/dbscripts/sqlserver/onprc_ehr_compliancedb-0.000-24.000.sql
@@ -0,0 +1,43 @@
+
+CREATE SCHEMA onprc_ehr_compliancedb;
+GO
+
+CREATE TABLE onprc_ehr_compliancedb.SciShield_Data
+(
+ RowId INT IDENTITY(1,1) NOT NULL,
+ employeeId nvarchar(255) not null,
+ requirementname nvarchar(255) null,
+ Date datetime null,
+ Container ENTITYID NOT NULL,
+ comment nvarchar(2000) null,
+ CreatedBy USERID,
+ Created datetime,
+ ModifiedBy USERID,
+ Modified datetime,
+ processed int NULL
+
+ CONSTRAINT PK_ScieShield_Data PRIMARY KEY (RowId),
+ CONSTRAINT FK_ONPRC_EHR_COMPLIANCE_SCISHIELD_DATA_CONTAINER FOREIGN KEY (Container) REFERENCES core.Containers (EntityId)
+);
+CREATE INDEX IX_ONPRC_EHR_COMPLIANCEDB_SCISHIELD_DATA_CONTAINER ON onprc_ehr_compliancedb.SciShield_Data (Container);
+
+CREATE TABLE onprc_ehr_compliancedb.SciShield_Reference_Data
+(
+ rowId int identity(1,1),
+ label nvarchar(250) NULL,
+ value nvarchar(255) NOT NULL ,
+ columnName nvarchar(255) NOT NULL,
+ sort_order integer null,
+ endDate datetime NULL,
+ Container ENTITYID NOT NULL,
+ CreatedBy USERID,
+ Created datetime,
+ ModifiedBy USERID,
+ Modified datetime,
+
+ CONSTRAINT pk_SciShield_reference PRIMARY KEY (value),
+ CONSTRAINT FK_ONPRC_EHR_COMPLIANCE_REFERENCE_DATA_CONTAINER FOREIGN KEY (Container) REFERENCES core.Containers (EntityId)
+);
+CREATE INDEX IX_ONPRC_EHR_COMPLIANCEDB_SCISHIELD_REFERENCE_DATA_CONTAINER ON onprc_ehr_compliancedb.SciShield_Reference_Data (Container);
+
+GO
\ No newline at end of file
diff --git a/ONPRC_EHR_ComplianceDB/resources/schemas/dbscripts/sqlserver/onprc_ehr_compliancedb-24.001-24.002.sql b/ONPRC_EHR_ComplianceDB/resources/schemas/dbscripts/sqlserver/onprc_ehr_compliancedb-24.001-24.002.sql
new file mode 100644
index 000000000..c36be855e
--- /dev/null
+++ b/ONPRC_EHR_ComplianceDB/resources/schemas/dbscripts/sqlserver/onprc_ehr_compliancedb-24.001-24.002.sql
@@ -0,0 +1,311 @@
+
+
+
+
+-- Author: R. Blasa
+-- Created: 2-10-2024
+-- Description: Stored procedure program process SciShield INitial Data
+
+
+CREATE TABLE [onprc_ehr_compliancedb].[SciShieldTemp] (
+ [searchID] [int] IDENTITY(100,1) NOT NULL,
+ [employeeid] [varchar](500) NULL,
+ [requirementname] [varchar](3000) NULL,
+ [completeddate] [smalldatetime] NULL,
+ [comment] [varchar](300) NULL,
+ [createddate] [smalldatetime] NULL,
+ [rowid] [int] NULL
+ ) ON [PRIMARY]
+ GO
+
+CREATE TABLE [onprc_ehr_compliancedb].[SciShieldMasterTemp](
+ [searchID] [int] IDENTITY(100,1) NOT NULL,
+ [employeeid] [varchar](500) NULL,
+ [requirementname] [varchar](3000) NULL,
+ [completeddate] [smalldatetime] NULL,
+ [comment] [varchar](300) NULL,
+ [createddate] [smalldatetime] NULL,
+ [rowid] [int] NULL
+ ) ON [PRIMARY]
+ GO
+
+
+
+-- Author: R. Blasa
+-- Created: 2-10-2024
+
+/*
+**
+** Created by
+** Blasa 1-25-2024 Import process from ScieShield To Prime Compliance Module
+**
+** Processed codes: Null ---Not Processed
+** 1 ------ Successfully posted
+** 2 --------- invalid Employeeid
+** 3 --------- Undefined Requirement Name
+** 4--------- Already exists Compliance module
+**
+**
+**
+*/
+
+CREATE Procedure onprc_ehr_compliancedb.[p_SciShieldToPrimeProcess]
+
+
+AS
+
+
+DECLARE
+ @SearchKey Int,
+ @TempsearchKey Int,
+ @requirementnameFinal varchar(2000),
+ @requirementnanme varchar(2000),
+ @employeeid varchar(500),
+ @Completiondate smalldatetime,
+ @SciShieldID int
+
+
+
+
+
+BEGIN
+
+ ---- Reset temp table
+
+ Delete onprc_ehr_compliancedb.SciShieldTemp
+
+
+ If @@Error <> 0
+ GoTo Err_Proc
+
+
+If exists(Select * from onprc_ehr_compliancedb.SciShield_Data where processed is null)
+BEGIN
+
+ Insert into onprc_ehr_compliancedb.SciShieldTemp
+ (
+ employeeid,
+ requirementname,
+ completeddate,
+ createddate,
+ rowid
+ )
+
+
+ select
+ employeeid, -------employeeid
+ requirementname, ----requirement name
+ date, ----completed Date
+ getdate(), --- created date
+ rowid --- SciShield unique id
+
+
+ from onprc_ehr_compliancedb.SciShield_Data
+ where processed is null
+
+ order by employeeid, requirementname, date desc
+
+ If @@Error <> 0
+ GoTo Err_Proc
+
+ END
+
+ELSE ------ No new entries exit
+ BEGIN
+
+ GOTO No_Records
+
+ END
+
+ --- Initialize Varaibles
+
+ Set @TempsearchKey = 0
+ Set @SearchKey = 0
+
+
+
+ --- Start processing input records from SciShield
+
+
+ Select top 1 @searchkey = searchID from onprc_ehr_compliancedb.SciShieldTemp
+ order by searchID
+
+
+
+
+While @TempSearchKey < @SearchKey
+ BEGIN
+ Set @requirementnameFinal = ''
+ Set @requirementnanme = ''
+ Set @employeeid = ''
+ Set @Completiondate = Null
+ Set @SciShieldID = Null
+
+
+ Select @employeeid =rtrim(ltrim(lower(employeeid))), @requirementnanme = requirementname, @completiondate = completeddate, @SciShieldID = rowid
+ from onprc_ehr_compliancedb.SciShieldTemp Where searchID = @Searchkey
+
+ ---Validate requirementname
+ IF exists (Select * from onprc_ehr_compliancedb.SciShield_Reference_Data where label = @requirementnanme And columnname = 'requirementname' )
+ BEGIN
+
+ Select @requirementnameFinal = value from onprc_ehr_compliancedb.SciShield_Reference_Data where label = @requirementnanme And columnname = 'requirementname'
+ END
+ ELSE IF exists (Select * from ehr_compliancedb.requirements where requirementname = @requirementnanme)
+ BEGIN
+ Select @requirementnameFinal = requirementname from ehr_compliancedb.requirements where requirementname = @requirementnanme
+ END
+
+ ELSE
+ BEGIN
+ Update ss
+ Set ss.processed = 3
+
+ From onprc_ehr_compliancedb.SciShield_Data ss Where ss.rowid = @SciShieldID
+
+ If @@Error <> 0
+ GoTo Err_Proc
+
+ GOTO Next_Record
+ END
+
+ ----validate if the record already exists
+
+ IF exists( Select * from ehr_compliancedb.completiondates Where employeeid = @employeeid And requirementname = @requirementnameFinal
+ And date = @completiondate)
+ BEGIN
+ Update ss
+ Set ss.processed = 4
+
+ From onprc_ehr_compliancedb.SciShield_Data ss Where ss.rowid = @SciShieldID
+
+ If @@Error <> 0
+ GoTo Err_Proc
+
+ GOTO Next_Record
+ END
+
+
+ ----validate if the employeeid is defined
+
+ IF not exists( Select * from ehr_compliancedb.employees Where employeeid = @employeeid And enddate is null)
+ BEGIN
+
+ Update ss
+ Set ss.processed = 2
+
+ From onprc_ehr_compliancedb.SciShield_Data ss Where ss.rowid = @SciShieldID
+
+
+ If @@Error <> 0
+ GoTo Err_Proc
+
+ GOTO Next_Record
+
+
+
+ END ----
+
+
+ ---- IF all previous version were validated proceed with the record insert
+
+
+ IF not exists( Select * from ehr_compliancedb.completiondates Where employeeid = @employeeid And requirementname = @requirementnameFinal
+ And date = @completiondate)
+
+ BEGIN
+ Insert into ehr_compliancedb.completiondates
+ (employeeid,
+ requirementname,
+ date,
+ trainer,
+ container,
+ created,
+ createdby,
+ modified,
+ modifiedby
+
+ )
+ values(
+ @employeeid,
+ @requirementnameFinal,
+ @completiondate,
+ 'ONLINE TRAINING',
+ 'CD170458-C55F-102F-9907-5107380A54BE',
+ getdate(),
+ 2595,
+ getdate(),
+ 2595
+ )
+ If @@Error <> 0
+ GoTo Err_Proc
+
+
+
+
+---------- Set successful entry flag
+
+ Update ss
+ Set ss.processed = 1
+
+ From onprc_ehr_compliancedb.SciShield_Data ss Where ss.rowid = @SciShieldID
+
+
+ If @@Error <> 0
+ GoTo Err_Proc
+
+END ----
+
+
+
+
+Next_Record:
+
+
+
+ Set @TempSearchkey = @SearchKey
+
+
+ Select Top 1 @Searchkey = searchID from onprc_ehr_compliancedb.SciShieldTemp
+ Where searchID > @TempSearchkey
+ Order by searchID
+
+
+
+END ---(While)
+
+
+
+ ---- Create a master records of the last most recent entries
+ If exists (Select * from onprc_ehr_compliancedb.SciShieldTemp)
+ BEGiN
+ Insert into onprc_ehr_compliancedb.SciShieldMasterTemp
+ select
+ employeeid,
+ requirementname,
+ completeddate,
+ comment,
+ createddate,
+ rowid
+
+
+ from onprc_ehr_compliancedb.SciShieldTemp
+
+
+ If @@Error <> 0
+ GoTo Err_Proc
+END
+
+No_Records:
+
+ RETURN 0
+
+
+Err_Proc:
+ -------Error Generated, Transfer process stopped
+ RETURN 1
+
+
+END
+
+GO
\ No newline at end of file
diff --git a/ONPRC_EHR_ComplianceDB/resources/schemas/onprc_ehr_compliancedb.xml b/ONPRC_EHR_ComplianceDB/resources/schemas/onprc_ehr_compliancedb.xml
new file mode 100644
index 000000000..3e14b18cc
--- /dev/null
+++ b/ONPRC_EHR_ComplianceDB/resources/schemas/onprc_ehr_compliancedb.xml
@@ -0,0 +1,161 @@
+
+
+ DETAILED
+
+ SciShield Data
+ rowid
+
+
+ true
+ true
+ Key
+
+
+ Employee Id
+
+ ehr_compliancedb
+ employees
+ employeeid
+
+
+
+ Requirement Name
+
+ ehr_compliancedb
+ requirements
+ requirementname
+
+
+
+ Date
+
+
+ false
+ true
+
+ core
+ containers
+ entityid
+
+
+
+ Comments
+
+
+ false
+ true
+ true
+
+
+ false
+ true
+ true
+
+
+ false
+ true
+ true
+
+
+ false
+ true
+ true
+
+
+ Processed
+
+
+
+
+
+ DETAILED
+
+ SciShield Reference Data
+ rowid
+
+
+ true
+ true
+ Key
+
+
+ Label
+
+
+ Value
+ true
+
+
+ Column Name
+
+
+ container
+
+
+ Created
+
+
+ Created by
+
+
+ Modified
+
+
+ Created by
+
+
+ Sort Order
+
+
+ End Date
+
+
+
+
+ Scishield Temp
+
+ DETAILED
+
+
+ Search ID
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Scishield Master Temp
+
+ DETAILED
+
+
+ Search ID
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/ONPRC_EHR_ComplianceDB/resources/views/begin.html b/ONPRC_EHR_ComplianceDB/resources/views/begin.html
index 48d834f75..f09495534 100644
--- a/ONPRC_EHR_ComplianceDB/resources/views/begin.html
+++ b/ONPRC_EHR_ComplianceDB/resources/views/begin.html
@@ -81,6 +81,8 @@
name: 'Requirements Per Essential Form', url: LABKEY.ActionURL.buildURL('ehr','dataEntryForm', '/ONPRC/Admin/Compliance',{formType: 'employeecategoryrecords'})
},{
name: 'Edit form with Task ID', url: LABKEY.ActionURL.buildURL('ONPRC_EHR_ComplianceDB', 'enterData.view',(ctx ? ctx['EmployeeContainer'] : null), null)
+ },{
+ name: 'SciShield input form',url: '<%=contextPath%>/query' + container + '/executeQuery.view?schemaName=onprc_ehr_compliancedb&query.queryName=SciShield_Data'
}]
},{
diff --git a/ONPRC_EHR_ComplianceDB/src/org/labkey/ONPRCEHR_ComplianceDB/ONPRC_EHR_ComplianceDBModule.java b/ONPRC_EHR_ComplianceDB/src/org/labkey/ONPRCEHR_ComplianceDB/ONPRC_EHR_ComplianceDBModule.java
index f111973ea..1bcde4100 100644
--- a/ONPRC_EHR_ComplianceDB/src/org/labkey/ONPRCEHR_ComplianceDB/ONPRC_EHR_ComplianceDBModule.java
+++ b/ONPRC_EHR_ComplianceDB/src/org/labkey/ONPRCEHR_ComplianceDB/ONPRC_EHR_ComplianceDBModule.java
@@ -15,22 +15,28 @@
*/
package org.labkey.ONPRCEHR_ComplianceDB;
+import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
-import org.labkey.ONPRCEHR_ComplianceDB.security.ONPRC_ComplianceDBEntryPermission;
-import org.labkey.ONPRCEHR_ComplianceDB.security.ONPRC_ComplianceDBAdminPermission;
-import org.labkey.api.ldk.ExtendedSimpleModule;
-import org.labkey.api.ehr.EHRService;
-import org.labkey.api.ldk.LDKService;
-import org.labkey.api.ehr.dataentry.DefaultDataEntryFormFactory;
import org.labkey.ONPRCEHR_ComplianceDB.dataentry.EmployeeRequirementCategoryFormType;
import org.labkey.ONPRCEHR_ComplianceDB.dataentry.EmployeeRequirementUnitFormType;
-import org.labkey.ONPRCEHR_ComplianceDB.security.ONPRC_ComplianceDBRole;
+import org.labkey.ONPRCEHR_ComplianceDB.query.ONPRC_EHR_ComplianceDBUserSchema;
import org.labkey.ONPRCEHR_ComplianceDB.security.ONPRC_ComplianceDBAdminRole;
+import org.labkey.ONPRCEHR_ComplianceDB.security.ONPRC_ComplianceDBEntryPermission;
+import org.labkey.ONPRCEHR_ComplianceDB.security.ONPRC_ComplianceDBRole;
+import org.labkey.api.ehr.EHRService;
+import org.labkey.api.ehr.dataentry.DefaultDataEntryFormFactory;
+import org.labkey.api.ldk.ExtendedSimpleModule;
import org.labkey.api.ldk.buttons.ShowEditUIButton;
+import org.labkey.api.module.Module;
import org.labkey.api.module.ModuleContext;
+import org.labkey.api.query.DefaultSchema;
+import org.labkey.api.query.QuerySchema;
import org.labkey.api.security.roles.RoleManager;
import org.labkey.api.view.template.ClientDependency;
+import java.util.Collection;
+import java.util.Collections;
+
//Created: 11-24-2020 R.Blasa
@@ -49,13 +55,32 @@ public String getName()
@Override
public Double getSchemaVersion()
{
- return null;
+ return 24.002;
+ }
+
+ @Override
+ public @NotNull Collection getSchemaNames()
+ {
+ return Collections.singleton(ONPRC_EHR_ComplianceDBSchema.NAME);
}
@Override
public boolean hasScripts()
{
- return false;
+ return true;
+ }
+
+ @Override
+ protected void registerSchemas()
+ {
+ DefaultSchema.registerProvider(ONPRC_EHR_ComplianceDBSchema.NAME, new DefaultSchema.SchemaProvider(this)
+ {
+ @Override
+ public @Nullable QuerySchema createSchema(final DefaultSchema schema, Module module)
+ {
+ return new ONPRC_EHR_ComplianceDBUserSchema(schema.getUser(), schema.getContainer());
+ }
+ });
}
protected void init()
diff --git a/ONPRC_EHR_ComplianceDB/src/org/labkey/ONPRCEHR_ComplianceDB/ONPRC_EHR_ComplianceDBSchema.java b/ONPRC_EHR_ComplianceDB/src/org/labkey/ONPRCEHR_ComplianceDB/ONPRC_EHR_ComplianceDBSchema.java
new file mode 100644
index 000000000..4f6885b45
--- /dev/null
+++ b/ONPRC_EHR_ComplianceDB/src/org/labkey/ONPRCEHR_ComplianceDB/ONPRC_EHR_ComplianceDBSchema.java
@@ -0,0 +1,52 @@
+/*
+ * Copyright (c) 2013 LabKey Corporation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.labkey.ONPRCEHR_ComplianceDB;
+
+import org.labkey.api.data.DbSchema;
+import org.labkey.api.data.dialect.SqlDialect;
+
+public class ONPRC_EHR_ComplianceDBSchema
+{
+ public static final String NAME = "onprc_ehr_complianceDB";
+
+ private static final ONPRC_EHR_ComplianceDBSchema _instance = new ONPRC_EHR_ComplianceDBSchema();
+
+ public static final String TABLE_SCISHIELD_DATA = "SciShield_Data";
+ public static final String TABLE_SCISHIELD_REFERENCE_DATA = "SciShield_Reference_Data";
+
+ public static ONPRC_EHR_ComplianceDBSchema getInstance()
+ {
+ return _instance;
+ }
+
+ private ONPRC_EHR_ComplianceDBSchema()
+ {
+ // private constructor to prevent instantiation from
+ // outside this class: this singleton should only be
+ // accessed via org.labkey.ONPRCEHR_ComplianceDB.ONPRC_EHR_ComplianceDBSchema.getInstance()
+ }
+
+ public DbSchema getSchema()
+ {
+ return DbSchema.get(NAME);
+ }
+
+ public SqlDialect getSqlDialect()
+ {
+ return getSchema().getSqlDialect();
+ }
+}
diff --git a/ONPRC_EHR_ComplianceDB/src/org/labkey/ONPRCEHR_ComplianceDB/query/ONPRC_EHR_ComplianceDBUserSchema.java b/ONPRC_EHR_ComplianceDB/src/org/labkey/ONPRCEHR_ComplianceDB/query/ONPRC_EHR_ComplianceDBUserSchema.java
new file mode 100644
index 000000000..7ba0c58d9
--- /dev/null
+++ b/ONPRC_EHR_ComplianceDB/src/org/labkey/ONPRCEHR_ComplianceDB/query/ONPRC_EHR_ComplianceDBUserSchema.java
@@ -0,0 +1,26 @@
+package org.labkey.ONPRCEHR_ComplianceDB.query;
+
+import org.labkey.ONPRCEHR_ComplianceDB.ONPRC_EHR_ComplianceDBSchema;
+import org.labkey.api.data.Container;
+import org.labkey.api.data.DbSchema;
+import org.labkey.api.query.SimpleUserSchema;
+import org.labkey.api.security.User;
+import org.labkey.api.security.permissions.ReadPermission;
+
+public class ONPRC_EHR_ComplianceDBUserSchema extends SimpleUserSchema
+{
+ public ONPRC_EHR_ComplianceDBUserSchema(User user, Container container)
+ {
+ super(ONPRC_EHR_ComplianceDBSchema.NAME, null, user, container, DbSchema.get(ONPRC_EHR_ComplianceDBSchema.NAME));
+ }
+
+ @Override
+ public boolean canReadSchema()
+ {
+ User user = getUser();
+ if (user == null)
+ return false;
+
+ return getContainer().hasPermission(user, ReadPermission.class);
+ }
+}
diff --git a/onprc_ehr/resources/web/onprc_ehr/panel/AnimalDetailsPanel.js b/onprc_ehr/resources/web/onprc_ehr/panel/AnimalDetailsPanel.js
index bfdfb287e..61a10ac65 100644
--- a/onprc_ehr/resources/web/onprc_ehr/panel/AnimalDetailsPanel.js
+++ b/onprc_ehr/resources/web/onprc_ehr/panel/AnimalDetailsPanel.js
@@ -85,7 +85,7 @@ Ext4.define('ONPRC_EHR.panel.AnimalDetailsPanel', {
},
items: [{
xtype: 'container',
- width: 380,
+ width: 780, //Modified width 2-15-2024 R. Blasa
defaults: {
xtype: 'displayfield',
labelWidth: this.defaultLabelWidth
@@ -115,6 +115,11 @@ Ext4.define('ONPRC_EHR.panel.AnimalDetailsPanel', {
},{
fieldLabel: 'Projects / Groups',
name: 'assignmentsAndGroups'
+ },{
+ // Added: 2-29-2024 R. Blasa
+ xtype: 'ehr-snapshotchildpanel',
+ headerLabel: 'Sustained Release Medication',
+ name: 'sdrug'
}]
},{
xtype: 'container',
diff --git a/onprc_ehr/src/org/labkey/onprc_ehr/dataentry/AnimalDetailssFormSection.java b/onprc_ehr/src/org/labkey/onprc_ehr/dataentry/AnimalDetailsFormSection.java
similarity index 90%
rename from onprc_ehr/src/org/labkey/onprc_ehr/dataentry/AnimalDetailssFormSection.java
rename to onprc_ehr/src/org/labkey/onprc_ehr/dataentry/AnimalDetailsFormSection.java
index 5492e7137..f92ae6abb 100644
--- a/onprc_ehr/src/org/labkey/onprc_ehr/dataentry/AnimalDetailssFormSection.java
+++ b/onprc_ehr/src/org/labkey/onprc_ehr/dataentry/AnimalDetailsFormSection.java
@@ -20,9 +20,9 @@
//Created:12-20-2018 R.Blasa
-public class AnimalDetailssFormSection extends NonStoreFormSection
+public class AnimalDetailsFormSection extends NonStoreFormSection
{
- public AnimalDetailssFormSection()
+ public AnimalDetailsFormSection()
{
super("AnimalDetails", "Animal Details", "onprc_ehr-animaldetailspanels");
addClientDependency(ClientDependency.supplierFromPath("onprc_ehr/panel/AnimalDetailsPanel.js"));
diff --git a/onprc_ehr/src/org/labkey/onprc_ehr/dataentry/AuxProcedureFormType.java b/onprc_ehr/src/org/labkey/onprc_ehr/dataentry/AuxProcedureFormType.java
index 18706265f..ac4d5effa 100644
--- a/onprc_ehr/src/org/labkey/onprc_ehr/dataentry/AuxProcedureFormType.java
+++ b/onprc_ehr/src/org/labkey/onprc_ehr/dataentry/AuxProcedureFormType.java
@@ -15,7 +15,7 @@
*/
package org.labkey.onprc_ehr.dataentry;
-import org.labkey.api.ehr.dataentry.AnimalDetailsFormSection;
+import org.labkey.onprc_ehr.dataentry.AnimalDetailsFormSection;
import org.labkey.api.ehr.dataentry.BloodDrawFormSection;
import org.labkey.api.ehr.dataentry.DataEntryFormContext;
import org.labkey.api.ehr.dataentry.FormSection;
diff --git a/onprc_ehr/src/org/labkey/onprc_ehr/dataentry/BulkClinicalEntryFormType.java b/onprc_ehr/src/org/labkey/onprc_ehr/dataentry/BulkClinicalEntryFormType.java
index 942abef1f..708e2c4e1 100644
--- a/onprc_ehr/src/org/labkey/onprc_ehr/dataentry/BulkClinicalEntryFormType.java
+++ b/onprc_ehr/src/org/labkey/onprc_ehr/dataentry/BulkClinicalEntryFormType.java
@@ -16,7 +16,7 @@
package org.labkey.onprc_ehr.dataentry;
import org.labkey.api.ehr.EHRService;
-import org.labkey.api.ehr.dataentry.AnimalDetailsFormSection;
+import org.labkey.onprc_ehr.dataentry.AnimalDetailsFormSection;
import org.labkey.api.ehr.dataentry.DataEntryFormContext;
import org.labkey.api.ehr.dataentry.FormSection;
import org.labkey.api.ehr.dataentry.SimpleGridPanel;
diff --git a/onprc_ehr/src/org/labkey/onprc_ehr/dataentry/NecropsyFormType.java b/onprc_ehr/src/org/labkey/onprc_ehr/dataentry/NecropsyFormType.java
index a9ac07c51..20363e527 100644
--- a/onprc_ehr/src/org/labkey/onprc_ehr/dataentry/NecropsyFormType.java
+++ b/onprc_ehr/src/org/labkey/onprc_ehr/dataentry/NecropsyFormType.java
@@ -51,7 +51,7 @@ public NecropsyFormType(DataEntryFormContext ctx, Module owner)
new NecropsyInstructionFormSection(), //Added: 12-21-2021 R.Blasa
new ClinicalEncountersFormPanelSection("Necropsy"),
//Modified: 12-20-2018 R.Blasa
- new AnimalDetailssFormSection(),
+ new AnimalDetailsFormSection(),
new GrossFindingsFormPanelSection(),
new PathologyFormSection("ehr", "encounter_participants", "Staff"),
new PathologyNotesFormPanelSection(),
diff --git a/onprc_ehr/src/org/labkey/onprc_ehr/dataentry/TreatmentsFormType.java b/onprc_ehr/src/org/labkey/onprc_ehr/dataentry/TreatmentsFormType.java
index 8b6319e44..cdc571d15 100644
--- a/onprc_ehr/src/org/labkey/onprc_ehr/dataentry/TreatmentsFormType.java
+++ b/onprc_ehr/src/org/labkey/onprc_ehr/dataentry/TreatmentsFormType.java
@@ -16,7 +16,7 @@
package org.labkey.onprc_ehr.dataentry;
import org.labkey.api.ehr.EHRService;
-import org.labkey.api.ehr.dataentry.AnimalDetailsFormSection;
+import org.labkey.onprc_ehr.dataentry.AnimalDetailsFormSection;
import org.labkey.api.ehr.dataentry.DataEntryFormContext;
import org.labkey.api.ehr.dataentry.FormSection;
import org.labkey.api.ehr.dataentry.TaskForm;