templus_models 3.0.7 → 3.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8a7986658883e7bee0507408a87a9941a7c0efee
-  data.tar.gz: 77d54cfcbf307318b3e2a3b7cfb846abf9350730
+  metadata.gz: 81dd9ee79ddc913b0d324a40d8e70df9151c22a5
+  data.tar.gz: c6213ab6097d334fd99db91e2441f428c6b644fe
 SHA512:
-  metadata.gz: 61b363865c81485b63d11eb0ef0353b302614076a2f28fe7fd84c4bde300f91e60472ce4d40ef8386c8f18578ce4d08c7f9a400085f96cfd94aaf4c8d1d7ae18
-  data.tar.gz: 9cbfb68fe1561d2040b115158e86065ddbd9244a97b564a3f59d24a02a349f0107acd1b437c68db1b3cf429959c861802ef84a5c888fda73f4349c1be5b6f544
+  metadata.gz: 9d82f807bf61673a0bedac2f387a64b4ee45bad043edaa5f41a3521095b4cb3426c9499e323ef0f5e2637255be4e1b5f5a51e442696e12ed6a3ce4a24cb4822a
+  data.tar.gz: 8c2c8ca412a8bf279613570396641fb1e3e3e43b98b35387fa44cde5752416164241f9a9079a760be45bd77b9af666f164e1ba789bab2bba04e0cb55396018e1

data/app/helpers/attributes_helper.rb

@@ -0,0 +1,32 @@
+module AttributesHelper
+
+  def association?(model, attribute)
+    !!model.reflect_on_association(attribute)
+  end
+
+  def belongs_to_association?(model, attribute)
+    association_type?(model, attribute, :belongs_to)
+  end
+
+  def has_one_association?(model, attribute)
+    association_type?(model, attribute, :has_one)
+  end
+
+  def array?(record, attribute)
+    attribute_class?(record, attribute, Array)
+  end
+
+  def boolean?(record, attribute)
+    ['false', 'true'].include? record.send(attribute).to_s
+  end
+
+  private
+
+  def association_type?(model, attribute, association_type)
+    association?(model, attribute) && model.reflect_on_association(attribute).macro == association_type
+  end
+
+  def attribute_class?(record, attribute, klass)
+    record.send(attribute).class == klass
+  end
+end

data/app/helpers/crud_helper.rb

@@ -1,11 +1,11 @@
 module CrudHelper
 
   def is_active_controller(controller_name)
-      params[:controller] == controller_name ? "active" : nil
+    params[:controller] == controller_name ? "active" : nil
   end
 
   def is_active_action(action_name)
-      params[:action] == action_name ? "active" : nil
+    params[:action] == action_name ? "active" : nil
   end
 
   def is_raro_crud(classe)
@@ -174,9 +174,9 @@ module CrudHelper
   end
 
   def render_field_file(field)
-		if imagem?(field) && field.url(:thumb)
+		if imagem?(field) && field.respond_to?(:thumb)
       if is_active_action("printing")
-        wicked_pdf_image_tag(field.url(:thumb))
+        pdf_image_tag(field)
       else
         link_to field.url, target: "_blank" do
           image_tag(field.url(:thumb))
@@ -233,4 +233,31 @@ module CrudHelper
     return true if crud_helper.condition_printing_action.nil?
     crud_helper.condition_printing_action.call(record)
   end
+
+
+  private
+
+  def pdf_image_tag(field, options = {})
+    if Rails.env.development? || Rails.env.test?
+      # Unless running a web server that can process 2 requests at the same
+      # time, trying to insert an image in a PDF creates a deadlock: the server
+      # can't finish processing the PDF request until it gets the image, but it
+      # can't start processing the image request until it has finished
+      # processing the PDF request.
+      # This will not be a problem in production, but in dev, a workaround is
+      # to base64 the image and insert its contents into the HTML
+      if field.respond_to?(:thumb)
+        image_data = File.read(field.thumb.path)
+      else
+        image_data = Rails.application.assets[field].to_s
+      end
+      image_tag("data:image/png;base64,#{::Base64.encode64(image_data)}", options)
+    else
+      if field.respond_to?(:thumb)
+        field = field.thumb.url
+      end
+      wicked_pdf_image_tag(field, options)
+    end
+  end
+
 end

