X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=js%2Fcommon.js;h=43bb7de4de81f12f0b81a62309ad00bf8038d3eb;hb=d6838f77443e2ef69364556e186a3ec5aa244fe3;hp=d961814bcde6aeff5c2b56ed63b80b68884feeca;hpb=e9e0b17078690e4fae6210e9225c48c6d2991a36;p=kivitendo-erp.git

diff --git a/js/common.js b/js/common.js
index d961814bc..43bb7de4d 100644
--- a/js/common.js
+++ b/js/common.js
@@ -64,6 +64,46 @@ function check_right_date_format(input_name) {
   if(input_name.value == "") {
     return true;
   }
+
+  if ( ( input_name.value.match(/^\d+$/ ) ) && !(dateFormat.lastIndexOf("y") == 3) ) {
+    // date shortcuts for entering date without separator for three date styles, e.g.
+    // 31122014 -> 12.04.2014
+    // 12312014 -> 12/31/2014
+    // 31122014 -> 31/12/2014
+
+    if (input_name.value.match(/^\d{8}$/)) {
+      input_name.value = input_name.value.replace(/^(\d\d)(\d\d)(\d\d\d\d)$/, "$1" + seperator + "$2" + seperator + "$3")
+    } else if (input_name.value.match(/^\d{6}$/)) {
+      // 120414 -> 12.04.2014
+      input_name.value = input_name.value.replace(/^(\d\d)(\d\d)(\d\d)$/, "$1" + seperator + "$2" + seperator + "$3")
+    } else if (input_name.value.match(/^\d{4}$/)) {
+      // 1204 -> 12.04.2014
+      var today = new Date();
+      var year = today.getYear();
+      if (year < 999) year += 1900;
+      input_name.value = input_name.value.replace(/^(\d\d)(\d\d)$/, "$1" + seperator + "$2");
+      input_name.value = input_name.value + seperator + year;
+    } else  if ( input_name.value.match(/^\d{1,2}$/ ) ) {
+      // assume the entry is the day of the current month and current year
+      var today = new Date();
+      var day = input_name.value;
+      var month = today.getMonth() + 1;
+      var year = today.getYear();
+      if( day.length == 1 && day < 10) {
+        day='0'+day;
+      };
+      if(month<10) {
+        month='0'+month;
+      };
+      if (year < 999) year += 1900;
+      if ( dateFormat.lastIndexOf("d") == 1) {
+        input_name.value = day + seperator + month + seperator + year;
+      } else {
+        input_name.value = month + seperator + day + seperator + year;
+      }
+    };
+  }
+
   var matching = new RegExp(dateFormat.replace(/\w/g, '\\d') + "\$","ig");
   if(!(dateFormat.lastIndexOf("y") == 3) && !matching.test(input_name.value)) {
     matching = new RegExp(dateFormat.replace(/\w/g, '\\d') + '\\d\\d\$', "ig");
@@ -150,29 +190,14 @@ function focus_by_name(name){
 }
 
 $(document).ready(function () {
-  // initialize all jQuery UI tab elements:
-  $(".tabwidget").each(function(idx, element) {
-    var $element = $(element);
-    var tabsParams = {};
-
-    var elementId = $element.attr('id');
-    if( elementId ) {
-      var cookieName = 'jquery_ui_tab_'+ elementId;
-
-      tabsParams.active = $.cookie(cookieName);
-      tabsParams.activate = function(event, ui) {
-        var i = ui.newTab.parent().children().index(ui.newTab);
-        $.cookie(cookieName, i);
-      };
-    }
-
-    $element.tabs(tabsParams);
-  });
-
   $('input').focus(function(){
     if (focussable(this)) window.focused_element = this;
   });
 
+  // Lowest priority: first focussable element in form.
+  set_cursor_to_first_element();
+
+  // Medium priority: class set in template
   var initial_focus = $(".initial_focus").filter(':visible')[0];
   if (initial_focus)
     $(initial_focus).focus();
@@ -180,7 +205,6 @@ $(document).ready(function () {
   // legacy. sone forms install these
   if (typeof fokus == 'function') { fokus(); return; }
   if (focus_by_name('cursor_fokus')) return;
-  set_cursor_to_first_element();
 });
 
 $('form').submit(function(){