drg_cms 0.6.0.1 → 0.6.1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: de756db4ff8ac1e6dbe88ef41e0d6dd213dbf20c91c7e2ec20b9cacdc5f80a1b
-  data.tar.gz: 64f7ac1107e10c095e6aa6a60308ae27622b10909c5e5ca529fd74e541e591d3
+  metadata.gz: a424c5a9f1d427b775dfb3a6a7bfa8ea0624c47fb2f4381c0fd19120a2c8c678
+  data.tar.gz: 6f0918c0365fbed1ff81e31bcd55be432ae8c02520f3811b18087941913957f5
 SHA512:
-  metadata.gz: 7fbfc08b2186e653b4a4cd09b21b9ff2435a5e14622559a4ae2301b41a59189fba6fb455cf67a93feff1676ed016f21dc8b47691e36337ae0ff9968bedc229d4
-  data.tar.gz: 2a7f6bcc224965503f491b50b598d4e45bc60e7cdb6524b29ed85c3f51ad3d3b096f1d62f50d9fa945995f64717db09365c5c36788be4cd51aa613e9dd1d7644
+  metadata.gz: 149a134733c8190f6b29003493f664e16fa2efad6608fb04a8bb607b9e00cd11a1752ec3b860d57af76789868667de12597b2023391879ad683ace066f71c1ec
+  data.tar.gz: 104ba8f48a7ad665da2f8ea99d833e04c94db4dc89a6d6ccecfe313ee5a082d7800691a31b805fb5cd35450e7350750ed68c073ef3e2bbafc971cfc8ff1180f2

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

@@ -28,6 +28,7 @@
  *******************************************************************/
 $.getUrlParam = function(name) {
   var results = new RegExp('[\\?&]' + name + '=([^&#]*)').exec(window.location.href);
+  if (results == null) return null;
   return results[1] || 0;
 };
 
@@ -42,16 +43,65 @@ dumpAttributes = function(obj) {
 };
 
 /*******************************************************************
- * Trying to remove background from iframe element. It is not yet working.
+ * Function checks if there are delay loaded embedded elements on 
+ * selected tab and triggers iframe reload.
  *******************************************************************/
