New condition section token builder

app/static/js/CorpusAnalysis/QueryBuilder.js

@@ -34,7 +34,6 @@ class ConcordanceQueryBuilder {
       {
         onOpenStart: () => {
           this.tokenAttributeBuilderFunctions.preparePositionalAttrModal();
-          this.tokenAttributeBuilderFunctions.optionToggleHandler();
         },
         onCloseStart: () => {
           this.tokenAttributeBuilderFunctions.resetPositionalAttrModal();

app/static/js/CorpusAnalysis/QueryBuilder/ElementReferencesQueryBuilder.js

@@ -19,17 +19,13 @@ class ElementReferencesQueryBuilder {
     // Token Attribute Builder Elements
     this.positionalAttrModal = M.Modal.getInstance(document.querySelector('#corpus-analysis-concordance-positional-attr-modal'));
     this.positionalAttrSelection = document.querySelector('#corpus-analysis-concordance-positional-attr-selection');
+    this.tokenBuilderContent = document.querySelector('#corpus-analysis-concordance-token-builder-content');
     this.tokenQuery = document.querySelector('#corpus-analysis-concordance-token-query');
+    this.tokenQueryTemplate = document.querySelector('#corpus-analysis-concordance-token-query-template');
     this.tokenSubmitButton = document.querySelector('#corpus-analysis-concordance-token-submit');
     this.noValueMessage = document.querySelector('#corpus-analysis-concordance-no-value-message');
     this.isTokenQueryInvalid = false;
 
-    this.wordInput = document.querySelector('#corpus-analysis-concordance-word-input');
-    this.lemmaInput = document.querySelector('#corpus-analysis-concordance-lemma-input');
-    this.englishPosSelection = document.querySelector('#corpus-analysis-concordance-english-pos-selection');
-    this.germanPosSelection = document.querySelector('#corpus-analysis-concordance-german-pos-selection');
-    this.simplePosSelection = document.querySelector('#corpus-analysis-concordance-simple-pos-selection');
-
     this.ignoreCaseCheckbox = document.querySelector('#corpus-analysis-concordance-ignore-case-checkbox');
   }
 }

app/static/js/CorpusAnalysis/QueryBuilder/GeneralFunctionsQueryBuilder.js

@@ -34,7 +34,9 @@ class GeneralFunctionsQueryBuilder {
   
   resetMaterializeSelection(selectionElements, value = "default") {
     selectionElements.forEach(selectionElement => {
-      selectionElement.querySelector(`option[value=${value}]`).selected = true;
+      if (selectionElement.querySelector(`option[value=${value}]`) !== null) {
+        selectionElement.querySelector(`option[value=${value}]`).selected = true;
+      }
       let instance = M.FormSelect.getInstance(selectionElement);
       instance.destroy();
       M.FormSelect.init(selectionElement);

app/templates/corpora/_analysis/concordance.html.j2

@@ -17,10 +17,10 @@
 <div class="card">
   <div class="card-content">
     <div class="row">
-      <div class="col s1">
+      <div class="col s2">
         <span class="card-title">Query <i class="material-icons left" style="font-size: inherit;">search</i></span>
       </div>
-      <div class="col s2">
+      <div class="col s1">
         <div class="switch" style="margin-top:8px; margin-left:0px;">
           <label>
             <input type="checkbox" id="corpus-analysis-concordance-expert-mode-switch">