drg_cms 0.6.0.6 → 0.6.0.8

data/app/helpers/{cmsedit_edit_helper.rb → cms_edit_helper.rb}

@@ -27,7 +27,7 @@
 # data found in 3 major sections of DRG CMS form: index, result_set and form sections. 
 #
 ###########################################################################
-module CmseditEditHelper
+module CmsEditHelper
 
 ############################################################################
 # Will return value when internal or additional parameters are defined in action
@@ -61,7 +61,15 @@ def dc_is_action_active?(options)
   # usually only for test
   when option.class  == TrueClass || option['eval'].class == TrueClass then true    
   when option.class == String then
-    (@record.new_record? && option == 'new_record') || (!@record.new_record? && option == 'not_new_record')
+    if option.match(/new_record/i)
+      (@record.new_record? && option == 'new_record') || (!@record.new_record? && option == 'not_new_record')
+    elsif option.match(/\./)
+      # shortcut for method and eval option
+      parms = @record ? @record : params
+      dc_process_eval(option,parms)
+    else
+      eval(option['eval'])
+    end
   # direct evaluate expression
   when option['eval'] then
     eval(option['eval'])
@@ -98,6 +106,7 @@ def dc_actions_for_form(position)
   actions = std_actions if actions.nil?
 # readonly 
   actions = {1 => 'back'} if @form['readonly']
+  actions = {1 => 'close'} if params[:window_close]
 # Actions are strictly forbidden 
   if @form['form']['actions'] and dc_dont?(@form['form']['actions'])
     actions = []
@@ -126,7 +135,7 @@ def dc_actions_for_form(position)
     next if options.nil?  # yes it happends
     parms = @parms.clone
     if options.class == String
-      next if params[:readonly] and !(options == 'back')
+      next if params[:readonly] and !options.match(/back|close/)
       
       html << '<li class="dc-link dc-animate">'
       html << case 
@@ -162,6 +171,14 @@ def dc_actions_for_form(position)
           
         when options == 'refresh' then
           "<div onclick='window.location.href=window.location.href;'>#{fa_icon('refresh')} #{t('drgcms.refresh')}</div></li>"
+          
+        when options == 'close' then
+          close = params[:window_close].to_i
+          if close < 2
+            "<div onclick='window.close();'>#{fa_icon('close')} #{t('drgcms.close')}</div></li>"
+          else
+            "<div onclick='history.back();'>#{fa_icon('close')} #{t('drgcms.close')}</div></li>"
+          end
       else 
         "err1 #{key}=>#{options}"
       end
@@ -247,21 +264,13 @@ def dc_check_and_default(value, default, values=nil) #:nodoc:
   value
 end
 
-############################################################################
-# Creates top or bottom horizontal line on form. 
-############################################################################
-def dc_top_bottom_line(options)
-  '<div class="dc-separator"></div>'
-end    
-
 ############################################################################
 # Creates input fields for one tab. Subroutine of dc_fields_for_form.
 ############################################################################
 def dc_fields_for_tab(fields_on_tab) #:nodoc:
-  html   = '<div class="dc-form">'
-  labels_pos = dc_check_and_default(@form['form']['labels_pos'], 'right', ['top','left','right'])
-  hidden_fields  = ''
-  odd_even       = nil
+  html = '<div class="dc-form">'
+  labels_pos = dc_check_and_default(@form['form']['labels_pos'], 'right', ['top', 'left', 'right'])
+  hidden_fields, odd_even = '', nil
   group_option, group_count = 0, 0
   reset_cycle()
   # Select form fields and sort them by key
@@ -278,8 +287,8 @@ def dc_fields_for_tab(fields_on_tab) #:nodoc:
     # label
     field_html,label,help = dc_field_label_help(options)
     # Line separator
-    html << dc_top_bottom_line(options['top-line']) if options['top-line']
-    # Begining of new row
+    html << dc_top_bottom_line(:top, options)
+    # Beginning of new row
     if group_count == 0
       html << '<div class="row-div">' 
       odd_even = cycle('odd','even')
