drg_cms 0.7.0.8 → 0.7.1.1

data/app/controls/dc_poll_result_control.rb

@@ -27,61 +27,61 @@
 module DcPollResultControl
 
 ######################################################################
-# Filter result data when filter is set
+# Set filter action called from form.
 ######################################################################
-def poll_filter
-  get_query
-end
+def filter_set
+  record = params[:record]
+  filter = "DcPollResult.where(dc_poll_id: '#{record[:dc_poll_id]}')"
+  filter << ".and(:created_at.gte => '#{Time.parse(record[:start_date]).beginning_of_day}')" if record[:start_date].present?
+  filter << ".and(:created_at.lte => '#{Time.parse(record[:end_date]).end_of_day}')" if record[:end_date].present?
 
-######################################################################
-# Filter action called. Update url to reflect filter conditions and reload form.
-######################################################################
-def do_filter
-  url = url_for(controller: 'cmsedit', action: :index, table: :dc_poll_result,
-                'record[dc_poll_id]' => params[:record][:dc_poll_id],
-                'record[start_date]' => params[:record][:start_date],
-                'record[end_date]'   => params[:record][:end_date]
-               )
-  dc_render_ajax(operation: :url, value: url)
+  session['dc_poll_result'][:filter] = {'field'     => I18n.t('drgcms.filter_off'),
+                                        'operation' => 'eval',
+                                        'value'     => filter,
+                                        'input'     => '',
+                                        'table'     => 'dc_poll_result' }.to_yaml
+  session['dc_poll_result'][:page] = 1 # must also be set
+
+  render json: { url: '/cmsedit?t=dc_poll_result'}
 end
 
 ######################################################################
 # Export data to file
 ######################################################################
-def do_export
+def data_export
   c, keys = '', []
-  get_query.to_a.each do |doc|
-    # ensure, that fields are always in same order
+  data_get.each do |doc|
     data = YAML.load(doc.data)
+    # header and ensure fields are always in same order
     if c.blank?
-      data.each { |k, v| keys << k }
-      c << I18n.t('helpers.label.dc_poll_result.created_at') + "\t"
-      c << keys.join("\t") + "\n"
+      keys = data.map(&:first)
+      c << I18n.t('helpers.label.dc_poll_result.created_at') + ";"
+      c << keys.join(";") + "\n"
     end
