drg_cms 0.6.0.6 → 0.6.0.8

data/app/models/dc_temp.rb

@@ -33,9 +33,11 @@
 class DcTemp
   include Mongoid::Document
   include Mongoid::Timestamps
+  
   field :key,     type: String
   field :data,    type: Hash,     default: {}
   field :active,  type: Time,     default: Time.now
+  field :order,   type: String
   
   index key: 1
   
@@ -45,8 +47,9 @@ class DcTemp
 def initialize(parms = {})
   super()
   parms.stringify_keys!
-  self.key = parms.delete('key')  if parms['key']
-  self.key = parms.delete('active') if parms['active']
+  self.key    = parms.delete('key')  if parms['key']
+  self.active = parms.delete('active') if parms['active']
+  self.order  = parms.delete('order') if parms['order']
   parms.each { |k, value| self.data[k] = value }
 end
 

data/app/models/drgcms_form_fields.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2012+ Damjan Rems
+# Copyright (c) 2020+ Damjan Rems
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the
@@ -22,5 +22,16 @@
 #++
 
 module DrgcmsFormFields
+  
+def self.field(parent, record, options) 
+  klass = options['type'].camelize
+  if DrgcmsFormFields.const_defined?(klass)
+    field = DrgcmsFormFields.const_get(klass).new(parent, record, options).render
+    [field.html + (field.js.size > 0 ? @parent.javascript_tag(field.js) : ''),field.css]
+  else
+    nil
+  end
+end
+
 end
 

data/app/models/drgcms_form_fields/date_picker.rb

@@ -67,17 +67,18 @@ class DatePicker < DrgcmsField
 def render
   value = @record.try(@yaml['name']) ? I18n.localize(@record[@yaml['name']].to_date) : nil
   #return ro_standard( @parent.dc_format_value(value)) if @readonly
-#
+
   @yaml['options'] ||= {}
   set_initial_value
   @yaml['html']['size'] ||= @yaml['size'] || 10
   @yaml['html']['value'] ||= value
   @yaml['html']['autocomplete'] ||= 'off'
-#
+  @yaml['html']['class'] = @yaml['html']['class'].to_s + ' date-picker'
+
   @yaml['options']['lang']   ||= "'#{I18n.locale}'"
   @yaml['options']['format'] ||= "'#{t('datetimepicker.formats.date')}'"
   @yaml['options']['timepicker'] = false
