Improve MCC validation and remove some elements from snapshot panel

Author: bbimber

mcc/resources/web/mcc/panel/MccClinicalSnapshotPanel.js

@@ -0,0 +1,77 @@
+EHR.reports.clinicalHistoryPanelXtype = 'mcc-snapshotpanel';
+
+Ext4.define('MCC.panel.SnapshotPanel', {
+    extend: 'EHR.panel.SnapshotPanel',
+    alias: 'widget.mcc-snapshotpanel',
+
+    showLocationDuration: false,
+
+    minWidth: 800,
+
+    initComponent: function () {
+
+        this.defaultLabelWidth = 120;
+        this.callParent();
+    },
+
+    getBaseItems: function(){
+        return [{
+            xtype: 'container',
+            border: false,
+            defaults: {
+                border: false
+            },
+            items: [{
+                xtype: 'container',
+                html: '<b>Summary:</b><hr>'
+            },{
+                bodyStyle: 'padding-bottom: 20px;',
+                layout: 'column',
+                defaults: {
+                    border: false
+                },
+                items: [{
+                    xtype: 'container',
+                    columnWidth: 0.25,
+                    defaults: {
+                        labelWidth: this.defaultLabelWidth,
+                        style: 'margin-right: 20px;'
+                    },
+                    items: [{
+                        xtype: 'displayfield',
+                        fieldLabel: 'Status',
+                        name: 'calculated_status'
+                    },{
+                        xtype: 'displayfield',
+                        fieldLabel: 'Gender',
+                        name: 'gender'
+                    },{
+                        xtype: 'displayfield',
+                        fieldLabel: 'Species',
+                        name: 'species'
+                    }]
+                },{
+                    xtype: 'container',
+                    columnWidth: 0.25,
+                    defaults: {
+                        labelWidth: this.defaultLabelWidth,
+                        style: 'margin-right: 20px;'
+                    },
+                    items: [{
+                        xtype: 'displayfield',
+                        fieldLabel: 'Age',
+                        name: 'age'
+                    }, {
+                        xtype: 'displayfield',
+                        fieldLabel: 'Source',
+                        name: 'source'
+                    },{
+                        xtype: 'displayfield',
+                        fieldLabel: 'Weights',
+                        name: 'weights'
+                    }]
+                }]
+            }]
+        }];
+    }
+});

mcc/resources/web/mcc/panel/MccImportPanel.js

@@ -131,7 +131,8 @@ Ext4.define('MCC.panel.MccImportPanel', {
         expectInImport: true
     },{
         name: 'availability',
-        labels: ['Available to Transfer', 'available to transfer'],
+        // NOTE: availalble was a typo in one generation of the input templates:
+        labels: ['Available to Transfer', 'available to transfer', 'availalble to transfer'],
         allowRowSpan: false,
         allowBlank: true,
         transform: 'available',
@@ -348,6 +349,14 @@ Ext4.define('MCC.panel.MccImportPanel', {
                 row.errors.push('Suspicious weight value');
             }
 
+            return val;
+        },
+
+        alternateIds: function(val) {
+            if (val) {
+                val = val.split(/[ ]*[;,]+[ ]*/g).join(',')
+            }
+
             return val;
         }
     },
@@ -520,18 +529,26 @@ Ext4.define('MCC.panel.MccImportPanel', {
                 else {
                     row.objectId = existingRecord.objectid;
 
-                    var fields = ['birth', 'dam', 'sire', 'source', 'alternateIds'];
+                    var fields = ['birth', 'dam', 'sire', 'source'];
                     for (var idx in fields) {
                         var fn = fields[idx];
 
                         // kind of a hack:
                         if (fn === 'birth' && existingRecord[fn]) {
                             existingRecord[fn] = Ext4.Date.format(LDK.ConvertUtils.parseDate(existingRecord[fn]), 'Y-m-d');
                         }
+
                         if (row[fn] && existingRecord[fn] && row[fn] !== existingRecord[fn]) {
                             row.errors.push('Does not match existing row for ' + fn + ': ' + existingRecord[fn]);
                         }
                     }
+
+                    // The goal of this is to take the union of the existing/new aliases:
+                    if (row.alternateIds && existingRecord.alternateIds) {
+                        row.alternateIds = row.alternateIds.split(/[ ]*[;,]+[ ]*/g)
+                        existingRecord.alternateIds = existingRecord.alternateIds.split(/[ ]*[;,]+[ ]*/g)
+                        row.alternateIds = Ext4.unique(row.alternateIds.concat(existingRecord.alternateIds)).sort().join(',')
+                    }
                 }
 
                 if (existingRecord['Id/death/date']) {

mcc/src/org/labkey/mcc/MccModule.java

@@ -31,7 +31,9 @@
 import org.labkey.api.security.roles.RoleManager;
 import org.labkey.api.util.SystemMaintenance;
 import org.labkey.api.view.WebPartFactory;
+import org.labkey.api.view.template.ClientDependency;
 import org.labkey.api.writer.ContainerUser;
+import org.labkey.mcc.ehr.NoOpClinicalHistorySource;
 import org.labkey.mcc.query.MarkShippedButton;
 import org.labkey.mcc.query.MccEhrCustomizer;
 import org.labkey.mcc.query.RenameIdButton;
@@ -125,6 +127,9 @@ private void registerEHRResources()
         EHRService.get().registerMoreActionsButton(new MarkShippedButton(), "study", "demographics");
         EHRService.get().registerMoreActionsButton(new RenameIdButton(), "study", "demographics");
         LDKService.get().registerQueryButton(new ShowEditUIButton(this, MccSchema.NAME, MccSchema.TABLE_CENSUS), MccSchema.NAME, MccSchema.TABLE_CENSUS);
+
+        EHRService.get().registerHistoryDataSource(new NoOpClinicalHistorySource("Case Opened"));
+        EHRService.get().registerClientDependency(ClientDependency.supplierFromPath("mcc/panel/MccClinicalSnapshotPanel.js"), this);
     }
 
     @Override

mcc/src/org/labkey/mcc/ehr/NoOpClinicalHistorySource.java

@@ -0,0 +1,44 @@
+package org.labkey.mcc.ehr;
+
+import org.jetbrains.annotations.NotNull;
+import org.labkey.api.data.Container;
+import org.labkey.api.data.Results;
+import org.labkey.api.data.TableInfo;
+import org.labkey.api.ehr.history.AbstractDataSource;
+import org.labkey.api.ehr.history.HistoryRow;
+import org.labkey.api.module.ModuleLoader;
+import org.labkey.api.security.User;
+import org.labkey.mcc.MccModule;
+
+import java.sql.SQLException;
+import java.util.Collections;
+import java.util.Date;
+import java.util.List;
+
+public class NoOpClinicalHistorySource extends AbstractDataSource
+{
+    public NoOpClinicalHistorySource(String categoryText)
+    {
+        super(null, null, categoryText, ModuleLoader.getInstance().getModule(MccModule.class));
+
+    }
+
+    @Override
+    protected TableInfo getTableInfo(Container c, User u)
+    {
+        throw new UnsupportedOperationException("This should never be called");
+    }
+
+    @Override
+    @NotNull
+    public List<HistoryRow> getRows(Container c, User u, final String subjectId, Date minDate, Date maxDate, boolean redacted)
+    {
+        return Collections.emptyList();
+    }
+
+    @Override
+    protected String getHtml(Container c, Results rs, boolean redacted) throws SQLException
+    {
+        return null;
+    }
+}