drg_cms 0.6.0.3 → 0.6.0.6

data/app/helpers/dc_application_helper.rb

@@ -98,6 +98,7 @@ def dc_render(renderer, opts={})
 # 
   opts[:edit_mode]  = session[:edit_mode] 
   opts[:editparams] = {}
+  
   opts = @options.merge(opts) # merge options with parameters passed on site, page, design ...
   opts.symbolize_keys!        # this makes lots of things easier
 # Create renderer object
@@ -260,7 +261,7 @@ end
 def dc_table_title(text, result_set=nil)
   c = %Q[<div class="dc-title">#{text}]
   if result_set and result_set.respond_to?(:current_page)
-    c << %Q[<div class="dc-paginate">#{paginate(result_set, :params => {:action => 'index'})}</div>]
+    c << %Q[<div class="dc-paginate">#{paginate(result_set, :params => {action: 'index', clear: 'no'})}</div>]
   end
   c << '<div style="clear: both;"></div></div>'
   c.html_safe
@@ -273,6 +274,7 @@ end
 # String. HTML code for title.
 ############################################################################
 def dc_edit_title()
+  session[:form_processing] = "form:title:"
   title = @form['form']['title']
 # defined as form:title:edit
   if title and title['edit'] and !@form['readonly']
@@ -299,6 +301,7 @@ end
 # String. HTML code for title.
 ############################################################################
 def dc_new_title()
+  session[:form_processing] = "form:title:"
   title = @form['form']['title']
 # defined as form:title:new
   if title and title['new']
@@ -351,6 +354,21 @@ def dc_submit_tag(caption, icon, parms, rest={})
   html = icon_image || ''
   html << submit_tag(t(caption, caption), parms)
 end
+
+############################################################################
+# Returns icon code if icon is specified
+############################################################################
+def dc_icon_for_link(icon)
+  return nil unless icon
+  if icon.match(/\./)
+    _origin.image_tag(icon, class: 'dc-link-img dc-animate')
+  elsif icon.match('<i')
+    icon
+  else
+    _origin.fa_icon(icon)
+  end
+end
+  
 ############################################################################
 # Similar to rails link_to, but also takes care of link icon, translation, ...
 ############################################################################
@@ -365,16 +383,7 @@ def dc_link_to(caption, icon, parms, rest={})
     icon_pos = parms.delete('icon_pos') || 'first'
   end
 #  
-  if icon
-    icon_image = if icon.match(/\./)
-      _origin.image_tag(icon, class: 'dc-link-img dc-animate')
-    elsif icon.match('<i')
-      icon
-    else
-      _origin.fa_icon(icon)
-    end
-  end
-#  
+  icon_image = dc_icon_for_link(icon)
   if caption
     caption = t(caption, caption)
     icon_image << ' ' if icon_image
@@ -391,23 +400,31 @@ end
 # String. HTML code formatted for display.
 ####################################################################
 def dc_flash_messages()
-  err  = _origin.flash[:error]
-  war  = _origin.flash[:warning]
-  inf  = _origin.flash[:info]
-  note = _origin.flash[:note]
+  err    = _origin.flash[:error]
+  war    = _origin.flash[:warning]
+  inf    = _origin.flash[:info]
+  note   = _origin.flash[:note]
+  html   = ''
   unless err.nil? and war.nil? and inf.nil? and note.nil?
-    c = ''
-    c << "<div class=\"dc-form-error\">#{err}</div>" if err
-    c << "<div class=\"dc-form-warning\">#{war}</div>" if war
-    c << "<div class=\"dc-form-info\">#{inf}</div>" if inf
-    c << note if note
+    html << "<div class=\"dc-form-error\">#{err}</div>" if err
+    html << "<div class=\"dc-form-warning\">#{war}</div>" if war
+    html << "<div class=\"dc-form-info\">#{inf}</div>" if inf
+    html << note if note
     _origin.flash[:error]   = nil
     _origin.flash[:warning] = nil
     _origin.flash[:info]    = nil
     _origin.flash[:note]    = nil
-
-    c.html_safe
   end
+# Update fields on the form
+  if _origin.flash[:update]
+    html << "<div class=\"dc-form-updates\">\n"
+    _origin.flash[:update].each do |field, value|
+      html << %Q[<div data-field="#{field}" data-value="#{value}"></div>\n]
+    end
+    html << '</div>'
+    _origin.flash[:update] = nil
+  end
+  html.html_safe
 end
 
 ########################################################################
@@ -772,9 +789,11 @@ end
 ############################################################################
 def dc_name4_id(model, field, field_name, id=nil)
   return '' if id.nil?
-  field_name ||= 'id'
+  field_name = (field_name || 'id').strip.to_sym
+  field = field.strip.to_sym
+  
   model = model.strip.classify.constantize if model.class == String
-  rec = Mongoid::QueryCache.cache { model.find_by(field_name.strip.to_sym => id) }
+  rec = Mongoid::QueryCache.cache { model.find_by(field_name => id) }
   rec.nil? ? '' : (rec.send(field) rescue 'not defined')
 end
 
@@ -794,7 +813,7 @@ end
 #        name: active
 #        eval: dc_icon4_boolean
 ############################################################################
-def dc_icon4_boolean(value)
+def dc_icon4_boolean(value=false)
   dc_dont?(value, true) ? fa_icon('square-o lg') : fa_icon('check-square-o lg') 
 end
 
@@ -1313,7 +1332,7 @@ def dc_internal_var(object, var_name)
       'VARIABLE: UNKNOWN OBJECT'
     end
   rescue Exception => e
-    Rails.logger.error "Method dc_internal var. Runtime error. #{e.message}"
+    logger.error "Method dc_internal_var. Runtime error. #{e.message}"
     'VARIABLE: ERROR'
   end
 end
@@ -1428,11 +1447,9 @@ end
 # [String] alt_image_name
 #######################################################################
 def dc_img_alt(file_name, text=nil)
-  if text.blank?
-    name = File.basename(file_name.to_s)
-    text = name[0,name.index('.')].downcase rescue name
-  end
-  text
+  return text unless text.blank?
+  name = File.basename(file_name.to_s)
+  name[0,name.index('.')].downcase rescue name
 end
 
 

data/app/models/dc_filter.rb

@@ -144,11 +144,18 @@ def self.get_filter_field(parent)
   klas = DrgcmsFormFields::const_get(klas_string) rescue nil
   return '' if klas.nil?
 # return data from object and create html code to display field
-  object = klas.new(parent, nil, field).render
-  js     = object.js
-  "<span class=\"filter_field\" data-url=\"#{url}\">#{object.html} " <<
-    parent.fa_icon('filter lg', class: 'record_filter_field_icon dc-link-icon dc-animate') <<
-    (js.size > 2 ? parent.javascript_tag(js) : '') << '</span>'
+  object = klas.new(parent, nil, field).render rescue nil
+  # Error. Forget filter and return 
+  if object.nil?
+    parent.session[ parent.form['table'] ][:filter] = nil
+    return ''
+  end
+  js = object.js.blank? ? '' : parent.javascript_tag(object.js)
+%Q[<li class="no-background">
+<span class="filter_field" data-url="#{url}">#{object.html}
+#{parent.fa_icon('search lg', class: 'record_filter_field_icon')}
+#{js}</span>
+</li>]
 end
 
 ######################################################################

data/app/models/dc_memory.rb

@@ -74,12 +74,19 @@ def initialize(parms = {})
 end
 
 ########################################################################
-# Respond_to should always return true.
+# Return id field
 ########################################################################
 def id()
   @internals['id']
 end
 
+########################################################################
+# Respond_to should always return true.
+########################################################################
+def id=(value)
+  @internals['id'] = value
+end
+
 ########################################################################
 # Respond_to should always return true.
 ########################################################################

data/app/models/dc_poll.rb

@@ -51,26 +51,45 @@
 # as DcSimpleItem embedded structure or as DRG CMS form YAML style entered into form field.
 ########################################################################
 class DcPoll
-  include Mongoid::Document
-  include Mongoid::Timestamps
+  
+include Mongoid::Document
+include Mongoid::Timestamps
 
-  field :name,          type: String, default: ''
-  field :title,         type: String, default: ''
-  field :sub_text,      type: String, default: ''
-  field :pre_display,   type: String
-  field :operation,     type: String
-  field :parameters,    type: String
-  field :display,       type: String, default: '1'
-  field :css,           type: String
-  field :form,          type: String
-  field :valid_from,    type: DateTime
-  field :valid_to,      type: DateTime
-  field :captcha_type,  type: String
-  field :active,        type: Boolean, default: true 
-  field :created_by,    type: BSON::ObjectId
-  field :updated_by,    type: BSON::ObjectId
+field :name,          type: String, default: ''
+field :title,         type: String, default: ''
+field :sub_text,      type: String, default: ''
+field :pre_display,   type: String
+field :operation,     type: String
+field :parameters,    type: String
+field :display,       type: String, default: '1'
+field :css,           type: String
+field :form,          type: String
+field :valid_from,    type: DateTime
+field :valid_to,      type: DateTime
+field :captcha_type,  type: String
+field :active,        type: Boolean, default: true 
+field :created_by,    type: BSON::ObjectId
+field :updated_by,    type: BSON::ObjectId
 
-  index( { name: 1 }, { unique: true } )
+index( { name: 1 }, { unique: true } )
 
-  embeds_many :dc_poll_items
+embeds_many :dc_poll_items
+
+########################################################################
+# Save poll results to DcPollResults collection
+# 
+# Params:
+# data : Hash : Records hash (params[:record])
+########################################################################
+def save_results(data)
+  h = {}
+  items = self.form.blank? ? self.dc_poll_items : YAML.load(self.form.gsub(' ',' '))
+  items.each do |item|
+    next if %w(hidden_field submit_tag link_to comment).include?(item.type)
+    next if item.try(:options).match('hidden')
+    h[ item['name'] ] = data[ item['name'] ]
+  end
+  DcPollResult.create(dc_poll_id: self.id, data: h.to_yaml)
+end    
+    
 end

data/app/models/dc_poll_result.rb

@@ -0,0 +1,44 @@
+#--
+# 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.
+#++
+
+########################################################################
+# == Schema information
+#
+# Collection name: dc_poll_results : Pools results saved
+#
+#  _id                  BSON::ObjectId       _id
+#  dc_poll_id           BSON::ObjectId       poll id
+#  data                 String               Data saved as YAML
+# 
+# Results of polls saved as YAML structure.
+########################################################################
+class DcPollResult
+  include Mongoid::Document
+  include Mongoid::Timestamps
+
+  field :data,         type: String
+  belongs_to :dc_poll
+
+  index( { dc_poll_id: 1 } )
+
+end

data/app/models/dc_temp.rb

@@ -0,0 +1,137 @@
+#--
+# 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.
+#++
+
+########################################################################
+# == Schema information
+#
+# Collection name: dc_temp : Collection used for temporary saving of any models data
+# 
+# dc_temp collection has only two fields. Key and Data hash. Data must be populated 
+# prior to for display best in dc_new_record callback.
+# 
+########################################################################
+class DcTemp
+  include Mongoid::Document
+  include Mongoid::Timestamps
+  field :key,     type: String
+  field :data,    type: Hash,     default: {}
+  field :active,  type: Time,     default: Time.now
+  
+  index key: 1
+  
+########################################################################
+# Initilize object
+########################################################################
+def initialize(parms = {})
+  super()
+  parms.stringify_keys!
+  self.key = parms.delete('key')  if parms['key']
+  self.key = parms.delete('active') if parms['active']
+  parms.each { |k, value| self.data[k] = value }
+end
+
+########################################################################
+# 
+########################################################################
+def __id()
+  self.data['id']
+end
+
+########################################################################
+# Respond_to should always return true.
+########################################################################
+def respond_to?(a=nil,b=nil)
+  true
+end
+
+########################################################################
+# Redefine send method. Send is used to assign or access value by cmsedit controller.
+########################################################################
+def send(field,value=nil)
+  return super(field) if field.is_a? Symbol
+  field = field.to_s
+  if field.match('=')
+    field.chomp!('=')
+    self.data[field] = value
+  else
+    self.data[field]
+  end
+end
+
+########################################################################
+# Redefine [] method to act similar as send method
+########################################################################
+def [](field)
+  self.data[field.to_s]
+end
+
+########################################################################
+# Redefine [] method to act similar as send method
+########################################################################
+def []=(field, value)
+  self.data[field.to_s] = value
+end
+
+########################################################################
+# For debugging purposes
+########################################################################
+def to_s
+  "DcTemp: @key=#{self.key} @data=#{self.data.inspect}"
+end
+  
+########################################################################
+# Method missing will return value if value defined by m parameter is saved to
+# @internals array or will save field value to @internals hash if m matches '='.
+########################################################################
+def method_missing(m, *args, &block) #:nodoc:
+  m = m.to_s
+  if m.match('=')
+    m.chomp!('=')
+    self.data[m] = args.first
+  else
+    self.data[m]
+  end   
+end
+
+########################################################################
+# Remove all documents with specified key from dc_temp collection
+########################################################################
+def self.clear(key)
+  self.where(key: key).delete
+end
+
+########################################################################
+# Prepare dc_temp for data. It first checks if data associated with the key is to
+# be deleted and then yields block code. 
+# 
+# Returns: Query for the data associated with the key
+########################################################################
+def self.prepare(key:, clear: nil)
+  unless %w(no false 0).include?(clear.to_s.strip.downcase)
+    self.clear(key)
+    yield
+  end
+  self.where(key: key) 
+end
+
+end