<script language="JavaScript">
<!--
function _AN_global_var_init(){
	_AN_this_url = "/prx/000/";
	_AN_base_scheme = "https";
	_AN_base_host = "https://patch-diff.githubusercontent.com";
	_AN_base_path = "https://patch-diff.githubusercontent.com/raw/mistic100/jQuery-QueryBuilder/pull/";
	_AN_encode_urls = 0;
	_AN_mpo = 1;
	_AN_md = 0;
	_AN_rel_urls = 1;
	_AN_nav_switch = 0;
	_AN_nav_allowurl = 1;
	_AN_nav_override = 0;
	_AN_has_iframe = 0;
	_AN_dbg_flags = null;
	_AN_nav_use_aaa = 1;
	_AN_expires_pass = 0;
	_AN_wrap_evthandlers = 0;
	_AN_rewrite_param_exact = 0;
	_AN_obj_params = {};
} 
_AN_global_var_init();
//-->
</script>
<script language="JavaScript" src="/prx/001/http/localh/an_util.js"></script>
<script language="JavaScript" src="/prx/001/http/localh/NSLib.js"></script>

From baa79ce9ca0691f335cd771c68b8b7967ba98e78 Mon Sep 17 00:00:00 2001
From: Reha Sterbin <reha@omniti.com>
Date: Fri, 14 Oct 2016 12:57:08 -0400
Subject: [PATCH 01/44] Began work on adding sections (placeholder commit)

---
 src/core.js      | 118 ++++++++++++++++++++++++++++++++++++++++++++++-
 src/data.js      |   8 ++++
 src/defaults.js  |  36 ++++++++++++---
 src/i18n/en.json |   9 +++-
 src/model.js     |  66 +++++++++++++++++++++++++-
 src/template.js  |  56 +++++++++++++++++++++-
 6 files changed, 281 insertions(+), 12 deletions(-)

