MOdified pairing observation xtype controls.

Author: Ohsudev

onprc_ehr/resources/queries/study/Pairings.query.xml

@@ -40,11 +40,11 @@
                      <column columnName="housingtype">
                         <isHidden>false</isHidden>
                         <columnTitle>Prior Group Housing</columnTitle>
-                        <fk>
-                            <fkDbSchema>ehr_lookups</fkDbSchema>
-                            <fkTable>housingTypes</fkTable>
-                            <fkColumnName>value</fkColumnName>
-                        </fk>
+                         <fk>
+                             <fkDbSchema>ehr_lookups</fkDbSchema>
+                             <fkTable>pairingpriorgroups</fkTable>
+                             <fkColumnName>value</fkColumnName>
+                         </fk>
                     </column>
 
                     <column columnName="remark">
@@ -103,6 +103,7 @@
                         <isHidden>false</isHidden>
                         <columnTitle>Other Infant</columnTitle>
                     </column>
+
                     <column columnName="remark2">
                         <columnTitle>End Remark</columnTitle>
                         <displayWidth>300</displayWidth>

onprc_ehr/resources/web/onprc_ehr/model/sources/Pairing_Properties.js

@@ -86,7 +86,6 @@ EHR.model.DataModelManager.registerMetadata('Pairing_Properties', {
                         LABKEY.Filter.create('date_disabled', null, LABKEY.Filter.Types.ISBLANK)
                     ]
                 }
-
             },
             remark2: {
                     xtype: 'textareafield',
@@ -100,6 +99,12 @@ EHR.model.DataModelManager.registerMetadata('Pairing_Properties', {
                     width: 130
                 }
               },
+            prior_group_housing: {
+                allowBlank: false,
+                columnConfig: {
+                    width: 100
+                }
+            },
             remark: {
                 columnConfig: {
                     width: 100