drg_cms 0.5.52.9 → 0.5.52.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 40fa56fbdb21a8a10e26ebeefc4f9ebf1a0a41d3
-  data.tar.gz: f3c627f7e59044e1826d120174b91c06d7d0ee25
+  metadata.gz: 637c9ceaf9353fced28bc05ec02a3ad516d91f54
+  data.tar.gz: 949139ee0f5a5351741e94d74d5e7e1502426946
 SHA512:
-  metadata.gz: 377369ee96b9fa738a115e607d3e187ab5a1bb951ea767add202be5cc3e3d1ef9f83f39a03ce8411c8c3fc86889c7d250e4f22c2ee51448b90b1ecc0492b0942
-  data.tar.gz: 2db3772bf7c84abf8a316eb3519f74e86b0d2a2925214f6e8a2a328f2b683ef6fa67df3d56cc4363d2481c7de9e77b030d2481c49ebe720e28a7d43623052f7e
+  metadata.gz: c67a0b1046125b1408fa8604b88d5b9993d29832fbe6daac9d829b4f6c2bb7537049da1636eefd5f5d3aaebdc84e3ef0ed5f9dd9abb56d039a857b509367573c
+  data.tar.gz: 44e2b256013e943de0edb9e96a947e4deebca64a24686809b2b70ed4d1d9edb827aafb0a300473dbfde0888f6044108150eeb84517ca822529f4b69773083499

data/app/assets/javascripts/drg_cms/drg_cms.js

@@ -51,6 +51,38 @@ remove_background_from_iframe = function(obj) {
             '</style>';
   $(head).append(css);    
 };
