Add inverse subset and help dialogs to query

Resolves #63 Partially address #143, but needs expansion
MontrealCorpusTools · Oct 3, 2018 · af530a0 · af530a0
1 parent a2af794
commit af530a0
Show file tree

Hide file tree

Showing 4 changed files with 144 additions and 51 deletions.
diff --git a/pgdb/models.py b/pgdb/models.py
@@ -1127,6 +1127,11 @@ def generate_base_query(self, corpus_context):
                     for s in subset_filters:
                         q = q.filter(ann.subset == s)
 
+                    inverse_subset_filters = filter_types.get('inverse_subset_filters', [])
+
+                    for s in inverse_subset_filters:
+                        q = q.filter(ann.subset != s)
+
                     subannotation_filters = filter_types.get('subannotation_filters', {})
                     for s_type, a_filters in subannotation_filters.items():
                         s_ann = getattr(ann, s_type)

diff --git a/pgdb/static/pgdb/enrichment/csv-properties/csv-properties.html b/pgdb/static/pgdb/enrichment/csv-properties/csv-properties.html
@@ -13,6 +13,7 @@ <h4>Enrich from a CSV file</h4>
                  </md-select>
         </md-input-container>
       <md-button class="md-icon-button" aria-label="Help" ng-click="getHelp($event, 'file_type')">
+        <md-tooltip md-direction="below">Help</md-tooltip>
        <i class="material-icons">info</i>
       </md-button>
 
@@ -27,6 +28,7 @@ <h4>Enrich from a CSV file</h4>
                 Delete file
             </md-button>
       <md-button class="md-icon-button" aria-label="Help" ng-click="getHelp($event, 'csv_file')">
+        <md-tooltip md-direction="below">Help</md-tooltip>
        <i class="material-icons">info</i>
       </md-button>
         </div>