X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;ds=inline;f=js%2Fcommon.js;h=3a855299fceefa66b9cde5c8094b29bbdfcaf213;hb=467ff4b400a031b337b92b058f9519ff2918a4c6;hp=71f1d3104b0d0c79a42263e88b31132763477c61;hpb=0d1bb5102f01eb03da55bc87b52ac52cd7ae7534;p=kivitendo-erp.git diff --git a/js/common.js b/js/common.js index 71f1d3104..3a855299f 100644 --- a/js/common.js +++ b/js/common.js @@ -33,17 +33,6 @@ function centerParms(width,height,extra) { return string; } -function set_longdescription_window(input_name) { - var parm = centerParms(600,500) + ",width=600,height=500,status=yes,scrollbars=yes"; - var name = document.getElementsByName(input_name)[0].value; - url = "common.pl?" + - "INPUT_ENCODING=UTF-8&" + - "action=set_longdescription&" + - "longdescription=" + encodeURIComponent(document.getElementsByName(input_name)[0].value) + "&" + - "input_name=" + encodeURIComponent(input_name) + "&" - window.open(url, "_new_generic", parm); - } - function check_right_number_format(input_name) { if(decpoint && thpoint && thpoint == decpoint) { return show_alert_and_focus(input_name, wrongNumberFormat); @@ -75,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"); @@ -160,35 +189,7 @@ function focus_by_name(name){ return false; } -function open_jqm_window(params) { - params = params || { }; - var id = params.id ? params.id : 'jqm_popup_dialog'; - - $('#' + id).remove(); - var div = $('
').hide().appendTo('body'); - var close = $('').appendTo(div); - var content = $('').appendTo(div); - - div.jqm({ modal: true }); - div.jqmShow(); - $(close).click(function() { - div.jqmClose(); - }); - - $.ajax({ - url: params.url, - data: params.data, - type: params.type, - success: function(new_html) { $(content).html(new_html); } - }); - - return true; -} - $(document).ready(function () { - // initialize all jQuery UI tab elements: - $(".tabwidget").each(function(idx, element) { $(element).tabs(); }); - $('input').focus(function(){ if (focussable(this)) window.focused_element = this; });