show and use condition for page render

 PATH
 PATH
   remote: .
   remote: .
   specs:
   specs:
-    kanjai (0.0.239)
+    kanjai (0.0.245)
       acts-as-taggable-on (~> 6.5)
       acts-as-taggable-on (~> 6.5)
       acts_as_list
       acts_as_list
       acts_as_tree
       acts_as_tree
@@ -1198,7 +1198,7 @@ GEM
     builder (3.2.4)
     builder (3.2.4)
     concurrent-ruby (1.1.9)
     concurrent-ruby (1.1.9)
     crass (1.0.6)
     crass (1.0.6)
-    devise (4.8.0)
+    devise (4.8.1)
       bcrypt (~> 3.0)
       bcrypt (~> 3.0)
       orm_adapter (~> 0.1)
       orm_adapter (~> 0.1)
       railties (>= 4.1.0)
       railties (>= 4.1.0)
@@ -1220,11 +1220,9 @@ GEM
     method_source (1.0.0)
     method_source (1.0.0)
     mini_magick (4.11.0)
     mini_magick (4.11.0)
     mini_mime (1.1.1)
     mini_mime (1.1.1)
-    mini_portile2 (2.6.1)
     minitest (5.14.4)
     minitest (5.14.4)
     nio4r (2.5.8)
     nio4r (2.5.8)
-    nokogiri (1.12.4)
-      mini_portile2 (~> 2.6.1)
+    nokogiri (1.12.4-x86_64-darwin)
       racc (~> 1.4)
       racc (~> 1.4)
     orm_adapter (0.5.0)
     orm_adapter (0.5.0)
     pg (1.0.0)
     pg (1.0.0)

@@ -13,9 +13,6 @@ module Kanjai
       @type_content = content_type
       @type_content = content_type
 
 
       render :partial => partial, locals: locals
       render :partial => partial, locals: locals
-
-
-
     end
     end
 
 
 
 
@@ -47,8 +44,6 @@ module Kanjai
         h[item[:index].to_i] = item[:position].to_i
         h[item[:index].to_i] = item[:position].to_i
       end
       end
 
 
-      p h
-
       @obj.page_content_markers.each do |item|
       @obj.page_content_markers.each do |item|
         if h[item.row_item]
         if h[item.row_item]
           p item.row_item
           p item.row_item

@@ -170,6 +170,9 @@ module Kanjai
         @obj = PageContent.create({:page => @page, :page_datum => @page_data, :structure_id => @structure_id})
         @obj = PageContent.create({:page => @page, :page_datum => @page_data, :structure_id => @structure_id})
       end
       end
 
 
+      params[:page_content] ||= {}
+      params[:page_content][:conditions] ||= []
+
       @obj.update(permitted_params[:page_content])
       @obj.update(permitted_params[:page_content])
 
 
       if params[:frontend_part].to_i == 1
       if params[:frontend_part].to_i == 1
@@ -300,7 +303,8 @@ module Kanjai
       params.permit(:page => [:parent_id, :domain_id, :page_template_id, :title, :private_flag, :default_private_page, :root_page, :show_public_only,
       params.permit(:page => [:parent_id, :domain_id, :page_template_id, :title, :private_flag, :default_private_page, :root_page, :show_public_only,
                     :page_data_attributes => [:id, :title, :url, :meta_title, :meta_description, :meta_keywords]],
                     :page_data_attributes => [:id, :title, :url, :meta_title, :meta_description, :meta_keywords]],
                     :page_content => [:type_content, :text_html, :controller_name, :action_name,
                     :page_content => [:type_content, :text_html, :controller_name, :action_name,
-                      page_content_markers_attributes: [:id, :page_content_id, :marker, :text_value, :attachment_file_name, :form_subject, :form_body, :from_mail, :to_mail, :form_answer_text, :_destroy]
+                      page_content_markers_attributes: [:id, :page_content_id, :marker, :text_value, :attachment_file_name, :form_subject, :form_body, :from_mail, :to_mail, :form_answer_text, :_destroy],
+                      conditions: []
                     ],
                     ],
                     :page_datum => [:id, :title, :url, :meta_title, :meta_description, :meta_keywords]
                     :page_datum => [:id, :title, :url, :meta_title, :meta_description, :meta_keywords]
                   )
                   )

@@ -90,10 +90,8 @@ module Kanjai
           html = TemplateGenerator::subpart_generate(session, domain, page_template, template_part.part_type, template_part.elements)
           html = TemplateGenerator::subpart_generate(session, domain, page_template, template_part.part_type, template_part.elements)
           layer.gsub!(content, html)
           layer.gsub!(content, html)
         end
         end
-
-
-
       end
       end
+      
       (0..1).each do |index|
       (0..1).each do |index|
         layer.scan(/(<element name="([\w\W]+?)"><\/element>)/).each do |item|
         layer.scan(/(<element name="([\w\W]+?)"><\/element>)/).each do |item|
           content = item[0]
           content = item[0]

@@ -72,11 +72,7 @@ module Kanjai
 
 
             end
             end
           end
           end
-
         end
         end
-
-
-
       end
       end
     end
     end
 
 
@@ -168,5 +164,9 @@ module Kanjai
       result
       result
     end
     end
 
 
+    def formatted_conditions
+      conditions || []
+    end
+
   end
   end
 end
 end

@@ -90,7 +90,8 @@ module Kanjai
                       code: item[:code],
                       code: item[:code],
                       source: item[:source],
                       source: item[:source],
                       elements: item[:elements],
                       elements: item[:elements],
