drg_cms 0.6.0.1 → 0.6.1.1.1

data/app/models/drgcms_form_fields/date_picker.rb

@@ -65,27 +65,29 @@ class DatePicker < DrgcmsField
 # Render date_picker field html code
 ###########################################################################
 def render
-  value = (@record and @record[@yaml['name']]) ? I18n.localize(@record[@yaml['name']].to_date) : nil
-  return ro_standard( @parent.dc_format_value(value)) if @readonly
-#
+  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'] ||= 10
-  @yaml['html']['value'] = 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 << <<EOJS
+  @js << %Q[
 $(document).ready(function() {
   $("##{record}_#{@yaml['name']}").datetimepicker( {
     #{hash_to_options(@yaml['options'])}
   });
 });
-EOJS
+] unless @readonly
   
   self
 end

data/app/models/drgcms_form_fields/date_select.rb

@@ -46,7 +46,7 @@ class DateSelect < DrgcmsField
 # Render date_select field html code
 ###########################################################################
 def render
-  return ro_standard( @parent.dc_format_value(@record[@yaml['name']])) if @readonly
+  #return ro_standard( @parent.dc_format_value(@record[@yaml['name']])) if @readonly
 #
   @yaml['options'] ||= {}
   set_initial_value('options','default')

data/app/models/drgcms_form_fields/datetime_picker.rb

@@ -51,26 +51,28 @@ class DatetimePicker < DrgcmsField
 # Render date_time_picker field html code
 ###########################################################################
 def render
-  value = (@record and @record[@yaml['name']]) ? I18n.localize(@record[@yaml['name']].localtime) : nil
-  return ro_standard( @parent.dc_format_value(value)) if @readonly
-#
+  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'] ||= 14
-  @yaml['html']['value'] = value if @record[@yaml['name']]
-#
+  @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 << <<EOJS
+  @js << %Q[
 $(document).ready(function() {
   $("##{record}_#{@yaml['name']}").datetimepicker( {
     #{hash_to_options(@yaml['options'])}
   });
-});
-EOJS
+}); 
+] unless @readonly
   
   self
 end

data/app/models/drgcms_form_fields/datetime_select.rb

@@ -45,7 +45,7 @@ class DatetimeSelect < DrgcmsField
 # Render datetime_select field html code
 ###########################################################################
 def render
-  return ro_standard( @parent.dc_format_value(@record[@yaml['name']])) if @readonly
+  #return ro_standard( @parent.dc_format_value(@record[@yaml['name']])) if @readonly
 #
   @yaml['options'] ||= {}
   set_initial_value('options','default')

data/app/models/drgcms_form_fields/drgcms_field.rb

@@ -62,6 +62,7 @@ module DrgcmsFormFields
 ###########################################################################
 class DrgcmsField
 attr_reader :js
+attr_reader :css
 
 ####################################################################
 # DrgcmsField initialization code.
@@ -79,14 +80,16 @@ def initialize( parent, record, yaml )
   @record = record
   @yaml   = yaml
   @form   = parent.form
+  @yaml['html'] ||= {}
+  # set readonly field
   @readonly = (@yaml and @yaml['readonly']) || (@form and @form['readonly'])
-  if @yaml['size'] # move size to html element if not already there
-    @yaml['html'] ||= {}
-    @yaml['html']['size'] ||= @yaml['size']
-  end
+  @yaml['html']['readonly'] = true if @readonly
+  # assign size to html element if not already there
+  @yaml['html']['size'] ||= @yaml['size'] if @yaml['size'] 
+    
   @html   = ''  
   @js     = ''
-  @css    = @yaml['css']
+  @css    = set_css_code @yaml['css']
   self
 end
 
@@ -94,7 +97,7 @@ end
 # Returns html code together with CSS code.
 ####################################################################
 def html
-  @html + (@css ? "\n<style type=\"text/css\">#{@css}</style>" : '')
+  @html
 end
 
 ####################################################################
@@ -125,7 +128,13 @@ end
 # Standard code for returning readonly field.
 ####################################################################
 def ro_standard(value=nil)
-  value = @record[@yaml['name']] if value.nil? and @record.respond_to?(@yaml['name']) 
+  if value.nil?
+    value = if @yaml['html']['value']
+      @yaml['html']['value']
+    else
+      @record.respond_to?(@yaml['name']) ? @record.send(@yaml['name']) : nil
+    end
+  end
   @html << (value.blank? ? '' : "<div class='dc-readonly'>#{value}</div>")
   self
 end
@@ -142,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]
@@ -150,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:
@@ -186,6 +210,28 @@ def set_style()
   end 
 end
 
