Add column to MCC to exclude shipped/duplicated IDs

Author: bbimber

mcc/resources/queries/mcc/aggregatedDemographics.sql

@@ -37,6 +37,7 @@ LEFT JOIN (SELECT
                    o."medical_history::observation" as medical_history,
     FROM "/data/Colonies/SNPRC/".study.mostRecentObservationsPivoted o
 ) o ON (o.Id = d.Id)
+WHERE (d.excludeFromCensus IS NULL or d.excludeFromCensus = false)
 
 UNION ALL
 
@@ -79,6 +80,7 @@ FROM "/data/Colonies/WNPRC/".study.demographics d
                         o."medical_history::observation" as medical_history,
                     FROM "/data/Colonies/WNPRC/".study.mostRecentObservationsPivoted o
 ) o ON (o.Id = d.Id)
+WHERE (d.excludeFromCensus IS NULL or d.excludeFromCensus = false)
 
 UNION ALL
 
@@ -118,6 +120,7 @@ FROM "/data/Colonies/UCSD/".study.demographics d
                         o."medical_history::observation" as medical_history,
                     FROM "/data/Colonies/UCSD/".study.mostRecentObservationsPivoted o
 ) o ON (o.Id = d.Id)
+WHERE (d.excludeFromCensus IS NULL or d.excludeFromCensus = false)
 
 UNION ALL
 
@@ -156,4 +159,5 @@ FROM "/data/Colonies/Other/".study.demographics d
                         o."fertility_status::observation" as fertility_status,
                         o."medical_history::observation" as medical_history,
                     FROM "/data/Colonies/Other/".study.mostRecentObservationsPivoted o
-) o ON (o.Id = d.Id)
+) o ON (o.Id = d.Id)
+WHERE (d.excludeFromCensus IS NULL or d.excludeFromCensus = false)

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

@@ -41,6 +41,9 @@
                     <column columnName="source">
                         <columnTitle>Source Colony</columnTitle>
                     </column>
+                    <column columnName="excludeFromCensus">
+                        <columnTitle>Exclude From Census?</columnTitle>
+                    </column>
                     <column columnName="project">
                         <isHidden>true</isHidden>
                     </column>

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

@@ -676,6 +676,9 @@
             <column columnName="alternateIds">
                 <datatype>varchar</datatype>
             </column>
+            <column columnName="excludeFromCensus">
+                <datatype>boolean</datatype>
+            </column>
         </columns>
         <tableTitle>Demographics</tableTitle>
     </table>

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

@@ -141,6 +141,7 @@ Ext4.define('MCC.window.MarkShippedWindow', {
 
                 var commands = [];
                 if (!row['Id/MostRecentDeparture/MostRecentDeparture']) {
+                    //TODO: make this update demographics.colony
                     commands.push({
                         command: 'insert',
                         schemaName: 'study',
@@ -190,6 +191,17 @@ Ext4.define('MCC.window.MarkShippedWindow', {
                     }]
                 });
 
+                commands.push({
+                    command: 'update',
+                    containerPath: null, //Use current folder
+                    schemaName: 'study',
+                    queryName: 'Demographics',
+                    rows: [{
+                        Id: newId,
+                        excludeFromCensus: true
+                    }]
+                });
+
                 LABKEY.Query.saveRows({
                     commands: commands,
                     scope: this,