-                      field_options: item[:field_options]
+                      field_options: item[:field_options],
+                      conditions: item[:conditions]
                   )
                   )
 
 
                   new_markers_general = item[:field_options].select{|item| item[:attributes]['repeat'] == 'false' }.collect{|item| item[:name] }
                   new_markers_general = item[:field_options].select{|item| item[:attributes]['repeat'] == 'false' }.collect{|item| item[:name] }

@@ -4,5 +4,10 @@ module Kanjai
 
 
     serialize :elements, Array
     serialize :elements, Array
     serialize :field_options, Array
     serialize :field_options, Array
+
+    def visibility_conditions
+      conditions || []
+    end
+
   end
   end
 end
 end

 <%= fields_for @obj do |form| %>
 <%= fields_for @obj do |form| %>
+
+    <% template_part.visibility_conditions.each do |item| %>
+      <div>
+        <%= check_box_tag "page_content[conditions][]", item['id'], @obj.formatted_conditions.include?(item['id']) %>
+        <%= item['name'] %>
+      </div>
+    <% end %>
+
     <%= form.fields_for :page_content_markers, sort_markers(@obj, @obj.page_content_markers.where(:row_item => 0).order('id'))  do |form2| %>
     <%= form.fields_for :page_content_markers, sort_markers(@obj, @obj.page_content_markers.where(:row_item => 0).order('id'))  do |form2| %>
         <div class="form-group">
         <div class="form-group">
             <%= form2.label :text_value, form2.object.marker_name || form2.object.marker, :class => "control-label" %>
             <%= form2.label :text_value, form2.object.marker_name || form2.object.marker, :class => "control-label" %>

+class AddConditionsToTemplatePart < ActiveRecord::Migration[5.2]
+  def change
+    add_column :kanjai_template_parts, :conditions, :jsonb
+  end
+end

+class AddConditionsToPageContent < ActiveRecord::Migration[5.2]
+  def change
+    add_column :kanjai_page_contents, :conditions, :jsonb
+  end
+end

@@ -8,6 +8,7 @@ module Kanjai
       @original_hash_value ||= {}
       @original_hash_value ||= {}
 
 
       @page_content_id = page_content_id
       @page_content_id = page_content_id
+      @page_content = page_content_id.present? ? Kanjai::PageContent.find(page_content_id) : nil
 
 
       Nokogiri::HTML::Builder.with(@doc) do |subparts|
       Nokogiri::HTML::Builder.with(@doc) do |subparts|
         TemplateGenerator.method("#{type}_generator").call(session, domain, elements, subparts, @original_hash_value[0])
         TemplateGenerator.method("#{type}_generator").call(session, domain, elements, subparts, @original_hash_value[0])
@@ -229,18 +230,28 @@ module Kanjai
               end
               end
             end
             end
           else
           else
-            attributes = self.replace_attributes_marker(item[:attributes], hash_value)
-            if item[:name] == 'select'
-              subparts.select(attributes) do |next_subparts|
-                self.content_generator(session, domain, item[:children], next_subparts, hash_value)
-              end
-            elsif item[:name] == 'p'
-              if item[:children].count > 0
-                subparts.p(attributes, self.replace_text_marker(item[:children][0][:source], hash_value).html_safe)
-              end
-            else
-              subparts.send(item[:name], attributes) do |next_subparts|
-                self.content_generator(session, domain, item[:children], next_subparts, hash_value)
+            condition_process = true
+
+            if item[:name] == 'condition' && @page_content.present? && item[:attributes] && item[:attributes]['id']
+              condition_process = @page_content.formatted_conditions.include?(item[:attributes]['id'])
+            end
+
+            #condition_process = false
+
+            if condition_process
+              attributes = self.replace_attributes_marker(item[:attributes], hash_value)
+              if item[:name] == 'select'
+                subparts.select(attributes) do |next_subparts|
+                  self.content_generator(session, domain, item[:children], next_subparts, hash_value)
+                end
+              elsif item[:name] == 'p'
+                if item[:children].count > 0
+                  subparts.p(attributes, self.replace_text_marker(item[:children][0][:source], hash_value).html_safe)
+                end
+              else
+                subparts.send(item[:name], attributes) do |next_subparts|
+                  self.content_generator(session, domain, item[:children], next_subparts, hash_value)
+                end
               end
               end
             end
             end
         end
         end

@@ -39,24 +39,35 @@ module Kanjai
           source_dom = Nokogiri::HTML::fragment(source)
           source_dom = Nokogiri::HTML::fragment(source)
 
 
           @field_options = []
           @field_options = []
+          conditions = []
           elements = html_to_hash(source_dom)
           elements = html_to_hash(source_dom)
 
 
+          p '1'
+          source_dom.traverse do |node|
+            if node.name.to_s == 'condition' && node.attributes && node.attributes['id'] && node.attributes['name']
+              conditions << {
+                id:   node.attributes['id'].value,
+                name: node.attributes['name'].value,
+              }
+            end
+          end
+          p '2'
 
 
 
 
           #field_options = elements.select {|item| (item[:name] == 'element' or item[:name] == 'repeat'  ) }
           #field_options = elements.select {|item| (item[:name] == 'element' or item[:name] == 'repeat'  ) }
           #field_options = get_elements(elements)
           #field_options = get_elements(elements)
           #elements.delete_if {|item| item[:name] == 'element' }
           #elements.delete_if {|item| item[:name] == 'element' }
 
 
-
-
           result << {
           result << {
               name: name,
               name: name,
               type: type,
               type: type,
               code: code,
               code: code,
               source: source,
               source: source,
               elements: elements,
               elements: elements,
-              field_options: @field_options
+              field_options: @field_options,
+              conditions: conditions
           }
           }
+          p '3'
         end
         end
       end
       end