diff --git a/src/core.js b/src/core.js
index 5ee8e0ac..fd63b573 100644
--- a/src/core.js
+++ b/src/core.js
@@ -9,9 +9,11 @@ QueryBuilder.prototype.init = function($el, options) {
     this.settings = $.extendext(true, 'replace', {}, QueryBuilder.DEFAULTS, options);
     this.model = new Model();
     this.status = {
+        section_id: 0,
         group_id: 0,
         rule_id: 0,
         generated_id: false,
+        has_sections: false,
         has_optgroup: false,
         has_operator_oprgroup: false,
         id: null,
@@ -28,6 +30,7 @@ QueryBuilder.prototype.init = function($el, options) {
 
     // SETTINGS SHORTCUTS
     this.filters = this.settings.filters;
+    this.sections = this.settings.sections;
     this.icons = this.settings.icons;
     this.operators = this.settings.operators;
     this.templates = this.settings.templates;
@@ -60,7 +63,13 @@ QueryBuilder.prototype.init = function($el, options) {
     this.$el.addClass('query-builder form-inline');
 
     this.filters = this.checkFilters(this.filters);
+    for (var k in this.sections) {
+        if (this.sections.hasOwnProperty(k)) {
+            this.sections[k].filters = this.checkFilters(this.sections[k].filters);
+        }
+    }
     this.operators = this.checkOperators(this.operators);
+
     this.bindEvents();
     this.initPlugins();
 
@@ -245,6 +254,14 @@ QueryBuilder.prototype.bindEvents = function() {
         }
     });
 
+    // section exists change
+    this.$el.on('change.queryBuilder', Selectors.section_exists, function() {
+        if ($(this).is(':checked')) {
+            var $section = $(this).closest(Selectors.section_exists);
+            Model($section).condition = $(this).val();
+        }
+    });
+
     // rule filter change
     this.$el.on('change.queryBuilder', Selectors.rule_filter, function() {
         var $rule = $(this).closest(Selectors.rule_container);
@@ -283,6 +300,20 @@ QueryBuilder.prototype.bindEvents = function() {
         });
     }
 
+    if (this.settings.allow_sections !== 0) {
+        // add section button
+        this.$el.on('click.queryBuilder', Selectors.add_section, function() {
+            var $section = $(this).closest(Selectors.group_container);
+            self.addSection(Model($section));
+        });
+
+        // delete section button
+        this.$el.on('click.queryBuilder', Selectors.delete_section, function() {
+            var $section = $(this).closest(Selectors.section_container);
+            self.deleteSection(Model($section));
+        });
+    }
+
     // model events
     this.model.on({
         'drop': function(e, node) {
@@ -298,6 +329,10 @@ QueryBuilder.prototype.bindEvents = function() {
             }
             self.refreshGroupsConditions();
         },
+        'set': function(e, node) {
+            node.parent.$el.find('>' + Selectors.section_body).empty().append(node.$el);
+            self.updateSectionExistsFlag(node.section);
+        },
         'move': function(e, node, group, index) {
             node.$el.detach();
 
@@ -402,8 +437,14 @@ QueryBuilder.prototype.addGroup = function(parent, addRule, data, flags) {
     }
 
     var group_id = this.nextGroupId();
-    var $group = $(this.getGroupTemplate(group_id, level));
-    var model = parent.addGroup($group);
+    var $group = $(this.getGroupTemplate(group_id, level, parent instanceof Section || parent.section ? true : false));
+    console.log(parent);
+    if (parent instanceof Section) {
+        var model = parent.setGroup($group);
+    } else {
+        var model = parent.addGroup($group);
+    }
+    console.log(model);
 
     model.data = data;
     model.flags = $.extend({}, this.settings.default_group_flags, flags);
@@ -480,6 +521,79 @@ QueryBuilder.prototype.refreshGroupsConditions = function() {
     }(this.model.root));
 };
 
+//--section
+
+/**
+ * Add a new section
+ * @param parent {Group}
+ * @param addRule {bool,optional} add a default empty rule
+ * @param data {mixed,optional} section custom data
+ * @param flags {object,optional} flags to apply to the section
+ * @return section {Section}
+ */
+QueryBuilder.prototype.addSection = function(parent, addRule, data, flags) {
+    addRule = (addRule === undefined || addRule === true);
+
+    var level = parent.level + 1;
+
+    var e = this.trigger('beforeAddSection', parent, addRule, level);
+    if (e.isDefaultPrevented()) {
+        return null;
+    }
+
+    var section_id = this.nextSectionId();
+    var $section = $(this.getSectionTemplate(section_id, level));
+    var model = parent.addSection($section);
+
+    model.data = data;
+    model.flags = $.extend({}, this.settings.default_section_flags, flags);
+
+    this.trigger('afterAddSection', model);
+
+    model.exists = this.settings.default_exists;
+
+    this.addGroup(model, true, data, flags);
+
+    return model;
+};
+
+/**
+ * Tries to delete a section. The section is not deleted if at least one rule is no_delete.
+ * @param section {Section}
+ * @return {boolean} true if the section has been deleted
+ */
+QueryBuilder.prototype.deleteSection = function(section) {
+    var e = this.trigger('beforeDeleteSection', section);
+    if (e.isDefaultPrevented()) {
+        return false;
+    }
+
+    if (!this.deleteGroup(section.group)) {
+        return false;
+    }
+
+    section.drop();
+    this.trigger('afterDeleteSection');
+
+    return true;
+};
+
+/**
+ * Changes the exists setting of a section
+ * @param section {Section}
+ */
+QueryBuilder.prototype.updateSectionExistsFlag = function(section) {
+    section.$el.find('>' + Selectors.section_exists_flag).each(function() {
+        var $this = $(this);
+        $this.prop('checked', $this.val() === section.exists);
+        $this.parent().toggleClass('active', $this.val() === section.exists);
+    });
+
+    this.trigger('afterUpdateSectionExistsFlag', section);
+};
+
+//--section
+
 /**
  * Add a new rule
  * @param parent {Group}
diff --git a/src/data.js b/src/data.js
index 2f1752dc..73f40ec8 100644
--- a/src/data.js
+++ b/src/data.js
@@ -215,6 +215,14 @@ QueryBuilder.prototype.nextRuleId = function() {
     return this.status.id + '_rule_' + (this.status.rule_id++);
 };
 
+/**
+ * Returns an incremented section ID
+ * @return {string}
+ */
+QueryBuilder.prototype.nextSectionId = function() {
+    return this.status.id + '_section_' + (this.status.section_id++);
+};
+
 /**
  * Returns the operators for a filter
  * @param filter {string|object} (filter id name or filter object)
diff --git a/src/defaults.js b/src/defaults.js
index fffde6f5..b2dbd84d 100644
--- a/src/defaults.js
+++ b/src/defaults.js
@@ -28,6 +28,7 @@ QueryBuilder.inputs = [
 QueryBuilder.modifiable_options = [
     'display_errors',
     'allow_groups',
+    'allow_sections',
     'allow_empty',
     'default_condition',
     'default_filter'
@@ -37,6 +38,7 @@ QueryBuilder.modifiable_options = [
  * CSS selectors for common components
  */
 var Selectors = QueryBuilder.selectors = {
+    section_container:    '.rules-section-container',
     group_container:      '.rules-group-container',
     rule_container:       '.rule-container',
     filter_container:     '.rule-filter-container',
@@ -45,13 +47,17 @@ var Selectors = QueryBuilder.selectors = {
     error_container:      '.error-container',
     condition_container:  '.rules-group-header .group-conditions',
 
-    rule_header:          '.rule-header',
+    section_header:       '.rules-section-header',
     group_header:         '.rules-group-header',
+    rule_header:          '.rule-header',
+    section_actions:      '.section-actions',
     group_actions:        '.group-actions',
     rule_actions:         '.rule-actions',
 
+    section_body:         '.rules-section-body',
     rules_list:           '.rules-group-body>.rules-list',
 
+    section_exists_flag:  '.rules-section-header [name$=_exists]',
     group_condition:      '.rules-group-header [name$=_cond]',
     rule_filter:          '.rule-filter-container [name$=_filter]',
     rule_operator:        '.rule-operator-container [name$=_operator]',
@@ -60,7 +66,9 @@ var Selectors = QueryBuilder.selectors = {
     add_rule:             '[data-add=rule]',
     delete_rule:          '[data-delete=rule]',
     add_group:            '[data-add=group]',
-    delete_group:         '[data-delete=group]'
+    delete_group:         '[data-delete=group]',
+    add_section:          '[data-add=section]',
+    delete_section:       '[data-delete=section]'
 };
 
 /**
@@ -104,14 +112,18 @@ QueryBuilder.OPERATORS = {
  */
 QueryBuilder.DEFAULTS = {
     filters: [],
+    sections: [],
     plugins: [],
 
     sort_filters: false,
     display_errors: true,
+    allow_sections: -1,
     allow_groups: -1,
     allow_empty: false,
     conditions: ['AND', 'OR'],
     default_condition: 'AND',
+    exist_options: ['EXISTS', 'DOES NOT EXIST'],
+    default_exists: 'EXISTS',
     inputs_separator: ' , ',
     select_placeholder: '------',
     display_empty_filter: true,
@@ -132,7 +144,15 @@ QueryBuilder.DEFAULTS = {
         no_delete: false
     },
 
+    default_section_flags: {
+        exists_readonly: false,
+        no_add_rule: false,
+        no_add_group: false,
+        no_delete: false
+    },
+
     templates: {
+        section: null,
         group: null,
         rule: null,
         filterSelect: null,
@@ -166,10 +186,12 @@ QueryBuilder.DEFAULTS = {
     ],
 
     icons: {
-        add_group:    'glyphicon glyphicon-plus-sign',
-        add_rule:     'glyphicon glyphicon-plus',
-        remove_group: 'glyphicon glyphicon-remove',
-        remove_rule:  'glyphicon glyphicon-remove',
-        error:        'glyphicon glyphicon-warning-sign'
+        add_section:    'glyphicon glyphicon-plus-sign',
+        add_group:      'glyphicon glyphicon-plus-sign',
+        add_rule:       'glyphicon glyphicon-plus',
+        remove_section: 'glyphicon glyphicon-remove',
+        remove_group:   'glyphicon glyphicon-remove',
+        remove_rule:    'glyphicon glyphicon-remove',
+        error:          'glyphicon glyphicon-warning-sign'
     }
 };
diff --git a/src/i18n/en.json b/src/i18n/en.json
index b5828139..60c0d07e 100644
--- a/src/i18n/en.json
+++ b/src/i18n/en.json
@@ -4,14 +4,21 @@
 
   "add_rule": "Add rule",
   "add_group": "Add group",
+  "add_section": "Add section",
   "delete_rule": "Delete",
   "delete_group": "Delete",
+  "delete_section": "Delete",
 
   "conditions": {
     "AND": "AND",
     "OR": "OR"
   },
 
+  "exist_options": {
+    "EXISTS": "EXISTS",
+    "NOT EXISTS": "DOES NOT EXIST"
+  },
+
   "operators": {
     "equal": "equal",
     "not_equal": "not equal",
@@ -58,4 +65,4 @@
     "boolean_not_valid": "Not a boolean",
     "operator_not_multiple": "Operator {0} cannot accept multiple values"
   }
-}
\ No newline at end of file
+}
diff --git a/src/model.js b/src/model.js
index f93dc8e3..df02b19d 100644
--- a/src/model.js
+++ b/src/model.js
@@ -221,7 +221,7 @@ Node.prototype._move = function(group, index) {
 // GROUP CLASS
 // ===============================
 /**
- * @param {Group}
+ * @param {Group|Section}
  * @param {jQuery}
  */
 var Group = function(parent, $el) {
@@ -232,6 +232,7 @@ var Group = function(parent, $el) {
     Node.call(this, parent, $el);
 
     this.rules = [];
+    this.section = null;
     this.__.condition = null;
 };
 
@@ -281,6 +282,9 @@ Group.prototype._appendNode = function(node, index, trigger) {
 
     this.rules.splice(index, 0, node);
     node.parent = this;
+    if (!(node instanceof Section)) {
+        node.section = this.section;
+    }
 
     if (trigger && this.model !== null) {
         this.model.trigger('add', node, index);
@@ -309,6 +313,17 @@ Group.prototype.addRule = function($el, index) {
     return this._appendNode(new Rule(this, $el), index, true);
 };
 
+/**
+ * Add a Section by jQuery element at specified index
+ * @param {jQuery}
+ * @param {int,optional}
+ * @return {Section} the inserted section
+ */
+Group.prototype.addSection = function($el, index) {
+    console.log($el);
+    return this._appendNode(new Section(this, $el), index, true);
+};
+
 /**
  * Delete a specific Node
  * @param {Node}
@@ -410,6 +425,8 @@ var Rule = function(parent, $el) {
 
     Node.call(this, parent, $el);
 
+    this.section = null;
+
     this.__.filter = null;
     this.__.operator = null;
     this.__.flags = {};
@@ -421,8 +438,55 @@ Rule.prototype.constructor = Rule;
 
 defineModelProperties(Rule, ['filter', 'operator', 'value']);
 
+// Section CLASS
+// ===============================
+/**
+ * @param {Section}
+ * @param {jQuery}
+ */
+var Section = function(parent, $el) {
+    if (!(this instanceof Section)) {
+        return new Section(parent, $el);
+    }
+
+    Node.call(this, parent, $el);
+
+    this.group = null;
+    this.__.exists = null;
+};
+
+Section.prototype = Object.create(Node.prototype);
+Section.prototype.constructor = Section;
+
+defineModelProperties(Section, ['exists']);
+
+/**
+ * Set the root group of the section by jQuery element
+ * @param {jQuery}
+ * @return {Group} the new root group
+ */
+Section.prototype.setGroup = function($el) {
+    this.group = new Group(this, $el);
+    this.group.parent = this;
+    this.group.section = this;
+    if (this.model !== null) {
+        this.model.trigger('set', this.group);
+    }
+    return this.group;
+};
+
+/**
+ * Delete self
+ */
+Section.prototype.drop = function() {
+    this.group.empty();
+    Node.prototype.drop.call(this);
+};
+
 
 // EXPORT
 // ===============================
 QueryBuilder.Group = Group;
 QueryBuilder.Rule = Rule;
+QueryBuilder.Section = Section;
+
diff --git a/src/template.js b/src/template.js
index 3a2756e4..b8808303 100644
--- a/src/template.js
+++ b/src/template.js
@@ -10,6 +10,11 @@ QueryBuilder.templates.group = '\
           <i class="{{= it.icons.add_group }}"></i> {{= it.lang.add_group }} \
         </button> \
       {{?}} \
+      {{? !it.in_section }} \
+        <button type="button" class="btn btn-xs btn-success" data-add="section"> \
+          <i class="{{= it.icons.add_section }}"></i> {{= it.lang.add_section }} \
+        </button> \
+      {{?}} \
       {{? it.level>1 }} \
         <button type="button" class="btn btn-xs btn-danger" data-delete="group"> \
           <i class="{{= it.icons.remove_group }}"></i> {{= it.lang.delete_group }} \
@@ -32,6 +37,31 @@ QueryBuilder.templates.group = '\
   </dd> \
 </dl>';
 
+QueryBuilder.templates.section = '\
+<dl id="{{= it.section_id }}" class="rules-section-container"> \
+  <dt class="rules-section-header"> \
+    <div class="btn-section pull-right section-actions"> \
+      {{? it.level>1 }} \
+        <button type="button" class="btn btn-xs btn-danger" data-delete="section"> \
+          <i class="{{= it.icons.remove_section }}"></i> {{= it.lang.delete_section }} \
+        </button> \
+      {{?}} \
+    </div> \
+    <div class="btn-group section-exist-options"> \
+      {{~ it.exist_options: option }} \
+        <label class="btn btn-xs btn-primary"> \
+          <input type="radio" name="{{= it.section_id }}_exists" value="{{= option }}"> {{= it.lang.exist_options[option] || option }} \
+        </label> \
+      {{~}} \
+    </div> \
+    {{? it.settings.display_errors }} \
+      <div class="error-container"><i class="{{= it.icons.error }}"></i></div> \
+    {{?}} \
+  </dt> \
+  <dd class="rules-section-body"> \
+  </dd> \
+</dl>';
+
 QueryBuilder.templates.rule = '\
 <li id="{{= it.rule_id }}" class="rule-container"> \
   <div class="rule-header"> \
@@ -91,13 +121,16 @@ QueryBuilder.templates.operatorSelect = '\
  * Returns group HTML
  * @param group_id {string}
  * @param level {int}
+ * @param in_section {bool}
  * @return {string}
  */
-QueryBuilder.prototype.getGroupTemplate = function(group_id, level) {
+QueryBuilder.prototype.getGroupTemplate = function(group_id, level, in_section) {
+    console.log(in_section);
     var h = this.templates.group({
         builder: this,
         group_id: group_id,
         level: level,
+        in_section: in_section,
         conditions: this.settings.conditions,
         icons: this.icons,
         lang: this.lang,
@@ -124,6 +157,27 @@ QueryBuilder.prototype.getRuleTemplate = function(rule_id) {
     return this.change('getRuleTemplate', h);
 };
 
+/**
+ * Returns section HTML
+ * @param group_id {string}
+ * @param level {int}
+ * @param in_section {bool}
+ * @return {string}
+ */
+QueryBuilder.prototype.getSectionTemplate = function(section_id, level) {
+    var h = this.templates.section({
+        builder: this,
+        section_id: section_id,
+        level: level,
+        exist_options: this.settings.exist_options,
+        icons: this.icons,
+        lang: this.lang,
+        settings: this.settings
+    });
+
+    return this.change('getSectionTemplate', h);
+};
+
 /**
  * Returns rule filter <select> HTML
  * @param rule {Rule}

From 42916800751134f5b25e035dd968c46726317c46 Mon Sep 17 00:00:00 2001
From: Reha Sterbin <reha@omniti.com>
Date: Fri, 14 Oct 2016 13:27:45 -0400
Subject: [PATCH 02/44] Set basic styles for sections

---
 src/scss/dark.scss    |  3 +++
 src/scss/default.scss | 31 +++++++++++++++++++++++++++++++
 2 files changed, 34 insertions(+)

diff --git a/src/scss/dark.scss b/src/scss/dark.scss
index 02e50e56..b9b11bad 100644
--- a/src/scss/dark.scss
+++ b/src/scss/dark.scss
@@ -3,6 +3,9 @@ $theme-name: dark;
 $group-background-color: rgba(50, 70, 80, .5);
 $group-border-color: #00164A;
 
+$section-background-color: rgba(100, 120, 130, .5);
+$section-border-color: #181E21;
+
 $rule-background-color: rgba(40, 40, 40, .9);
 $rule-border-color: #111;
 
diff --git a/src/scss/default.scss b/src/scss/default.scss
index 1008a7fd..c4c80735 100644
--- a/src/scss/default.scss
+++ b/src/scss/default.scss
@@ -10,6 +10,12 @@ $group-border-color: #DCC896 !default;
 $group-border: 1px solid $group-border-color !default;
 $group-padding: 10px !default;
 
+// sections
+$section-background-color: rgba(196, 173, 237, .5) !default;
+$section-border-color: #AD92DB !default;
+$section-border: 1px solid $section-border-color !default;
+$section-padding: 10px !default;
+
 // rules
 $rule-background-color: rgba(255, 255, 255, .9) !default;
 $rule-border-color: #EEE !default;
@@ -107,6 +113,31 @@ $ticks-position: 5px, 10px !default;
     }
   }
 
+  // SECTIONS
+  .rules-section-container {
+    @extend %base-container;
+
+    padding: $section-padding;
+    padding-bottom: #{$section-padding - $item-vertical-spacing};
+    border: $section-border;
+    background: $section-background-color;
+  }
+
+  .rules-section-header {
+    margin-bottom: $section-padding;
+
+    .section-exists-options {
+      .btn.readonly:not(.active),
+      input[name$=_exists] {
+        display: none;
+      }
+
+      .btn.readonly {
+        border-radius: 3px;
+      }
+    }
+  }
+
   // ERRORS
   .error-container {
     @extend %rule-component;

From c33383b0e210214b39f62a5515ae684a472ced32 Mon Sep 17 00:00:00 2001
From: Reha Sterbin <reha@omniti.com>
Date: Thu, 20 Oct 2016 09:13:51 -0400
Subject: [PATCH 03/44] Partially working type selection

---
 examples/index.html | 121 ++++++++++++++++++++++++++++++++++++++++++++
 src/core.js         |  73 +++++++++++++++++++++++---
 src/data.js         |  37 ++++++++++++--
 src/defaults.js     |   3 ++
 src/model.js        |  17 +++++--
 src/template.js     |  34 ++++++++++++-
 6 files changed, 268 insertions(+), 17 deletions(-)

diff --git a/examples/index.html b/examples/index.html
index cb78fd23..900113fe 100644
--- a/examples/index.html
+++ b/examples/index.html
@@ -123,6 +123,126 @@ <h3>Output</h3>
   //default_filter: 'name',
   sort_filters: true,
 
+  sections: [
+    {
+      id: 'subquery-a',
+      label: 'Subquery A',
+      filters: [
+        {
+          id: 'sqa-name',
+          label: {
+            en: 'Subquery A Name',
+            fr: 'Nom'
+          },
+          type: 'string',
+          optgroup: 'core',
+          default_value: 'Subquery Name',
+          size: 30,
+          unique: true
+        },
+        {
+          id: 'sqa-category',
+          label: 'Subquery A Category',
+          type: 'integer',
+          input: 'checkbox',
+          optgroup: 'core',
+          values: {
+            1: 'Books',
+            2: 'Movies',
+            3: 'Music',
+            4: 'Tools',
+            5: 'Goodies',
+            6: 'Clothes'
+          },
+          colors: {
+            1: 'foo',
+            2: 'warning',
+            5: 'success'
+          },
+          operators: ['in', 'not_in', 'equal', 'not_equal', 'is_null', 'is_not_null']
+        }
+      ]
+    },
+    {
+      id: 'subquery-b',
+      label: 'Subquery B',
+      filters: [
+        {
+          id: 'sqb-name',
+          label: {
+            en: 'Subquery B Name',
+            fr: 'Nom'
+          },
+          type: 'string',
+          optgroup: 'core',
+          default_value: 'Subquery Name',
+          size: 30,
+          unique: true
+        },
+        {
+          id: 'sqb-category',
+          label: 'Subquery B Category',
+          type: 'integer',
+          input: 'checkbox',
+          optgroup: 'core',
+          values: {
+            1: 'Books',
+            2: 'Movies',
+            3: 'Music',
+            4: 'Tools',
+            5: 'Goodies',
+            6: 'Clothes'
+          },
+          colors: {
+            1: 'foo',
+            2: 'warning',
+            5: 'success'
+          },
+          operators: ['in', 'not_in', 'equal', 'not_equal', 'is_null', 'is_not_null']
+        }
+      ]
+    },
+    {
+      id: 'subquery-c',
+      label: 'Subquery C',
+      filters: [
+        {
+          id: 'sqc-name',
+          label: {
+            en: 'Subquery C Name',
+            fr: 'Nom'
+          },
+          type: 'string',
+          optgroup: 'core',
+          default_value: 'Subquery Name',
+          size: 30,
+          unique: true
+        },
+        {
+          id: 'sqc-category',
+          label: 'Subquery C Category',
+          type: 'integer',
+          input: 'checkbox',
+          optgroup: 'core',
+          values: {
+            1: 'Books',
+            2: 'Movies',
+            3: 'Music',
+            4: 'Tools',
+            5: 'Goodies',
+            6: 'Clothes'
+          },
+          colors: {
+            1: 'foo',
+            2: 'warning',
+            5: 'success'
+          },
+          operators: ['in', 'not_in', 'equal', 'not_equal', 'is_null', 'is_not_null']
+        }
+      ]
+    }
+  ],
+
   optgroups: {
     core: {
       en: 'Core',
@@ -400,6 +520,7 @@ <h3>Output</h3>
     }
   }]
 };
+console.log(options);
 
 // init
 $('#builder').queryBuilder(options);
diff --git a/src/core.js b/src/core.js
index fd63b573..092858c6 100644
--- a/src/core.js
+++ b/src/core.js
@@ -262,10 +262,20 @@ QueryBuilder.prototype.bindEvents = function() {
         }
     });
 
+    // section type change
+    this.$el.on('change.queryBuilder', Selectors.rule_stype, function() {
+        var sid = $(this).val();
+        var $section = $(this).closest(Selectors.section_container);
+        var model = Model($section)
+        model.id = sid;
+        self.refreshSection(model);
+    });
+
     // rule filter change
     this.$el.on('change.queryBuilder', Selectors.rule_filter, function() {
         var $rule = $(this).closest(Selectors.rule_container);
-        Model($rule).filter = self.getFilterById($(this).val());
+        var m = Model($rule);
+        m.filter = self.getFilterById($(this).val(), m.section_id);
     });
 
     // rule operator change
@@ -331,7 +341,7 @@ QueryBuilder.prototype.bindEvents = function() {
         },
         'set': function(e, node) {
             node.parent.$el.find('>' + Selectors.section_body).empty().append(node.$el);
-            self.updateSectionExistsFlag(node.section);
+            self.updateSectionExistsFlag(node.parent);
         },
         'move': function(e, node, group, index) {
             node.$el.detach();
@@ -437,14 +447,12 @@ QueryBuilder.prototype.addGroup = function(parent, addRule, data, flags) {
     }
 
     var group_id = this.nextGroupId();
-    var $group = $(this.getGroupTemplate(group_id, level, parent instanceof Section || parent.section ? true : false));
-    console.log(parent);
+    var $group = $(this.getGroupTemplate(group_id, level, parent instanceof Section || parent.section_id ? true : false));
     if (parent instanceof Section) {
         var model = parent.setGroup($group);
     } else {
         var model = parent.addGroup($group);
     }
-    console.log(model);
 
     model.data = data;
     model.flags = $.extend({}, this.settings.default_group_flags, flags);
@@ -552,6 +560,14 @@ QueryBuilder.prototype.addSection = function(parent, addRule, data, flags) {
 
     model.exists = this.settings.default_exists;
 
+    this.createSectionTypes(model);
+
+    if (this.settings.default_section) {
+        model.id = this.settings.default_section;
+    } else {
+        model.id = this.sections[0].id;
+    }
+
     this.addGroup(model, true, data, flags);
 
     return model;
@@ -592,6 +608,40 @@ QueryBuilder.prototype.updateSectionExistsFlag = function(section) {
     this.trigger('afterUpdateSectionExistsFlag', section);
 };
 
+/**
+ * Create the type <select> for a section
+ * @param section {Section}
+ */
+QueryBuilder.prototype.createSectionTypes = function(section) {
+    var stypes = this.change('getSectionTypes', this.sections, section);
+    var $stypesSelect = $(this.getSectionTypeSelect(section, stypes));
+
+    section.$el.find(Selectors.stype_container).html($stypesSelect);
+
+    this.trigger('afterCreateSectionStypes', section);
+};
+
+/**
+ * Refreshes a section after a type change
+ * @param section {Section}
+ */
+QueryBuilder.prototype.refreshSection = function(model) {
+
+    // Clear out the section if there's any rule that don't belong
+    var ok = true;
+    model.$el.find(Selectors.rule_container).each(function() {
+        var rule = Model($(this));
+        if (rule.section_id != model.id) {
+            ok = false;
+        }
+    });
+    if (!ok) {
+        model.empty();
+    }
+
+    this.trigger('afterRefreshSection', model);
+};
+
 //--section
 
 /**
@@ -658,7 +708,18 @@ QueryBuilder.prototype.deleteRule = function(rule) {
  * @param rule {Rule}
  */
 QueryBuilder.prototype.createRuleFilters = function(rule) {
-    var filters = this.change('getRuleFilters', this.filters, rule);
+    if (rule.section_id) {
+        console.log('on create rule filters');
+        console.log(rule.section_id);
+        var section = this.getSectionById(rule.section_id);
+        if (section) {
+            var filters = this.change('getRuleFilters', section.filters, rule);
+        } else {
+            var filters = this.change('getRuleFilters', [], rule);
+        }
+    } else {
+        var filters = this.change('getRuleFilters', this.filters, rule);
+    }
     var $filterSelect = $(this.getRuleFilterSelect(rule, filters));
 
     rule.$el.find(Selectors.filter_container).html($filterSelect);
diff --git a/src/data.js b/src/data.js
index 73f40ec8..0c67e255 100644
--- a/src/data.js
+++ b/src/data.js
@@ -223,6 +223,26 @@ QueryBuilder.prototype.nextSectionId = function() {
     return this.status.id + '_section_' + (this.status.section_id++);
 };
 
+/**
+ * Returns a particular section by its id
+ * @throws UndefinedSectionError
+ * @param sectionId {string}
+ * @return {object|null}
+ */
+QueryBuilder.prototype.getSectionById = function(id) {
+    if (id == '-1') {
+        return null;
+    }
+
+    for (var i = 0, l = this.sections.length; i < l; i++) {
+        if (this.sections[i].id == id) {
+            return this.sections[i];
+        }
+    }
+
+    Utils.error('UndefinedSection', 'Undefined section "{0}"', id);
+};
+
 /**
  * Returns the operators for a filter
  * @param filter {string|object} (filter id name or filter object)
@@ -264,16 +284,25 @@ QueryBuilder.prototype.getOperators = function(filter) {
  * Returns a particular filter by its id
  * @throws UndefinedFilterError
  * @param filterId {string}
+ * @param sectionId {string|null}
  * @return {object|null}
  */
-QueryBuilder.prototype.getFilterById = function(id) {
+QueryBuilder.prototype.getFilterById = function(id, sectionId) {
     if (id == '-1') {
         return null;
     }
 
-    for (var i = 0, l = this.filters.length; i < l; i++) {
-        if (this.filters[i].id == id) {
-            return this.filters[i];
+    if (sectionId) {
+        console.log('on getFilterById');
+        console.log(sectionId);
+        var s = this.getSectionById(sectionId);
+        var filters = s ? s.filters : [];
+    } else {
+        var filters = this.filters;
+    }
+    for (var i = 0, l = filters.length; i < l; i++) {
+        if (filters[i].id == id) {
+            return filters[i];
         }
     }
 
diff --git a/src/defaults.js b/src/defaults.js
index b2dbd84d..f495a2db 100644
--- a/src/defaults.js
+++ b/src/defaults.js
@@ -41,6 +41,7 @@ var Selectors = QueryBuilder.selectors = {
     section_container:    '.rules-section-container',
     group_container:      '.rules-group-container',
     rule_container:       '.rule-container',
+    stype_container:      '.rule-stype-container',
     filter_container:     '.rule-filter-container',
     operator_container:   '.rule-operator-container',
     value_container:      '.rule-value-container',
@@ -59,6 +60,7 @@ var Selectors = QueryBuilder.selectors = {
 
     section_exists_flag:  '.rules-section-header [name$=_exists]',
     group_condition:      '.rules-group-header [name$=_cond]',
+    rule_stype:           '.rule-stype-container [name$=_section_type]',
     rule_filter:          '.rule-filter-container [name$=_filter]',
     rule_operator:        '.rule-operator-container [name$=_operator]',
     rule_value:           '.rule-value-container [name*=_value_]',
@@ -153,6 +155,7 @@ QueryBuilder.DEFAULTS = {
 
     templates: {
         section: null,
+        stypeSelect: null,
         group: null,
         rule: null,
         filterSelect: null,
diff --git a/src/model.js b/src/model.js
index df02b19d..a716050d 100644
--- a/src/model.js
+++ b/src/model.js
@@ -232,7 +232,7 @@ var Group = function(parent, $el) {
     Node.call(this, parent, $el);
 
     this.rules = [];
-    this.section = null;
+    this.section_id = null;
     this.__.condition = null;
 };
 
@@ -283,7 +283,7 @@ Group.prototype._appendNode = function(node, index, trigger) {
     this.rules.splice(index, 0, node);
     node.parent = this;
     if (!(node instanceof Section)) {
-        node.section = this.section;
+        node.section_id = this.section_id;
     }
 
     if (trigger && this.model !== null) {
@@ -320,7 +320,6 @@ Group.prototype.addRule = function($el, index) {
  * @return {Section} the inserted section
  */
 Group.prototype.addSection = function($el, index) {
-    console.log($el);
     return this._appendNode(new Section(this, $el), index, true);
 };
 
@@ -425,7 +424,7 @@ var Rule = function(parent, $el) {
 
     Node.call(this, parent, $el);
 
-    this.section = null;
+    this.section_id = null;
 
     this.__.filter = null;
     this.__.operator = null;
@@ -452,6 +451,7 @@ var Section = function(parent, $el) {
     Node.call(this, parent, $el);
 
     this.group = null;
+    this.__.id = null;
     this.__.exists = null;
 };
 
@@ -468,13 +468,20 @@ defineModelProperties(Section, ['exists']);
 Section.prototype.setGroup = function($el) {
     this.group = new Group(this, $el);
     this.group.parent = this;
-    this.group.section = this;
+    this.group.section_id = this.id;
     if (this.model !== null) {
         this.model.trigger('set', this.group);
     }
     return this.group;
 };
 
+/**
+ * Clear out all rules
+ */
+Section.prototype.empty = function() {
+    this.group.empty();
+};
+
 /**
  * Delete self
  */
diff --git a/src/template.js b/src/template.js
index b8808303..56d32fd4 100644
--- a/src/template.js
+++ b/src/template.js
@@ -47,7 +47,7 @@ QueryBuilder.templates.section = '\
         </button> \
       {{?}} \
     </div> \
-    <div class="btn-group section-exist-options"> \
+    <div class="btn-group section-exists-options"> \
       {{~ it.exist_options: option }} \
         <label class="btn btn-xs btn-primary"> \
           <input type="radio" name="{{= it.section_id }}_exists" value="{{= option }}"> {{= it.lang.exist_options[option] || option }} \
@@ -58,10 +58,21 @@ QueryBuilder.templates.section = '\
       <div class="error-container"><i class="{{= it.icons.error }}"></i></div> \
     {{?}} \
   </dt> \
+  <div class="rule-stype-container"></div> \
   <dd class="rules-section-body"> \
   </dd> \
 </dl>';
 
+QueryBuilder.templates.stypeSelect = '\
+<select class="form-control" name="{{= it.section.id }}_section_type"> \
+  {{? it.settings.display_empty_stype_filter }} \
+    <option value="-1">{{= it.settings.select_placeholder }}</option> \
+  {{?}} \
+  {{~ it.stypes: stype }} \
+    <option value="{{= stype.id }}">{{= it.translate(stype.label) }}</option> \
+  {{~}} \
+</select>';
+
 QueryBuilder.templates.rule = '\
 <li id="{{= it.rule_id }}" class="rule-container"> \
   <div class="rule-header"> \
@@ -125,7 +136,6 @@ QueryBuilder.templates.operatorSelect = '\
  * @return {string}
  */
 QueryBuilder.prototype.getGroupTemplate = function(group_id, level, in_section) {
-    console.log(in_section);
     var h = this.templates.group({
         builder: this,
         group_id: group_id,
@@ -178,6 +188,26 @@ QueryBuilder.prototype.getSectionTemplate = function(section_id, level) {
     return this.change('getSectionTemplate', h);
 };
 
+/**
+ * Returns section type <select> HTML
+ * @param section {Section}
+ * @param stypes {array}
+ * @return {string}
+ */
+QueryBuilder.prototype.getSectionTypeSelect = function(section, stypes) {
+    var h = this.templates.stypeSelect({
+        builder: this,
+        section: section,
+        stypes: stypes,
+        icons: this.icons,
+        lang: this.lang,
+        settings: this.settings,
+        translate: this.translateLabel
+    });
+
+    return this.change('getSectionTypeSelect', h, section);
+};
+
 /**
  * Returns rule filter <select> HTML
  * @param rule {Rule}

From ad69458e7f797c758cc7e9588d43f1da779f4030 Mon Sep 17 00:00:00 2001
From: Reha Sterbin <reha@omniti.com>
Date: Thu, 20 Oct 2016 12:13:29 -0400
Subject: [PATCH 04/44] Fixed a bug in swapping the section-exists flag

---
 src/core.js  | 17 +++++++++++------
 src/data.js  |  2 --
 src/model.js |  1 +
 3 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/src/core.js b/src/core.js
index 092858c6..d3c9c402 100644
--- a/src/core.js
+++ b/src/core.js
@@ -255,10 +255,10 @@ QueryBuilder.prototype.bindEvents = function() {
     });
 
     // section exists change
-    this.$el.on('change.queryBuilder', Selectors.section_exists, function() {
+    this.$el.on('change.queryBuilder', Selectors.section_exists_flag, function() {
         if ($(this).is(':checked')) {
-            var $section = $(this).closest(Selectors.section_exists);
-            Model($section).condition = $(this).val();
+            var $section = $(this).closest(Selectors.section_container);
+            Model($section).exists = $(this).val();
         }
     });
 
@@ -378,7 +378,7 @@ QueryBuilder.prototype.bindEvents = function() {
                         break;
                 }
             }
-            else {
+            else if (node instanceof Group) {
                 switch (field) {
                     case 'error':
                         self.displayError(node);
@@ -393,6 +393,13 @@ QueryBuilder.prototype.bindEvents = function() {
                         break;
                 }
             }
+            else if (node instanceof Section) {
+                switch (field) {
+                    case 'exists':
+                        self.updateSectionExistsFlag(node);
+                        break;
+                }
+            }
         }
     });
 };
@@ -709,8 +716,6 @@ QueryBuilder.prototype.deleteRule = function(rule) {
  */
 QueryBuilder.prototype.createRuleFilters = function(rule) {
     if (rule.section_id) {
-        console.log('on create rule filters');
-        console.log(rule.section_id);
         var section = this.getSectionById(rule.section_id);
         if (section) {
             var filters = this.change('getRuleFilters', section.filters, rule);
diff --git a/src/data.js b/src/data.js
index 0c67e255..8cb46d1a 100644
--- a/src/data.js
+++ b/src/data.js
@@ -293,8 +293,6 @@ QueryBuilder.prototype.getFilterById = function(id, sectionId) {
     }
 
     if (sectionId) {
-        console.log('on getFilterById');
-        console.log(sectionId);
         var s = this.getSectionById(sectionId);
         var filters = s ? s.filters : [];
     } else {
diff --git a/src/model.js b/src/model.js
index a716050d..29d09b71 100644
--- a/src/model.js
+++ b/src/model.js
@@ -479,6 +479,7 @@ Section.prototype.setGroup = function($el) {
  * Clear out all rules
  */
 Section.prototype.empty = function() {
+    this.group.section_id = this.id;
     this.group.empty();
 };
 

From b3e29dc092ab79985b1b906e7a97878610482f98 Mon Sep 17 00:00:00 2001
From: Reha Sterbin <reha@omniti.com>
Date: Thu, 20 Oct 2016 14:01:22 -0400
Subject: [PATCH 05/44] Set up json building and validation for sections

---
 src/core.js   |  8 ++++++++
 src/model.js  | 15 +++++++++++++--
 src/public.js | 14 ++++++++++++++
 3 files changed, 35 insertions(+), 2 deletions(-)

diff --git a/src/core.js b/src/core.js
index d3c9c402..270f0ba7 100644
--- a/src/core.js
+++ b/src/core.js
@@ -496,6 +496,8 @@ QueryBuilder.prototype.deleteGroup = function(group) {
         del&= this.deleteRule(rule);
     }, function(group) {
         del&= this.deleteGroup(group);
+    }, function (section) {
+        del&= this.deleteSection(section);
     }, this);
 
     if (del) {
@@ -532,6 +534,10 @@ QueryBuilder.prototype.refreshGroupsConditions = function() {
 
         group.each(function(rule) {}, function(group) {
             walk(group);
+        }, function(section) {
+            if (section.group) {
+                walk(section.group);
+            }
         }, this);
     }(this.model.root));
 };
@@ -920,6 +926,8 @@ QueryBuilder.prototype.clearErrors = function(node) {
             rule.error = null;
         }, function(group) {
             this.clearErrors(group);
+        }, function(section) {
+            this.clearErrors(section.group);
         }, this);
     }
 };
diff --git a/src/model.js b/src/model.js
index 29d09b71..e220705c 100644
--- a/src/model.js
+++ b/src/model.js
@@ -249,6 +249,8 @@ Group.prototype.empty = function() {
         rule.drop();
     }, function(group) {
         group.drop();
+    }, function(section) {
+        section.drop();
     });
 };
 
@@ -352,11 +354,13 @@ Group.prototype.getNodePos = function(node) {
  * @param {boolean,optional} iterate in reverse order, required if you delete nodes
  * @param {function} callback for Rules
  * @param {function,optional} callback for Groups
+ * @param {function,optional} callback for Sections
  * @return {boolean}
  */
-Group.prototype.each = function(reverse, cbRule, cbGroup, context) {
+Group.prototype.each = function(reverse, cbRule, cbGroup, cbSection, context) {
     if (typeof reverse == 'function') {
-        context = cbGroup;
+        context = cbSection;
+        cbSection = cbGroup;
         cbGroup = cbRule;
         cbRule = reverse;
         reverse = false;
@@ -375,6 +379,11 @@ Group.prototype.each = function(reverse, cbRule, cbGroup, context) {
                 stop = cbGroup.call(context, this.rules[i]) === false;
             }
         }
+        else if (this.rules[i] instanceof Section) {
+            if (cbSection !== undefined) {
+                stop = cbSection.call(context, this.rules[i]) === false;
+            }
+        }
         else {
             stop = cbRule.call(context, this.rules[i]) === false;
         }
@@ -406,6 +415,8 @@ Group.prototype.contains = function(node, deep) {
             return true;
         }, function(group) {
             return !group.contains(node, true);
+        }, function(section) {
+            return !section.group.contains(node, true);
         });
     }
 };
diff --git a/src/public.js b/src/public.js
index d74a67b2..673c6972 100644
--- a/src/public.js
+++ b/src/public.js
@@ -109,6 +109,13 @@ QueryBuilder.prototype.validate = function() {
             else {
                 errors++;
             }
+        }, function(section) {
+            if (parse(section.group)) {
+                done++;
+            }
+            else {
+                errors++;
+            }
         });
 
         if (errors > 0) {
@@ -190,6 +197,13 @@ QueryBuilder.prototype.getRules = function(options) {
 
         }, function(model) {
             data.rules.push(parse(model));
+        }, function(model) {
+            var rule = {
+                section: model.id,
+                exists: model.exists,
+            };
+            rule.group = parse(model.group);
+            data.rules.push(rule);
         });
 
         return data;

From 9a34dfa6ef23bf6ab26d07498607a7446cd332b6 Mon Sep 17 00:00:00 2001
From: Reha Sterbin <reha@omniti.com>
Date: Thu, 20 Oct 2016 14:10:46 -0400
Subject: [PATCH 06/44] When switching section types, add an empty rule to the
 group after we clear it out

---
 src/core.js | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/core.js b/src/core.js
index 270f0ba7..a395465c 100644
--- a/src/core.js
+++ b/src/core.js
@@ -542,8 +542,6 @@ QueryBuilder.prototype.refreshGroupsConditions = function() {
     }(this.model.root));
 };
 
-//--section
-
 /**
  * Add a new section
  * @param parent {Group}
@@ -650,13 +648,12 @@ QueryBuilder.prototype.refreshSection = function(model) {
     });
     if (!ok) {
         model.empty();
+        this.addRule(model.group);
     }
 
     this.trigger('afterRefreshSection', model);
 };
 
-//--section
-
 /**
  * Add a new rule
  * @param parent {Group}

From 248f2d9543694ac67005f95125ded31c9c1dd7c7 Mon Sep 17 00:00:00 2001
From: Reha Sterbin <reha@omniti.com>
Date: Mon, 24 Oct 2016 09:19:33 -0400
Subject: [PATCH 07/44] Implemented allow_sections and section flags

---
 src/core.js     | 75 ++++++++++++++++++++++++++++++++++---------------
 src/defaults.js |  3 +-
 src/template.js |  2 +-
 3 files changed, 56 insertions(+), 24 deletions(-)

diff --git a/src/core.js b/src/core.js
index a395465c..87b89e83 100644
--- a/src/core.js
+++ b/src/core.js
@@ -13,7 +13,6 @@ QueryBuilder.prototype.init = function($el, options) {
         group_id: 0,
         rule_id: 0,
         generated_id: false,
-        has_sections: false,
         has_optgroup: false,
         has_operator_oprgroup: false,
         id: null,
@@ -63,9 +62,11 @@ QueryBuilder.prototype.init = function($el, options) {
     this.$el.addClass('query-builder form-inline');
 
     this.filters = this.checkFilters(this.filters);
-    for (var k in this.sections) {
-        if (this.sections.hasOwnProperty(k)) {
-            this.sections[k].filters = this.checkFilters(this.sections[k].filters);
+    if (this.settings.allow_sections) {
+        for (var k in this.sections) {
+            if (this.sections.hasOwnProperty(k)) {
+                this.sections[k].filters = this.checkFilters(this.sections[k].filters);
+            }
         }
     }
     this.operators = this.checkOperators(this.operators);
@@ -254,23 +255,6 @@ QueryBuilder.prototype.bindEvents = function() {
         }
     });
 
-    // section exists change
-    this.$el.on('change.queryBuilder', Selectors.section_exists_flag, function() {
-        if ($(this).is(':checked')) {
-            var $section = $(this).closest(Selectors.section_container);
-            Model($section).exists = $(this).val();
-        }
-    });
-
-    // section type change
-    this.$el.on('change.queryBuilder', Selectors.rule_stype, function() {
-        var sid = $(this).val();
-        var $section = $(this).closest(Selectors.section_container);
-        var model = Model($section)
-        model.id = sid;
-        self.refreshSection(model);
-    });
-
     // rule filter change
     this.$el.on('change.queryBuilder', Selectors.rule_filter, function() {
         var $rule = $(this).closest(Selectors.rule_container);
@@ -310,7 +294,24 @@ QueryBuilder.prototype.bindEvents = function() {
         });
     }
 
-    if (this.settings.allow_sections !== 0) {
+    if (this.settings.allow_sections) {
+        // section exists change
+        this.$el.on('change.queryBuilder', Selectors.section_exists_flag, function() {
+            if ($(this).is(':checked')) {
+                var $section = $(this).closest(Selectors.section_container);
+                Model($section).exists = $(this).val();
+            }
+        });
+
+        // section type change
+        this.$el.on('change.queryBuilder', Selectors.rule_stype, function() {
+            var sid = $(this).val();
+            var $section = $(this).closest(Selectors.section_container);
+            var model = Model($section)
+            model.id = sid;
+            self.refreshSection(model);
+        });
+
         // add section button
         this.$el.on('click.queryBuilder', Selectors.add_section, function() {
             var $section = $(this).closest(Selectors.group_container);
@@ -398,6 +399,9 @@ QueryBuilder.prototype.bindEvents = function() {
                     case 'exists':
                         self.updateSectionExistsFlag(node);
                         break;
+                    case 'flags':
+                        self.applySectionFlags(node);
+                        break;
                 }
             }
         }
@@ -905,6 +909,33 @@ QueryBuilder.prototype.applyGroupFlags = function(group) {
     this.trigger('afterApplyGroupFlags', group);
 };
 
+/**
+ * Change section properties depending on flags.
+ * @param section {Section}
+ */
+QueryBuilder.prototype.applySectionFlags = function(section) {
+    var flags = section.flags;
+
+    if (flags.exists_readonly) {
+        section.$el.find('>' + Selectors.section_exists_flag).prop('disabled', true)
+            .parent().addClass('readonly');
+    }
+    if (flags.no_add_rule) {
+        section.$el.find(Selectors.add_rule).remove();
+    }
+    if (flags.no_add_group) {
+        section.$el.find(Selectors.add_group).remove();
+    }
+    if (flags.no_delete) {
+        section.$el.find(Selectors.delete_section).remove();
+    }
+    this.trigger('afterApplySectionFlags', section);
+
+    if (section.group) {
+        this.applyGroupFlags(section.group);
+    }
+};
+
 /**
  * Clear all errors markers
  * @param node {Node,optional} default is root Group
diff --git a/src/defaults.js b/src/defaults.js
index f495a2db..1991b532 100644
--- a/src/defaults.js
+++ b/src/defaults.js
@@ -119,11 +119,12 @@ QueryBuilder.DEFAULTS = {
 
     sort_filters: false,
     display_errors: true,
-    allow_sections: -1,
     allow_groups: -1,
     allow_empty: false,
     conditions: ['AND', 'OR'],
     default_condition: 'AND',
+    allow_sections: false,
+    default_section: null,
     exist_options: ['EXISTS', 'DOES NOT EXIST'],
     default_exists: 'EXISTS',
     inputs_separator: ' , ',
diff --git a/src/template.js b/src/template.js
index 56d32fd4..b5e87599 100644
--- a/src/template.js
+++ b/src/template.js
@@ -10,7 +10,7 @@ QueryBuilder.templates.group = '\
           <i class="{{= it.icons.add_group }}"></i> {{= it.lang.add_group }} \
         </button> \
       {{?}} \
-      {{? !it.in_section }} \
+      {{? it.settings.allow_sections && !it.in_section }} \
         <button type="button" class="btn btn-xs btn-success" data-add="section"> \
           <i class="{{= it.icons.add_section }}"></i> {{= it.lang.add_section }} \
         </button> \

From 989967e6b0624fe6d0cc16a6d3737efa1607f676 Mon Sep 17 00:00:00 2001
From: Reha Sterbin <reha@omniti.com>
Date: Mon, 24 Oct 2016 09:19:59 -0400
Subject: [PATCH 08/44] Set allow_sections in the example

---
 examples/index.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/examples/index.html b/examples/index.html
index 900113fe..e7515571 100644
--- a/examples/index.html
+++ b/examples/index.html
@@ -119,6 +119,7 @@ <h3>Output</h3>
 
 var options = {
   allow_empty: true,
+  allow_sections: true,
 
   //default_filter: 'name',
   sort_filters: true,
@@ -520,7 +521,6 @@ <h3>Output</h3>
     }
   }]
 };
-console.log(options);
 
 // init
 $('#builder').queryBuilder(options);

From 6d249e8b2a9c904798d03caa3dcb13735dba6876 Mon Sep 17 00:00:00 2001
From: Reha Sterbin <reha@omniti.com>
Date: Mon, 24 Oct 2016 12:31:44 -0400
Subject: [PATCH 09/44] Unless we have a default section id, create the section
 with no group and add one when an id is selected

---
 src/core.js     | 37 ++++++++++++++++++++++++-------------
 src/defaults.js |  1 +
 src/model.js    |  8 ++++----
 src/template.js |  8 +++-----
 4 files changed, 32 insertions(+), 22 deletions(-)

diff --git a/src/core.js b/src/core.js
index 87b89e83..1dcf3a80 100644
--- a/src/core.js
+++ b/src/core.js
@@ -579,12 +579,9 @@ QueryBuilder.prototype.addSection = function(parent, addRule, data, flags) {
 
     if (this.settings.default_section) {
         model.id = this.settings.default_section;
-    } else {
-        model.id = this.sections[0].id;
+        this.addGroup(model, true, data, flags);
     }
 
-    this.addGroup(model, true, data, flags);
-
     return model;
 };
 
@@ -642,17 +639,31 @@ QueryBuilder.prototype.createSectionTypes = function(section) {
  */
 QueryBuilder.prototype.refreshSection = function(model) {
 
-    // Clear out the section if there's any rule that don't belong
-    var ok = true;
-    model.$el.find(Selectors.rule_container).each(function() {
-        var rule = Model($(this));
-        if (rule.section_id != model.id) {
-            ok = false;
+    if (model.id) {
+        // Clear out the section if there's any group or rule that don't belong
+        var ok = true;
+        model.$el.find(Selectors.group_container).each(function() {
+            var group = Model($(this));
+            if (group.section_id != model.id) {
+                ok = false;
+            }
+        });
+        if (ok) {
+            model.$el.find(Selectors.rule_container).each(function() {
+                var rule = Model($(this));
+                if (rule.section_id != model.id) {
+                    ok = false;
+                }
+            });
         }
-    });
-    if (!ok) {
+        if (!ok) {
+            model.empty();
+        }
+        if (!model.group) {
+            var group = this.addGroup(model, true);
+        }
+    } else {
         model.empty();
-        this.addRule(model.group);
     }
 
     this.trigger('afterRefreshSection', model);
diff --git a/src/defaults.js b/src/defaults.js
index 1991b532..0288cfd4 100644
--- a/src/defaults.js
+++ b/src/defaults.js
@@ -130,6 +130,7 @@ QueryBuilder.DEFAULTS = {
     inputs_separator: ' , ',
     select_placeholder: '------',
     display_empty_filter: true,
+    display_empty_stype_filter: true,
     default_filter: null,
     optgroups: {},
 
diff --git a/src/model.js b/src/model.js
index e220705c..6b6f2b6f 100644
--- a/src/model.js
+++ b/src/model.js
@@ -147,7 +147,7 @@ Node.prototype.getPos = function() {
 Node.prototype.drop = function() {
     var model = this.model;
 
-    if (!this.isRoot()) {
+    if (!this.isRoot() && this.parent instanceof Group) {
         this.parent._removeNode(this);
     }
 
@@ -490,15 +490,15 @@ Section.prototype.setGroup = function($el) {
  * Clear out all rules
  */
 Section.prototype.empty = function() {
-    this.group.section_id = this.id;
-    this.group.empty();
+    this.group.drop();
+    this.group = null;
 };
 
 /**
  * Delete self
  */
 Section.prototype.drop = function() {
-    this.group.empty();
+    this.group.drop();
     Node.prototype.drop.call(this);
 };
 
diff --git a/src/template.js b/src/template.js
index b5e87599..6c128d80 100644
--- a/src/template.js
+++ b/src/template.js
@@ -41,11 +41,9 @@ QueryBuilder.templates.section = '\
 <dl id="{{= it.section_id }}" class="rules-section-container"> \
   <dt class="rules-section-header"> \
     <div class="btn-section pull-right section-actions"> \
-      {{? it.level>1 }} \
-        <button type="button" class="btn btn-xs btn-danger" data-delete="section"> \
-          <i class="{{= it.icons.remove_section }}"></i> {{= it.lang.delete_section }} \
-        </button> \
-      {{?}} \
+      <button type="button" class="btn btn-xs btn-danger" data-delete="section"> \
+        <i class="{{= it.icons.remove_section }}"></i> {{= it.lang.delete_section }} \
+      </button> \
     </div> \
     <div class="btn-group section-exists-options"> \
       {{~ it.exist_options: option }} \

From 6e1d3ad1641184e4df98ad95f6f8786410054dbd Mon Sep 17 00:00:00 2001
From: Reha Sterbin <reha@omniti.com>
Date: Fri, 14 Oct 2016 12:57:08 -0400
Subject: [PATCH 10/44] Began work on adding sections (placeholder commit)

---
 src/core.js      | 118 ++++++++++++++++++++++++++++++++++++++++++++++-
 src/data.js      |   8 ++++
 src/defaults.js  |  36 ++++++++++++---
 src/i18n/en.json |   9 +++-
 src/model.js     |  66 +++++++++++++++++++++++++-
 src/template.js  |  56 +++++++++++++++++++++-
 6 files changed, 281 insertions(+), 12 deletions(-)

diff --git a/src/core.js b/src/core.js
index 33138413..7efca268 100644
--- a/src/core.js
+++ b/src/core.js
@@ -9,9 +9,11 @@ QueryBuilder.prototype.init = function($el, options) {
     this.settings = $.extendext(true, 'replace', {}, QueryBuilder.DEFAULTS, options);
     this.model = new Model();
     this.status = {
+        section_id: 0,
         group_id: 0,
         rule_id: 0,
         generated_id: false,
+        has_sections: false,
         has_optgroup: false,
         has_operator_oprgroup: false,
         id: null,
@@ -28,6 +30,7 @@ QueryBuilder.prototype.init = function($el, options) {
 
     // SETTINGS SHORTCUTS
     this.filters = this.settings.filters;
+    this.sections = this.settings.sections;
     this.icons = this.settings.icons;
     this.operators = this.settings.operators;
     this.templates = this.settings.templates;
@@ -60,7 +63,13 @@ QueryBuilder.prototype.init = function($el, options) {
     this.$el.addClass('query-builder form-inline');
 
     this.filters = this.checkFilters(this.filters);
+    for (var k in this.sections) {
+        if (this.sections.hasOwnProperty(k)) {
+            this.sections[k].filters = this.checkFilters(this.sections[k].filters);
+        }
+    }
     this.operators = this.checkOperators(this.operators);
+
     this.bindEvents();
     this.initPlugins();
 
@@ -245,6 +254,14 @@ QueryBuilder.prototype.bindEvents = function() {
         }
     });
 
+    // section exists change
+    this.$el.on('change.queryBuilder', Selectors.section_exists, function() {
+        if ($(this).is(':checked')) {
+            var $section = $(this).closest(Selectors.section_exists);
+            Model($section).condition = $(this).val();
+        }
+    });
+
     // rule filter change
     this.$el.on('change.queryBuilder', Selectors.rule_filter, function() {
         var $rule = $(this).closest(Selectors.rule_container);
@@ -283,6 +300,20 @@ QueryBuilder.prototype.bindEvents = function() {
         });
     }
 
+    if (this.settings.allow_sections !== 0) {
+        // add section button
+        this.$el.on('click.queryBuilder', Selectors.add_section, function() {
+            var $section = $(this).closest(Selectors.group_container);
+            self.addSection(Model($section));
+        });
+
+        // delete section button
+        this.$el.on('click.queryBuilder', Selectors.delete_section, function() {
+            var $section = $(this).closest(Selectors.section_container);
+            self.deleteSection(Model($section));
+        });
+    }
+
     // model events
     this.model.on({
         'drop': function(e, node) {
@@ -298,6 +329,10 @@ QueryBuilder.prototype.bindEvents = function() {
             }
             self.refreshGroupsConditions();
         },
+        'set': function(e, node) {
+            node.parent.$el.find('>' + Selectors.section_body).empty().append(node.$el);
+            self.updateSectionExistsFlag(node.section);
+        },
         'move': function(e, node, group, index) {
             node.$el.detach();
 
@@ -402,8 +437,14 @@ QueryBuilder.prototype.addGroup = function(parent, addRule, data, flags) {
     }
 
     var group_id = this.nextGroupId();
-    var $group = $(this.getGroupTemplate(group_id, level));
-    var model = parent.addGroup($group);
+    var $group = $(this.getGroupTemplate(group_id, level, parent instanceof Section || parent.section ? true : false));
+    console.log(parent);
+    if (parent instanceof Section) {
+        var model = parent.setGroup($group);
+    } else {
+        var model = parent.addGroup($group);
+    }
+    console.log(model);
 
     model.data = data;
     model.flags = $.extend({}, this.settings.default_group_flags, flags);
@@ -480,6 +521,79 @@ QueryBuilder.prototype.refreshGroupsConditions = function() {
     }(this.model.root));
 };
 
+//--section
+
+/**
+ * Add a new section
+ * @param parent {Group}
+ * @param addRule {bool,optional} add a default empty rule
+ * @param data {mixed,optional} section custom data
+ * @param flags {object,optional} flags to apply to the section
+ * @return section {Section}
+ */
+QueryBuilder.prototype.addSection = function(parent, addRule, data, flags) {
+    addRule = (addRule === undefined || addRule === true);
+
+    var level = parent.level + 1;
+
+    var e = this.trigger('beforeAddSection', parent, addRule, level);
+    if (e.isDefaultPrevented()) {
+        return null;
+    }
+
+    var section_id = this.nextSectionId();
+    var $section = $(this.getSectionTemplate(section_id, level));
+    var model = parent.addSection($section);
+
+    model.data = data;
+    model.flags = $.extend({}, this.settings.default_section_flags, flags);
+
+    this.trigger('afterAddSection', model);
+
+    model.exists = this.settings.default_exists;
+
+    this.addGroup(model, true, data, flags);
+
+    return model;
+};
+
+/**
+ * Tries to delete a section. The section is not deleted if at least one rule is no_delete.
+ * @param section {Section}
+ * @return {boolean} true if the section has been deleted
+ */
+QueryBuilder.prototype.deleteSection = function(section) {
+    var e = this.trigger('beforeDeleteSection', section);
+    if (e.isDefaultPrevented()) {
+        return false;
+    }
+
+    if (!this.deleteGroup(section.group)) {
+        return false;
+    }
+
+    section.drop();
+    this.trigger('afterDeleteSection');
+
+    return true;
+};
+
+/**
+ * Changes the exists setting of a section
+ * @param section {Section}
+ */
+QueryBuilder.prototype.updateSectionExistsFlag = function(section) {
+    section.$el.find('>' + Selectors.section_exists_flag).each(function() {
+        var $this = $(this);
+        $this.prop('checked', $this.val() === section.exists);
+        $this.parent().toggleClass('active', $this.val() === section.exists);
+    });
+
+    this.trigger('afterUpdateSectionExistsFlag', section);
+};
+
+//--section
+
 /**
  * Add a new rule
  * @param parent {Group}
diff --git a/src/data.js b/src/data.js
index 6cb5a28e..d8082985 100644
--- a/src/data.js
+++ b/src/data.js
@@ -212,6 +212,14 @@ QueryBuilder.prototype.nextRuleId = function() {
     return this.status.id + '_rule_' + (this.status.rule_id++);
 };
 
+/**
+ * Returns an incremented section ID
+ * @return {string}
+ */
+QueryBuilder.prototype.nextSectionId = function() {
+    return this.status.id + '_section_' + (this.status.section_id++);
+};
+
 /**
  * Returns the operators for a filter
  * @param filter {string|object} (filter id name or filter object)
diff --git a/src/defaults.js b/src/defaults.js
index fffde6f5..b2dbd84d 100644
--- a/src/defaults.js
+++ b/src/defaults.js
@@ -28,6 +28,7 @@ QueryBuilder.inputs = [
 QueryBuilder.modifiable_options = [
     'display_errors',
     'allow_groups',
+    'allow_sections',
     'allow_empty',
     'default_condition',
     'default_filter'
@@ -37,6 +38,7 @@ QueryBuilder.modifiable_options = [
  * CSS selectors for common components
  */
 var Selectors = QueryBuilder.selectors = {
+    section_container:    '.rules-section-container',
     group_container:      '.rules-group-container',
     rule_container:       '.rule-container',
     filter_container:     '.rule-filter-container',
@@ -45,13 +47,17 @@ var Selectors = QueryBuilder.selectors = {
     error_container:      '.error-container',
     condition_container:  '.rules-group-header .group-conditions',
 
-    rule_header:          '.rule-header',
+    section_header:       '.rules-section-header',
     group_header:         '.rules-group-header',
+    rule_header:          '.rule-header',
+    section_actions:      '.section-actions',
     group_actions:        '.group-actions',
     rule_actions:         '.rule-actions',
 
+    section_body:         '.rules-section-body',
     rules_list:           '.rules-group-body>.rules-list',
 
+    section_exists_flag:  '.rules-section-header [name$=_exists]',
     group_condition:      '.rules-group-header [name$=_cond]',
     rule_filter:          '.rule-filter-container [name$=_filter]',
     rule_operator:        '.rule-operator-container [name$=_operator]',
@@ -60,7 +66,9 @@ var Selectors = QueryBuilder.selectors = {
     add_rule:             '[data-add=rule]',
     delete_rule:          '[data-delete=rule]',
     add_group:            '[data-add=group]',
-    delete_group:         '[data-delete=group]'
+    delete_group:         '[data-delete=group]',
+    add_section:          '[data-add=section]',
+    delete_section:       '[data-delete=section]'
 };
 
 /**
@@ -104,14 +112,18 @@ QueryBuilder.OPERATORS = {
  */
 QueryBuilder.DEFAULTS = {
     filters: [],
+    sections: [],
     plugins: [],
 
     sort_filters: false,
     display_errors: true,
+    allow_sections: -1,
     allow_groups: -1,
     allow_empty: false,
     conditions: ['AND', 'OR'],
     default_condition: 'AND',
+    exist_options: ['EXISTS', 'DOES NOT EXIST'],
+    default_exists: 'EXISTS',
     inputs_separator: ' , ',
     select_placeholder: '------',
     display_empty_filter: true,
@@ -132,7 +144,15 @@ QueryBuilder.DEFAULTS = {
         no_delete: false
     },
 
+    default_section_flags: {
+        exists_readonly: false,
+        no_add_rule: false,
+        no_add_group: false,
+        no_delete: false
+    },
+
     templates: {
+        section: null,
         group: null,
         rule: null,
         filterSelect: null,
@@ -166,10 +186,12 @@ QueryBuilder.DEFAULTS = {
     ],
 
     icons: {
-        add_group:    'glyphicon glyphicon-plus-sign',
-        add_rule:     'glyphicon glyphicon-plus',
-        remove_group: 'glyphicon glyphicon-remove',
-        remove_rule:  'glyphicon glyphicon-remove',
-        error:        'glyphicon glyphicon-warning-sign'
+        add_section:    'glyphicon glyphicon-plus-sign',
+        add_group:      'glyphicon glyphicon-plus-sign',
+        add_rule:       'glyphicon glyphicon-plus',
+        remove_section: 'glyphicon glyphicon-remove',
+        remove_group:   'glyphicon glyphicon-remove',
+        remove_rule:    'glyphicon glyphicon-remove',
+        error:          'glyphicon glyphicon-warning-sign'
     }
 };
diff --git a/src/i18n/en.json b/src/i18n/en.json
index b5828139..60c0d07e 100644
--- a/src/i18n/en.json
+++ b/src/i18n/en.json
@@ -4,14 +4,21 @@
 
   "add_rule": "Add rule",
   "add_group": "Add group",
+  "add_section": "Add section",
   "delete_rule": "Delete",
   "delete_group": "Delete",
+  "delete_section": "Delete",
 
   "conditions": {
     "AND": "AND",
     "OR": "OR"
   },
 
+  "exist_options": {
+    "EXISTS": "EXISTS",
+    "NOT EXISTS": "DOES NOT EXIST"
+  },
+
   "operators": {
     "equal": "equal",
     "not_equal": "not equal",
@@ -58,4 +65,4 @@
     "boolean_not_valid": "Not a boolean",
     "operator_not_multiple": "Operator {0} cannot accept multiple values"
   }
-}
\ No newline at end of file
+}
diff --git a/src/model.js b/src/model.js
index 39db5988..e532ac6c 100644
--- a/src/model.js
+++ b/src/model.js
@@ -221,7 +221,7 @@ Node.prototype._move = function(group, index) {
 // GROUP CLASS
 // ===============================
 /**
- * @param {Group}
+ * @param {Group|Section}
  * @param {jQuery}
  */
 var Group = function(parent, $el) {
@@ -232,6 +232,7 @@ var Group = function(parent, $el) {
     Node.call(this, parent, $el);
 
     this.rules = [];
+    this.section = null;
     this.__.condition = null;
 };
 
@@ -281,6 +282,9 @@ Group.prototype._appendNode = function(node, index, trigger) {
 
     this.rules.splice(index, 0, node);
     node.parent = this;
+    if (!(node instanceof Section)) {
+        node.section = this.section;
+    }
 
     if (trigger && this.model !== null) {
         this.model.trigger('add', node, index);
@@ -309,6 +313,17 @@ Group.prototype.addRule = function($el, index) {
     return this._appendNode(new Rule(this, $el), index, true);
 };
 
+/**
+ * Add a Section by jQuery element at specified index
+ * @param {jQuery}
+ * @param {int,optional}
+ * @return {Section} the inserted section
+ */
+Group.prototype.addSection = function($el, index) {
+    console.log($el);
+    return this._appendNode(new Section(this, $el), index, true);
+};
+
 /**
  * Delete a specific Node
  * @param {Node}
@@ -410,6 +425,8 @@ var Rule = function(parent, $el) {
 
     Node.call(this, parent, $el);
 
+    this.section = null;
+
     this.__.filter = null;
     this.__.operator = null;
     this.__.flags = {};
@@ -421,8 +438,55 @@ Rule.prototype.constructor = Rule;
 
 Model.defineModelProperties(Rule, ['filter', 'operator', 'value']);
 
+// Section CLASS
+// ===============================
+/**
+ * @param {Section}
+ * @param {jQuery}
+ */
+var Section = function(parent, $el) {
+    if (!(this instanceof Section)) {
+        return new Section(parent, $el);
+    }
+
+    Node.call(this, parent, $el);
+
+    this.group = null;
+    this.__.exists = null;
+};
+
+Section.prototype = Object.create(Node.prototype);
+Section.prototype.constructor = Section;
+
+defineModelProperties(Section, ['exists']);
+
+/**
+ * Set the root group of the section by jQuery element
+ * @param {jQuery}
+ * @return {Group} the new root group
+ */
+Section.prototype.setGroup = function($el) {
+    this.group = new Group(this, $el);
+    this.group.parent = this;
+    this.group.section = this;
+    if (this.model !== null) {
+        this.model.trigger('set', this.group);
+    }
+    return this.group;
+};
+
+/**
+ * Delete self
+ */
+Section.prototype.drop = function() {
+    this.group.empty();
+    Node.prototype.drop.call(this);
+};
+
 
 // EXPORT
 // ===============================
 QueryBuilder.Group = Group;
 QueryBuilder.Rule = Rule;
+QueryBuilder.Section = Section;
+
diff --git a/src/template.js b/src/template.js
index 3a2756e4..b8808303 100644
--- a/src/template.js
+++ b/src/template.js
@@ -10,6 +10,11 @@ QueryBuilder.templates.group = '\
           <i class="{{= it.icons.add_group }}"></i> {{= it.lang.add_group }} \
         </button> \
       {{?}} \
+      {{? !it.in_section }} \
+        <button type="button" class="btn btn-xs btn-success" data-add="section"> \
+          <i class="{{= it.icons.add_section }}"></i> {{= it.lang.add_section }} \
+        </button> \
+      {{?}} \
       {{? it.level>1 }} \
         <button type="button" class="btn btn-xs btn-danger" data-delete="group"> \
           <i class="{{= it.icons.remove_group }}"></i> {{= it.lang.delete_group }} \
@@ -32,6 +37,31 @@ QueryBuilder.templates.group = '\
   </dd> \
 </dl>';
 
+QueryBuilder.templates.section = '\
+<dl id="{{= it.section_id }}" class="rules-section-container"> \
+  <dt class="rules-section-header"> \
+    <div class="btn-section pull-right section-actions"> \
+      {{? it.level>1 }} \
+        <button type="button" class="btn btn-xs btn-danger" data-delete="section"> \
+          <i class="{{= it.icons.remove_section }}"></i> {{= it.lang.delete_section }} \
+        </button> \
+      {{?}} \
+    </div> \
+    <div class="btn-group section-exist-options"> \
+      {{~ it.exist_options: option }} \
+        <label class="btn btn-xs btn-primary"> \
+          <input type="radio" name="{{= it.section_id }}_exists" value="{{= option }}"> {{= it.lang.exist_options[option] || option }} \
+        </label> \
+      {{~}} \
+    </div> \
+    {{? it.settings.display_errors }} \
+      <div class="error-container"><i class="{{= it.icons.error }}"></i></div> \
+    {{?}} \
+  </dt> \
+  <dd class="rules-section-body"> \
+  </dd> \
+</dl>';
+
 QueryBuilder.templates.rule = '\
 <li id="{{= it.rule_id }}" class="rule-container"> \
   <div class="rule-header"> \
@@ -91,13 +121,16 @@ QueryBuilder.templates.operatorSelect = '\
  * Returns group HTML
  * @param group_id {string}
  * @param level {int}
+ * @param in_section {bool}
  * @return {string}
  */
-QueryBuilder.prototype.getGroupTemplate = function(group_id, level) {
+QueryBuilder.prototype.getGroupTemplate = function(group_id, level, in_section) {
+    console.log(in_section);
     var h = this.templates.group({
         builder: this,
         group_id: group_id,
         level: level,
+        in_section: in_section,
         conditions: this.settings.conditions,
         icons: this.icons,
         lang: this.lang,
@@ -124,6 +157,27 @@ QueryBuilder.prototype.getRuleTemplate = function(rule_id) {
     return this.change('getRuleTemplate', h);
 };
 
+/**
+ * Returns section HTML
+ * @param group_id {string}
+ * @param level {int}
+ * @param in_section {bool}
+ * @return {string}
+ */
+QueryBuilder.prototype.getSectionTemplate = function(section_id, level) {
+    var h = this.templates.section({
+        builder: this,
+        section_id: section_id,
+        level: level,
+        exist_options: this.settings.exist_options,
+        icons: this.icons,
+        lang: this.lang,
+        settings: this.settings
+    });
+
+    return this.change('getSectionTemplate', h);
+};
+
 /**
  * Returns rule filter <select> HTML
  * @param rule {Rule}

From 4440b58407ffb581191de0c4b93e42614dbb4155 Mon Sep 17 00:00:00 2001
From: Reha Sterbin <reha@omniti.com>
Date: Fri, 14 Oct 2016 13:27:45 -0400
Subject: [PATCH 11/44] Set basic styles for sections

---
 src/scss/dark.scss    |  3 +++
 src/scss/default.scss | 31 +++++++++++++++++++++++++++++++
 2 files changed, 34 insertions(+)

diff --git a/src/scss/dark.scss b/src/scss/dark.scss
index 02e50e56..b9b11bad 100644
--- a/src/scss/dark.scss
+++ b/src/scss/dark.scss
@@ -3,6 +3,9 @@ $theme-name: dark;
 $group-background-color: rgba(50, 70, 80, .5);
 $group-border-color: #00164A;
 
+$section-background-color: rgba(100, 120, 130, .5);
+$section-border-color: #181E21;
+
 $rule-background-color: rgba(40, 40, 40, .9);
 $rule-border-color: #111;
 
diff --git a/src/scss/default.scss b/src/scss/default.scss
index 1008a7fd..c4c80735 100644
--- a/src/scss/default.scss
+++ b/src/scss/default.scss
@@ -10,6 +10,12 @@ $group-border-color: #DCC896 !default;
 $group-border: 1px solid $group-border-color !default;
 $group-padding: 10px !default;
 
+// sections
+$section-background-color: rgba(196, 173, 237, .5) !default;
+$section-border-color: #AD92DB !default;
+$section-border: 1px solid $section-border-color !default;
+$section-padding: 10px !default;
+
 // rules
 $rule-background-color: rgba(255, 255, 255, .9) !default;
 $rule-border-color: #EEE !default;
@@ -107,6 +113,31 @@ $ticks-position: 5px, 10px !default;
     }
   }
 
+  // SECTIONS
+  .rules-section-container {
+    @extend %base-container;
+
+    padding: $section-padding;
+    padding-bottom: #{$section-padding - $item-vertical-spacing};
+    border: $section-border;
+    background: $section-background-color;
+  }
+
+  .rules-section-header {
+    margin-bottom: $section-padding;
+
+    .section-exists-options {
+      .btn.readonly:not(.active),
+      input[name$=_exists] {
+        display: none;
+      }
+
+      .btn.readonly {
+        border-radius: 3px;
+      }
+    }
+  }
+
   // ERRORS
   .error-container {
     @extend %rule-component;

From 8094d4995ae601a35c1545f46e4ebc9287c4a76f Mon Sep 17 00:00:00 2001
From: Reha Sterbin <reha@omniti.com>
Date: Thu, 20 Oct 2016 09:13:51 -0400
Subject: [PATCH 12/44] Partially working type selection

---
 examples/index.html | 121 ++++++++++++++++++++++++++++++++++++++++++++
 src/core.js         |  73 +++++++++++++++++++++++---
 src/data.js         |  37 ++++++++++++--
 src/defaults.js     |   3 ++
 src/model.js        |  17 +++++--
 src/template.js     |  34 ++++++++++++-
 6 files changed, 268 insertions(+), 17 deletions(-)

diff --git a/examples/index.html b/examples/index.html
index 205d2a06..9a098689 100644
--- a/examples/index.html
+++ b/examples/index.html
@@ -124,6 +124,126 @@ <h3>Output</h3>
   //default_filter: 'name',
   sort_filters: true,
 
+  sections: [
+    {
+      id: 'subquery-a',
+      label: 'Subquery A',
+      filters: [
+        {
+          id: 'sqa-name',
+          label: {
+            en: 'Subquery A Name',
+            fr: 'Nom'
+          },
+          type: 'string',
+          optgroup: 'core',
+          default_value: 'Subquery Name',
+          size: 30,
+          unique: true
+        },
+        {
+          id: 'sqa-category',
+          label: 'Subquery A Category',
+          type: 'integer',
+          input: 'checkbox',
+          optgroup: 'core',
+          values: {
+            1: 'Books',
+            2: 'Movies',
+            3: 'Music',
+            4: 'Tools',
+            5: 'Goodies',
+            6: 'Clothes'
+          },
+          colors: {
+            1: 'foo',
+            2: 'warning',
+            5: 'success'
+          },
+          operators: ['in', 'not_in', 'equal', 'not_equal', 'is_null', 'is_not_null']
+        }
+      ]
+    },
+    {
+      id: 'subquery-b',
+      label: 'Subquery B',
+      filters: [
+        {
+          id: 'sqb-name',
+          label: {
+            en: 'Subquery B Name',
+            fr: 'Nom'
+          },
+          type: 'string',
+          optgroup: 'core',
+          default_value: 'Subquery Name',
+          size: 30,
+          unique: true
+        },
+        {
+          id: 'sqb-category',
+          label: 'Subquery B Category',
+          type: 'integer',
+          input: 'checkbox',
+          optgroup: 'core',
+          values: {
+            1: 'Books',
+            2: 'Movies',
+            3: 'Music',
+            4: 'Tools',
+            5: 'Goodies',
+            6: 'Clothes'
+          },
+          colors: {
+            1: 'foo',
+            2: 'warning',
+            5: 'success'
+          },
+          operators: ['in', 'not_in', 'equal', 'not_equal', 'is_null', 'is_not_null']
+        }
+      ]
+    },
+    {
+      id: 'subquery-c',
+      label: 'Subquery C',
+      filters: [
+        {
+          id: 'sqc-name',
+          label: {
+            en: 'Subquery C Name',
+            fr: 'Nom'
+          },
+          type: 'string',
+          optgroup: 'core',
+          default_value: 'Subquery Name',
+          size: 30,
+          unique: true
+        },
+        {
+          id: 'sqc-category',
+          label: 'Subquery C Category',
+          type: 'integer',
+          input: 'checkbox',
+          optgroup: 'core',
+          values: {
+            1: 'Books',
+            2: 'Movies',
+            3: 'Music',
+            4: 'Tools',
+            5: 'Goodies',
+            6: 'Clothes'
+          },
+          colors: {
+            1: 'foo',
+            2: 'warning',
+            5: 'success'
+          },
+          operators: ['in', 'not_in', 'equal', 'not_equal', 'is_null', 'is_not_null']
+        }
+      ]
+    }
+  ],
+
   optgroups: {
     core: {
       en: 'Core',
@@ -406,6 +526,7 @@ <h3>Output</h3>
     }
   }]
 };
+console.log(options);
 
 // init
 $('#builder').queryBuilder(options);
diff --git a/src/core.js b/src/core.js
index 7efca268..6ec52beb 100644
--- a/src/core.js
+++ b/src/core.js
@@ -262,10 +262,20 @@ QueryBuilder.prototype.bindEvents = function() {
         }
     });
 
+    // section type change
+    this.$el.on('change.queryBuilder', Selectors.rule_stype, function() {
+        var sid = $(this).val();
+        var $section = $(this).closest(Selectors.section_container);
+        var model = Model($section)
+        model.id = sid;
+        self.refreshSection(model);
+    });
+
     // rule filter change
     this.$el.on('change.queryBuilder', Selectors.rule_filter, function() {
         var $rule = $(this).closest(Selectors.rule_container);
-        Model($rule).filter = self.getFilterById($(this).val());
+        var m = Model($rule);
+        m.filter = self.getFilterById($(this).val(), m.section_id);
     });
 
     // rule operator change
@@ -331,7 +341,7 @@ QueryBuilder.prototype.bindEvents = function() {
         },
         'set': function(e, node) {
             node.parent.$el.find('>' + Selectors.section_body).empty().append(node.$el);
-            self.updateSectionExistsFlag(node.section);
+            self.updateSectionExistsFlag(node.parent);
         },
         'move': function(e, node, group, index) {
             node.$el.detach();
@@ -437,14 +447,12 @@ QueryBuilder.prototype.addGroup = function(parent, addRule, data, flags) {
     }
 
     var group_id = this.nextGroupId();
-    var $group = $(this.getGroupTemplate(group_id, level, parent instanceof Section || parent.section ? true : false));
-    console.log(parent);
+    var $group = $(this.getGroupTemplate(group_id, level, parent instanceof Section || parent.section_id ? true : false));
     if (parent instanceof Section) {
         var model = parent.setGroup($group);
     } else {
         var model = parent.addGroup($group);
     }
-    console.log(model);
 
     model.data = data;
     model.flags = $.extend({}, this.settings.default_group_flags, flags);
@@ -552,6 +560,14 @@ QueryBuilder.prototype.addSection = function(parent, addRule, data, flags) {
 
     model.exists = this.settings.default_exists;
 
+    this.createSectionTypes(model);
+
+    if (this.settings.default_section) {
+        model.id = this.settings.default_section;
+    } else {
+        model.id = this.sections[0].id;
+    }
+
     this.addGroup(model, true, data, flags);
 
     return model;
@@ -592,6 +608,40 @@ QueryBuilder.prototype.updateSectionExistsFlag = function(section) {
     this.trigger('afterUpdateSectionExistsFlag', section);
 };
 
+/**
+ * Create the type <select> for a section
+ * @param section {Section}
+ */
+QueryBuilder.prototype.createSectionTypes = function(section) {
+    var stypes = this.change('getSectionTypes', this.sections, section);
+    var $stypesSelect = $(this.getSectionTypeSelect(section, stypes));
+
+    section.$el.find(Selectors.stype_container).html($stypesSelect);
+
+    this.trigger('afterCreateSectionStypes', section);
+};
+
+/**
+ * Refreshes a section after a type change
+ * @param section {Section}
+ */
+QueryBuilder.prototype.refreshSection = function(model) {
+
+    // Clear out the section if there's any rule that don't belong
+    var ok = true;
+    model.$el.find(Selectors.rule_container).each(function() {
+        var rule = Model($(this));
+        if (rule.section_id != model.id) {
+            ok = false;
+        }
+    });
+    if (!ok) {
+        model.empty();
+    }
+
+    this.trigger('afterRefreshSection', model);
+};
+
 //--section
 
 /**
@@ -658,7 +708,18 @@ QueryBuilder.prototype.deleteRule = function(rule) {
  * @param rule {Rule}
  */
 QueryBuilder.prototype.createRuleFilters = function(rule) {
-    var filters = this.change('getRuleFilters', this.filters, rule);
+    if (rule.section_id) {
+        console.log('on create rule filters');
+        console.log(rule.section_id);
+        var section = this.getSectionById(rule.section_id);
+        if (section) {
+            var filters = this.change('getRuleFilters', section.filters, rule);
+        } else {
+            var filters = this.change('getRuleFilters', [], rule);
+        }
+    } else {
+        var filters = this.change('getRuleFilters', this.filters, rule);
+    }
     var $filterSelect = $(this.getRuleFilterSelect(rule, filters));
 
     rule.$el.find(Selectors.filter_container).html($filterSelect);
diff --git a/src/data.js b/src/data.js
index d8082985..d76f4487 100644
--- a/src/data.js
+++ b/src/data.js
@@ -220,6 +220,26 @@ QueryBuilder.prototype.nextSectionId = function() {
     return this.status.id + '_section_' + (this.status.section_id++);
 };
 
+/**
+ * Returns a particular section by its id
+ * @throws UndefinedSectionError
+ * @param sectionId {string}
+ * @return {object|null}
+ */
+QueryBuilder.prototype.getSectionById = function(id) {
+    if (id == '-1') {
+        return null;
+    }
+
+    for (var i = 0, l = this.sections.length; i < l; i++) {
+        if (this.sections[i].id == id) {
+            return this.sections[i];
+        }
+    }
+
+    Utils.error('UndefinedSection', 'Undefined section "{0}"', id);
+};
+
 /**
  * Returns the operators for a filter
  * @param filter {string|object} (filter id name or filter object)
@@ -261,16 +281,25 @@ QueryBuilder.prototype.getOperators = function(filter) {
  * Returns a particular filter by its id
  * @throws UndefinedFilterError
  * @param filterId {string}
+ * @param sectionId {string|null}
  * @return {object|null}
  */
-QueryBuilder.prototype.getFilterById = function(id) {
+QueryBuilder.prototype.getFilterById = function(id, sectionId) {
     if (id == '-1') {
         return null;
     }
 
-    for (var i = 0, l = this.filters.length; i < l; i++) {
-        if (this.filters[i].id == id) {
-            return this.filters[i];
+    if (sectionId) {
+        console.log('on getFilterById');
+        console.log(sectionId);
+        var s = this.getSectionById(sectionId);
+        var filters = s ? s.filters : [];
+    } else {
+        var filters = this.filters;
+    }
+    for (var i = 0, l = filters.length; i < l; i++) {
+        if (filters[i].id == id) {
+            return filters[i];
         }
     }
 
diff --git a/src/defaults.js b/src/defaults.js
index b2dbd84d..f495a2db 100644
--- a/src/defaults.js
+++ b/src/defaults.js
@@ -41,6 +41,7 @@ var Selectors = QueryBuilder.selectors = {
     section_container:    '.rules-section-container',
     group_container:      '.rules-group-container',
     rule_container:       '.rule-container',
+    stype_container:      '.rule-stype-container',
     filter_container:     '.rule-filter-container',
     operator_container:   '.rule-operator-container',
     value_container:      '.rule-value-container',
@@ -59,6 +60,7 @@ var Selectors = QueryBuilder.selectors = {
 
     section_exists_flag:  '.rules-section-header [name$=_exists]',
     group_condition:      '.rules-group-header [name$=_cond]',
+    rule_stype:           '.rule-stype-container [name$=_section_type]',
     rule_filter:          '.rule-filter-container [name$=_filter]',
     rule_operator:        '.rule-operator-container [name$=_operator]',
     rule_value:           '.rule-value-container [name*=_value_]',
@@ -153,6 +155,7 @@ QueryBuilder.DEFAULTS = {
 
     templates: {
         section: null,
+        stypeSelect: null,
         group: null,
         rule: null,
         filterSelect: null,
diff --git a/src/model.js b/src/model.js
index e532ac6c..f2202fc6 100644
--- a/src/model.js
+++ b/src/model.js
@@ -232,7 +232,7 @@ var Group = function(parent, $el) {
     Node.call(this, parent, $el);
 
     this.rules = [];
-    this.section = null;
+    this.section_id = null;
     this.__.condition = null;
 };
 
@@ -283,7 +283,7 @@ Group.prototype._appendNode = function(node, index, trigger) {
     this.rules.splice(index, 0, node);
     node.parent = this;
     if (!(node instanceof Section)) {
-        node.section = this.section;
+        node.section_id = this.section_id;
     }
 
     if (trigger && this.model !== null) {
@@ -320,7 +320,6 @@ Group.prototype.addRule = function($el, index) {
  * @return {Section} the inserted section
  */
 Group.prototype.addSection = function($el, index) {
-    console.log($el);
     return this._appendNode(new Section(this, $el), index, true);
 };
 
@@ -425,7 +424,7 @@ var Rule = function(parent, $el) {
 
     Node.call(this, parent, $el);
 
-    this.section = null;
+    this.section_id = null;
 
     this.__.filter = null;
     this.__.operator = null;
@@ -452,6 +451,7 @@ var Section = function(parent, $el) {
     Node.call(this, parent, $el);
 
     this.group = null;
+    this.__.id = null;
     this.__.exists = null;
 };
 
@@ -468,13 +468,20 @@ defineModelProperties(Section, ['exists']);
 Section.prototype.setGroup = function($el) {
     this.group = new Group(this, $el);
     this.group.parent = this;
-    this.group.section = this;
+    this.group.section_id = this.id;
     if (this.model !== null) {
         this.model.trigger('set', this.group);
     }
     return this.group;
 };
 
+/**
+ * Clear out all rules
+ */
+Section.prototype.empty = function() {
+    this.group.empty();
+};
+
 /**
  * Delete self
  */
diff --git a/src/template.js b/src/template.js
index b8808303..56d32fd4 100644
--- a/src/template.js
+++ b/src/template.js
@@ -47,7 +47,7 @@ QueryBuilder.templates.section = '\
         </button> \
       {{?}} \
     </div> \
-    <div class="btn-group section-exist-options"> \
+    <div class="btn-group section-exists-options"> \
       {{~ it.exist_options: option }} \
         <label class="btn btn-xs btn-primary"> \
           <input type="radio" name="{{= it.section_id }}_exists" value="{{= option }}"> {{= it.lang.exist_options[option] || option }} \
@@ -58,10 +58,21 @@ QueryBuilder.templates.section = '\
       <div class="error-container"><i class="{{= it.icons.error }}"></i></div> \
     {{?}} \
   </dt> \
+  <div class="rule-stype-container"></div> \
   <dd class="rules-section-body"> \
   </dd> \
 </dl>';
 
+QueryBuilder.templates.stypeSelect = '\
+<select class="form-control" name="{{= it.section.id }}_section_type"> \
+  {{? it.settings.display_empty_stype_filter }} \
+    <option value="-1">{{= it.settings.select_placeholder }}</option> \
+  {{?}} \
+  {{~ it.stypes: stype }} \
+    <option value="{{= stype.id }}">{{= it.translate(stype.label) }}</option> \
+  {{~}} \
+</select>';
+
 QueryBuilder.templates.rule = '\
 <li id="{{= it.rule_id }}" class="rule-container"> \
   <div class="rule-header"> \
@@ -125,7 +136,6 @@ QueryBuilder.templates.operatorSelect = '\
  * @return {string}
  */
 QueryBuilder.prototype.getGroupTemplate = function(group_id, level, in_section) {
-    console.log(in_section);
     var h = this.templates.group({
         builder: this,
         group_id: group_id,
@@ -178,6 +188,26 @@ QueryBuilder.prototype.getSectionTemplate = function(section_id, level) {
     return this.change('getSectionTemplate', h);
 };
 
+/**
+ * Returns section type <select> HTML
+ * @param section {Section}
+ * @param stypes {array}
+ * @return {string}
+ */
+QueryBuilder.prototype.getSectionTypeSelect = function(section, stypes) {
+    var h = this.templates.stypeSelect({
+        builder: this,
+        section: section,
+        stypes: stypes,
+        icons: this.icons,
+        lang: this.lang,
+        settings: this.settings,
+        translate: this.translateLabel
+    });
+
+    return this.change('getSectionTypeSelect', h, section);
+};
+
 /**
  * Returns rule filter <select> HTML
  * @param rule {Rule}

From 323bfc49f8356e08a2bf03059ab1847577b44067 Mon Sep 17 00:00:00 2001
From: Reha Sterbin <reha@omniti.com>
Date: Thu, 20 Oct 2016 12:13:29 -0400
Subject: [PATCH 13/44] Fixed a bug in swapping the section-exists flag

---
 src/core.js  | 17 +++++++++++------
 src/data.js  |  2 --
 src/model.js |  1 +
 3 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/src/core.js b/src/core.js
index 6ec52beb..a65a1f98 100644
--- a/src/core.js
+++ b/src/core.js
@@ -255,10 +255,10 @@ QueryBuilder.prototype.bindEvents = function() {
     });
 
     // section exists change
-    this.$el.on('change.queryBuilder', Selectors.section_exists, function() {
+    this.$el.on('change.queryBuilder', Selectors.section_exists_flag, function() {
         if ($(this).is(':checked')) {
-            var $section = $(this).closest(Selectors.section_exists);
-            Model($section).condition = $(this).val();
+            var $section = $(this).closest(Selectors.section_container);
+            Model($section).exists = $(this).val();
         }
     });
 
@@ -378,7 +378,7 @@ QueryBuilder.prototype.bindEvents = function() {
                         break;
                 }
             }
-            else {
+            else if (node instanceof Group) {
                 switch (field) {
                     case 'error':
                         self.displayError(node);
@@ -393,6 +393,13 @@ QueryBuilder.prototype.bindEvents = function() {
                         break;
                 }
             }
+            else if (node instanceof Section) {
+                switch (field) {
+                    case 'exists':
+                        self.updateSectionExistsFlag(node);
+                        break;
+                }
+            }
         }
     });
 };
@@ -709,8 +716,6 @@ QueryBuilder.prototype.deleteRule = function(rule) {
  */
 QueryBuilder.prototype.createRuleFilters = function(rule) {
     if (rule.section_id) {
-        console.log('on create rule filters');
-        console.log(rule.section_id);
         var section = this.getSectionById(rule.section_id);
         if (section) {
             var filters = this.change('getRuleFilters', section.filters, rule);
diff --git a/src/data.js b/src/data.js
index d76f4487..ef544cc9 100644
--- a/src/data.js
+++ b/src/data.js
@@ -290,8 +290,6 @@ QueryBuilder.prototype.getFilterById = function(id, sectionId) {
     }
 
     if (sectionId) {
-        console.log('on getFilterById');
-        console.log(sectionId);
         var s = this.getSectionById(sectionId);
         var filters = s ? s.filters : [];
     } else {
diff --git a/src/model.js b/src/model.js
index f2202fc6..4f980f55 100644
--- a/src/model.js
+++ b/src/model.js
@@ -479,6 +479,7 @@ Section.prototype.setGroup = function($el) {
  * Clear out all rules
  */
 Section.prototype.empty = function() {
+    this.group.section_id = this.id;
     this.group.empty();
 };
 

From f945379288f92e35266947e45020819911112317 Mon Sep 17 00:00:00 2001
From: Reha Sterbin <reha@omniti.com>
Date: Thu, 20 Oct 2016 14:01:22 -0400
Subject: [PATCH 14/44] Set up json building and validation for sections

---
 src/core.js   |  8 ++++++++
 src/model.js  | 15 +++++++++++++--
 src/public.js | 16 +++++++++++++++-
 3 files changed, 36 insertions(+), 3 deletions(-)

diff --git a/src/core.js b/src/core.js
index a65a1f98..cf0a7f70 100644
--- a/src/core.js
+++ b/src/core.js
@@ -496,6 +496,8 @@ QueryBuilder.prototype.deleteGroup = function(group) {
         del&= this.deleteRule(rule);
     }, function(group) {
         del&= this.deleteGroup(group);
+    }, function (section) {
+        del&= this.deleteSection(section);
     }, this);
 
     if (del) {
@@ -532,6 +534,10 @@ QueryBuilder.prototype.refreshGroupsConditions = function() {
 
         group.each(function(rule) {}, function(group) {
             walk(group);
+        }, function(section) {
+            if (section.group) {
+                walk(section.group);
+            }
         }, this);
     }(this.model.root));
 };
@@ -928,6 +934,8 @@ QueryBuilder.prototype.clearErrors = function(node) {
             rule.error = null;
         }, function(group) {
             this.clearErrors(group);
+        }, function(section) {
+            this.clearErrors(section.group);
         }, this);
     }
 };
diff --git a/src/model.js b/src/model.js
index 4f980f55..d01edb9c 100644
--- a/src/model.js
+++ b/src/model.js
@@ -249,6 +249,8 @@ Group.prototype.empty = function() {
         rule.drop();
     }, function(group) {
         group.drop();
+    }, function(section) {
+        section.drop();
     });
 };
 
@@ -352,11 +354,13 @@ Group.prototype.getNodePos = function(node) {
  * @param {boolean,optional} iterate in reverse order, required if you delete nodes
  * @param {function} callback for Rules
  * @param {function,optional} callback for Groups
+ * @param {function,optional} callback for Sections
  * @return {boolean}
  */
-Group.prototype.each = function(reverse, cbRule, cbGroup, context) {
+Group.prototype.each = function(reverse, cbRule, cbGroup, cbSection, context) {
     if (typeof reverse == 'function') {
-        context = cbGroup;
+        context = cbSection;
+        cbSection = cbGroup;
         cbGroup = cbRule;
         cbRule = reverse;
         reverse = false;
@@ -375,6 +379,11 @@ Group.prototype.each = function(reverse, cbRule, cbGroup, context) {
                 stop = cbGroup.call(context, this.rules[i]) === false;
             }
         }
+        else if (this.rules[i] instanceof Section) {
+            if (cbSection !== undefined) {
+                stop = cbSection.call(context, this.rules[i]) === false;
+            }
+        }
         else {
             stop = cbRule.call(context, this.rules[i]) === false;
         }
@@ -406,6 +415,8 @@ Group.prototype.contains = function(node, deep) {
             return true;
         }, function(group) {
             return !group.contains(node, true);
+        }, function(section) {
+            return !section.group.contains(node, true);
         });
     }
 };
diff --git a/src/public.js b/src/public.js
index 9c503043..431ab2b7 100644
--- a/src/public.js
+++ b/src/public.js
@@ -109,6 +109,13 @@ QueryBuilder.prototype.validate = function() {
             else {
                 errors++;
             }
+        }, function(section) {
+            if (parse(section.group)) {
+                done++;
+            }
+            else {
+                errors++;
+            }
         });
 
         if (errors > 0) {
@@ -190,7 +197,14 @@ QueryBuilder.prototype.getRules = function(options) {
 
         }, function(model) {
             groupData.rules.push(parse(model));
-        }, this);
+        }, function(model) {
+            var rule = {
+                section: model.id,
+                exists: model.exists,
+            };
+            rule.group = parse(model.group);
+            groupData.rules.push(rule);
+        });
 
         return self.change('groupToJson', groupData, group);
 

From e7e09dfbde37b7ee487c0e96c81a561cd1ef8ab0 Mon Sep 17 00:00:00 2001
From: Reha Sterbin <reha@omniti.com>
Date: Thu, 20 Oct 2016 14:10:46 -0400
Subject: [PATCH 15/44] When switching section types, add an empty rule to the
 group after we clear it out

---
 src/core.js | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/core.js b/src/core.js
index cf0a7f70..4f1cba89 100644
--- a/src/core.js
+++ b/src/core.js
@@ -542,8 +542,6 @@ QueryBuilder.prototype.refreshGroupsConditions = function() {
     }(this.model.root));
 };
 
-//--section
-
 /**
  * Add a new section
  * @param parent {Group}
@@ -650,13 +648,12 @@ QueryBuilder.prototype.refreshSection = function(model) {
     });
     if (!ok) {
         model.empty();
+        this.addRule(model.group);
     }
 
     this.trigger('afterRefreshSection', model);
 };
 
-//--section
-
 /**
  * Add a new rule
  * @param parent {Group}

From a771cf4016692ba5ec32752c3c3699b69edb62b3 Mon Sep 17 00:00:00 2001
From: Reha Sterbin <reha@omniti.com>
Date: Mon, 24 Oct 2016 09:19:33 -0400
Subject: [PATCH 16/44] Implemented allow_sections and section flags

---
 src/core.js     | 75 ++++++++++++++++++++++++++++++++++---------------
 src/defaults.js |  3 +-
 src/template.js |  2 +-
 3 files changed, 56 insertions(+), 24 deletions(-)

diff --git a/src/core.js b/src/core.js
index 4f1cba89..d216a696 100644
--- a/src/core.js
+++ b/src/core.js
@@ -13,7 +13,6 @@ QueryBuilder.prototype.init = function($el, options) {
         group_id: 0,
         rule_id: 0,
         generated_id: false,
-        has_sections: false,
         has_optgroup: false,
         has_operator_oprgroup: false,
         id: null,
@@ -63,9 +62,11 @@ QueryBuilder.prototype.init = function($el, options) {
     this.$el.addClass('query-builder form-inline');
 
     this.filters = this.checkFilters(this.filters);
-    for (var k in this.sections) {
-        if (this.sections.hasOwnProperty(k)) {
-            this.sections[k].filters = this.checkFilters(this.sections[k].filters);
+    if (this.settings.allow_sections) {
+        for (var k in this.sections) {
+            if (this.sections.hasOwnProperty(k)) {
+                this.sections[k].filters = this.checkFilters(this.sections[k].filters);
+            }
         }
     }
     this.operators = this.checkOperators(this.operators);
@@ -254,23 +255,6 @@ QueryBuilder.prototype.bindEvents = function() {
         }
     });
 
-    // section exists change
-    this.$el.on('change.queryBuilder', Selectors.section_exists_flag, function() {
-        if ($(this).is(':checked')) {
-            var $section = $(this).closest(Selectors.section_container);
-            Model($section).exists = $(this).val();
-        }
-    });
-
-    // section type change
-    this.$el.on('change.queryBuilder', Selectors.rule_stype, function() {
-        var sid = $(this).val();
-        var $section = $(this).closest(Selectors.section_container);
-        var model = Model($section)
-        model.id = sid;
-        self.refreshSection(model);
-    });
-
     // rule filter change
     this.$el.on('change.queryBuilder', Selectors.rule_filter, function() {
         var $rule = $(this).closest(Selectors.rule_container);
@@ -310,7 +294,24 @@ QueryBuilder.prototype.bindEvents = function() {
         });
     }
 
-    if (this.settings.allow_sections !== 0) {
+    if (this.settings.allow_sections) {
+        // section exists change
+        this.$el.on('change.queryBuilder', Selectors.section_exists_flag, function() {
+            if ($(this).is(':checked')) {
+                var $section = $(this).closest(Selectors.section_container);
+                Model($section).exists = $(this).val();
+            }
+        });
+
+        // section type change
+        this.$el.on('change.queryBuilder', Selectors.rule_stype, function() {
+            var sid = $(this).val();
+            var $section = $(this).closest(Selectors.section_container);
+            var model = Model($section)
+            model.id = sid;
+            self.refreshSection(model);
+        });
+
         // add section button
         this.$el.on('click.queryBuilder', Selectors.add_section, function() {
             var $section = $(this).closest(Selectors.group_container);
@@ -398,6 +399,9 @@ QueryBuilder.prototype.bindEvents = function() {
                     case 'exists':
                         self.updateSectionExistsFlag(node);
                         break;
+                    case 'flags':
+                        self.applySectionFlags(node);
+                        break;
                 }
             }
         }
@@ -913,6 +917,33 @@ QueryBuilder.prototype.applyGroupFlags = function(group) {
     this.trigger('afterApplyGroupFlags', group);
 };
 
+/**
+ * Change section properties depending on flags.
+ * @param section {Section}
+ */
+QueryBuilder.prototype.applySectionFlags = function(section) {
+    var flags = section.flags;
+
+    if (flags.exists_readonly) {
+        section.$el.find('>' + Selectors.section_exists_flag).prop('disabled', true)
+            .parent().addClass('readonly');
+    }
+    if (flags.no_add_rule) {
+        section.$el.find(Selectors.add_rule).remove();
+    }
+    if (flags.no_add_group) {
+        section.$el.find(Selectors.add_group).remove();
+    }
+    if (flags.no_delete) {
+        section.$el.find(Selectors.delete_section).remove();
+    }
+    this.trigger('afterApplySectionFlags', section);
+
+    if (section.group) {
+        this.applyGroupFlags(section.group);
+    }
+};
+
 /**
  * Clear all errors markers
  * @param node {Node,optional} default is root Group
diff --git a/src/defaults.js b/src/defaults.js
index f495a2db..1991b532 100644
--- a/src/defaults.js
+++ b/src/defaults.js
@@ -119,11 +119,12 @@ QueryBuilder.DEFAULTS = {
 
     sort_filters: false,
     display_errors: true,
-    allow_sections: -1,
     allow_groups: -1,
     allow_empty: false,
     conditions: ['AND', 'OR'],
     default_condition: 'AND',
+    allow_sections: false,
+    default_section: null,
     exist_options: ['EXISTS', 'DOES NOT EXIST'],
     default_exists: 'EXISTS',
     inputs_separator: ' , ',
diff --git a/src/template.js b/src/template.js
index 56d32fd4..b5e87599 100644
--- a/src/template.js
+++ b/src/template.js
@@ -10,7 +10,7 @@ QueryBuilder.templates.group = '\
           <i class="{{= it.icons.add_group }}"></i> {{= it.lang.add_group }} \
         </button> \
       {{?}} \
-      {{? !it.in_section }} \
+      {{? it.settings.allow_sections && !it.in_section }} \
         <button type="button" class="btn btn-xs btn-success" data-add="section"> \
           <i class="{{= it.icons.add_section }}"></i> {{= it.lang.add_section }} \
         </button> \

From d9959dd99ce3e6248a599f0b5ffe316948db05ae Mon Sep 17 00:00:00 2001
From: Reha Sterbin <reha@omniti.com>
Date: Mon, 24 Oct 2016 09:19:59 -0400
Subject: [PATCH 17/44] Set allow_sections in the example

---
 examples/index.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/examples/index.html b/examples/index.html
index 9a098689..c714a377 100644
--- a/examples/index.html
+++ b/examples/index.html
@@ -120,6 +120,7 @@ <h3>Output</h3>
 
 var options = {
   allow_empty: true,
+  allow_sections: true,
 
   //default_filter: 'name',
   sort_filters: true,
@@ -526,7 +527,6 @@ <h3>Output</h3>
     }
   }]
 };
-console.log(options);
 
 // init
 $('#builder').queryBuilder(options);

From 543b87becbd78b5c94695d9990679f679061c78f Mon Sep 17 00:00:00 2001
From: Reha Sterbin <reha@omniti.com>
Date: Mon, 24 Oct 2016 12:31:44 -0400
Subject: [PATCH 18/44] Unless we have a default section id, create the section
 with no group and add one when an id is selected

---
 src/core.js     | 37 ++++++++++++++++++++++++-------------
 src/defaults.js |  1 +
 src/model.js    |  8 ++++----
 src/template.js |  8 +++-----
 4 files changed, 32 insertions(+), 22 deletions(-)

diff --git a/src/core.js b/src/core.js
index d216a696..1557e1bd 100644
--- a/src/core.js
+++ b/src/core.js
@@ -579,12 +579,9 @@ QueryBuilder.prototype.addSection = function(parent, addRule, data, flags) {
 
     if (this.settings.default_section) {
         model.id = this.settings.default_section;
-    } else {
-        model.id = this.sections[0].id;
+        this.addGroup(model, true, data, flags);
     }
 
-    this.addGroup(model, true, data, flags);
-
     return model;
 };
 
@@ -642,17 +639,31 @@ QueryBuilder.prototype.createSectionTypes = function(section) {
  */
 QueryBuilder.prototype.refreshSection = function(model) {
 
-    // Clear out the section if there's any rule that don't belong
-    var ok = true;
-    model.$el.find(Selectors.rule_container).each(function() {
-        var rule = Model($(this));
-        if (rule.section_id != model.id) {
-            ok = false;
+    if (model.id) {
+        // Clear out the section if there's any group or rule that don't belong
+        var ok = true;
+        model.$el.find(Selectors.group_container).each(function() {
+            var group = Model($(this));
+            if (group.section_id != model.id) {
+                ok = false;
+            }
+        });
+        if (ok) {
+            model.$el.find(Selectors.rule_container).each(function() {
+                var rule = Model($(this));
+                if (rule.section_id != model.id) {
+                    ok = false;
+                }
+            });
         }
-    });
-    if (!ok) {
+        if (!ok) {
+            model.empty();
+        }
+        if (!model.group) {
+            var group = this.addGroup(model, true);
+        }
+    } else {
         model.empty();
-        this.addRule(model.group);
     }
 
     this.trigger('afterRefreshSection', model);
diff --git a/src/defaults.js b/src/defaults.js
index 1991b532..0288cfd4 100644
--- a/src/defaults.js
+++ b/src/defaults.js
@@ -130,6 +130,7 @@ QueryBuilder.DEFAULTS = {
     inputs_separator: ' , ',
     select_placeholder: '------',
     display_empty_filter: true,
+    display_empty_stype_filter: true,
     default_filter: null,
     optgroups: {},
 
diff --git a/src/model.js b/src/model.js
index d01edb9c..b07db08f 100644
--- a/src/model.js
+++ b/src/model.js
@@ -147,7 +147,7 @@ Node.prototype.getPos = function() {
 Node.prototype.drop = function() {
     var model = this.model;
 
-    if (!this.isRoot()) {
+    if (!this.isRoot() && this.parent instanceof Group) {
         this.parent._removeNode(this);
     }
 
@@ -490,15 +490,15 @@ Section.prototype.setGroup = function($el) {
  * Clear out all rules
  */
 Section.prototype.empty = function() {
-    this.group.section_id = this.id;
-    this.group.empty();
+    this.group.drop();
+    this.group = null;
 };
 
 /**
  * Delete self
  */
 Section.prototype.drop = function() {
-    this.group.empty();
+    this.group.drop();
     Node.prototype.drop.call(this);
 };
 
diff --git a/src/template.js b/src/template.js
index b5e87599..6c128d80 100644
--- a/src/template.js
+++ b/src/template.js
@@ -41,11 +41,9 @@ QueryBuilder.templates.section = '\
 <dl id="{{= it.section_id }}" class="rules-section-container"> \
   <dt class="rules-section-header"> \
     <div class="btn-section pull-right section-actions"> \
-      {{? it.level>1 }} \
-        <button type="button" class="btn btn-xs btn-danger" data-delete="section"> \
-          <i class="{{= it.icons.remove_section }}"></i> {{= it.lang.delete_section }} \
-        </button> \
-      {{?}} \
+      <button type="button" class="btn btn-xs btn-danger" data-delete="section"> \
+        <i class="{{= it.icons.remove_section }}"></i> {{= it.lang.delete_section }} \
+      </button> \
     </div> \
     <div class="btn-group section-exists-options"> \
       {{~ it.exist_options: option }} \

From 3943f67b692577d22784d41158889dd6744b9ad5 Mon Sep 17 00:00:00 2001
From: Reha Sterbin <reha@omniti.com>
Date: Mon, 24 Oct 2016 16:31:52 -0400
Subject: [PATCH 19/44] Fixed a merge error

---
 src/core.js  |  4 ++--
 src/model.js | 56 +---------------------------------------------------
 2 files changed, 3 insertions(+), 57 deletions(-)

diff --git a/src/core.js b/src/core.js
index 1557e1bd..d8a4e71e 100644
--- a/src/core.js
+++ b/src/core.js
@@ -314,8 +314,8 @@ QueryBuilder.prototype.bindEvents = function() {
 
         // add section button
         this.$el.on('click.queryBuilder', Selectors.add_section, function() {
-            var $section = $(this).closest(Selectors.group_container);
-            self.addSection(Model($section));
+            var $group = $(this).closest(Selectors.group_container);
+            self.addSection(Model($group));
         });
 
         // delete section button
diff --git a/src/model.js b/src/model.js
index 671624ff..4c96f5d0 100644
--- a/src/model.js
+++ b/src/model.js
@@ -469,61 +469,7 @@ var Section = function(parent, $el) {
 Section.prototype = Object.create(Node.prototype);
 Section.prototype.constructor = Section;
 
-defineModelProperties(Section, ['exists']);
-
-/**
- * Set the root group of the section by jQuery element
- * @param {jQuery}
- * @return {Group} the new root group
- */
-Section.prototype.setGroup = function($el) {
-    this.group = new Group(this, $el);
-    this.group.parent = this;
-    this.group.section_id = this.id;
-    if (this.model !== null) {
-        this.model.trigger('set', this.group);
-    }
-    return this.group;
-};
-
-/**
- * Clear out all rules
- */
-Section.prototype.empty = function() {
-    this.group.drop();
-    this.group = null;
-};
-
-/**
- * Delete self
- */
-Section.prototype.drop = function() {
-    this.group.drop();
-    Node.prototype.drop.call(this);
-};
-
-// Section CLASS
-// ===============================
-/**
- * @param {Section}
- * @param {jQuery}
- */
-var Section = function(parent, $el) {
-    if (!(this instanceof Section)) {
-        return new Section(parent, $el);
-    }
-
-    Node.call(this, parent, $el);
-
-    this.group = null;
-    this.__.id = null;
-    this.__.exists = null;
-};
-
-Section.prototype = Object.create(Node.prototype);
-Section.prototype.constructor = Section;
-
-defineModelProperties(Section, ['exists']);
+Model.defineModelProperties(Section, ['exists']);
 
 /**
  * Set the root group of the section by jQuery element

From 3dfdf2929ec150ce30a93a81abcf505893bbc41a Mon Sep 17 00:00:00 2001
From: Reha Sterbin <reha@omniti.com>
Date: Mon, 24 Oct 2016 16:37:25 -0400
Subject: [PATCH 20/44] Fixed linting and style errors

---
 src/core.js   | 28 +++++++++++++++++-----------
 src/data.js   |  8 +++++---
 src/public.js |  2 +-
 3 files changed, 23 insertions(+), 15 deletions(-)

diff --git a/src/core.js b/src/core.js
index d8a4e71e..0a6812f8 100644
--- a/src/core.js
+++ b/src/core.js
@@ -307,7 +307,7 @@ QueryBuilder.prototype.bindEvents = function() {
         this.$el.on('change.queryBuilder', Selectors.rule_stype, function() {
             var sid = $(this).val();
             var $section = $(this).closest(Selectors.section_container);
-            var model = Model($section)
+            var model = Model($section);
             model.id = sid;
             self.refreshSection(model);
         });
@@ -459,10 +459,12 @@ QueryBuilder.prototype.addGroup = function(parent, addRule, data, flags) {
 
     var group_id = this.nextGroupId();
     var $group = $(this.getGroupTemplate(group_id, level, parent instanceof Section || parent.section_id ? true : false));
+    var model = null;
     if (parent instanceof Section) {
-        var model = parent.setGroup($group);
-    } else {
-        var model = parent.addGroup($group);
+        model = parent.setGroup($group);
+    }
+    else {
+        model = parent.addGroup($group);
     }
 
     model.data = data;
@@ -500,7 +502,7 @@ QueryBuilder.prototype.deleteGroup = function(group) {
         del&= this.deleteRule(rule);
     }, function(group) {
         del&= this.deleteGroup(group);
-    }, function (section) {
+    }, function(section) {
         del&= this.deleteSection(section);
     }, this);
 
@@ -662,7 +664,8 @@ QueryBuilder.prototype.refreshSection = function(model) {
         if (!model.group) {
             var group = this.addGroup(model, true);
         }
-    } else {
+    }
+    else {
         model.empty();
     }
 
@@ -733,15 +736,18 @@ QueryBuilder.prototype.deleteRule = function(rule) {
  * @param rule {Rule}
  */
 QueryBuilder.prototype.createRuleFilters = function(rule) {
+    var filters = [];
     if (rule.section_id) {
         var section = this.getSectionById(rule.section_id);
         if (section) {
-            var filters = this.change('getRuleFilters', section.filters, rule);
-        } else {
-            var filters = this.change('getRuleFilters', [], rule);
+            filters = this.change('getRuleFilters', section.filters, rule);
         }
-    } else {
-        var filters = this.change('getRuleFilters', this.filters, rule);
+        else {
+            filters = this.change('getRuleFilters', [], rule);
+        }
+    }
+    else {
+        filters = this.change('getRuleFilters', this.filters, rule);
     }
     var $filterSelect = $(this.getRuleFilterSelect(rule, filters));
 
diff --git a/src/data.js b/src/data.js
index ef544cc9..b5feeead 100644
--- a/src/data.js
+++ b/src/data.js
@@ -289,11 +289,13 @@ QueryBuilder.prototype.getFilterById = function(id, sectionId) {
         return null;
     }
 
+    var filters = [];
     if (sectionId) {
         var s = this.getSectionById(sectionId);
-        var filters = s ? s.filters : [];
-    } else {
-        var filters = this.filters;
+        filters = s ? s.filters : [];
+    }
+    else {
+        filters = this.filters;
     }
     for (var i = 0, l = filters.length; i < l; i++) {
         if (filters[i].id == id) {
diff --git a/src/public.js b/src/public.js
index 431ab2b7..f3c1e6ff 100644
--- a/src/public.js
+++ b/src/public.js
@@ -200,7 +200,7 @@ QueryBuilder.prototype.getRules = function(options) {
         }, function(model) {
             var rule = {
                 section: model.id,
-                exists: model.exists,
+                exists: model.exists
             };
             rule.group = parse(model.group);
             groupData.rules.push(rule);

From 1a3fa8733ab570d2f2b073bb86a105cc2cc08c99 Mon Sep 17 00:00:00 2001
From: Reha Sterbin <reha@omniti.com>
Date: Wed, 26 Oct 2016 11:51:08 -0400
Subject: [PATCH 21/44] You can now set section data from JSON

---
 examples/index.html | 23 ++++++++++++++++---
 src/core.js         | 54 +++++++++++++++++++++++++++++++--------------
 src/data.js         | 49 ++++++++++++++++++++++++++++++++++++++--
 src/model.js        | 12 +++++-----
 src/public.js       | 27 ++++++++++++++++++++---
 src/template.js     |  8 +++----
 6 files changed, 139 insertions(+), 34 deletions(-)

diff --git a/examples/index.html b/examples/index.html
index c714a377..c35aca98 100644
--- a/examples/index.html
+++ b/examples/index.html
@@ -567,8 +567,7 @@ <h3>Output</h3>
 });
 
 // set rules
-$('.set').on('click', function() {
-  $('#builder').queryBuilder('setRules', {
+var json_rules = {
     condition: 'AND',
     flags: {
       condition_readonly: true
@@ -584,6 +583,21 @@ <h3>Output</h3>
       data: {
         unit: '€'
       }
+    }, {
+      section: 'subquery-a',
+      exists: 'EXISTS',
+      group: {
+        condition: 'AND',
+        rules: [{
+          id: 'sqa-name',
+          operator: 'equal',
+          value: 'Name Within Subquery A'
+        }, {
+          id: 'sqa-category',
+          operator: 'in',
+          value: [2,3]
+        }]
+      }
     }, {
       id: 'state',
       operator: 'equal',
@@ -610,7 +624,10 @@ <h3>Output</h3>
     }, {
         empty: true
     }]
-  });
+  };
+
+$('.set').on('click', function() {
+  $('#builder').queryBuilder('setRules', json_rules);
 });
 
 // set rules from MongoDB
diff --git a/src/core.js b/src/core.js
index 0a6812f8..5e5e9ff2 100644
--- a/src/core.js
+++ b/src/core.js
@@ -259,7 +259,7 @@ QueryBuilder.prototype.bindEvents = function() {
     this.$el.on('change.queryBuilder', Selectors.rule_filter, function() {
         var $rule = $(this).closest(Selectors.rule_container);
         var m = Model($rule);
-        m.filter = self.getFilterById($(this).val(), m.section_id);
+        m.filter = self.getFilterById($(this).val(), m.section_type_id);
     });
 
     // rule operator change
@@ -396,6 +396,9 @@ QueryBuilder.prototype.bindEvents = function() {
             }
             else if (node instanceof Section) {
                 switch (field) {
+                    case 'type_id':
+                        self.updateSectionTypeId(node);
+                        break;
                     case 'exists':
                         self.updateSectionExistsFlag(node);
                         break;
@@ -458,7 +461,9 @@ QueryBuilder.prototype.addGroup = function(parent, addRule, data, flags) {
     }
 
     var group_id = this.nextGroupId();
-    var $group = $(this.getGroupTemplate(group_id, level, parent instanceof Section || parent.section_id ? true : false));
+    var section_root = parent instanceof Section;
+    var in_section = section_root || parent.section_type_id;
+    var $group = $(this.getGroupTemplate(group_id, level, in_section, section_root));
     var model = null;
     if (parent instanceof Section) {
         model = parent.setGroup($group);
@@ -487,7 +492,7 @@ QueryBuilder.prototype.addGroup = function(parent, addRule, data, flags) {
  * @return {boolean} true if the group has been deleted
  */
 QueryBuilder.prototype.deleteGroup = function(group) {
-    if (group.isRoot()) {
+    if (group.isRoot() || group.parent instanceof Section) {
         return false;
     }
 
@@ -579,9 +584,9 @@ QueryBuilder.prototype.addSection = function(parent, addRule, data, flags) {
 
     this.createSectionTypes(model);
 
-    if (this.settings.default_section) {
-        model.id = this.settings.default_section;
-        this.addGroup(model, true, data, flags);
+    if (addRule && this.settings.default_section) {
+        model.type_id = this.settings.default_section;
+        this.addGroup(model, true);
     }
 
     return model;
@@ -608,6 +613,15 @@ QueryBuilder.prototype.deleteSection = function(section) {
     return true;
 };
 
+/**
+ * Changes the type setting of a section
+ * @param section {Section}
+ */
+QueryBuilder.prototype.updateSectionTypeId = function(section) {
+    section.$el.find(Selectors.rule_stype).val(section.type_id ? section.type_id : '-1');
+    this.trigger('afterUpdateSectionTypeId', section);
+};
+
 /**
  * Changes the exists setting of a section
  * @param section {Section}
@@ -646,14 +660,14 @@ QueryBuilder.prototype.refreshSection = function(model) {
         var ok = true;
         model.$el.find(Selectors.group_container).each(function() {
             var group = Model($(this));
-            if (group.section_id != model.id) {
+            if (group.section_type_id != model.type_id) {
                 ok = false;
             }
         });
         if (ok) {
             model.$el.find(Selectors.rule_container).each(function() {
                 var rule = Model($(this));
-                if (rule.section_id != model.id) {
+                if (rule.section_type_id != model.type_id) {
                     ok = false;
                 }
             });
@@ -699,11 +713,19 @@ QueryBuilder.prototype.addRule = function(parent, data, flags) {
 
     this.createRuleFilters(model);
 
-    if (this.settings.default_filter || !this.settings.display_empty_filter) {
-        model.filter = this.change('getDefaultFilter',
-            this.getFilterById(this.settings.default_filter || this.filters[0].id),
-            model
-        );
+    if (model.section_type_id) {
+        var s = this.getSectionById(model.section_type_id);
+        if (s.default_filter || !this.settings.display_empty_filter) {
+            var d = s.default_filter || s.filters[0].id;
+            model.filter = this.change('getDefaultFilter', this.getFilterById(d, s.id), model);
+        }
+    } else {
+        if (this.settings.default_filter || !this.settings.display_empty_filter) {
+            model.filter = this.change('getDefaultFilter',
+                this.getFilterById(this.settings.default_filter || this.filters[0].id),
+                model
+            );
+        }
     }
 
     return model;
@@ -737,8 +759,8 @@ QueryBuilder.prototype.deleteRule = function(rule) {
  */
 QueryBuilder.prototype.createRuleFilters = function(rule) {
     var filters = [];
-    if (rule.section_id) {
-        var section = this.getSectionById(rule.section_id);
+    if (rule.section_type_id) {
+        var section = this.getSectionById(rule.section_type_id);
         if (section) {
             filters = this.change('getRuleFilters', section.filters, rule);
         }
@@ -767,7 +789,7 @@ QueryBuilder.prototype.createRuleOperators = function(rule) {
         return;
     }
 
-    var operators = this.getOperators(rule.filter);
+    var operators = this.getOperators(rule.filter, rule.section_type_id);
     var $operatorSelect = $(this.getRuleOperatorSelect(rule, operators));
 
     $operatorContainer.html($operatorSelect);
diff --git a/src/data.js b/src/data.js
index b5feeead..47eb0003 100644
--- a/src/data.js
+++ b/src/data.js
@@ -245,9 +245,9 @@ QueryBuilder.prototype.getSectionById = function(id) {
  * @param filter {string|object} (filter id name or filter object)
  * @return {object[]}
  */
-QueryBuilder.prototype.getOperators = function(filter) {
+QueryBuilder.prototype.getOperators = function(filter, sectionId) {
     if (typeof filter == 'string') {
-        filter = this.getFilterById(filter);
+        filter = this.getFilterById(filter, sectionId);
     }
 
     var result = [];
@@ -536,6 +536,51 @@ QueryBuilder.prototype.getGroupFlags = function(flags, all) {
     }
 };
 
+/**
+ * Clean section flags.
+ * @param section {object}
+ * @return {object}
+ */
+QueryBuilder.prototype.parseSectionFlags = function(section) {
+    var flags = $.extend({}, this.settings.default_section_flags);
+
+    if (section.readonly) {
+        $.extend(flags, {
+            exists_readonly: true,
+            no_add_rule: true,
+            no_add_group: true,
+            no_delete: true
+        });
+    }
+
+    if (section.flags) {
+        $.extend(flags, section.flags);
+    }
+
+    return this.change('parseSectionFlags', flags, section);
+};
+
+/**
+ * Get a copy of flags of a section.
+ * @param {object} flags
+ * @param {boolean} all - true to return all flags, false to return only changes from default
+ * @returns {object}
+ */
+QueryBuilder.prototype.getSectionFlags = function(flags, all) {
+    if (all) {
+        return $.extend({}, flags);
+    }
+    else {
+        var ret = {};
+        $.each(this.settings.default_section_flags, function(key, value) {
+            if (flags[key] !== value) {
+                ret[key] = flags[key];
+            }
+        });
+        return ret;
+    }
+};
+
 /**
  * Translate a label
  * @param label {string|object}
diff --git a/src/model.js b/src/model.js
index 4c96f5d0..7e286641 100644
--- a/src/model.js
+++ b/src/model.js
@@ -232,7 +232,7 @@ var Group = function(parent, $el) {
     Node.call(this, parent, $el);
 
     this.rules = [];
-    this.section_id = null;
+    this.section_type_id = null;
     this.__.condition = null;
 };
 
@@ -285,7 +285,7 @@ Group.prototype._appendNode = function(node, index, trigger) {
     this.rules.splice(index, 0, node);
     node.parent = this;
     if (!(node instanceof Section)) {
-        node.section_id = this.section_id;
+        node.section_type_id = this.section_type_id;
     }
 
     if (trigger && this.model !== null) {
@@ -435,7 +435,7 @@ var Rule = function(parent, $el) {
 
     Node.call(this, parent, $el);
 
-    this.section_id = null;
+    this.section_type_id = null;
 
     this.__.filter = null;
     this.__.operator = null;
@@ -462,14 +462,14 @@ var Section = function(parent, $el) {
     Node.call(this, parent, $el);
 
     this.group = null;
-    this.__.id = null;
+    this.__.type_id = null;
     this.__.exists = null;
 };
 
 Section.prototype = Object.create(Node.prototype);
 Section.prototype.constructor = Section;
 
-Model.defineModelProperties(Section, ['exists']);
+Model.defineModelProperties(Section, ['type_id', 'exists']);
 
 /**
  * Set the root group of the section by jQuery element
@@ -479,7 +479,7 @@ Model.defineModelProperties(Section, ['exists']);
 Section.prototype.setGroup = function($el) {
     this.group = new Group(this, $el);
     this.group.parent = this;
-    this.group.section_id = this.id;
+    this.group.section_type_id = this.type_id;
     if (this.model !== null) {
         this.model.trigger('set', this.group);
     }
diff --git a/src/public.js b/src/public.js
index f3c1e6ff..38b9c734 100644
--- a/src/public.js
+++ b/src/public.js
@@ -121,7 +121,7 @@ QueryBuilder.prototype.validate = function() {
         if (errors > 0) {
             return false;
         }
-        else if (done === 0 && (!self.settings.allow_empty || !group.isRoot())) {
+        else if (done === 0 && (!self.settings.allow_empty || !group.isRoot() || !group.parent instanceof Section)) {
             self.triggerValidationError(group, 'empty_group', null);
             return false;
         }
@@ -199,7 +199,7 @@ QueryBuilder.prototype.getRules = function(options) {
             groupData.rules.push(parse(model));
         }, function(model) {
             var rule = {
-                section: model.id,
+                section: model.type_id,
                 exists: model.exists
             };
             rule.group = parse(model.group);
@@ -268,6 +268,27 @@ QueryBuilder.prototype.setRules = function(data) {
                     add(item, model);
                 }
             }
+            else if (item.section !== undefined) {
+                if (!self.settings.allow_sections) {
+                    self.reset();
+                    Utils.error('RulesParse', 'No sections are allowed');
+                }
+                else {
+                    var section = self.addSection(group, false, item.data, self.parseSectionFlags(item));
+                    if (section === null) {
+                        return;
+                    }
+                    section.type_id = item.section;
+                    section.exists = item.exists;
+                    if (item.group !== undefined) {
+                        var gmodel = self.addGroup(section, false, item.group.data, self.parseGroupFlags(item.group));
+                        if (gmodel === null) {
+                            return;
+                        }
+                        add(item.group, gmodel);
+                    }
+                }
+            }
             else {
                 if (!item.empty) {
                     if (item.id === undefined) {
@@ -284,7 +305,7 @@ QueryBuilder.prototype.setRules = function(data) {
                 }
 
                 if (!item.empty) {
-                    model.filter = self.getFilterById(item.id);
+                    model.filter = self.getFilterById(item.id, group.section_type_id);
                     model.operator = self.getOperatorByType(item.operator);
 
                     if (model.operator.nb_inputs !== 0 && item.value !== undefined) {
diff --git a/src/template.js b/src/template.js
index 6c128d80..d33bf46a 100644
--- a/src/template.js
+++ b/src/template.js
@@ -15,7 +15,7 @@ QueryBuilder.templates.group = '\
           <i class="{{= it.icons.add_section }}"></i> {{= it.lang.add_section }} \
         </button> \
       {{?}} \
-      {{? it.level>1 }} \
+      {{? it.level>1 && !it.section_root }} \
         <button type="button" class="btn btn-xs btn-danger" data-delete="group"> \
           <i class="{{= it.icons.remove_group }}"></i> {{= it.lang.delete_group }} \
         </button> \
@@ -133,12 +133,13 @@ QueryBuilder.templates.operatorSelect = '\
  * @param in_section {bool}
  * @return {string}
  */
-QueryBuilder.prototype.getGroupTemplate = function(group_id, level, in_section) {
+QueryBuilder.prototype.getGroupTemplate = function(group_id, level, in_section, section_root) {
     var h = this.templates.group({
         builder: this,
         group_id: group_id,
         level: level,
         in_section: in_section,
+        section_root: section_root,
         conditions: this.settings.conditions,
         icons: this.icons,
         lang: this.lang,
@@ -167,9 +168,8 @@ QueryBuilder.prototype.getRuleTemplate = function(rule_id) {
 
 /**
  * Returns section HTML
- * @param group_id {string}
+ * @param section_id {string}
  * @param level {int}
- * @param in_section {bool}
  * @return {string}
  */
 QueryBuilder.prototype.getSectionTemplate = function(section_id, level) {

From ff606d438bb9963ef7a27fc9395b9f56d5ef14eb Mon Sep 17 00:00:00 2001
From: Reha Sterbin <reha@omniti.com>
Date: Wed, 26 Oct 2016 11:53:19 -0400
Subject: [PATCH 22/44] Fixed linting/style warnings

---
 src/core.js   | 3 ++-
 src/public.js | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/core.js b/src/core.js
index 5e5e9ff2..d8f61cde 100644
--- a/src/core.js
+++ b/src/core.js
@@ -719,7 +719,8 @@ QueryBuilder.prototype.addRule = function(parent, data, flags) {
             var d = s.default_filter || s.filters[0].id;
             model.filter = this.change('getDefaultFilter', this.getFilterById(d, s.id), model);
         }
-    } else {
+    }
+    else {
         if (this.settings.default_filter || !this.settings.display_empty_filter) {
             model.filter = this.change('getDefaultFilter',
                 this.getFilterById(this.settings.default_filter || this.filters[0].id),
diff --git a/src/public.js b/src/public.js
index 38b9c734..dd31fa39 100644
--- a/src/public.js
+++ b/src/public.js
@@ -121,7 +121,7 @@ QueryBuilder.prototype.validate = function() {
         if (errors > 0) {
             return false;
         }
-        else if (done === 0 && (!self.settings.allow_empty || !group.isRoot() || !group.parent instanceof Section)) {
+        else if (done === 0 && (!self.settings.allow_empty || !group.isRoot() || !(group.parent instanceof Section))) {
             self.triggerValidationError(group, 'empty_group', null);
             return false;
         }

From 1c16555afd49721dbe933645b2ef5b4cee05d97d Mon Sep 17 00:00:00 2001
From: Reha Sterbin <reha@omniti.com>
Date: Sat, 29 Oct 2016 09:20:35 -0400
Subject: [PATCH 23/44] More bug fixes for sections

---
 src/core.js      | 16 ++++++++++------
 src/i18n/en.json |  1 +
 src/model.js     | 15 ++++++++++++---
 src/public.js    | 14 ++++++++++++--
 4 files changed, 35 insertions(+), 11 deletions(-)

diff --git a/src/core.js b/src/core.js
index d8f61cde..e92fb702 100644
--- a/src/core.js
+++ b/src/core.js
@@ -308,7 +308,7 @@ QueryBuilder.prototype.bindEvents = function() {
             var sid = $(this).val();
             var $section = $(this).closest(Selectors.section_container);
             var model = Model($section);
-            model.id = sid;
+            model.type_id = sid;
             self.refreshSection(model);
         });
 
@@ -492,7 +492,7 @@ QueryBuilder.prototype.addGroup = function(parent, addRule, data, flags) {
  * @return {boolean} true if the group has been deleted
  */
 QueryBuilder.prototype.deleteGroup = function(group) {
-    if (group.isRoot() || group.parent instanceof Section) {
+    if (group.isRoot()) {
         return false;
     }
 
@@ -603,8 +603,10 @@ QueryBuilder.prototype.deleteSection = function(section) {
         return false;
     }
 
-    if (!this.deleteGroup(section.group)) {
-        return false;
+    if (section.group) {
+        if (!this.deleteGroup(section.group)) {
+            return false;
+        }
     }
 
     section.drop();
@@ -655,7 +657,7 @@ QueryBuilder.prototype.createSectionTypes = function(section) {
  */
 QueryBuilder.prototype.refreshSection = function(model) {
 
-    if (model.id) {
+    if (model.type_id && model.type_id != '-1') {
         // Clear out the section if there's any group or rule that don't belong
         var ok = true;
         model.$el.find(Selectors.group_container).each(function() {
@@ -1003,7 +1005,9 @@ QueryBuilder.prototype.clearErrors = function(node) {
         }, function(group) {
             this.clearErrors(group);
         }, function(section) {
-            this.clearErrors(section.group);
+            if (section.group) {
+                this.clearErrors(section.group);
+            }
         }, this);
     }
 };
diff --git a/src/i18n/en.json b/src/i18n/en.json
index 60c0d07e..ff0e3260 100644
--- a/src/i18n/en.json
+++ b/src/i18n/en.json
@@ -44,6 +44,7 @@
 
   "errors": {
     "no_filter": "No filter selected",
+    "no_type": "No section type selected",
     "empty_group": "The group is empty",
     "radio_empty": "No value selected",
     "checkbox_empty": "No value selected",
diff --git a/src/model.js b/src/model.js
index 7e286641..0a325e40 100644
--- a/src/model.js
+++ b/src/model.js
@@ -416,7 +416,12 @@ Group.prototype.contains = function(node, deep) {
         }, function(group) {
             return !group.contains(node, true);
         }, function(section) {
-            return !section.group.contains(node, true);
+            if (section.group) {
+                return !section.group.contains(node, true);
+            }
+            else {
+                return true;
+            }
         });
     }
 };
@@ -490,7 +495,9 @@ Section.prototype.setGroup = function($el) {
  * Clear out all rules
  */
 Section.prototype.empty = function() {
-    this.group.drop();
+    if (this.group) {
+        this.group.drop();
+    }
     this.group = null;
 };
 
@@ -498,7 +505,9 @@ Section.prototype.empty = function() {
  * Delete self
  */
 Section.prototype.drop = function() {
-    this.group.drop();
+    if (this.group) {
+        this.group.drop();
+    }
     Node.prototype.drop.call(this);
 };
 
diff --git a/src/public.js b/src/public.js
index dd31fa39..611f3364 100644
--- a/src/public.js
+++ b/src/public.js
@@ -110,6 +110,11 @@ QueryBuilder.prototype.validate = function() {
                 errors++;
             }
         }, function(section) {
+            if (!section.type_id || section.type_id == '-1' || !section.group) {
+                self.triggerValidationError(section, 'no_type', null);
+                errors++;
+                return;
+            }
             if (parse(section.group)) {
                 done++;
             }
@@ -121,7 +126,7 @@ QueryBuilder.prototype.validate = function() {
         if (errors > 0) {
             return false;
         }
-        else if (done === 0 && (!self.settings.allow_empty || !group.isRoot() || !(group.parent instanceof Section))) {
+        else if (done === 0 && (!self.settings.allow_empty || !group.isRoot())) {
             self.triggerValidationError(group, 'empty_group', null);
             return false;
         }
@@ -202,7 +207,12 @@ QueryBuilder.prototype.getRules = function(options) {
                 section: model.type_id,
                 exists: model.exists
             };
-            rule.group = parse(model.group);
+            if (model.group) {
+                rule.group = parse(model.group);
+            }
+            else {
+                rule.group = null;
+            }
             groupData.rules.push(rule);
         });
 

From 6df52ff3e8b4fefa771bf9a1dfa23bb2289a7657 Mon Sep 17 00:00:00 2001
From: Reha Sterbin <reha@omniti.com>
Date: Mon, 31 Oct 2016 23:05:25 -0400
Subject: [PATCH 24/44] Invert plugin passes tests and works for sections

---
 src/plugins/invert/plugin.js | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/src/plugins/invert/plugin.js b/src/plugins/invert/plugin.js
index a4818e3e..06179dd2 100644
--- a/src/plugins/invert/plugin.js
+++ b/src/plugins/invert/plugin.js
@@ -30,6 +30,11 @@ QueryBuilder.defaults({
     conditionOpposites: {
         'AND': 'OR',
         'OR': 'AND'
+    },
+
+    existsOpposites: {
+        'EXISTS': 'DOES NOT EXIST',
+        'DOES NOT EXIST': 'EXISTS'
     }
 });
 
@@ -115,6 +120,8 @@ QueryBuilder.extend({
                     }
                 }, function(group) {
                     this.invert(group, tempOpts);
+                }, function(section) {
+                    this.invert(section, tempOpts);
                 }, this);
             }
         }
@@ -133,6 +140,21 @@ QueryBuilder.extend({
                 }
             }
         }
+        else if (node instanceof Section) {
+            // invert exists setting
+            if (this.settings.existsOpposites[node.exists]) {
+                node.exists = this.settings.existsOpposites[node.exists];
+            }
+            else if (!options.silent_fail) {
+                Utils.error('InvertExists', 'Unknown inverse of exists "{0}"', node.exists);
+            }
+
+            // recursive call
+            if (options.recursive && node.group) {
+                var tempOpts = $.extend({}, options, { trigger: false });
+                this.invert(node.group, tempOpts);
+            }
+        }
 
         if (options.trigger) {
             this.trigger('afterInvert', node, options);

From 0ac032668787453a3f71e4ac6ab4b75e47b155d7 Mon Sep 17 00:00:00 2001
From: Reha Sterbin <reha@omniti.com>
Date: Sun, 6 Nov 2016 15:03:00 -0500
Subject: [PATCH 25/44] Broke section checking into its own method and added
 section detail to filter error messages

---
 src/core.js | 57 ++++++++++++++++++++++++++++++++++++++---------------
 1 file changed, 41 insertions(+), 16 deletions(-)

diff --git a/src/core.js b/src/core.js
index e92fb702..553c5bf9 100644
--- a/src/core.js
+++ b/src/core.js
@@ -62,13 +62,7 @@ QueryBuilder.prototype.init = function($el, options) {
     this.$el.addClass('query-builder form-inline');
 
     this.filters = this.checkFilters(this.filters);
-    if (this.settings.allow_sections) {
-        for (var k in this.sections) {
-            if (this.sections.hasOwnProperty(k)) {
-                this.sections[k].filters = this.checkFilters(this.sections[k].filters);
-            }
-        }
-    }
+    this.sections = this.checkSections(this.sections);
     this.operators = this.checkOperators(this.operators);
 
     this.bindEvents();
@@ -89,19 +83,20 @@ QueryBuilder.prototype.init = function($el, options) {
  * Checks the configuration of each filter
  * @throws ConfigError
  */
-QueryBuilder.prototype.checkFilters = function(filters) {
+QueryBuilder.prototype.checkFilters = function(filters, section) {
     var definedFilters = [];
+    var sectiontag = function (i) { if (section) { return ' [section: {' + i + '}]'; } };
 
     if (!filters || filters.length === 0) {
-        Utils.error('Config', 'Missing filters list');
+        Utils.error('Config', 'Missing filters list' + sectiontag(0), section);
     }
 
     filters.forEach(function(filter, i) {
         if (!filter.id) {
-            Utils.error('Config', 'Missing filter {0} id', i);
+            Utils.error('Config', 'Missing filter {0} id' + sectiontag(1), i, section);
         }
         if (definedFilters.indexOf(filter.id) != -1) {
-            Utils.error('Config', 'Filter "{0}" already defined', filter.id);
+            Utils.error('Config', 'Filter "{0}" already defined' + sectiontag(1), filter.id, section);
         }
         definedFilters.push(filter.id);
 
@@ -109,20 +104,20 @@ QueryBuilder.prototype.checkFilters = function(filters) {
             filter.type = 'string';
         }
         else if (!QueryBuilder.types[filter.type]) {
-            Utils.error('Config', 'Invalid type "{0}"', filter.type);
+            Utils.error('Config', 'Invalid type "{0}"' + sectiontag(1), filter.type, section);
         }
 
         if (!filter.input) {
             filter.input = 'text';
         }
         else if (typeof filter.input != 'function' && QueryBuilder.inputs.indexOf(filter.input) == -1) {
-            Utils.error('Config', 'Invalid input "{0}"', filter.input);
+            Utils.error('Config', 'Invalid input "{0}"' + sectiontag(1), filter.input, section);
         }
 
         if (filter.operators) {
             filter.operators.forEach(function(operator) {
                 if (typeof operator != 'string') {
-                    Utils.error('Config', 'Filter operators must be global operators types (string)');
+                    Utils.error('Config', 'Filter operators must be global operators types (string)' + sectiontag(0), section);
                 }
             });
         }
@@ -149,7 +144,7 @@ QueryBuilder.prototype.checkFilters = function(filters) {
         switch (filter.input) {
             case 'radio': case 'checkbox':
                 if (!filter.values || filter.values.length < 1) {
-                    Utils.error('Config', 'Missing filter "{0}" values', filter.id);
+                    Utils.error('Config', 'Missing filter "{0}" values' + sectiontag(1), filter.id, section);
                 }
                 break;
 
@@ -160,7 +155,7 @@ QueryBuilder.prototype.checkFilters = function(filters) {
                     }
                     Utils.iterateOptions(filter.values, function(key) {
                         if (key == filter.placeholder_value) {
-                            Utils.error('Config', 'Placeholder of filter "{0}" overlaps with one of its values', filter.id);
+                            Utils.error('Config', 'Placeholder of filter "{0}" overlaps with one of its values' + sectiontag(1), filter.id, section);
                         }
                     });
                 }
@@ -187,6 +182,36 @@ QueryBuilder.prototype.checkFilters = function(filters) {
     return filters;
 };
 
+/**
+ * Checks the configuration of each section
+ * @throws ConfigError
+ */
+QueryBuilder.prototype.checkSections = function(sections) {
+    if (!this.settings.allow_sections) {
+        return [];
+    }
+
+    var definedSections = [];
+
+    if (!sections || sections.length === 0) {
+        Utils.error('Config', 'Missing sections list');
+    }
+
+    sections.forEach(function(section, i) {
+        if (!section.id) {
+            Utils.error('Config', 'Missing section {0} id', i);
+        }
+        if (definedSections.indexOf(section.id) != -1) {
+            Utils.error('Config', 'Section "{0}" already defined', section.id);
+        }
+        sections[i].filters = this.checkFilters(sections[i].filters, sections[i].id);
+        definedSections.push(section.id);
+    }, this);
+
+    return sections;
+};
+
+
 /**
  * Checks the configuration of each operator
  * @throws ConfigError

From b7fc5807585b2f7486c7ad32b9639fbeed0366d8 Mon Sep 17 00:00:00 2001
From: Reha Sterbin <reha@omniti.com>
Date: Mon, 7 Nov 2016 16:49:19 -0500
Subject: [PATCH 26/44] Fixed a logical error in setRules

---
 src/public.js | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/src/public.js b/src/public.js
index 611f3364..6a6fff19 100644
--- a/src/public.js
+++ b/src/public.js
@@ -264,21 +264,7 @@ QueryBuilder.prototype.setRules = function(data) {
         data.rules.forEach(function(item) {
             var model;
 
-            if (item.rules !== undefined) {
-                if (self.settings.allow_groups !== -1 && self.settings.allow_groups < group.level) {
-                    self.reset();
-                    Utils.error('RulesParse', 'No more than {0} groups are allowed', self.settings.allow_groups);
-                }
-                else {
-                    model = self.addGroup(group, false, item.data, self.parseGroupFlags(item));
-                    if (model === null) {
-                        return;
-                    }
-
-                    add(item, model);
-                }
-            }
-            else if (item.section !== undefined) {
+            if (item.section !== undefined) {
                 if (!self.settings.allow_sections) {
                     self.reset();
                     Utils.error('RulesParse', 'No sections are allowed');
@@ -299,6 +285,20 @@ QueryBuilder.prototype.setRules = function(data) {
                     }
                 }
             }
+            else if (item.rules !== undefined) {
+                if (self.settings.allow_groups !== -1 && self.settings.allow_groups < group.level) {
+                    self.reset();
+                    Utils.error('RulesParse', 'No more than {0} groups are allowed', self.settings.allow_groups);
+                }
+                else {
+                    model = self.addGroup(group, false, item.data, self.parseGroupFlags(item));
+                    if (model === null) {
+                        return;
+                    }
+
+                    add(item, model);
+                }
+            }
             else {
                 if (!item.empty) {
                     if (item.id === undefined) {

From 8e6b42ef618bd59c9ea7394825681cf220480017 Mon Sep 17 00:00:00 2001
From: Reha Sterbin <reha@omniti.com>
Date: Mon, 7 Nov 2016 17:57:40 -0500
Subject: [PATCH 27/44] First pass at sections test suite (only currently
 passing tests for now)

---
 tests/common.js          |  78 ++++++++++++++
 tests/index.html         |   1 +
 tests/sections.module.js | 228 +++++++++++++++++++++++++++++++++++++++
 3 files changed, 307 insertions(+)
 create mode 100644 tests/sections.module.js

diff --git a/tests/common.js b/tests/common.js
index 26111ecb..3712ecc9 100644
--- a/tests/common.js
+++ b/tests/common.js
@@ -294,6 +294,58 @@ var basic_filters = [{
     }
 }];
 
+var basic_sections = [{
+    id: 'partner',
+    label: 'Partner',
+    filters: [{
+        id: 'name',
+        label: 'Partner Name',
+        type: 'string'
+    }, {
+        id: 'status',
+        label: 'Partnership Status',
+        type: 'string',
+        input: 'select',
+        multiple: true,
+        values: {
+            'ac': 'Active',
+            'in': 'Inactive',
+            'tr': 'Terminated'
+        }
+    }]
+}, {
+    id: 'related',
+    label: 'Releated Products',
+    filters: [{
+        id: 'name',
+        label: 'Name',
+        type: 'string'
+    }, {
+        id: 'price',
+        label: 'Price',
+        type: 'double',
+        validation: {
+            min: 0,
+            step: 0.01
+        }
+    }, {
+        id: 'category',
+        label: 'Category',
+        type: 'string',
+        input: 'select',
+        multiple: true,
+        values: {
+            'bk': 'Books',
+            'mo': 'Movies',
+            'mu': 'Music',
+            'to': 'Tools',
+            'go': 'Goodies',
+            'cl': 'Clothes'
+        },
+        operators: ['in', 'not_in', 'equal', 'not_equal', 'is_null', 'is_not_null']
+    }]
+}];
+
 var basic_rules = {
     condition: 'AND',
     rules: [{
@@ -321,3 +373,29 @@ var basic_rules = {
         }]
     }]
 };
+
+var section_rules = {
+    condition: 'AND',
+    rules: [{
+        id: 'price',
+        field: 'price',
+        operator: 'less',
+        value: 10.25
+    }, {
+        section: 'partner',
+        group: {
+            condition: 'AND',
+            rules: [{
+                id: 'name',
+                field: 'name',
+                operator: 'begins_with',
+                value: 'Best'
+            }, {
+                id: 'status',
+                field: 'status',
+                operator: 'in',
+                value: [ 'ac', 'in' ]
+            }]
+        }
+    }]
+};
diff --git a/tests/index.html b/tests/index.html
index 4c395d25..058ce194 100644
--- a/tests/index.html
+++ b/tests/index.html
@@ -56,6 +56,7 @@
 
 <!-- qunit:modules -->
 <script src="/prx/000/https/patch-diff.githubusercontent.com/raw/mistic100/jQuery-QueryBuilder/tests/core.module.js,_ANDesc=js,"></script>
+<script src="/prx/000/https/patch-diff.githubusercontent.com/raw/mistic100/jQuery-QueryBuilder/tests/sections.module.js,_ANDesc=js,"></script>
 <script src="/prx/000/https/patch-diff.githubusercontent.com/raw/mistic100/jQuery-QueryBuilder/tests/data.module.js,_ANDesc=js,"></script>
 <script src="/prx/000/https/patch-diff.githubusercontent.com/raw/mistic100/jQuery-QueryBuilder/tests/plugins-gui.module.js,_ANDesc=js,"></script>
 <script src="/prx/000/https/patch-diff.githubusercontent.com/raw/mistic100/jQuery-QueryBuilder/tests/plugins.module.js,_ANDesc=js,"></script>
diff --git a/tests/sections.module.js b/tests/sections.module.js
new file mode 100644
index 00000000..5a33884a
--- /dev/null
+++ b/tests/sections.module.js
@@ -0,0 +1,228 @@
+$(function(){
+    var $b = $('#builder');
+
+    QUnit.module('sections', {
+        afterEach: function() {
+            $b.queryBuilder('destroy');
+        }
+    });
+
+    /**
+     * Disallow sections
+     */
+    QUnit.test('Disallow sections', function(assert) {
+        $b.queryBuilder({
+            filters: basic_filters,
+            sections: basic_sections
+        });
+
+        assert.equal(
+            $('#builder_group_0 .rules-group-header .group-actions button[data-add="section"]').length,
+            0,
+            'Should not have the add section button'
+        );
+    });
+
+    /**
+     * Allow sections
+     */
+    QUnit.test('Allow sections', function(assert) {
+        $b.queryBuilder({
+            allow_sections: true,
+            filters: basic_filters,
+            sections: basic_sections
+        });
+
+        assert.equal(
+            $('#builder_group_0 .rules-group-header .group-actions button[data-add="section"]').length,
+            1,
+            'Should have the add section button'
+        );
+    });
+
+    /**
+     * Test invalid sections
+     */
+    QUnit.test('Invalid sections', function(assert) {
+
+        assert.initError($b,
+            {allow_sections: true,
+            sections: [],
+            filters: basic_filters},
+            /Missing sections list/
+        );
+
+        assert.initError($b,
+            {allow_sections: true,
+            sections: [{}],
+            filters: basic_filters},
+            /Missing section 0 id/
+        );
+
+        assert.initError($b,
+            {allow_sections: true,
+            sections: [
+                {id: 'foo', filters: basic_filters},
+                {id: 'foo', filters: basic_filters}
+            ],
+            filters: basic_filters},
+            /Section "foo" already defined/
+        );
+
+        assert.initError($b,
+            {allow_sections: true,
+            sections: [
+                {id: 'foo'}
+            ],
+            filters: basic_filters},
+            /Missing filters list \[section: foo\]/
+        );
+
+        assert.initError($b,
+            {allow_sections: true,
+            sections: [
+                {id: 'foo', filters: [{}]}
+            ],
+            filters: basic_filters},
+            /Missing filter 0 id \[section: foo\]/
+        );
+
+        assert.initError($b,
+            {allow_sections: true,
+            sections: [
+                {id: 'baz', filters: [
+                    {id: 'foo'},
+                    {id: 'foo'}
+                ]}
+            ],
+            filters: basic_filters},
+            /Filter "foo" already defined \[section: baz\]/
+        );
+
+        assert.initError($b,
+            {allow_sections: true,
+            sections: [
+                {id: 'baz', filters: [
+                    {id: 'foo', type: 'bar'}
+                ]}
+            ],
+            filters: basic_filters},
+            /Invalid type "bar" \[section: baz\]/
+        );
+
+        assert.initError($b,
+            {allow_sections: true,
+            sections: [
+                {id: 'baz', filters: [
+                    {id: 'foo', input: 'bar'}
+                ]}
+            ],
+            filters: basic_filters},
+            /Invalid input "bar" \[section: baz\]/
+        );
+
+        assert.initError($b,
+            {allow_sections: true,
+            sections: [
+                {id: 'baz', filters: [
+                    {id: 'foo', input: 'radio'}
+                ]}
+            ],
+            filters: basic_filters},
+            /Missing filter "foo" values \[section: baz\]/
+        );
+
+        assert.initError($b,
+            {allow_sections: true,
+            sections: [
+                {id: 'baz', filters: [
+                    {id:'foo', input: 'select', values:[1,2,3], placeholder: 1, placeholder_value: 1}
+                ]}
+            ],
+            filters: basic_filters},
+            /Placeholder of filter "foo" overlaps with one of its values \[section: baz\]/
+        );
+
+        assert.initError($b,
+            {allow_sections: true,
+            sections: [
+                {id: 'baz', filters: [
+                    {id: 'foo', operators: ['equal',
+                        {type: 'geo', nb_inputs: 3, multiple: false, apply_to: ['string'] }
+                    ]}
+                ]}
+            ],
+            filters: basic_filters},
+            /Filter operators must be global operators types \(string\) \[section: baz\]/
+        );
+
+    });
+
+    /**
+     * Test setRules and getRules with sections
+     */
+    QUnit.test('Set/get rules with sections', function(assert) {
+        $b.queryBuilder({
+            filters: basic_filters,
+            allow_sections: true,
+            sections: basic_sections,
+            rules: section_rules
+        });
+
+        assert.rulesMatch(
+            $b.queryBuilder('getRules'),
+            section_rules,
+            'Should return object with rules for sections'
+        );
+    });
+
+    /**
+     * Test default section
+     */
+    QUnit.test('Default section', function(assert) {
+        $b.queryBuilder({
+            allow_sections: true,
+            default_section: 'related',
+            sections: basic_sections,
+            filters: basic_filters
+        });
+
+        $('#builder_group_0>.rules-group-header>.group-actions [data-add=section]').trigger('click');
+
+        assert.equal(
+            $('[name=builder_section_0_section_type] [value="-1"]').length,
+            1,
+            'Should have the placeholder section type'
+        );
+
+        assert.equal(
+            $('[name=builder_section_0_section_type]').val(),
+            'related',
+            'Sould have used "related" as default section type'
+        );
+
+        $b.queryBuilder('destroy');
+
+        $b.queryBuilder({
+            allow_sections: true,
+            display_empty_stype_filter: false,
+            sections: basic_sections,
+            filters: basic_filters
+        });
+
+        $('#builder_group_0>.rules-group-header>.group-actions [data-add=section]').trigger('click');
+
+        assert.equal(
+            $('[name=builder_section_0_section_type] [value="-1"]').length,
+            0,
+            'Should not have the placeholder section type'
+        );
+
+        assert.equal(
+            $('[name=builder_section_0_section_type]').val(),
+            'partner',
+            'Sould have used the first section as default one'
+        );
+    });
+
+});

From d0a8ec6c608f17eb29e03c054189f36c2a641d17 Mon Sep 17 00:00:00 2001
From: Reha Sterbin <reha@omniti.com>
Date: Tue, 15 Nov 2016 12:17:56 -0500
Subject: [PATCH 28/44] Rounded out section tests and made allow_sections
 default to true

---
 src/core.js              |  10 +-
 src/defaults.js          |   3 +-
 src/public.js            |   2 +-
 src/template.js          |   2 +-
 tests/sections.module.js | 543 ++++++++++++++++++++++++++++++++++++---
 5 files changed, 519 insertions(+), 41 deletions(-)

diff --git a/src/core.js b/src/core.js
index 553c5bf9..f0f16da5 100644
--- a/src/core.js
+++ b/src/core.js
@@ -65,6 +65,10 @@ QueryBuilder.prototype.init = function($el, options) {
     this.sections = this.checkSections(this.sections);
     this.operators = this.checkOperators(this.operators);
 
+    if (this.sections.length > 0) {
+        this.settings.has_sections = true;
+    }
+
     this.bindEvents();
     this.initPlugins();
 
@@ -193,10 +197,6 @@ QueryBuilder.prototype.checkSections = function(sections) {
 
     var definedSections = [];
 
-    if (!sections || sections.length === 0) {
-        Utils.error('Config', 'Missing sections list');
-    }
-
     sections.forEach(function(section, i) {
         if (!section.id) {
             Utils.error('Config', 'Missing section {0} id', i);
@@ -319,7 +319,7 @@ QueryBuilder.prototype.bindEvents = function() {
         });
     }
 
-    if (this.settings.allow_sections) {
+    if (this.settings.allow_sections && this.settings.has_sections) {
         // section exists change
         this.$el.on('change.queryBuilder', Selectors.section_exists_flag, function() {
             if ($(this).is(':checked')) {
diff --git a/src/defaults.js b/src/defaults.js
index 0288cfd4..59c244dc 100644
--- a/src/defaults.js
+++ b/src/defaults.js
@@ -123,7 +123,8 @@ QueryBuilder.DEFAULTS = {
     allow_empty: false,
     conditions: ['AND', 'OR'],
     default_condition: 'AND',
-    allow_sections: false,
+    allow_sections: true,
+    has_sections: false,
     default_section: null,
     exist_options: ['EXISTS', 'DOES NOT EXIST'],
     default_exists: 'EXISTS',
diff --git a/src/public.js b/src/public.js
index 6a6fff19..3a3f0ea3 100644
--- a/src/public.js
+++ b/src/public.js
@@ -265,7 +265,7 @@ QueryBuilder.prototype.setRules = function(data) {
             var model;
 
             if (item.section !== undefined) {
-                if (!self.settings.allow_sections) {
+                if (!self.settings.allow_sections || !self.settings.has_sections) {
                     self.reset();
                     Utils.error('RulesParse', 'No sections are allowed');
                 }
diff --git a/src/template.js b/src/template.js
index d33bf46a..f4e4ceb7 100644
--- a/src/template.js
+++ b/src/template.js
@@ -10,7 +10,7 @@ QueryBuilder.templates.group = '\
           <i class="{{= it.icons.add_group }}"></i> {{= it.lang.add_group }} \
         </button> \
       {{?}} \
-      {{? it.settings.allow_sections && !it.in_section }} \
+      {{? it.settings.allow_sections && it.settings.has_sections && !it.in_section }} \
         <button type="button" class="btn btn-xs btn-success" data-add="section"> \
           <i class="{{= it.icons.add_section }}"></i> {{= it.lang.add_section }} \
         </button> \
diff --git a/tests/sections.module.js b/tests/sections.module.js
index 5a33884a..8e83bba7 100644
--- a/tests/sections.module.js
+++ b/tests/sections.module.js
@@ -13,6 +13,7 @@ $(function(){
     QUnit.test('Disallow sections', function(assert) {
         $b.queryBuilder({
             filters: basic_filters,
+            allow_sections: false,
             sections: basic_sections
         });
 
@@ -28,7 +29,6 @@ $(function(){
      */
     QUnit.test('Allow sections', function(assert) {
         $b.queryBuilder({
-            allow_sections: true,
             filters: basic_filters,
             sections: basic_sections
         });
@@ -38,30 +38,34 @@ $(function(){
             1,
             'Should have the add section button'
         );
+
+        $b.queryBuilder('destroy');
+
+        $b.queryBuilder({
+            allow_sections: false,
+            filters: basic_filters,
+            sections: basic_sections
+        });
+
+        assert.equal(
+            $('#builder_group_0 .rules-group-header .group-actions button[data-add="section"]').length,
+            0,
+            'Should not have the add section button'
+        );
     });
 
     /**
      * Test invalid sections
      */
     QUnit.test('Invalid sections', function(assert) {
-
-        assert.initError($b,
-            {allow_sections: true,
-            sections: [],
-            filters: basic_filters},
-            /Missing sections list/
-        );
-
         assert.initError($b,
-            {allow_sections: true,
-            sections: [{}],
+            {sections: [{}],
             filters: basic_filters},
             /Missing section 0 id/
         );
 
         assert.initError($b,
-            {allow_sections: true,
-            sections: [
+            {sections: [
                 {id: 'foo', filters: basic_filters},
                 {id: 'foo', filters: basic_filters}
             ],
@@ -70,8 +74,7 @@ $(function(){
         );
 
         assert.initError($b,
-            {allow_sections: true,
-            sections: [
+            {sections: [
                 {id: 'foo'}
             ],
             filters: basic_filters},
@@ -79,8 +82,7 @@ $(function(){
         );
 
         assert.initError($b,
-            {allow_sections: true,
-            sections: [
+            {sections: [
                 {id: 'foo', filters: [{}]}
             ],
             filters: basic_filters},
@@ -88,8 +90,7 @@ $(function(){
         );
 
         assert.initError($b,
-            {allow_sections: true,
-            sections: [
+            {sections: [
                 {id: 'baz', filters: [
                     {id: 'foo'},
                     {id: 'foo'}
@@ -100,8 +101,7 @@ $(function(){
         );
 
         assert.initError($b,
-            {allow_sections: true,
-            sections: [
+            {sections: [
                 {id: 'baz', filters: [
                     {id: 'foo', type: 'bar'}
                 ]}
@@ -111,8 +111,7 @@ $(function(){
         );
 
         assert.initError($b,
-            {allow_sections: true,
-            sections: [
+            {sections: [
                 {id: 'baz', filters: [
                     {id: 'foo', input: 'bar'}
                 ]}
@@ -122,8 +121,7 @@ $(function(){
         );
 
         assert.initError($b,
-            {allow_sections: true,
-            sections: [
+            {sections: [
                 {id: 'baz', filters: [
                     {id: 'foo', input: 'radio'}
                 ]}
@@ -133,8 +131,7 @@ $(function(){
         );
 
         assert.initError($b,
-            {allow_sections: true,
-            sections: [
+            {sections: [
                 {id: 'baz', filters: [
                     {id:'foo', input: 'select', values:[1,2,3], placeholder: 1, placeholder_value: 1}
                 ]}
@@ -144,8 +141,7 @@ $(function(){
         );
 
         assert.initError($b,
-            {allow_sections: true,
-            sections: [
+            {sections: [
                 {id: 'baz', filters: [
                     {id: 'foo', operators: ['equal',
                         {type: 'geo', nb_inputs: 3, multiple: false, apply_to: ['string'] }
@@ -155,7 +151,6 @@ $(function(){
             filters: basic_filters},
             /Filter operators must be global operators types \(string\) \[section: baz\]/
         );
-
     });
 
     /**
@@ -164,7 +159,6 @@ $(function(){
     QUnit.test('Set/get rules with sections', function(assert) {
         $b.queryBuilder({
             filters: basic_filters,
-            allow_sections: true,
             sections: basic_sections,
             rules: section_rules
         });
@@ -181,7 +175,6 @@ $(function(){
      */
     QUnit.test('Default section', function(assert) {
         $b.queryBuilder({
-            allow_sections: true,
             default_section: 'related',
             sections: basic_sections,
             filters: basic_filters
@@ -204,7 +197,6 @@ $(function(){
         $b.queryBuilder('destroy');
 
         $b.queryBuilder({
-            allow_sections: true,
             display_empty_stype_filter: false,
             sections: basic_sections,
             filters: basic_filters
@@ -225,4 +217,489 @@ $(function(){
         );
     });
 
+    /**
+     * Test UI events
+     */
+    QUnit.test('UI events', function(assert) {
+        $b.queryBuilder({
+            sections: basic_sections,
+            filters: basic_filters
+        });
+
+        // set the top-level rule
+        $('[name=builder_rule_0_filter]').val('name').trigger('change');
+        $('[name=builder_rule_0_operator]').val('not_equal').trigger('change');
+        $('[name=builder_rule_0_value_0]').val('foo').trigger('change');
+
+        // add a section
+        $('#builder_group_0>.rules-group-header>.group-actions [data-add=section]').trigger('click');
+
+        // set the first rule in the section
+        $('[name=builder_section_0_section_type]').val('partner').trigger('change');
+        $('[name=builder_rule_1_filter]').val('name').trigger('change');
+        $('[name=builder_rule_1_operator]').val('begins_with').trigger('change');
+        $('[name=builder_rule_1_value_0]').val('bar').trigger('change');
+
+        // add a second rule to the section and set it
+        $('#builder_section_0 #builder_group_1>.rules-group-header>.group-actions [data-add=rule]').trigger('click');
+        $('[name=builder_rule_2_filter]').val('status').trigger('change');
+        $('[name=builder_rule_2_operator]').val('is_null').trigger('change');
+
+        // set the section group to "or"
+        $('#builder_section_0 #builder_group_1>.rules-group-header>.group-conditions [value=OR]').trigger('click');
+
+        // set the section exists to "does not exist"
+        $('#builder_section_0>.rules-section-header>.section-exists-options [value="DOES NOT EXIST"]').trigger('click');
+
+        // add a section rule and delete it
+        $('#builder_section_0 #builder_group_1>.rules-group-header>.group-actions [data-add=rule]').trigger('click');
+        $('#builder_section_0 #builder_rule_3 [data-delete=rule]').trigger('click');
+
+        // add a section group and delete it
+        $('#builder_section_0 #builder_group_1>.rules-group-header>.group-actions [data-add=group]').trigger('click');
+        $('#builder_section_0 #builder_group_2 [data-delete=group]').trigger('click');
+
+        // add a section and delete it
+        $('#builder_group_0>.rules-group-header>.group-actions [data-add=section]').trigger('click');
+        $('#builder_section_1 [data-delete=section]').trigger('click');
+
+        var generated = $b.queryBuilder('getRules');
+        var expected = {
+            condition: 'AND',
+            rules: [{
+                id: 'name',
+                operator: 'not_equal',
+                value: 'foo'
+            }, {
+                section: 'partner',
+                exists: 'DOES NOT EXIST',
+                group: {
+                    condition: 'OR',
+                    rules: [{
+                        id: 'name',
+                        operator: 'begins_with',
+                        value: 'bar'
+                    },{
+                        id: 'status',
+                        operator: 'is_null'
+                    }]
+                }
+            }]
+        };
+
+        assert.rulesMatch(
+            generated,
+            expected,
+            'Should return correct rules after UI events'
+        );
+        assert.rulesMatch(
+            generated.rules != undefined && generated.rules[1] != undefined ? generated.rules[1].group : 'missing',
+            expected.rules[1].group,
+            'Should return correct section group after UI events'
+        );
+    });
+
+    /**
+     * Test filter.operators within sections
+     */
+    QUnit.test('Change operators within sections', function(assert) {
+        $b.queryBuilder({
+            filters: [{
+                id: 'name',
+                type: 'string'
+            }],
+            sections: [{
+                id: 'test',
+                filters: [{
+                    id: 'name',
+                    type: 'string'
+                }, {
+                    id: 'price',
+                    type: 'double'
+                }, {
+                    id: 'release',
+                    type: 'date',
+                    operators: ['before', 'equal', 'after']
+                }]
+            }],
+            rules: {
+                condition: 'AND',
+                rules: [{
+                    section: 'test',
+                    exists: 'EXISTS',
+                    group: {
+                        condition: 'AND',
+                        rules: [{
+                            id: 'name',
+                            operator: 'equal',
+                            value: 'foo'
+                        }, {
+                            id: 'price',
+                            operator: 'less',
+                            value: 10
+                        }, {
+                            id: 'release',
+                            operator: 'before',
+                            value: '1995-5-1'
+                        }]
+                    }
+                }]
+            },
+            operators: [
+                {type: 'equal',     nb_inputs: 1,    apply_to: ['string']},
+                {type: 'not_equal', nb_inputs: 1,    apply_to: ['string']},
+                {type: 'less',      nb_inputs: 1,    apply_to: ['number']},
+                {type: 'greater',   nb_inputs: 1,    apply_to: ['number']},
+                {type: 'before',    nb_inputs: 1,    apply_to: ['datetime']},
+                {type: 'after',     nb_inputs: 1,    apply_to: ['datetime']}
+            ]
+        });
+
+        assert.optionsMatch(
+            $('#builder_rule_0 [name$=_operator] option'),
+            ['equal', 'not_equal'],
+            '"name" filter should have "equal" & "not_equal" operators'
+        );
+
+        assert.optionsMatch(
+            $('#builder_rule_1 [name$=_operator] option'),
+            ['less', 'greater'],
+            '"price" filter should have "less" & "greater" operators'
+        );
+
+        assert.optionsMatch(
+            $('#builder_rule_2 [name$=_operator] option'),
+            ['before', 'equal', 'after'],
+            '"release" filter should have "before" & "equal" & "after" operators'
+        );
+    });
+
+    /**
+     * Test custom conditions within sections
+     */
+    QUnit.test('Change conditions within sections', function(assert) {
+        var rules = {
+            condition: 'NAND',
+            rules: [{
+                section: 'partner',
+                exists: 'EXISTS',
+                group: {
+                    condition: 'NAND',
+                    rules: [{
+                        id: 'name',
+                        operator: 'equal',
+                        value: 'foo'
+                    }, {
+                        condition: 'XOR',
+                        rules: [{
+                            id: 'name',
+                            operator: 'equal',
+                            value: 'bar'
+                        }]
+                    }]
+                }
+            }]
+        };
+
+        $b.queryBuilder({
+            filters: basic_filters,
+            sections: basic_sections,
+            rules: rules,
+            conditions: ['NAND', 'XOR'],
+            default_condition: 'NAND'
+        });
+
+        assert.rulesMatch(
+            $b.queryBuilder('getRules'),
+            rules,
+            'Should return correct rules'
+        );
+
+        assert.optionsMatch(
+            $('#builder_group_0 > .rules-group-header [name$=_cond]'),
+            ['NAND', 'XOR'],
+            'Available onditions should be NAND & XOR'
+        );
+
+        assert.equal(
+            $('#builder_group_2 [name$=_cond]:checked').val(),
+            'XOR',
+            'The second group should have "XOR" condition selected'
+        );
+    });
+
+    /**
+     * Test readonly
+     */
+    QUnit.test('Readonly within sections', function(assert) {
+        $b.queryBuilder({
+            filters: basic_filters,
+            sections: basic_sections,
+            rules: {
+                condition: 'AND',
+                flags: {
+                    condition_readonly: true
+                },
+                rules: [{
+                    section: 'partner',
+                    exists: 'EXISTS',
+                    flags: {
+                        exists_readonly: true
+                    },
+                    group: {
+                        condition: 'AND',
+                        flags: {
+                            condition_readonly: true
+                        },
+                        rules: [{
+                            id: 'name',
+                            operator: 'not_equal',
+                            value: 'foo',
+                            flags: {
+                                no_delete: true
+                            }
+                        }, {
+                            condition: 'OR',
+                            rules: [{
+                                id: 'status',
+                                operator: 'not_equal',
+                                value: 'ac',
+                                readonly: true
+                            }]
+                        }, {
+                            condition: 'AND',
+                            readonly: true,
+                            rules: [{
+                                id: 'name',
+                                operator: 'not_equal',
+                                value: 'bar'
+                            }]
+                        }]
+                    }
+                }]
+            }
+        });
+
+        assert.equal(
+            $('#builder_section_0 #builder_group_1>.rules-group-header input:not(:disabled)').length, 0,
+            'Should disable group condition radio buttons'
+        );
+
+        assert.equal(
+            $('#builder_section_0>.rules-section-header input:not(:disabled)').length, 0,
+            'Should disable section exists radio buttons'
+        );
+
+        assert.equal(
+            $('#builder_section_0 #builder_rule_0 [data-delete=rule]').length, 0,
+            'Should hide delete button of "no_delete" rule'
+        );
+
+        assert.equal(
+            $('#builder_section_0 #builder_rule_0').find('input:disabled, select:disabled').length, 0,
+            'Should not disable inputs of "no_delete" rule'
+        );
+
+        assert.equal(
+            $('#builder_section_0 #builder_rule_1 [data-delete=rule]').length, 0,
+            'Should hide delete button of "readonly" rule'
+        );
+
+        assert.equal(
+            $('#builder_section_0 #builder_rule_1').find('input:disabled, select:disabled').length, 3,
+            'Should disable inputs of "readonly" rule'
+        );
+
+        assert.equal(
+            $('#builder_section_0 #builder_group_3').find('[data-delete=group], [data-add=rule], [data-add=group]').length, 0,
+            'Should hide all buttons of "readonly" group'
+        );
+
+        $('#builder_section_0 #builder_group_2 [data-delete=group]').click();
+
+        assert.rulesMatch(
+            $b.queryBuilder('getRules'),
+            {
+                condition: 'AND',
+                rules: [{
+                    section: 'partner',
+                    exists: 'EXISTS',
+                    group: {
+                        condition: 'AND',
+                        rules: [{
+                            condition: 'AND',
+                            rules: [{
+                                id: 'name',
+                                operator: 'not_equal',
+                                value: 'foo'
+                            }, {
+                                condition: 'OR',
+                                rules: [{
+                                    id: 'status',
+                                    operator: 'not_equal',
+                                    value: 'ac'
+                                }]
+                            }, {
+                                condition: 'AND',
+                                rules: [{
+                                    id: 'name',
+                                    operator: 'not_equal',
+                                    value: 'bar'
+                                }]
+                            }]
+                        }]
+                    }
+                }]
+            },
+            'Should not delete group with readonly rule'
+        );
+    });
+
+    /**
+     * Test groups limit within section
+     */
+    QUnit.test('No groups allowed, other than the section group', function(assert) {
+        $b.queryBuilder({
+            filters: basic_filters,
+            sections: basic_sections,
+            allow_groups: false
+        });
+
+        assert.ok(
+            $('#builder_group_0 [data-add=group]').length == 0,
+            'Should not contain group add button'
+        );
+
+        assert.throws(
+            function(){ $b.queryBuilder('setRules', {
+                condition: 'AND',
+                rules: [{
+                    id: 'price',
+                    field: 'price',
+                    operator: 'less',
+                    value: 10.25
+                }, {
+                    section: 'partner',
+                    group: {
+                        condition: 'AND',
+                        rules: [{
+                            id: 'name',
+                            field: 'name',
+                            operator: 'begins_with',
+                            value: 'Best'
+                        }, {
+                            condition: 'OR',
+                            rules: [{
+                                id: 'status',
+                                field: 'status',
+                                operator: 'equal',
+                                value: 'ac'
+                            },{
+                                id: 'status',
+                                field: 'status',
+                                operator: 'not_equal',
+                                value: 'iv'
+                            }]
+                        }]
+                    }
+                }]
+            }); },
+            /No more than 0 groups are allowed/,
+            'Should throw "No more than 0 groups are allowed" error'
+        );
+    });
+
+    /**
+     * Test filters ordering in sections
+     */
+    QUnit.test('Sort filters in sections', function(assert) {
+        $b.queryBuilder({
+            filters: basic_filters,
+            sections: [{
+                id: 'partner',
+                label: 'Partner',
+                filters: [{
+                    id: '3',
+                    label: {
+                        fr: 'ccc',
+                        en: 'Ccc'
+                    }
+                }, {
+                    id: '1',
+                    label: 'AAA'
+                }, {
+                    id: '5',
+                    label: 'eee'
+                }, {
+                    id: '2',
+                    label: 'bbb'
+                }, {
+                    id: '4',
+                    label: {
+                        fr: 'ddd',
+                        en: 'Ddd'
+                    }
+                }]
+            }],
+            sort_filters: true,
+            lang_code: 'fr'
+        });
+
+        $('#builder_group_0>.rules-group-header>.group-actions [data-add=section]').trigger('click');
+        $('[name=builder_section_0_section_type]').val('partner').trigger('change');
+
+        var options = [];
+        $('[name=builder_rule_1_filter]>*').each(function() {
+            options.push($(this).val());
+        });
+
+        assert.deepEqual(
+            options,
+            ['-1', '1', '2', '3', '4', '5'],
+            'Filters should be sorted by alphabetical order'
+        );
+
+        $b.queryBuilder('destroy');
+
+        $b.queryBuilder({
+            filters: basic_filters,
+            sections: [{
+                id: 'partner',
+                label: 'Partner',
+                filters: [{
+                    id: '3',
+                    label: 'ccc'
+                }, {
+                    id: '1',
+                    label: 'AAA'
+                }, {
+                    id: '5',
+                    label: 'eee'
+                }, {
+                    id: '2',
+                    label: 'bbb'
+                }, {
+                    id: '4',
+                    label: 'ddd'
+                }]
+            }],
+            sort_filters: function(a, b) {
+                return parseInt(b.id) - parseInt(a.id);
+            }
+        });
+
+        $('#builder_group_0>.rules-group-header>.group-actions [data-add=section]').trigger('click');
+        $('[name=builder_section_0_section_type]').val('partner').trigger('change');
+
+        options = [];
+        $('[name=builder_rule_1_filter]>*').each(function() {
+            options.push($(this).val());
+        });
+
+        assert.deepEqual(
+            options,
+            ['-1', '5', '4', '3', '2', '1'],
+            'Filters should be sorted by custom order'
+        );
+    });
 });

From 360fece7ce107e2a7af04fac625c387a39607371 Mon Sep 17 00:00:00 2001
From: Reha Sterbin <reha@omniti.com>
Date: Tue, 15 Nov 2016 12:18:16 -0500
Subject: [PATCH 29/44] Removed allow_sections from the example

---
 examples/index.html | 1 -
 1 file changed, 1 deletion(-)

diff --git a/examples/index.html b/examples/index.html
index c35aca98..2af400d6 100644
--- a/examples/index.html
+++ b/examples/index.html
@@ -120,7 +120,6 @@ <h3>Output</h3>
 
 var options = {
   allow_empty: true,
-  allow_sections: true,
 
   //default_filter: 'name',
   sort_filters: true,

From eb4f8ea8b6367942ede447a0837f3d07b970af11 Mon Sep 17 00:00:00 2001
From: Reha Sterbin <reha@omniti.com>
Date: Fri, 18 Nov 2016 14:30:57 -0500
Subject: [PATCH 30/44] Sortable plugin now restricts moving rules/groups in
 and out of sections

---
 src/core.js                    | 34 +++++++++++++++--
 src/defaults.js                |  1 +
 src/model.js                   |  5 +--
 src/plugins/sortable/plugin.js | 68 ++++++++++++++++++++++++++--------
 src/template.js                | 19 ++++++----
 5 files changed, 98 insertions(+), 29 deletions(-)

diff --git a/src/core.js b/src/core.js
index f0f16da5..8e965059 100644
--- a/src/core.js
+++ b/src/core.js
@@ -402,6 +402,10 @@ QueryBuilder.prototype.bindEvents = function() {
                     case 'value':
                         self.updateRuleValue(node);
                         break;
+
+                    case 'section_type_id':
+                        self.updateRuleSectionTypeId(node);
+                        break;
                 }
             }
             else if (node instanceof Group) {
@@ -417,6 +421,10 @@ QueryBuilder.prototype.bindEvents = function() {
                     case 'condition':
                         self.updateGroupCondition(node);
                         break;
+
+                    case 'section_type_id':
+                        self.updateGroupSectionTypeId(node);
+                        break;
                 }
             }
             else if (node instanceof Section) {
@@ -487,8 +495,9 @@ QueryBuilder.prototype.addGroup = function(parent, addRule, data, flags) {
 
     var group_id = this.nextGroupId();
     var section_root = parent instanceof Section;
-    var in_section = section_root || parent.section_type_id;
-    var $group = $(this.getGroupTemplate(group_id, level, in_section, section_root));
+    var stype = section_root ? parent.type_id : parent.section_type_id;
+    var in_section = section_root || stype != undefined;
+    var $group = $(this.getGroupTemplate(group_id, level, stype, in_section, section_root));
     var model = null;
     if (parent instanceof Section) {
         model = parent.setGroup($group);
@@ -646,9 +655,28 @@ QueryBuilder.prototype.deleteSection = function(section) {
  */
 QueryBuilder.prototype.updateSectionTypeId = function(section) {
     section.$el.find(Selectors.rule_stype).val(section.type_id ? section.type_id : '-1');
+    section.$el.attr('data-stype', section.type_id);
     this.trigger('afterUpdateSectionTypeId', section);
 };
 
+/**
+ * Changes the section type setting of a group
+ * @param section {Section}
+ */
+QueryBuilder.prototype.updateGroupSectionTypeId = function(group) {
+    group.$el.attr('data-stype', group.section_type_id);
+    this.trigger('afterUpdateGroupSectionTypeId', group);
+};
+
+/**
+ * Changes the section type setting of a rule
+ * @param section {Section}
+ */
+QueryBuilder.prototype.updateRuleSectionTypeId = function(rule) {
+    rule.$el.attr('data-stype', rule.section_type_id);
+    this.trigger('afterUpdateRuleSectionTypeId', rule);
+};
+
 /**
  * Changes the exists setting of a section
  * @param section {Section}
@@ -727,7 +755,7 @@ QueryBuilder.prototype.addRule = function(parent, data, flags) {
     }
 
     var rule_id = this.nextRuleId();
-    var $rule = $(this.getRuleTemplate(rule_id));
+    var $rule = $(this.getRuleTemplate(rule_id, parent.section_type_id));
     var model = parent.addRule($rule);
 
     if (data !== undefined) {
diff --git a/src/defaults.js b/src/defaults.js
index 59c244dc..b73d5ca6 100644
--- a/src/defaults.js
+++ b/src/defaults.js
@@ -47,6 +47,7 @@ var Selectors = QueryBuilder.selectors = {
     value_container:      '.rule-value-container',
     error_container:      '.error-container',
     condition_container:  '.rules-group-header .group-conditions',
+    exists_container:     '.rules-section-header .section-exists-options',
 
     section_header:       '.rules-section-header',
     group_header:         '.rules-group-header',
diff --git a/src/model.js b/src/model.js
index 0a325e40..afccbeb4 100644
--- a/src/model.js
+++ b/src/model.js
@@ -232,7 +232,7 @@ var Group = function(parent, $el) {
     Node.call(this, parent, $el);
 
     this.rules = [];
-    this.section_type_id = null;
+    this.__.section_type_id = null;
     this.__.condition = null;
 };
 
@@ -440,8 +440,7 @@ var Rule = function(parent, $el) {
 
     Node.call(this, parent, $el);
 
-    this.section_type_id = null;
-
+    this.__.section_type_id = null;
     this.__.filter = null;
     this.__.operator = null;
     this.__.flags = {};
diff --git a/src/plugins/sortable/plugin.js b/src/plugins/sortable/plugin.js
index 6b2818ea..20ac43ac 100644
--- a/src/plugins/sortable/plugin.js
+++ b/src/plugins/sortable/plugin.js
@@ -3,7 +3,6 @@
  * Enables drag & drop sort of rules.
  */
 
-Selectors.rule_and_group_containers = Selectors.rule_container + ', ' + Selectors.group_container;
 Selectors.drag_handle = '.drag-handle';
 
 QueryBuilder.define('sortable', function(options) {
@@ -21,10 +20,24 @@ QueryBuilder.define('sortable', function(options) {
     var ghost;
     var src;
 
+    var acceptable = function(node) {
+        if (node instanceof Section) {
+            return Selectors.rule_container + '[data-stype="' + node.type_id + '"], ' +
+                Selectors.group_container + '[data-stype="' + node.type_id + '"]';
+        } else if (node.section_type_id != undefined) {
+            return Selectors.rule_container + '[data-stype="' + node.section_type_id + '"], ' +
+                Selectors.group_container + '[data-stype="' + node.section_type_id + '"]';
+        } else {
+            return Selectors.rule_container + '[data-stype=""], ' +
+                Selectors.group_container + '[data-stype=""], ' +
+                Selectors.section_container;
+        }
+    };
+
     /**
      * Init drag and drop
      */
-    this.on('afterAddRule afterAddGroup', function(e, node) {
+    this.on('afterAddRule afterAddGroup afterAddSection', function(e, node) {
         if (node == placeholder) {
             return;
         }
@@ -76,16 +89,18 @@ QueryBuilder.define('sortable', function(options) {
         /**
          * Configure drop on groups and rules
          */
-        interact(node.$el[0])
-            .dropzone({
-                accept: Selectors.rule_and_group_containers,
-                ondragenter: function(event) {
-                    moveSortableToTarget(placeholder, $(event.target));
-                },
-                ondrop: function(event) {
-                    moveSortableToTarget(src, $(event.target));
-                }
-            });
+        if (!(node instanceof Section)) {
+            interact(node.$el[0])
+                .dropzone({
+                    accept: acceptable(node),
+                    ondragenter: function(event) {
+                        moveSortableToTarget(placeholder, $(event.target));
+                    },
+                    ondrop: function(event) {
+                        moveSortableToTarget(src, $(event.target));
+                    }
+                });
+        }
 
         /**
          * Configure drop on group headers
@@ -93,7 +108,7 @@ QueryBuilder.define('sortable', function(options) {
         if (node instanceof Group) {
             interact(node.$el.find(Selectors.group_header)[0])
                 .dropzone({
-                    accept: Selectors.rule_and_group_containers,
+                    accept: acceptable(node),
                     ondragenter: function(event) {
                         moveSortableToTarget(placeholder, $(event.target));
                     },
@@ -107,7 +122,7 @@ QueryBuilder.define('sortable', function(options) {
     /**
      * Detach interactables
      */
-    this.on('beforeDeleteRule beforeDeleteGroup', function(e, node) {
+    this.on('beforeDeleteRule beforeDeleteGroup beforeDeleteSection', function(e, node) {
         if (!e.isDefaultPrevented()) {
             interact(node.$el[0]).unset();
 
@@ -147,11 +162,26 @@ QueryBuilder.define('sortable', function(options) {
         }
     });
 
+    /**
+     * Remove drag handle from non-sortable sections
+     */
+    this.on('parseSectionFlags.filter', function(flags) {
+        if (flags.value.no_sortable === undefined) {
+            flags.value.no_sortable = options.default_no_sortable;
+        }
+    });
+
+    this.on('afterApplySectionFlags', function(e, group) {
+        if (group.flags.no_sortable) {
+            group.$el.find('.drag-handle').remove();
+        }
+    });
+
     /**
      * Modify templates
      */
-    this.on('getGroupTemplate.filter', function(h, level) {
-        if (level > 1) {
+    this.on('getGroupTemplate.filter', function(h, level, in_section, section_root) {
+        if (level > 1 && !section_root) {
             var $h = $(h.value);
             $h.find(Selectors.condition_container).after('<div class="drag-handle"><i class="' + options.icon + '"></i></div>');
             h.value = $h.prop('outerHTML');
@@ -163,6 +193,12 @@ QueryBuilder.define('sortable', function(options) {
         $h.find(Selectors.rule_header).after('<div class="drag-handle"><i class="' + options.icon + '"></i></div>');
         h.value = $h.prop('outerHTML');
     });
+
+    this.on('getSectionTemplate.filter', function(h) {
+        var $h = $(h.value);
+        $h.find(Selectors.exists_container).after('<div class="drag-handle"><i class="' + options.icon + '"></i></div>');
+        h.value = $h.prop('outerHTML');
+    });
 }, {
     default_no_sortable: false,
     icon: 'glyphicon glyphicon-sort'
diff --git a/src/template.js b/src/template.js
index f4e4ceb7..68f314a6 100644
--- a/src/template.js
+++ b/src/template.js
@@ -1,5 +1,5 @@
 QueryBuilder.templates.group = '\
-<dl id="{{= it.group_id }}" class="rules-group-container"> \
+<dl id="{{= it.group_id }}" class="rules-group-container" data-stype="{{= it.section_type || " }> \
   <dt class="rules-group-header"> \
     <div class="btn-group pull-right group-actions"> \
       <button type="button" class="btn btn-xs btn-success" data-add="rule"> \
@@ -38,7 +38,7 @@ QueryBuilder.templates.group = '\
 </dl>';
 
 QueryBuilder.templates.section = '\
-<dl id="{{= it.section_id }}" class="rules-section-container"> \
+<dl id="{{= it.section_id }}" class="rules-section-container" data-stype=""> \
   <dt class="rules-section-header"> \
     <div class="btn-section pull-right section-actions"> \
       <button type="button" class="btn btn-xs btn-danger" data-delete="section"> \
@@ -72,7 +72,7 @@ QueryBuilder.templates.stypeSelect = '\
 </select>';
 
 QueryBuilder.templates.rule = '\
-<li id="{{= it.rule_id }}" class="rule-container"> \
+<li id="{{= it.rule_id }}" class="rule-container" data-stype="{{= it.section_type || " }> \
   <div class="rule-header"> \
     <div class="btn-group pull-right rule-actions"> \
       <button type="button" class="btn btn-xs btn-danger" data-delete="rule"> \
@@ -130,14 +130,17 @@ QueryBuilder.templates.operatorSelect = '\
  * Returns group HTML
  * @param group_id {string}
  * @param level {int}
+ * @param section_type {string}
  * @param in_section {bool}
+ * @param section_root {bool}
  * @return {string}
  */
-QueryBuilder.prototype.getGroupTemplate = function(group_id, level, in_section, section_root) {
+QueryBuilder.prototype.getGroupTemplate = function(group_id, level, section_type, in_section, section_root) {
     var h = this.templates.group({
         builder: this,
         group_id: group_id,
         level: level,
+        section_type: section_type,
         in_section: in_section,
         section_root: section_root,
         conditions: this.settings.conditions,
@@ -146,24 +149,26 @@ QueryBuilder.prototype.getGroupTemplate = function(group_id, level, in_section,
         settings: this.settings
     });
 
-    return this.change('getGroupTemplate', h, level);
+    return this.change('getGroupTemplate', h, level, section_type, in_section, section_root);
 };
 
 /**
  * Returns rule HTML
  * @param rule_id {string}
+ * @param section_type {string}
  * @return {string}
  */
-QueryBuilder.prototype.getRuleTemplate = function(rule_id) {
+QueryBuilder.prototype.getRuleTemplate = function(rule_id, section_type) {
     var h = this.templates.rule({
         builder: this,
         rule_id: rule_id,
+        section_type: section_type,
         icons: this.icons,
         lang: this.lang,
         settings: this.settings
     });
 
-    return this.change('getRuleTemplate', h);
+    return this.change('getRuleTemplate', h, section_type);
 };
 
 /**

From 08ba292647d29675cce94d35d9838ff30f2f6705 Mon Sep 17 00:00:00 2001
From: Reha Sterbin <reha@omniti.com>
Date: Sat, 19 Nov 2016 13:21:15 -0500
Subject: [PATCH 31/44] Fixed missing error message and tooltip on section

---
 src/core.js                             | 6 ++++++
 src/plugins/bt-tooltip-errors/plugin.js | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/core.js b/src/core.js
index 8e965059..801e2857 100644
--- a/src/core.js
+++ b/src/core.js
@@ -429,12 +429,18 @@ QueryBuilder.prototype.bindEvents = function() {
             }
             else if (node instanceof Section) {
                 switch (field) {
+                    case 'error':
+                        self.displayError(node);
+                        break;
+
                     case 'type_id':
                         self.updateSectionTypeId(node);
                         break;
+
                     case 'exists':
                         self.updateSectionExistsFlag(node);
                         break;
+
                     case 'flags':
                         self.applySectionFlags(node);
                         break;
diff --git a/src/plugins/bt-tooltip-errors/plugin.js b/src/plugins/bt-tooltip-errors/plugin.js
index 0d97c0b9..3a305859 100644
--- a/src/plugins/bt-tooltip-errors/plugin.js
+++ b/src/plugins/bt-tooltip-errors/plugin.js
@@ -14,7 +14,7 @@ QueryBuilder.define('bt-tooltip-errors', function(options) {
     var self = this;
 
     // add BT Tooltip data
-    this.on('getRuleTemplate.filter getGroupTemplate.filter', function(h) {
+    this.on('getRuleTemplate.filter getGroupTemplate.filter getSectionTemplate.filter', function(h) {
         var $h = $(h.value);
         $h.find(Selectors.error_container).attr('data-toggle', 'tooltip');
         h.value = $h.prop('outerHTML');

From e4d7bf4b9abdf33c0f670ac19a946be37b23ae13 Mon Sep 17 00:00:00 2001
From: Reha Sterbin <reha@omniti.com>
Date: Mon, 21 Nov 2016 17:23:11 -0500
Subject: [PATCH 32/44] Changing filters now works both in and out of sections

---
 src/plugins/change-filters/plugin.js | 87 +++++++++++++++++++++++-----
 tests/plugins.module.js              | 35 ++++++-----
 2 files changed, 92 insertions(+), 30 deletions(-)

diff --git a/src/plugins/change-filters/plugin.js b/src/plugins/change-filters/plugin.js
index 27aa6881..ca2be926 100644
--- a/src/plugins/change-filters/plugin.js
+++ b/src/plugins/change-filters/plugin.js
@@ -9,17 +9,19 @@ QueryBuilder.extend({
      * @throws ChangeFilterError
      * @param {boolean,optional} delete rules using old filters
      * @param {object[]} new filters
+     * @param {string,optional} set these new filters for a particular section
      */
-    setFilters: function(delete_orphans, filters) {
+    setFilters: function(delete_orphans, filters, section_id) {
         var self = this;
 
-        if (filters === undefined) {
+        if (Object.prototype.toString.call(delete_orphans) === '[object Array]') {
+            section_id = filters;
             filters = delete_orphans;
             delete_orphans = false;
         }
 
-        filters = this.checkFilters(filters);
-        filters = this.change('setFilters', filters);
+        filters = this.checkFilters(filters, section_id);
+        filters = this.change('setFilters', filters, section_id);
 
         var filtersIds = filters.map(function(filter) {
             return filter.id;
@@ -30,7 +32,10 @@ QueryBuilder.extend({
             (function checkOrphans(node) {
                 node.each(
                     function(rule) {
-                        if (rule.filter && filtersIds.indexOf(rule.filter.id) === -1) {
+                        if (section_id !== rule.section_type_id) {
+                            // ignore
+                        }
+                        else if (rule.filter && filtersIds.indexOf(rule.filter.id) === -1) {
                             Utils.error('ChangeFilter', 'A rule is using filter "{0}"', rule.filter.id);
                         }
                     },
@@ -40,13 +45,29 @@ QueryBuilder.extend({
         }
 
         // replace filters
-        this.filters = filters;
+        if (section_id === undefined) {
+            this.filters = filters;
+        } else {
+            var found = false;
+            for (var i = 0; i < this.sections.length; i++) {
+                if (this.sections[i].id === section_id) {
+                    this.sections[i].filters = filters;
+                    found = true;
+                }
+            }
+            if (!found) {
+                Utils.error('ChangeFilter', 'Unknown section "{0}"', section_id);
+            }
+        }
 
         // apply on existing DOM
         (function updateBuilder(node) {
             node.each(true,
               function(rule) {
-                  if (rule.filter && filtersIds.indexOf(rule.filter.id) === -1) {
+                  if (section_id !== rule.section_type_id) {
+                      // ignore
+                  }
+                  else if (rule.filter && filtersIds.indexOf(rule.filter.id) === -1) {
                       rule.drop();
                   }
                   else {
@@ -56,7 +77,12 @@ QueryBuilder.extend({
                       self.trigger('afterUpdateRuleFilter', rule);
                   }
               },
-              updateBuilder
+              updateBuilder,
+              function (section) {
+                  if (section.group) {
+                      updateBuilder(section.group);
+                  }
+              }
             );
         }(this.model.root));
 
@@ -80,15 +106,16 @@ QueryBuilder.extend({
             }
         }
 
-        this.trigger('afterSetFilters', filters);
+        this.trigger('afterSetFilters', filters, section_id);
     },
 
     /**
      * Adds a new filter to the builder
      * @param {object|object[]} the new filter
      * @param {mixed,optional} numeric index or '#start' or '#end'
+     * @param {string,optional} add these new filters for a particular section
      */
-    addFilter: function(new_filters, position) {
+    addFilter: function(new_filters, position, section_id) {
         if (position === undefined || position == '#end') {
             position = this.filters.length;
         }
@@ -100,7 +127,20 @@ QueryBuilder.extend({
             new_filters = [new_filters];
         }
 
-        var filters = $.extend(true, [], this.filters);
+        if (section_id === undefined) {
+            var filters = $.extend(true, [], this.filters);
+        } else {
+            var found = false;
+            for (var i = 0; i < this.sections.length; i++) {
+                if (this.sections[i].id === section_id) {
+                    var filters = $.extend(true, [], this.sections[i].filters);
+                    found = true;
+                }
+            }
+            if (!found) {
+                Utils.error('ChangeFilter', 'Unknown section "{0}"', section_id);
+            }
+        }
 
         // numeric position
         if (parseInt(position) == position) {
@@ -108,7 +148,7 @@ QueryBuilder.extend({
         }
         else {
             // after filter by its id
-            if (this.filters.some(function(filter, index) {
+            if (filters.some(function(filter, index) {
                 if (filter.id == position) {
                     position = index + 1;
                     return true;
@@ -122,16 +162,31 @@ QueryBuilder.extend({
             }
         }
 
-        this.setFilters(filters);
+        this.setFilters(filters, section_id);
     },
 
     /**
      * Removes a filter from the builder
      * @param {string|string[]} the filter id
      * @param {boolean,optional} delete rules using old filters
+     * @param {string,optional} remove these filters from a particular section
      */
-    removeFilter: function(filter_ids, delete_orphans) {
-        var filters = $.extend(true, [], this.filters);
+    removeFilter: function(filter_ids, delete_orphans, section_id) {
+        if (section_id === undefined) {
+            var filters = $.extend(true, [], this.filters);
+        } else {
+            var found = false;
+            for (var i = 0; i < this.sections.length; i++) {
+                if (this.sections[i].id === section_id) {
+                    var filters = $.extend(true, [], this.sections[i].filters);
+                    found = true;
+                }
+            }
+            if (!found) {
+                Utils.error('ChangeFilter', 'Unknown section "{0}"', section_id);
+            }
+        }
+
         if (typeof filter_ids === 'string') {
             filter_ids = [filter_ids];
         }
@@ -140,6 +195,6 @@ QueryBuilder.extend({
             return filter_ids.indexOf(filter.id) === -1;
         });
 
-        this.setFilters(delete_orphans, filters);
+        this.setFilters(delete_orphans, filters, section_id);
     }
 });
diff --git a/tests/plugins.module.js b/tests/plugins.module.js
index 110c1baf..11e7151a 100644
--- a/tests/plugins.module.js
+++ b/tests/plugins.module.js
@@ -144,20 +144,15 @@ $(function(){
      * Test change filters
      */
     QUnit.test('change-filters', function(assert) {
-        var filter_a = {
-            id: 'a',
-            type: 'string'
-        };
+        var filter_a = { id: 'a', type: 'string' };
+        var filter_b = { id: 'b', type: 'string' };
+        var filter_c = { id: 'c', type: 'string' };
+        var filter_d = { id: 'd', type: 'string' };
+        var filter_e = { id: 'e', type: 'string' };
+        var filter_f = { id: 'f', type: 'string' };
 
-        var filter_b = {
-            id: 'b',
-            type: 'string'
-        };
-
-        var filter_c = {
-            id: 'c',
-            type: 'string'
-        };
+        var section_a = { id: 'a', label: 'sec a', filters: [filter_d ] };
+        var section_b = { id: 'b', label: 'sec b', filters: [filter_e ] };
 
         var rule_a = {
             id: 'a',
@@ -165,7 +160,6 @@ $(function(){
             operator: 'equal',
             value: 'foo'
         };
-
         var rule_b = {
             id: 'b',
             field: 'b',
@@ -175,6 +169,7 @@ $(function(){
 
         $b.queryBuilder({
             filters: [filter_a, filter_b],
+            sections: [section_a, section_b],
             rules: [rule_a, rule_b]
         });
 
@@ -209,5 +204,17 @@ $(function(){
             ['-1', filter_c.id, filter_a.id, filter_b.id],
             'Should have added filter "a" after "c"'
         );
+
+        $('#builder_group_0>.rules-group-header>.group-actions [data-add=section]').trigger('click');
+        $('[name=builder_section_0_section_type]').val('a').trigger('change');
+
+        $b.queryBuilder('addFilter', filter_f, 0, 'a');
+
+        assert.optionsMatch(
+            $('#builder_rule_2 [name$=_filter] option'),
+            ['-1', filter_f.id, filter_d.id],
+            'Should have added filter "f" at begining for section "a"'
+        );
+
     });
 });

From 5afefaf9ddd86f070142529b4d0eb000eb230da6 Mon Sep 17 00:00:00 2001
From: Reha Sterbin <reha@omniti.com>
Date: Wed, 23 Nov 2016 13:27:49 -0500
Subject: [PATCH 33/44] Unique filters within sections

---
 src/plugins/unique-filter/plugin.js | 65 +++++++++++++++++++++++++----
 1 file changed, 58 insertions(+), 7 deletions(-)

diff --git a/src/plugins/unique-filter/plugin.js b/src/plugins/unique-filter/plugin.js
index aee31b7c..73e52cf8 100644
--- a/src/plugins/unique-filter/plugin.js
+++ b/src/plugins/unique-filter/plugin.js
@@ -5,6 +5,7 @@
 
 QueryBuilder.define('unique-filter', function() {
     this.status.used_filters = {};
+    this.status.used_filters_by_section = {};
 
     this.on('afterUpdateRuleFilter', this.updateDisabledFilters);
     this.on('afterDeleteRule', this.updateDisabledFilters);
@@ -21,9 +22,27 @@ QueryBuilder.define('unique-filter', function() {
 
         self.updateDisabledFilters();
 
-        if (e.value.id in self.status.used_filters) {
-            var found = self.filters.some(function(filter) {
-                if (!(filter.id in self.status.used_filters) || self.status.used_filters[filter.id].length > 0 && self.status.used_filters[filter.id].indexOf(model.parent) === -1) {
+        if (model.section_type_id === undefined) {
+            var used = self.status.used_filters;
+            var available = self.filters;
+        }
+        else {
+            var s = this.getSectionById(model.section_type_id);
+            if (s === undefined) {
+                Utils.error('UniqueFilter', 'Unknown section "${0}"', model.section_type_id);
+                e.value = undefined;
+                return;
+            }
+            if (self.status.used_filters_by_section[s.id] === undefined) {
+                self.status.used_filters_by_section[s.id] = {};
+            }
+            var used = self.status.used_filters_by_section[s.id];
+            var available = s.filters;
+        }
+
+        if (e.value.id in used) {
+            var found = available.some(function(filter) {
+                if (!(filter.id in used) || used[filter.id].length > 0 && used[filter.id].indexOf(model.parent) === -1) {
                     e.value = filter;
                     return true;
                 }
@@ -55,15 +74,32 @@ QueryBuilder.extend({
         (function walk(group) {
             group.each(function(rule) {
                 if (rule.filter && rule.filter.unique) {
-                    if (!self.status.used_filters[rule.filter.id]) {
-                        self.status.used_filters[rule.filter.id] = [];
+                    if (rule.section_type_id) {
+                        if (!self.status.used_filters_by_section[rule.section_type_id]) {
+                            self.status.used_filters_by_section[rule.section_type_id] = {};
+                        }
+                        if (!self.status.used_filters_by_section[rule.section_type_id][rule.filter.id]) {
+                            self.status.used_filters_by_section[rule.section_type_id][rule.filter.id] = [];
+                        }
+                        if (rule.filter.unique == 'group') {
+                            self.status.used_filters_by_section[rule.section_type_id][rule.filter.id].push(rule.parent);
+                        }
                     }
-                    if (rule.filter.unique == 'group') {
-                        self.status.used_filters[rule.filter.id].push(rule.parent);
+                    else {
+                        if (!self.status.used_filters[rule.filter.id]) {
+                            self.status.used_filters[rule.filter.id] = [];
+                        }
+                        if (rule.filter.unique == 'group') {
+                            self.status.used_filters[rule.filter.id].push(rule.parent);
+                        }
                     }
                 }
             }, function(group) {
                 walk(group);
+            }, function(section) {
+                if (section.group) {
+                    walk(section.group);
+                }
             });
         }(self.model.root));
 
@@ -78,6 +114,7 @@ QueryBuilder.extend({
         var self = e ? e.builder : this;
 
         self.status.used_filters = {};
+        self.status.used_filters_by_section = {};
 
         self.applyDisabledFilters(e);
     },
@@ -105,6 +142,20 @@ QueryBuilder.extend({
                 });
             }
         });
+        $.each(self.status.used_filters_by_section, function(section_id, filters) {
+            $.each(filters, function(filterId, groups) {
+                if (groups.length === 0) {
+                    self.$el.find(Selectors.section_container + '[data-stype=' + section_id + '] ' + Selectors.filter_container + ' option[value="' + filterId + '"]:not(:selected)').prop('disabled', true);
+                }
+                else {
+                    groups.forEach(function(group) {
+                        group.each(function(rule) {
+                            rule.$el.find(Selectors.section_container + '[data-stype=' + section_id + '] ' + Selectors.filter_container + ' option[value="' + filterId + '"]:not(:selected)').prop('disabled', true);
+                        });
+                    });
+                }
+            });
+        });
 
         // update Selectpicker
         if (self.settings.plugins && self.settings.plugins['bt-selectpicker']) {

From ed48873f73973b23b0361178b4cc2fb4d4eb4a5c Mon Sep 17 00:00:00 2001
From: Reha Sterbin <reha@omniti.com>
Date: Thu, 24 Nov 2016 13:58:42 -0500
Subject: [PATCH 34/44] Added support for sections to the SQL plugin and an
 error about non-support to the MongoDB plugin

---
 examples/index.html                   | 13 +++++++------
 src/plugins/mongodb-support/plugin.js |  5 ++++-
 src/plugins/sql-support/plugin.js     |  5 +++++
 3 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/examples/index.html b/examples/index.html
index 2af400d6..7699fbd1 100644
--- a/examples/index.html
+++ b/examples/index.html
@@ -128,9 +128,10 @@ <h3>Output</h3>
     {
       id: 'subquery-a',
       label: 'Subquery A',
+      base_sql: 'SELECT a_id FROM section_a WHERE parent_id = 10 AND ',
       filters: [
         {
-          id: 'sqa-name',
+          id: 'sqa_name',
           label: {
             en: 'Subquery A Name',
             fr: 'Nom'
@@ -142,7 +143,7 @@ <h3>Output</h3>
           unique: true
         },
         {
-          id: 'sqa-category',
+          id: 'sqa_category',
           label: 'Subquery A Category',
           type: 'integer',
           input: 'checkbox',
@@ -169,7 +170,7 @@ <h3>Output</h3>
       label: 'Subquery B',
       filters: [
         {
-          id: 'sqb-name',
+          id: 'sqb_name',
           label: {
             en: 'Subquery B Name',
             fr: 'Nom'
@@ -181,7 +182,7 @@ <h3>Output</h3>
           unique: true
         },
         {
-          id: 'sqb-category',
+          id: 'sqb_category',
           label: 'Subquery B Category',
           type: 'integer',
           input: 'checkbox',
@@ -208,7 +209,7 @@ <h3>Output</h3>
       label: 'Subquery C',
       filters: [
         {
-          id: 'sqc-name',
+          id: 'sqc_name',
           label: {
             en: 'Subquery C Name',
             fr: 'Nom'
@@ -220,7 +221,7 @@ <h3>Output</h3>
           unique: true
         },
         {
-          id: 'sqc-category',
+          id: 'sqc_category',
           label: 'Subquery C Category',
           type: 'integer',
           input: 'checkbox',
diff --git a/src/plugins/mongodb-support/plugin.js b/src/plugins/mongodb-support/plugin.js
index fa6ae09d..b5151d13 100644
--- a/src/plugins/mongodb-support/plugin.js
+++ b/src/plugins/mongodb-support/plugin.js
@@ -81,7 +81,7 @@ QueryBuilder.defaults({
 QueryBuilder.extend({
     /**
      * Get rules as MongoDB query
-     * @throws UndefinedMongoConditionError, UndefinedMongoOperatorError
+     * @throws UndefinedMongoConditionError, UndefinedMongoBehavior, UndefinedMongoOperatorError
      * @param data {object} (optional) rules
      * @return {object}
      */
@@ -108,6 +108,9 @@ QueryBuilder.extend({
                 if (rule.rules && rule.rules.length > 0) {
                     parts.push(parse(rule));
                 }
+                else if (rule.section) {
+                    Utils.error('UndefinedMongoBehavior', 'Sections are not currently supported for MongoDB queries');
+                }
                 else {
                     var mdb = self.settings.mongoOperators[rule.operator];
                     var ope = self.getOperatorByType(rule.operator);
diff --git a/src/plugins/sql-support/plugin.js b/src/plugins/sql-support/plugin.js
index fef1ff92..bed9c676 100644
--- a/src/plugins/sql-support/plugin.js
+++ b/src/plugins/sql-support/plugin.js
@@ -247,6 +247,11 @@ QueryBuilder.extend({
                 if (rule.rules && rule.rules.length > 0) {
                     parts.push('(' + nl + parse(rule) + nl + ')' + nl);
                 }
+                else if (rule.section) {
+                    var info = self.getSectionById(rule.section);
+                    var base_sql = info.base_sql !== undefined ? info.base_sql : 'SELECT * FROM ' + rule.section + ' WHERE ';
+                    parts.push('( ' + rule.exists + ' ( ' + base_sql + parse(rule.group) + ' ) )');
+                }
                 else {
                     var sql = self.settings.sqlOperators[rule.operator];
                     var ope = self.getOperatorByType(rule.operator);

From 96b58477c5d29f80d1cb4d7b6ff93da3c15b41d8 Mon Sep 17 00:00:00 2001
From: Reha Sterbin <reha@omniti.com>
Date: Mon, 28 Nov 2016 20:43:43 -0500
Subject: [PATCH 35/44] Tests for get-sql sections support

---
 tests/plugins.sql-support.module.js | 35 +++++++++++++++++++++++++++++
 1 file changed, 35 insertions(+)

diff --git a/tests/plugins.sql-support.module.js b/tests/plugins.sql-support.module.js
index bc7098a9..4b35b998 100644
--- a/tests/plugins.sql-support.module.js
+++ b/tests/plugins.sql-support.module.js
@@ -191,6 +191,41 @@ $(function () {
         );
     });
 
+    QUnit.test('Subqueries', function (assert) {
+
+        $b.queryBuilder({
+            filters: basic_filters,
+            sections: basic_sections,
+        });
+
+        // TODO: start here
+
+        $b.queryBuilder('setRulesFromSQL', nested_rules_sql);
+
+        assert.rulesMatch(
+            $b.queryBuilder('getRules'),
+            nested_rules,
+            'Should parse SQL with deep nested rules'
+        );
+
+        $b.queryBuilder('reset');
+
+        $b.queryBuilder('setRulesFromSQL', 'a = 5');
+
+        assert.rulesMatch(
+            $b.queryBuilder('getRules'),
+            {
+                condition: 'AND',
+                rules: [{
+                    id: 'a',
+                    operator: 'equal',
+                    value: 5
+                }]
+            },
+            'Should parse SQL with one rule'
+        );
+    });
+
 
     var basic_rules_sql_raw = {
         sql: 'price < 10.25 AND name IS NULL AND ( category IN(\'mo\', \'mu\') OR id != \'1234-azer-5678\' ) '

From fa0a2ab3424cbc8ee152c46162db316c6d540d2a Mon Sep 17 00:00:00 2001
From: Reha Sterbin <reha@omniti.com>
Date: Mon, 28 Nov 2016 20:44:04 -0500
Subject: [PATCH 36/44] Test for get-mongo sections error

---
 tests/plugins.mongo-support.module.js | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/tests/plugins.mongo-support.module.js b/tests/plugins.mongo-support.module.js
index 68e4a329..e57e939e 100644
--- a/tests/plugins.mongo-support.module.js
+++ b/tests/plugins.mongo-support.module.js
@@ -39,6 +39,20 @@ $(function(){
         );
     });
 
+    QUnit.test('Sections not allowed', function(assert) {
+        $b.queryBuilder({
+            filters: basic_filters,
+            sections: basic_sections,
+            rules: section_rules
+        });
+
+        assert.throws(
+            function(){ $b.queryBuilder('getMongo'); },
+            /Sections are not currently supported for MongoDB queries/,
+            'Should throw "Not supported" error'
+        );
+    });
+
     QUnit.test('All operators', function(assert) {
         $b.queryBuilder({
             filters: basic_filters,

From 187bdac71c34e0b9301bd8b27d34d73ec84f177e Mon Sep 17 00:00:00 2001
From: Reha Sterbin <reha@omniti.com>
Date: Wed, 30 Nov 2016 16:13:51 -0500
Subject: [PATCH 37/44] Setting sections from SQL works now; also:

- removed the custom base sql option, which rightfully belongs in a plugin
- added tests
---
 src/plugins/sql-support/plugin.js   | 54 ++++++++++++++++++++--
 tests/plugins.sql-support.module.js | 72 ++++++++++++++++++++---------
 2 files changed, 101 insertions(+), 25 deletions(-)

diff --git a/src/plugins/sql-support/plugin.js b/src/plugins/sql-support/plugin.js
index bed9c676..49f3cc15 100644
--- a/src/plugins/sql-support/plugin.js
+++ b/src/plugins/sql-support/plugin.js
@@ -249,7 +249,7 @@ QueryBuilder.extend({
                 }
                 else if (rule.section) {
                     var info = self.getSectionById(rule.section);
-                    var base_sql = info.base_sql !== undefined ? info.base_sql : 'SELECT * FROM ' + rule.section + ' WHERE ';
+                    var base_sql = 'SELECT * FROM ' + rule.section + ' WHERE ';
                     parts.push('( ' + rule.exists + ' ( ' + base_sql + parse(rule.group) + ' ) )');
                 }
                 else {
@@ -382,6 +382,12 @@ QueryBuilder.extend({
                 return;
             }
 
+            // a plugin returned a section
+            if ('section' in data && 'exists' in data && 'group' in data) {
+                curr.rules.push(data);
+                return;
+            }
+
             // a plugin returned a rule
             if ('id' in data && 'operator' in data && 'value' in data) {
                 curr.rules.push(data);
@@ -389,12 +395,13 @@ QueryBuilder.extend({
             }
 
             // data must be a SQL parser node
-            if (!('left' in data) || !('right' in data) || !('operation' in data)) {
+            if ((!('operator' in data) && !('operand' in data))
+                && (!('operation' in data) || !('left' in data) || !('right' in data))) {
                 Utils.error('SQLParse', 'Unable to parse WHERE clause');
             }
 
             // it's a node
-            if (['AND', 'OR'].indexOf(data.operation.toUpperCase()) !== -1) {
+            if (('operation') in data && ['AND', 'OR'].indexOf(data.operation.toUpperCase()) !== -1) {
                 // create a sub-group if the condition is not the same and it's not the first level
                 if (i > 0 && curr.condition != data.operation.toUpperCase()) {
                     var group = self.change('sqlToGroup', {
@@ -416,6 +423,47 @@ QueryBuilder.extend({
                 curr = next;
                 flatten(data.right, i);
             }
+            // it's a subquery
+            else if (('operator') in data && ['EXISTS', 'NOT EXISTS'].indexOf(data.operator.toUpperCase()) !== -1) {
+                // find the section name
+                if (!('select' in data.operand) || !('source' in data.operand.select)
+                    || !('name' in data.operand.select.source)
+                    || !('value' in data.operand.select.source.name)) {
+                    Utils.error('SQLParse', 'Unable to parse subquery: missing table name');
+                }
+                var section = self.change('sqlToSection', {
+                    section: data.operand.select.source.name.value,
+                    exists: data.operator.toUpperCase(),
+                }, data);
+
+                // find the where clause
+                if (!('where' in data.operand.select) || !('conditions' in data.operand.select.where)) {
+                    Utils.error('SQLParse', 'Unable to parse subquery: no where clause found');
+                }
+
+                // allow plugins to manually parse or handle special cases
+                var sdata = self.change('parseSQLNode', data.operand.select.where.conditions);
+
+                // a plugin returned a group
+                if ('rules' in sdata && 'condition' in sdata) {
+                    section.group = sdata;
+                }
+                // create root group for section
+                else {
+                    var sgroup = self.change('sqlToGroup', {
+                        condition: self.settings.default_condition,
+                        rules: []
+                    }, sdata);
+                    section.group = sgroup;
+                }
+
+                // push the section
+                curr.rules.push(section);
+                curr = section.group;
+
+                // parse each part of the group
+                flatten(sdata);
+            }
             // it's a leaf
             else {
                 if (data.left.value === undefined || data.right.value === undefined) {
diff --git a/tests/plugins.sql-support.module.js b/tests/plugins.sql-support.module.js
index 4b35b998..610cb9f4 100644
--- a/tests/plugins.sql-support.module.js
+++ b/tests/plugins.sql-support.module.js
@@ -191,42 +191,43 @@ $(function () {
         );
     });
 
-    QUnit.test('Subqueries', function (assert) {
+    QUnit.test('Get SQL with subqueries', function (assert) {
 
         $b.queryBuilder({
             filters: basic_filters,
             sections: basic_sections,
+            rules: section_rules
         });
 
-        // TODO: start here
-
-        $b.queryBuilder('setRulesFromSQL', nested_rules_sql);
-
-        assert.rulesMatch(
-            $b.queryBuilder('getRules'),
-            nested_rules,
-            'Should parse SQL with deep nested rules'
+        assert.deepEqual(
+            $b.queryBuilder('getSQL', false),
+            section_rules_sql,
+            'Should create SQL query with sections'
         );
+    });
 
-        $b.queryBuilder('reset');
+    QUnit.test('Set from SQL with subqueries', function (assert) {
 
-        $b.queryBuilder('setRulesFromSQL', 'a = 5');
+        $b.queryBuilder({
+            filters: basic_filters,
+            sections: basic_sections
+        });
+
+        $b.queryBuilder('setRulesFromSQL', section_rules_sql);
 
+        var result = $b.queryBuilder('getRules');
         assert.rulesMatch(
-            $b.queryBuilder('getRules'),
-            {
-                condition: 'AND',
-                rules: [{
-                    id: 'a',
-                    operator: 'equal',
-                    value: 5
-                }]
-            },
-            'Should parse SQL with one rule'
+            result,
+            section_rules,
+            'Should parse SQL with rules that include sections'
+        );
+        assert.rulesMatch(
+            result.rules[1].group.rules,
+            section_rules.rules[1].group.rules,
+            'Should parse SQL with rules that include sections'
         );
     });
 
-
     var basic_rules_sql_raw = {
         sql: 'price < 10.25 AND name IS NULL AND ( category IN(\'mo\', \'mu\') OR id != \'1234-azer-5678\' ) '
     };
@@ -266,6 +267,33 @@ $(function () {
         }
     };
 
+    var section_rules_sql = {
+        sql: 'name IS NOT NULL AND ( EXISTS ( SELECT * FROM partner WHERE name LIKE(\'%foo%\') AND status NOT IN(\'in\', \'tr\') ) )'
+    };
+
+    var section_rules = {
+        condition: 'AND',
+        rules: [{
+            id: 'name',
+            operator: 'is_not_null',
+        },{
+            section: 'partner',
+            exists: 'EXISTS',
+            group: {
+                condition: 'AND',
+                rules: [{
+                    id: 'name',
+                    operator: 'contains',
+                    value: 'foo'
+                }, {
+                    id: 'status',
+                    operator: 'not_in',
+                    value: ['in', 'tr']
+                }]
+            }
+        }]
+    };
+
     var all_operators_rules = {
         condition: 'AND',
         rules: [{

From a2a041e74a2c57b0695909c0c6221568c76c60f1 Mon Sep 17 00:00:00 2001
From: Reha Sterbin <reha@omniti.com>
Date: Wed, 30 Nov 2016 16:25:12 -0500
Subject: [PATCH 38/44] Fixed linting and style warnings

---
 src/core.js                          |  4 ++--
 src/plugins/change-filters/plugin.js | 21 +++++++++++++--------
 src/plugins/invert/plugin.js         |  4 ++--
 src/plugins/sortable/plugin.js       |  6 ++++--
 src/plugins/sql-support/plugin.js    |  9 +++------
 src/plugins/unique-filter/plugin.js  | 10 ++++++----
 6 files changed, 30 insertions(+), 24 deletions(-)

diff --git a/src/core.js b/src/core.js
index 801e2857..0359c407 100644
--- a/src/core.js
+++ b/src/core.js
@@ -89,7 +89,7 @@ QueryBuilder.prototype.init = function($el, options) {
  */
 QueryBuilder.prototype.checkFilters = function(filters, section) {
     var definedFilters = [];
-    var sectiontag = function (i) { if (section) { return ' [section: {' + i + '}]'; } };
+    var sectiontag = function(i) { if (section) { return ' [section: {' + i + '}]'; } };
 
     if (!filters || filters.length === 0) {
         Utils.error('Config', 'Missing filters list' + sectiontag(0), section);
@@ -502,7 +502,7 @@ QueryBuilder.prototype.addGroup = function(parent, addRule, data, flags) {
     var group_id = this.nextGroupId();
     var section_root = parent instanceof Section;
     var stype = section_root ? parent.type_id : parent.section_type_id;
-    var in_section = section_root || stype != undefined;
+    var in_section = section_root || stype !== undefined;
     var $group = $(this.getGroupTemplate(group_id, level, stype, in_section, section_root));
     var model = null;
     if (parent instanceof Section) {
diff --git a/src/plugins/change-filters/plugin.js b/src/plugins/change-filters/plugin.js
index ca2be926..c61c3829 100644
--- a/src/plugins/change-filters/plugin.js
+++ b/src/plugins/change-filters/plugin.js
@@ -47,7 +47,8 @@ QueryBuilder.extend({
         // replace filters
         if (section_id === undefined) {
             this.filters = filters;
-        } else {
+        }
+        else {
             var found = false;
             for (var i = 0; i < this.sections.length; i++) {
                 if (this.sections[i].id === section_id) {
@@ -78,7 +79,7 @@ QueryBuilder.extend({
                   }
               },
               updateBuilder,
-              function (section) {
+              function(section) {
                   if (section.group) {
                       updateBuilder(section.group);
                   }
@@ -127,13 +128,15 @@ QueryBuilder.extend({
             new_filters = [new_filters];
         }
 
+        var filters = [];
         if (section_id === undefined) {
-            var filters = $.extend(true, [], this.filters);
-        } else {
+            filters = $.extend(true, [], this.filters);
+        }
+        else {
             var found = false;
             for (var i = 0; i < this.sections.length; i++) {
                 if (this.sections[i].id === section_id) {
-                    var filters = $.extend(true, [], this.sections[i].filters);
+                    filters = $.extend(true, [], this.sections[i].filters);
                     found = true;
                 }
             }
@@ -172,13 +175,15 @@ QueryBuilder.extend({
      * @param {string,optional} remove these filters from a particular section
      */
     removeFilter: function(filter_ids, delete_orphans, section_id) {
+        var filters = [];
         if (section_id === undefined) {
-            var filters = $.extend(true, [], this.filters);
-        } else {
+            filters = $.extend(true, [], this.filters);
+        }
+        else {
             var found = false;
             for (var i = 0; i < this.sections.length; i++) {
                 if (this.sections[i].id === section_id) {
-                    var filters = $.extend(true, [], this.sections[i].filters);
+                    filters = $.extend(true, [], this.sections[i].filters);
                     found = true;
                 }
             }
diff --git a/src/plugins/invert/plugin.js b/src/plugins/invert/plugin.js
index 06179dd2..e8ad8d9c 100644
--- a/src/plugins/invert/plugin.js
+++ b/src/plugins/invert/plugin.js
@@ -151,8 +151,8 @@ QueryBuilder.extend({
 
             // recursive call
             if (options.recursive && node.group) {
-                var tempOpts = $.extend({}, options, { trigger: false });
-                this.invert(node.group, tempOpts);
+                var sectOpts = $.extend({}, options, { trigger: false });
+                this.invert(node.group, sectOpts);
             }
         }
 
diff --git a/src/plugins/sortable/plugin.js b/src/plugins/sortable/plugin.js
index 20ac43ac..bcd3d6ec 100644
--- a/src/plugins/sortable/plugin.js
+++ b/src/plugins/sortable/plugin.js
@@ -24,10 +24,12 @@ QueryBuilder.define('sortable', function(options) {
         if (node instanceof Section) {
             return Selectors.rule_container + '[data-stype="' + node.type_id + '"], ' +
                 Selectors.group_container + '[data-stype="' + node.type_id + '"]';
-        } else if (node.section_type_id != undefined) {
+        }
+        else if (node.section_type_id !== undefined) {
             return Selectors.rule_container + '[data-stype="' + node.section_type_id + '"], ' +
                 Selectors.group_container + '[data-stype="' + node.section_type_id + '"]';
-        } else {
+        }
+        else {
             return Selectors.rule_container + '[data-stype=""], ' +
                 Selectors.group_container + '[data-stype=""], ' +
                 Selectors.section_container;
diff --git a/src/plugins/sql-support/plugin.js b/src/plugins/sql-support/plugin.js
index 49f3cc15..447d7813 100644
--- a/src/plugins/sql-support/plugin.js
+++ b/src/plugins/sql-support/plugin.js
@@ -395,8 +395,7 @@ QueryBuilder.extend({
             }
 
             // data must be a SQL parser node
-            if ((!('operator' in data) && !('operand' in data))
-                && (!('operation' in data) || !('left' in data) || !('right' in data))) {
+            if ((!('operator' in data) && !('operand' in data)) && (!('operation' in data) || !('left' in data) || !('right' in data))) {
                 Utils.error('SQLParse', 'Unable to parse WHERE clause');
             }
 
@@ -426,14 +425,12 @@ QueryBuilder.extend({
             // it's a subquery
             else if (('operator') in data && ['EXISTS', 'NOT EXISTS'].indexOf(data.operator.toUpperCase()) !== -1) {
                 // find the section name
-                if (!('select' in data.operand) || !('source' in data.operand.select)
-                    || !('name' in data.operand.select.source)
-                    || !('value' in data.operand.select.source.name)) {
+                if (!('select' in data.operand) || !('source' in data.operand.select) || !('name' in data.operand.select.source) || !('value' in data.operand.select.source.name)) {
                     Utils.error('SQLParse', 'Unable to parse subquery: missing table name');
                 }
                 var section = self.change('sqlToSection', {
                     section: data.operand.select.source.name.value,
-                    exists: data.operator.toUpperCase(),
+                    exists: data.operator.toUpperCase()
                 }, data);
 
                 // find the where clause
diff --git a/src/plugins/unique-filter/plugin.js b/src/plugins/unique-filter/plugin.js
index 73e52cf8..4d53e0e8 100644
--- a/src/plugins/unique-filter/plugin.js
+++ b/src/plugins/unique-filter/plugin.js
@@ -22,9 +22,11 @@ QueryBuilder.define('unique-filter', function() {
 
         self.updateDisabledFilters();
 
+        var used = [];
+        var available = [];
         if (model.section_type_id === undefined) {
-            var used = self.status.used_filters;
-            var available = self.filters;
+            used = self.status.used_filters;
+            available = self.filters;
         }
         else {
             var s = this.getSectionById(model.section_type_id);
@@ -36,8 +38,8 @@ QueryBuilder.define('unique-filter', function() {
             if (self.status.used_filters_by_section[s.id] === undefined) {
                 self.status.used_filters_by_section[s.id] = {};
             }
-            var used = self.status.used_filters_by_section[s.id];
-            var available = s.filters;
+            used = self.status.used_filters_by_section[s.id];
+            available = s.filters;
         }
 
         if (e.value.id in used) {

From 8d550fea87c31bc6d63985a406b1607e6a2f1a5a Mon Sep 17 00:00:00 2001
From: Reha Sterbin <reha@omniti.com>
Date: Wed, 30 Nov 2016 16:25:35 -0500
Subject: [PATCH 39/44] Put sections in right include location

---
 tests/index.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/index.html b/tests/index.html
index 058ce194..1e891678 100644
--- a/tests/index.html
+++ b/tests/index.html
@@ -56,13 +56,13 @@
 
 <!-- qunit:modules -->
 <script src="/prx/000/https/patch-diff.githubusercontent.com/raw/mistic100/jQuery-QueryBuilder/tests/core.module.js,_ANDesc=js,"></script>
-<script src="/prx/000/https/patch-diff.githubusercontent.com/raw/mistic100/jQuery-QueryBuilder/tests/sections.module.js,_ANDesc=js,"></script>
 <script src="/prx/000/https/patch-diff.githubusercontent.com/raw/mistic100/jQuery-QueryBuilder/tests/data.module.js,_ANDesc=js,"></script>
 <script src="/prx/000/https/patch-diff.githubusercontent.com/raw/mistic100/jQuery-QueryBuilder/tests/plugins-gui.module.js,_ANDesc=js,"></script>
 <script src="/prx/000/https/patch-diff.githubusercontent.com/raw/mistic100/jQuery-QueryBuilder/tests/plugins.module.js,_ANDesc=js,"></script>
 <script src="/prx/000/https/patch-diff.githubusercontent.com/raw/mistic100/jQuery-QueryBuilder/tests/plugins.mongo-support.module.js,_ANDesc=js,"></script>
 <script src="/prx/000/https/patch-diff.githubusercontent.com/raw/mistic100/jQuery-QueryBuilder/tests/plugins.not-group.module.js,_ANDesc=js,"></script>
 <script src="/prx/000/https/patch-diff.githubusercontent.com/raw/mistic100/jQuery-QueryBuilder/tests/plugins.sql-support.module.js,_ANDesc=js,"></script>
+<script src="/prx/000/https/patch-diff.githubusercontent.com/raw/mistic100/jQuery-QueryBuilder/tests/sections.module.js,_ANDesc=js,"></script>
 <script src="/prx/000/https/patch-diff.githubusercontent.com/raw/mistic100/jQuery-QueryBuilder/tests/utils.module.js,_ANDesc=js,"></script>
 <!-- /qunit:modules -->
 </head>

From a46736aea4b772f7cafb9acb5f9d7aa572c10648 Mon Sep 17 00:00:00 2001
From: Reha Sterbin <reha@omniti.com>
Date: Thu, 8 Dec 2016 11:46:39 -0500
Subject: [PATCH 40/44] Increased test coverage and fixed a bug in the sections
 part of the unique-filter plugin

---
 src/plugins/unique-filter/plugin.js | 18 ++----
 src/public.js                       |  1 +
 tests/plugins.module.js             | 92 +++++++++++++++++++++++++++++
 tests/sections.module.js            | 40 +++++++++++++
 4 files changed, 137 insertions(+), 14 deletions(-)

diff --git a/src/plugins/unique-filter/plugin.js b/src/plugins/unique-filter/plugin.js
index 4d53e0e8..28d918e0 100644
--- a/src/plugins/unique-filter/plugin.js
+++ b/src/plugins/unique-filter/plugin.js
@@ -132,7 +132,7 @@ QueryBuilder.extend({
         self.$el.find(Selectors.filter_container + ' option').prop('disabled', false);
 
         // disable some
-        $.each(self.status.used_filters, function(filterId, groups) {
+        var disableSome = function(filterId, groups) {
             if (groups.length === 0) {
                 self.$el.find(Selectors.filter_container + ' option[value="' + filterId + '"]:not(:selected)').prop('disabled', true);
             }
@@ -143,20 +143,10 @@ QueryBuilder.extend({
                     });
                 });
             }
-        });
+        };
+        $.each(self.status.used_filters, disableSome);
         $.each(self.status.used_filters_by_section, function(section_id, filters) {
-            $.each(filters, function(filterId, groups) {
-                if (groups.length === 0) {
-                    self.$el.find(Selectors.section_container + '[data-stype=' + section_id + '] ' + Selectors.filter_container + ' option[value="' + filterId + '"]:not(:selected)').prop('disabled', true);
-                }
-                else {
-                    groups.forEach(function(group) {
-                        group.each(function(rule) {
-                            rule.$el.find(Selectors.section_container + '[data-stype=' + section_id + '] ' + Selectors.filter_container + ' option[value="' + filterId + '"]:not(:selected)').prop('disabled', true);
-                        });
-                    });
-                }
-            });
+            $.each(filters, disableSome);
         });
 
         // update Selectpicker
diff --git a/src/public.js b/src/public.js
index 3a3f0ea3..320dcc32 100644
--- a/src/public.js
+++ b/src/public.js
@@ -39,6 +39,7 @@ QueryBuilder.prototype.reset = function() {
 QueryBuilder.prototype.clear = function() {
     this.status.group_id = 0;
     this.status.rule_id = 0;
+    this.status.section_id = 0;
 
     if (this.model.root) {
         this.model.root.drop();
diff --git a/tests/plugins.module.js b/tests/plugins.module.js
index 11e7151a..28f05404 100644
--- a/tests/plugins.module.js
+++ b/tests/plugins.module.js
@@ -93,6 +93,98 @@ $(function(){
             !$('select[name=builder_rule_3_filter] option[value=price]').is(':disabled'),
             '"Price" filter should be disabled in his group only'
         );
+
+        $b.queryBuilder('destroy');
+
+        var unique_sections = $.extend(true, [], basic_sections);
+        unique_sections[0].filters[0].unique = true; // partner -> name
+        unique_sections[1].filters[1].unique = 'group';    // related -> price
+
+        var unique_rules = {
+            condition: 'AND',
+            rules: [{
+                id: 'price',
+                field: 'price',
+                operator: 'less',
+                value: 10.25
+            }, {
+                section: 'partner',
+                group: {
+                    condition: 'OR',
+                    rules: [{
+                        condition: 'AND',
+                        rules: [{
+                            id: 'name',
+                            field: 'name',
+                            operator: 'begins_with',
+                            value: 'Best'
+                        }, {
+                            id: 'status',
+                            field: 'status',
+                            operator: 'equal',
+                            value: 'ac'
+                        }]
+                    }, {
+                        condition: 'AND',
+                        rules: [{
+                            id: 'name',
+                            field: 'name',
+                            operator: 'begins_with',
+                            value: 'Worst'
+                        }, {
+                            id: 'status',
+                            field: 'status',
+                            operator: 'in',
+                            value: [ 'in', 'tr' ]
+                        }]
+                    }]
+                }
+            }, {
+                section: 'related',
+                group: {
+                    condition: 'OR',
+                    rules: [{
+                        id: 'category',
+                        field: 'category',
+                        operator: 'in',
+                        value: [ 'bk', 'mo', 'mu' ]
+                    },{
+                        condition: 'AND',
+                        rules: [{
+                            id: 'category',
+                            field: 'category',
+                            operator: 'equal',
+                            value: 'cl'
+                        }, {
+                            id: 'price',
+                            field: 'price',
+                            operator: 'greater',
+                            value: 10.00
+                        }]
+                    }]
+                }
+            }]
+        };
+
+        $b.queryBuilder({
+            plugins: ['unique-filter'],
+            filters: basic_filters,
+            sections: unique_sections,
+            rules: unique_rules
+        });
+
+        assert.ok(
+            $('#builder_section_0 select[name=builder_rule_2_filter] option[value=name]').is(':disabled') &&
+            $('#builder_section_0 select[name=builder_rule_4_filter] option[value=name]').is(':disabled'),
+            '"Name" filter in "partner" section should be disabled everywhere'
+        );
+
+        assert.ok(
+            !$('#builder_section_1 select[name=builder_rule_5_filter] option[value=price]').is(':disabled') &&
+             $('#builder_section_1 select[name=builder_rule_6_filter] option[value=price]').is(':disabled'),
+            '"Price" filter in "related" section should be disabled in his group only'
+        );
+
     });
 
     /**
diff --git a/tests/sections.module.js b/tests/sections.module.js
index 8e83bba7..0e4879a8 100644
--- a/tests/sections.module.js
+++ b/tests/sections.module.js
@@ -297,6 +297,46 @@ $(function(){
             expected.rules[1].group,
             'Should return correct section group after UI events'
         );
+
+        // change the section type and set the first rule
+        $('[name=builder_section_0_section_type]').val('related').trigger('change');
+        $('[name=builder_rule_5_filter]').val('name').trigger('change');
+        $('[name=builder_rule_5_operator]').val('begins_with').trigger('change');
+        $('[name=builder_rule_5_value_0]').val('bar').trigger('change');
+
+        // confirm that the old section rules are gone and the new one is in place
+        var generated = $b.queryBuilder('getRules');
+        var expected = {
+            condition: 'AND',
+            rules: [{
+                id: 'name',
+                operator: 'not_equal',
+                value: 'foo'
+            }, {
+                section: 'related',
+                exists: 'DOES NOT EXIST',
+                group: {
+                    condition: 'AND',
+                    rules: [{
+                        id: 'name',
+                        operator: 'begins_with',
+                        value: 'bar'
+                    }]
+                }
+            }]
+        };
+
+        assert.rulesMatch(
+            generated,
+            expected,
+            'Should return correct rules after UI events'
+        );
+        assert.rulesMatch(
+            generated.rules != undefined && generated.rules[1] != undefined ? generated.rules[1].group : 'missing',
+            expected.rules[1].group,
+            'Should return correct section group after UI events'
+        );
+
     });
 
     /**

From 71d8cec1cf6b2ff021aab9ea11be9660e0267372 Mon Sep 17 00:00:00 2001
From: Reha Sterbin <reha@omniti.com>
Date: Thu, 8 Dec 2016 12:17:03 -0500
Subject: [PATCH 41/44] Added a test for inverting on sections and fixed a bug
 in auto-setting the exists flag

---
 src/public.js           |  3 +++
 tests/plugins.module.js | 42 +++++++++++++++++++++++++++++++++++++++++
 2 files changed, 45 insertions(+)

diff --git a/src/public.js b/src/public.js
index 320dcc32..db43963a 100644
--- a/src/public.js
+++ b/src/public.js
@@ -276,6 +276,9 @@ QueryBuilder.prototype.setRules = function(data) {
                         return;
                     }
                     section.type_id = item.section;
+                    if (item.exists === undefined) {
+                        item.exists = self.settings.default_exists;
+                    }
                     section.exists = item.exists;
                     if (item.group !== undefined) {
                         var gmodel = self.addGroup(section, false, item.group.data, self.parseGroupFlags(item.group));
diff --git a/tests/plugins.module.js b/tests/plugins.module.js
index 28f05404..f463f320 100644
--- a/tests/plugins.module.js
+++ b/tests/plugins.module.js
@@ -230,6 +230,48 @@ $(function(){
             },
             'Should have inverted all conditions and operators'
         );
+
+        $b.queryBuilder('destroy');
+
+        $b.queryBuilder({
+            plugins: ['invert'],
+            filters: basic_filters,
+            sections: basic_sections,
+            rules: section_rules
+        });
+
+        $b.queryBuilder('invert');
+
+        assert.rulesMatch(
+            $b.queryBuilder('getRules'),
+            {
+                condition: 'OR',
+                rules: [{
+                    id: 'price',
+                    field: 'price',
+                    operator: 'greater_or_equal',
+                    value: 10.25
+                }, {
+                    section: 'partner',
+                    exists: 'NOT EXISTS',
+                    group: {
+                        condition: 'OR',
+                        rules: [{
+                            id: 'name',
+                            field: 'name',
+                            operator: 'not_begins_with',
+                            value: 'Best'
+                        }, {
+                            id: 'status',
+                            field: 'status',
+                            operator: 'not_in',
+                            value: [ 'ac', 'in' ]
+                        }]
+                    }
+                }]
+            },
+            'Should have inverted all exist checks, conditions, and operators'
+        );
     });
 
     /**

From 5db5f73651887283d10face17e5260a77f2df513 Mon Sep 17 00:00:00 2001
From: Reha Sterbin <reha@omniti.com>
Date: Thu, 8 Dec 2016 12:39:32 -0500
Subject: [PATCH 42/44] Added testing of default unique filters

---
 src/plugins/unique-filter/plugin.js |  2 +-
 tests/plugins.module.js             | 22 ++++++++++++++++++++--
 2 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/src/plugins/unique-filter/plugin.js b/src/plugins/unique-filter/plugin.js
index 28d918e0..855def62 100644
--- a/src/plugins/unique-filter/plugin.js
+++ b/src/plugins/unique-filter/plugin.js
@@ -29,7 +29,7 @@ QueryBuilder.define('unique-filter', function() {
             available = self.filters;
         }
         else {
-            var s = this.getSectionById(model.section_type_id);
+            var s = self.getSectionById(model.section_type_id);
             if (s === undefined) {
                 Utils.error('UniqueFilter', 'Unknown section "${0}"', model.section_type_id);
                 e.value = undefined;
diff --git a/tests/plugins.module.js b/tests/plugins.module.js
index f463f320..172292f8 100644
--- a/tests/plugins.module.js
+++ b/tests/plugins.module.js
@@ -77,7 +77,8 @@ $(function(){
         $b.queryBuilder({
             plugins: ['unique-filter'],
             filters: unique_filters,
-            rules: basic_rules
+            rules: basic_rules,
+            default_filter: 'id'
         });
 
         assert.ok(
@@ -94,11 +95,20 @@ $(function(){
             '"Price" filter should be disabled in his group only'
         );
 
+        $('#builder_group_0>.rules-group-header>.group-actions [data-add=rule]').trigger('click');
+
+        assert.ok(
+             $('select[name=builder_rule_4_filter] option[value=id]').is(':disabled') &&
+            !$('select[name=builder_rule_4_filter] option[value=id]').is(':selected'),
+            '"Identifier" filter should be disabled and not selected'
+        );
+
         $b.queryBuilder('destroy');
 
         var unique_sections = $.extend(true, [], basic_sections);
+        unique_sections[0].default_filter = 'name'; // partner -> name is the default
         unique_sections[0].filters[0].unique = true; // partner -> name
-        unique_sections[1].filters[1].unique = 'group';    // related -> price
+        unique_sections[1].filters[1].unique = 'group'; // related -> price
 
         var unique_rules = {
             condition: 'AND',
@@ -185,6 +195,14 @@ $(function(){
             '"Price" filter in "related" section should be disabled in his group only'
         );
 
+        $('#builder_group_1>.rules-group-header>.group-actions [data-add=rule]').trigger('click');
+
+        assert.ok(
+             $('select[name=builder_rule_8_filter] option[value=name]').is(':disabled') &&
+            !$('select[name=builder_rule_8_filter] option[value=name]').is(':selected'),
+            '"Name" filter in "partner" section should be disabled and not selected'
+        );
+
     });
 
     /**

From 9fe66f54a71262132b1c4846bd76ea93b17b7dbd Mon Sep 17 00:00:00 2001
From: Reha Sterbin <reha@omniti.com>
Date: Thu, 8 Dec 2016 12:50:27 -0500
Subject: [PATCH 43/44] Added a test for remove filter on a section

---
 tests/plugins.module.js | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/tests/plugins.module.js b/tests/plugins.module.js
index 172292f8..4b12ac63 100644
--- a/tests/plugins.module.js
+++ b/tests/plugins.module.js
@@ -368,5 +368,13 @@ $(function(){
             'Should have added filter "f" at begining for section "a"'
         );
 
+        $b.queryBuilder('removeFilter', 'd', false, 'a');
+
+        assert.optionsMatch(
+            $('#builder_rule_2 [name$=_filter] option'),
+            ['-1', filter_f.id],
+            'Should have removed filter "d" for section "a"'
+        );
+
     });
 });

From e3966f3f0e2150eb17ccfd74a8713995063f5402 Mon Sep 17 00:00:00 2001
From: Reha Sterbin <reha@omniti.com>
Date: Thu, 8 Dec 2016 13:08:49 -0500
Subject: [PATCH 44/44] Forgot about section flags

---
 src/public.js            | 16 ++++++++++++----
 tests/sections.module.js |  2 +-
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/src/public.js b/src/public.js
index db43963a..d432cd49 100644
--- a/src/public.js
+++ b/src/public.js
@@ -204,17 +204,25 @@ QueryBuilder.prototype.getRules = function(options) {
         }, function(model) {
             groupData.rules.push(parse(model));
         }, function(model) {
-            var rule = {
+            var sectionData = {
                 section: model.type_id,
                 exists: model.exists
             };
             if (model.group) {
-                rule.group = parse(model.group);
+                sectionData.group = parse(model.group);
             }
             else {
-                rule.group = null;
+                sectionData.group = null;
             }
-            groupData.rules.push(rule);
+
+            if (options.get_flags) {
+                var flags = self.getRuleFlags(model.flags, options.get_flags === 'all');
+                if (!$.isEmptyObject(flags)) {
+                    sectionData.flags = flags;
+                }
+            }
+
+            groupData.rules.push(sectionData);
         });
 
         return self.change('groupToJson', groupData, group);
diff --git a/tests/sections.module.js b/tests/sections.module.js
index 0e4879a8..914da33f 100644
--- a/tests/sections.module.js
+++ b/tests/sections.module.js
@@ -164,7 +164,7 @@ $(function(){
         });
 
         assert.rulesMatch(
-            $b.queryBuilder('getRules'),
+            $b.queryBuilder('getRules', { get_flags: true }),
             section_rules,
             'Should return object with rules for sections'
         );
