templus_models 2.0.8 → 2.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1676aaa61958cdb536366ee3608d1cf0d9771288
-  data.tar.gz: 4a33e15646197c32f54067eaa48c39dfbf463bdf
+  metadata.gz: 872ddd9090321dc9cb61eb0813bde103169ce3e4
+  data.tar.gz: 6fd45c48c159edc1891fc63d9e0249593d0a8f61
 SHA512:
-  metadata.gz: 9565970acc7b83e8adfcd7822194ffd9a83d948ac9348ab34370642924fb92c639cac0cc6d09cf273eb6015ec96eafb644275bca3561e7f24e7377faf34b6ad8
-  data.tar.gz: 44a4d3804c73423d0f7d462265f739075bbf31005ab473bb9d5dd0711570ed0cfe4e2f897271acba33bb4c328f428b8af7defa497b98a47feb1b4cdf169bfcd5
+  metadata.gz: 2fe91b7d4f1f96c87787a26c4fedf70a50a1c489d6369d12bdd398664497b65ddd24691217d250982d5429c2573cbdb1d8e33cce7a23b9375d2f27786d484d52
+  data.tar.gz: be8bb80479a4ce137a56e28315268e0cad502e3127d4a1eb2cabe7f30c8f488c3d27c9ae0d48cb141d8322e7c204cedad417d76e68766398e268e86562b1bf5d

data/app/controllers/crud_controller.rb

@@ -165,14 +165,7 @@ class CrudController < ApplicationController
     respond_to do |format|
       format.xls { headers["Content-Disposition"] = "attachment; filename=#{report_name}.xls" }
       format.pdf do
-        html = render_to_string('crud/listing.pdf.erb')
-        options = {
-          encoding: 'UTF-8',
-          page_size: 'A4',
-          show_as_html: params[:debug],
-          margin: { top: 20, bottom: 20 }
-        }
-        pdf = WickedPdf.new.pdf_from_string(html, options)
+        pdf = generate_pdf_report(@crud_helper.setup_report_listing, 'crud/listing.pdf.erb')
         send_data(pdf, filename: "#{report_name}.pdf", type: "application/pdf", disposition: "inline")
       end
     end
@@ -184,13 +177,7 @@ class CrudController < ApplicationController
     report_name = "#{@record}_#{DateTime.now.strftime('%Y%m%d')}"
     respond_to do |format|
       format.pdf do
-        pdf = WickedPdf.new.pdf_from_string(
-          render_to_string('crud/printing.pdf.erb'),
-          encoding: 'UTF-8',
-          page_size: 'A4',
-          show_as_html: params[:debug],
-          margin: { top: 20, bottom: 20 }
-        )
+        pdf = generate_pdf_report(@crud_helper.setup_report_printing, 'crud/printing.pdf.erb')
         send_data(pdf, filename: "#{report_name}.pdf", type: "application/pdf", disposition: "inline")
       end
       format.html
@@ -199,6 +186,24 @@ class CrudController < ApplicationController
 
 
   private
+  
+  def generate_pdf_report(opts, layout)
+    html = render_to_string(layout)
+    options = {
+      encoding: 'UTF-8',
+      orientation: opts[:orientation],
+      page_size: 'A4',
+      show_as_html: params[:debug],
+      margin: { top: opts[:top], bottom: opts[:bottom] }
+    }
+    if opts[:header].present?
+      options[:header] = {content: render_to_string(template: opts[:header], locals: {title: @crud_helper.title})}
+    end
+    if opts[:footer].present?
+      options[:footer] = {content: render_to_string(template: opts[:footer])}
+    end
+    WickedPdf.new.pdf_from_string(html, options)
+  end
 
   def setup
     if params[:associacao]
@@ -225,7 +230,7 @@ class CrudController < ApplicationController
   end
 
   def params_permitt
-    params.require(@model.name.underscore.to_sym).permit(fields_model)
+    params.require(@model.name.underscore.gsub('/','_').to_sym).permit(fields_model)
   end
 
   def fields_model
@@ -279,7 +284,7 @@ class CrudController < ApplicationController
     end
     group
   end
-  
+
   def valid_method?(method)
     list_methods = []
     @model.ancestors.each do |m|
@@ -288,7 +293,7 @@ class CrudController < ApplicationController
     end
     list_methods.flatten.include? method.to_sym
   end
-  
+
   def valid_instance_method?(method)
     list_methods = []
     @model.ancestors.each do |m|

data/app/helpers/search_helper.rb

@@ -78,11 +78,11 @@ module SearchHelper
     end
 
     def raro_input_as(name,type,opts)
+      if opts[:collection_if] and opts[:collection_if].class == Proc
+        opts[:collection] = ActionView::Helpers::FormBuilder.instance_eval(&opts[:collection_if])
+      end
       case opts[:as]
       when :select
-        if opts[:collection_if] and opts[:collection_if].class == Proc
-          opts[:collection] = ActionView::Helpers::FormBuilder.instance_eval(&opts[:collection_if])
-        end
         raro_select(name,opts,opts[:collection])
       when :hidden
         return raro_hidden_field(name,opts[:value],opts)
@@ -92,6 +92,8 @@ module SearchHelper
         raro_range(name)
       when :monthyear
         raro_monthyear(name, opts)
+      when :check_boxes
+        raro_check_boxes(name, opts, opts[:collection])
       end
     end
 
@@ -105,6 +107,23 @@ module SearchHelper
       return raro_select("q[#{model_name}_id_eq]",opts,collection)
     end
 
+    def raro_check_boxes(name, opts, collection)
+      unless opts[:model]
+        name = "q[#{name}_eq]"
+      end
+      buf = "<div class='col-sm-12'>"
+      input_class = opts[:input_html].try(:[], :class)
+      collection.each do |e|
+        buf << "<span class='checkbox' style='display: inline;'>"
+        buf << "<label class='control-label'>"
+        buf << "<input class='form-control check_boxes optional #{input_class}' type='checkbox' value='#{e[0]}' name='#{name}' style=''> #{e[1]}"
+        buf << '</label>'
+        buf << '</span>'
+      end
+      buf << '</div>'
+      return buf
+    end
+
     def raro_select(name,opts,collection)
       unless opts[:model]
         name = "q[#{name}_eq]"

data/app/raro_crud/raro_crud.rb

@@ -7,11 +7,9 @@ class RaroCrud
   @@form_scripts              = {}
   @@view_fields               = {}
   @@listing_fields            = {}
-  @@logo_listing_field        = {}
-  @@titulo_listing_field      = {}
+  @@setup_report_listing      = {}
+  @@setup_report_printing     = {}
   @@printing_fields           = {}
-  @@logo_printing_field       = {}
-  @@titulo_printing_field     = {}
   @@search_fields             = {}
   @@test_fields               = {}
   @@top_links                 = {}
@@ -178,27 +176,19 @@ class RaroCrud
   def self.listing_fields
     @@listing_fields[self.to_s.to_sym] || []
   end
-
-  def self.logo_listing_field
-    @@logo_listing_field[self.to_s.to_sym]
+  
+  def self.setup_report_listing
+    @@setup_report_listing[self.to_s.to_sym] || {}
   end
-
-  def self.titulo_listing_field
-    @@titulo_listing_field[self.to_s.to_sym]
+  
+  def self.setup_report_printing
+    @@setup_report_printing[self.to_s.to_sym] || {}
   end
 
   def self.printing_fields
     @@printing_fields[self.to_s.to_sym] || []
   end
 
-  def self.logo_printing_field
-    @@logo_printing_field[self.to_s.to_sym]
-  end
-
-  def self.titulo_printing_field
-    @@titulo_printing_field[self.to_s.to_sym]
-  end
-
   def self.search_fields
     @@search_fields[self.to_s.to_sym] || []
   end
@@ -249,35 +239,23 @@ class RaroCrud
     })
   end
 
-  def self.relatorio_listagem_logo(proc = nil, options = {})
-    url = nil
-    logo_proc = nil
-    if proc.respond_to?(:call)
-      logo_proc = proc
-    else
-      url = Templus.logo
-    end
-
-    @@logo_listing_field[self.to_s.to_sym] = {
-      url: url,
-      logo_proc: logo_proc,
-      sf: options
+  def self.setup_relatorio_listagem(options = {})
+    @@setup_report_listing[self.to_s.to_sym] = {
+      top: options[:top] || 20,
+      bottom: options[:bottom] || 20,
+      orientation: options[:orientation] || 'Portrait',
+      header: options[:header],
+      footer: options[:footer]
     }
   end
 
-  def self.relatorio_listagem_titulo(string_or_proc)
-    titulo_proc = nil
-    titulo = nil
-
-    if string_or_proc.respond_to?(:call)
-      titulo_proc = string_or_proc
-    elsif string_or_proc.is_a?(String)
-      titulo = string_or_proc
-    end
-
-    @@titulo_listing_field[self.to_s.to_sym] = {
-      titulo_proc: titulo_proc,
-      titulo: titulo
+  def self.setup_relatorio_impressao(options = {})
+    @@setup_report_printing[self.to_s.to_sym] = {
+      top: options[:top] || 20,
+      bottom: options[:bottom] || 20,
+      orientation: options[:orientation] || 'Portrait',
+      header: options[:header],
+      footer: options[:footer]
     }
   end
 
@@ -290,39 +268,6 @@ class RaroCrud
     })
   end
 
-  def self.relatorio_impressao_logo(field_or_url = nil, options = {})
-    url = nil
-    field = nil
-    if field_or_url.blank?
-      url = Templus.logo
-    elsif field_or_url.is_a?(String)
-      url = field_or_url
-    else
-      field = field_or_url
-    end
-
-    @@logo_printing_field[self.to_s.to_sym] = {
-      url: url,
-      field: field,
-      sf: options
-    }
-  end
-
-  def self.relatorio_impressao_titulo(field_or_string = nil)
-    field = nil
-    titulo = nil
-    if field_or_string.is_a?(String)
-      titulo = I18n.t(field_or_string)
-    elsif field_or_string.present?
-      field = field_or_string
-    end
-
-    @@titulo_printing_field[self.to_s.to_sym] = {
-      field: field,
-      titulo: titulo
-    }
-  end
-
   def self.sem_visualizacao
     @@view_action[self.to_s.to_sym] = false
   end

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

@@ -3,51 +3,16 @@
 <div class="widget-box" id="relatorio">
   <div class="widget-body">
     <div class="widget-main">
-      <div class="profile-element">
 
-        <div>
-          <div class="row">
-            <% if @crud_helper.logo_listing_field.present? %>
-              <div class="col-xs-3">
-                <% if @crud_helper.logo_listing_field[:logo_proc].present? %>
-                  <% proc_result = @crud_helper.logo_listing_field[:logo_proc].call(@records) %>
-                  <% if proc_result.is_a?(String) %>
-                    <%= pdf_image_tag(proc_result, width: '100px') %>
-                  <% else %>
-                    <%= render_field_file(proc_result) %>
-                  <% end %>
-                <% elsif @crud_helper.logo_listing_field[:url].present? %>
-                  <%= pdf_image_tag(@crud_helper.logo_listing_field[:url], width: '100px') %>
-                <% end %>
-              </div>
-            <% end %>
-
-            <% if @crud_helper.titulo_listing_field.present? %>
-              <div class="col-xs-9">
-                <h1>
-                  <% if @crud_helper.titulo_listing_field[:titulo].present? %>
-                    <%= t(@crud_helper.titulo_listing_field[:titulo]) %>
-                  <% elsif @crud_helper.titulo_listing_field[:titulo_proc].present? %>
-                    <%= @crud_helper.titulo_listing_field[:titulo_proc].call(@records) %>
-                  <% else %>
-                    <%= Templus.nome_aplicacao %>
-                  <% end %>
-                </h1>
-              </div>
-            <% end %>
+      <% unless @crud_helper.setup_report_listing[:header].present? %>
+        <div class="row">
+          <div class="col-lg-12">
+            <h2>
+              <small><%= @crud_helper.title %></small><br />
+            </h2>
           </div>
         </div>
-      </div>
-
-      <div style="clear: both;"></div>
-
-      <div class="row">
-        <div class="col-lg-12">
-          <h2>
-            <small><%= @crud_helper.title %></small><br />
-          </h2>
-        </div>
-      </div>
+      <% end %>
 
 
       <table class="table table-bordered table-striped">

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

@@ -3,47 +3,13 @@
 <div class="widget-box" id="relatorio">
   <div class="widget-body">
     <div class="widget-main">
-      <div class="profile-element">
-
-        <div>
-          <div class="row">
-            <% if @crud_helper.logo_printing_field.present? %>
-              <div class="col-xs-3">
-                <% if @crud_helper.logo_printing_field[:field].present? %>
-                  <% if @record.send(@crud_helper.logo_printing_field[:field]).present? %>
-                    <%= render_field_file(@record.send(@crud_helper.logo_printing_field[:field])) %>
-                  <% else %>
-                    <%= pdf_image_tag(Templus.logo, width: '100px') %>
-                  <% end %>
-                <% elsif @crud_helper.logo_printing_field[:url].present? %>
-                  <%= pdf_image_tag(@crud_helper.logo_printing_field[:url], width: '100px') %>
-                <% end %>
-              </div>
-            <% end %>
-
-            <% if @crud_helper.titulo_printing_field.present? %>
-              <div class="col-xs-9">
-                <h1>
-                  <% if @crud_helper.titulo_printing_field[:titulo].present? %>
-                    <%= t(@crud_helper.titulo_printing_field[:titulo]) %>
-                  <% elsif @crud_helper.titulo_printing_field[:field].present? %>
-                    <%= @record.send(@crud_helper.titulo_printing_field[:field]) %>
-                  <% else %>
-                    <%= Templus.nome_aplicacao %>
-                  <% end %>
-                </h1>
-              </div>
-            <% end %>
-          </div>
-        </div>
-      </div>
-
-      <div style="clear: both;"></div>
 
       <div class="row">
         <div class="col-lg-12">
           <h2>
-            <small><%= @crud_helper.title %></small><br />
+            <% unless @crud_helper.setup_report_printing[:header].present? %>
+              <small><%= @crud_helper.title %></small><br />
+            <% end %>
             <%= @record.to_s %>
           </h2>
         </div>

data/lib/templus_models/version.rb

@@ -1,3 +1,3 @@
 module TemplusModels
-  VERSION = "2.0.8"
+  VERSION = "2.0.9"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: templus_models
 version: !ruby/object:Gem::Version
-  version: 2.0.8
+  version: 2.0.9
 platform: ruby
 authors:
 - Rodrigo Sol
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-27 00:00:00.000000000 Z
+date: 2017-07-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -981,7 +981,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: Easy CRUD generator for Rails Projects