Add arrival record on MCC transfers

Author: bbimber

mcc/resources/queries/study/demographicsArrival.query.xml

@@ -0,0 +1,37 @@
+<query xmlns="http://labkey.org/data/xml/query">
+    <metadata>
+        <tables xmlns="http://labkey.org/data/xml">
+            <table tableName="demographicsArrival" tableDbType="NOT_IN_DB">
+                <columns>
+                    <column columnName="Id">
+                        <isKeyField>true</isKeyField>
+                        <isHidden>true</isHidden>
+                    </column>
+                    <column columnName="MostRecentArrival">
+                        <url>/query/executeQuery.view?schemaName=study&amp;
+                            query.queryName=arrival&amp;
+                            query.Id~eq=${Id}&amp;
+                            query.sort=-Date&amp;
+                        </url>
+                    </column>
+                    <column columnName="EarliestArrival">
+                        <url>/query/executeQuery.view?schemaName=study&amp;
+                            query.queryName=arrival&amp;
+                            query.Id~eq=${Id}&amp;
+                            query.sort=-Date&amp;
+                        </url>
+                    </column>
+                    <column columnName="Center_Arrival">
+                        <url>/query/executeQuery.view?schemaName=study&amp;
+                            query.queryName=arrival&amp;
+                            query.Id~eq=${Id}&amp;
+                            query.sort=-Date&amp;
+                        </url>
+                        <columnTitle>Arrival At Center</columnTitle>
+                    </column>
+                </columns>
+                <titleColumn>MostRecentArrival</titleColumn>
+            </table>
+        </tables>
+    </metadata>
+</query>

mcc/resources/queries/study/demographicsArrival.sql

@@ -0,0 +1,26 @@
+/*
+ * Copyright (c) 2010-2019 LabKey Corporation
+ *
+ * Licensed under the Apache License, Version 2.0: http://www.apache.org/licenses/LICENSE-2.0
+ */
+SELECT
+  d.Id AS Id,
+
+  T1.MostRecentArrival,
+
+  T2.EarliestArrival,
+
+  coalesce(T2.EarliestArrival, d.birth) as Center_Arrival
+
+FROM study.demographics d
+
+
+--date of most recent arrival
+LEFT JOIN
+  (select T1.Id, max(T1.date) as MostRecentArrival FROM study.arrival T1 WHERE T1.qcstate.publicdata = true GROUP BY T1.Id) T1
+  ON (T1.Id = d.Id)
+
+--date of first arrival
+LEFT JOIN
+  (select T1.Id, min(T1.date) as EarliestArrival FROM study.arrival T1 WHERE T1.qcstate.publicdata = true GROUP BY T1.Id) T2
+  ON (T2.Id = d.Id)

mcc/resources/referenceStudy/study/datasets/datasets_metadata.xml

@@ -558,6 +558,9 @@
             <column columnName="estimated">
                 <datatype>boolean</datatype>
             </column>
+            <column columnName="mccRequestId">
+                <datatype>integer</datatype>
+            </column>
         </columns>
         <tableTitle>Arrival</tableTitle>
     </table>

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

@@ -205,7 +205,7 @@ Ext4.define('MCC.window.MarkShippedWindow', {
             schemaName: 'study',
             queryName: 'Demographics',
             filterArray: [LABKEY.Filter.create('lsid', lsids.join(';'), LABKEY.Filter.Types.IN)],
-            columns: 'Id,gender,colony,species,birth,death,center,Id/MostRecentDeparture/MostRecentDeparture,Id/mccAlias/externalAlias,calculated_status,dam,sire,damMccAlias/externalAlias,sireMccAlias/externalAlias',
+            columns: 'Id,gender,colony,species,birth,death,center,Id/MostRecentDeparture/MostRecentDeparture,Id/MostRecentArrival/MostRecentArrival,Id/mccAlias/externalAlias,calculated_status,dam,sire,damMccAlias/externalAlias,sireMccAlias/externalAlias',
             scope: this,
             failure: LDK.Utils.getErrorCallback(),
             success: function(results) {
@@ -245,6 +245,26 @@ Ext4.define('MCC.window.MarkShippedWindow', {
                         });
                     }
 
+                    var shouldAddArrival = !row['Id/MostRecentArrival/MostRecentArrival'] ||
+                            row['Id/MostRecentArrival/MostRecentArrival'] !== Ext4.Date.format(row.effectiveDate, 'Y-m-d') ||
+                            row['Id/MostRecentArrival/mccRequestId'] !== requestId ||
+                            row.Id !== effectiveId;
+                    commands.push({
+                        command: 'insert',
+                        schemaName: 'study',
+                        containerPath: targetFolder,
+                        queryName: 'Arrival',
+                        rows: [{
+                            Id: row.Id,
+                            date: effectiveDate,
+                            source: row.colony,
+                            mccRequestId: requestId,
+                            qcstate: null,
+                            objectId: null,
+                            QCStateLabel: 'Completed'
+                        }]
+                    });
+
                     // If going to a new LK folder, we're creating a whole new record:
                     if (targetFolderId.toUpperCase() !== LABKEY.Security.currentContainer.id.toUpperCase() || effectiveId !== row.Id) {
                         commands.push({