carnival 0.0.55 → 0.0.56

data/app/assets/javascripts/carnival/vizir_admin.js

@@ -25,36 +25,6 @@ function openPopUp(url){
   $.colorbox({href:url, opacity:0.5, width:"90%"});
 }
 
-function notyError(msg){
-  noty({
-    'text': msg,
-    'layout': 'bottom',
-    'type': 'error',
-    'animateOpen': {'height': 'toggle'},
-    'animateClose': {'height': 'toggle'},
-    'speed': 500,
-    'timeout': 5000,
-    'closeButton': false,
-    'closeOnSelfClick': true,
-    'closeOnSelfOver': true
-  });
-}
-
-function notySuccess(msg){
-  noty({
-    'text': msg,
-    'layout': 'bottom',
-    'type': 'success',
-    'animateOpen': {'height': 'toggle'},
-    'animateClose': {'height': 'toggle'},
-    'speed': 500,
-    'timeout': 5000,
-    'closeButton': false,
-    'closeOnSelfClick': true,
-    'closeOnSelfOver': true
-  });
-}
-
 function markActive(){
   $('.dropdown_main_menu_sublevel a.actived').closest('.dropdown_main_menu_sublevel').show();
 }

data/app/assets/stylesheets/carnival/admin.css

@@ -3,7 +3,6 @@
  *= require carnival/vizir-grid.css
  *= require carnival/datatable.css
  *= require carnival/jquery.noty.css
- *= require carnival/noty_theme_default.css
  *= require carnival/chosen.css
  *= require carnival/colorbox.css
  *= require carnival/formframe.css

data/app/assets/stylesheets/carnival/jquery.noty.css

@@ -1,104 +1,17 @@
-/* CORE STYLES */
-
-  /* noty bar */
-  .noty_bar {
-    position: fixed;
-    display: none;
-    z-index: 9999999;
-  }
-
-  /* noty_message */
-  .noty_bar .noty_message {
-    text-align: center;
-  }
-
-  /* noty close button */
-  .noty_bar .noty_close {
-    cursor: pointer;
-  }
-
-  /* noty modal */
-  .noty_modal {
-    position: fixed;
-    width: 100%;
-    height: 100%;
-    background-color: #000;
-    z-index: 10000;
-    opacity: 0.6;
-    display: none;
-    left: 0;
-    top: 0;
-  }
-
-  /* noty container for noty_layout_topLeft & noty_layout_topRight */
-  ul.noty_cont {
-    position: fixed;
-    z-index: 10000000;
-    margin: 0px;
-    padding: 0px;
-    list-style: none;
-    width: 300px;
-  }
-  ul.noty_cont li {
-    position: relative;
-    float: left;
-    clear: both;
-    list-style: none;
-    padding: 0px;
-    margin: 10px 0 0 0;
-    width: 300px; /* Fix for: http://bugs.jquery.com/ticket/2278 */
-  }
-  ul.noty_cont.noty_layout_topLeft {left:20px; top:20px;}
-  ul.noty_cont.noty_layout_topRight {right:40px; top:20px;}
-  ul.noty_cont.noty_layout_bottomLeft {left:20px; bottom:20px}
-  ul.noty_cont.noty_layout_bottomRight {right:40px; bottom:20px}
-  ul.noty_cont.noty_layout_topRight li {float:right}
-
-/* LAYOUTS */
-
-  /* noty_layout_top */
-  .noty_bar.noty_layout_top {
-    top: 0;
-    left: 0;
-    width: 100%;
-    -webkit-border-radius: 0px;
-    -moz-border-radius: 0px;
-    border-radius: 0px;
-  }
-
-  /* noty_layout_bottom */
-  .noty_bar.noty_layout_bottom {
-    bottom: 0;
-    left: 0;
-    width: 100%;
-    -webkit-border-radius: 0px;
-    -moz-border-radius: 0px;
-    border-radius: 0px;
-  }
-
-  /* noty_layout_center */
-  .noty_bar.noty_layout_center {
-    top: 40%;
-  }
-
-  /* noty_layout_topLeft & noty_layout_topRight */
-  .noty_bar.noty_layout_topLeft,
-  .noty_bar.noty_layout_topRight,
-  .noty_bar.noty_layout_bottomLeft,
-  .noty_bar.noty_layout_bottomRight {
-    width: 100%;
-    clear: both;
-    position: relative;
-  }
-
-  .noty_bar.noty_layout_topLeft .noty_message,
-  .noty_bar.noty_layout_topRight .noty_message,
-  .noty_bar.noty_layout_bottomLeft .noty_message,
-  .noty_bar.noty_layout_bottomRight .noty_message {
-    text-align: left;
-  }
-
-  /* noty_layout_topCenter */
-  .noty_bar.noty_layout_topCenter {
-    top: 20px;
-  }
+ul#noty_bottom_layout_container{
+  left:0 !important;
+  width:100% !important;
+}
+
+ul#noty_bottom_layout_container li{
+  border-radius: 0px !important;
+  background-image: none !important;
+  height: 60px !important;
+  color:#FFFFFF !important;
+  padding-top: 20px !important;
+}
+
+ul#noty_bottom_layout_container li .noty_text{
+  font-size: 26px !important;
+  text-shadow: 1px 1px #000;
+}

