drg_cms 0.5.52.16 → 0.6.1.0

data/app/models/drgcms_form_fields/hidden_field.rb

@@ -42,7 +42,7 @@ class HiddenField < DrgcmsField
 ###########################################################################
 def render 
   set_initial_value
-  value = @yaml['html']['value'] ? @yaml['html']['value'] : @record[@yaml['name']]
+  value = @yaml['html']['value'] ? @yaml['html']['value'] : @record.send(@yaml['name'])
   record = record_text_for(@yaml['name'])  
   @parent.hidden_field(record, @yaml['name'], value: value)
 end

data/app/models/drgcms_form_fields/html_field.rb

@@ -49,7 +49,7 @@ class HtmlField < DrgcmsField
 # Render html_field field html code
 ###########################################################################
 def render
-  return ro_standard if @readonly  
+  #return ro_standard if @readonly  
 # retrieve html editor from page settings
   editor_string = @parent.dc_get_site.params['html_editor'] if @parent.dc_get_site
   editor_string ||= 'ckeditor'

data/app/models/drgcms_form_fields/link_to.rb

@@ -53,13 +53,13 @@ def render
   @yaml['html'] ||= {}
   @yaml['html']['class'] ||= 'dc-link dc-animate'
   @yaml['html'].symbolize_keys!
-#
+
   @yaml[:id] = record._id if @yaml[:id] == 'id'
   url = @yaml['url'] || "#{@yaml[:controller]}/#{@yaml[:action]}/#{@yaml[:id]}"
   url.gsub!('//','/')                             # no action and id
   url = '/' + @yaml['url'] unless url[0,1] == '/' # no leading /
   url.chop if url[0,-1] == '/'                    # remove trailing /
-#
+
   caption = @yaml['caption'] || @yaml['text']
   @html << @parent.dc_link_to(caption, @yaml['icon'], url, @yaml['html'])
   self

data/app/models/drgcms_form_fields/method.rb

@@ -0,0 +1,66 @@
+#--
+# Copyright (c) 2012+ Damjan Rems
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+#++
+module DrgcmsFormFields
+
+###########################################################################
+# Implementation of custom DRG CMS form field. Method field will call method or class method
+# defined in eval option and add returned code to HTML output code.
+#
+# It can be used in case when form contains complex data structure. For example set of pictures which can not
+# be simply displayed by any other DRG Forms field.
+#   
+# Form example:
+#    50:
+#      name: galery
+#      type: method
+#      eval: show_gallery
+#      or
+#      eval: MyClass.show_gallery
+#      
+###########################################################################
+class Method < DrgcmsField
+
+###########################################################################
+# Render file_select field html code
+###########################################################################
+def render
+  # might be defined as my_method or MyClass.my_method
+  clas, method = @yaml['eval'].split(/\.|\,/).map(&:strip)
+  if method.nil?
+    if @parent.respond_to?(clas)
+      @html << @parent.send(clas, @record, @yaml, @readonly) 
+      return self
+    end
+  else
+    klass = clas.camelize.constantize
+    if klass.respond_to?(method)
+      @html << klass.send(method, @record, @yaml, @readonly) 
+      return self
+    end
+  end   
+  @html << "Error: #{@yaml['name']} : #{@yaml['eval']} not defined!"
+  self
+end
+
+end
+end

data/app/models/drgcms_form_fields/multitext_autocomplete.rb

@@ -23,7 +23,7 @@
 module DrgcmsFormFields
 
 ###########################################################################
-# Implementation of multitext_autocomplete DRG CMS form field.
+# Implementation of multitext_autocomplete DRG Form field.
 # 
 # multitext_autocomplete field is complex data entry field which uses autocomplete
 # function when selecting multiple values for MongoDB Array field. Array typically holds
@@ -33,20 +33,21 @@ module DrgcmsFormFields
 # ===Form options:
 # * +name:+ field name (required)
 # * +type:+ multitext_autocomplete (required)
-# * +table+ Collection (table) name. When defined search must contain field name
+# * +table+ Model (table) name which must contain searched field name.
 # * +search:+ Search may consist of three parameters from which are separated either by dot (.) or comma(,)
 #   * search_field_name; when table option is defined search must define field name which will be used for search query
 #   * collection_name.search_field_name; Same as above except that table options must be ommited.
 #   * collection_name.search_field_name.method_name; When searching is more complex custom search
 #   method may be defined in CollectionName model which will provide result set for search.