data/app/helpers/imagens_helper.rb

@@ -0,0 +1,15 @@
+module ImagensHelper
+
+  def carrier_wave_uploader?(model, attribute)
+    model.new.send(attribute).class.ancestors.include?(CarrierWave::Uploader::Base)
+  end
+
+  def possui_url?(record, attribute)
+    record.send(attribute).respond_to?(:url)
+  end
+
+  def deve_renderizar_imagem?(opts)
+    opts.has_key?(:render) && !!opts[:render]
+  end
+
+end

data/app/raro_crud/raro_crud.rb

@@ -9,6 +9,8 @@ class RaroCrud
   @@view_fields               = {}
   @@listing_fields            = {}
   @@printing_fields           = {}
+  @@logo_printing_field       = {}
+  @@titulo_printing_field     = {}
   @@search_fields             = {}
   @@test_fields               = {}
   @@top_links                 = {}
@@ -180,6 +182,14 @@ class RaroCrud
     @@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
@@ -238,6 +248,39 @@ 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 = 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/_records.html.erb

@@ -7,8 +7,8 @@
       <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])) %>
+            <% 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 %>

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

@@ -15,13 +15,13 @@
         <% end %>
         <%= raro_search_form(@model, 'records','records', url) do %>
           <% raro_group "#{@crud_helper.title}" %>
-          <%@crud_helper.search_fields.each do |att| %>
+          <% @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]%>
+            <% raro_field att[:attribute], att[:sf] %>
           <%end%>
         <%end%>
       </div>

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

@@ -49,7 +49,7 @@
                 <% 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">
+                <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 %>

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

@@ -5,44 +5,44 @@ xmlns:x="urn:schemas-microsoft-com:office:excel"
 xmlns:ss="urn:schemas-microsoft-com:office:spreadsheet"
 xmlns:html="http://www.w3.org/TR/REC-html40">
 <Worksheet ss:Name="<%= @crud_helper.title %>">
-	<Table>
-		<Row>
-			<% @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 %>
-				<Cell><Data ss:Type="String"><%= I18n.t(att[:sf][:label]) %></Data></Cell>
-			<% end %>
-		</Row>
-		<% @records.each do |record| %>
-			<Row>
-				<% @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?%>
-									<Cell><Data ss:Type="String"><%=  record.send(att[:attribute]).strftime(att[:date_format]) %></Data></Cell>
-								<% else %>
-									<Cell><Data ss:Type="String"><%= l record.send(att[:attribute]) %></Data></Cell>
-								<% 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)%>
-							<Cell><Data ss:Type="String"><%= record.send(att[:attribute]).map{|rec| rec.to_s}.join(",") %></Data></Cell>
-						<% else %>
-							<% if record.send(att[:attribute]).to_s == "false" or record.send(att[:attribute]).to_s == "true" %>
-								<Cell><Data ss:Type="String"><%= I18n.t(record.send(att[:attribute]) ? "shared.sim" : "shared.nao") %></Data></Cell>
-							<% elsif att[:sf][:label_method].present? %>
-								<Cell><Data ss:Type="String"><%=  record.send(att[:attribute]).send(att[:sf][:label_method]).to_s %></Data></Cell>
-							<% else %>
-								<Cell><Data ss:Type="String"><%=  record.send(att[:attribute]).to_s %></Data></Cell>
-							<% end %>
-						<% end %>
-					<% else %>
-						<Cell><Data ss:Type="String"></Data></Cell>
-					<% end %>
-				<% end %>
-			</Row>
-		<% end %>
-	</Table>
+  <Table>
+    <Row>
+      <% @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 %>
+        <Cell><Data ss:Type="String"><%= I18n.t(att[:sf][:label]) %></Data></Cell>
+      <% end %>
+    </Row>
+    <% @records.each do |record| %>
+      <Row>
+        <% @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?%>
+                  <Cell><Data ss:Type="String"><%=  record.send(att[:attribute]).strftime(att[:date_format]) %></Data></Cell>
+                <% else %>
+                  <Cell><Data ss:Type="String"><%= l record.send(att[:attribute]) %></Data></Cell>
+                <% end %>
+            <% elsif array?(record, att[:attribute]) || (association?(@model, att[:attribute]) && !belongs_to_association?(@model, att[:attribute]) && !has_one_association?(@model, att[:attribute])) %>
+              <Cell><Data ss:Type="String"><%= record.send(att[:attribute]).map{|rec| rec.to_s}.join(",") %></Data></Cell>
+            <% elsif boolean?(record, att[:attribute]) %>
+              <Cell><Data ss:Type="String"><%= I18n.t(record.send(att[:attribute]) ? "shared.sim" : "shared.nao") %></Data></Cell>
+            <% elsif possui_url?(record, att[:attribute]) %>
+              <Cell><Data ss:Type="String"><%= record.send(att[:attribute]).url %></Data></Cell>
+            <% elsif att[:sf][:label_method].present? %>
+              <Cell><Data ss:Type="String"><%=  record.send(att[:attribute]).send(att[:sf][:label_method]).to_s %></Data></Cell>
+            <% else %>
+              <Cell><Data ss:Type="String"><%=  record.send(att[:attribute]).to_s %></Data></Cell>
+            <% end %>
+          <% else %>
+            <Cell><Data ss:Type="String"></Data></Cell>
+          <% end %>
+        <% end %>
+      </Row>
+    <% end %>
+  </Table>
 </Worksheet>
 </Workbook>

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

@@ -4,47 +4,80 @@
   <div class="widget-body">
     <div class="widget-main">
       <div class="profile-element">
-        <div class="header">
-          <h1>
+        <div>
+          <div class="row">
+            <% if @crud_helper.logo_printing_field.present? %>
+              <div class="col-xs-3">
+                <% if @crud_helper.logo_printing_field[:field].present? %>
+                  <%= render_field_file(@record.send(@crud_helper.logo_printing_field[:field])) %>
+                <% 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 />
             <%= @record.to_s %>
-          </h1>
+          </h2>
         </div>
       </div>
+
       <table class="table table-bordered table-striped">
         <tbody>
           <% @crud_helper.printing_fields.each do |field| %>
+            <% next if field[:sf].present? && !field[:sf][:visible_if].nil? && ((field[:sf][:visible_if].class == Proc && !field[:sf][:visible_if].call(@record)) || (field[:sf][:visible_if].class != Proc && !field[:sf][:visible_if])) %>
             <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])) %>
-                  <% next %>
-                <% end %>
-              <% end %>
               <% if field[:sf].present? && field[:sf][:label].present? %>
                 <th><%= field[:sf][:label].to_s.mb_chars.upcase.to_s %></th>
               <% else %>
                 <th><%= I18n.t("simple_form.labels.#{@model.name.underscore}.#{field[:attribute]}") %></th>
               <% end %>
 
-              <% if @model.columns_hash[field[:attribute].to_s].present? && [:date, :datetime].include?(@model.columns_hash[field[:attribute].to_s].type)%>
+              <% if @model.columns_hash[field[:attribute].to_s].present? && [:date, :datetime].include?(@model.columns_hash[field[:attribute].to_s].type) %>
                 <% if field[:date_format].present?%>
-                  <td><%= l @record.send(field[:attribute]).strftime(field[:date_format]) if @record.send(field[:attribute]).present?%></td>
+                  <td><%= l @record.send(field[:attribute]).strftime(field[:date_format]) if @record.send(field[:attribute]).present? %></td>
                 <% else %>
