MOdified pairing observation xtype controls.

Author: Ohsudev

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

@@ -24,6 +24,14 @@
                     <column columnName="cage">
                         <columnTitle>Cage</columnTitle>
                     </column>
+                    <column columnName="other_IDs">
+                        <isHidden>false</isHidden>
+                        <columnTitle>Other ID</columnTitle>
+                    </column>
+                    <column columnName="other_infant">
+                        <isHidden>false</isHidden>
+                        <columnTitle>Other Infant</columnTitle>
+                    </column>
                     <column columnName="date">
                         <columnTitle>Start Date</columnTitle>
                     </column>
@@ -98,22 +106,20 @@
                             <fkColumnName>value</fkColumnName>
                         </fk>
                     </column>
-                    <column columnName="other_infant">
-                        <isHidden>false</isHidden>
-                        <columnTitle>Other Infant</columnTitle>
-                    </column>
 
-                    <column columnName="remark2">
+                    <column columnName="duration">
+                        <columnTitle>Duration</columnTitle>
+                    </column>                    <column columnName="remark2">
                         <columnTitle>End Remark</columnTitle>
                         <displayWidth>300</displayWidth>
                     </column>
 
-
                     <column columnName="pairid">
                         <columnTitle>Pair ID</columnTitle>
                         <isHidden>true</isHidden>
                         <description>This field is used to differentiate pairs.  By convention is should usually be the lowest cage number in the group; however, it does not need to match this</description>
                     </column>
+
                     <column columnName="performedby">
                         <columnTitle>Performed By</columnTitle>
                     </column>

onprc_ehr/resources/web/onprc_ehr/form/field/InfantEntryField.js

@@ -0,0 +1,82 @@
+/*
+ * Copyright (c) 2013-2019 LabKey Corporation
+ *
+ * Licensed under the Apache License, Version 2.0: http://www.apache.org/licenses/LICENSE-2.0
+ */
+/**
+ * @cfg idFieldIndex The name of the field holding the Animal ID
+ */
+Ext4.define('ONPRC_EHR.form.field.InfantEntryField', {
+    extend: 'LABKEY.ext4.ComboBox',
+    alias: 'widget.onprc_ehr-infantentryfield',
+
+    // caseSensitive: false,
+    // anyMatch: true,
+    // displayField: 'InfantCageMate',
+    // forceSelection: true,
+    //
+    // idFieldIndex: 'Id',
+    // cageFieldIndex: null,
+
+    trigger1Cls: 'x4-form-search-trigger',
+
+    initComponent: function(){
+        this.callParent(arguments);
+    },
+
+    onTrigger1Click: function(){
+        var rec = EHR.DataEntryUtils.getBoundRecord(this);
+        if (!rec){
+            Ext4.Msg.alert('Error', 'Unable to locate associated animal Id');
+            return;
+        }
+        // var id = rec.get(this.idFieldIndex);
+
+        if (!rec || !rec.get('Id')){
+            Ext4.Msg.alert('Error', 'No Id Entered');
+            return;
+        }
+
+        Ext4.Msg.wait('Loading...');
+        // this.showTextArea();
+
+        this.queryValue(rec, function(ret){
+            Ext4.Msg.hide();
+
+            if (ret && ret.InfantCageMate){
+                this.setValue(ret.InfantCageMate);
+                // this.linkEl.update('Refresh Hx');
+            }
+        }, true);
+    },
+
+    queryValue: function(rec, cb, alwaysUseCallback){
+        var date = rec.get('date') || new Date();
+        var id = rec.get('Id');
+        // this.pendingIdRequest = id;
+        LABKEY.Query.selectRows({
+            schemaName: 'study',
+            queryName: 'CageMateInfant',
+            columns: 'Id,InfantCageMate',
+            filterArray: [
+                LABKEY.Filter.create('Id', rec.get('Id'), LABKEY.Filter.Types.EQUAL)
+            ],
+            failure: LDK.Utils.getErrorCallback(),
+            scope: this,
+            success: function(results){
+                if (!alwaysUseCallback && id != this.pendingIdRequest){
+                    console.log('more recent request, aborting');
+                    return;
+                }
+
+                if (results && results.rows && results.rows.length){
+                    cb.call(this, results.rows[0], results.rows[0].Id);
+                }
+                else {
+                    cb.call(this, null, id);
+                }
+            }
+        });
+    }
+
+});

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

@@ -32,7 +32,7 @@ EHR.model.DataModelManager.registerMetadata('Pairing_Properties', {
                     defaultSubset: 'PairingStarttype'
                 },
                 columnConfig: {
-                    width: 150
+                    width: 200
                 }
             },
 
@@ -56,7 +56,7 @@ EHR.model.DataModelManager.registerMetadata('Pairing_Properties', {
                     defaultSubset: 'PairingEndtype'
                 },
                 columnConfig: {
-                    width: 150
+                    width: 200
                 }
             },
 
@@ -87,28 +87,53 @@ EHR.model.DataModelManager.registerMetadata('Pairing_Properties', {
                     ]
                 }
             },
-            remark2: {
+            other_IDs: {
                     xtype: 'textareafield',
+                    header:'Other ID',
                     columnConfig: {
-                    width: 150
+                    width: 200
                     }
                 },
+            remark2: {
+                xtype: 'textareafield',
+                columnConfig: {
+                    width: 200
+                }
+            },
             room: {
                 allowBlank: false,
                 columnConfig: {
                     width: 130
                 }
               },
             prior_group_housing: {
-                allowBlank: false,
+                allowBlank: true,
                 columnConfig: {
                     width: 100
                 }
             },
-            remark: {
+            duration: {
+                allowBlank:true,
                 columnConfig: {
                     width: 100
                 }
+            },
+            other_infant: {
+                xtype: 'onprc_ehr-infantentryfield',
+                // editorConfig: {
+                //     idFieldIndex: 'Id',
+                //     cageFieldIndex: 'other_infant'
+                // },
+                columnConfig: {
+                    width: 160,
+                    showLink: false
+                }
+            },
+            remark: {
+                xtype: 'textareafield',
+                columnConfig: {
+                    width: 200
+                }
              }
 
           }