From a6f5a115d2dae6cc435b56dae362a19561756eee Mon Sep 17 00:00:00 2001
From: nathanbegbie <nathanbegbie@gmail.com>
Date: Mon, 6 Nov 2017 14:20:01 +0200
Subject: [PATCH 1/8] Use hidden input + dropdown widget with js intialization
 for rule block

---
 molo/surveys/blocks.py | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/molo/surveys/blocks.py b/molo/surveys/blocks.py
index 59b2f9e..7e61046 100644
--- a/molo/surveys/blocks.py
+++ b/molo/surveys/blocks.py
@@ -147,6 +147,12 @@ def clean(self, value):
 
 
 class RuleSelectBlock(blocks.CharBlock):
+    def __init__(self, *args, **kwargs):
+        super(RuleSelectBlock, self).__init__(*args, **kwargs)
+        self.field.widget = SelectAndHiddenWidget()
+
+    def js_initializer(self):
+        return 'newRuleAdded'
 
     class Meta:
         icon = 'cog'

From aed63d7506564a2c307e5100fd867a26af32c121 Mon Sep 17 00:00:00 2001
From: nathanbegbie <nathanbegbie@gmail.com>
Date: Mon, 6 Nov 2017 14:21:43 +0200
Subject: [PATCH 2/8] Check to see whether CombinationRule streamfield has
 correct structure

---
 molo/surveys/rules.py | 32 ++++++++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)

diff --git a/molo/surveys/rules.py b/molo/surveys/rules.py
index 646129a..d3d272d 100644
--- a/molo/surveys/rules.py
+++ b/molo/surveys/rules.py
@@ -8,6 +8,7 @@
 from django.utils.functional import cached_property
 from django.utils.translation import ugettext_lazy as _
 
+from wagtail.wagtailcore.blocks.stream_block import StreamBlockValidationError
 from wagtail.wagtailadmin.edit_handlers import (
     FieldPanel,
     FieldRowPanel,
@@ -391,5 +392,36 @@ def description(self):
                 'particular combination of rules'),
         }
 
+    def clean(self):
+        super(CombinationRule, self).clean()
+        if isinstance(self.body.stream_data[0], dict):
+            newData = [block['type'] for block in self.body.stream_data]
+        elif isinstance(self.body.stream_data[0], tuple):
+            newData = [block[0] for block in self.body.stream_data]
+
+        if len(newData) % 3 != 0:
+            raise StreamBlockValidationError(non_block_errors=[_(
+                'Rule Combination must follow the <Rule/NestedLogic>'
+                '<Operator> <Rule/NestedLogic> pattern.')])
+
+        iterations = len(newData) / 3
+        print iterations
+        for i in range(iterations):
+            first_rule_index = (i * 3)
+            operator_index = (i * 3) + 1
+            second_rule_index = (i * 3) + 2
+
+            if((newData[first_rule_index] == 'Rule' or
+                newData[first_rule_index] == 'NestedLogic') and
+               (newData[operator_index] == 'Operator') and
+               (newData[second_rule_index] == 'Rule' or
+                    newData[second_rule_index] == 'NestedLogic')):
+                pass
+            else:
+                raise StreamBlockValidationError(non_block_errors=[_(
+                    'Rule Combination must follow the <Rule/NestedLogic> '
+                    '<Operator> <Rule/NestedLogic> pattern.')])
+
+
     class Meta:
         verbose_name = _('Rule Combination')

From 09f8db5bd45507673de046776a8d4a33a3b02bf1 Mon Sep 17 00:00:00 2001
From: nathanbegbie <nathanbegbie@gmail.com>
Date: Mon, 6 Nov 2017 14:22:30 +0200
Subject: [PATCH 3/8] Add JS to infer rule reference in RuleCombination by rule
 type and order

---
 molo/surveys/static/js/survey-admin.js | 202 ++++++++++++++++++++++++-
 1 file changed, 201 insertions(+), 1 deletion(-)