+# * +with_new+ Will add an icon for shortcut to add new document to collection
 #      
 # Form example:
 #      90:
 #        name: kats
 #        type: multitext_autocomplete
 #        search: dc_category.name      
-#        html:
-#          size: 30
+#        with_new: model_name
+#        size: 30
 ###########################################################################
 class MultitextAutocomplete < DrgcmsField
 
@@ -76,7 +77,7 @@ def render
     method   = @yaml['search']['method']
     search = method.nil? ? field_name : "#{field_name}.#{method}"
   elsif @yaml['search'].to_s.match(/\./)
-    table, field_name, method = @yaml['search'].split(/\.|\,/) 
+    table, field_name, method = @yaml['search'].split(/\.|\,/).map(&:strip)
     search = method.nil? ? field_name : "#{field_name}.#{method}"
   else # search and table name are separated
     search = field_name = @yaml['search']
@@ -89,7 +90,7 @@ def render
     elsif @yaml['table']['eval']
       eval @yaml['table']['eval']
     else
-      p "Field #{@yaml['name']}: Invalid table parameter!"
+      @parent.logger.error "Field #{@yaml['name']}: Invalid table parameter!"
       nil
     end
   end
@@ -97,15 +98,14 @@ def render
     @html << 'Table or search field not defined!' 
     return self
   end
-# 
-  return ro_standard(table, search) if @readonly
-# TODO check if table exists    
+  # 
+  # TODO check if table exists    
   collection = table.classify.constantize
   unless @record.respond_to?(@yaml['name'])
     @html << "Invalid field name: #{@yaml['name']}" 
     return self
   end
-# put field to enter search data on form
+  # put field to enter search data on form
   @yaml['html'] ||= {}
   @yaml['html']['value'] = ''   # must be. Otherwise it will look into record and return error
   @yaml['html']['placeholder'] = t('drgcms.search_placeholder')
@@ -113,10 +113,18 @@ def render
   @html << '<div class="ui-autocomplete-border">'
   @html << @parent.link_to(@parent.fa_icon('plus-square lg', class: 'dc-animate dc-green'), '#',onclick: 'return false;') # dummy add. But it is usefull.
 
-  record = record_text_for(@yaml['name'])    
-  @html << ' ' << @parent.text_field(record, _name, @yaml['html'])                 # text field for autocomplete
-  @html << "<div id =\"#{record}#{@yaml['name']}\">"        # div to list active records
-# find value for each field inside categories 
+  record = record_text_for(@yaml['name'])
+  # text field for autocomplete
+  @html << '<span class="dc-text-autocomplete">' << @parent.text_field(record, _name, @yaml['html']) << '<span></span></span>'
+  # direct link for adding new documents to collection
+  if @yaml['with_new'] and !@readonly
+    @html << ' ' + 
+             @parent.fa_icon('plus-square lg', class: 'in-edit-add', title: t('drgcms.new'), 
+             style: "vertical-align: top;", 'data-table' => @yaml['with_new'] )    
+  end
+  # div to list active selections
+  @html << "<div id =\"#{record}#{@yaml['name']}\">"
+  # find value for each field inside categories 
   unless @record[@yaml['name']].nil?
     @record[@yaml['name']].each do |element|
 # this is quick and dirty trick. We have model dc_big_table which can be used for retrive 
@@ -131,6 +139,7 @@ def render
       @html << if rec
         link  = @parent.link_to(@parent.fa_icon('remove lg', class: 'dc-animate dc-red'), '#',
                 onclick: "$('##{rec.id}').hide(); var v = $('##{record}_#{@yaml['name']}_#{rec.id}'); v.val(\"-\" + v.val());return false;")
+        link  = @parent.fa_icon('check lg', class: 'dc-green') if @readonly      
         field = @parent.hidden_field(record, "#{@yaml['name']}_#{rec.id}", value: element)
         "<div id=\"#{rec.id}\" style=\"padding:4px;\">#{link} #{rec.send(field_name)}<br>#{field}</div>"
       else

data/app/models/drgcms_form_fields/number_field.rb

@@ -52,22 +52,31 @@ class NumberField < DrgcmsField
 # Render text_field field html code
 ###########################################################################
 def render
-  return ro_standard if @readonly
+  #return ro_standard if @readonly
   set_initial_value
 #
   record = record_text_for(@yaml['name'])
   @yaml['html'] ||= {}
   @yaml['html']['class'] = 'dc-number'
