implemented support for negated group operators

TheFlow0360 · May 22, 2017 · 0e6fa1a · 0e6fa1a
1 parent a33f118
commit 0e6fa1a
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 5 deletions.
diff --git a/app/cells/criteria_operator/ui_component/group_cell.rb b/app/cells/criteria_operator/ui_component/group_cell.rb
@@ -40,7 +40,7 @@ def caption
       end
 
       def empty?
-        !model.kind_of?(GroupOperator) || model.operand_collection.empty?
+        !@group.kind_of?(GroupOperator) || @group.operand_collection.empty?
       end
 
       def model_negated_group?

diff --git a/app/controllers/criteria_operator/ui_component/ajax_controller.rb b/app/controllers/criteria_operator/ui_component/ajax_controller.rb
@@ -59,11 +59,12 @@ def new_locator
       end
 
       def locate_sub_operator(operator, locator)
-        op = operator
+        op = get_negated_group_if_exist operator
         locator.split(',').map(&:to_i).each do |pos|
           # TODO: some kind of error handling beside cancelling?
           return nil unless op.is_a? GroupOperator
           op = op.operand_collection[pos]
+          op = get_negated_group_if_exist op
         end
         op
       end
@@ -82,6 +83,14 @@ def remove_sub_operator(root_op, locator)
         end
         op.operand_collection.delete_at pos.to_i
       end
+
+      def get_negated_group_if_exist(op)
+        if op.is_a?(UnaryOperator) && (op.operator_type == UnaryOperatorType::NOT)
+          op.operand
+        else
+          op
+        end
+      end
     end
   end
 end
diff --git a/test/dummy/app/controllers/dummy_controller.rb b/test/dummy/app/controllers/dummy_controller.rb
@@ -1,9 +1,8 @@
 class DummyController < ApplicationController
   def show
-    #first_op = CriteriaOperator::UnaryOperator.new(CriteriaOperator::OperandValue.new(true), CriteriaOperator::UnaryOperatorType::NOT)
-    first_op = CriteriaOperator::GroupOperator.new [], CriteriaOperator::GroupOperatorType::AND
+    first_op = CriteriaOperator::UnaryOperator.new(CriteriaOperator::GroupOperator.new([], CriteriaOperator::GroupOperatorType::AND), CriteriaOperator::UnaryOperatorType::NOT)
     second_op = CriteriaOperator::BinaryOperator.new(CriteriaOperator::OperandProperty.new("column xyz"), CriteriaOperator::OperandValue.new(42), CriteriaOperator::BinaryOperatorType::GREATER_OR_EQUAL)
-    @example_op = CriteriaOperator::GroupOperator.new [first_op, second_op], CriteriaOperator::GroupOperatorType::OR
+    @example_op = CriteriaOperator::UnaryOperator.new(CriteriaOperator::GroupOperator.new([first_op, second_op], CriteriaOperator::GroupOperatorType::OR), CriteriaOperator::UnaryOperatorType::NOT)
     # @example_op = CriteriaOperator::GroupOperator.new [], CriteriaOperator::GroupOperatorType::OR
     render
   end