data/app/assets/stylesheets/carnival/main.css

@@ -2310,10 +2310,10 @@ table input{
 }
 
 .nested-form-list-item{
-  border-bottom: 1px solid #ccc;
+  border: 1px solid #ccc;
   float: left;
   margin-bottom: 10px;
-  padding-bottom: 10px;
+  padding: 10px;
   width: 95%;
 }
 .nested-form-list-item-actions{
@@ -2328,4 +2328,32 @@ table input{
 
 .existing-options span{
   float: left;
-}
+}
+
+.carnival-form-options-hide{
+  display: none
+}
+
+.carnival-select-options{
+  width: 100%;
+  margin-left: 20px;
+  position: relative;
+  float: left;
+}
+
+.carnival-select-tag{
+  width: 50%;
+  float: left;
+  position: relative;
+  margin-right: 10px;
+}
+
+.carnival-select-action{
+  width: 50%;
+  float: left;
+  position: relative;
+}
+.carnival-form-options{
+  margin-left: 20px;
+  float: left;
+}

data/app/controllers/carnival/base_admin_controller.rb

@@ -20,16 +20,20 @@ module Carnival
 
       respond_to do |format|
         format.html do |render|
-          render 'index'
+          render 'index' and return
         end
         format.json do |render|
-          render(json: @datatable)
+          if params[:list_scope]
+            render(json: @datatable.as_list) and return
+          else
+            render(json: @datatable) and return
+          end
         end
         format.csv do
-          render text: @datatable.as_csv.encode("utf-16le")
+          render text: @datatable.as_csv.encode("utf-16le") and return
         end
         format.pdf do
-          render :pdf => t("#{@datatable.model.to_s.underscore}.lista") , :template => 'carnival/index.pdf.haml',  :show_as_html => params[:debug].present?
+          render :pdf => t("#{@datatable.model.to_s.underscore}.lista") , :template => 'carnival/index.pdf.haml',  :show_as_html => params[:debug].present? and return
         end
       end
     end
@@ -90,6 +94,13 @@ module Carnival
       render 'layouts/shared/render_popup' and return
     end
 
+    def load_dependent_select_options
+      presenter = params[:presenter].constantize.send(:new, :controller => self)
+      model = presenter.relation_model(params[:field].gsub("_id", "").to_sym)
+      @options = model.list_for_select(add_empty_option: true, query: ["#{params[:dependency_field]} = ?", params[:dependency_value]])
+      render layout: nil
+    end
+
     private
 
     def instantiate_model(presenter)

data/app/datatable/carnival/generic_datatable.rb

@@ -49,6 +49,27 @@ module Carnival
       fetch_records
     end
 
+    def as_list(options = {})
+      items = []
+      model_object = params[:model_class_name].classify.constantize.send(:new)
+      if !params[:model_id].empty?
+        model_object = params[:model_class_name].classify.constantize.send(:find, params[:model_id])
+      end
+      if params[:carnival_list_scope]
+        items = @model.where(params[:carnival_list_scope])
+      else
+        items = @model.all
+      end
+
+      just_class_name = params[:model_class_name].demodulize.classify.underscore
+      controller = params[:controller_name].constantize.new
+      model_presenter = params[:presenter_name].constantize.new controller: controller
+      field = model_presenter.fields[params[:field_name].to_sym]
+      opt = Carnival::NestedFormOptions.new model_object, model_presenter, field, items
+      html = render_to_string :partial => 'carnival/shared/form/nested_form_options.html.haml', :locals => { opt_obj: opt }
+      return :template => html.to_s, :items => items
+    end
+
     def filters
       @filters
     end
@@ -165,17 +186,8 @@ module Carnival
     end
 
     def sort_direction
-      sort_dir = @presenter.default_sort_direction
-      if params[:sSortDir_0].present?
-        sort_dir = params[:sSortDir_0]
-        sort_dir == "desc" ? "desc" : "asc"
-      end
-
-      if sort_dir == 'desc'
-        return 'desc'
-      else
-        return 'asc'
-      end
+      return 'desc' if params[:sSortDir_0] == 'desc'
+      'asc'
     end
   end
 end

data/app/helpers/carnival/base_admin_helper.rb

@@ -11,9 +11,9 @@ module Carnival
         @type = type
       end
       javascript = "noty({'text':'#{@messages}',
-            'layout':'bottom','type':'#{@type}','animateOpen':{'height':'toggle'},
-            'animateClose':{'height':'toggle'},'speed':500,'timeout':4000,
-            'closeButton':false,'closeOnSelfClick':true,'closeOnSelfOver':true});"
+            'layout':'bottom','type':'#{@type}',
+            'animation': {'close':{'height':'toggle'}, 'open':{'height':'toggle'},'speed':500},'timeout':4000,
+            'closeWith':['click', 'hover']});"
       return javascript if defined?(@type)
       ''
     end