+  if @yaml['format'].class == String
+    format = @yaml['format']
+    @yaml['format'] = {}
+    @yaml['format']['decimal']   = format[1].blank? ? 2 : format[1].to_i
+    @yaml['format']['separator'] = format[2].blank? ? I18n.t('number.currency.format.separator') : format[2]
+    @yaml['format']['delimiter'] = format[3].blank? ? I18n.t('number.currency.format.delimiter') : format[3]
+  end
   @yaml['html']['data-decimal']   = @yaml.dig('format','decimal') || 2
   @yaml['html']['data-delimiter'] = @yaml.dig('format','delimiter') || I18n.t('number.currency.format.delimiter')
   @yaml['html']['data-separator'] = @yaml.dig('format','separator') || I18n.t('number.currency.format.separator')
  # @yaml['html']['data-currency']  = @yaml.dig('format','currency') == 'yes' ? I18n.t('number.currency.format.currency') : @yaml.dig('format','currency')
   value = @record[@yaml['name']] || 0 
-    
-  @html << @parent.hidden_field( record, @yaml['name'], value: value )
-  
   @yaml['html']['value'] = @parent.dc_format_number(value, @yaml['html']['data-decimal'], @yaml['html']['data-separator'], @yaml['html']['data-delimiter'] )
-  @html << @parent.text_field( nil,"record_#{@yaml['name']}1", @yaml['html']) 
+  
+  return ro_standard(@yaml['html']['value']) if @readonly
+
+  @yaml['html']['autocomplete'] ||= 'off'
+  @html << @parent.hidden_field( record, @yaml['name'], value: value )
+  @html << @parent.text_field( nil,"record_#{@yaml['name']}_", @yaml['html']) 
   self
 end
 
@@ -76,7 +85,7 @@ end
 ###########################################################################
 def self.get_data(params, name)
   return 0 if params['record'][name].blank?
-  params['record'][name].match('.') ? BigDecimal.new(params['record'][name]) : Integer.new(params['record'][name])
+  params['record'][name].match('.') ? params['record'][name].to_f : Integer.new(params['record'][name])
 end
 
 end

data/app/models/drgcms_form_fields/radio.rb

@@ -0,0 +1,96 @@
+#--
+# Copyright (c) 2012+ Damjan Rems
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+#++
+module DrgcmsFormFields
+
+###########################################################################
+# Implementation of radio DRG CMS form field. Field provides radio button input
+# structure.
+# Form options are mostly same as in select field. 
+# 
+# ===Form options:
+# * +name:+ field name (required)
+# * +type:+ radio (required)
+# * +choices:+ Values for choices separated by comma. Values can also be specified like description:value.
+# In this case description will be shown to user, but value will be saved to document.
+#   choices: 'OK:0,Ready:1,Error:2'
+#   choices: Ruby,Pyton,PHP
+# * +eval:+ Choices will be provided by evaluating expression
+#   eval: dc_choices4('model_name','description_field_name','_id'); dc_choices4 helper will provide data for select field. 
+#   eval: ModelName.choices4_field; ModelName class will define method choices4_field which 
+#   will provide data for select field. Since expression is evaluated in the context of Form Field object
+# Even session session variables can be accessed. 
+#   eval: 'MyClass.method(@parent.session[:user_id])'
+# When searching is more complex custom search method may be defined in CollectionName 
+# model which will provide result set for search.
+#   eval: collection_name.search_field_name.method_name; 
+# If choices or eval is not defined choices will be provided from translation helpers. For example: 
+# Collection has field status. Choices for field will be provided by en.helpers.model_name.choices4_status 
+# entry of english translation. English is of course default translation. If you provide translations in
+# your local language then select choices will be localized.
+#   en.helpers.model_name.choices4_status: 'OK:0,Ready:1,Error:2'
+#   sl.helpers.model_name.choices4_status: 'V redu:0,Pripravljen:1,Napaka:2'
+# * +inline:+ Radio buttons will be presented inline instead of stacked on each other.
+# 
+# Form example:
+#    10:
+#      name: hifi
+#      type: radio
+#      choices: 'Marantz:1,Sony:2,Bose:3,Pioneer:4'
+#      inline: true
+###########################################################################
+class Radio < Select
+
+###########################################################################
+# Render radio DRG Form field
+###########################################################################
+def render
+  set_initial_value('html','value')
+  
+  record = record_text_for(@yaml['name'])
+  @yaml['html'].symbolize_keys!
+  clas = 'dc-radio' + ( @yaml['inline'] ? ' dc-inline' : '')
+  @html << "<div class=\"#{clas}\">"
+  choices = get_choices
+  # When error and boolean field
+  #if choices.size == 1 and (@record[@yaml['name']].class == TrueClass or @record[@yaml['name']].class == FalseClass)
+  #  choices = [[I18n.t('drgcms.true'), true], [I18n.t('drgcms.false'), false]]
+  #end
+  # Should select first button if no value provided
+  value = if @record.nil? || @record[@yaml['name']].blank?
+    choices.first.class == String ? choices.first :  choices.first.last
+  else
+    @record[@yaml['name']]
+  end
+  choices.each do |choice|
+    choice = [choice, choice] if choice.class == String
+    @html << "<div>"
+    @html << @parent.radio_button_tag("#{record}[#{@yaml['name']}]",choice.last, choice.last.to_s == value.to_s)
+    @html << choice.first
+    @html << "</div>"
+  end
+  @html << "</div>\n"
+  self
+end
+
+end
+end