diff --git a/molo/surveys/static/js/survey-admin.js b/molo/surveys/static/js/survey-admin.js
index 5bb3f06..cb52c7b 100644
--- a/molo/surveys/static/js/survey-admin.js
+++ b/molo/surveys/static/js/survey-admin.js
@@ -1,5 +1,4 @@
 $(function(){
-  console.log('loaded')
   var multi_step_checkbox = $('#id_multi_step');
   var multi_step_label = $('label[for=id_multi_step]');
 
@@ -52,4 +51,205 @@ $(function(){
           enableDisplayDirect();
         }
     });
+
+  window.rules = [
+    'Time Rule',
+    'Day Rule',
+    'Referral Rule',
+    'Visit Count Rule',
+    'Article Tag Rule',
+    'Query Rule',
+    'Device Rule',
+    'User Is Logged In Rule',
+    'Comment Data Rule',
+    'Profile Data Rule',
+    'Survey Submission Data Rule',
+    'Group Membership Rule',
+  ]
+
+  window.ruleIndex = {};
+  window.ruleFields = [];
+
+  window.initRuleIndex = function(){
+    rules.map(function(ruleTitle) {
+      var ruleInfo = {
+        ruleName: ruleTitle,
+        form: $('[id*="' + ruleTitle.replace(/ /g, "").toLowerCase() + '"]').filter('ul'),
+        blockIds: [],
+        updateBlock: function(){
+          this.blockIds = $.map(this.form.children('li').not('.deleted'), function(arg, index){
+            return arg.id
+          });
+        },
+        deleteBlock: function(id){
+          var index = this.blockIds.indexOf(id);
+          this.updateBlock();
+          var deletedOptionValue = this.ruleName.replace(/ /g, "") + "_" + String(index);
+          deleteRuleFromField(deletedOptionValue);
+        },
+      }
+      ruleInfo.updateBlock();
+      window.ruleIndex[ruleInfo.form.attr("id")] = ruleInfo;
+    })
+  }
+
+
+
+  window.extractRuleInfo = function(){
+    var ruleValueTextPairs = []
+    $.each(ruleIndex, function(index_outer, form){
+      $.each(form.blockIds, function(index_inner, value) {
+        ruleValueTextPairs.push({
+          "value": form.ruleName.replace(" ", "") + "_" + String(index_inner),
+          "text": form.ruleName + " " + String(index_inner + 1),
+        });
+      });
+    });
+    return ruleValueTextPairs;
+  }
+
+  window.addUpdateTrigger = function(obj, form_id, block_id){
+    obj.click(function(){
+      window.deleteFromRuleIndex(form_id, block_id);
+    });
+  }
+
+  window.addActionToExistingDeleteButtons = function(){
+    // TODO exclude ruleCombination
+    var forms = $('[id*="rule_related-FORMS"]')
+      .not("#id_surveys_combinationrule_related-FORMS")
+      .filter("ul");
+
+    forms.map(function(index, form) {
+      $("#" + form.id)
+        .children("li")
+        .not(".deleted")
+        .map(function(index, block) { // TODO: check you can use .each instead
+          var deleteButton = $("#" + block.id).find('button[title^="Delete"]');
+          window.addUpdateTrigger(deleteButton, form.id, block.id);
+        });
+    });
+  };
+
+  window.deleteFromRuleIndex = function(form_id, block_id){
+    var block = ruleIndex[form_id]
+    block.deleteBlock(block_id);
+  };
+
+  window.attachActionToRuleCreators = function() {
+    var some_rules = $('[id*="rule_related-ADD"]').filter("a").not("#id_surveys_combinationrule_related-ADD");
+    $.map(some_rules, function(val, i) {
+      val.addEventListener("click", function() {
+          var id = $(this).attr('id');
+          var form_id = id.replace('ADD', 'FORMS');
+          var form = $("#" + form_id);
+          var newBlock = form.children(':last');
+          // upate Index of Rules
+          ruleIndex[form_id].updateBlock();
+          updateRuleOptions();
+          // add event listener to new Delete Button
+          var newDeleteButton = newBlock.find('button[title^="Delete"]');
+          window.addUpdateTrigger(newDeleteButton, form.attr("id"), newBlock.attr("id"));
+        }, false);
+    });
+  };
+
+  var createSelectManager = function(id){
+    var selectRuleField = {
+      hiddenInput: $('#' + id + '_0'),
+      select: $('#' + id + '_1'),
+      repopulateOptions: function(){
+        var ruleInfo = extractRuleInfo()
+        var select = this.select;
+        select.children().remove();
+        select.append($("<option value=''>-------</option>"));
+        $.each(ruleInfo, function(index, option) {
+            select.append($('<option>', {
+            "value": option["value"],
+            "text": option["text"],
+          }));
+        });
+      },
+      populateSelect: function(){
+        var existingValue = this.hiddenInput.val();
+        this.repopulateOptions();
+        if(existingValue){
+          this.select.val(existingValue);
+        }
+        this.updateHiddenField();
+      },
+      updateHiddenField:function(){
+        this.hiddenInput.val(this.select.val())
+      },
+      deleteSelect: function(optionValue){
+        var existingValue = this.hiddenInput.val();
+
+        var existingRuleType = existingValue.split("_")[0]
+        var existingRuleOrder = existingValue.split("_")[1]
+
+        var deletedRuleType = optionValue.split("_")[0]
+        var deletedRuleOrder = optionValue.split("_")[1]
+
+        //check if the value is the one being deleted
+        if(existingRuleType===deletedRuleType){
+          if(existingRuleOrder===deletedRuleOrder){
+            this.repopulateOptions();
+            this.select.val("");
+            this.updateHiddenField();
+          }
+          else if(deletedRuleOrder<existingRuleOrder){
+            var newSelectedValue = existingRuleType + "_" + String(existingRuleOrder - 1);
+            this.repopulateOptions();
+            this.select.val(newSelectedValue);
+            this.updateHiddenField();
+          }
+          else{
+            this.populateSelect()
+          }
+        }
+        else{
+          this.populateSelect()
+        }
+      }
+    }
+    selectRuleField.populateSelect();
+    return selectRuleField
+  }
+
+  window.newRuleAdded = function(id){
+    ruleFields.push(createSelectManager(id));
+  };
+
+  window.deleteRuleFromField = function(deletedOption){
+    $.each(ruleFields, function(index, selectManager){
+      selectManager.deleteSelect(deletedOption);
+    });
+  }
+
+  window.updateRuleOptions = function(){
+    $.each(ruleFields, function(index, selectManager){
+      selectManager.populateSelect();
+    });
+  }
+
+  // Prevent User from creating more than one rule combination
+  window.addHideToRuleCombinationFunctionality = function(){
+    $('#id_surveys_combinationrule_related-ADD').click(function(){
+      var id = $(this).attr("id");
+      var form_id = id.replace("ADD", "FORMS");
+      var form = $("#" + form_id);
+      var deleteButton = form
+        .children(":last")
+        .find('button[title^="Delete"]');
+      deleteButton.click(function(){
+        $("#id_surveys_combinationrule_related-ADD").toggle();
+      });
+      $("#id_surveys_combinationrule_related-ADD").toggle();
+    });
+  }
+  addHideToRuleCombinationFunctionality();
+
+  initRuleIndex();
+  attachActionToRuleCreators();
+  addActionToExistingDeleteButtons();
 })

