Improve styling on MarkShippedWindow

Author: bbimber

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

@@ -247,26 +247,6 @@ 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({
@@ -332,7 +312,13 @@ Ext4.define('MCC.window.MarkShippedWindow', {
                                 objectId: null
                             }]
                         });
+                    }
 
+                    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;
+                    if (shouldAddArrival) {
                         // And also add an arrival record. NOTE: set the date after the departure to get status to update properly
                         var arrivalDate = new Date(effectiveDate).setMinutes(effectiveDate.getMinutes() + 1);
                         commands.push({
@@ -344,6 +330,7 @@ Ext4.define('MCC.window.MarkShippedWindow', {
                                 Id: effectiveId,
                                 date: arrivalDate,
                                 source: centerName,
+                                mccRequestId: requestId,
                                 QCState: null,
                                 QCStateLabel: 'Completed',
                                 objectId: null