Skip to content

Commit 6129354

Browse files
LeviCameron1LeviCameron1
committed
Remove cage column switch in housing as this shouldn't be added yet
1 parent 43a3357 commit 6129354

7 files changed

Lines changed: 3 additions & 23 deletions

File tree

‎WNPRC_EHR/resources/queries/study/Housing.query.xml‎

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -28,20 +28,9 @@
2828
<columnTitle>Room</columnTitle>
2929
<url>/EHR/cageDetails.view?room=${room}&amp;</url>
3030
</column>
31-
<column columnName="cageOld">
32-
<!--<nullable>false</nullable>-->
33-
<columnTitle>Cage Old</columnTitle>
34-
<url>/EHR/cageDetails.view?room=${room}&amp;cage=${cageOld}&amp;</url>
35-
</column>
3631
<column columnName="cage">
3732
<!--<nullable>false</nullable>-->
3833
<columnTitle>Cage</columnTitle>
39-
<fk>
40-
<fkDbSchema>cageui</fkDbSchema>
41-
<fkTable>cages</fkTable>
42-
<fkColumnName>objectid</fkColumnName>
43-
<fkDisplayColumnName>cage_number</fkDisplayColumnName>
44-
</fk>
4534
<url>/EHR/cageDetails.view?room=${room}&amp;cage=${cage}&amp;</url>
4635
</column>
4736
<column columnName="cond">

‎WNPRC_EHR/resources/queries/study/Housing/.qview.xml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
<column name="enddate"/>
66
<column name="room"/>
77
<column name="cage"/>
8-
<column name="cageOld"/>
98
<column name="cond"/>
109
<column name="reason"/>
1110
<!--<column name="isTemp"/>-->

‎WNPRC_EHR/resources/queries/study/Housing/Active Housing.qview.xml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
<column name="enddate"/>
66
<column name="room"/>
77
<column name="cage"/>
8-
<column name="cageOld"/>
98
<column name="cond"/>
109
<column name="reason"/>
1110
<column name="duration">

‎WNPRC_EHR/resources/queries/study/Housing/Current Housing Plus Weight.qview.xml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
<column name="enddate"/>
66
<column name="room"/>
77
<column name="cage"/>
8-
<column name="cageOld"/>
98
<column name="cond"/>
109
<column name="reason"/>
1110
<!--<column name="isTemp"/>-->

‎WNPRC_EHR/resources/referenceStudy/study/datasets/datasets_metadata.xml‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12743,17 +12743,14 @@
1274312743
</fk>
1274412744
<scale>0</scale>
1274512745
</column>
12746-
<column columnName="cageOld">
12746+
<column columnName="cage">
1274712747
<datatype>varchar</datatype>
12748-
<columnTitle>Cage Old</columnTitle>
12748+
<columnTitle>Cage</columnTitle>
1274912749
<rangeURI>http://www.w3.org/2001/XMLSchema#string</rangeURI>
1275012750
<url replaceMissing="blankValue"><![CDATA[/EHR/cageDetails.view?room=${room}&cage=${cage}&]]></url>
1275112751
<facetingBehavior>ALWAYS_OFF</facetingBehavior>
1275212752
<scale>0</scale>
1275312753
</column>
12754-
<column columnName="cage">
12755-
<datatype>varchar</datatype>
12756-
</column>
1275712754
<column columnName="cond">
1275812755
<datatype>varchar</datatype>
1275912756
<columnTitle>Condition</columnTitle>

‎WNPRC_EHR/resources/web/ehr/metadata/Default.js‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -782,9 +782,6 @@ EHR.Metadata.registerMetadata('Default', {
782782
,cage: {
783783
allowBlank: false
784784
}
785-
,cageOld: {
786-
allowBlank: false
787-
}
788785
,cond: {
789786
allowBlank: false
790787
,shownInGrid: false

‎WNPRC_EHR/resources/web/ehr/metadata/Metadata.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -260,7 +260,7 @@ EHR.Metadata.Columns = {
260260
'Hematology Results': EHR.Metadata.topCols + ',testid,method,result,units,qualResult,performing_lab,' + EHR.Metadata.bottomCols,
261261
'Hematology Morphology': EHR.Metadata.topCols + ',morphology,score,performing_lab,' + EHR.Metadata.bottomCols,
262262
Histology: EHR.Metadata.topCols + ',slideNum,stain,tissue,qualifier,container_type,pathologist,trimdate,trimmed_by,trim_remarks,' + EHR.Metadata.bottomCols,
263-
'Housing': 'id,project,date,enddate,room,cage,cageOld,id/numroommates/cagemates,cond,reason,isTemp,' + EHR.Metadata.bottomCols,
263+
'Housing': 'id,project,date,enddate,room,cage,id/numroommates/cagemates,cond,reason,isTemp,' + EHR.Metadata.bottomCols,
264264
'Immunology Results': EHR.Metadata.topCols + ',testid,method,result,units,qualResult,performing_lab,' + EHR.Metadata.bottomCols,
265265
'Irregular Observations': 'id/curlocation/location,' + EHR.Metadata.topCols + ',feces,menses,other,tlocation,behavior,otherbehavior,other,breeding,' + EHR.Metadata.bottomCols,
266266
'Necropsy Diagnosis': EHR.Metadata.topCols + ',tissue,severity,duration,distribution,process,' + EHR.Metadata.bottomCols,

0 commit comments

Comments
 (0)