+
+format_number_field = function(e) {
+  var decimals  = e.attr("data-decimal") || 2;
+  var delimiter = e.attr("data-delimiter") || '.';
+  var separator = e.attr("data-separator") || ',';
+  var currency  = e.attr("data-currency") || '';
+  var whole = e.val().split(separator)[0];
+  var dec   = e.val().split(separator)[1];
+// save value to hidden field which will be used for return 
+  var field = '#' + e.attr("id").slice(0,-1);
+  var value = e.val().replace(delimiter,'.');
+
+  $(field).val( parseFloat(value).toFixed(decimals) );
+
+// decimal part
+  if (dec == null) dec = '';
+  dec = dec.substring(0, decimals, dec);
+  while (dec.length < decimals) dec = dec + '0';
+// whole part 
+  if (whole == null || whole == '') whole = '0';
+  var ar = [];
+
+  while (whole.length > 0) { 
+    var pos1 = whole.length - 3
+    if (pos1 < 0) pos1 = 0;
+    ar.unshift(whole.substr(pos1,3)); 
+    whole = whole.slice(0, -3); 
+  };
+
+  if (delimiter !== '') whole = ar.join(delimiter);
+  e.val(whole + separator + dec + currency);
+};
   
 /*******************************************************************
  * Activate jquery UI tooltip. This needs jquery.ui >= 1.9
@@ -80,6 +112,8 @@ $(function() {
  *  msg_warn: will display warning message.
  *  msg_info: will display informational message.
  *  
+ *  popup: will display popup message
+ *  
  *  #div_divname : will replace divname with value
  *  #div+_divname : will append value to divname
  *  #+div_divname : will prepend value to divname 
@@ -126,6 +160,11 @@ process_json_result = function(json) {
         $('.'+selector).html(val);
       }
       break;
+    // display popup message
+    case 'popup':
+      $('#popup').html(val);
+      $('#popup').bPopup({ speed: 650, transition: 'slideDown' });            
+
     // update div 
     case '#div+':
       $('#'+what).append(val);
@@ -306,9 +345,14 @@ $(document).ready( function() {
  * Process Ajax call on cmsedit form actions
  *******************************************************************/
   $('.dc-link-ajax').on('click', function(e) {
+// check HTML5 validations
+    if (!$("form")[0].checkValidity() ) {
+      $("form")[0].reportValidity();
+      return false;
+    }
     var target = e.target;
     var req    = target.getAttribute("data-request");
-/* Get some values from elements on the page: */
+// Get values from elements on the page:
     if (req == "script") {
       eval (target.getAttribute("data-script"));
       return false;
@@ -625,8 +669,84 @@ element = $(this).find(':first').attr('id');
   .mouseleave(function() {
     console.log("leave");
   });
-
   
+ /*******************************************************************
+  * number_field type entered
+  *******************************************************************/
+   $('.dc-number').on('focus', function(e) {
+    var separator = $(this).attr("data-separator") || ',';
+    var field = '#' + $(this).attr("id").slice(0,-1);
+    var value = $(field).val().replace('.',separator);
+    $(this).val( value );
+    $(this).select();
+   });
+
+  /*******************************************************************
+  * number_field type leaved
+  *******************************************************************/
+   $('.dc-number').on('focusout', function(e) {
+//     format_number_field($(this));
+     
+     var decimals  = $(this).attr("data-decimal") || 2;
+     var delimiter = $(this).attr("data-delimiter") || '.';
+     var separator = $(this).attr("data-separator") || ',';
+     var currency  = $(this).attr("data-currency") || '';
+     var whole = this.value.split(separator)[0];
+     var dec   = this.value.split(separator)[1];
+// save value to hidden field which will be used for return 
+     var field = '#' + $(this).attr("id").slice(0,-1);
+     var value = this.value.replace(separator,'.');
+// remove negative sign and add at the end
+     var sign = whole.substr(0,1);
+     if (sign == '-') { 
+       whole = whole.substr(1,20);
+     } else { 
+       sign = '';
+     }
+    
+     $(field).val( parseFloat(value).toFixed(decimals) );
+     
+// decimal part
+     if (dec == null) dec = '';
+     dec = dec.substring(0, decimals, dec);
+     while (dec.length < decimals) dec = dec + '0';
+// whole part 
+     if (whole == null || whole == '') whole = '0';
+     var ar = [];
+     while (whole.length > 0) { 
+       var pos1 = whole.length - 3
+       if (pos1 < 0) pos1 = 0;
+       ar.unshift(whole.substr(pos1,3)); 
+       whole = whole.slice(0, -3); 
+     };
+          
+     if (delimiter !== '') whole = ar.join(delimiter);
+     $(this).val(sign + whole + separator + dec + currency);
+   });
+   
+ /*******************************************************************
+  * number_field type keypressed
+  *******************************************************************/
+   $('.dc-number').on('keydown', function(e) {
+// Minus sign. Put it on first place     
+     if (e.which == 109) {
+       if($(this).val().substr(0,1) == '-') {
+         $(this).val( $(this).val().substr(1,20));
+       } else {
+         $(this).val( '-' + $(this).val());
+       }
+       e.preventDefault();
+     }
+// Enter. Save value before Enter is processed
+      if (e.which == 13) {
+        var delimiter = $(this).attr("data-delimiter") || '.';
+        var decimals  = $(this).attr("data-decimal") || 2;        
+        var value = $(this).val().replace(delimiter,'.');
+        var field = '#' + $(this).attr("id").slice(0,-1);
+        
+        $(field).val( parseFloat(value).toFixed(decimals) );
+      }
+   });
 });
 
 /*******************************************************************

data/app/assets/javascripts/drg_cms_application.js

@@ -8,4 +8,5 @@
 //= require drg_cms/jquery-migrate
 //= require jquery_ujs
 //= require drg_cms/drg_cms
+//= require drg_cms/jquery.bpopup.min
 //= #require_tree .

data/app/assets/stylesheets/drg_cms/drg_cms.css

@@ -557,6 +557,10 @@ border: 1px solid #ddd;
 */
 }
 