-                  <td><%= l @record.send(field[:attribute]) if @record.send(field[:attribute]).present?%></td>
+                  <td><%= l @record.send(field[:attribute]) if @record.send(field[:attribute]).present? %></td>
                 <% end %>
-              <% elsif @model.reflect_on_association(field[:attribute]) &&  @model.reflect_on_association(field[:attribute]).macro != :belongs_to && @model.reflect_on_association(field[:attribute]).macro != :has_one%>
+              <% elsif association?(@model, field[:attribute]) && !belongs_to_association?(@model, field[:attribute]) && !has_one_association?(@model, field[:attribute]) %>
                 <td>
                   <% @record.send(field[:attribute]).each do |rec| %>
                   <li>
                     <% if field[:sf].present? && field[:sf][:label_method].present? %>
-                      <% if rec.send(field[:sf][:label_method]).respond_to?(:url) %>
-                        <%= render_field_file(rec.send(field[:sf][:label_method])) %>
+                      <% if possui_url?(rec, field[:sf][:label_method]) %>
+                        <% if deve_renderizar_imagem?(field[:sf]) %>
+                          <%= render_field_file(rec.send(field[:sf][:label_method])) %>
+                        <% else %>
+                          <%= rec.send(field[:sf][:label_method]).url %>
+                        <% end %>
                       <% else %>
                         <%= rec.send(field[:sf][:label_method]) %>
                       <% end %>
                     <% else %>
-                      <% if rec.to_s.respond_to?(:url) %>
-                        <%= render_field_file(rec.to_s) %>
+                      <% if possui_url?(rec, :itself) && deve_renderizar_imagem?(field[:sf]) %>
+                        <%= render_field_file(rec) %>
                       <% else %>
                         <%= rec.to_s %>
                       <% end %>
@@ -52,19 +85,19 @@
                   </li>
                   <% end %>
                 </td>
-              <% elsif @record.send(field[:attribute]).class == Array %>
+              <% elsif array?(@record, field[:attribute]) %>
                 <td>
                   <% @record.send(field[:attribute]).each do |rec| %>
-                    <li>
-                      <%= rec.to_s %>
-                    </li>
+                    <li><%= rec.to_s %></li>
                   <% end %>
                 </td>
-              <% elsif @record.send(field[:attribute]).respond_to?(:url) %>
-                <td>
-                  <%= render_field_file(@record.send(field[:attribute])) %>
-                </td>
-              <% elsif ["false","true"].include? @record.send(field[:attribute]).to_s %>
+              <% elsif possui_url?(@record, field[:attribute]) %>
+                <% if deve_renderizar_imagem?(field[:sf]) %>
+                  <td><%= render_field_file(@record.send(field[:attribute])) %></td>
+                <% else %>
+                  <td><%= @record.send(field[:attribute]).url %></td>
+                <% end %>
+              <% elsif boolean?(@record, field[:attribute]) %>
                 <td><%= I18n.t(@record.send(field[:attribute]) ? "shared.sim" : "shared.nao") %></td>
               <% else %>
                 <td>

data/lib/templus_models/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: templus_models
 version: !ruby/object:Gem::Version
-  version: 3.0.7
+  version: 3.0.8
 platform: ruby
 authors:
 - Rodrigo Sol
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-27 00:00:00.000000000 Z
+date: 2017-03-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -153,7 +153,9 @@ files:
 - app/assets/javascripts/raro_crud.js
 - app/assets/javascripts/templus_models.js.coffee
 - app/controllers/crud_controller.rb
+- app/helpers/attributes_helper.rb
 - app/helpers/crud_helper.rb
+- app/helpers/imagens_helper.rb
 - app/helpers/mensagens_helper.rb
 - app/helpers/search_helper.rb
 - app/raro_crud/raro_crud.rb