carnival 0.1.9 → 0.1.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: acec3349db3511b753cc1101611499d85592eb64
-  data.tar.gz: 08d91c53a1bf630dd1e20c96f59832ce7c5f7a99
+  metadata.gz: f29cbe0fe87ebf233ac76a070a542ecbf05298ea
+  data.tar.gz: a7eeb7c0be12e445f3363e1ce163660a642540c7
 SHA512:
-  metadata.gz: 3ce76cc6bba852ae22b55e0af05e1e058e1a9edfaa2dcf0e136067008da656055ba530f0b8dceb0ce796c0f72949308671ccac53fcee2d7e10ac9145a5119f6e
-  data.tar.gz: 9d39db89803bf52864f0d3603de39013570e82b16f2fc79cf1b83256c50dc8f949bf96e29fac45f47337af0f57a95eaf7e5ef9dfd4edc7815046167b24b62363
+  metadata.gz: 08ce7f9c8c419bf2400ee7d22f90df4c4c50fd15aa7a2b3296f2671a45b81a038cffdf87f99ea42c06ebc30edc7efac0cd8bd3e0d1eac1766ff75c6759f2bf20
+  data.tar.gz: ca35ecb2687cd8262a984651412c9f8c1f691c0e68e82ae2e628c26ad70517036c28ba4c30b0dc76a0427f8d14e5708903075f469378dcafa40a89cfb5ccccc3

data/app/helpers/carnival/base_admin_helper.rb.orig