From 7bf618e62d58b536a859b13709ae378028a27da0 Mon Sep 17 00:00:00 2001
From: nathanbegbie <nathanbegbie@gmail.com>
Date: Mon, 6 Nov 2017 14:27:36 +0200
Subject: [PATCH 4/8] Remove extra line

---
 molo/surveys/rules.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/molo/surveys/rules.py b/molo/surveys/rules.py
index d3d272d..100d38f 100644
--- a/molo/surveys/rules.py
+++ b/molo/surveys/rules.py
@@ -422,6 +422,5 @@ def clean(self):
                     'Rule Combination must follow the <Rule/NestedLogic> '
                     '<Operator> <Rule/NestedLogic> pattern.')])
 
-
     class Meta:
         verbose_name = _('Rule Combination')

From e61538c944f5245624e4e950cb502291aaf3b5db Mon Sep 17 00:00:00 2001
From: nathanbegbie <nathanbegbie@gmail.com>
Date: Tue, 7 Nov 2017 08:21:33 +0200
Subject: [PATCH 5/8] Fix clean method for CombinationRule

---
 molo/surveys/rules.py | 24 +++++++++++-------------
 1 file changed, 11 insertions(+), 13 deletions(-)

diff --git a/molo/surveys/rules.py b/molo/surveys/rules.py
index 100d38f..108eeb7 100644
--- a/molo/surveys/rules.py
+++ b/molo/surveys/rules.py
@@ -399,25 +399,23 @@ def clean(self):
         elif isinstance(self.body.stream_data[0], tuple):
             newData = [block[0] for block in self.body.stream_data]
 
-        if len(newData) % 3 != 0:
+        if (len(newData) - 1) % 2 != 0:
             raise StreamBlockValidationError(non_block_errors=[_(
                 'Rule Combination must follow the <Rule/NestedLogic>'
                 '<Operator> <Rule/NestedLogic> pattern.')])
 
-        iterations = len(newData) / 3
-        print iterations
+        iterations = (len(newData) - 1) / 2
         for i in range(iterations):