@@ -55,6 +55,23 @@ module Carnival
       :other
     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_as_list(presenter, field)
+      current_type = field_type(presenter,field)
+      return false if current_type != :relation
+      return presenter.fields[field.to_sym].show_as_list
+    end
+
     def field_to_show(presenter, field, record, show_only_value=false)
       current_type = field_type(presenter,field)
       if current_type == :relation

data/app/inputs/admin_enum_input.rb

@@ -1,12 +1,14 @@
 class AdminEnumInput < SimpleForm::Inputs::CollectionSelectInput
   def input
     super
+    input_html_options[:class] << ' chosen'
+
     @builder.collection_select(
       attribute_name, @builder.object.class.const_get(attribute_name.to_s.upcase),
       :first, :last,
-      prompt: I18n.t("#{@builder.object.class.to_s.gsub(/^.*::/, '').downcase}.lista_#{attribute_name}.selecione",
-                default: I18n.t("messages.select")),
-      input_html: {:class=> 'chosen'}
+      {prompt: I18n.t("#{@builder.object.class.to_s.gsub(/^.*::/, '').downcase}.lista_#{attribute_name}.selecione",
+                default: I18n.t("messages.select"))},
+      input_html_options
     )
   end
 end

data/app/inputs/admin_relationship_select_input.rb

@@ -1,13 +1,25 @@
 class AdminRelationshipSelectInput < SimpleForm::Inputs::CollectionSelectInput
   def input
     super
+    input_html_options[:class] << ' chosen'
+    if input_html_options[:data][:depends_on].nil?
+      collection = @builder.object.class.name.constantize.reflect_on_association(attribute_name.to_sym).klass.name.constantize.list_for_select
+    else
+      depends_on =  @builder.object.class.name.constantize.reflect_on_association(input_html_options[:data][:depends_on]).foreign_key
+      depends_on_value = @builder.object.send(depends_on.to_s)
+      if depends_on_value.present?
+        collection = @builder.object.class.name.constantize.reflect_on_association(attribute_name.to_sym).klass.name.constantize.list_for_select(add_empty_option: true, query: ["#{depends_on} = ?", depends_on_value])
+      else
+        collection = []
+      end
+    end
+
     @builder.collection_select(
-      "#{attribute_name}_id",
-      @builder.object.class.name.constantize.reflect_on_association(attribute_name.to_sym).klass.name.constantize.list_for_select,
+      "#{@builder.object.class.name.constantize.reflections[attribute_name.to_sym].foreign_key}",
+      collection,
       :first, :last,
-      prompt: I18n.t("#{@builder.object.class.to_s.gsub(/^.*::/, '').downcase}.lista_#{attribute_name}.selecione",
-                default: I18n.t("messages.select")),
-      input_html: {:class=> 'chosen'}
+      {prompt: I18n.t("#{@builder.object.class.to_s.gsub(/^.*::/, '').downcase}.lista_#{attribute_name}.selecione", default: I18n.t("messages.select"))},
+      input_html_options
     )
   end
 end

data/app/models/carnival/admin_user.rb

@@ -1,6 +1,7 @@
 module Carnival
 
-  class AdminUser < ActiveRecord::Base
+  class AdminUser < Carnival::Config.ar_admin_user_class
+
     include Carnival::ModelHelper
     devise_flags = *Carnival::Config.devise_config
     devise_flags << :recoverable

data/app/models/carnival/field.rb

@@ -61,6 +61,10 @@ module Carnival
       return :asc
     end
 
+    def depends_on
+      @params[:depends_on]
+    end
+
     def nested_form?
       @params[:nested_form]
     end
@@ -70,12 +74,29 @@ module Carnival
     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?
-      @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
     end
 
     def searchable?
@@ -86,6 +107,10 @@ module Carnival
       @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
@@ -111,5 +136,16 @@ module Carnival
         @size = @params[:position][:size]
       end
     end
+
+    def get_associate_nested_form_mode
+      @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