@@ -0,0 +1,250 @@
+module Carnival
+  module BaseAdminHelper
+    def set_resource_actived_if_current(path)
+      (request.fullpath == path)? 'actived' : ''
+    end
+
+    def show_messages
+      @messages = ''
+      flash.each do |type, message|
+        @messages = message
+        @type = type
+      end
+      javascript = "noty({'text':'#{@messages}',
+            'layout':'bottom','type':'#{@type}',
+            'animation': {'close':{'height':'toggle'}, 'open':{'height':'toggle'},'speed':500},'timeout':4000,
+            'closeWith':['click', 'hover']});"
+      return javascript if defined?(@type)
+      ''
+    end
+
+    def caminho_modelo(action, extra_params=nil)
+      params = {controller: controller.controller_name, action: action}
+      params = params.merge(extra_params) if extra_params.present?
+      url_for(params)
+    end
+
+    def carnival_render_if_exist partial_path
+      if partial_exist?(partial_path)
+        return render partial_path
+      end
+    end
+
+    def partial_exist? partial_path
+      File.exists?(get_partial_path(partial_path))
+    end
+
+    def has_many_relation? model, field
+      klass = Carnival::KlassService.new model.class
+      klass.is_a_has_many_relation?(field.to_sym)
+    end
+
+    def has_one_relation? model, field
+      klass = Carnival::KlassService.new model.class
+      klass.is_a_has_one_relation?(field.to_sym)
+    end
+
+    def many_to_many_relation? model, field
+      klass = Carnival::KlassService.new model.class
+      klass.is_a_many_to_many_relation?(field.to_sym)
+    end
+
+    def get_partial_path partial_path
+      path = Rails.root.join('app', 'views')
+      partial_path_array = partial_path.split('/')
+      partial_path_array.each do |pp|
+        if pp == partial_path_array.last
+          path = path.join "_#{pp}.html.haml"
+        else
+          path = path.join pp
+        end
+      end
+      path
+    end
+
+    def menu_link link
+      link.strip!
+      if link.to_s.end_with?('_path') or link.to_s.end_with?('_url')
+        return eval link
+      elsif link.index(/_path.+/) #path with arguments
+        return eval link
+      end
+
+      link
+    end
+
+    def show_view(presenter, field)
+      presenter.get_field(field).show_view
+    end
+
+    def show_as_list(presenter, field)
+      current_type = presenter.field_type(field)
+      if current_type != :relation
+        false
+      else
+        presenter.get_field(field).show_as_list
+      end
+    end
+
+<<<<<<< HEAD
+    def field_to_show(presenter, field_name, record, show_only_values=false)
+      if presenter.fields[field_name].params[:as] == :partial 
+        raw(render field_name.to_s, record: record)
+      else
+        rendered = field_value_and_type presenter, field_name, record
+        field_type = rendered[:field_type]
+        value = rendered[:value]
+
+        is_relation = presenter.relation_field?(field_name)
+=======
+    def field_to_show(presenter, field_name, record, show_only_value=false)
+      rendered = field_value_and_type presenter, field_name, record
+      field_type = rendered[:field_type]
+      value = rendered[:value]
+      
+      is_relation = presenter.relation_field?(field_name)
+>>>>>>> 43cbab7664a6b7fd7b42b86626ec2bb9953b5711
+
+        unless value.nil?
+          formatted_field = format_field(presenter, field_name, field_type, value)
+          if is_relation and !show_only_values
+            link_to(formatted_field, presenter.relation_path(field_name, record))
+          else
+            formatted_field
+          end
+        else
+          nil
+        end
+      end
+    end
+
+    def field_value_and_type presenter, field_name, record
+      renderer = FieldRenderers::RendererCreator
+        .create_field_renderer(presenter, field_name)
+
+      rendered = renderer.render_field(record)
+    end
+
+    def is_image? field_type, value
+      field_type.nil? and value.class.to_s == "Paperclip::Attachment" and value.content_type.include? "image"
+    end
+
+    def format_field(presenter, field_name, field_type, value)
+      if is_image?(field_type, value)
+        "<img class='attr' src='#{value.url(:thumb)}' alt='#{translate_field(presenter, field_name)}' />"
+      else
+        case field_type
+        when :datetime
+          begin
+            I18n.l(value, format: :long_date)
+          rescue I18n::MissingTranslationData
+            value.strftime("%d/%m/%y %H:%M:%S")
+          end
+        when :date
+          begin
+            I18n.l(value, format: :short_date)
+          rescue I18n::MissingTranslationData
+            value.strftime("%d/%m/%Y")
+          end
+        when :number
+          number_with_precision(value, :precision => 2, :separator => ",")
+        when :enum
+          presenter.model_class.const_get(field_name.upcase)[value]
+        else
+          value
+        end
+      end
+    end
+
+    def translate_field(presenter, field_name)
+      field = presenter.get_field(field_name)
+      field_key = field.name_for_translation
+      presenter.full_model_name.classify.constantize.human_attribute_name field_key
+    end
+
+    def list_cel(presenter, field, record, only_render_fields)
+      result = field_to_show(presenter, field, record, only_render_fields)
+      return result if only_render_fields
+      td = "<td class='first-td'>"
+      return "#{td}<span class='#{get_css_class(presenter, field, record)}'>#{result}</span></td>" if presenter.get_field(field).css_class.present?
+      "#{td}#{result}</td>"
+    end
+
+    def grid_attr(presenter, field, record, only_render_fields)
+      result = field_to_show(presenter, field, record, only_render_fields)
+      return result if only_render_fields
+      list_attr(presenter, field, record, only_render_fields)
+    end
+
+    def list_attr(presenter, field, record, only_render_fields)
+      result = field_to_show(presenter, field, record, only_render_fields)
+      return result if only_render_fields
+      return "<div class='attr'><div class='label #{field}'>#{translate_field(presenter, field)}:</div><div class='field_value #{field} #{get_css_class(presenter, field, record)}'>#{result}</div></div>" if presenter.get_field(field).css_class.present?
+      "<div class='attr'><div class='label #{field}'>#{translate_field(presenter, field)}:</div><div class='field_value #{field}'>#{result}</div></div>"
+    end
+
+    def get_css_class presenter, field, record
+      css_class = presenter.get_field(field).css_class
+      return '' if !css_class
+      return record.send(css_class[:method]) if css_class.is_a? Hash
+      return css_class if css_class.is_a? String
+      return ''
+    end
+
+    def list_buttons(presenter, record)
+      result = ""
+      presenter.actions_for_record.each do |key, record_action|
+        if presenter.before_action(record_action, params[:action])
+          if record_action.show(record)
+            if record_action.remote?
+              result << button_action_remote(record_action, presenter, record)
+            else
+              result << button_action(record_action, presenter, record)
+            end
+          end
+        end
+      end
+      result
+    end
+
+    def button_action(action, presenter, record)
+      label = t("#{presenter.model_name.underscore}.#{action.name}", default: t("carnival.#{action.name}"))
+      path = action.path(presenter, :id => record.id)
+      if action.default_partial == :default
+        "<a class='carnival-action-link #{label.parameterize}' href='#{path}'>#{label}</a>"
+      elsif action.default_partial == :delete
+        confirm = I18n.t("are_you_sure")
+        "<a class='carnival-action-link apagar' data-confirm='#{confirm}' data-method='delete' href='#{path}' rel='nofollow'>#{label}</a>"
+      end
+    end
+
+    def button_action_remote(action, presenter, record)
+      name = action.name
+      params = action.params
+      label =  t("#{presenter.model_name}.#{action.name}", default: t("carnival.#{action.name}"))
+      path = action.path(presenter, :id => record.id)
+
+      success_callback = "#{name}_success_callback"
+      if params[:success]
+        success_callback = params[:success]
+      end
+
+      error_callback = "#{name}_error_callback"
+      if params[:error]
+        error_callback = params[:error]
+      end
+
+      data_overlay = ''
+      if params[:show_overlay]
+        data_overlay = 'data-carnival-show-overlay=true'
+      end
+
+      params[:show_overlay] = false if params[:show_overlay].nil?
+
+      remote_function = "Carnival.remoteFunction(\"#{path}\", \"#{success_callback}\", \"#{error_callback}\", \"#{params[:method]}\", {} ,#{params[:show_overlay]})"
+
+      "<a class='carnival-action-link editar' href='javascript:#{remote_function}'>#{label}</a>"
+    end
+
+  end
+end

