diff --git a/app/main/controller/api/signature.php b/app/main/controller/api/signature.php index c69ef1b8..565f3efb 100644 --- a/app/main/controller/api/signature.php +++ b/app/main/controller/api/signature.php @@ -117,13 +117,19 @@ class Signature extends \Controller\AccessController{ $newData = [ $data['name'] => $data['value'] ]; + + // if groupID changed -> typeID set to 0 + if($data['name'] == 'groupId'){ + $newData['typeId'] = 0; + } + }else{ // update complete signature (signature reader dialog) // description should not be updated unset( $data['description'] ); - // wormhole typeID cant figured out/saved by the sig reader dialog + // wormhole typeID canīt figured out/saved by the sig reader dialog if($data['groupId'] == 5){ unset( $data['typeId'] ); } diff --git a/build_js/app/landingpage.js b/build_js/app/landingpage.js index aa5188f9..d47beb6c 100644 --- a/build_js/app/landingpage.js +++ b/build_js/app/landingpage.js @@ -11,5 +11,5 @@ viewseparator:", "}),t.fn.editabletypes.select2=e}(window.jQuery),function(t){va initPicker:function(e,i){this.options.viewformat||(this.options.viewformat=this.options.format),e.datepicker=t.fn.editableutils.tryParseJson(e.datepicker,!0),this.options.datepicker=t.extend({},i.datepicker,e.datepicker,{format:this.options.viewformat}),this.options.datepicker.language=this.options.datepicker.language||"en",this.dpg=t.fn.bdatepicker.DPGlobal,this.parsedFormat=this.dpg.parseFormat(this.options.format),this.parsedViewFormat=this.dpg.parseFormat(this.options.viewformat)},render:function(){this.$input.bdatepicker(this.options.datepicker),this.options.clear&&(this.$clear=t('').html(this.options.clear).click(t.proxy(function(t){t.preventDefault(),t.stopPropagation(),this.clear()},this)),this.$tpl.parent().append(t('
').append(this.$clear)))},value2html:function(t,i){var n=t?this.dpg.formatDate(t,this.parsedViewFormat,this.options.datepicker.language):"";e.superclass.value2html.call(this,n,i)},html2value:function(t){return this.parseDate(t,this.parsedViewFormat)},value2str:function(t){return t?this.dpg.formatDate(t,this.parsedFormat,this.options.datepicker.language):""},str2value:function(t){return this.parseDate(t,this.parsedFormat)},value2submit:function(t){return this.value2str(t)},value2input:function(t){this.$input.bdatepicker("update",t)},input2value:function(){return this.$input.data("datepicker").date},activate:function(){},clear:function(){this.$input.data("datepicker").date=null,this.$input.find(".active").removeClass("active"),this.options.showbuttons||this.$input.closest("form").submit()},autosubmit:function(){this.$input.on("mouseup",".day",function(e){if(!t(e.currentTarget).is(".old")&&!t(e.currentTarget).is(".new")){var i=t(this).closest("form");setTimeout(function(){i.submit()},200)}})},parseDate:function(t,e){var i,n=null;return t&&(n=this.dpg.parseDate(t,e,this.options.datepicker.language),"string"==typeof t&&(i=this.dpg.formatDate(n,e,this.options.datepicker.language),t!==i&&(n=null))),n}}),e.defaults=t.extend({},t.fn.editabletypes.abstractinput.defaults,{tpl:'
',inputclass:null,format:"yyyy-mm-dd",viewformat:null,datepicker:{weekStart:0,startView:0,minViewMode:0,autoclose:!1},clear:"× clear"}),t.fn.editabletypes.date=e}(window.jQuery),function(t){"use strict";var e=function(t){this.init("datefield",t,e.defaults),this.initPicker(t,e.defaults)};t.fn.editableutils.inherit(e,t.fn.editabletypes.date),t.extend(e.prototype,{render:function(){this.$input=this.$tpl.find("input"),this.setClass(),this.setAttr("placeholder"),this.$tpl.bdatepicker(this.options.datepicker),this.$input.off("focus keydown"),this.$input.keyup(t.proxy(function(){this.$tpl.removeData("date"),this.$tpl.bdatepicker("update")},this))},value2input:function(t){this.$input.val(t?this.dpg.formatDate(t,this.parsedViewFormat,this.options.datepicker.language):""),this.$tpl.bdatepicker("update")},input2value:function(){return this.html2value(this.$input.val())},activate:function(){t.fn.editabletypes.text.prototype.activate.call(this)},autosubmit:function(){}}),e.defaults=t.extend({},t.fn.editabletypes.date.defaults,{tpl:'
',inputclass:"input-small",datepicker:{weekStart:0,startView:0,minViewMode:0,autoclose:!0}}),t.fn.editabletypes.datefield=e}(window.jQuery),function(t){"use strict";var e=function(t){this.init("datetime",t,e.defaults),this.initPicker(t,e.defaults)};t.fn.editableutils.inherit(e,t.fn.editabletypes.abstractinput),t.extend(e.prototype,{initPicker:function(e,i){this.options.viewformat||(this.options.viewformat=this.options.format),e.datetimepicker=t.fn.editableutils.tryParseJson(e.datetimepicker,!0),this.options.datetimepicker=t.extend({},i.datetimepicker,e.datetimepicker,{format:this.options.viewformat}),this.options.datetimepicker.language=this.options.datetimepicker.language||"en",this.dpg=t.fn.datetimepicker.DPGlobal,this.parsedFormat=this.dpg.parseFormat(this.options.format,this.options.formatType),this.parsedViewFormat=this.dpg.parseFormat(this.options.viewformat,this.options.formatType)},render:function(){this.$input.datetimepicker(this.options.datetimepicker),this.$input.on("changeMode",function(){var e=t(this).closest("form").parent();setTimeout(function(){e.triggerHandler("resize")},0)}),this.options.clear&&(this.$clear=t('').html(this.options.clear).click(t.proxy(function(t){t.preventDefault(),t.stopPropagation(),this.clear()},this)),this.$tpl.parent().append(t('
').append(this.$clear)))},value2html:function(t,i){var n=t?this.dpg.formatDate(this.toUTC(t),this.parsedViewFormat,this.options.datetimepicker.language,this.options.formatType):"";return i?void e.superclass.value2html.call(this,n,i):n},html2value:function(t){var e=this.parseDate(t,this.parsedViewFormat);return e?this.fromUTC(e):null},value2str:function(t){return t?this.dpg.formatDate(this.toUTC(t),this.parsedFormat,this.options.datetimepicker.language,this.options.formatType):""},str2value:function(t){var e=this.parseDate(t,this.parsedFormat);return e?this.fromUTC(e):null},value2submit:function(t){return this.value2str(t)},value2input:function(t){t&&this.$input.data("datetimepicker").setDate(t)},input2value:function(){var t=this.$input.data("datetimepicker");return t.date?t.getDate():null},activate:function(){},clear:function(){this.$input.data("datetimepicker").date=null,this.$input.find(".active").removeClass("active"),this.options.showbuttons||this.$input.closest("form").submit()},autosubmit:function(){this.$input.on("mouseup",".minute",function(){var e=t(this).closest("form");setTimeout(function(){e.submit()},200)})},toUTC:function(t){return t?new Date(t.valueOf()-6e4*t.getTimezoneOffset()):t},fromUTC:function(t){return t?new Date(t.valueOf()+6e4*t.getTimezoneOffset()):t},parseDate:function(t,e){var i,n=null;return t&&(n=this.dpg.parseDate(t,e,this.options.datetimepicker.language,this.options.formatType),"string"==typeof t&&(i=this.dpg.formatDate(n,e,this.options.datetimepicker.language,this.options.formatType),t!==i&&(n=null))),n}}),e.defaults=t.extend({},t.fn.editabletypes.abstractinput.defaults,{tpl:'
',inputclass:null,format:"yyyy-mm-dd hh:ii",formatType:"standard",viewformat:null,datetimepicker:{todayHighlight:!1,autoclose:!1},clear:"× clear"}),t.fn.editabletypes.datetime=e}(window.jQuery),function(t){"use strict";var e=function(t){this.init("datetimefield",t,e.defaults),this.initPicker(t,e.defaults)};t.fn.editableutils.inherit(e,t.fn.editabletypes.datetime),t.extend(e.prototype,{render:function(){this.$input=this.$tpl.find("input"),this.setClass(),this.setAttr("placeholder"),this.$tpl.datetimepicker(this.options.datetimepicker),this.$input.off("focus keydown"),this.$input.keyup(t.proxy(function(){this.$tpl.removeData("date"),this.$tpl.datetimepicker("update")},this))},value2input:function(t){this.$input.val(this.value2html(t)),this.$tpl.datetimepicker("update")},input2value:function(){return this.html2value(this.$input.val())},activate:function(){t.fn.editabletypes.text.prototype.activate.call(this)},autosubmit:function(){}}),e.defaults=t.extend({},t.fn.editabletypes.datetime.defaults,{tpl:'
',inputclass:"input-medium",datetimepicker:{todayHighlight:!1,autoclose:!0}}),t.fn.editabletypes.datetimefield=e}(window.jQuery);define("xEditable",["bootstrap"],function(){});!function(t,e){"object"==typeof exports?module.exports=e(require("jquery")):"function"==typeof define&&define.amd?define("easyPieChart",["jquery"],e):e(t.jQuery)}(this,function(t){var e=function(t,e){var i,n=document.createElement("canvas");t.appendChild(n),"undefined"!=typeof G_vmlCanvasManager&&G_vmlCanvasManager.initElement(n);var a=n.getContext("2d");n.width=n.height=e.size;var o=1;window.devicePixelRatio>1&&(o=window.devicePixelRatio,n.style.width=n.style.height=[e.size,"px"].join(""),n.width=n.height=e.size*o,a.scale(o,o)),a.translate(e.size/2,e.size/2),a.rotate((-.5+e.rotate/180)*Math.PI);var s=(e.size-e.lineWidth)/2;e.scaleColor&&e.scaleLength&&(s-=e.scaleLength+2),Date.now=Date.now||function(){return+new Date};var r=function(t,e,i){i=Math.min(Math.max(-1,i||0),1);var n=0>=i?!0:!1;a.beginPath(),a.arc(0,0,s,0,2*Math.PI*i,n),a.strokeStyle=t,a.lineWidth=e,a.stroke()},l=function(){var t,i;a.lineWidth=1,a.fillStyle=e.scaleColor,a.save();for(var n=24;n>0;--n)n%6===0?(i=e.scaleLength,t=0):(i=.6*e.scaleLength,t=e.scaleLength-i),a.fillRect(-e.size/2+t,0,i,1),a.rotate(Math.PI/12);a.restore()},c=function(){return window.requestAnimationFrame||window.webkitRequestAnimationFrame||window.mozRequestAnimationFrame||function(t){window.setTimeout(t,1e3/60)}}(),u=function(){e.scaleColor&&l(),e.trackColor&&r(e.trackColor,e.trackWidth||e.lineWidth,1)};this.getCanvas=function(){return n},this.getCtx=function(){return a},this.clear=function(){a.clearRect(e.size/-2,e.size/-2,e.size,e.size)},this.draw=function(t){e.scaleColor||e.trackColor?a.getImageData&&a.putImageData?i?a.putImageData(i,0,0):(u(),i=a.getImageData(0,0,e.size*o,e.size*o)):(this.clear(),u()):this.clear(),a.lineCap=e.lineCap;var n;n="function"==typeof e.barColor?e.barColor(t):e.barColor,r(n,e.lineWidth,t/100)}.bind(this),this.animate=function(t,i){var n=Date.now();e.onStart(t,i);var a=function(){var o=Math.min(Date.now()-n,e.animate.duration),s=e.easing(this,o,t,i-t,e.animate.duration);this.draw(s),e.onStep(t,i,s),o>=e.animate.duration?e.onStop(t,i):c(a)}.bind(this);c(a)}.bind(this)},i=function(t,i){var n={barColor:"#ef1e25",trackColor:"#f9f9f9",scaleColor:"#dfe0e0",scaleLength:5,lineCap:"round",lineWidth:3,trackWidth:void 0,size:110,rotate:0,animate:{duration:1e3,enabled:!0},easing:function(t,e,i,n,a){return e/=a/2,1>e?n/2*e*e+i:-n/2*(--e*(e-2)-1)+i},onStart:function(){},onStep:function(){},onStop:function(){}};if("undefined"!=typeof e)n.renderer=e;else{if("undefined"==typeof SVGRenderer)throw new Error("Please load either the SVG- or the CanvasRenderer");n.renderer=SVGRenderer}var a={},o=0,s=function(){this.el=t,this.options=a;for(var e in n)n.hasOwnProperty(e)&&(a[e]=i&&"undefined"!=typeof i[e]?i[e]:n[e],"function"==typeof a[e]&&(a[e]=a[e].bind(this)));a.easing="string"==typeof a.easing&&"undefined"!=typeof jQuery&&jQuery.isFunction(jQuery.easing[a.easing])?jQuery.easing[a.easing]:n.easing,"number"==typeof a.animate&&(a.animate={duration:a.animate,enabled:!0}),"boolean"!=typeof a.animate||a.animate||(a.animate={duration:1e3,enabled:a.animate}),this.renderer=new a.renderer(t,a),this.renderer.draw(o),t.dataset&&t.dataset.percent?this.update(parseFloat(t.dataset.percent)):t.getAttribute&&t.getAttribute("data-percent")&&this.update(parseFloat(t.getAttribute("data-percent")))}.bind(this);this.update=function(t){return t=parseFloat(t),a.animate.enabled?this.renderer.animate(o,t):this.renderer.draw(t),o=t,this}.bind(this),this.disableAnimation=function(){return a.animate.enabled=!1,this},this.enableAnimation=function(){return a.animate.enabled=!0,this},s()};t.fn.easyPieChart=function(e){return this.each(function(){var n;t.data(this,"easyPieChart")||(n=t.extend({},e,t(this).data()),t.data(this,"easyPieChart",new i(this,n)))})}});!function(t){t.fn.hoverIntent=function(e,i,n){var a={interval:100,sensitivity:6,timeout:0};a="object"==typeof e?t.extend(a,e):t.isFunction(i)?t.extend(a,{over:e,out:i,selector:n}):t.extend(a,{over:e,out:e,selector:i});var o,s,r,l,c=function(t){o=t.pageX;s=t.pageY},u=function(e,i){i.hoverIntent_t=clearTimeout(i.hoverIntent_t);if(Math.sqrt((r-o)*(r-o)+(l-s)*(l-s))

'});i.prototype=t.extend({},t.fn.popover.Constructor.prototype);i.prototype.constructor=i;i.prototype.getDefaults=function(){return i.DEFAULTS};i.prototype.setContent=function(){var e=this,i=this.tip(),n=this.getTitle(),a=i.find('[data-apply="confirmation"]'),o=i.find('[data-dismiss="confirmation"]'),s=this.options;a.addClass(this.getBtnOkClass()).html(this.getBtnOkLabel()).prepend(t("").addClass(this.getBtnOkIcon())," ").attr("href",this.getHref()).attr("target",this.getTarget()).off("click").on("click",function(t){e.$element.confirmation("hide");s.onConfirm(t,e.$element)});o.addClass(this.getBtnCancelClass()).html(this.getBtnCancelLabel()).prepend(t("").addClass(this.getBtnCancelIcon())," ").off("click").on("click",function(t){s.onCancel(t,e.$element);e.$element.confirmation("hide")});i.find(".popover-title")[this.options.html?"html":"text"](n);i.removeClass("fade top bottom left right in");i.find(".popover-title").html()||i.find(".popover-title").hide()};i.prototype.getBtnOkClass=function(){var t=this.$element,e=this.options;return t.attr("data-btnOkClass")||("function"==typeof e.btnOkClass?e.btnOkClass.call(t[0]):e.btnOkClass)};i.prototype.getBtnOkLabel=function(){var t=this.$element,e=this.options;return t.attr("data-btnOkLabel")||("function"==typeof e.btnOkLabel?e.btnOkLabel.call(t[0]):e.btnOkLabel)};i.prototype.getBtnOkIcon=function(){var t=this.$element,e=this.options;return t.attr("data-btnOkIcon")||("function"==typeof e.btnOkIcon?e.btnOkIcon.call(t[0]):e.btnOkIcon)};i.prototype.getBtnCancelClass=function(){var t=this.$element,e=this.options;return t.attr("data-btnCancelClass")||("function"==typeof e.btnCancelClass?e.btnCancelClass.call(t[0]):e.btnCancelClass)};i.prototype.getBtnCancelLabel=function(){var t=this.$element,e=this.options;return t.attr("data-btnCancelLabel")||("function"==typeof e.btnCancelLabel?e.btnCancelLabel.call(t[0]):e.btnCancelLabel)};i.prototype.getBtnCancelIcon=function(){var t=this.$element,e=this.options;return t.attr("data-btnCancelIcon")||("function"==typeof e.btnCancelIcon?e.btnCancelIcon.call(t[0]):e.btnCancelIcon)};i.prototype.getHref=function(){var t=this.$element,e=this.options;return t.attr("data-href")||("function"==typeof e.href?e.href.call(t[0]):e.href)};i.prototype.getTarget=function(){var t=this.$element,e=this.options;return t.attr("data-target")||("function"==typeof e.target?e.target.call(t[0]):e.target)};i.prototype.isPopout=function(){var t,e=this.$element,i=this.options;t=e.attr("data-popout")||("function"==typeof i.popout?i.popout.call(e[0]):i.popout);"false"==t&&(t=!1);return t};var n=t.fn.confirmation;t.fn.confirmation=function(e){var n=this;return this.each(function(){var a=t(this),o=a.data("bs.confirmation"),s="object"==typeof e&&e;s=s||{};s.all_selector=n.selector;if(o||"destroy"!=e){o||a.data("bs.confirmation",o=new i(this,s));"string"==typeof e&&o[e]()}})};t.fn.confirmation.Constructor=i;t.fn.confirmation.noConflict=function(){t.fn.confirmation=n;return this}}(jQuery);define("bootstrapConfirmation",["bootstrap"],function(){});+function(t){"use strict";function e(e){return this.each(function(){var n=t(this),a=n.data("bs.toggle"),o="object"==typeof e&&e;a||n.data("bs.toggle",a=new i(this,o)),"string"==typeof e&&a[e]&&a[e]()})}var i=function(e,i){this.$element=t(e),this.options=t.extend({},this.defaults(),i),this.render()};i.VERSION="2.2.0",i.DEFAULTS={on:"On",off:"Off",onstyle:"primary",offstyle:"default",size:"normal",style:"",width:null,height:null},i.prototype.defaults=function(){return{on:this.$element.attr("data-on")||i.DEFAULTS.on,off:this.$element.attr("data-off")||i.DEFAULTS.off,onstyle:this.$element.attr("data-onstyle")||i.DEFAULTS.onstyle,offstyle:this.$element.attr("data-offstyle")||i.DEFAULTS.offstyle,size:this.$element.attr("data-size")||i.DEFAULTS.size,style:this.$element.attr("data-style")||i.DEFAULTS.style,width:this.$element.attr("data-width")||i.DEFAULTS.width,height:this.$element.attr("data-height")||i.DEFAULTS.height}},i.prototype.render=function(){this._onstyle="btn-"+this.options.onstyle,this._offstyle="btn-"+this.options.offstyle;var e="large"===this.options.size?"btn-large":"small"===this.options.size?"btn-small":"mini"===this.options.size?"btn-mini":"",i=t('