carnival 0.0.55 → 0.0.56

data/app/models/carnival/field.rb.orig

@@ -0,0 +1,157 @@
+module Carnival
+  class Field
+
+    attr_accessor :size, :column, :line, :name, :params
+
+    def initialize(name, params={})
+      @params = params
+      @name = name
+      set_position_by_params
+    end
+
+    def name
+      @name.to_s
+    end
+
+    def css_class
+      if @params[:css_class]
+        return @params[:css_class]
+      else
+        return ""
+      end
+    end
+
+    def date_filter?
+      @params[:date_filter]
+    end
+
+    def default_date_filter
+      if @params[:date_filter_default]
+        @params[:date_filter_default]
+      else
+        date_filter_periods.first.first
+      end
+    end
+
+    def date_filter_periods
+      if @params[:date_filter_periods]
+        @params[:date_filter_periods]
+      else
+        {:today => ["#{Date.today}", "#{Date.today}"],
+                                  :yesterday => ["#{Date.today - 1.day}", "#{Date.today - 1.day}"],
+                                  :this_week => ["#{Date.today.beginning_of_week}", "#{Date.today.end_of_week}"],
+                                  :last_week => ["#{(Date.today - 1.week).beginning_of_week}", "#{(Date.today - 1.week).end_of_week}"],
+                                  :this_month => ["#{Date.today.beginning_of_month}", "#{Date.today.end_of_month}"],
+                                  :last_month => ["#{(Date.today - 1.month).beginning_of_month}", "#{(Date.today - 1.month).end_of_month}"],
+                                  :this_year => ["#{Date.today.beginning_of_year}", "#{Date.today.end_of_year}"],
+                                  :last_year => ["#{(Date.today - 1.year).beginning_of_year}", "#{(Date.today - 1.year).end_of_year}"]
+        }
+      end
+    end
+    def default_sortable?
+      @params[:sortable] && @params[:sortable].class == Hash && @params[:sortable][:default] == true
+    end
+
+    def default_sort_direction
+      if default_sortable?
+        if @params[:sortable][:direction]
+          return @params[:sortable][:direction]
+        end
+      end
+      return :asc
+    end
+
+    def depends_on
+      @params[:depends_on]
+    end
+
+    def nested_form?
+      @params[:nested_form]
+    end
+
+    def nested_form_allow_destroy?
+      @params[:nested_form_allow_destroy]
+    end
+
+    def nested_form_modes? (mode)
+      associate = get_associate_nested_form_mode
+      return true if associate.present? && mode == :associate
+      return @params[:nested_form_modes].include?(mode) unless @params[:nested_form_modes].nil?
+      return false
+    end
+
+    def nested_form_scope
+      return nil if !nested_form_modes? :associate
+      associate_mode =  get_associate_nested_form_mode
+      return nil if associate_mode.is_a? Symbol
+      return associate_mode[:scope] if associate_mode[:scope].present?
+    end
+
+    def sortable?
+<<<<<<< HEAD
+      return true if @params[:sortable].nil?
+      @params[:sortable]
+=======
+      return true if @params[:sortable]
+      return true if @params[:sortable].class == Hash
+      return false
+    end
+
+    def sortable_params
+      return false if !sortable?
+      return @params[:sortable].to_json if @params[:sortable].class == Hash
+      return true
+>>>>>>> master
+    end
+
+    def searchable?
+      @params[:searchable]
+    end
+
+    def advanced_searchable?
+      @params[:advanced_search]
+    end
+
+    def show_as_list
+      @params[:show_as_list]
+    end
+
+    def advanced_search_operator
+      return @params[:advanced_search][:operator] if advanced_searchable? and @params[:advanced_search][:operator].present?
+      :like
+    end
+
+    def valid_for_action?(action)
+      @params[:actions].include?(action)
+    end
+
+    def as
+      @params[:as]
+    end
+
+    def widget
+      @params[:widget].present? ? @params[:widget] : :input
+    end
+
+  private
+    def set_position_by_params
+      if @params[:position].present?
+        @line = @params[:position][:line]
+        @column =  @params[:position][:column]
+        @size = @params[:position][:size]
+      end
+    end
+
+    def get_associate_nested_form_mode
+      return nil if @params[:nested_form_modes].nil?
+      @params[:nested_form_modes].each do |mode|
+        if mode.is_a? Hash
+          return mode[:associate] if mode[:associate].present?
+        elsif mode.is_a? Symbol
+          return mode if mode == :associate
+        end
+      end
+      nil
+    end
+  end
+end

data/app/models/carnival/model_helper.rb

@@ -1,7 +1,7 @@
 module Carnival::ModelHelper
 
   def to_label
-    self.respond_to? :name ? self.name : self.to_s
+    self.respond_to?(:name) ? self.name : self.to_s
   end
 
   def self.included mod
@@ -12,10 +12,12 @@ module Carnival::ModelHelper
     def list_for_select(params = {})
       select = []
       select << ['', ''] if params[:add_empty_option]
