templus_models 3.0.6 → 3.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 113c5743e7d0a89db83a873c296d5bc7794afbc1
-  data.tar.gz: a4dd2f51ef7f9ea9fbad36c01c412f88652b7772
+  metadata.gz: 8a7986658883e7bee0507408a87a9941a7c0efee
+  data.tar.gz: 77d54cfcbf307318b3e2a3b7cfb846abf9350730
 SHA512:
-  metadata.gz: 289b16d543ffe6b79d7580749ebae633c3c397bd67bcdffa69a61c747001e34794db6f6c031e6a7be3e66c5f667428ab50dfdfb4abe0fa1a12b8d62c86d8e62f
-  data.tar.gz: fa73fdebf8f701a4a232b13c6ab5892508e7e7d9477342550ad159d44f749b08a6f88ba417bed7958606672e7e881515b7763a3fcaffecfd912f82b5a970a19d
+  metadata.gz: 61b363865c81485b63d11eb0ef0353b302614076a2f28fe7fd84c4bde300f91e60472ce4d40ef8386c8f18578ce4d08c7f9a400085f96cfd94aaf4c8d1d7ae18
+  data.tar.gz: 9cbfb68fe1561d2040b115158e86065ddbd9244a97b564a3f59d24a02a349f0107acd1b437c68db1b3cf429959c861802ef84a5c888fda73f4349c1be5b6f544

data/app/controllers/crud_controller.rb

@@ -1,28 +1,7 @@
 class CrudController < ApplicationController
   before_action :setup, except: :autocomplete
 
-  private
-  def setup
-    if params[:associacao]
-      @crud_associacao = Module.const_get("#{params[:model].to_s.singularize}_crud".camelize)
-      @model = Module.const_get(params[:model].camelize).find(params[:id]).send(params[:associacao])
-      c_helper = Module.const_get(params[:model].camelize).reflect_on_association(params[:associacao]).class_name
-      @crud_helper = Module.const_get("#{c_helper}Crud") unless params[:render] == "modal" and params[:action] == "new"
-      @url = crud_associacao_models_path(model: params[:model], id: params[:id], associacao: params[:associacao], page: params[:page], q: params[:q])
-      @clean_url = crud_associacao_models_path(model: params[:model], id: params[:id], associacao: params[:associacao])
-      @model_permission = c_helper.constantize
-      @id = params[:associacao_id] if params[:associacao_id]
-    else
-      @model = Module.const_get(params[:model].camelize)
-      @model_permission = @model
-      @crud_helper = Module.const_get("#{params[:model]}_crud".camelize) unless params[:render] == "modal" and params[:action] == "new"
-      @url = crud_models_path(model: params[:model], page: params[:page], q: params[:q])
-      @clean_url = crud_models_path(model: params[:model])
-      @id = params[:id] if params[:id]
-    end
-  end
 
-  public
   def index
     authorize! :read, @model_permission if respond_to?(:current_usuario)
     if params[:scope].present?
@@ -180,18 +159,7 @@ class CrudController < ApplicationController
     end
     report_name = "#{@crud_helper.title}_#{DateTime.now.strftime('%Y%m%d')}"
     respond_to do |format|
-      format.xls {headers["Content-Disposition"] = "attachment; filename=#{report_name}.xls"}
-      format.pdf do
-        pdf = WickedPdf.new.pdf_from_string(
-          render_to_string('crud/listing.pdf.erb'),
-          encoding: 'UTF-8',
-          page_size: 'A4',
-          show_as_html: params[:debug],
-          margin: { top: 20, bottom: 20 }
-        )
-        send_data(pdf, filename: "#{report_name}.pdf", type: "application/pdf", disposition: "inline")
-      end
-      format.html
+      format.xls { headers["Content-Disposition"] = "attachment; filename=#{report_name}.xls" }
     end
   end
 
@@ -214,7 +182,29 @@ class CrudController < ApplicationController
     end
   end
 
+
   private
+
+  def setup
+    if params[:associacao]
+      @crud_associacao = Module.const_get("#{params[:model].to_s.singularize}_crud".camelize)
+      @model = Module.const_get(params[:model].camelize).find(params[:id]).send(params[:associacao])
+      c_helper = Module.const_get(params[:model].camelize).reflect_on_association(params[:associacao]).class_name
+      @crud_helper = Module.const_get("#{c_helper}Crud") unless params[:render] == "modal" and params[:action] == "new"
+      @url = crud_associacao_models_path(model: params[:model], id: params[:id], associacao: params[:associacao], page: params[:page], q: params[:q])
+      @clean_url = crud_associacao_models_path(model: params[:model], id: params[:id], associacao: params[:associacao])
+      @model_permission = c_helper.constantize
+      @id = params[:associacao_id] if params[:associacao_id]
+    else
+      @model = Module.const_get(params[:model].camelize)
+      @model_permission = @model
+      @crud_helper = Module.const_get("#{params[:model]}_crud".camelize) unless params[:render] == "modal" and params[:action] == "new"
+      @url = crud_models_path(model: params[:model], page: params[:page], q: params[:q])
+      @clean_url = crud_models_path(model: params[:model])
+      @id = params[:id] if params[:id]
+    end
+  end
+
   def params_permitt
     params.require(@model.name.underscore.to_sym).permit(fields_model)
   end

data/app/helpers/crud_helper.rb

@@ -198,43 +198,37 @@ module CrudHelper
   end
 
   #Permissions
-  def should_view?(crud_helper,record)
+  def should_view?(crud_helper, record)
     return false unless can?(:read, record)
     return true if crud_helper.condition_view_action.nil?
     crud_helper.condition_view_action.call(record)
   end
 
-  def should_edit?(crud_helper,record)
+  def should_edit?(crud_helper, record)
     return false unless can?(:update, record)
     return true if crud_helper.condition_edit_action.nil?
     crud_helper.condition_edit_action.call(record)
   end
 
-  def should_destroy?(crud_helper,record)
+  def should_destroy?(crud_helper, record)
     return false unless can?(:destroy, record)
     return true if crud_helper.condition_destroy_action.nil?
     crud_helper.condition_destroy_action.call(record)
   end
 