-            first_rule_index = (i * 3)
-            operator_index = (i * 3) + 1
-            second_rule_index = (i * 3) + 2
-
-            if((newData[first_rule_index] == 'Rule' or
-                newData[first_rule_index] == 'NestedLogic') and
-               (newData[operator_index] == 'Operator') and
-               (newData[second_rule_index] == 'Rule' or
+            first_rule_index = i * 2
+            operator_index = (i * 2) + 1
+            second_rule_index = (i * 2) + 2
+
+            if not (
+                (newData[first_rule_index] == 'Rule' or
+                 newData[first_rule_index] == 'NestedLogic') and
+                (newData[operator_index] == 'Operator') and
+                (newData[second_rule_index] == 'Rule' or
                     newData[second_rule_index] == 'NestedLogic')):
-                pass
-            else:
                 raise StreamBlockValidationError(non_block_errors=[_(
                     'Rule Combination must follow the <Rule/NestedLogic> '
                     '<Operator> <Rule/NestedLogic> pattern.')])

From dfd54db531521410b0173580bd55a124f33d6d36 Mon Sep 17 00:00:00 2001
From: nathanbegbie <nathanbegbie@gmail.com>
Date: Tue, 7 Nov 2017 08:24:38 +0200
Subject: [PATCH 6/8] Use each instead of map function

---
 molo/surveys/static/js/survey-admin.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/molo/surveys/static/js/survey-admin.js b/molo/surveys/static/js/survey-admin.js
index cb52c7b..7a1fa3b 100644
--- a/molo/surveys/static/js/survey-admin.js
+++ b/molo/surveys/static/js/survey-admin.js
@@ -115,7 +115,6 @@ $(function(){
   }
 
   window.addActionToExistingDeleteButtons = function(){
-    // TODO exclude ruleCombination
     var forms = $('[id*="rule_related-FORMS"]')
       .not("#id_surveys_combinationrule_related-FORMS")
       .filter("ul");
@@ -124,7 +123,7 @@ $(function(){
       $("#" + form.id)
         .children("li")
         .not(".deleted")
-        .map(function(index, block) { // TODO: check you can use .each instead
+        .each(function(index, block) {
           var deleteButton = $("#" + block.id).find('button[title^="Delete"]');
           window.addUpdateTrigger(deleteButton, form.id, block.id);
         });

From efd1c3b2e4491735f392f8f84afcbae535ef7e92 Mon Sep 17 00:00:00 2001
From: nathanbegbie <nathanbegbie@gmail.com>
Date: Tue, 7 Nov 2017 09:07:18 +0200
Subject: [PATCH 7/8] Fix migration naming issue

---
 ...nt_positive_integer.py => 0017_make_count_positive_integer.py} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename molo/surveys/migrations/{0014_make_count_positive_integer.py => 0017_make_count_positive_integer.py} (100%)

diff --git a/molo/surveys/migrations/0014_make_count_positive_integer.py b/molo/surveys/migrations/0017_make_count_positive_integer.py
similarity index 100%
rename from molo/surveys/migrations/0014_make_count_positive_integer.py
rename to molo/surveys/migrations/0017_make_count_positive_integer.py

From 02b9082625513ef70a6fceb53ebf5820d7dc551e Mon Sep 17 00:00:00 2001
From: nathanbegbie <nathanbegbie@gmail.com>
Date: Tue, 7 Nov 2017 09:07:47 +0200
Subject: [PATCH 8/8] Add migration for Combination Rule

---
 .../migrations/0018_add_combination_rule.py   | 37 +++++++++++++++++++
 1 file changed, 37 insertions(+)
 create mode 100644 molo/surveys/migrations/0018_add_combination_rule.py

diff --git a/molo/surveys/migrations/0018_add_combination_rule.py b/molo/surveys/migrations/0018_add_combination_rule.py
new file mode 100644
index 0000000..3c32a50
--- /dev/null
+++ b/molo/surveys/migrations/0018_add_combination_rule.py
@@ -0,0 +1,37 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.9.13 on 2017-11-07 07:01
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+import django.db.models.deletion
+import modelcluster.fields
+import molo.surveys.blocks
+import wagtail.wagtailcore.blocks
+import wagtail.wagtailcore.fields
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('wagtail_personalisation', '0013_auto_20171026_1748'),
+        ('surveys', '0017_make_count_positive_integer'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='CombinationRule',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('body', wagtail.wagtailcore.fields.StreamField([(b'Rule', molo.surveys.blocks.RuleSelectBlock()), (b'Operator', wagtail.wagtailcore.blocks.ChoiceBlock(choices=[(b'and', 'And'), (b'or', 'Or')])), (b'NestedLogic', wagtail.wagtailcore.blocks.StructBlock([(b'rule_1', molo.surveys.blocks.RuleSelectBlock(required=True)), (b'operator', wagtail.wagtailcore.blocks.ChoiceBlock(choices=[(b'and', 'And'), (b'or', 'Or')])), (b'rule_2', molo.surveys.blocks.RuleSelectBlock(required=True))]))])),
+                ('segment', modelcluster.fields.ParentalKey(on_delete=django.db.models.deletion.CASCADE, related_name='surveys_combinationrule_related', related_query_name='%(app_label)s_%(class)ss', to='wagtail_personalisation.Segment')),
+            ],
+            options={
+                'verbose_name': 'Rule Combination',
+            },
+        ),
+        migrations.AlterField(
+            model_name='articletagrule',
+            name='date_to',
+            field=models.DateTimeField(blank=True, help_text='All times are UTC. Leave both fields blank to search all time.', null=True),
+        ),
+    ]