Skip to content

Commit e551197

Browse files
committed
Add MCC field for litter
1 parent 4e9bd3b commit e551197

5 files changed

Lines changed: 17 additions & 1 deletion

File tree

MccColony/resources/queries/study/demographics/.qview.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
<column name="Id/MostRecentWeight/MostRecentWeightGrams"/>
2727
<column name="Id/MostRecentWeight/MostRecentWeightDate"/>
2828
<column name="alternateIds"/>
29+
<column name="litterId"/>
2930
<column name="excludeFromCensus"/>
3031
<column name="Id/mostRecentObservations/availability::observation">
3132
<properties>

mcc/resources/queries/mcc/aggregatedDemographics.sql

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ SELECT
1919
WHEN d.calculated_status = 'Alive' AND (SELECT COUNT(f.flag.value) as total FROM "/data/Colonies/SNPRC/".study.flags f WHERE f.Id = d.Id AND f.isActive = true) > 0 THEN true
2020
ELSE false
2121
END as u24_status,
22+
d.litterId,
2223
d.Id.mostRecentDeparture.mostRecentDeparture,
2324
o.availability,
2425
o.current_housing_status,
@@ -67,6 +68,7 @@ SELECT
6768
WHEN d.calculated_status = 'Alive' AND (SELECT COUNT(f.flag.value) as total FROM "/data/Colonies/WNPRC/".study.flags f WHERE f.Id = d.Id AND f.isActive = true) > 0 THEN true
6869
ELSE false
6970
END as u24_status,
71+
d.litterId,
7072
d.Id.mostRecentDeparture.mostRecentDeparture,
7173
o.availability,
7274
o.current_housing_status,
@@ -112,6 +114,7 @@ SELECT
112114
d.objectid,
113115
d.calculated_status,
114116
d.u24_status,
117+
d.litterId,
115118
d.Id.mostRecentDeparture.mostRecentDeparture,
116119
o.availability,
117120
o.current_housing_status,
@@ -160,6 +163,7 @@ SELECT
160163
d.objectid,
161164
d.calculated_status,
162165
d.u24_status,
166+
d.litterId,
163167
d.Id.mostRecentDeparture.mostRecentDeparture,
164168
o.availability,
165169
o.current_housing_status,

mcc/resources/queries/study/demographics.query.xml

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<deleteUrl />
1010
<columns>
1111
<column columnName="Id">
12-
<url></url>
12+
<url />
1313
</column>
1414
<column columnName="date">
1515
<isHidden>true</isHidden>
@@ -121,6 +121,13 @@
121121
<column columnName="alternateIds">
122122
<columnTitle>Alternate IDs</columnTitle>
123123
</column>
124+
<column columnName="litterId">
125+
<columnTitle>Litter ID</columnTitle>
126+
<url>/query/executeQuery.view?schemaName=study&amp;
127+
query.queryName=Demographics&amp;
128+
query.litterId~eq=${litterId}
129+
</url>
130+
</column>
124131
<column columnName="remark">
125132

126133
</column>

mcc/resources/queries/study/demographics/.qview.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@
3636
<column name="usage_current"/>
3737
<column name="usage_future"/>
3838
<column name="date_of_observations"/>
39+
<column name="litterId"/>
3940
</columns>
4041
<sorts>
4142
<sort column="Id" descending="false"/>

mcc/resources/referenceStudy/study/datasets/datasets_metadata.xml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -685,6 +685,9 @@
685685
<column columnName="excludeFromCensus">
686686
<datatype>boolean</datatype>
687687
</column>
688+
<column columnName="litterId">
689+
<datatype>varchar</datatype>
690+
</column>
688691
</columns>
689692
<tableTitle>Demographics</tableTitle>
690693
</table>

0 commit comments

Comments
 (0)