-  def should_listing?(crud_helper,model)
+  def should_listing?(crud_helper, model)
     return false unless can?(:read, model)
     return true if crud_helper.condition_listing_action.nil?
     crud_helper.condition_listing_action.call(model)
   end
 
-  def should_listing_excel?(crud_helper,model)
+  def should_listing_excel?(crud_helper, model)
     return false unless can?(:read, model)
     return true if crud_helper.condition_listing_excel.nil?
     crud_helper.condition_listing_excel.call(model)
   end
 
-  def should_listing_pdf?(crud_helper,model)
-    return false unless can?(:read, model)
-    return true if crud_helper.condition_listing_pdf.nil?
-    crud_helper.condition_listing_pdf.call(model)
-  end
-
-  def should_printing?(crud_helper,record)
+  def can_print_pdf?(crud_helper, record)
     return false unless can?(:read, record)
     return true if crud_helper.condition_printing_action.nil?
     crud_helper.condition_printing_action.call(record)

data/app/raro_crud/raro_crud.rb

@@ -129,11 +129,11 @@ class RaroCrud
   end
 
   def self.top_links
-    (@@top_links[self.to_s.to_sym]) ? @@top_links[self.to_s.to_sym] : []
+    @@top_links[self.to_s.to_sym] || []
   end
 
   def self.index_fields
-    (@@index_fields[self.to_s.to_sym]) ? @@index_fields[self.to_s.to_sym] : []
+    @@index_fields[self.to_s.to_sym] || []
   end
 
   def self.order_field
@@ -145,51 +145,51 @@ class RaroCrud
   end
 
   def self.actions
-    (@@actions[self.to_s.to_sym]) ? @@actions[self.to_s.to_sym] : []
+    @@actions[self.to_s.to_sym] || []
   end
 
   def self.actions_links
-    (@@links[self.to_s.to_sym]) ? @@links[self.to_s.to_sym] : []
+    @@links[self.to_s.to_sym] || []
   end
 
   def self.options_link
-    (@@options_link[self.to_s.to_sym]) ? @@options_link[self.to_s.to_sym] : []
+    @@options_link[self.to_s.to_sym] || []
   end
 
   def self.form_fields
-    (@@form_fields[self.to_s.to_sym]) ? @@form_fields[self.to_s.to_sym]  : []
+    @@form_fields[self.to_s.to_sym] || []
   end
 
   def self.form_groups
-    (@@form_group[self.to_s.to_sym]) ? @@form_group[self.to_s.to_sym]  : []
+    @@form_group[self.to_s.to_sym] || []
   end
 
   def self.form_scripts
-    (@@form_scripts[self.to_s.to_sym]) ? @@form_scripts[self.to_s.to_sym]  : []
+    @@form_scripts[self.to_s.to_sym] || []
   end
 
   def self.view_fields
-    (@@view_fields[self.to_s.to_sym]) ? @@view_fields[self.to_s.to_sym]  : []
+    @@view_fields[self.to_s.to_sym] || []
   end
 
   def self.listing_fields
-    (@@listing_fields[self.to_s.to_sym]) ? @@listing_fields[self.to_s.to_sym]  : []
+    @@listing_fields[self.to_s.to_sym] || []
   end
 
   def self.printing_fields
-    (@@printing_fields[self.to_s.to_sym]) ? @@printing_fields[self.to_s.to_sym]  : []
+    @@printing_fields[self.to_s.to_sym] || []
   end
 
   def self.search_fields
-    (@@search_fields[self.to_s.to_sym]) ? @@search_fields[self.to_s.to_sym]  : []
+    @@search_fields[self.to_s.to_sym] || []
   end
 
   def self.test_fields
-    (@@test_fields[self.to_s.to_sym]) ? @@test_fields[self.to_s.to_sym]  : []
+    @@test_fields[self.to_s.to_sym] || []
   end
 
   def self.scopes
-    (@@scopes[self.to_s.to_sym]) ? @@scopes[self.to_s.to_sym]  : []
+    @@scopes[self.to_s.to_sym] || []
   end
 
   def self.add_menus(menu)
@@ -200,132 +200,8 @@ class RaroCrud
     @@menus
   end
 