data/app/models/drgcms_form_fields/readonly.rb

@@ -66,10 +66,10 @@ def render
       
 #      @parent.dc_name4_id(a[1], a[2], @record[ @yaml['name'] ])
     else
-      eval( "#{@yaml['eval']} '#{@record[ @yaml['name'] ]}'") 
+      eval( "#{@yaml['eval']} '#{@record.send(@yaml['name'])}'") 
     end
   else
-    @parent.dc_format_value(@record[@yaml['name']],@yaml['format'])    
+    @parent.dc_format_value(@record.send(@yaml['name']),@yaml['format'])    
   end  
   @html << '</div>'
   self

data/app/models/drgcms_form_fields/select.rb

@@ -44,6 +44,8 @@ module DrgcmsFormFields
 #   your local language then select choices will be localized.
 #    en.helpers.model_name.choices4_status: 'OK:0,Ready:1,Error:2'
 #    sl.helpers.model_name.choices4_status: 'V redu:0,Pripravljen:1,Napaka:2'
+# * +depend:+ Select options may depend on a value in some other field. If depend option is specified
+#   then chices must be provided by class method and defined in eval option.
 # * +html:+ html options which apply to select field (optional)
 #      
 # Form example:
@@ -56,53 +58,107 @@ module DrgcmsFormFields
 #      eval: DcCategory.values_for_parent
 #      html:
 #        include_blank: true      
+#    50:
+#      name: company
+#      type: select
+#      choices: Audi,BMW,Mercedes
+#        or
+#      choices: helpers.label.model.choices4_field
+#    60:
+#      name: type
+#      type: select
+#      eval: Cars.choices4_type
+#      depend: company
 ###########################################################################
 class Select < DrgcmsField
   
 ###########################################################################
-# Return values, when choices options will be returned by evaluating expression
+# Choices are defined in helper as:
+# helper.label.table_name.choices_for_fieldname or
+# choices4_tablename_fieldname
+###########################################################################
+def choices_in_helper(helper = nil)
+  helper ||= "helpers.label.#{@form['table']}.choices4_#{@yaml['name']}"
+  c = t(helper)
+  if c.match( 'translation missing' )
+    helper = "choices_for_#{@form['table']}_#{@yaml['name']}"
+    return "Error. #{helper} not defined" if c.match( 'translation missing' )
+  end
+  c
+end
+
 ###########################################################################
-def do_eval(e)
+# Choices are defined by evaluating an expression. This is most common class
+# method defined in a class. eg. SomeClass.get_choices4
+###########################################################################
+def choices_in_eval(e)
   e.strip!