@@ -320,7 +329,7 @@ def dc_fields_for_tab(fields_on_tab) #:nodoc:
       html << '<div></div>' if group_option == 2
     end
     
-    html << dc_top_bottom_line(options['bottom-line']) if options['bottom-line']
+    html << dc_top_bottom_line(:bottom, options)
   end
   html << '</div>' << hidden_fields
 end
@@ -332,22 +341,22 @@ def dc_fields_for_form()
   html, tabs, tab_data = '',[], ''
   @js  ||= ''
   @css ||= ''
-# Only fields defined  
+  # Only fields defined
   if (form_fields = @form['form']['fields'])
     html << "<div id='data_fields' " + (@form['form']['height'] ? "style=\"height: #{@form['form']['height']}px;\">" : '>')  
     html << dc_fields_for_tab(form_fields) + '</div>'
   else
-# there are multiple tabs on form 
+    # there are multiple tabs on form
     first = true # first tab 
     @form['form']['tabs'].keys.sort.each do |tab_name|
       next if tab_name.match('actions')
-# Tricky. If field name is not on the tab skip to next tab
+      # Tricky. If field name is not on the tab skip to next tab
       if params[:edit_only]
         is_on_tab = false
         @form['form']['tabs'][tab_name].each {|k,v| is_on_tab = true if params[:edit_only] == v['name'] }
         next unless is_on_tab
       end
-# first div is displayed, all others are hidden      
+      # first div is displayed, all others are hidden
       tab_data << "<div id=\"data_#{tab_name.delete("\s\n")}\""
       tab_data << ' class="div-hidden"' unless first
       tab_data << " style=\"height: #{@form['form']['height']}px;\"" if @form['form']['height']
@@ -356,13 +365,13 @@ def dc_fields_for_form()
       tabs << [tab_name, tab_label]
       first = false      
     end
-# make it all work together
+    # make it all work together
     html << '<ul class="dc-form-ul" >'
     first = true # first tab must be selected
     tabs.each do |tab_name, tab_label| 
       html << "<li id=\"li_#{tab_name}\" data-div=\"#{tab_name.delete("\s\n")}\" class=\"dc-form-li"
       html << ' dc-form-li-selected' if first 
-      html << "\">#{t(tab_label, t_name(tab_label,tab_label))}</li>" 
+      html << "\">#{t(tab_label, t_name(tab_label, tab_label))}</li>"
       first = false
     end
     html << '</ul>'
@@ -378,9 +387,8 @@ def dc_fields_for_form()
   html.html_safe
 end
 
-
 ############################################################################
-# Creates head form div. Head form div is used to display header datausefull
+# Creates head form div. Head form div is used to display header data usefull
 # to be seen even when tabs are switched.
 ############################################################################
 def dc_head_for_form()
@@ -468,4 +476,23 @@ def dc_document_statistics
   (html << '</div></div>').html_safe
 end
 
+private
+
+############################################################################
+# Creates top or bottom horizontal line on form.
+#
+# @param [String] location (top or bottom)
+# @param [Object] options yaml field definition
+#
+# @return [String] html code for drawing a line
+############################################################################
+def dc_top_bottom_line(location, options)
+  if options["#{location}-line"] || options['line'].to_s == location.to_s
+    '<div class="dc-separator"></div>'
+  else
+    ''
+  end
+end
+
+
 end

data/app/helpers/{cmsedit_helper.rb → cms_helper.rb}

@@ -26,7 +26,7 @@
 # CmseditHelper module defines common methods used for DRGCMS forms.
 #
 ###########################################################################
-module CmseditHelper
+module CmsHelper
   # javascript part created by form helpers
   attr_reader :js 
   
@@ -75,29 +75,33 @@ end
 def dc_field_label_help(options)
   # no label or help in comments
   unless %w(comment action).include?(options['type'])
-    caption = options['caption'] || options['text']
-    label = if caption.blank?    
+    label = options['caption'] || options['text'] || options['label']
+    label = if label.blank?
       t_name(options['name'], options['name'].capitalize.gsub('_',' ') )
     elsif options['name']