-# 
+
   record = record_text_for(@yaml['name'])
   @html << @parent.text_field(record, @yaml['name'], @yaml['html'])
   @js << %Q[

data/app/models/drgcms_form_fields/datetime_picker.rb

@@ -53,16 +53,17 @@ class DatetimePicker < DrgcmsField
 def render
   value = @record.try(@yaml['name']) ? I18n.localize(@record[@yaml['name']].localtime) : nil
   #return ro_standard( @parent.dc_format_value(value)) if @readonly
-#
+
   @yaml['options'] ||= {}
   set_initial_value
   @yaml['html']['size'] ||= @yaml['size'] || 14
   @yaml['html']['value'] ||= value if @record[@yaml['name']]
   @yaml['html']['autocomplete'] ||= 'off'
-#
+  @yaml['html']['class'] = @yaml['html']['class'].to_s + ' date-picker'
+
   @yaml['options']['lang']   ||= "'#{I18n.locale}'"
   @yaml['options']['format'] ||= "'#{t('datetimepicker.formats.datetime')}'"
-# 
+
   record = record_text_for(@yaml['name'])
   @html << @parent.text_field(record, @yaml['name'], @yaml['html'])
   @js << %Q[

data/app/models/drgcms_form_fields/drgcms_field.rb

@@ -128,7 +128,6 @@ end
 # Standard code for returning readonly field.
 ####################################################################
 def ro_standard(value=nil)
-  p @yaml['name'],value
   if value.nil?
     value = if @yaml['html']['value']
       @yaml['html']['value']
@@ -152,7 +151,7 @@ end
 #    flash[:record] = {}
 #    flash[:record]['picture'] = '/path/to_picture'
 ####################################################################
-def set_initial_value(opt1='html', opt2='value')
+def set_initial_value(opt1 = 'html', opt2 = 'value')
   @yaml['html'] ||= {}
   value_send_as = 'p_' + @yaml['name']
   if @parent.params[value_send_as]
@@ -160,11 +159,26 @@ def set_initial_value(opt1='html', opt2='value')
   elsif @parent.flash[:record] and @parent.flash[:record][@yaml['name']]
     @yaml[opt1][opt2] = @parent.flash[:record][@yaml['name']]
   end
+  set_default_value(opt1, opt2) if @yaml['default']
+end
+
+####################################################################
+# Will set default value
+####################################################################
+def set_default_value(opt1, opt2)
+  return if @yaml[opt1][opt2].present?
+  return if @record && @record[@yaml['name']].present?
+
+  @yaml[opt1][opt2] = if @yaml['default'].class == Hash
+    eval(@yaml['default']['eval'])
+  else
+    @yaml['default']
+  end
 end
 
 ####################################################################
 # Returns style html code for DRGForm object if style directive is present in field definition.
-# Otherwiese returns empty string.
+# Otherwise returns empty string.
 # 
 # Style may be defined like:
 #    style:
@@ -202,7 +216,7 @@ end
 # Returns css code for the field if specified. It replaces all occurences of '# ' 
 # with field name id, as defined on form.
 ####################################################################
-def css_code
+def __css_code
   return '' if @css.blank?
   @css.gsub!('# ',"#td_record_#{@yaml['name']} ")
   "\n<style type=\"text/css\">#{@css}</style>"

data/app/models/drgcms_form_fields/embedded.rb

@@ -31,6 +31,7 @@ module DrgcmsFormFields
 # * +name:+ field name (required)
 # * +type:+ embedded (required)
 # * +form_name:+ name of form which will be used for editing
+# * +load:+ when is embedded iframe loaded. default=on form load, delay=on tab select, always=every time tab is selected)
 # * +html:+ html options (optional)
 #   * +height:+ height of embedded object in pixels (1000)
 #   * +width:+ width of embedded object in pixels (500)
@@ -40,6 +41,7 @@ module DrgcmsFormFields
 #      name: dc_parts
 #      type: embedded
 #      form_name: dc_part
+#      refresh: delay
 #      html:
 #        height: 1000
 ###########################################################################
@@ -49,25 +51,27 @@ class Embedded < DrgcmsField
 ###########################################################################
 def render 
   #return self if @record.new_record?  # would be in error otherwise
-# HTML defaults. Some must be set    
+  # HTML defaults. Some must be set    
   @yaml['html'] ||= {}
   @yaml['html']['height'] ||= 300
   @yaml['html']['width']  ||= '99%'
-# defaults both way 
+  @yaml['action'] ||= 'index'
+  # defaults both way 
   @yaml['table']     ||= @yaml['form_name'] if @yaml['form_name']
   @yaml['form_name'] ||= @yaml['table'] if @yaml['table']
-# 
+  # 
   html = ''  
   @yaml['html'].each {|k,v| html << "#{k}=\"#{v}\" "}
-# 
+  # 
   if @yaml['name'] == @yaml['table'] or @yaml['table'] == 'dc_memory'
     tables = @yaml['table']
-    ids = @record._id
+    ids    = @record.id
   else
-    tables      = @parent.tables.inject('') { |r,v| r << "#{v[1]};" } + @yaml['table']
-    ids         = @parent.ids.inject('') { |r,v| r << "#{v};" } + @record._id
+    tables = @parent.tables.inject('') { |r,v| r << "#{v[1]};" } + @yaml['table']
+    ids    = @parent.ids.inject('') { |r,v| r << "#{v};" } + @record.id
   end
-  opts = { controller: 'cmsedit', action: 'index', ids: ids, table: tables, form_name: @yaml['form_name'], 
+  opts = { controller: 'cmsedit', action: @yaml['action'], 
+           ids: ids, table: tables, form_name: @yaml['form_name'], 
            field_name: @yaml['name'], iframe: "if_#{@yaml['name']}", readonly: @readonly }
   # additional parameters if specified
   @yaml['params'].each { |k,v| opts[k] = @parent.dc_value_for_parameter(v) } if @yaml['params']         
@@ -75,7 +79,11 @@ def render
   @html << "<iframe class='iframe_embedded' id='if_#{@yaml['name']}' name='if_#{@yaml['name']}' #{html}></iframe>"
   unless @record.new_record?
     url  = @parent.url_for(opts)
-    data = @yaml['delay'] ? 'data-src-delay' : 'src'
+    data = if @yaml['load'].nil? || @yaml['load'].match('default')
+      "src"
+    else
+      "data-src-#{@yaml['load']}"
+    end
     @js << %Q[
 $(document).ready( function() {
   $('#if_#{@yaml['name']}').attr('#{data}', '#{url}');

data/app/models/drgcms_form_fields/file_field.rb

@@ -44,7 +44,7 @@ class FileField < DrgcmsField
 def render
   return self if @readonly 
   #record = record_text_for(@yaml['name'])
-  @html << @parent.file_field( @yaml['name'], @yaml['html']) 
+  @html << @parent.file_field(nil,@yaml['name'], @yaml['html']) 
   self
 end
 

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/method.rb

@@ -0,0 +1,65 @@
+#--
+# 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. This might prove usefull in 
+# cases where form contains complex dta stgructer or set of pictures which can not
+# be simply displayed by any other 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('.')
+  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
 
@@ -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')
@@ -115,10 +115,16 @@ def render
 
   record = record_text_for(@yaml['name'])
   # text field for autocomplete
-  @html << ' ' << @parent.text_field(record, _name, @yaml['html'])
+  @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 
+  # 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 

data/app/models/drgcms_form_fields/radio.rb

@@ -61,10 +61,9 @@ module DrgcmsFormFields
 class Radio < Select
 
 ###########################################################################
-# Render text_with_select field html code
+# Render radio DRG Form field
 ###########################################################################
 def render
-  #return ro_standard if @readonly  
   set_initial_value('html','value')
   
   record = record_text_for(@yaml['name'])
@@ -73,13 +72,19 @@ def render
   @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]] 
+  #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 == @record[@yaml['name']].to_s)
+    @html << @parent.radio_button_tag("#{record}[#{@yaml['name']}]",choice.last, choice.last.to_s == value.to_s)
     @html << choice.first
     @html << "</div>"
   end

data/app/models/drgcms_form_fields/readonly.rb

@@ -66,7 +66,7 @@ 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.send(@yaml['name']),@yaml['format'])    

data/app/models/drgcms_form_fields/select.rb

@@ -62,6 +62,8 @@ module DrgcmsFormFields
 #      name: company
 #      type: select
 #      choices: Audi,BMW,Mercedes
+#        or
+#      choices: helpers.label.model.choices4_field
 #    60:
 #      name: type
 #      type: select
@@ -75,8 +77,8 @@ class Select < DrgcmsField
 # helper.label.table_name.choices_for_fieldname or
 # choices4_tablename_fieldname
 ###########################################################################
-def choices_in_helper(all)
-  helper = "helpers.label.#{@form['table']}.choices4_#{@yaml['name']}"
+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']}"
@@ -86,10 +88,10 @@ def choices_in_helper(all)
 end
 
 ###########################################################################
-# Choices are defined by evaluating an exspression. This is most common class
-# method defined in a class. SomeClass.get_choices4.
+# 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, all=false)
+def choices_in_eval(e)
   e.strip!
   if @yaml['depend'].nil?
     method = e.split(/\ |\(/).first
@@ -99,19 +101,15 @@ def choices_in_eval(e, all=false)
     eval e
   else
     # add event listener to depend field
-    @js << %Q[
+    @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. Its value should be set in params
-    depend_value = if @yaml['depend'][0] == '_'
-      @parent.params["p_#{@yaml['depend']}"]
-    else
-      @record[@yaml['depend']]
-    end
-    
+)
+    # 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
@@ -120,19 +118,19 @@ end
 ###########################################################################
 # Create choices array for select field.
 ###########################################################################
-def get_choices(all=false)
+def get_choices
   begin
     choices = case 
-    when @yaml['choices'] then 
-      @yaml['choices']
-    when @yaml['eval']    then
-      choices_in_eval(@yaml['eval'], all)
-    else
-      choices_in_helper(all)
-    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"
@@ -140,14 +138,25 @@ def get_choices(all=false)
   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   = @yaml['html']['value'] ? @yaml['html']['value'] : nil
-  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 = ''
@@ -178,14 +187,21 @@ end
 def render
   return ro_standard if @readonly
   set_initial_value('html','selected')
-#
+  # separate options and html part
   @yaml['html'].symbolize_keys!
+  html_part = {}
+  html_part[:class] = @yaml['html'].delete(:class)  if @yaml['html'][:class]
+  html_part[:id]    = @yaml['html'].delete(:id)     if @yaml['html'][:id]
+  html_part[:style] = @yaml['html'].delete(:style)  if @yaml['html'][:style]
   record = record_text_for(@yaml['name'])
-  if @yaml['multiple']  
-    @html << @parent.select(record, @yaml['name'], get_choices, @yaml['html'], {multiple: true})
+  if @yaml['multiple']
+    html_part[:multiple] = true
+    @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
@@ -197,7 +213,8 @@ 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   
+
+    # 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]