check config and render reepat element and condition part

@@ -28,6 +28,8 @@ module Kanjai
             end
           end
 
+          use_cache = false
+
           if current_admin_user || @page_data.page.private_flag == true || use_cache == false
             layer = @page_data.page.page_template.get_html_content
             content_for_render = setTemplateContent(@page_data.page.domain, @page_data.page.page_template, layer, @page_data)

@@ -83,7 +83,7 @@ module Kanjai
           names_array = {}
           
           (subpart.conditions || []).each do |item|
-            names_array[item["name"]] = item["name"]
+            names_array[item["name"]] = item["id"]
           end
           subpart.field_options.each do |item|
             names_array[item[:itemName]] = item[:name]

@@ -77,7 +77,7 @@ module Kanjai
 
             subpart.conditions.select{|item| item["repeat_id"] == "" }.each do |cond|
                 self.page_content_markers.create({
-                                                     marker: cond["name"],
+                                                     marker: cond["id"],
                                                      marker_name: cond["name"],
                                                      condition: true
                                                  })
@@ -121,7 +121,7 @@ module Kanjai
 
             subpart.conditions.select{|item| item["repeat_id"] == repeat_id }.each do |cond|
                 self.page_content_markers.create({
-                                                     marker: cond["name"],
+                                                     marker: cond["id"],
                                                      row_item: row_item,
                                                      marker_name: cond["name"],
                                                      parent_id: parent_item_index,

@@ -71,16 +71,19 @@
                   <% end %>
               <% end %>
           <% end %>
-        </div>
-      </div>
 
-        <%  sub_repeat_elements = @template_part.field_options.select{|item| item[:name] == 'repeat' && item[:repeatItemId].to_s == params[:repeat_id] } %>
+          <%  sub_repeat_elements = @template_part.field_options.select{|item| item[:name] == 'repeat' && item[:repeatItemId].to_s == params[:repeat_id] } %>
+
+          <% sub_repeat_elements.each do |sub_repeat_element| %>
+            <% sub_row_items = @obj.page_content_markers.select{|item| item.row_item.to_i > 0 && item.parent_id == params[:parent_item_index] && item.repeat_id == sub_repeat_element[:id]}.collect(&:row_item).uniq %>
+
+            <%= render partial: 'kanjai/admin/pages/content_types/repeat_item', locals: {repeat_element: sub_repeat_element, row_items: sub_row_items, template_part: @template_part, form: nil, margin_index: params[:margin_index].to_i + 1, parent_item_index: @row_item} %>
+          <% end %>
+
 
-        <% sub_repeat_elements.each do |sub_repeat_element| %>
-          <% sub_row_items = @obj.page_content_markers.select{|item| item.row_item.to_i > 0 && item.parent_id == params[:parent_item_index] && item.repeat_id == sub_repeat_element[:id]}.collect(&:row_item).uniq %>
+        </div>
+      </div>
 
-          <%= render partial: 'kanjai/admin/pages/content_types/repeat_item', locals: {repeat_element: sub_repeat_element, row_items: sub_row_items, template_part: @template_part, form: nil, margin_index: params[:margin_index].to_i + 1, parent_item_index: @row_item} %>
-        <% end %>
 
 
     </div>

@@ -58,9 +58,12 @@
         </div>
 
     <% end %>
-    <% row_items = @obj.page_content_markers.select{|item| item.row_item.to_i > 0 && item.parent_id.nil?}.collect(&:row_item).uniq %>
-    <%  repeat_element = template_part.field_options.select{|item| item[:name] == 'repeat' && item[:repeatItemId].to_s.empty? }.first %>
+    <%  repeat_elements = template_part.field_options.select{|item| item[:name] == 'repeat' && item[:repeatItemId].to_s.empty? } %>
 
-    <%= render partial: 'kanjai/admin/pages/content_types/repeat_item', locals: {repeat_element: repeat_element, row_items: row_items, template_part: template_part, form: form, margin_index: 0, parent_item_index: nil} %>
+    <% repeat_elements.each do |repeat_element| %>
+      <% row_items = @obj.page_content_markers.select{|item| item.row_item.to_i > 0 && item.parent_id.nil? && item.repeat_id == repeat_element[:id] }.collect(&:row_item).uniq %>
+
+      <%= render partial: 'kanjai/admin/pages/content_types/repeat_item', locals: {repeat_element: repeat_element, row_items: row_items, template_part: template_part, form: form, margin_index: 0, parent_item_index: nil} %>
+    <% end %>
 
 <% end %>
\ No newline at end of file

@@ -77,19 +77,22 @@
 
                     </div>
                   <% end %>
+
+
+                  <%  sub_repeat_elements = template_part.field_options.select{|item| item[:name] == 'repeat' && item[:repeatItemId].to_s == repeat_element[:id] } %>
+
+                  <% sub_repeat_elements.each do |sub_repeat_element| %>
+                    <% sub_row_items = @obj.page_content_markers.select{|item| item.row_item.to_i > 0 && item.parent_id == index && item.repeat_id == sub_repeat_element[:id]}.collect(&:row_item).uniq %>
+
+                    <%= render partial: 'kanjai/admin/pages/content_types/repeat_item', locals: {repeat_element: sub_repeat_element, row_items: sub_row_items, template_part: template_part, form: form, margin_index: margin_index + 1, parent_item_index: index} %>
+                  <% end %>
+
                 </div>
               </div>
 
 
           </div>
 
-        <%  sub_repeat_elements = template_part.field_options.select{|item| item[:name] == 'repeat' && item[:repeatItemId].to_s == repeat_element[:id] } %>
-
-        <% sub_repeat_elements.each do |sub_repeat_element| %>
-          <% sub_row_items = @obj.page_content_markers.select{|item| item.row_item.to_i > 0 && item.parent_id == index && item.repeat_id == sub_repeat_element[:id]}.collect(&:row_item).uniq %>
-
-          <%= render partial: 'kanjai/admin/pages/content_types/repeat_item', locals: {repeat_element: sub_repeat_element, row_items: sub_row_items, template_part: template_part, form: form, margin_index: margin_index + 1, parent_item_index: index} %>
-        <% end %>
 
       <% end %>
     </div>

@@ -218,25 +218,37 @@ module Kanjai
           when 'text'
             subparts << self.replace_text_marker(item[:source], hash_value)
           when 'repeat'
-            @original_hash_value.each do |key, value|
-              if key > 0
-                if(key == 1)
-                  value['###FIRST_ITEM_ACTIVE###'] = 'active'
-                else
-                  value['###FIRST_ITEM_ACTIVE###'] = ''
-                end
-                value['###REPEAT_NUMBER###'] = key.to_s
-                self.content_generator(session, domain, item[:children], subparts, value)
+            repeat_id = item[:attributes]['id']
+            scope = @page_content.page_content_markers.where(repeat_id: repeat_id)
+            if hash_value && hash_value['PARENT_ITEM_ID'].present?
+              scope = scope.where(parent_id: hash_value['PARENT_ITEM_ID'])
+            end
+            row_index = scope.pluck(:row_item).uniq.sort
+
+            row_index.each do |row_index|
+              value = scope.where(row_item: row_index).collect{|item| [item.marker, item.text_value] }.to_h
+
+              if(row_index == 1)
+                value['###FIRST_ITEM_ACTIVE###'] = 'active'
+              else
+                value['###FIRST_ITEM_ACTIVE###'] = ''
               end
+              value['###REPEAT_NUMBER###'] = row_index.to_s
+              value['PARENT_ITEM_ID'] = row_index.to_s
+
+              self.content_generator(session, domain, item[:children], subparts, value)
+
             end
+
           else
             condition_process = true
-
+            p '!!!!!!!!!!!!!!!!!!!!!!'
+            p hash_value
+            p item[:attributes]['id']
             if item[:name] == 'condition' && @page_content.present? && item[:attributes] && item[:attributes]['id']
-              condition_process = @page_content.formatted_conditions.include?(item[:attributes]['id'])
+              condition_process = hash_value[item[:attributes]['id']].to_i == 1
             end
 
-            #condition_process = false
 
             if condition_process
               attributes = self.replace_attributes_marker(item[:attributes], hash_value)

 module Kanjai
-  VERSION = "0.0.261"
+  VERSION = "0.0.262"
 end