-      t(caption, caption) 
+      t(label, label)
     end
     # help text can be defined in form or in translations starting with helpers. or as helpers.help.collection.field
-    help = if options['help'] 
-      options['help'].match('helpers.') ? t(options['help']) : options['help']
-    end
-    help ||= t('helpers.help.' + @form['table'] + '.' + options['name'],' ') if options['name'] 
+    help = options['help']
+    help ||= "helpers.help.#{@form['table']}.#{options['name']}" if options['name']
+    help = t(help, ' ') if help.to_s.match(/helpers\./)
   end
-  # create field object from class and call its render method
-  klass_string = options['type'].camelize
-  field_html = if DrgcmsFormFields.const_defined?(klass_string) # when field type defined
-    klass = DrgcmsFormFields.const_get(klass_string)
-    field = klass.new(self, @record, options).render
-    @js  << field.js
-    @css << field.css
-    field.html 
-  else # litle error string
-    "Error: Field type #{options['type']} not defined!"
+  # create field object from type option and call its render method
+  if options['type'].present?
+    klass_string = options['type'].camelize
+    field_html = if DrgcmsFormFields.const_defined?(klass_string) # when field type defined
+      klass = DrgcmsFormFields.const_get(klass_string)
+      field = klass.new(self, @record, options).render
+      @js  << field.js
+      @css << field.css
+      field.html
+    else
+      "Error: Field type #{options['type']} not defined!"
+    end
+  else
+    "Error: Field type missing!"
   end
+
   [field_html, label, help]
 end
 
@@ -110,25 +114,26 @@ def dc_field_action(yaml)
     value = params['record'][yaml['name']]
     params["p_#{yaml['name']}"] = value
   end
-  #
+  # find field definition on form
   if ( field_definition = dc_get_field_form_definition(yaml['name']) )
-     field, label, help = dc_field_label_help(field_definition)
+    # some options may be redefined
+    field_definition['size'] = yaml['size'] if yaml['size']
+    field, label, help = dc_field_label_help(field_definition)
   else
     yaml['type'] = yaml['field_type']
     field, label, help = dc_field_label_help(yaml)
   end