+      query = all
+      query = query.where(params[:query]) if params[:query].present?
       if params[:reverse]
-        select.concat all.collect{|c|[c.to_label, c.id]}
+        select.concat query.collect{|c|[c.to_label, c.id]}
       else
-        select.concat all.collect{|c|[c.id, c.to_label]}
+        select.concat query.collect{|c|[c.id, c.to_label]}
       end
       select
     end
@@ -25,5 +27,19 @@ module Carnival::ModelHelper
       all.each {|object| list << [object.id, object.to_label] }
       list
     end
+
+    def get_elements_for_select(params = {})
+      return all if params[:carnival_scope].nil?
+      scopes = params[:carnival_scope][:scopes]
+      return all if scopes.empty?
+      model_object = params[:carnival_scope][:model_object]
+      conditions = {}
+      scopes.each do |scp|
+        value = model_object.send scp
+        conditions[scp] = value if !value.nil?
+      end
+      return where(conditions) if !conditions.empty?
+      []
+    end
   end
 end

data/app/presenters/carnival/base_admin_presenter.rb

@@ -13,7 +13,10 @@ module Carnival
       @base_query
     end
 
-    #New implementation starts here
+    def presenter_name
+      self.class.to_s
+    end
+
     @@actions = {}
     def self.action(name, params = {})
       @@actions[presenter_class_name] = {} if @@actions[presenter_class_name].nil?
@@ -109,6 +112,10 @@ module Carnival
       end
     end
 
+    def controller_class_name
+      @@controller.class.name
+    end
+
     def controller_name
       namespace = extract_namespace
       if namespace.present?
@@ -130,6 +137,14 @@ module Carnival
       searchable_fields
     end
 
+    def build_relation_field(field, model_object)
+      if is_relation_belongs_to?(field.name)
+        model_object.send("#{field.name}_build")
+      else
+        model_object.send(field.name).build
+      end
+    end
+
     def must_render_field?(nested_in, field, model_object)
       must_render = true
       if nested_in.present?
@@ -198,22 +213,31 @@ module Carnival
     end
 
     def relation_field?(field)
-      model_class.reflect_on_association(field)
+      model_class.reflect_on_association(field.to_sym)
     end
 
+    def is_relation_belongs_to?(field)
+      model_class.reflect_on_association(field.to_sym).macro == :belongs_to
+    end
 
     def relation_label(field, record)
       if relation_field?(field)
-        if model_class.reflect_on_association(field).macro == :belongs_to
+        if is_relation_belongs_to?(field)
           value = record.send(field.to_s)
           return value.to_label if value.present?
         else
-          return I18n.t("activerecord.attibutes.#{full_model_name}.#{field}")
+          return I18n.t("activerecord.attributes.#{full_model_name}.#{field}")
         end
       end
       return ""
     end
 
+    def relation_model(field)
+      if is_relation_belongs_to?(field)
+        model_class.reflect_on_association(field).klass.name.constantize
+      end
+    end
+
     def relation_path(field, record)
       if relation_field?(field)
         if is_namespaced? and !model_class.reflect_on_association(field).klass.name.pluralize.underscore.include?("/")
@@ -221,7 +245,7 @@ module Carnival
         else
           related_class = model_class.reflect_on_association(field).klass.name.pluralize.underscore
         end
-        if model_class.reflect_on_association(field).macro == :belongs_to
+        if is_relation_belongs_to?(field)
           id = -1
           id = record.send(model_class.reflect_on_association(field).foreign_key) if record.send(model_class.reflect_on_association(field).foreign_key).present?
           params = {:controller => related_class, :action => :show, :id => id}
@@ -250,7 +274,15 @@ module Carnival
     end
 
     def presenter_to_field field, record
-      "#{extract_namespace}::#{field.name.singularize.classify}Presenter".constantize.send("new", :controller => @@controller)
+      "#{extract_namespace}::#{field.name.singularize.classify}Presenter".constantize.send("new", :controller => controller_to_field(field))
+    end
+
+    def controller_to_field field
+      "#{extract_namespace}::#{field.name.classify.pluralize}Controller".constantize.send("new")
+    end
+
+    def load_dependent_select_options_path
+      "/#{extract_namespace.downcase}/carnival-base/load_dependent_select_options"
     end
 
     protected

data/app/view_objects/carnival/nested_form_options.rb

@@ -0,0 +1,135 @@
+module Carnival
+
+  class NestedFormOptions
+    include Rails.application.routes.url_helpers
+
+
+    def initialize(model, presenter, field, items = nil)
+      @model = model
+      @presenter = presenter
+      @field = field
+      @available_options = items
+      @model_fields_ids = []
+      populate_model_items
+      populate_available_options if items.nil?
+    end
+
+    def field
+      @field
+    end
+
+    def field_name
+      @field.name
+    end
+
+    def available_options
+      @available_options
+    end
+
+    def has_new_action?
+      @field.nested_form_modes?(:new)
+    end
+
+    def model_has_this_item? id
+      @model_fields_ids.include? id
+    end
+
+    def model_class_name_underscore
+      @model.class.name.underscore.gsub('/', '_')
+    end
+
+    def field_name_identifier
+      self.field_name.singularize.to_sym
+    end
+
+    def option_name
+      model_id = self.model_class_name_underscore
+      field_id = self.field_name_identifier
+      "#{model_id}[#{field_id}_ids][]"
+    end
+
+    def option_id item_option
+      model_id = self.model_class_name_underscore
+      field_id = self.field_name_identifier
+      "#{model_id}_#{field_id}_ids_#{item_option.id}"
+    end
+
+    def option_css_class item
+      return "carnival-form-options-hide" if !self.model_has_this_item?(item.id)
+    end
+
+    def select_tag_id
+      "carnival-options-select-#{self.field_name_identifier}"
+    end
+
+    def check_box_html
+
+    end
+
+    def select_options
+      options = []
+      options << [I18n.t('nested_form.choose_an_option'), -1]
+      @available_options.each do |item|
+        props = {}
+        id = self.option_id(item)
+        props[:id] = "#{id}_select_option"
+        props[:disabled] = self.model_has_this_item?(item.id)
+        options << [item.to_label, id, props]
+      end
+      options
+    end
+
+    def scope_html_id
+      make_html_id_for scope_column_name
+    end
+
+    def scope_column_name
+      scope = @field.nested_form_scope
+      return nil if !@model.reflections[scope]
+      fkey = @model.reflections[scope].foreign_key
+    end
+
+    def scopeJSFunction
+      url = "#{@presenter.model_path(:index)}.json"
+      function_params = {}
+      function_params[:url] = url
+      function_params[:list_scope] = true
+      function_params[:model_class_name] = @model.class.name
+      function_params[:model_id] = @model.id
+      function_params[:field_name] = @field.name
+      function_params[:scope_name] = scope_column_name
+      function_params[:scope_html_id] = scope_html_id
+      function_params[:presenter_name] = @presenter.class.name
+      function_params[:controller_name] = @presenter.controller_class_name
+      function_params[:has_new_action] = self.has_new_action?
+
+      "getNestedFormOptions(#{function_params.to_json});"
+    end
+
+    def make_html_id_for(elem)
+      first = @model.class.name.gsub(/::/, '_').
+      gsub(/([a-z\d])([A-Z])/,'\1_\2').
+      tr("-", "_").
+      downcase
+      "#{first}_#{elem}"
+    end
+
+    private
+
+    def populate_model_items
+      list = @model.send(self.field_name)
+      @model_fields_ids = list.map {|i| i.id}
+    end
+
+    def populate_available_options
+      scopes = []
+      scopes << @field.nested_form_scope if @field.nested_form_scope.present?
+      carnival_scope = {carnival_scope: {scopes: scopes, model_object: @model}}
+      field_presenter = @presenter.presenter_to_field(@field, nil)
+      model_class = field_presenter.model_class
+      @available_options = model_class.get_elements_for_select(carnival_scope)
+    end
+
+  end
+
+end

data/app/views/carnival/base_admin/edit.html.haml

@@ -1,6 +1,6 @@
 - index_path = caminho_modelo(:index)
 .gray_border.with_margin_bottom
-  %h1= t("#{@model_presenter.model_name}.editar")
+  %h1= t("#{@model_presenter.model_name}.edit", default: t('carnival.edit'))
 .action_back
   = link_to t('back'), index_path, class: 'back_link'
 = render '/carnival/shared/form/form', button: t('update'), model_object: @model, model_presenter: @model_presenter, :url => @model_presenter.model_path(:show, :id => @model.id), :action => :edit

data/app/views/carnival/base_admin/index.html.haml

@@ -23,19 +23,19 @@
   = render '/carnival/shared/scope', :params => params, presenter: presenter
   .actions
     - presenter.actions_for_page.each do |key, action|
-      = render '/carnival/shared/action_default', :label=>t("#{presenter.model_name}.#{action.name}"), :path=> action.path
+      = render '/carnival/shared/action_default', :label=>t("#{presenter.model_name}.#{action.name}", default: t("carnival.#{action.name}")), :path=> action.path
   = render '/carnival/shared/period_filter', :params => params, presenter: presenter
 
 %table{params}
   %thead
     %tr
       -presenter.fields_for_action(:index).each do |key, field|
-        %th{"data-sortable" => "#{field.sortable?}"}= t("activerecord.attributes.#{presenter.full_model_name}.#{field.name}")
+        %th{"data-sortable" => "#{field.sortable_params}"}= t("activerecord.attributes.#{presenter.full_model_name}.#{field.name}")
       %th.buttons
   %tbody
 
 .table-tools.table-download-links
-  = link_to t('download_as_csv'), "javascript:exportTable('csv');"
+  = link_to t('download_as_csv'), "javascript:exportTable('csv');"  if presenter.has_action?(:csv)
   = link_to t('download_as_pdf'), presenter.model_path(:index, {:format => 'pdf'}) if presenter.has_action?(:pdf)
 :javascript
   function exportTable(format){