+####################################################################
+# DEPRECATED!
+#  
+# Returns css code for the field if specified. It replaces all occurences of '# ' 
+# with field name id, as defined on form.
+####################################################################
+def __css_code
+  return '' if @css.blank?
+  @css.gsub!('# ',"#td_record_#{@yaml['name']} ")
+  "\n<style type=\"text/css\">#{@css}</style>"
+end
+
+####################################################################
+# Sets css code for the field if specified. It replaces all occurences of '# ' 
+# with field name id, as defined on form.
+####################################################################
+def set_css_code(css)
+  return '' if css.blank?
+  css.gsub!('# ',"#td_record_#{@yaml['name']} ") if css.match('# ')
+  css
+end
+
 ####################################################################
 # Will return ruby hash formated as javascript string which can be used
 # for passing parameters in javascript code.

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
 ###########################################################################
@@ -47,33 +49,41 @@ class Embedded < DrgcmsField
 ###########################################################################
 # Render embedded field html code
 ###########################################################################
-def render 
-  #return self if @record.new_record?  # would be in error otherwise
-# HTML defaults. Some must be set    
+def render
+  # HTML defaults. Some must be set    
   @yaml['html'] ||= {}
-  @yaml['html']['height'] ||= 300
-  @yaml['html']['width']  ||= '99%'
-# defaults both way 
+  @yaml['html']['width'] ||= '99%'
+  html = @yaml['html'].inject('') { |r, val| r << "#{val.first}=\"#{val.last}\" " }
+
+  @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']
+
+  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']         
+         
   @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 = if @yaml['load'].nil? || @yaml['load'].match('default')
+      "src"
+    else
+      "data-src-#{@yaml['load']}"
+    end
     @js << %Q[
 $(document).ready( function() {
-  $('#if_#{@yaml['name']}').attr('src', '#{@parent.url_for(opts)}');
+  $('#if_#{@yaml['name']}').attr('#{data}', '#{url}');
 });]
   end
   self

data/app/models/drgcms_form_fields/file_field.rb

@@ -0,0 +1,52 @@
+#--
+# 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
+# "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 file_field DRG CMS form field.
+# 
+# ===Form options:
+# * +type:+ text_field (required)
+# * +name:+ Field name (required) 
+# * +html:+ html options which apply to text_field field (optional)
+# 
+# Form example:
+#    10:
+#      name: title
+#      type: file_field
+#      size: 30
+###########################################################################
+class FileField < DrgcmsField
+  
+###########################################################################
+# Render text_field field html code
+###########################################################################
+def render
+  return self if @readonly 
+
+  @html << @parent.file_field(nil,@yaml['name'], @yaml['html']) 
+  self
+end
+
+end
+end

data/app/models/drgcms_form_fields/file_select.rb

@@ -50,10 +50,10 @@ class FileSelect < DrgcmsField
 ###########################################################################
 def render
   return ro_standard if @readonly  
-# retrieve html editor from page settings
+  # retrieve file_select component from site settings
   selector_string = @parent.dc_get_site.params['file_select'] if @parent.dc_get_site 
   selector_string ||= 'elfinder' 
-# 
+
   klas_string = selector_string.camelize
   if DrgcmsFormFields.const_defined?(klas_string)
     klas = DrgcmsFormFields::const_get(klas_string)

data/app/models/drgcms_form_fields/hash_field.rb

@@ -0,0 +1,90 @@
+#--
+# Copyright (c) 2019+ 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 text_field DRG CMS form field.
+# 
+# ===Form options:
+# * +type:+ text_field (required)
+# * +name:+ Field name (required) 
+# * +html:+ html options which apply to text_field field (optional)
+# 
+# Form example:
+#    10:
+#      name: title
+#      type: text_field
+#      size: 30
+#      html:
+#        required: yes
+###########################################################################
+class HashField < DrgcmsField
+  
+###########################################################################
+# Returns value for readonly field
+###########################################################################
+def ro_standard()
+  return self if @record[@yaml['name']].nil?
+
+  html = ''
+  @record[@yaml['name']].each do |key, value|
+    html << "#{key}:#{value}<br>"
+  end
+  super(html)
+end
+  
+###########################################################################
+# Render text_field field html code
+###########################################################################
+def render
+  return ro_standard if @readonly
+
+  set_initial_value
+  record = record_text_for(@yaml['name'])
+  # Convert Hash to values separated by colon
+  if @record[@yaml['name']]
+    @yaml['html']['value'] = @record[@yaml['name']].to_a.inject('') {|r, e| r << "#{e.first}:#{e.last}\n"}
+  end
+  @html << @parent.text_area( record, @yaml['name'], @yaml['html']) 
+  self
+end
+
+###########################################################################
+# Return value. Return nil if input field is empty
+###########################################################################
+def self.get_data(params, name)
+  return nil if params['record'][name].blank?
+
+  result = params['record'][name].split("\n").select { |e| !e.blank? }
+  return if result.size == 0
+  # convert to Hash
+  ret = {}
+  result.map do |e|
+    key, value = e.chomp.split(':')
+    ret[key.strip] = value.strip if value.present?
+  end
+  ret
+end
+
+end
+end