-   # input field will have label as placeholder
-   field = field.sub('input',"input placeholder=\"#{label}\"")
-   %Q[<li class="no-background">#{field}</li>]
-  
+  # input field will have label as placeholder
+  field = field.sub('input',"input placeholder=\"#{label}\"")
+  %Q[<li class="no-background">#{field}</li>]
 end
 
 ############################################################################
-#
+# Create ex. class="my-class" html code from html options for action
 ############################################################################
 def dc_html_data(yaml)
   return '' if yaml.blank?
-  yaml.inject(' ') {|result, e| result << "#{e.first}=\"#{e.last}\" "}
+  yaml.inject(' ') {|result, e| result = e.last.nil? ? result : result << "#{e.first}=\"#{e.last}\" "}
 end
 
 ############################################################################
@@ -154,6 +159,9 @@ def dc_link_ajax_window_submit_action(yaml, record=nil, action_active=true)
   yaml['html'] ||= {}
   confirm = yaml['html']['data-confirm'] || yaml['confirm']
   yaml['html']['data-confirm'] = t(confirm) unless confirm.blank?
+  yaml['html']['title'] ||= yaml['title']
+  yaml['html']['title'] = t(yaml['title'])
+  yaml['html']['target'] ||= yaml['target']
   # direct url
   if yaml['url']
     parms['controller'] = yaml['url'] 
@@ -162,7 +170,7 @@ def dc_link_ajax_window_submit_action(yaml, record=nil, action_active=true)
   else
     parms['controller'] = yaml['controller'] || 'cmsedit'
     parms['action']     = yaml['action'] 
-    parms['table']      = yaml['table'] 
+    parms['table']      = yaml['table'] || @form['table']
     parms['form_name']  = yaml['form_name']
     parms['control']    = yaml['control'] if yaml['control']
     parms['id']         = record.id if record
@@ -176,15 +184,14 @@ def dc_link_ajax_window_submit_action(yaml, record=nil, action_active=true)
   if parms['controller'].nil? && parms['url'].nil?
     "<li>#{'Controller not defined'}</li>"
   else
-    yaml['caption'] ||= yaml['text'] 
-    
+    yaml['caption'] ||= yaml['text']
     html_data = dc_html_data(yaml['html'])
     #
     url = url_for(parms) rescue 'URL error'
     request = yaml['request'] || yaml['method'] || 'get'
     if yaml['type'] == 'ajax' # ajax button
       clas = "dc-link-ajax dc-animate"
-      %Q[<li class="#{clas}" data-url="#{action_active ? url : ''}"  #{html_data}
+      %Q[<li class="#{clas}" data-url="#{action_active ? url : ''}" #{html_data}
          data-request="#{request}" title="#{yaml['title']}">#{icon}#{caption}</li>]
 
     elsif yaml['type'] == 'submit'  # submit button
@@ -197,7 +204,7 @@ def dc_link_ajax_window_submit_action(yaml, record=nil, action_active=true)
 
     elsif yaml['type'] == 'link'  # link button
       clas = "dc-link dc-animate"
-      link = dc_link_to(yaml['caption'],yaml['icon'], parms, {target: yaml['target'], html: yaml['html']} )
+      link = dc_link_to(yaml['caption'], yaml['icon'], parms, html_data )
       %Q[<li class="#{clas}">#{action_active ? link : caption}</li>]
 
     elsif yaml['type'] == 'window'

data/app/helpers/{cmsedit_index_helper.rb → cms_index_helper.rb}

@@ -27,29 +27,8 @@
 # data found in 3 major sections of DRG CMS form: index, result_set and form sections. 
 #
 ###########################################################################
-module CmseditIndexHelper
+module CmsIndexHelper
   
-############################################################################
-# Get standard actions when actions directive contains single line.
-# Subroutine of dc_actions_for_index
-# 
-# Allows for actions: new, filter, standard syntax
-############################################################################
-def define_standard_actions(actions_params, standard)
-  actions = {}
-  actions_params.split(',').each do |an_action|
-    an_action.strip!
-    if an_action == 'standard'
-      actions.merge!(standard)
-    else
-      standard.each do |index, action| 
-        (actions[index] = action; break) if action == an_action
-      end
-    end
-  end 
-  actions
-end
-
 ############################################################################
 # Creates action div for cmsedit index action. 
 ############################################################################
@@ -62,7 +41,7 @@ def dc_actions_for_index()
   
   std_actions = {2 => 'new', 3 => 'sort', 4 => 'filter' }
   if actions.class == String
-    actions = define_standard_actions(actions, std_actions)
+    actions = dc_define_standard_actions(actions, std_actions)
   elsif actions['standard']
     actions.merge!(std_actions)
     actions['standard'] = nil
@@ -113,7 +92,7 @@ EOT
       end
       fa_icon('sort-alpha-asc') + ' ' + t('drgcms.sort') + ' ' + 
               select('sort', 'sort', choices, { include_blank: true }, 
-              { class: 'drgcms_sort', 'data-table' => @form['table']} )
+              { class: 'drgcms_sort', 'data-table' => @form['table'], 'data-form' => params['form_name']} )
 # filter
     when action == 'filter' then 
       caption = t('drgcms.filter')
@@ -121,8 +100,9 @@ EOT
 # add filter OFF link
       sess = session[@form['table']]
       if sess and sess[:filter]
-        caption << '&nbsp;&nbsp;' + dc_link_to(nil,'remove lg', {controller: 'cmsedit', 
-                   filter: 'off', table: @form['table']}, { title: DcFilter.title4_filter_off(sess[:filter]) }) 
+        caption << '&nbsp;&nbsp;' + dc_link_to(nil,'remove lg',
+                   { controller: 'cmsedit', filter: 'off', table: @form['table'], form_name: params['form_name'] },
+                   { title: DcFilter.title4_filter_off(sess[:filter]) })
       end
       caption
 # new
@@ -229,79 +209,63 @@ end
 ############################################################################
 def dc_table_title_for_result(result=nil)
   title = if @form['title'] # form has title section
-    t(@form['title'], @form['title'])
+    if @form['title'].class == Hash
+      dc_process_eval(@form['title']['eval'], [@form['title']['caption'] || @form['title']['text'], params])
+    else
+      t(@form['title'], @form['title'])
+    end
   else # get name from translations
     t("helpers.label.#{@form['table']}.tabletitle", @form['table'])
   end
   dc_table_title(title, result)
 end
 
-############################################################################
-# Creates code for link or ajax action type. Subroutine of dc_actions_for_result.
-############################################################################
-def __dc_link_or_ajax_action(yaml, parms) #:nodoc:
-  rest = {}
-  rest['method']  = yaml['method'] || yaml['request'] || 'get'
-  rest['caption'] = yaml['caption'] || yaml['text']
-  rest['class']   = 'dc-animate'
-  rest['title']   = yaml['title']
-  
-  if yaml['type'] == 'link'
-    dc_link_to(yaml['caption'], yaml['icon'], parms, rest ) 
-  else
-    rest['data-url'] = url_for(parms)
-    rest['class'] << " fa fa-#{yaml['icon']}"
-    fa_icon(yaml['icon'], rest ) 
-  end
-end
-
 ############################################################################
 # Determines actions and width of actions column
 ############################################################################
-def dc_actions_column()
+def dc_actions_column
   actions = @form['result_set']['actions']
-  return [{},0] if actions.nil? or dc_dont?(actions)
+  return [{}, 0] if actions.nil? or dc_dont?(actions)
 # standard actions  
   actions = {'standard' => true} if actions.class == String && actions == 'standard'
-  std_actions = {' 2' => 'edit', ' 3' => 'delete'}
+  std_actions = { 2 => 'edit', 5 => 'delete' }
   if actions['standard']
     actions.merge!(std_actions) 
     actions.delete('standard')
   end
 #  
   width = @form['result_set']['actions_width'] || 18*actions.size
-  [ actions, width ] 
+  [actions, width]
 end
 
 ############################################################################
 # Calculates (blank) space required for actions when @record_footer is rendered 
 ############################################################################
-def dc_actions_column_for_footer()
+def dc_actions_column_for_footer
   return '' unless @form['result_set']['actions']
+
   ignore, width = dc_actions_column
   %Q[<div class="actions" style="width: #{width}px;"></div>].html_safe
 end
 
-
 ############################################################################
 # Creates actions that could be performed on single row of result set.
 ############################################################################
 def dc_actions_for_result(document)
   actions = @form['result_set']['actions']
   return '' if actions.nil? or @form['readonly']
-#  
+
   actions, width = dc_actions_column()
   html = %Q[<ul class="actions" style="width: #{width}px;">]
-  actions.each do |k,v|
+  actions.sort_by(&:first).each do |k, v|
     session[:form_processing] = "result_set:actions: #{k}=#{v}"
-    next if k == 'standard' # ignore standard definition
-    parms = @parms.clone   
+    parms = @parms.clone
     # if single definition simulate type parameter
-    yaml = v.class == String ? {'type' => v} : v
+    yaml = v.class == String ? { 'type' => v } : v
     # code already includes li tag
     if %w(ajax link window submit).include?(yaml['type']) then
       @record = document # otherwise document fields can't be used as parameters
-      html << dc_link_ajax_window_submit_action(yaml,document)
+      html << dc_link_ajax_window_submit_action(yaml, document)
     else
       html << '<li class="dc-link">'
       html << case
@@ -327,21 +291,7 @@ def dc_actions_for_result(document)
         parms['ids']   ||= ''
         parms['ids']   +=  "#{document.id};"
         dc_link_to( nil, 'table lg', parms, method: :get )
-=begin        
-      when yaml['type'] == 'link' || yaml['type'] == 'ajax' then
-        if yaml['url']
-          parms['controller'] = yaml['url']
-          parms['idr']        = document.id
-        else
-          parms['id']         = document.id
-        end
-        parms['controller'] = yaml['controller'] if yaml['controller']
-        parms['action']     = yaml['action']     if yaml['action']
-        parms['table']      = yaml['table']      if yaml['table']
-        parms['form_name']  = yaml['form_name']  if yaml['form_name']
-        parms['target']     = yaml['target']     if yaml['target']
-        dc_link_or_ajax_action(yaml, parms)
-=end        
+    
       else # error. 
         yaml['type'].to_s
       end
@@ -359,33 +309,35 @@ def dc_header_for_result()
   html = '<div class="dc-result-header">'
   if @form['result_set']['actions'] and !@form['readonly']
     ignore, width = dc_actions_column()
-    html << %Q[<div class="actions" style="width: #{width}px;"></div>]
+    html << %Q[<div class="actions" style="width:#{width}px;"></div>]
   end
   # preparation for sort icon  
   sort_field, sort_direction = nil, nil
   if session[@form['table']]
     sort_field, sort_direction = session[@form['table']][:sort].to_s.split(' ')
   end
-  #  
+
   if (columns = @form['result_set']['columns'])
-    columns.sort.each do |k,v|
+    columns.sort.each do |k, v|
       session[:form_processing] = "result_set:columns: #{k}=#{v}"
-      th = %Q[<div class="th" style="width: #{v['width'] || '15%'};text-align: #{v['align'] || 'left'};" data-name="#{v['name']}"]
-      # when no caption or name is defined it might be just spacer      
-      if (caption = v['caption']).nil? 
-        caption = v['name'] ? t("helpers.label.#{@form['table']}.#{v['name']}") : ''
-      end
+      next if v['width'].to_s.match(/hidden|none/i)
+
+      th = %Q[<div class="th" style="width:#{v['width'] || '15%'};text-align:#{v['align'] || 'left'};" data-name="#{v['name']}"]
+      label = v['caption'] || v['label']
+      label = (v['name'] ? "helpers.label.#{@form['table']}.#{v['name']}" : '') if label.nil?
+      label = t(label) if label.match(/helpers\./)
       # no sorting when embedded documents or custom filter is active 
       sort_ok = @form['result_set'].nil? || (@form['result_set'] && @form['result_set']['filter'].nil?)
       sort_ok = sort_ok || (@form['index'] && @form['index']['sort'])
+      sort_ok = sort_ok && !dc_dont?(v['sort'], false)
       if @tables.size == 1 and sort_ok
         icon = 'sort lg'
         if v['name'] == sort_field
           icon = sort_direction == '1' ? 'sort-alpha-asc lg' : 'sort-alpha-desc lg'
         end        
-        th << ">#{dc_link_to(caption, icon, sort: v['name'], table: params[:table], form_name: params[:form_name], action: :index, icon_pos: :last )}</div>"
+        th << ">#{dc_link_to(label, icon, sort: v['name'], table: params[:table], form_name: params[:form_name], action: :index, icon_pos: :last )}</div>"
       else
-        th << ">#{caption}</div>"
+        th << ">#{label}</div>"
       end
       html << "<div class=\"spacer\"></div>" + th
     end
@@ -407,6 +359,8 @@ def dc_clicks_for_result(document)
     opts[:form_name]  = yaml['form_name']
     opts[:method]     = yaml['method'] || 'get'
     opts[:id]         = document['id']
+    opts[:readonly]   = yaml['readonly'] if yaml['readonly']
+    opts[:window_close] = yaml['window_close'] if yaml['window_close']
     html << ' data-dblclick=' + url_for(opts) 
   else
      html << (' data-dblclick=' +
@@ -422,14 +376,13 @@ end
 ############################################################################
 def dc_format_value(value, format=nil)
   return '' if value.nil?
+
   klass = value.class.to_s
-  case when klass.match('Time') then
-    format ||= t('time.formats.default')
-    value.strftime(format)  
-  when klass.match('Date') then
-    format ||= t('date.formats.default')
-    value.strftime(format)  
-  when format.to_s[0] == 'N' then
+  if klass.match(/time|date/i)
+    CmsCommonHelper.dc_format_date_time(value, format)
+  elsif format.to_s[0] == 'N'
+    return '' if value == 0 and format.match('z')
+
     dec = format[1].blank? ? nil : format[1].to_i
     sep = format[2].blank? ? nil : format[2]
     del = format[3].blank? ? nil : format[3]
@@ -440,26 +393,6 @@ def dc_format_value(value, format=nil)
   end
 end      
 
-############################################################################
-# Defines style or class for row (tr) or column (td)
-############################################################################
-def dc_style_or_class(selector, yaml, value, record)
-  return '' if yaml.nil?
-# alias record and value so both names can be used in eval
-  field, document = value, record
-  html = selector ? "#{selector}=\"" : ''
-  html << if yaml.class == String
-    yaml
-  # direct evaluate expression
-  elsif yaml['eval']
-    eval(yaml['eval']) rescue 'background-color:red;'
-  elsif yaml['method']
-    dc_process_eval(yaml['method'],record)
-  end
-  html << '"' if selector 
-  html
-end 
-
 ############################################################################
 # Creates tr code for each row of result set.
 ############################################################################
@@ -469,6 +402,52 @@ def dc_row_for_result(document)
   "<div  id=\"#{document.id}\" class=\"dc-result-data #{clas}\" #{dc_clicks_for_result(document)} #{style}>".html_safe
 end
 
+############################################################################
+# Creates column for each field of result set document.
+############################################################################
+def dc_columns_for_result(document)
+  return '' unless @form['result_set']['columns']
+  html = ''  
+  @form['result_set']['columns'].sort.each do |k,v|
+    session[:form_processing] = "result_set:columns: #{k}=#{v}"
+    next if v['width'].to_s.match(/hidden|none/i)
+
+    # convert shortcut to hash 
+    v = {'name' => v} if v.class == String    
+    begin
+      # eval
+      value = if v['eval']
+        dc_process_column_eval(v, document)
+      # as field        
+      elsif document.respond_to?(v['name'])
+        dc_format_value(document.send( v['name'] ), v['format']) 
+      # as hash (dc_memory)
+      elsif document.class == Hash 
+        dc_format_value(document[ v['name'] ], v['format'])
+      # error
+      else
+        "??? #{v['name']}"
+      end
+    rescue Exception => e
+      dc_log_exception(e)
+      value = '!!!Error'
+    end
+    html << '<div class="spacer"></div>'
+    # set class
+    clas = dc_style_or_class(nil, v['td_class'], value, document)
+    # set width and align an additional style
+    style = dc_style_or_class(nil, v['td_style'] || v['style'], value, document)
+    flex_align  = v['align'].to_s == 'right' ? 'flex-direction:row-reverse;' : ''
+    width_align = %Q[width:#{v['width'] || '15%'};#{flex_align}]
+    style = "style=\"#{width_align}#{style}\" "
+
+    html << "<div class=\"td #{clas}\" #{style}>#{value}</div>"
+  end
+  html.html_safe
+end
+
+private
+
 ############################################################################
 # Process eval. Breaks eval option and calls with send method.
 # Parameters:
@@ -486,22 +465,41 @@ def dc_process_eval(evaluate, parameters)
   end  
 end
 
+############################################################################
+# Break eval expression to array by parameters.
+# Will break 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 }
+end
+
 ############################################################################
 # Process eval option for field value. 
 # Used for processing single field column on result_set or form head.
 ############################################################################
 def dc_process_column_eval(yaml, document)
-  # dc_name4_id
-  if yaml['eval'].match('dc_name4_id')
-    a = yaml['eval'].split(/\ |\,/)
-    if a.size == 3
-      dc_name4_id(a[1], a[2], nil, document[ yaml['name'] ])
+  # dc_name_for_id
+  if yaml['eval'].match('dc_name4_id') || yaml['eval'].match('dc_name_for_id')
+    prms = dc_eval_to_array(yaml['eval'])
+    if prms.size == 3
+      dc_name_for_id(prms[1], prms[2], nil, document[ yaml['name'] ])
     else
-      dc_name4_id(a[1], a[2], a[3], document[ yaml['name'] ])
+      dc_name_for_id(prms[1], prms[2], prms[3], document[ yaml['name'] ])
     end
-  # dc_name4_value  
-  elsif yaml['eval'].match('dc_name4_value')
-    dc_name4_value( @form['table'], yaml['name'], document[ yaml['name'] ] )
+  # dc_name_for_value from this model
+  elsif yaml['eval'] == 'dc_name4_value' || yaml['eval'] == 'dc_name_for_value'
+    dc_name_for_value( @form['table'], yaml['name'], document[ yaml['name'] ] )
+  # dc_name_for_value from other model  
+  elsif yaml['eval'].match('dc_name4_value') || yaml['eval'].match('dc_name_for_value')
+    prms = dc_eval_to_array(yaml['eval'])
+    dc_name_for_value( prms[1], prms[2], document[ yaml['name'] ] )
+  # for example dc_icon_for_boolean
+  elsif respond_to?(yaml['eval'])
+    send(yaml['eval'], document[ yaml['name'] ])
+  # defined in document
+  elsif document.respond_to?(yaml['eval'])
+    document.send(yaml['eval'])
+  # special eval  
   elsif yaml['eval'].match('eval ')
   # TO DO evaluate with specified parameters
   else
@@ -523,45 +521,44 @@ def dc_process_column_eval(yaml, document)
 end
 
 ############################################################################
-# Creates column for each field of result set document.
+# Defines style or class for row (tr) or column (td)
 ############################################################################
-def dc_columns_for_result(document)
-  return '' unless @form['result_set']['columns']
-  html = ''  
-  @form['result_set']['columns'].sort.each do |k,v|
-    session[:form_processing] = "result_set:columns: #{k}=#{v}"
-    # convert shortcut to hash 
-    v = {'name' => v} if v.class == String    
-    begin
-      # eval
-      value = if v['eval']
-        dc_process_column_eval(v, document)
-      # as field        
-      elsif document.respond_to?(v['name'])
-        dc_format_value(document.send( v['name'] ), v['format']) 
-      # as hash (dc_memory)
-      elsif document.class == Hash 
-        dc_format_value(document[ v['name'] ], v['format'])
-      # error
-      else
-        "!!! #{v['name']}"
+def dc_style_or_class(selector, yaml, value, record)
+  return '' if yaml.nil?
+# alias record and value so both names can be used in eval
+  field, document = value, record
+  html = selector ? "#{selector}=\"" : ''
+  html << if yaml.class == String
+    yaml
+  # direct evaluate expression
+  elsif yaml['eval']
+    eval(yaml['eval']) rescue 'background-color:red;'
+  elsif yaml['method']
+    dc_process_eval(yaml['method'],record)
+  end
+  html << '"' if selector 
+  html
+end 
+
+############################################################################
+# Get standard actions when actions directive contains single line.
+# Subroutine of dc_actions_for_index
+# 
+# Allows for actions: new, filter, standard syntax
+############################################################################
+def dc_define_standard_actions(actions_params, standard)
+  actions = {}
+  actions_params.split(',').each do |an_action|
+    an_action.strip!
+    if an_action == 'standard'
+      actions.merge!(standard)
+    else
+      standard.each do |index, action| 
+        (actions[index] = action; break) if action == an_action
       end
-    rescue Exception => e
-      dc_log_exception(e)
-      value = '!!!Error'
     end
-    html << '<div class="spacer"></div>'
-    # set class
-    clas = dc_style_or_class(nil, v['td_class'], value, document)
-    # set width and align an additional style
-    style = dc_style_or_class(nil, v['td_style'] || v['style'], value, document)
-    width_align = %Q[width: #{v['width'] || '15%'};text-align: #{v['align'] || 'left'};]
-    style = "#{width_align}#{style}"
-
-    html << "<div class=\"td #{clas}\" style=\"#{style}\">#{value}</div>"
-  end
-  html.html_safe
+  end 
+  actions
 end
 
-
 end