-    c << doc.created_at.strftime(I18n.t('date.formats.default') ) + "\t"
-    keys.each { |k| c << data[k] + "\t" }
-    c << "\n"
+
+    c << doc.created_at.strftime(I18n.t('time.formats.default')) + ";"
+    keys.each do |k|
+      c << if data[k].class == String
+             %("#{data[k].gsub(/\"/, "'").gsub(';', ',')}";)
+           else
+             %("#{data[k]}";)
+           end
+    end
+    c << "\r\n"
   end
   File.write(Rails.root.join('public', 'export.csv'), c)
-  dc_render_ajax(operation: :window, value: 'export.csv')
+  render json: { 'window_' => 'export.csv' }
 end
 
 private
 ######################################################################
 # Creates query for Poll results
 ######################################################################
-def get_query
-  if params.dig(:record, :dc_poll_id).nil?
-    qry = DcPollResult.all
-  else  
-    qry = DcPollResult.where(dc_poll_id: params[:record][:dc_poll_id])
-    unless params[:record][:start_date].blank?
-      start_date = DrgcmsFormFields::DatePicker.get_data(params,'start_date').beginning_of_day
-      end_date   = DrgcmsFormFields::DatePicker.get_data(params,'end_date').end_of_day
-      qry = qry.and(:created_at.gt => start_date).and(:created_at.lt => end_date)
-    end
-  end
-  qry
+def data_get
+  return [] if session.dig('dc_poll_result', :filter).blank?
+
+  filter = YAML.load(session['dc_poll_result'][:filter])
+  eval filter['value'] rescue []
 end
 
 end 

data/app/controls/dc_setup_control.rb

@@ -0,0 +1,53 @@
+#--
+# Copyright (c) 2024+ 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.
+#++
+
+################################################################################
+# Controls for DcSetup edit form.
+################################################################################
+module DcSetupControl
+
+################################################################################
+# Update edit form. Admin sees everything while user sees only setup fields.
+################################################################################
+def dc_update_form
+  return unless params[:id]
+
+  record = if BSON::ObjectId.legal?(params[:id])
+             DcSetup.find(params[:id])
+           else
+             DcSetup.find_by(name: params[:id])
+           end
+
+  unless dc_user_has_role('admin')
+    @form['form'].delete('tabs')
+    @form['readonly'] = true unless record.editors.include?(session[:user_id])
+  end
+
+  form = YAML.load(record.form) rescue nil
+  if form.present?
+    @form['form']['tabs'] ||= {}
+    @form['form']['tabs'].merge!(form)
+  end
+end
+
+end

data/app/forms/all_options.yml

@@ -1,16 +1,16 @@
 ## DRGCMS Form
 ---
-extend: form_name
+extend: form_name,another_form_name
 table: table_name
 title: Some title
 title: 
-  text: Dynamicaly defined title
+  text: Same as above
   eval: SomeClass.title_method
 controls: controls_file
 readonly: 1
 permissions:
   can_view: role_name
-class: angular-like
+class: report
   
 script: "
 javascript code

data/app/forms/cms_menu.yml

@@ -145,6 +145,13 @@ menu:
         icon: history
         table: dc_journal
 
+      510:
+        caption: helpers.label.dc_setup.tabletitle
+        controller: cmsedit
+        icon: cog-o
+        table: dc_setup
+        form_name: dc_setup
+
       600: 
         caption: drgcms.browse_collections
         controller: cmsedit

data/app/forms/dc_image_search.yml

@@ -55,14 +55,14 @@ result_set:
   columns:
     10:
       name: preview
-      eval: dc_image_first
+      eval: first_dc_image
       caption: drgcms.dc_image.image
       width: 20%
     20:
       name: short
     30:
       name: links
-      eval: dc_image_select_links
+      eval: select_links_for_dc_image
       caption: drgcms.dc_image.available
 
 css: "

data/app/forms/dc_poll.yml

@@ -18,7 +18,8 @@ result_set:
   columns:
     1:  
       name: name
-    2:  
+      width: 30%
+    2:
       name: title
       width: 40%
     3: 

data/app/forms/dc_poll_result.yml

@@ -9,27 +9,30 @@ index:
     10: 
       type: field
       name: dc_poll_id
+      position: left
 
     30: 
       type: field
       name: start_date
       field_type: date_picker
-        
+      position: left
+
     40: 
       type: field
       name: end_date
       field_type: date_picker
       options: 
         openOnFocus: false
-        
+      position: left
+
     50: 
       type: ajax
       caption: drgcms.filter_poll
       title: drgcms.filter_poll_title
-      icon: filter
+      icon: filter-alt-o
       controller: cmsedit
       action: run
-      control: dc_poll_result.do_filter
+      control: dc_poll_result.filter_set
       method: post
     
     60: 
@@ -37,9 +40,9 @@ index:
       caption: drgcms.export_poll
       title: drgcms.export_poll_title
       controller: cmsedit
-      icon: table
+      icon: download-o
       action: run
-      control: dc_poll_result.do_export
+      control: dc_poll_result.data_export
       method: post
     
 result_set:
@@ -50,7 +53,7 @@ result_set:
     10:  
       name: dc_poll_id
       eval: dc_name4_id,dc_poll,name
-      width: 25%
+      width: 40%
     20: 
       name: created_at
       format: '%d.%m.%Y %H:%M'

data/app/forms/dc_setup.yml

@@ -0,0 +1,45 @@
+table: dc_setup
+
+index:
+  filter: data as text_field
+  actions: standard
+  
+result_set:
+  actions: standard
+
+  columns:
+    10:  
+      name: name
+      width: 20%
+    20:
+      name: updated_at
+      format: '%d.%m.%Y'
+      width: 10%
+
+form:
+  title:
+    field: name
+  actions: standard
+
+  tabs:
+    tab0:
+      10:
+        name: name
+        type: text_field
+        size: 20
+
+      20:
+        name: editors
+        type: multitext_autocomplete
+        search: dc_user.name
+        size: 30
+
+    tab00:
+      10:
+        name: form
+        type: text_area
+        size: 80x50
+
+css: '
+#record_form {font-family: monospace; font-size: 12px;}
+'

data/app/forms/dc_steps_template.yml

@@ -1,6 +1,9 @@
 ## Template for standard options on wizard form
 form:
-  css: '#dc-form-left {display: block;width: 20%}'
+  css: '
+#dc-form-left {display: block;width: 20%;}
+#dc-form-container {display: flex;}'
+
   actions:
     1:
       type: ajax

data/app/helpers/cms_common_helper.rb

@@ -97,6 +97,8 @@ end
 ############################################################################
 def t_label_for_column(options)
   label = options['caption'] || options['label']
+  return ' ' if label == false
+
   if label.blank?
     label = if options['name']
               prefix = @form['i18n_prefix'] || "helpers.label.#{@form['table']}"
@@ -135,9 +137,10 @@ end
 ############################################################################
 def self.dc_name_for_value(model, field, value)
   return '' if value.nil?
-  c = t('helpers.label.' + model + '.choices4_' + field )
-  a = c.chomp.split(',').inject([]) {|r,v| r << v.split(':') }
-  a.each {|e| return e.first if e.last.to_s == value.to_s }
+
+  choices = t("helpers.label.#{model}.choices4_#{field}")
+  values  = choices.chomp.split(',').map{ _1.split(':') }
+  values.each{ |e| return e.first if e.last.to_s == value.to_s }
   '???'
 end
 
@@ -168,9 +171,10 @@ end
 # Array. Choices for select input field
 ############################################################################
 def self.dc_choices_for_field(model, field)
-  c = CmsCommonHelper.t('helpers.label.' + model + '.choices4_' + field )
-  return ['error'] if c.match( /translation missing/i )
-  c.chomp.split(',').inject([]) { |r, v| r << v.split(':') }
+  choices = CmsCommonHelper.t("helpers.label.#{model}.choices4_#{field}" )
+  return ['error'] if choices.match( /translation missing/i )
+
+  choices.chomp.split(',').map{ _1.split(':') }
 end
 
 ############################################################################
@@ -214,13 +218,13 @@ end
 # Returns: 
 # String. Name (descriptive value) for specified key in table.
 ############################################################################
-def dc_name_for_id(model, field, field_name, id=nil)
+def dc_name_for_id(model, field, field_name, id = nil)
   return '' if id.nil?
 
   field_name = (field_name || 'id').strip.to_sym
   field = field.strip.to_sym
   model = model.strip.classify.constantize if model.class == String
-  doc = Mongoid::QueryCache.cache { model.find_by(field_name => id) }
+  doc = Mongo::QueryCache.cache { model.find_by(field_name => id) }
 
   doc.nil? ? '' : (doc.send(field) rescue 'not defined')
 end
@@ -228,7 +232,7 @@ end
 ############################################################################
 #
 ############################################################################
-def dc_name4_id(model, field, field_name, id=nil) #nodoc
+def dc_name4_id(model, field, field_name, id = nil) #nodoc
   #dc_deprecate('dc_name4_id will be deprecated. Use dc_name_for_id instead.')
   dc_name_for_id(model, field, field_name, id) 
 end
@@ -258,7 +262,7 @@ end
 ############################################################################
 #
 ############################################################################
-def dc_icon4_boolean(document = false, field_name = false) #nodoc
+def dc_icon4_boolean(document = false, field_name = nil) #nodoc
   #dc_deprecate('dc_icon4_boolean will be deprecated. Use dc_icon_for_boolean instead.')
   dc_icon_for_boolean(document, field_name)
 end

data/app/helpers/cms_helper.rb

@@ -53,12 +53,12 @@ end
 ############################################################################
 def dc_get_field_form_definition(name) #:nodoc:
   return if @form['form'].nil?
-  
+
   @form['form']['tabs'].each do |tab|
     # Array with 2 elements. First is tab name, second is data
     my_fields = tab.last
     my_fields.each { |k, v| return v if (k.class == Integer && v['name'] == name) }
-  end if @form['form']['tabs'] #  I know. But nice. 
+  end if @form['form']['tabs'] #  I know. But nice.
 
   @form['form']['fields'].each do |field|
     next unless field.first.class == Integer # options
@@ -102,17 +102,18 @@ end
 # Return label and help text for a field defined on Form.
 #
 # Parameters:
-# options : Hash : Field definition
+#   @options : Hash : Field definition
 #
 # Returns:
-#   label : String : Label text
-#   help : String : Help text
+#   @label : String : Label text
+#   @help : String : Help text
 ############################################################################
 def dc_label_help(options)
   # no label or help in comments
   return [nil, nil] if %w[comment action].include?(options['type'])
 
   label = options['caption'] || options['text'] || options['label']
+  label = '' if options['type'] == 'check_box'
   if options['name']
     label = if label.blank?
               t_label_for_field(options['name'], options['name'].capitalize.gsub('_',' ') )
@@ -175,7 +176,7 @@ def dc_field_action(yaml)
     field, label, help = dc_field_label_help(yaml)
   end
   # input field will have label as placeholder
-  field = field.sub('input',"input placeholder=\"#{label}\"")
+  field = field.sub('input', "input placeholder=\"#{label}\"")
   %(<li class="no-background">#{field}</li>)
 end
 
@@ -185,7 +186,7 @@ end
 def dc_html_data(yaml)
   return '' if yaml.blank?
 
-  yaml.inject(' ') { |result, e| result = e.last.nil? ? result : result << "#{e.first}=\"#{e.last}\" " }
+  yaml.inject(' ') { |result, e| result << (e.last ? %(#{e.first}="#{e.last}" ) : '') }
 end
 
 ############################################################################

data/app/helpers/cms_index_helper.rb

@@ -129,12 +129,17 @@ def dc_actions_for_index
       parms['id']       = params[:ids]
       parms['table']     = @form['table']
       dc_link_to( caption, 'reorder', parms, method: :delete )              
-=end     
+=end
+
     when action == 'script'
       html_left << dc_script_action(options)
 
     when action == 'field'
-      html_right << dc_field_action(yaml)
+      if options['position'] && options['position'] == 'left'
+        html_left << dc_field_action(yaml)
+      else
+        html_right << dc_field_action(yaml)
+      end
 
     when %w(ajax link window popup submit).include?(action)
       html_left << dc_link_ajax_window_submit_action(options, nil)
@@ -304,34 +309,37 @@ def dc_actions_for_result(document)
       caption = has_sub_menu ? t(caption, '') : nil
       html    = '<li>'
       html << case yaml['type']
-      when 'check' then
+      when 'check'
         main_menu << '<li>' + check_box_tag("check-#{document.id}", false, false, { class: 'dc-check' }) + '</li>'
         next
 
-      when 'edit' then
+      when 'edit'
         parms['action'] = 'edit'
         parms['id'] = document.id
         parms['readonly'] = yaml['readonly']
-        dc_link_to( caption, 'edit-o', parms, title: title )
+        icon = yaml['icon'] || 'edit-o'
+        dc_link_to( caption, icon, parms, title: title )
 
-      when 'show' then
+      when 'show'
         parms['action'] = 'show'
         parms['id'] = document.id
         parms['readonly'] = true
         icon = yaml['icon'] || 'eye-o'
         dc_link_to( caption, icon, parms, title: title )
 
-      when 'duplicate' then
+      when 'duplicate'
         parms['id'] = document.id
         # duplicate string will be added to these fields.
         parms['dup_fields'] = yaml['dup_fields'] 
         parms['action'] = 'create'
-        dc_link_to( caption, 'content_copy-o', parms, data: { confirm: t('drgcms.confirm_dup') }, method: :post, title: title )
+        icon = yaml['icon'] || 'content_copy-o'
+        dc_link_to( caption, icon, parms, data: { confirm: t('drgcms.confirm_dup') }, method: :post, title: title )
 
-      when 'delete' then
+      when 'delete'
         parms['action'] = 'destroy'
         parms['id'] = document.id
-        dc_link_to( caption, 'delete-o', parms, data: { confirm: t('drgcms.confirm_delete') }, method: :delete, title: title )
+        icon = yaml['icon'] || 'delete-o'
+        dc_link_to( caption, icon, parms, data: { confirm: t('drgcms.confirm_delete') }, method: :delete, title: title )
 
       else # error. 
         yaml['type'].to_s
@@ -480,7 +488,7 @@ def dc_columns_for_result(document)
 
     # convert shortcut to hash 
     v = {'name' => v} if v.class == String    
-    begin
+    #begin
               # as Array (footer)
       value = if document.class == Array
                 dc_format_value(document[index], v['format']) if document[index]
@@ -498,10 +506,10 @@ def dc_columns_for_result(document)
               else
                 "??? #{v['name']}"
               end
-    rescue Exception => e
-      dc_log_exception(e, 'dc_columns_for_result')
-      value = '!!!Error'
-    end
+    #rescue Exception => e
+    #  dc_log_exception(e, 'dc_columns_for_result')
+    #  value = '!!!Error'
+    #end
     html << '<div class="spacer"></div>'
     # set class
     clas = dc_style_or_class(nil, v['td_class'] || v['class'], value, document)
@@ -522,7 +530,7 @@ end
 # Ex. Will split dc_name4_value(one ,"two") => ['dc_name4_value', 'one', 'two']
 ############################################################################
 def dc_eval_to_array(expression)
-  expression.split(/\ |\,|\(|\)/).delete_if {|e| e.blank? }.map {|e| e.gsub(/\'|\"/,'').strip }
+  expression.split(/\ |\,|\(|\)/).select(&:present?).map{ _1.gsub(/\'|\"/, '').strip }
 end
 
 ############################################################################
@@ -532,7 +540,7 @@ end
 #   parameters : Array : array of parameters which will be send to method
 ############################################################################
 def dc_process_eval(evaluate, parameters = nil)
-  # evaluate by calling send method 
+  # evaluate by calling send method
   clas, method = evaluate.split('.')
   if method.nil?
     send(clas, *parameters)
@@ -545,40 +553,46 @@ end
 private
 
 ############################################################################
-# Process eval option for field value. 
+# Process eval option for field value.
+#
 # Used for processing single field column on result_set or form head.
 ############################################################################
+#TODO make it universal without parameters complications
 def dc_process_column_eval(yaml, document)
-  # dc_name_for_id
-  if yaml['eval'].match(/dc_name4_id|dc_name_for_id/)
-    parms = dc_eval_to_array(yaml['eval'])
-    if parms.size == 3
-      dc_name_for_id(parms[1], parms[2], nil, document[ yaml['name'] ])
-    else
-      dc_name_for_id(parms[1], parms[2], parms[3], document[ yaml['name'] ])
+  if yaml['params'].blank?
+    parms  = dc_eval_to_array(yaml['eval'])
+    method = parms.shift
+
+    # prepare parameters for dc_name_for_* methods
+    method.sub!('dc_name4_', 'dc_name_for_') if method.match(/^dc_name4_/)
+    if method == 'dc_name_for_id' && parms.size == 2
+      parms << 'id'
     end
-
-  # dc_name_for_value from locale definition
-  elsif yaml['eval'].match(/dc_name4_value|dc_name_for_value/)
-    parms = dc_eval_to_array(yaml['eval'])
-    if parms.size == 1
-      dc_name_for_value( @form['table'], yaml['name'], document[ yaml['name'] ] )
-    else
-      dc_name_for_value( parms[1], parms[2], document[ yaml['name'] ] )
+    if method == 'dc_name_for_value' && parms.size < 2
+      parms = [@form['table'], yaml['name']]
     end
 
-  # defined in helpers. For example dc_icon_for_boolean
-  elsif respond_to?(yaml['eval'])
-    send(yaml['eval'], document, yaml['name'])
+    parms << document[yaml['name']]
+    parms.map!{ %w[record document].include?(_1.to_s) ? document : _1 }
+    case
+    when method.match(/^dc_/)
+      send(method, *parms)
 
-  # defined in model
-  elsif document.respond_to?(yaml['eval'])
-    document.send(yaml['eval'])
+    when respond_to?(method)
+      parms = [document] + parms
+      send(method, *parms)
 
-  # special eval  
-  elsif yaml['eval'].match('eval ')
-  # TO DO evaluate with specified parameters
+    # model method
+    when document.respond_to?(method)
+      document.send(method)
 
+    # some class method
+    when method.match('.')
+      klass, method = method.split('.')
+      klass.classify.constantize.send(method, *parms)
+    else
+      '?????'
+    end
   # eval with params
   else
     parms = {}