Force re-cache of all IDs in MCC ETL

Author: bbimber

mcc/resources/etls/mcc.xml

@@ -45,6 +45,12 @@
                 </alternateKeys>
             </destination>
         </transform>
+        <transform id="cacheDemographics" type="TaskRefTransformStep">
+            <taskref ref="org.labkey.mcc.etl.CacheDemographicsStep">
+                <settings>
+                </settings>
+            </taskref>
+        </transform>
         <transform type="SimpleQueryTransformStep" id="kinship">
             <description>Copy to target</description>
             <source schemaName="mcc" queryName="aggregatedKinship" >

mcc/resources/web/mcc/window/MarkShippedWindow.js

@@ -66,7 +66,7 @@ Ext4.define('MCC.window.MarkShippedWindow', {
                 fieldLabel: 'Target Folder',
                 itemId: 'targetFolder',
                 allowBlank: false,
-                displayField: 'title',
+                displayField: 'DisplayName',
                 valueField: 'Path',
                 triggerAction: 'all',
                 queryMode: 'local',
@@ -76,9 +76,9 @@ Ext4.define('MCC.window.MarkShippedWindow', {
                     containerPath: ctx.MCCInternalDataContainer,
                     schemaName: 'core',
                     queryName: 'containers',
-                    columns: 'EntityId,title,Parent,Path',
+                    columns: 'EntityId,DisplayName,Parent,Path',
                     containerFilter: 'CurrentAndSubfolders',
-                    sort: 'title',
+                    sort: 'DisplayName',
                     autoLoad: true,
                     listeners: {
                         load: function(store) {

mcc/src/org/labkey/mcc/etl/CacheDemographicsStep.java

@@ -0,0 +1,51 @@
+package org.labkey.mcc.etl;
+
+import org.apache.xmlbeans.XmlException;
+import org.jetbrains.annotations.NotNull;
+import org.labkey.api.data.TableInfo;
+import org.labkey.api.data.TableSelector;
+import org.labkey.api.di.TaskRefTask;
+import org.labkey.api.ehr.EHRDemographicsService;
+import org.labkey.api.pipeline.PipelineJob;
+import org.labkey.api.pipeline.PipelineJobException;
+import org.labkey.api.pipeline.RecordedActionSet;
+import org.labkey.api.query.QueryService;
+import org.labkey.api.writer.ContainerUser;
+
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+
+public class CacheDemographicsStep implements TaskRefTask
+{
+    protected ContainerUser _containerUser;
+
+    @Override
+    public RecordedActionSet run(@NotNull PipelineJob job) throws PipelineJobException
+    {
+        TableInfo demographics = QueryService.get().getUserSchema(_containerUser.getUser(), _containerUser.getContainer(), "study").getTable("demographics");
+        List<String> ids = new TableSelector(demographics, Collections.singleton("Id"), null, null).getArrayList(String.class);
+
+        EHRDemographicsService.get().getAnimals(_containerUser.getContainer(), ids);
+
+        return new RecordedActionSet();
+    }
+
+    @Override
+    public List<String> getRequiredSettings()
+    {
+        return Collections.emptyList();
+    }
+
+    @Override
+    public void setSettings(Map<String, String> settings) throws XmlException
+    {
+
+    }
+
+    @Override
+    public void setContainerUser(ContainerUser containerUser)
+    {
+        _containerUser = containerUser;
+    }
+}