-remove_background_from_iframe = function(obj) {
-  var head = obj.head;
-  var css = '<style type="text/css">' +
-            'body{background: none; background-picture:none; } ' +
-            '</style>';
-  $(head).append(css);    
+update_embedded_on_tab_select = function(div_name) {
+  let iframes = $(div_name).find("iframe");
+  $.each(iframes, function(index, iframe) {
+    // delayed load
+    let src_delay = iframe.getAttribute('data-src-delay');
+    if (src_delay != null && src_delay != '') {
+      iframe.setAttribute('data-src-delay', '');
+      iframe.setAttribute('src', src_delay);
+    }
+    // always load on tab select
+    let src_always = iframe.getAttribute('data-src-always');
+    if (src_always != null) {
+      iframe.setAttribute('src', src_always);
+    }    
+  });
+};
+
+/*******************************************************************
+ *  Return false when confirmation is not required 
+ *******************************************************************/
+confirmation_is_cancled = function(object) {
+  var confirmation = object.getAttribute("data-confirm");
+  // if confirmation required
+  if (confirmation !== null) {
+    if (!confirm(confirmation)) {return true;}
+  }
+  return false;
+};
+
+/*******************************************************************
+ * Will update select field on the form which select options are dependend 
+ * on other field value. It calls /dc_common/autocomplete and passes 
+ * methodname and depend field value to obtain new values for select field.
+ *******************************************************************/
+update_select_depend = function(select_name, depend_name, method) {
+  var select_field = $('#'+select_name);
+  var depend_field = $('#'+depend_name);
+  
+  $.ajax({
+    url: "/dc_common/autocomplete",
+    type: "POST",
+    dataType: "json",
+    data: { input: depend_field.val(), search: method},
+    success: function(data) {
+
+      select_field.empty();
+      $.each(data, function(index, element) {
+        select_field.append( new Option(element['label'], element['id']) );
+      });
+    }
+  });  
 };
 
+/*******************************************************************
+ * Format number input field according to data
+ *******************************************************************/
 format_number_field = function(e) {
   var decimals  = e.attr("data-decimal") || 2;
   var delimiter = e.attr("data-delimiter") || '.';
@@ -99,10 +149,10 @@ $(function() {
  * 
  * Protocol consists of operation and value which are returned as json by
  * called controller. Controller will return an ajax call usually like this:
- *    render json: {operation: value}.to_json
+ *    render json: {operation: value}
  *    
  * Operation is further divided into source and determinator which are divided by underline char.
- *    render json: {#div_status: 'OK!'}.to_json
+ *    render json: {#div_status: 'OK!'}
  * will replace html in div="status" with value 'OK!'. Source is '#div' determinator is 'status'.
  * 
  * Possible operators are:
@@ -125,78 +175,133 @@ $(function() {
  *  window_: Will force loading of url supplied in value into new window
  *  reload_: Will reload current window
  *  
- *  Operations can be chained and are executed sequentialy.
- *    render json: {'window_' => "/dokument.pdf", 'reload_' => 1}.to_json
- *  will open /dokument.pdf in new window and reload current window.
+ *  Operations can be chained and are executed sequential.
+ *    render json: {'window_' => "/document.pdf", 'reload_' => 1}.to_json
+ *  will open /document.pdf in new window and reload current window.
  *  
  *    render json: {'record_name' => "Damjan", 'record_surname' => 'Rems'}.to_json
  *  will replace values of two fields on the form.
  *******************************************************************/
 
 process_json_result = function(json) {
-  var i,operation,what, selector;
-  $.each(json, function(key, val) {
+  var i, w, operation, selector, msg_div, field;
+  $.each(json, function(key, value) {
     i = key.search('_');
     if (i > 1) {
       operation = key.substring(0,i);
-      what = key.substring(i+1,100);
+      selector  = key.substring(i+1,100);
     } else {
       operation = key;
-      what = '';
+      selector  = '';
     }
-//    
+
     switch (operation) {
-    // update field 
+      
+/**** update fields on form ****/
     case 'record':
-      $('#'+key).val(val);
+      let name = key.replace('record_','record[') + ']';
+      field = $('[name="' + name + '"]');
+      // checkbox field
+      if (field.is(':checkbox')) {
+        field.prop('checked', value);
+      // select field  
+      } else if (field.is('select')) {
+        // options for select field
+        if (value && value.isArray) {
+          field.empty();
+          $.each(value, function(index, v) {
+            field.append( new Option(v[0], v[1]) );
+          });
+        // select field value
+        } else {
+          field.val(value).change();
+        }
+      // radio field
+      } else if (field.attr('type') == 'radio') {
+        field.val([value])
+
+      // other input fields
+      } else {
+        field.val(value);
+      }
       break;
-    // display message   
+
+/**** display message ****/
     case 'msg': 
-      selector = 'dc-form-' + what;
-      if ( $('.'+selector).length == 0 ) {
-        val = '<div class="' + selector + '">' + val + '</div>';
-        $('.dc-title').after(val);
+      let msg_div = 'dc-form-' + selector;
+      if ( $('.' + msg_div).length == 0 ) {
+        value = '<div class="' + msg_div + '">' + value + '</div>';
+        $('.dc-title').after(value);
       } else {
-        $('.'+selector).html(val);
+        $('.' + msg_div).html(value);
+        $('.' + msg_div).show();
       }
       break;
-    // display popup message
-    case 'popup':
-      $('#popup').html(val);
-      $('#popup').bPopup({ speed: 650, transition: 'slideDown' });            
+      
+/**** display popup message ****/
+      case 'popup':
+      $('#popup').html(value);
+      $('#popup').bPopup({ speed: 650, transition: 'slideUp'});
+      break;
 
-    // update div 
+/**** update div ****/
     case '#div+':
-      $('#'+what).append(val);
+      $('#'+selector).append(value);
       break;
     case '#+div':
-      $('#'+what).prepend(val);
+      $('#'+selector).prepend(value);
       break;
     case '#div':
-      $('#'+what).html(val);
+      $('#'+selector).html(value);
       break;
     case '.div+':
-      $('.'+what).append(val);
+      $('.'+selector).append(value);
       break;
     case '.+div':
-      $('.'+what).prepend(val);
+      $('.'+selector).prepend(value);
       break;
     case '.div':
-      $('.'+what).html(val);
+      $('.'+selector).html(value);
       break;
-    // goto url 
+      
+/**** goto url ****/
     case 'url':
-      window.location.href = val;
+      window.location.href = value;
       break;
     case 'alert':
-      alert(val);
+      alert(value);
       break;
     case 'window':
-      w = window.open(val, what);
+      if (value == 'close') { window.close(); 
+      } else if (value == 'reload') {
+        location.reload();
+      } else {
+        w = window.open(value, selector);
+        w.focus();
+      }
+      break;
+    case 'newwindow':
+      w = window.open(value, selector,"location=no,scrollbars=yes,resizable=yes");
       w.focus();        
       break;
+    case 'eval':
+      console.log('from process_json_result: Eval option will be deprecated. Use script instead.')
+      eval (value);
+      break;
+    case 'script':
+      eval (value);
+      break; 
     case 'reload':
-      location.reload(); 
+      value = value.toString();
+      if (value == 'parent') {
+        parent.location.reload();
+/*** this would be current window (reload: true) ****/
+      } else if (value.length < 5) {
+        location.reload();
+/*** reload iframe ****/
+      } else {
+        $( '#' + value ).attr('src', $( '#' + value ).attr('src'));
+      } 
       break;
     default: 
       console.log("DRGCMS: Invalid ajax result operation: " + operation);
@@ -236,6 +341,42 @@ $.fn.dc_scroll_view = function () {
   });
 };
 
+/*******************************************************************
+ * Updates single field on parent iframe form of embedded form.
+ *******************************************************************/
+process_parent_form_updates = function(element) {
+  let field = element.getAttribute("data-field");
+  let value = element.getAttribute("data-value");
+  let selector = '#' + field;
+
+  // update record
+  if (field.match(/record/)) {
+    if (window.parent.$(selector).length > 0) {
+      if (field.substring(0, 3) === 'td_') {   // readonly field
+        window.parent.$(selector + ' > div').html(value);
+      } else { // input field
+        window.parent.$(selector).val(value);
+      }
+    }
+  // any div
+  } else {
+    if (window.parent.$(selector).length > 0) {
+      window.parent.$(selector).html(value);
+    }
+  }
+};
+
+/*****************************************************************
+ * Toggle show and hide div
+ ******************************************************************/
+dc_toggle_div = function(div) {
+  if ($(div).is(":visible")) {
+    $(div).slideUp();
+  } else {
+    $(div).slideDown();
+  }
+};
+
 /*******************************************************************
  * 
  *******************************************************************/
@@ -248,6 +389,27 @@ $(document).ready( function() {
 //    select_first_input_field('.dc-form');
   }
 */
+ /*******************************************************************
+  * It will scroll display to ypos if return_to_ypos parameter is present
+  *******************************************************************/
+  if (window.location.href.match(/return_to_ypos=/))
+  {
+    window.scrollTo(0, $.getUrlParam('return_to_ypos'));
+  }
+  
+ /*******************************************************************
+  * The idea is to update fields on parent iframe form, when embedded document
+  * is updated in its iframe. Update fields are listed in .dc-form-updates div
+  * and are set by flash[:update] Hash object.
+  * 
+  * eg. flash[:update] = {'td_record_radonly' => 'New value for read_only field',
+  *                       'record_name' => 'New name'}
+  *******************************************************************/
+  if ( $('.dc-form-updates').length > 0 ) {
+     $('.dc-form-updates').children().each( function( index, element ) {
+       process_parent_form_updates(element);
+     });
+  }
   
  /*******************************************************************
   * Register ad clicks
@@ -257,6 +419,17 @@ $(document).ready( function() {
     return true;
   });
   
+ /*****************************************************************
+ * Toggle CMS mode. When clicked on left 30 pixels, window will be scrolled approximately 
+ * to the position wher toggle was clicked. When clicked from pixel 31 and on it will
+ * stay on the top of window.
+ ******************************************************************/  
+  $('.cms-toggle').bind('click', function(e) {
+    var url = '/dc_common/toggle_edit_mode?return_to=' + window.location.href;
+    if (e.pageX < 30) url = url + '&return_to_ypos=' + e.pageY ;
+    window.location.href = url;
+  });
+ 
  /*******************************************************************
   * Popup or close CMS edit menu on icon click
   *******************************************************************/
@@ -280,21 +453,22 @@ $(document).ready( function() {
   * Sort action clicked on cmsedit
   *******************************************************************/
   $('.drgcms_sort').change( function(e) {
-    table = e.target.getAttribute("data-table");
-    sort = e.target.value; 
+    var table = e.target.getAttribute("data-table");
+    var form  = e.target.getAttribute("data-form");
+    var sort = e.target.value;
     e.target.value = null;
-    window.location.href = "/cmsedit?sort=" + sort + "&table=" + table;
+    window.location.href = "/cmsedit?sort=" + sort + "&table=" + table +  "&form_name=" + form;
   });
   
  /*******************************************************************
   * Tab clicked on form. Hide old and show selected div.
   *******************************************************************/
   $('.dc-form-li').on('click', function(e) { 
-// find li with dc-form-li-selected class. This is our old tab
-    var old_tab_id = null;
+    // find li with dc-form-li-selected class. This is our old tab
+    let old_tab_id = null;
     $(e.target).parents('ul').find('li').each( function() {
       if ($(this).hasClass('dc-form-li-selected')) {
-// when not already selected toggle dc-form-li-selected class and save old tab
+        // when not already selected toggle dc-form-li-selected class and save old tab
         if ($(this) !== $(e.target)) {
           $(this).toggleClass('dc-form-li-selected');
           $(e.target).toggleClass('dc-form-li-selected');
@@ -307,11 +481,15 @@ $(document).ready( function() {
     if (old_tab_id !== null) {
       $('#data_' + old_tab_id).toggleClass('div-hidden');
       $('#data_' + e.target.getAttribute("data-div")).toggleClass('div-hidden');
-// resize parent iframe to fit selected tab size
-      var div_height = document.getElementById('data_' + e.target.getAttribute("data-div")).clientHeight + 130;
-        window.frameElement.style.height = div_height.toString() + 'px';
-// it would be too easy      $('#cmsform :input:enabled:visible:first').focus();
+      
+      // resize parent iframe to fit selected tab size
+      let div_height = document.body.scrollHeight;
+      let frame = window.frameElement
+      if (frame === null) frame = document.body;
+      frame.style.height = div_height.toString() + 'px';
+
       select_first_input_field('#data_' + e.target.getAttribute("data-div"));
+      update_embedded_on_tab_select('#data_' + e.target.getAttribute("data-div"));
     }
   });  
 
@@ -319,12 +497,11 @@ $(document).ready( function() {
  * Resize iframe_cms to the size of its contents. Make at least 500 px high
  * unless on initial display.
  *******************************************************************/
-  $('#iframe_cms').load( function() {
-//    alert('bla 1');
-    new_height = this.contentWindow.document.body.offsetHeight + 50;
+  $('#iframe_cms').on('load', function() {
+    let new_height = this.contentWindow.document.body.offsetHeight + 50;
     if (new_height < 500 && new_height > 60) new_height = 500;
     this.style.height = new_height + 'px'; 
-// scroll to top
+    // scroll to top
     $('#iframe_cms').dc_scroll_view();
   });
 
@@ -332,61 +509,99 @@ $(document).ready( function() {
  * Same goes for editiframe. Resize it + 30px
  * unless on initial display with no data 
  *******************************************************************/
-  $('#iframe_edit').load( function() {
-//    console.log(this.contentWindow.document.body.offsetHeight);
+  $('#iframe_edit').on('load', function() {
     if (this.contentWindow.document.body.offsetHeight > 10) {
       this.style.height = (this.contentWindow.document.body.offsetHeight + 30) + 'px'; 
-// scroll to top
+
       $('#iframe_edit').dc_scroll_view();
     }
   });
-  
+
+  /*******************************************************************
+   * Same goes for iframe_embedded. Resize it + 30px
+   *******************************************************************/
+  $('.iframe_embedded').on('load', function() {
+    let embedded_height = this.contentWindow.document.body.offsetHeight;
+    // workaround. It gets tricky when embedded field is on tab
+    if (embedded_height == 0) embedded_height = 500;
+    this.style.height = (embedded_height + 30) + 'px';
+    // resize parent iframe window too
+    let parentWindow = this.contentWindow.parent;
+    let parent_height = (parentWindow.document.body.offsetHeight + 30) + 'px';
+    //parentWindow.frameElement.setAttribute('style', 'height:' + parent_height);
+    parentWindow.frameElement.style.height = parent_height;
+  });
+
 /*******************************************************************
  * Process Ajax call on cmsedit form actions
  *******************************************************************/
   $('.dc-link-ajax').on('click', function(e) {
-// check HTML5 validations
+    // confirmation if required
+    if (confirmation_is_cancled(this)) {return false;}
+   
+    // check HTML5 validations
     if ($("form")[0] && !$("form")[0].checkValidity() ) {
       $("form")[0].reportValidity();
       return false;
     }
-    var target = e.target;
-    var req    = target.getAttribute("data-request");
-// Get values from elements on the page:
+    let req = this.getAttribute("data-request");
+    // Get values from elements on the page:
     if (req == "script") {
-      eval (target.getAttribute("data-script"));
+      eval (this.getAttribute("data-script"));
       return false;
     }
     else if (req == "post") { 
       data = $('form').serialize(); 
-//      alert(data);
     }
     else { 
       data = {}; 
       req = 'get'; // by default
     }
-    
-    $('.dc-spinner').toggleClass('div-hidden');   
+
+    let url = this.getAttribute("data-url");
+    if (url.length < 5) return false;
+
+    $('.dc-spinner').show();
     $.ajax({
-      url: target.getAttribute("data-url"),
+      url: url,
       type: req,
       dataType: "json",
       data: data,
-//      success: function(files,data,xhr) { 
-//        document.getElementById('if_priponkas').contentDocument.location.reload(true); 
-//      }
       success: function(data) {
         process_json_result(data);
-        $('.dc-spinner').toggleClass('div-hidden');
+        $('.dc-spinner').hide();
       }
-      
-    });  
-  }); 
+    });
+  });
+  
+/*******************************************************************
+ * Process action submit button click. 
+ *******************************************************************/
+  $('.dc-action-submit').on('click', function(e) {
+    // confirmation if required
+    if (confirmation_is_cancled(this)) {return false;}
+   
+    // check HTML5 validations
+    var form = $("form")[0];
+    if (form && !form.checkValidity() ) {
+      form.reportValidity();
+      return false;
+    }
+    var url = this.getAttribute("data-url");
+    if (url == null) {return false;}
+
+    form.setAttribute('action', url);
+    form.setAttribute('method', "post");
+    form.submit();
+  });  
     
 /*******************************************************************
   will open a new window with URL specified. 
 ********************************************************************/
   $('.dc-window-open').on('click', function(e) { 
+   // confirmation if required
+    if (confirmation_is_cancled(this)) {return false;}
+    
     var url   = this.getAttribute("data-url");
     var title = this.getAttribute("title");
     var w     = 1000;
@@ -395,7 +610,6 @@ $(document).ready( function() {
     var top   = (screen.height/2)-(h/2);
     var win   = window.open(url, title, 'toolbar=no, location=no, directories=no, status=no, menubar=no, scrollbars=yes, resizable=no, copyhistory=no, width='+w+', height='+h+', top='+top+', left='+left);
     win.focus();
-//    $('#bpopup').bPopup({ loadUrl: url, speed: 650, transition: 'slideDown' });  
   });  
 
  /*******************************************************************
@@ -447,11 +661,11 @@ $(document).ready( function() {
  * Display spinner on link with spinner, submit link
  *******************************************************************/
   $('.dc-link-spinner').on('click', function(e) {
-    $('.dc-spinner').toggleClass('div-hidden');
+    $('.dc-spinner').show();
   });  
   
   $('.dc-link-submit').on('click', function(e) {
-    $('.dc-spinner').toggleClass('div-hidden');
+    $('.dc-spinner').show();
   });  
 
 /*******************************************************************
@@ -460,8 +674,8 @@ $(document).ready( function() {
   * data from with text_autocomplete and data doesn't exist in belongs_to table.
   *******************************************************************/
   $('.in-edit-add').on('click', function(e) { 
-    url = '/cmsedit/new?table=' + this.getAttribute("data-table");
-/* I know. It doesn't work as expected. But it will do for now. */
+    let url = '/cmsedit/new?table=' + this.getAttribute("data-table");
+    // I know. It doesn't work as expected. But it will do for now.
     w = window.open(url, '', 'chrome=yes,width=800,height=600,resizable,scrollbars=yes,status=1,centerscreen=yes,modal=yes');
     w.focus();    
   });  
@@ -472,13 +686,9 @@ $(document).ready( function() {
  **********************************************************************/
   $('#filter_field').on('change', function() {
     if (this.value.length > 0) { 
-      name = 'filter_' + this.value;
+      let name = 'filter_' + this.value;
       $(this).parents('form').find('span').each( function() {
-/*
-element = $(this).find(':first').attr('id');
- sometimes it is the second element         
-        if (element == nil) { element = $(this).find(':first').next().attr('id');}
- */   
+
         if ($(this).attr('id') == name) {
           if ( $(this).hasClass('div-hidden') ) { $(this).toggleClass('div-hidden'); }
         } else {
@@ -534,7 +744,7 @@ element = $(this).find(':first').attr('id');
 /*******************************************************************
  * Experimental. Force reload of parent page if this div appears. 
  *******************************************************************/
-  $('#div-reload-parent').load( function() {
+  $('#div-reload-parent').on('load', function() {
 //    alert('div-reload-parent 1');
     parent.location.href = parent.location.href;
   });
@@ -544,7 +754,7 @@ element = $(this).find(':first').attr('id');
  * 
  * Just an Idea. Not needed yet.
  *******************************************************************/
-  $('#div-reload').load( function() {
+  $('#div-reload').on('load', function() {
     alert('div-reload 1');
 //    location.href = location.href;
   });
@@ -560,8 +770,8 @@ element = $(this).find(':first').attr('id');
   * Fire action (by default show document) when doubleclicked on result row
   *******************************************************************/
   $('.dc-result tr').on('dblclick', function(e) {
-    url = String( this.getAttribute("data-dblclick") );
-// prevent when data-dblclick not set
+    let url = String( this.getAttribute("data-dblclick") );
+    // prevent when data-dblclick not set
     if (url.length > 5) { 
       e.preventDefault();
       location.href = url;
@@ -572,8 +782,8 @@ element = $(this).find(':first').attr('id');
   * Fire action (by default show document) when doubleclicked on result row
   *******************************************************************/
   $('.dc-result-data').on('dblclick', function(e) {
-    url = String( this.getAttribute("data-dblclick") );
-// prevent when data-dblclick not set
+    let url = String( this.getAttribute("data-dblclick") );
+    // prevent when data-dblclick not set
     if (url.length > 5) { 
       e.preventDefault();
       location.href = url;
@@ -605,12 +815,12 @@ element = $(this).find(':first').attr('id');
   });
   
  /*******************************************************************
-  * This will fire cmsedit index action and pass value enterred into 
+  * This will fire cmsedit index action and pass value entered into
   * filter field and thus refresh browsed result set.
   *******************************************************************/
   $('#_record__filter_field').keydown( function(e) {
     if (e.which == '13' || e.which == '9') {
-      url = $(this).parents('span').attr("data-url");
+      var url = $(this).parents('span').attr("data-url");
       url = url + "&filter_value=" + this.value;
       location.href = url;
       return false;      
@@ -622,9 +832,16 @@ element = $(this).find(':first').attr('id');
   * work on all field types.
   *******************************************************************/
   $('.record_filter_field_icon').on('click', function(e) {
-    field = $('#_record__filter_field');
-    url = $(this).parents('span').attr("data-url");
-    url = url + "&filter_value=" + field.val();
+    let field = $('#_record__filter_field');
+    let url = $(this).parents('span').attr("data-url");
+    let value = null;
+
+    if (field.is(':checkbox')) {
+      value = field.is(':checked'); }
+    else {
+      value = field.val();
+    }
+    url = url + "&filter_value=" + value;
     location.href = url;
   });
 
@@ -675,8 +892,9 @@ element = $(this).find(':first').attr('id');
    });
    
 /*******************************************************************
-  * Resize result table columns
+  * Resize result table columns. For now an idea.
   *******************************************************************/
+ /*
    $( ".dc-result-header .spacer" )
   .mouseenter(function() {
     console.log("enter");
@@ -684,7 +902,7 @@ element = $(this).find(':first').attr('id');
   .mouseleave(function() {
     console.log("leave");
   });
-  
+*/  
  /*******************************************************************
   * number_field type entered
   *******************************************************************/
@@ -699,51 +917,57 @@ element = $(this).find(':first').attr('id');
   /*******************************************************************
   * 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,'.');
+  $('.dc-number').on('focusout', function(e) {
+    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 val     = this.value;
+    // clear delimiters and replace separator with .
+    val = val.replace(delimiter,'');
+    val = val.replace(separator,'.');
+    val = parseFloat(val).toFixed(decimals);
+    var whole, dec, sign;
+//    [whole,dec] = val.split('.');
+    whole = val.split('.')[0];
+    dec   = val.split('.')[1];
 // remove negative sign and add at the end
-     var sign = whole.substr(0,1);
-     if (sign == '-') { 
-       whole = whole.substr(1,20);
-     } else { 
-       sign = '';
-     }
+    var sign = whole.substr(0,1);
+    if (sign == '-') { 
+      whole = whole.substr(1,20);
+    } else { 
+      sign = '';
+    }
+// save value to hidden field which holds return value
+    var field = '#' + $(this).attr("id").slice(0,-1);
+    $(field).val(val);
     
-     $(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';
+    if (decimals == 0) separator = '';
+    if (dec == null) 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 (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);
+    if (delimiter !== '') whole = ar.join(delimiter);
+    $(this).val(sign + whole + separator + dec + currency);
    });
    
  /*******************************************************************
-  * number_field type keypressed
+  * Key pressed in number_field.
+  * - put minus sign in front of input field
+  * - replace dot and comma separators when required. Not all numeric pads are created equal.
+  * - when enter is pressed, save value to field before form is proccessed
   *******************************************************************/
    $('.dc-number').on('keydown', function(e) {
-// Minus sign. Put it on first place     
+     // Minus sign. Put it on first place
      if (e.which == 109) {
        if($(this).val().substr(0,1) == '-') {
          $(this).val( $(this).val().substr(1,20));
@@ -752,16 +976,103 @@ element = $(this).find(':first').attr('id');
        }
        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);
+     // replace , with . if . is separator.
+     var separator = $(this).attr("data-separator") || '.';
+     var inp = this;
+     if (e.which == 188) {
+       if (separator == '.') {
+         setTimeout(function() {
+           inp.value = inp.value.replace(/,/g, '.');
+         }, 0);
+       }
+     }
+     // replace . with , if , is separator
+     if (e.which == 190) {
+       if (separator == ',') {
+         setTimeout(function() {
+           inp.value = inp.value.replace(/\./g, ',');
+         }, 0);
+       }
+     }
+
+     // Enter means process form. Save the value before form is processed
+     if (e.which == 13) {
+       var decimals  = $(this).attr("data-decimal") || 2;
+       var value = $(this).val().replace(separator,'.');
+       var field = '#' + $(this).attr("id").slice(0,-1);
         
-        $(field).val( parseFloat(value).toFixed(decimals) );
-      }
+       $(field).val( parseFloat(value).toFixed(decimals) );
+     }
    });
+
+  /*******************************************************************
+   * Slovenian keyboard has comma key instead of dot in numeric pad.
+   * This will catch if comma has been pressed and will replace it with dot.
+   *******************************************************************/
+  $('.date-picker').keypress( function(e) {
+    if (e.keyCode !== 44) return;
+    var inp = this;
+    setTimeout(function() {
+      inp.value = inp.value.replace(/,/g, '.');
+    }, 0);
+  });
+
+ /*******************************************************************
+  * Result header sort icon is hoverd. Change background icon to filter.
+  *******************************************************************/
+  $('.dc-result-header .th i').hover( function() {
+    old_sort_icon = '';
+    // save old sort icon and replace it with filter icon   
+    $.each( $(this).attr("class").split(/\s+/), 
+      function(index, item) { if (item.match('sort')) { old_sort_icon = item}; }
+    );
+    $(this).removeClass(old_sort_icon).addClass('fa-filter');
+// bring back old sort icon
+  }, function(){
+    $(this).removeClass('fa-filter').addClass(old_sort_icon);
+  });
+
+/*******************************************************************
+  * Result header sort icon is clicked. Display filter menu for the field.
+  *******************************************************************/
+  $('.dc-result-header .th i').click( function(e) {
+    e.preventDefault();
+    // additional click will close dialog when visible
+    if ($('.filter-popup').is(':visible')) {
+      $('.filter-popup').hide();
+      return;
+    }
+    // retrieve name of current field and set it in popup
+    let header = $(this).closest('.th');
+    let field_name = header.attr("data-name");
+    $('.filter-popup').attr('data-name', field_name);
+    // change popup position and show
+    $('.filter-popup').css({'top':e.pageY+5,'left':e.pageX, 'position':'absolute'});
+    $('.filter-popup').show();    
+  });
+  
+/*******************************************************************
+  * Filter operation is clicked on filter popup. Retrieve data and call
+  * filter on action.
+  *******************************************************************/
+  $('.filter-popup li').click( function(e) {
+    let url = $(this).data('url');
+    let operator = $(this).data('operator');
+    let parent = $(this).closest('.filter-popup');
+    let field_name = parent.data("name");
+    
+    url = url + '&filter_field=' + field_name + '&filter_oper=' + operator;
+    window.location.href = url;
+  });
+
+  /*****************************************************************
+   * Toggle div
+   ******************************************************************/
+  $(".dc-handle").click(function() {
+    let div = this.getAttribute("data-div");
+    dc_toggle_div(div);
+  });
+
 });
 
 /*******************************************************************
@@ -780,9 +1091,7 @@ $(document).keydown( function(e) {
 });
 
 /*******************************************************************
- * Catch ctrl+s key pressed and fire save form event. I press ctrl+s
- * almost every minute. That was a lesson learned years ago when I lost
- * few hours of work on computer lockup ;-(
+
  *******************************************************************
 $(document).onmousedown( function(e) {
   mouseDown = true;
@@ -794,4 +1103,4 @@ $(document).onmouseup( function(e) {
   console.log("mouse up");  
 });
 
-**/
+**/