data/app/models/carnival/model_helper.rb

@@ -22,6 +22,12 @@ module Carnival::ModelHelper
       select
     end
 
+    def list_for_search
+      select = []
+      select << ['', '']
+      select.concat all.collect{|c|[c.to_label, c.to_label]}
+    end
+
     def list_for_checkbox
       list = []
       all.each {|object| list << [object.id, object.to_label] }

data/app/presenters/carnival/base_admin_presenter.rb

@@ -433,6 +433,61 @@ module Carnival
       end
     end
 
+<<<<<<< HEAD
+    def parse_advanced_search_field search_field, field_param, records
+      return records if not field_param["value"].present?
+      return records if field_param["value"] == ""
+
+      if relation_field?(search_field.to_sym)
+        related_model = model_class.reflect_on_association(search_field.to_sym).klass.name.underscore
+        foreign_key = model_class.reflect_on_association(search_field.to_sym).foreign_key
+        if model_class.reflect_on_association(search_field.to_sym).macro == :belongs_to
+          records = records.joins(related_model.split("/").last.to_sym)
+        else
+          records = records.joins(related_model.split("/").last.pluralize)
+        end
+        table = related_model.split("/").last.pluralize
+        column = "id"
+      else
+        table = table_name
+        column = search_field
+      end
+      full_column_query = "#{table}.#{column}"
+      where_clause = nil
+
+      case field_param["operator"]
+        when "equal"
+          if field_param["value"] == "nil"
+            where_clause = "#{full_column_query} is null"
+          else
+            where_clause = "#{full_column_query} = '#{advanced_search_field_value_for_query(field_param["value"])}'"
+          end
+        when "like"
+          where_clause = "#{full_column_query} like '%#{field_param["value"]}%'"
+        when "greater_than"
+          where_clause = "#{full_column_query} >= '#{field_param["value"]}'"
+        when "less_than"
+          where_clause = "#{full_column_query} <= '#{field_param["value"]}'"
+        when "between"
+          where_clause = "#{full_column_query} between '#{field_param["value"]}' and '#{field_param["value2"]}'"
+        else
+          where_clause = "#{full_column_query} = #{advanced_search_field_value_for_query(field_param["value"])}"
+      end
+      records = records.where(where_clause) if where_clause.present?
+      records
+    end
+
+    def advanced_search_field_value_for_query(value)
+      if "true" == value.downcase
+        return "'t'"
+      elsif "false" == value.downcase
+        return "'f'"
+      else
+        "#{value}"
+      end
+    end
+=======
+>>>>>>> master
 
     def is_namespaced?
       self.class.to_s.split("::").size > 0

data/app/services/carnival/presenters/advanced_search_parser.rb

@@ -49,7 +49,7 @@ module Carnival
               records = records.joins(related_model.split("/").last.pluralize.to_sym)
             end
             table = related_model.split("/").last.classify.constantize.table_name
-            column = "id" if column.nil? || field_param["operator"] == "equal"
+            column = "id" if column.nil?
           else
             table = @klass_service.table_name
             column = search_field

data/app/views/carnival/shared/_advanced_search.html.haml

@@ -7,7 +7,11 @@
     %li.search_item
       .search_field
         .label
-          = label_tag key, t("activerecord.attributes.#{presenter.full_model_name}.#{key}")
+          - label_field = presenter.get_field(field)
+          - if presenter.relation_field?(label_field)
+            = label_tag key, t("activerecord.attributes.#{label_field.name}")
+          - else
+            = label_tag key, t("activerecord.attributes.#{presenter.full_model_name}.#{key}")
         .field
           = render '/carnival/shared/advanced_search_field', :field => field, :presenter => presenter, :value => value
   %li.search_item

data/app/views/carnival/shared/_advanced_search_field.html.haml

@@ -2,7 +2,7 @@
 - field = presenter.get_field(field)
 - if presenter.relation_field?(field)
   - if field.advanced_search_operator == :equal
-    = select_tag "advanced_search[#{field.name}]", options_for_select(presenter.get_association(field.association_name).klass.list_for_select(reverse: true, add_empty_option: true), value), "data-operator" => 'equal'
+    = select_tag "advanced_search[#{field.name}]", options_for_select(presenter.get_association(field.association_name).klass.list_for_search, value), "data-operator" => 'equal'
   - else
     = text_field_tag "advanced_search[#{field.name}]", value, "data-operator" => field.advanced_search_operator
 - else

data/lib/carnival/version.rb

@@ -1,3 +1,3 @@
 module Carnival
-  VERSION = "0.1.9"
+  VERSION = "0.1.10"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: carnival
 version: !ruby/object:Gem::Version
-  version: 0.1.9
+  version: 0.1.10
 platform: ruby
 authors:
 - Vizir Software Studio
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-18 00:00:00.000000000 Z
+date: 2015-03-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -447,6 +447,7 @@ files:
 - app/datatable/carnival/generic_datatable/column_sorter_creator.rb
 - app/datatable/carnival/generic_datatable/relation_column_sorter.rb
 - app/helpers/carnival/base_admin_helper.rb
+- app/helpers/carnival/base_admin_helper.rb.orig
 - app/helpers/carnival/field_renderers/field_renderer.rb
 - app/helpers/carnival/field_renderers/many_relation_renderer.rb
 - app/helpers/carnival/field_renderers/renderer_creator.rb
@@ -588,7 +589,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Carnival is an easy-to-use and extensible Rails Engine to speed the development