+.dc-number {
+  text-align: right;
+}
+
 .dc-readonly {
   display: inline-block;
   font-size: 14px;

data/app/assets/stylesheets/drg_cms/select-multiple.css

@@ -28,7 +28,7 @@
   -ms-transition: border linear 0.2s, box-shadow linear 0.2s;
   -o-transition: border linear 0.2s, box-shadow linear 0.2s;
   transition: border linear 0.2s, box-shadow linear 0.2s;
-  border: 1px solid #ccc;
+  border: 2px solid #ddd;
   -webkit-border-radius: 3px;
   -moz-border-radius: 3px;
   border-radius: 3px;

data/app/controllers/browse_models_control.rb

@@ -70,7 +70,7 @@ end
 ######################################################################
 # List field definition for single model
 ######################################################################
-def fields()
+def all_fields()
   @records = []
   model = params[:id].classify.constantize
   document = model.new

data/app/controllers/cmsedit_controller.rb

@@ -779,16 +779,16 @@ end
 # to get all edit fields on form. This method does it. Subroutine of save_data.
 ########################################################################
 def fields_on_form() #:nodoc:
-  fields = []
+  form_fields = []
   if @form['form']['fields']
 # read only field elements (key is Integer)
-    @form['form']['fields'].each {|key,options| fields << options if key.class == Integer }
+    @form['form']['fields'].each {|key,options| form_fields << options if key.class == Integer }
   else
     @form['form']['tabs'].keys.each do |tab|
-      @form['form']['tabs'][tab].each {|key,options| fields << options if key.class == Integer }
+      @form['form']['tabs'][tab].each {|key,options| form_fields << options if key.class == Integer }
     end  
   end
-  fields
+  form_fields
 end
 
 ########################################################################
@@ -796,17 +796,17 @@ end
 # It also saves journal data and calls before_save and after_save callbacks.
 ########################################################################
 def save_data
-  fields = fields_on_form()
-  return true if fields.size == 0
+  form_fields = fields_on_form()
+  return true if form_fields.size == 0
 #
-  fields.each do |v|
+  form_fields.each do |v|
     session[:form_processing] = v['name'] # for debuging
     next if v['type'].nil? or
             v['type'].match('embedded') or # don't wipe embedded types
             (params[:edit_only] and params[:edit_only] != v['name']) or # otherwise other fields would be wiped
             v['readonly'] or # fields with readonly option don't return value and would be wiped
             !@record.respond_to?(v['name']) # there can be temporary fields on the form
-    # good to know how to get type of field @record.fields[v['name']].type
+    # good to know! How to get type of field @record.fields[v['name']].type
     # return value from form field definition
     value = DrgcmsFormFields.const_get(v['type'].camelize).get_data(params, v['name'])
     @record.send("#{v['name']}=", value)

data/app/controllers/dc_application_controller.rb

@@ -327,7 +327,7 @@ def dc_process_default_request()
   dc_set_options(@site.settings)
 # HOMEPAGE. When no parameters is set
   params[:path]   = @site.homepage_link if params[:id].nil? and params[:path].nil?
-  @options[:path] = params[:path].split('/')
+  @options[:path] = params[:path].to_s.split('/')
   params[:path]   = @options[:path].first if @options[:path].size > 1
 # some other process request. It should fail if not defined
   return send(@site.request_processor) unless @site.request_processor.blank?

data/app/controllers/dc_common_controller.rb

@@ -187,8 +187,7 @@ end
 ########################################################################
 def copy_clipboard
 # Only administrators can perform this operation  
-  return render(plain: t('drgcms.not_authorized') )  unless dc_user_has_role('admin')
-#  
+  return render(plain: t('drgcms.not_authorized') )  unless dc_user_can(DcPermission::CAN_ADMIN,'dc_site')
   respond_to do |format|
 # just open new window to same url and come back with html request    
     format.json { dc_render_ajax(operation: 'window', url: request.url ) }
@@ -209,8 +208,7 @@ end
 ########################################################################
 def paste_clipboard
 # Only administrators can perform this operation  
-  return render(plain: t('drgcms.not_authorized') ) unless dc_user_has_role('admin')
-  
+  return render(plain: t('drgcms.not_authorized') )  unless dc_user_can(DcPermission::CAN_ADMIN,'dc_site')
   result = ''
   respond_to do |format|
 # just open new window to same url and come back with html request    
@@ -299,10 +297,11 @@ end
 # Fills session with data related to successful login.
 ####################################################################
 def fill_login_data(user, remember_me)
-  session[:user_id]   = user.id
-  session[:user_name] = user.name
-  session[:edit_mode] = 0 
+  session[:user_id]    = user.id
+  session[:user_name]  = user.name
+  session[:edit_mode]  = 0 
   session[:user_roles] = []
+  
 # special for SUPERADMIN
   sa = DcPolicyRole.find_by(system_name: 'superadmin')
   if sa and (role = user.dc_user_roles.find_by(dc_policy_role_id: sa.id))
@@ -310,6 +309,9 @@ def fill_login_data(user, remember_me)
     session[:edit_mode]  = 2
     return
   end
+# Every user has guest role
+  guest = DcPolicyRole.find_by(system_name: 'guest')
+  session[:user_roles] << guest.id if guest
 # read default policy from site  
   default_policy = dc_get_site().dc_policies.find_by(is_default: true)
 # load user roles      
@@ -324,13 +326,6 @@ def fill_login_data(user, remember_me)
     session[:edit_mode] = 1 if policy_role.permission > 1
     session[:user_roles] << role.dc_policy_role_id
   end
-# Add default guest role if no role set
-# This was previously in dc_user_can. I belive it should be here. 
-#TODO This might not be the best idea. Check in the future.
-  if session[:user_roles].size == 0
-    guest = DcPolicyRole.find_by(:system_name => 'guest')
-    session[:user_roles] << guest.id if guest
-  end
 # Save remember me cookie if not CMS user and remember me is selected
   if session[:edit_mode] == 0 and remember_me
     cookies.signed[:remember_me] = { :value => user.id, :expires => 180.days.from_now}

data/app/forms/dc_site.yml

@@ -100,11 +100,11 @@ form:
         name: menu_class
         type: text_field
         size: 20
-      60:
-        name: menu_name
-        type: text_with_select
-        eval: dc_choices4(@record.menu_class,'description','name')
-        size: 30
+#      60:
+#        name: menu_name
+#        type: text_with_select
+#        eval: dc_choices4(@record.menu_class,'description','name')
+#        size: 30
       70:
         name: menu_id
         type: select

data/app/helpers/cmsedit_helper.rb

@@ -364,12 +364,18 @@ def dc_format_value(value, format=nil)
 # :TODO: Enable formating numbers.
   return '' if value.nil?
   klass = value.class.to_s
-  if klass.match('Time')
+  case when klass.match('Time') then
     format ||= t('time.formats.default')
     value.strftime(format)  
-  elsif klass.match('Date')
+  when klass.match('Date') then
     format ||= t('date.formats.default')
     value.strftime(format)  
+  when format.to_s[0] == 'N' then
+    dec = format[1].blank? ? nil : format[1].to_i
+    sep = format[2].blank? ? nil : format[2]
+    del = format[3].blank? ? nil : format[3]
+    cur = format[4].blank? ? nil : format[4]
+    dc_format_number(value, dec, sep, del, cur)
   else
     value.to_s
   end
@@ -675,7 +681,7 @@ end
 ############################################################################
 # Creates input fields for one tab. Subroutine of dc_fields_for_form.
 ############################################################################
-def dc_fields_for_tab(fields) #:nodoc:
+def dc_fields_for_tab(fields_on_tab) #:nodoc:
   @js      ||= ''
   html       = '<div class="dc-form">'
   labels_pos = dc_check_and_default(@form['form']['labels_pos'], 'right', ['top','left','right'])
@@ -687,7 +693,7 @@ def dc_fields_for_tab(fields) #:nodoc:
 #  form_options = fields.select {|field| field.class != Integer }
 #  columns      = form_options.try(:[],'columns') || 1
 # Select form fields and sort them by key
-  form_fields  = fields.select {|field| field.class == Integer }
+  form_fields  = fields_on_tab.select {|field| field.class == Integer }
   form_fields.to_a.sort.each do |element|
     options = element.last
     session[:form_processing] = "form:fields: #{element.first}=#{options}"
@@ -761,9 +767,9 @@ end
 def dc_fields_for_form()
   html, tabs, tdata = '',[], ''
 # Only fields defined  
-  if (fields = @form['form']['fields'])
+  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(fields) + '</div>'
+    html << dc_fields_for_tab(form_fields) + '</div>'
   else
 # there are multiple tabs on form 
     first = true # first tab 

data/app/helpers/dc_application_helper.rb

@@ -766,10 +766,10 @@ end
 ############################################################################
 def dc_name4_id(model, field, field_name, id=nil)
   return '' if id.nil?
-  field_name = 'id' if field_name.nil?
+  field_name ||= 'id'
   model = model.strip.classify.constantize if model.class == String
   rec = Mongoid::QueryCache.cache { model.find_by(field_name.strip.to_sym => id) }
-  rec.nil? ? '' : rec[field]
+  rec.nil? ? '' : (rec.send(field) rescue 'not defined')
 end
 
 ############################################################################
@@ -813,6 +813,44 @@ def dc_date_time(value, format) #:nodoc:
   dc_format_date_time(value, format)
 end
 
+############################################################################
+# Returns html code for displaying formatted number.
+# 
+# Parameters:
+# [value] Numeric number.  
+# [decimals] Integer. Number of decimals
+# [separator] String. Decimals separator
+# [delimiter] String. Thousands delimiter.
+# [currency] String. Currency symbol if applied to result string.
+############################################################################
+def dc_format_number(value=0, decimals=nil, separator=nil, delimiter=nil, currency=nil)
+  decimals  ||=  I18n.t('number.currency.format.precision')
+  separator ||= I18n.t('number.currency.format.separator')
+  separator = '' if decimals == 0
+  delimiter ||= I18n.t('number.currency.format.delimiter')
+  whole,dec = value.to_s.split('.')
+  whole = '0' if whole.blank?
+# remove and remember sign  
+  sign = whole[0,1]
+  if sign == '-'
+    whole = whole[1,20]
+  else
+    sign = ''
+  end
+# format decimals
+  dec ||= '0'
+  dec = dec[0,decimals]
+  while dec.size < decimals do dec += '0' end
+# slice whole on chunks of 3
+  ar = []
+  while whole.size > 0 do 
+    n = whole.size >=3 ? 3 : whole.size 
+    ar << whole.slice!(n*-1,n)
+  end
+# put it all back and format
+  "#{sign}#{ar.reverse.join(delimiter)}#{separator}#{dec}" 
+end
+
 ####################################################################
 # Parse site name from url and return dc_site document. Site document will be cached in
 # @site variable.
@@ -1056,7 +1094,6 @@ def dc_user_can_view(ctrl, policy_id)
   policy_id = nil unless policy_id.class == BSON::ObjectId
 #
   site = ctrl.site
-  policies = site.dc_policies
   policies = if site.inherit_policy.blank? 
     site.dc_policies
   else
@@ -1075,7 +1112,7 @@ def dc_user_can_view(ctrl, policy_id)
     return false, 'Access policy not found for part!' unless part_policy
     part_policy.dc_policy_rules.to_a.each { |v| permissions[v.dc_policy_role_id] = v.permission }
   end
-# apply guest role if user has no roles defined
+# apply guest role if no roles defined
   if ctrl.session[:user_roles].nil?
     role = Mongoid::QueryCache.cache { DcPolicyRole.find_by(system_name: 'guest', active: true) }
     return false, 'System guest role not defined!' unless role

data/app/helpers/dc_menu_renderer.rb

@@ -110,6 +110,8 @@ end
 # [item] MenuItem.
 ########################################################################
 def link_4menu(item)
+# just horizontal line
+  return item.caption if item.caption == '<hr>'
 # prepand to link  
   link = if !item.link_prepend.blank?
     item.link_prepend

data/app/helpers/dc_simple_menu_renderer.rb

@@ -226,35 +226,31 @@ end
 def as_dropdown
   html = link_4edit
   return "#{html}#{@opts[:name]}<br>Menu not found!" if @menu.nil?
-  # 
-  items = @menu.dc_simple_menu_items.sort {|a,b| a.order <=> b.order}
-  @selected = find_selected
-
-  html << "<div id='#{@menu.div_name}'>" unless @menu.div_name.blank?
-  html << '<table><tr>'
   # sort items acording to :order 
+  items = @menu.dc_simple_menu_items.where(active: true).order_by(order: 1)
+  @selected = find_selected
+  div_name  = (@menu.div_name.blank? ? @menu.name : @menu.div_name ).downcase
+  
+  html << "<div id='#{div_name}'><ul>"
   items.each do |item|
-    next unless item.active
     # menu can be hidden from user    
     can_view, msg = dc_user_can_view(@parent, item)
     next unless can_view
 #
-    selector = item.id == @selected.id ? 'th' : 'td'
-    html << "<#{selector}>#{ link_4menu(item) }"
-    y = YAML.load(item.submenu) || {}
-    if y.size > 0
+    selected = item.id == @selected.id ? 'selected' : ''
+    html << "<li class=\"#{selected}\">#{ link_4menu(item) }"
+    y = YAML.load(item.submenu) rescue {}
+    if y and y.size > 0
       html << '<ul>'
       y.each do |k,v|
-        html << "<li>#{@parent.link_to(v['title'], v['link'], {target: v['target']})}</li>"
+        v ||= k # defined as array
+        html << (v['title'] == '<hr>' ? '<hr>' : "<li>#{@parent.link_to(v['title'], v['link'], {target: v['target']})}</li>" )
       end
       html << '</ul>'
     end
-    html << "</#{selector}>"
-
+    html << "</li>"
   end
-  html << '</tr></table>'
-  html << '</div>' unless @menu.div_name.blank?
-  html
+  html << '</ul></div>'
 end
 
 ########################################################################
@@ -273,10 +269,9 @@ def default
   div_name  = (@menu.div_name.to_s.size > 2 ? @menu.div_name : @menu.name).downcase
   html << "<div class=\"#{div_name}\">"
   html << "<ul class=\"ul-#{div_name}\">"
-# sort items acording to :order  
-  items = @menu.dc_simple_menu_items.sort {|a,b| a.order <=> b.order}
+# 
+  items = @menu.dc_simple_menu_items.where(active: true).order_by(order: 1)  
   items.each do |item|
-    next unless item.active
 # menu can be hidden from user 
     can_view, msg = dc_user_can_view(@parent, item)
     next unless can_view
@@ -286,15 +281,16 @@ def default
   end
   html << "</ul></div>"
 # submenu
-  html << "<div class=\"sub-#{div_name}\">
-        <ul class=\"ul-sub-#{div_name}\">"
-  y = YAML.load(@selected.submenu) rescue []
-  if y.class == Hash
+  y = YAML.load(@selected.submenu) rescue {}
+  if y and y.size > 0
+    html << "\n<div class=\"sub-#{div_name}\"><ul class=\"ul-sub-#{div_name}\">"
     y.each do |k,v|
-      html << "<li class=\"li-sub-#{div_name}\">#{@parent.link_to(v['title'], v['link'])}</li>"
+      v ||= k # defined as array
+      html << "<li class=\"li-sub-#{div_name}\">#{@parent.link_to(v['title'], v['link'])}</li>\n"
     end
+    html << "</ul></div>\n"
   end
-  html << '</ul></div>'
+  html
 end
 
 

data/app/models/concerns/dc_site_concern.rb

@@ -93,7 +93,7 @@ end
 # Return choices for select for site_id
 ########################################################################
 def self.choices4_site
-  result = all.inject([]) { |r,site| r << [ (site.active ? '' : t('drgcms.disabled') ) + site.name, site._id] }
+  result = all.inject([]) { |r,site| r << [ (site.active ? '' : I18n.t('drgcms.disabled') ) + site.name, site._id] }
   result.sort {|a,b| a[0] <=> b[0]}
 end
 

data/app/models/concerns/dc_user_concern.rb

@@ -74,10 +74,11 @@ has_secure_password
 index( { username: 1 }, { unique: true } )
 index( { email: 1 }, { unique: true } )
 index 'dc_user_roles.dc_policy_role_id' => 1  
-
 index 'members' => 1  
 
 validates_length_of :username, minimum: 4
+validates           :username, uniqueness: true  
+validates           :email,    uniqueness: true  
 before_save :do_before_save
 
 ##########################################################################

data/app/models/dc_design.rb

@@ -113,8 +113,9 @@ class DcDesign
 # end user.
 ########################################################################
 def self.choices4_design(site=nil)
-  list = site.nil? ? where(active: true) : where(active: true).in(site_id: [nil,site.id])
-  list.sort(name: 1).inject([]) { |r,design| r << [ design.description, design._id] }
+  list = site.nil? ? where(active: true) : where(active: true).in(site_id: [nil,site.id]).to_a
+  list.sort! { |w1, w2| w1.description.casecmp(w2.description) }
+  list.inject([]) { |r, design| r << [ design.description, design._id] }
 end
   
 end

data/app/models/dc_filter.rb

@@ -88,8 +88,8 @@ def self.get_field_form_definition(name, parent) #:nodoc:
   form = parent.form
   form['form']['tabs'].each do |tab|
 # Array with 2 elements. First is tabname, second is data      
-    fields = tab.last
-    fields.each {|k,v| return v if (k.class == Integer and v['name'] == name) }
+    my_fields = tab.last
+    my_fields.each {|k,v| return v if (k.class == Integer and v['name'] == name) }
   end if form['form']['tabs'] #  I know. But nice. 
 #
   form['form']['fields'].each do |field|
@@ -121,10 +121,11 @@ def self.get_filter_field(parent)
     end
   end
 # field redefined with input keyword. Name must start with _
-  field['name'] = '_filter_field'
-  field['type'] = filter['input'] if filter['input'].to_s.size > 5
-  field['type'] ||= 'text_field'
-  field['html'] ||= {} 
+  field['name']     = '_filter_field'
+  field['type']     = filter['input'] if filter['input'].to_s.size > 5
+  field['type']   ||= 'text_field'
+  field['readonly'] = false   # must be
+  field['html']   ||= {} 
   field['html']['size']  = 20
 # Start with last entered value
   field['html']['value'] = filter['value'] unless filter['value'] == '#NIL'

data/app/models/drgcms_form_fields.rb

@@ -61,7 +61,7 @@ module DrgcmsFormFields
 # most of the common code for custom form field already implemented.
 ###########################################################################
 class DrgcmsField
-attr_reader :html, :js
+attr_reader :js
 
 ####################################################################
 # DrgcmsField initialization code.
@@ -86,9 +86,17 @@ def initialize( parent, record, yaml )
   end
   @html   = ''  
   @js     = ''
+  @css    = @yaml['css']
   self
 end
 
+####################################################################
+# Returns html code together with CSS code.
+####################################################################
+def html
+  @html + (@css ? "\n<style type=\"text/css\">#{@css}</style>" : '')
+end
+
 ####################################################################
 # Wrapper for i18 t method, with some spice added. If translation is not found English
 # translation value will be returned. And if still not found default value will be returned if passed.
@@ -1302,8 +1310,9 @@ end
 #    10:
 #      name: title
 #      type: text_field
+#      size: 30
 #      html:
-#        size: 30
+#        required: yes
 ###########################################################################
 class TextField < DrgcmsField
   
@@ -1320,6 +1329,64 @@ def render
 end
 end
 
+###########################################################################
+# Implementation of number_field DRG CMS form field. Number fields can be 
+# formated for display with thousands delimiters and decimal separators and 
+# can have currency symbol.
+# 
+# ===Form options:
+# * +type:+ number_field (required)
+# * +name:+ Field name (required) 
+# * +format:+ Format options
+# *   +decimals:+ No of decimal places
+# *   +separator:+ decimal separator (yes no , .) Default yes if decimals > 0
+# *   +delimiter:+ Thousands delimiter (yes no , .) Default defind by locals
+# *   +currency:+ Currency sign (yes no sign) Default no. If yes defined by locals
+# * +html:+ html options which apply to text_field field (optional)
+# 
+# Form example:
+#    10:
+#      name: title
+#      type: number_field
+#      size: 10
+#      format:
+#        decimals: 2
+#        delimiter: false
+###########################################################################
+class NumberField < DrgcmsField
+  
+###########################################################################
+# Render text_field field html code
+###########################################################################
+def render
+  return ro_standard if @readonly
+  set_initial_value
+#
+  record = record_text_for(@yaml['name'])
+  @yaml['html'] ||= {}
+  @yaml['html']['class'] = 'dc-number'
+  @yaml['html']['data-decimal']   = @yaml.dig('format','decimal') || 2
+  @yaml['html']['data-delimiter'] = @yaml.dig('format','delimiter') || I18n.t('number.currency.format.delimiter')
+  @yaml['html']['data-separator'] = @yaml.dig('format','separator') || I18n.t('number.currency.format.separator')
+ # @yaml['html']['data-currency']  = @yaml.dig('format','currency') == 'yes' ? I18n.t('number.currency.format.currency') : @yaml.dig('format','currency')
+  value = @record[@yaml['name']] || 0 
+    
+  @html << @parent.hidden_field( record, @yaml['name'], value: value )
+  
+  @yaml['html']['value'] = @parent.dc_format_number(value, @yaml['html']['data-decimal'], @yaml['html']['data-separator'], @yaml['html']['data-delimiter'] )
+  @html << @parent.text_field( nil,"record_#{@yaml['name']}1", @yaml['html']) 
+  self
+end
+
+###########################################################################
+# Return value. Return nil if input field is empty
+###########################################################################
+def self.get_data(params, name)
+  return 0 if params['record'][name].blank?
+  params['record'][name].match('.') ? BigDecimal.new(params['record'][name]) : Integer.new(params['record'][name])
+end
+end
+
 ###########################################################################
 # Implementation of text_with_select DRG CMS form field. Field will provide
 # text_field entry field with select dropdown box with optional values for the field.

data/drg_cms.gemspec

@@ -27,8 +27,7 @@ Gem::Specification.new do |s|
 
   s.add_dependency 'bcrypt' #, '~> 3.0.0'
   s.add_dependency 'mongoid'#, '~> 5'
-#  s.add_dependency 'mongo_session_store-rails4'  
-#  s.add_dependency 'kaminari'
+
   s.add_dependency 'kaminari-mongoid'
   s.add_dependency 'kaminari-actionview'
   s.add_dependency 'font-awesome-rails'

data/lib/drg_cms/engine.rb

@@ -1,6 +1,5 @@
-#coding: utf-8
 #--
-# Copyright (c) 2012-2013 Damjan Rems
+# 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

data/lib/drg_cms/version.rb

@@ -1,4 +1,27 @@
+#--
+# 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 DrgCms #:nodoc:
   # drg_cms gem version
-  VERSION = "0.5.52.9"
+  VERSION = "0.5.52.12"
 end

data/lib/generators/new_drg_form/new_drg_form_generator.rb

@@ -82,15 +82,20 @@ result_set:
 # Choose from
 # #{@model.attribute_names.join(',')}
   columns:
-    1:  
+    10:  
       name: #{@model.attribute_names[1]}
-      style: 'align: left; width: 100px'
-    2:  
+      style: 'color: red'
+      width: 10%
+      align: right
+    20:  
       name: #{@model.attribute_names[2]}
-    3: 
+    30: 
       name: created_at
       format: '%d.%m.%Y'
-    4: 
+    40: 
+      name: created_by
+      eval: dc_name4_id,dc_user,name
+    50: 
       name: active
       eval: dc_icon4_boolean
 

data/lib/tasks/browse_models.rake

@@ -53,7 +53,7 @@ def collections(what)
     next if model.nil?
     next unless model.respond_to?(:mongo_client)
     record = {'id' =>  collection, 'description' => I18n.t("helpers.label.#{collection}.tabletitle") } 
-    list << [record, fields(collection)]
+    list << [record, model_fields(collection)]
   end
   list
 end
@@ -61,7 +61,7 @@ end
 ######################################################################
 # List field definition for single model
 ######################################################################
-def fields(collection)
+def model_fields(collection)
   records = []
   model = collection.classify.constantize
   document = model.new
@@ -112,11 +112,11 @@ def create_output(descriptions)
   body = ''
   descriptions.each do |description|
     collection = description.first
-    fields = description.last 
+    all_fields = description.last 
     body << "#\n# == Schema information\n#\n"
     body << "# Collection name: #{collection['id']} : #{collection['description']}\n#\n"
     
-    fields.each do |field|
+    all_fields.each do |field|
       body << "#  #{field['field'].ljust(20)} #{field['type'].to_s.ljust(20)} #{field['description']}\n"
     end
     body << "\n\n"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: drg_cms
 version: !ruby/object:Gem::Version
-  version: 0.5.52.9
+  version: 0.5.52.12
 platform: ruby
 authors:
 - Damjan Rems
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-07 00:00:00.000000000 Z
+date: 2018-07-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails