diff --git a/snprc_ehr/resources/queries/snprc_ehr/HL7UnknownPivot.sql b/snprc_ehr/resources/queries/snprc_ehr/HL7UnknownPivot.sql
index 9958bb49c..c557fc0fb 100644
--- a/snprc_ehr/resources/queries/snprc_ehr/HL7UnknownPivot.sql
+++ b/snprc_ehr/resources/queries/snprc_ehr/HL7UnknownPivot.sql
@@ -1,6 +1,7 @@
SELECT
obr.ANIMAL_ID as id,
obr.OBSERVATION_DATE_TM as date,
+ obr.ANIMAL_ID || '-' || CAST(obr.OBSERVATION_DATE_TM AS VARCHAR) as key,
obr.MESSAGE_ID,
COALESCE (lp.ServiceId.ServiceName, obr.PROCEDURE_NAME) as PROCEDURE_NAME,
obr.PROCEDURE_ID,
diff --git a/snprc_ehr/resources/queries/snprc_ehr/HL7Urinalysis.query.xml b/snprc_ehr/resources/queries/snprc_ehr/HL7Urinalysis.query.xml
index 5e01645b2..5eeff14fc 100644
--- a/snprc_ehr/resources/queries/snprc_ehr/HL7Urinalysis.query.xml
+++ b/snprc_ehr/resources/queries/snprc_ehr/HL7Urinalysis.query.xml
@@ -2,7 +2,14 @@
+ Urinalysis Pivot
+
+
+ true
+ true
+
+
diff --git a/snprc_ehr/resources/queries/snprc_ehr/HL7UrinalysisPivot.sql b/snprc_ehr/resources/queries/snprc_ehr/HL7UrinalysisPivot.sql
index 1ddf9af4f..0f20e91db 100644
--- a/snprc_ehr/resources/queries/snprc_ehr/HL7UrinalysisPivot.sql
+++ b/snprc_ehr/resources/queries/snprc_ehr/HL7UrinalysisPivot.sql
@@ -1,6 +1,7 @@
SELECT
obr.ANIMAL_ID as id,
obr.OBSERVATION_DATE_TM as date,
+ obr.ANIMAL_ID || '-' || CAST(obr.OBSERVATION_DATE_TM AS VARCHAR) as key,
obr.MESSAGE_ID,
COALESCE (lp.ServiceId.ServiceName, obr.PROCEDURE_NAME) as PROCEDURE_NAME,
obr.PROCEDURE_ID,
diff --git a/snprc_ehr/resources/queries/snprc_ehr/MhcDataPivot.sql b/snprc_ehr/resources/queries/snprc_ehr/MhcDataPivot.sql
index b724529c4..f0f3165c0 100644
--- a/snprc_ehr/resources/queries/snprc_ehr/MhcDataPivot.sql
+++ b/snprc_ehr/resources/queries/snprc_ehr/MhcDataPivot.sql
@@ -1,11 +1,12 @@
SELECT
b.Id,
+ b.modified,
b.Haplotype,
b.Ocid,
b.DataFileSource,
- b.modified,
group_concat(b.MhcValue) as MhcValue
+
FROM (
SELECT
b.Id,
@@ -13,13 +14,13 @@ FROM (
b.Ocid,
b.MhcValue,
b.DataFileSource,
- b.Modified
+ cast(b.modified as varchar) as modified
FROM snprc_ehr.MhcData as b
- ) as b
+ ) as b
GROUP BY b.id, b.ocid, b.DataFileSource, b.haplotype, b.modified
-PIVOT MhcValue BY Haplotype IN
-(select distinct Haplotype from snprc_ehr.MhcData order by Haplotype
-
-)
+ PIVOT MhcValue BY Haplotype IN
+(
+ select distinct Haplotype from snprc_ehr.MhcData order by Haplotype
+)
\ No newline at end of file
diff --git a/snprc_ehr/resources/queries/study/BrowseDataSets.sql b/snprc_ehr/resources/queries/study/BrowseDataSets.sql
index aab30e6fa..9b2b44a5e 100644
--- a/snprc_ehr/resources/queries/study/BrowseDataSets.sql
+++ b/snprc_ehr/resources/queries/study/BrowseDataSets.sql
@@ -68,3 +68,5 @@ UNION
select 'ehr' as schema, 'Colony Management' as CategoryId,'Kinship' as Label, 'kinship' as Name, true as ShowByDefault, true as isAnimal
UNION
select 'ehr' as schema, 'Colony Management' as CategoryId,'Project' as Label, 'project' as Name, true as ShowByDefault, false as isAnimal
+UNION
+select 'study' as schema, 'Colony Management' as CategoryId,'Offspring' as Label, 'demographicsOffspring' as Name, true as ShowByDefault, true as isAnimal
diff --git a/snprc_ehr/resources/queries/study/demographicsEarliestHousing.sql b/snprc_ehr/resources/queries/study/demographicsEarliestHousing.sql
new file mode 100644
index 000000000..3480516d6
--- /dev/null
+++ b/snprc_ehr/resources/queries/study/demographicsEarliestHousing.sql
@@ -0,0 +1,17 @@
+/*
+ * Copyright (c) 2017-2018 LabKey Corporation
+ *
+ * Licensed under the Apache License, Version 2.0: http://www.apache.org/licenses/LICENSE-2.0
+ */
+SELECT
+ d.Id AS Id,
+ h.date as FirstHousingDate,
+ h.room as FirstHousingRoom,
+ h.room.area.description as FirstHousingRoomDescription
+FROM study.demographics d
+
+
+--date of first housing
+LEFT JOIN study.housing as h on h.id = d.id and h.qcstate.publicdata = true
+ and h.date = (select min(c1.date) from study.housing as c1
+ where h.id = c1.id)
diff --git a/snprc_ehr/resources/referenceStudy/study/datasets/datasets_metadata.xml b/snprc_ehr/resources/referenceStudy/study/datasets/datasets_metadata.xml
index 40dadbc39..806d12694 100644
--- a/snprc_ehr/resources/referenceStudy/study/datasets/datasets_metadata.xml
+++ b/snprc_ehr/resources/referenceStudy/study/datasets/datasets_metadata.xml
@@ -394,6 +394,11 @@
varchar
+
+
+ caseid
+
+ Cases
@@ -1498,6 +1503,7 @@
varcharfalseSpecies code (3 char)
+ 10integer
diff --git a/snprc_ehr/resources/schemas/dbscripts/sqlserver/snprc_ehr-25.000-25.001.sql b/snprc_ehr/resources/schemas/dbscripts/sqlserver/snprc_ehr-25.000-25.001.sql
new file mode 100644
index 000000000..a198a3c9a
--- /dev/null
+++ b/snprc_ehr/resources/schemas/dbscripts/sqlserver/snprc_ehr-25.000-25.001.sql
@@ -0,0 +1,27 @@
+EXEC core.fn_dropifexists @objname = 'SndSuperPackageStaging', @objschema = 'snprc_ehr', @objtype = 'TABLE';
+
+CREATE TABLE snprc_ehr.SndSuperPackageStaging
+(
+ TopLevelPkgId INTEGER NOT NULL,
+ SuperPkgId INTEGER NOT NULL,
+ ParentSuperPkgId INTEGER NULL,
+ PkgId INTEGER NOT NULL,
+ TreePath VARCHAR(800) NOT NULL,
+ SuperPkgPath VARCHAR(MAX) NOT NULL,
+ SortOrder INTEGER NULL,
+ Required INTEGER NULL,
+ Description VARCHAR(MAX) NOT NULL,
+ Narrative VARCHAR(MAX) NOT NULL,
+ Active INTEGER NOT NULL,
+ Repeatable INTEGER NOT NULL,
+ Level INTEGER NOT NULL,
+ Created DATETIME NOT NULL,
+ CreatedBy USERID NOT NULL,
+ Modified DATETIME NOT NULL,
+ ModifiedBy USERID NOT NULL,
+ diModified DATETIME NOT NULL,
+ ObjectId UNIQUEIDENTIFIER NOT NULL
+
+ CONSTRAINT PK_SndSuperPackageStaging PRIMARY KEY CLUSTERED ( TopLevelPkgId, SuperPkgId, TreePath)
+);
+GO
\ No newline at end of file
diff --git a/snprc_ehr/resources/schemas/snprc_ehr.xml b/snprc_ehr/resources/schemas/snprc_ehr.xml
index 2c0946f64..7543d168a 100644
--- a/snprc_ehr/resources/schemas/snprc_ehr.xml
+++ b/snprc_ehr/resources/schemas/snprc_ehr.xml
@@ -2374,7 +2374,7 @@
+
)
}
-export {MyCustomHeader};
+export { MyCustomHeader };
class TimelineGrid extends React.Component {
@@ -72,6 +55,8 @@ class TimelineGrid extends React.Component {
constructor(props) {
super(props);
+ this.timelineProcNoteRef = React.createRef();
+ this.dataGridRef = React.createRef();
this.state = this.getInitState();
this.state.columns = this.getColumns(props.selectedProject);
}
@@ -98,19 +83,83 @@ class TimelineGrid extends React.Component {
return Math.random();
};
+ isScheduleDateWithinRange = (row) => {
+ // If the feature is disabled, all rows are considered within range
+ if (!ENABLE_OUT_OF_RANGE_ROW_DISABLE) {
+ return true;
+ }
+
+ const { selectedTimeline } = this.props;
+
+ // First row (header) is always considered within range
+ if (row.RowIdx === 0) {
+ return true;
+ }
+
+ // If no schedule date, consider it within range
+ if (!row.ScheduleDate) {
+ return true;
+ }
+
+ // If no timeline or no start/end dates, consider it within range
+ if (!selectedTimeline || (!selectedTimeline.StartDate && !selectedTimeline.EndDate)) {
+ return true;
+ }
+
+ // Strip time from ScheduleDate before converting to a date. This is kind of a hack but we're storing
+ // timeline start and end dates as date type and scheduled date as datetime, which causes different timezone
+ // corrections in Date conversion.
+ const scheduleDateStr = row.ScheduleDate.toString().split(' ')[0];
+ const scheduleDate = new Date(scheduleDateStr);
+
+ if (selectedTimeline.StartDate) {
+ const startDate = new Date(selectedTimeline.StartDate);
+ if (scheduleDate < startDate) {
+ return false;
+ }
+ }
+
+ if (selectedTimeline.EndDate) {
+ const endDate = new Date(selectedTimeline.EndDate);
+ if (scheduleDate > endDate) {
+ return false;
+ }
+ }
+
+ return true;
+ };
+
CheckBoxFormatter = (colKey) => {
return ((props) => {
const { selectedTimeline } = this.props;
+ if (!selectedTimeline) {
+ return ;
+ }
if (props.row.RowIdx === 0 && selectedTimeline) {
const projItem = selectedTimeline.TimelineProjectItems.find((item) => item.ProjectItemId === colKey);
return