-
-  private
-
-  def self.modelo
-    self.to_s.underscore.gsub("_crud", "")
-  end
-
-  def self.titulo str
-    @@title[self.to_s.to_sym] = str
-  end
-
-  def self.subtitulo(str,type)
-    case type
-    when :index
-      @@subtitle_index[self.to_s.to_sym] = str
-    end
-  end
-
-  def self.descricao(str,type)
-    case type
-    when :index
-      @@description_index[self.to_s.to_sym] = str
-    end
-  end
-
-  def self.link_superior opts={}
-      @@top_links[self.to_s.to_sym] = [] unless @@top_links[self.to_s.to_sym]
-      @@top_links[self.to_s.to_sym].push(
-          {
-            text: opts[:nome],
-            modelo: self.modelo,
-            id:   opts[:id],
-            data: {push: 'partial', target: '#form'},
-            icon: "fa fa-#{opts[:icon]}",
-            class: 'btn btn-small btn-primary btn-rounded',
-            link: opts[:link],
-            url: opts[:url],
-            can: opts[:can],
-            partial: opts[:partial]
-          }
-    )
-  end
-
-  def self.campo_tabela nome, opts={}
-    @@index_fields[self.to_s.to_sym] = [] unless @@index_fields[self.to_s.to_sym]
-    opts = set_default_label nome, opts
-    @@index_fields[self.to_s.to_sym].push(
-      {
-        attribute: nome
-      }.merge(opts)
-    )
-  end
-
-  def self.ordenar_por nome
-    @@order_field[self.to_s.to_sym] = nome
-  end
-
-  def self.itens_por_pagina qtd
-    @@per_page[self.to_s.to_sym] = qtd
-  end
-
-  def self.campo_teste nome, opts = {}
-    @@test_fields[self.to_s.to_sym] = [] unless @@test_fields[self.to_s.to_sym]
-    @@test_fields[self.to_s.to_sym].push(
-      {
-        attribute: nome
-      }.merge({sf: opts})
-    )
-  end
-
-  def self.campo_formulario nome, opts={}
-    @@form_fields[self.to_s.to_sym] = [] unless @@form_fields[self.to_s.to_sym]
-    opts = set_default_label nome, opts
-    if opts.present? && opts[:autocomplete].present?
-      opts[:as] = :autocomplete
-      label_method = opts[:autocomplete][:label_method] || opts[:autocomplete][:campo]
-      opts[:url] = Rails.application.routes.url_helpers.autocomplete_crud_path(model: opts[:autocomplete][:classe], campo: opts[:autocomplete][:campo], tipo: "start", label: label_method)
-      name = "#{opts[:autocomplete][:campo]}_#{opts[:autocomplete][:classe]}"
-      opts[:input_html] = {name: name, id: name}
-      opts[:id_element] = "##{self.modelo}_#{nome}_id"
-    end
-    if opts.present? && opts[:grupo].present?
-      opts[:fields] = []
-      opts[:grupo].each do |field|
-        attribute = field[:campo]
-        field.delete(:campo)
-        add_group_formulario(field) if field[:grupo].present?
-        opts[:fields].push({attribute: attribute,sf: field})
-      end
-      opts[:grupo] = true if opts[:grupo].present?
-    end
-    if @agrupamento.present?
-      opts[:agrupamento] = @agrupamento
-    end
-    @@form_fields[self.to_s.to_sym].push(
-      {
-        attribute: nome
-      }.merge({sf: opts})
-    )
-    if opts.present? && opts[:autocomplete].present?
-      campo_formulario(nome, {as: :hidden})
-    end
-  end
-
-  private
-  def self.add_group_formulario(field)
-    field[:fields] = []
-    field[:grupo].each do |f|
-      attribute = f[:campo]
-      f.delete(:campo)
-      add_group_formulario(f) if f[:grupo].present?
-      field[:fields].push({attribute: attribute, sf: f})
-    end
-    field[:grupo] = true
-  end
-
-  def self.set_default_label nome, opts
-    unless opts[:label].present?
-      opts[:label] = "simple_form.labels.#{self.modelo.underscore}.#{nome}"
-    end
-    opts
-  end
-
-  public
-  def self.campo_visualizacao nome, opts = {}
-    @@view_fields[self.to_s.to_sym] = [] unless @@view_fields[self.to_s.to_sym]
+  def self.campo_visualizacao(nome, opts = {})
+    @@view_fields[self.to_s.to_sym] ||= []
     opts = set_default_label nome, opts
     @@view_fields[self.to_s.to_sym].push(
       {
@@ -334,8 +210,8 @@ class RaroCrud
     )
   end
 
-  def self.campo_busca nome, opts = {}
-    @@search_fields[self.to_s.to_sym] = [] unless @@search_fields[self.to_s.to_sym]
+  def self.campo_busca(nome, opts = {})
+    @@search_fields[self.to_s.to_sym] ||= []
     opts = set_default_label nome, opts
     @@search_fields[self.to_s.to_sym].push(
       {
@@ -344,24 +220,22 @@ class RaroCrud
     )
   end
 
-  def self.campo_listagem nome, opts = {}
-    @@listing_fields[self.to_s.to_sym] = [] unless @@listing_fields[self.to_s.to_sym]
+  def self.relatorio_listagem(nome, opts = {})
+    @@listing_fields[self.to_s.to_sym] ||= []
     opts = set_default_label nome, opts
-    @@listing_fields[self.to_s.to_sym].push(
-      {
-        attribute: nome
-      }.merge({sf: opts})
-    )
+    @@listing_fields[self.to_s.to_sym].push({
+      attribute: nome,
+      sf: opts
+    })
   end
 
-  def self.campo_impressao nome, opts = {}
-    @@printing_fields[self.to_s.to_sym] = [] unless @@printing_fields[self.to_s.to_sym]
+  def self.relatorio_impressao(nome, opts = {})
+    @@printing_fields[self.to_s.to_sym] ||= []
     opts = set_default_label nome, opts
-    @@printing_fields[self.to_s.to_sym].push(
-      {
-        attribute: nome
-      }.merge({sf: opts})
-    )
+    @@printing_fields[self.to_s.to_sym].push({
+      attribute: nome,
+      sf: opts
+    })
   end
 
   def self.sem_visualizacao
@@ -492,4 +366,125 @@ class RaroCrud
     @@form_scripts[self.to_s.to_sym] << script.to_s
   end
 
+
+  private
+
+  def self.modelo
+    self.to_s.underscore.gsub("_crud", "")
+  end
+
+  def self.titulo str
+    @@title[self.to_s.to_sym] = str
+  end
+
+  def self.subtitulo(str,type)
+    case type
+    when :index
+      @@subtitle_index[self.to_s.to_sym] = str
+    end
+  end
+
+  def self.descricao(str,type)
+    case type
+    when :index
+      @@description_index[self.to_s.to_sym] = str
+    end
+  end
+
+  def self.link_superior opts={}
+      @@top_links[self.to_s.to_sym] = [] unless @@top_links[self.to_s.to_sym]
+      @@top_links[self.to_s.to_sym].push(
+          {
+            text: opts[:nome],
+            modelo: self.modelo,
+            id:   opts[:id],
+            data: {push: 'partial', target: '#form'},
+            icon: "fa fa-#{opts[:icon]}",
+            class: 'btn btn-small btn-primary btn-rounded',
+            link: opts[:link],
+            url: opts[:url],
+            can: opts[:can],
+            partial: opts[:partial]
+          }
+    )
+  end
+
+  def self.campo_tabela nome, opts={}
+    @@index_fields[self.to_s.to_sym] = [] unless @@index_fields[self.to_s.to_sym]
+    opts = set_default_label nome, opts
+    @@index_fields[self.to_s.to_sym].push(
+      {
+        attribute: nome
+      }.merge(opts)
+    )
+  end
+
+  def self.ordenar_por nome
+    @@order_field[self.to_s.to_sym] = nome
+  end
+
+  def self.itens_por_pagina qtd
+    @@per_page[self.to_s.to_sym] = qtd
+  end
+
+  def self.campo_teste nome, opts = {}
+    @@test_fields[self.to_s.to_sym] = [] unless @@test_fields[self.to_s.to_sym]
+    @@test_fields[self.to_s.to_sym].push(
+      {
+        attribute: nome
+      }.merge({sf: opts})
+    )
+  end
+
+  def self.campo_formulario nome, opts={}
+    @@form_fields[self.to_s.to_sym] = [] unless @@form_fields[self.to_s.to_sym]
+    opts = set_default_label nome, opts
+    if opts.present? && opts[:autocomplete].present?
+      opts[:as] = :autocomplete
+      label_method = opts[:autocomplete][:label_method] || opts[:autocomplete][:campo]
+      opts[:url] = Rails.application.routes.url_helpers.autocomplete_crud_path(model: opts[:autocomplete][:classe], campo: opts[:autocomplete][:campo], tipo: "start", label: label_method)
+      name = "#{opts[:autocomplete][:campo]}_#{opts[:autocomplete][:classe]}"
+      opts[:input_html] = {name: name, id: name}
+      opts[:id_element] = "##{self.modelo}_#{nome}_id"
+    end
+    if opts.present? && opts[:grupo].present?
+      opts[:fields] = []
+      opts[:grupo].each do |field|
+        attribute = field[:campo]
+        field.delete(:campo)
+        add_group_formulario(field) if field[:grupo].present?
+        opts[:fields].push({attribute: attribute,sf: field})
+      end
+      opts[:grupo] = true if opts[:grupo].present?
+    end
+    if @agrupamento.present?
+      opts[:agrupamento] = @agrupamento
+    end
+    @@form_fields[self.to_s.to_sym].push(
+      {
+        attribute: nome
+      }.merge({sf: opts})
+    )
+    if opts.present? && opts[:autocomplete].present?
+      campo_formulario(nome, {as: :hidden})
+    end
+  end
+
+  def self.add_group_formulario(field)
+    field[:fields] = []
+    field[:grupo].each do |f|
+      attribute = f[:campo]
+      f.delete(:campo)
+      add_group_formulario(f) if f[:grupo].present?
+      field[:fields].push({attribute: attribute, sf: f})
+    end
+    field[:grupo] = true
+  end
+
+  def self.set_default_label nome, opts
+    unless opts[:label].present?
+      opts[:label] = "simple_form.labels.#{self.modelo.underscore}.#{nome}"
+    end
+    opts
+  end
 end

data/app/views/crud/_records.html.erb

@@ -1,59 +1,59 @@
 <%= render_crud do %>
-	<div>
-		<%= render "/crud/links" %>
-	</div>
-	<div class="dataTables_wrapper form-inline">
-		<table class="table table-striped table-bordered table-hover dataTables-example dataTable">
-			<thead>
-				<tr>
-					<%@crud_helper.index_fields.each do |att|  %>
-						<% if !att[:visible_if].nil?%>
-							<% if ((att[:visible_if].class == Proc && !att[:visible_if].call(att)) || (att[:visible_if].class != Proc && !att[:visible_if])) %>
-								<% next %>
-							<% end %>
-						<% end %>
-						<th>
-							<% if att[:sort_field].present? %>
-								<% if att[:sort_field] == :false %>
-									<%= I18n.t(att[:label]) %>
-								<% else %>
-									<%= sort_link @q, att[:sort_field], I18n.t(att[:label]), {},data: {push: 'partial', target: "#form"}%>
-								<% end %>
-							<% else %>
-								<%= sort_link @q, att[:attribute], I18n.t(att[:label]), {},data: {push: 'partial', target: "#form"}%>
-							<% end %>
-						</th>
-					<%end%>
-					<%if @crud_helper.view_action || @crud_helper.edit_action || @crud_helper.destroy_action || @crud_helper.actions.present?%>
-						<td><%= I18n.t("simple_form.index.options") %></td>
-					<% end %>
-				</tr>
-			</thead>
-			<tbody id="records-body">
-				<% @records.each do |record| %>
-					<%= render '/crud/record', record: record %>
-				<% end %>
-			</tbody>
-		</table>
-		<%= paginate @records, target: '#form', theme: 'templus'%>
-	</div>
+  <div>
+    <%= render "/crud/links" %>
+  </div>
+  <div class="dataTables_wrapper form-inline">
+    <table class="table table-striped table-bordered table-hover dataTables-example dataTable">
+      <thead>
+        <tr>
+          <% @crud_helper.index_fields.each do |att| %>
+            <% if !att[:visible_if].nil?%>
+              <% if ((att[:visible_if].class == Proc && !att[:visible_if].call(att)) || (att[:visible_if].class != Proc && !att[:visible_if])) %>
+                <% next %>
+              <% end %>
+            <% end %>
+            <th>
+              <% if att[:sort_field].present? %>
+                <% if att[:sort_field] == :false %>
+                  <%= I18n.t(att[:label]) %>
+                <% else %>
+                  <%= sort_link @q, att[:sort_field], I18n.t(att[:label]), {},data: {push: 'partial', target: "#form"}%>
+                <% end %>
+              <% else %>
+                <%= sort_link @q, att[:attribute], I18n.t(att[:label]), {},data: {push: 'partial', target: "#form"}%>
+              <% end %>
+            </th>
+          <% end %>
+          <% if @crud_helper.view_action || @crud_helper.edit_action || @crud_helper.destroy_action || @crud_helper.actions.present? %>
+            <td><%= I18n.t("simple_form.index.options") %></td>
+          <% end %>
+        </tr>
+      </thead>
+      <tbody id="records-body">
+        <% @records.each do |record| %>
+          <%= render '/crud/record', record: record %>
+        <% end %>
+      </tbody>
+    </table>
+    <%= paginate @records, target: '#form', theme: 'templus'%>
+  </div>
 <% end %>
 <script type="text/javascript">
-	var theadtxt = [];
-	var headers = document.querySelectorAll("thead");
-	var tablebody = document.querySelectorAll("tbody");
-	for (var x = 0; x < headers.length; x++) {
-		theadtxt[x]=[];
-		for (var j = 0, headrow; headrow = headers[x].rows[0].cells[j]; j++) {
-		  var current = headrow;
-		  theadtxt[x].push(current.innerHTML);
-		}
-	}
-	for (var v = 0, tbody; tbody = tablebody[v]; v++) {
-		for (var x = 0, row; row = tbody.rows[x]; x++) {
-		  for (var j = 0, col; col = row.cells[j]; j++) {
+  var theadtxt = [];
+  var headers = document.querySelectorAll("thead");
+  var tablebody = document.querySelectorAll("tbody");
+  for (var x = 0; x < headers.length; x++) {
+    theadtxt[x]=[];
+    for (var j = 0, headrow; headrow = headers[x].rows[0].cells[j]; j++) {
+      var current = headrow;
+      theadtxt[x].push(current.innerHTML);
+    }
+  }
+  for (var v = 0, tbody; tbody = tablebody[v]; v++) {
+    for (var x = 0, row; row = tbody.rows[x]; x++) {
+      for (var j = 0, col; col = row.cells[j]; j++) {
             col.insertAdjacentHTML('afterbegin', '<div class="col-xs-3 no-padding">' + theadtxt[v][j] + '</div>');
-		  }
-		}
-	}
+      }
+    }
+  }
 </script>

data/app/views/crud/_search.html.erb

@@ -1,30 +1,30 @@
 <div class="modal inmodal" id="modal_search" tabindex="-1" role="dialog" aria-hidden="true">
-	<div class="modal-dialog modal-lg">
-		<div class="modal-content animated bounceInRight">
-			<div class="modal-header">
-				<button type="button" class="close" data-dismiss="modal"><span aria-hidden="true">&times;</span><span class="sr-only"><%= I18n.t("close") %></span></button>
-				<i class="fa fa-search modal-icon"></i>
-				<h4 class="modal-title"><%= I18n.t("search") %></h4>
-				<small class="font-bold"></small>
-			</div>
-			<div class="modal-body">
-				<% if @crud_associacao.present? %>
-					<% url = query_crud_associacao_path(model: params[:model], id: params[:id], associacao: params[:associacao]) %>
-				<% else %>
-					<% url = query_crud_path(model: @model.name.underscore) %>
-				<% end %>
-				<%=raro_search_form(@model, 'records','records', url) do%>
-					<%raro_group "#{@crud_helper.title}"%>
-					<%@crud_helper.search_fields.each do |att| %>
-						<% if att[:sf].present? && !att[:sf][:visible_if].nil?%>
-							<% if ((att[:sf][:visible_if].class == Proc && !att[:sf][:visible_if].call(att)) || (att[:sf][:visible_if].class != Proc && !att[:sf][:visible_if])) %>
-								<% next %>
-							<% end %>
-						<% end %>
-						<%raro_field att[:attribute], att[:sf]%>
-					<%end%>
-				<%end%>
-			</div>
-		</div>
-	</div>
+  <div class="modal-dialog modal-lg">
+    <div class="modal-content animated bounceInRight">
+      <div class="modal-header">
+        <button type="button" class="close" data-dismiss="modal"><span aria-hidden="true">&times;</span><span class="sr-only"><%= I18n.t("close") %></span></button>
+        <i class="fa fa-search modal-icon"></i>
+        <h4 class="modal-title"><%= I18n.t("search") %></h4>
+        <small class="font-bold"></small>
+      </div>
+      <div class="modal-body">
+        <% if @crud_associacao.present? %>
+          <% url = query_crud_associacao_path(model: params[:model], id: params[:id], associacao: params[:associacao]) %>
+        <% else %>
+          <% url = query_crud_path(model: @model.name.underscore) %>
+        <% end %>
+        <%= raro_search_form(@model, 'records','records', url) do %>
+          <% raro_group "#{@crud_helper.title}" %>
+          <%@crud_helper.search_fields.each do |att| %>
+            <% if att[:sf].present? && !att[:sf][:visible_if].nil? %>
+              <% if ((att[:sf][:visible_if].class == Proc && !att[:sf][:visible_if].call(att)) || (att[:sf][:visible_if].class != Proc && !att[:sf][:visible_if])) %>
+                <% next %>
+              <% end %>
+            <% end %>
+            <%raro_field att[:attribute], att[:sf]%>
+          <%end%>
+        <%end%>
+      </div>
+    </div>
+  </div>
 </div>

data/app/views/crud/_shared.html.erb

@@ -1,124 +1,119 @@
-<%unless params[:render] == 'modal'%>
+<% unless params[:render] == 'modal' %>
 <div class="wrapper wrapper-content animated fadeInRight">
-	<div class="row">
-		<div class="col-lg-12">
-			<div class="ibox float-e-margins">
-				<div class="ibox-title">
-					<% if content_for?(:ibox_title) %>
-						<%= yield :ibox_title %>
-					<% elsif is_action_edit? && @model.present?%>
-						<h5>
-							<%= I18n.t("edit") %>
-							<small style="margin-left: 2px;"><%= @record.to_s %> - #<%= @record.id %></small>
-						</h5>
-					<% elsif (is_action_create? || is_action_new?) && @model.present? %>
-						<h5><%= I18n.t("new", model: I18n.t("model.#{@model.name.underscore}")) %></h5>
-					<% elsif @record.present? && !@record.new_record? %>
-						<h5>
-							<%= @record.to_s %>
-							<small style="margin-left: 2px;">#<%= @record.id %></small>
-						</h5>
-					<% elsif @crud_helper.present? %>
-						<h5>
-							<%= @crud_helper.subtitle(:index) %>
-							<small><%= @crud_helper.description(:index) %></small>
-						</h5>
-					<% end %>
-					<% if (@crud_helper.present? && (is_action_index? || is_action_query?))%>
-						<div class="pull-right actions">
-							<% @crud_helper.top_links.each do |link| %>
-								<% if link[:can].present? %>
-									<%=render_link(link,@clean_url) if self.instance_eval &link[:can]%>
-								<% else %>
-									<%=render_link(link,@clean_url)%>
-								<% end %>
-							<%end%>
-							<% if params[:associacao] %>
-								<% if @crud_helper.listing_fields.present? && should_listing?(@crud_helper, @model_permission) %>
-									<%= link_to listing_crud_associacao_path(model: params[:model], id: params[:id], associacao: params[:associacao], q: params[:q], format: :xls), class: "btn btn-success btn-rounded" do %>
-										<%= I18n.t("devise.reports.excel").html_safe %>
-									<% end if should_listing_excel?(@crud_helper, @model_permission) %>
-	                				<%= link_to listing_crud_associacao_path(model: params[:model], id: params[:id], associacao: params[:associacao], q: params[:q], format: :pdf), class: "btn btn-success btn-rounded", target: '_blank' do %>
-										<%= I18n.t("devise.reports.pdf").html_safe %>
-									<% end if should_listing_pdf?(@crud_helper, @model_permission) %>
-								<% end %>
-							<% else %>
-								<% if @crud_helper.listing_fields.present? && should_listing?(@crud_helper, @model) %>
-									<%= link_to listing_crud_path(model: @model.name.underscore, q: params[:q], format: :xls), class: "btn btn-success btn-rounded" do %>
-										<%= I18n.t("devise.reports.excel").html_safe %>
-									<% end if should_listing_excel?(@crud_helper, @model) %>
-	                				<%= link_to listing_crud_path(model: @model.name.underscore, q: params[:q], target: '_blank', format: :pdf), class: "btn btn-success btn-rounded", target: '_blank' do %>
-										<%= I18n.t("devise.reports.pdf").html_safe %>
-									<% end if should_listing_pdf?(@crud_helper, @model) %>
-								<% end %>
-							<% end %>
-							<% if @crud_helper.search_fields.present? %>
-								<button id="button_search_<%=@model.name.underscore%>" class="btn btn-warning btn-rounded" data-toggle="modal" data-target="#modal_search">
-									<i class="fa fa-search"></i>
-								</button>
-							<% end %>
-						</div>
-					<% elsif is_action_show? %>
-						<% @crud_helper.actions_links.each do |name, options| %>
-							<% unless (options[:can].present? && !@record.instance_eval(&options[:can])) %>
-								<% if options[:url].present? %>
-									<% url = options[:url] %>
-									<% if options[:id] %>
-										<% url += options[:url].include?("?") ? "&id=#{@record.id}" : "?id=#{@record.id}" %>
-									<% else url.include?(":id") %>
-										<% url = url.gsub(":id", "#{@record.id}") %>
-									<% end %>
-									<% if options[:wiselink].present? && options[:wiselink] %>
-										<a href="<%= url %>" class="btn btn-success btn-xs pull-right m-l-xs" data-push="partial" data-target="#form">
-											<%= I18n.t(name) %>
-										</a>
-									<% else %>
-										<a href="<%= url %>" class="btn btn-success btn-xs pull-right m-l-xs">
-											<%= I18n.t(name) %>
-										</a>
-									<% end %>
-								<% elsif options[:partial].present? %>
-									<div class="pull-right m-l-xs">
-										<%= render options[:partial], record: @record, action: :show %>
-									</div>
-								<% end %>
-							<% end %>
-						<% end %>
+  <div class="row">
+    <div class="col-lg-12">
+      <div class="ibox float-e-margins">
+        <div class="ibox-title">
+          <% if content_for?(:ibox_title) %>
+            <%= yield :ibox_title %>
+          <% elsif is_action_edit? && @model.present?%>
+            <h5>
+              <%= I18n.t("edit") %>
+              <small style="margin-left: 2px;"><%= @record.to_s %> - #<%= @record.id %></small>
+            </h5>
+          <% elsif (is_action_create? || is_action_new?) && @model.present? %>
+            <h5><%= I18n.t("new", model: I18n.t("model.#{@model.name.underscore}")) %></h5>
+          <% elsif @record.present? && !@record.new_record? %>
+            <h5>
+              <%= @record.to_s %>
+              <small style="margin-left: 2px;">#<%= @record.id %></small>
+            </h5>
+          <% elsif @crud_helper.present? %>
+            <h5>
+              <%= @crud_helper.subtitle(:index) %>
+              <small><%= @crud_helper.description(:index) %></small>
+            </h5>
+          <% end %>
 
-						<% if (@crud_helper.present? && @crud_helper.destroy_action) && should_destroy?(@crud_helper, @record) %>
-							<% if @crud_associacao.present? %>
-								<%= link_to I18n.t("destroy"), destroy_crud_associacao_path(model: params[:model], id: params[:id], associacao: params[:associacao], associacao_id: @record.id, page: params[:page], q: params[:q]), class: 'btn btn-danger btn-xs pull-right m-l-xs', data: {method: 'delete', confirm: I18n.t('mensagem_confirm_destroy')} %>
-							<% else %>
-								<%= link_to I18n.t("destroy"), destroy_crud_path(model: @model.name.underscore, id: @record.id, page: params[:page], q: params[:q]), class: 'btn btn-danger btn-xs pull-right m-l-xs', data: {method: 'delete', confirm: I18n.t('mensagem_confirm_destroy')} %>
-							<% end %>
-						<% end %>
-						<% if (@crud_helper.present? && @crud_helper.edit_action) && should_edit?(@crud_helper, @record) %>
-							<% if @crud_associacao.present? %>
-								<%= link_to I18n.t("edit"), edit_crud_associacao_path(model: params[:model], id: params[:id], associacao: params[:associacao], associacao_id: @record.id, page: params[:page], q: params[:q]), class: 'btn btn-primary btn-xs pull-right m-l-xs', data: {push: 'partial', target: '#form'} %>
-							<% else %>
-								<%= link_to I18n.t("edit"), edit_crud_path(model: @model.name.underscore, id: @record.id, page: params[:page], q: params[:q]), class: 'btn btn-primary btn-xs pull-right m-l-xs', data: {push: 'partial', target: '#form'} %>
-							<% end %>
-						<% end %>
-						<% if @crud_helper.printing_fields.present? && should_printing?(@crud_helper, @record) %>
-							<% if @crud_associacao.present? %>
-								<%= link_to printing_crud_associacao_path(model: params[:model], id: params[:id], associacao: params[:associacao], associacao_id: @record.id, page: params[:page], q: params[:q], format: :pdf), class: "btn btn-success btn-xs pull-right m-l-xs", target: "_blank" do %>
-										<%= I18n.t("devise.printing").html_safe %>
-								<% end %>
-							<% else %>
-								<%= link_to printing_crud_path(model: @model.name.underscore, id: @record.id, page: params[:page], q: params[:q], format: :pdf), class: "btn btn-success btn-xs pull-right m-l-xs", target: "_blank" do %>
-									<%= I18n.t("devise.printing").html_safe %>
-								<% end %>
-							<% end %>
-						<% end %>
-					<% end %>
-				</div>
-				<div class="ibox-content">
-					<% block.call %>
-				</div>
-			</div>
-		</div>
-	</div>
+
+          <% if @crud_helper.present? && (is_action_index? || is_action_query?) %>
+            <div class="pull-right actions">
+              <% @crud_helper.top_links.each do |link| %>
+                <% if link[:can].present? %>
+                  <%= render_link(link,@clean_url) if self.instance_eval &link[:can] %>
+                <% else %>
+                  <%= render_link(link,@clean_url) %>
+                <% end %>
+              <% end %>
+              <% if params[:associacao] %>
+                <% if @crud_helper.listing_fields.present? && should_listing?(@crud_helper, @model_permission) && should_listing_excel?(@crud_helper, @model_permission) %>
+                  <%= link_to listing_crud_associacao_path(model: params[:model], id: params[:id], associacao: params[:associacao], q: params[:q], format: :xls), class: "btn btn-success btn-rounded" do %>
+                    <%= I18n.t("devise.reports.excel").html_safe %>
+                  <% end %>
+                <% end %>
+              <% else %>
+                <% if @crud_helper.listing_fields.present? && should_listing?(@crud_helper, @model) && should_listing_excel?(@crud_helper, @model) %>
+                  <%= link_to listing_crud_path(model: @model.name.underscore, q: params[:q], format: :xls), class: "btn btn-success btn-rounded" do %>
+                    <%= I18n.t("devise.reports.excel").html_safe %>
+                  <% end %>
+                <% end %>
+              <% end %>
+              <% if @crud_helper.search_fields.present? %>
+                <button id="button_search_<%=@model.name.underscore%>" class="btn btn-warning btn-rounded" data-toggle="modal" data-target="#modal_search">
+                  <i class="fa fa-search"></i>
+                </button>
+              <% end %>
+            </div>
+
+          <% elsif is_action_show? %>
+            <% @crud_helper.actions_links.each do |name, options| %>
+              <% unless (options[:can].present? && !@record.instance_eval(&options[:can])) %>
+                <% if options[:url].present? %>
+                  <% url = options[:url] %>
+                  <% if options[:id] %>
+                    <% url += options[:url].include?("?") ? "&id=#{@record.id}" : "?id=#{@record.id}" %>
+                  <% else url.include?(":id") %>
+                    <% url = url.gsub(":id", "#{@record.id}") %>
+                  <% end %>
+                  <% if options[:wiselink].present? && options[:wiselink] %>
+                    <%= link_to t('name'), url, class: 'btn btn-success btn-xs pull-right m-l-xs', data: { push: 'partial', target: '#form' } %>
+                  <% else %>
+                    <%= link_to t(name), url, class: 'btn btn-success btn-xs pull-right m-l-xs' %>
+                  <% end %>
+                <% elsif options[:partial].present? %>
+                  <div class="pull-right m-l-xs">
+                    <%= render options[:partial], record: @record, action: :show %>
+                  </div>
+                <% end %>
+              <% end %>
+            <% end %>
+
+            <% if (@crud_helper.present? && @crud_helper.destroy_action) && should_destroy?(@crud_helper, @record) %>
+              <% if @crud_associacao.present? %>
+                <%= link_to I18n.t("destroy"), destroy_crud_associacao_path(model: params[:model], id: params[:id], associacao: params[:associacao], associacao_id: @record.id, page: params[:page], q: params[:q]), class: 'btn btn-danger btn-xs pull-right m-l-xs', data: {method: 'delete', confirm: I18n.t('mensagem_confirm_destroy')} %>
+              <% else %>
+                <%= link_to I18n.t("destroy"), destroy_crud_path(model: @model.name.underscore, id: @record.id, page: params[:page], q: params[:q]), class: 'btn btn-danger btn-xs pull-right m-l-xs', data: {method: 'delete', confirm: I18n.t('mensagem_confirm_destroy')} %>
+              <% end %>
+            <% end %>
+
+            <% if (@crud_helper.present? && @crud_helper.edit_action) && should_edit?(@crud_helper, @record) %>
+              <% if @crud_associacao.present? %>
+                <%= link_to I18n.t("edit"), edit_crud_associacao_path(model: params[:model], id: params[:id], associacao: params[:associacao], associacao_id: @record.id, page: params[:page], q: params[:q]), class: 'btn btn-primary btn-xs pull-right m-l-xs', data: {push: 'partial', target: '#form'} %>
+              <% else %>
+                <%= link_to I18n.t("edit"), edit_crud_path(model: @model.name.underscore, id: @record.id, page: params[:page], q: params[:q]), class: 'btn btn-primary btn-xs pull-right m-l-xs', data: {push: 'partial', target: '#form'} %>
+              <% end %>
+            <% end %>
+
+            <% if @crud_helper.printing_fields.present? && can_print_pdf?(@crud_helper, @record) %>
+              <% if @crud_associacao.present? %>
+                <%= link_to printing_crud_associacao_path(model: params[:model], id: params[:id], associacao: params[:associacao], associacao_id: @record.id, page: params[:page], q: params[:q], format: :pdf), class: "btn btn-success btn-xs pull-right m-l-xs", target: "_blank" do %>
+                  <%= I18n.t("devise.printing").html_safe %>
+                <% end %>
+              <% else %>
+                <%= link_to printing_crud_path(model: @model.name.underscore, id: @record.id, page: params[:page], q: params[:q], format: :pdf), class: "btn btn-success btn-xs pull-right m-l-xs", target: "_blank" do %>
+                  <%= I18n.t("devise.printing").html_safe %>
+                <% end %>
+              <% end %>
+            <% end %>
+          <% end %>
+        </div>
+        <div class="ibox-content">
+          <% block.call %>
+        </div>
+      </div>
+    </div>
+  </div>
 </div>
 <% else %>
-	<% block.call %>
+  <% block.call %>
 <% end %>

data/app/views/crud/listing.xls.erb

@@ -7,7 +7,7 @@ xmlns:html="http://www.w3.org/TR/REC-html40">
 <Worksheet ss:Name="<%= @crud_helper.title %>">
 	<Table>
 		<Row>
-			<% @crud_helper.listing_fields.each do |att|%>
+			<% @crud_helper.listing_fields.each do |att| %>
 				<% if !att[:visible_if].nil?%>
 					<% if ((att[:visible_if].class == Proc && !att[:visible_if].call(att)) || (att[:visible_if].class != Proc && !att[:visible_if])) %>
 						<% next %>
@@ -18,7 +18,7 @@ xmlns:html="http://www.w3.org/TR/REC-html40">
 		</Row>
 		<% @records.each do |record| %>
 			<Row>
-				<%@crud_helper.listing_fields.each do |att| %>
+				<% @crud_helper.listing_fields.each do |att| %>
 					<% if record.send(att[:attribute]).present? or record.send(att[:attribute]).to_s == "false"%>
 						<% if @model.columns_hash[att[:attribute].to_s].present? && [:date, :datetime].include?(@model.columns_hash[att[:attribute].to_s].type)%>
 								<% if att[:date_format].present?%>

data/app/views/crud/printing.pdf.erb

@@ -13,7 +13,7 @@
       </div>
       <table class="table table-bordered table-striped">
         <tbody>
-          <% @crud_helper.view_fields.each do |field|%>
+          <% @crud_helper.printing_fields.each do |field| %>
             <tr>
               <% if field[:sf].present? && !field[:sf][:visible_if].nil?%>
                 <% if ((field[:sf][:visible_if].class == Proc && !field[:sf][:visible_if].call(@record)) || (field[:sf][:visible_if].class != Proc && !field[:sf][:visible_if])) %>

data/lib/templus_models/version.rb

@@ -1,3 +1,3 @@
 module TemplusModels
-  VERSION = "3.0.6"
+  VERSION = "3.0.7"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: templus_models
 version: !ruby/object:Gem::Version
-  version: 3.0.6
+  version: 3.0.7
 platform: ruby
 authors:
 - Rodrigo Sol
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-21 00:00:00.000000000 Z
+date: 2017-03-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -174,7 +174,6 @@ files:
 - app/views/crud/create.js.erb
 - app/views/crud/edit.html.erb
 - app/views/crud/index.html.erb
-- app/views/crud/listing.pdf.erb
 - app/views/crud/listing.xls.erb
 - app/views/crud/mensagens/_avisos.html.erb
 - app/views/crud/mensagens/_erros_formulario.html.erb

data/app/views/crud/listing.pdf.erb

@@ -1,76 +0,0 @@
-<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css" integrity="sha384-BVYiiSIFeK1dGmJRAkycuHAHRg32OmUcww7on3RYdg4Va+PmSTsz/K68vbdEjh4u" crossorigin="anonymous">
-
-<div class="widget-box" id="relatorio">
-  <div class="widget-body">
-    <div class="widget-main">
-      <div class="profile-element">
-        <div class="header">
-          <h1><%= @crud_helper.title %></h1>
-        </div>
-      </div>
-      <table class="table table-bordered table-striped">
-        <thead>
-          <tr>
-            <% @crud_helper.listing_fields.each do |att|%>
-      				<% if !att[:visible_if].nil?%>
-      					<% if ((att[:visible_if].class == Proc && !att[:visible_if].call(att)) || (att[:visible_if].class != Proc && !att[:visible_if])) %>
-      						<% next %>
-      					<% end %>
-      				<% end %>
-      				<% if att[:sf].present? && att[:sf][:label].present? %>
-      					<th><%= att[:sf][:label].to_s.mb_chars.upcase.to_s %></th>
-      				<% else %>
-      					<th><%= I18n.t(att[:sf][:label]) %></th>
-      				<% end %>
-      			<% end %>
-          </tr>
-        </thead>
-        <tbody>
-          <% @records.each do |record| %>
-          <tr>
-            <%@crud_helper.listing_fields.each do |att| %>
-    					<% if record.send(att[:attribute]).present? or record.send(att[:attribute]).to_s == "false"%>
-    						<% if @model.columns_hash[att[:attribute].to_s].present? && [:date, :datetime].include?(@model.columns_hash[att[:attribute].to_s].type)%>
-    								<% if att[:date_format].present?%>
-    									<td><%= record.send(att[:attribute]).strftime(att[:date_format]) %></td>
-    								<% else %>
-    									<td><%= l record.send(att[:attribute]) %></td>
-    								<% end %>
-    						<% elsif ((@model.reflect_on_association(att[:attribute]) && @model.reflect_on_association(att[:attribute]).macro != :belongs_to && @model.reflect_on_association(att[:attribute]).macro != :has_one) || record.send(att[:attribute]).class == Array)%>
-    							<td><%= record.send(att[:attribute]).map{|rec| rec.to_s}.join(",") %></td>
-    						<% else %>
-    							<% if record.send(att[:attribute]).to_s == "false" or record.send(att[:attribute]).to_s == "true" %>
-    								<td><%= I18n.t(record.send(att[:attribute]) ? "shared.sim" : "shared.nao") %></td>
-    							<% elsif att[:sf][:label_method].present? %>
-    								<td><%= record.send(att[:attribute]).send(att[:sf][:label_method]).to_s %></td>
-    							<% else %>
-    								<td><%= record.send(att[:attribute]).to_s %></td>
-    							<% end %>
-    						<% end %>
-    					<% else %>
-    						<td></td>
-    					<% end %>
-    				<% end %>
-          </tr>
-          <% end %>
-        </tbody>
-      </table>
-    </div>
-  </div>
-</div>
-<style>
-  #relatorio {
-    clear: both;
-    page-break-inside: avoid;
-  }
-  .header {
-    float: left;
-  }
-  table {
-    font-size: 0.75em;
-  }
-  thead { display: table-header-group }
-  tfoot { display: table-row-group }
-  tr { page-break-inside: avoid }
-  h1 { padding-bottom: 20px; }
-</style>