Updated NewAnimalData for SourceInstitutionLocation (#352)

Added column for source Institution
04.05.2021
srr

Author: srouseTxbiomed

snprc_ehr/resources/queries/snprc_ehr/ExportNewAnimalData.sql

@@ -6,7 +6,11 @@
 
 
  srr 07.07.2020
-  Syncing with current table structure 02.02.21
+ Syncing with current table structure
+  srr 02.02.2021
+ Adding SourceInstitution column to hold source institution for
+  non-birth acquisitions.
+  srr 03.31.2021
  ********************************************************/
 
 SELECT
@@ -15,6 +19,7 @@ SELECT
     n.BirthCode as Bd_Status,
     n.AcquisitionType,
     n.AcqDate AS AcquisitionDate,
+    n.SourceInstitutionLocation,
     n.species,
     n.Gender,
     n.sire,

snprc_ehr/resources/schemas/dbscripts/sqlserver/snprc_ehr-21.000-21.001.sql

@@ -0,0 +1,57 @@
+/*******************************************************
+New table to load data from new animal wizard.
+  Data will be ETLed back down to animal database
+
+srr 01.28.2020
+
+  May not use all columns.
+  I defaulted to nvarchar(400) if unsure of datatype.
+  May need to change datatypes to match those in lookup tables.
+
+srr 03.09.2020 version 20.003
+  Changed to ints for values that have a dropdown.
+  No Real data, therefore dropping table and re-recreating.
+srr 06.08.2020 version 20.007
+  Added column for BirthCode.
+    1   DOB accurate
+    2   Month-Year accurate
+    3   Year accurate
+  No Real data, therefore dropping table and re-recreating.
+
+ srr 06.24.2020
+  Changed Diet, AnimalAccount and IACUC to strings
+ srr 04012021 version 21.000
+*******************************************************/
+
+EXEC core.fn_dropifexists 'NewAnimalData','snprc_ehr', 'TABLE';
+
+
+CREATE TABLE snprc_ehr.NewAnimalData
+(
+    Id                     nvarchar(32)     NOT NULL,
+    BirthDate              datetime         NULL,
+    BirthCode              int              NULL,
+    AcquisitionType        int              NULL,
+    AcqDate                datetime         NULL,
+    SourceInstitutionLocation   nvarchar(10) NULL,
+    Gender                 nvarchar(10)     NULL,
+    Sire                   nvarchar(32)     NULL,
+    Dam                    nvarchar(32)     NULL,
+    Species                nvarchar(3)      NULL,
+    Colony                 int              NULL,
+    AnimalAccount          nvarchar(16)     NULL,
+    OwnerInstitution       int              NULL,
+    ResponsibleInstitution int              NULL,
+    Room                   int              NULL,
+    Cage                   int              NULL,
+    Diet                   nvarchar(20)     NULL,
+    Pedigree               int              NULL,
+    IACUC                  nvarchar(200)    NULL,
+    Created                datetime         NULL,
+    CreatedBy              dbo.USERID       NULL,
+    Modified               datetime         NULL,
+    ModifiedBy             dbo.USERID       NULL,
+    Container              dbo.ENTITYID     NOT NULL,
+    objectid               uniqueidentifier NOT NULL,
+    CONSTRAINT PK_snprc_NEWANIMALDATA PRIMARY KEY (Id)
+);

snprc_ehr/resources/source_queries/create_CAMP_NewAnimalData.sql

@@ -31,6 +31,13 @@ EXEC('CREATE SCHEMA [TAC_src] AUTHORIZATION [DBO]');
 -- new schema
 DROP TABLE IF EXISTS TAC_src.NewAnimalData;
 
+/*****************************************************
+  Added SourceInstitutionLocation to hold
+  source location for non-birth acquisitions
+04.01.2021 srr
+  ******************************************************/
+
+
 CREATE TABLE TAC_src.NewAnimalData
 (
     tid INT IDENTITY,
@@ -39,6 +46,7 @@ CREATE TABLE TAC_src.NewAnimalData
     Bd_Status INT NULL,
     AcquisitionType INT NULL,
     AcquisitionDate DATETIME NULL, -- Start date for Data Tables
+    SourceInstitutionLocation VARCHAR(10) NULL, -- handle as room
     Gender CHAR(1) NULL,
     Sire VARCHAR(6) NULL,
     Dam VARCHAR(6) NULL,

snprc_ehr/src/org/labkey/snprc_ehr/SNPRC_EHRModule.java

@@ -119,7 +119,7 @@ public String getName()
     @Override
     public @Nullable Double getSchemaVersion()
     {
-        return 21.000;
+        return 21.001;
     }
 
     @Override