-  method = e.split(/\ |\(/).first
-  return eval(e) if respond_to?(method) # id method defined here
-  return eval('@parent.'+e) if @parent.respond_to?(method) # is method defined in helpers
-# eval whatever it is
-  eval e
+  if @yaml['depend'].nil?
+    method = e.split(/\ |\(/).first
+    return eval(e) if respond_to?(method) # id method defined here
+    return eval('@parent.'+e) if @parent.respond_to?(method) # is method defined in helpers
+    # eval whatever it is there
+    eval e
+  else
+    # add event listener to depend field
+    @js << %(
+$(document).ready(function() {
+  $('#record_#{@yaml['depend']}').change( function(e) { update_select_depend('record_#{@yaml['name']}', 'record_#{@yaml['depend']}','#{e}');});
+  $('#_record_#{@yaml['depend']}').change( function(e) { update_select_depend('record_#{@yaml['name']}', '_record_#{@yaml['depend']}','#{e}');});
+});
+)
+    # depend field might be virtual field. It's value should be set in params
+    depend_value = @yaml['depend'][0] == '_' ? @parent.params["p_#{@yaml['depend']}"] : @record[@yaml['depend']]
+
+    e << " '#{depend_value}'"
+    eval e
+  end
 end
-  
+
 ###########################################################################
 # Create choices array for select field.
 ###########################################################################
 def get_choices
   begin
     choices = case 
-    when @yaml['choices'] then 
-      (@yaml['choices'].match('helpers.') ) ? t(@yaml['choices']) : @yaml['choices']
-    when @yaml['eval']    then
-      do_eval(@yaml['eval'])
-    else 
-      c = t('helpers.label.' + @form['table'] + '.choices4_' + @yaml['name'] )
-      c = 'Error' if c.match( 'translation missing' )
-      c
-    end
+              when @yaml['choices'] then
+                @yaml['choices'].match('helpers.') ? choices_in_helper(@yaml['choices']) : @yaml['choices']
+              when @yaml['eval'] then
+                choices_in_eval(@yaml['eval'])
+              else
+                choices_in_helper()
+              end
   # Convert string to Array
     choices.class == String ?
-      choices.chomp.split(',').inject([]) {|r,v| r << (v.match(':') ? v.split(':') : v )} :
+      choices.chomp.split(',').inject([]) { |r,v| r << (v.match(':') ? v.split(':') : v ) } :
       choices
   rescue Exception => e 
-    Rails.logger.debug "Error in select eval. #{e.message}\n"
+    Rails.logger.debug "\nError in select eval. #{e.message}\n"
+    Rails.logger.debug(e.backtrace.join($/)) if Rails.env.development?
     ['error'] # return empty array when error occures
   end
 end
 
+###########################################################################
+# Will add code to view more data about selected option in a window
+###########################################################################
+def add_view_code
+  return '' if (data = @record.send(@yaml['name'])).blank?
+
+  ar = @yaml['view'].split(/\ |\,/).delete_if {|e| e.blank?}
+  table, form_name = *ar
+  url  = @parent.url_for(controller: :cmsedit, id: data, action: :edit, table: table, form_name: form_name, readonly: true, window_close: 1 )
+  icon = @parent.fa_icon('eye')
+  %(<span class="dc-window-open" data-url="#{url}">#{icon}</span>)
+end
+
 ###########################################################################
 # Return value when readonly is required
 ###########################################################################
 def ro_standard
-  value = @record.respond_to?(@yaml['name']) ? @record[@yaml['name']] : nil
-  return self if value.nil?
-# 
+  value = @record.respond_to?(@yaml['name']) ? @record.send(@yaml['name']) : nil
+  return self if value.blank?
+
   choices = get_choices()
   if value.class == Array   # multiple choices
     html = ''
@@ -132,15 +188,22 @@ end
 ###########################################################################
 def render
   return ro_standard if @readonly
+
   set_initial_value('html','selected')
-#
+  # separate options and html part
+  html_part = {}
   @yaml['html'].symbolize_keys!
+  %i(class id style required).each { |sym| html_part[sym] = @yaml['html'].delete(sym) if html_part[sym]}
+  html_part[:multiple] = true if @yaml['multiple']
+
   record = record_text_for(@yaml['name'])
-  if @yaml['multiple']  
-    @html << @parent.select(record, @yaml['name'], get_choices, @yaml['html'], {multiple: true})
+  if html_part[:multiple]
+    @html << @parent.select(record, @yaml['name'], get_choices, @yaml['html'], html_part)
     @js   << "$('##{record}_#{@yaml['name']}').selectMultiple();"
   else
-    @html << @parent.select(record, @yaml['name'], get_choices, @yaml['html'])
+    @html << @parent.select(record, @yaml['name'], get_choices, @yaml['html'], html_part)
+    # add code for view more data
+    @html << add_view_code() if @yaml['view']
   end
   self
 end
@@ -151,11 +214,11 @@ end
 def self.get_data(params, name)
   if params['record'][name].class == Array
     params['record'][name].delete_if {|e| e.blank? }
-    return nil if params['record'][name].size == 0
-# convert to BSON objects   
+    return if params['record'][name].size == 0
+
+    # convert to BSON objects
     is_id = BSON::ObjectId.legal?(params['record'][name].first)
     return params['record'][name].map{ |e| BSON::ObjectId.from_string(e) } if is_id
-    return params['record'][name]
   end
   params['record'][name]
 end