fernando/luos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update

Browse Source
This commit is contained in:
Henry Jordan
2021-09-22 20:56:26 +00:00
parent d4b5fe044d 1af8792bad
commit bfd627c326
6 changed files with 35 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
gulliver/js/form/core/form.js
View File

@@ -1249,7 +1249,7 @@ function G_Text(form, element, name)
if ((pressKey == 8 || pressKey == 46) && (me.validate != 'Login' && me.validate != 'NodeName')) me.sendOnChange(); if ((pressKey == 8 || pressKey == 46) && (me.validate != 'Login' && me.validate != 'NodeName')) me.sendOnChange();
me.checkBrowser(); me.checkBrowser();
if (me.browser.name == 'Chrome' || me.browser.name == 'Safari'){ if (me.browser.name == 'Chrome' || me.browser.name == 'Safari' || me.browser.name == 'Firefox'){
event.returnValue = false; event.returnValue = false;
} }
else{ else{
@@ -1338,7 +1338,7 @@ function G_Text(form, element, name)
//if ((me.browser.name == 'Firefox') && (keyCode == 8 || keyCode == 46)) { //if ((me.browser.name == 'Firefox') && (keyCode == 8 || keyCode == 46)) {
if ((me.browser.name == 'Firefox') && (keyCode == 8) && (me.validate != 'NodeName')) { if ((me.browser.name == 'Firefox') && (keyCode == 8) && (me.validate != 'NodeName')) {
if (me.browser.name == 'Chrome' || me.browser.name == 'Safari'){ if (me.browser.name == 'Chrome' || me.browser.name == 'Safari' || me.browser.name == 'Firefox'){
event.returnValue = false; event.returnValue = false;
} }
else{ else{
@@ -1480,7 +1480,7 @@ function G_Text(form, element, name)
} }
} }
if (me.browser.name == 'Chrome' || me.browser.name == 'Safari'){ if (me.browser.name == 'Chrome' || me.browser.name == 'Safari' || me.browser.name == 'Firefox'){
event.returnValue = false; event.returnValue = false;
} }
else{ else{

6
gulliver/js/maborak/core/maborak.js
View File

@@ -969,7 +969,7 @@ switch(pressKey){case 8:case 46:case 35:case 36:case 37:case 38:case 39:case 40:
if(pressKey==46&&me.validate=="Email"){return true;} if(pressKey==46&&me.validate=="Email"){return true;}
if(me.validate=="Email"&&pressKey!=8&&(me.element.value.length>me.element.maxLength-1)){return false;} if(me.validate=="Email"&&pressKey!=8&&(me.element.value.length>me.element.maxLength-1)){return false;}
if(pressKey==43&&me.validate=="AlphaNum"){return false;} if(pressKey==43&&me.validate=="AlphaNum"){return false;}
me.applyMask(pressKey);if((pressKey==8||pressKey==46)&&(me.validate!='Login'&&me.validate!='NodeName'))me.sendOnChange();me.checkBrowser();if(me.browser.name=='Chrome'||me.browser.name=='Safari'){event.returnValue=false;} me.applyMask(pressKey);if((pressKey==8||pressKey==46)&&(me.validate!='Login'&&me.validate!='NodeName'))me.sendOnChange();me.checkBrowser();if(me.browser.name=='Chrome'||me.browser.name=='Safari'||me.browser.name=='Firefox'){event.returnValue=false;}
else{return false;} else{return false;}
break;case 9:return true;break;default:if(me.validate=='NodeName'&&(pressKey==190||pressKey==189)){return false;} break;case 9:return true;break;default:if(me.validate=='NodeName'&&(pressKey==190||pressKey==189)){return false;}
if(me.mType=='date'||me.mType=='currency'||me.mType=='percentage'||me.validate=='Real'||me.validate=='Int'){if((48<=pressKey&&pressKey<=57)||(pressKey==109||pressKey==190||pressKey==188||pressKey==189)||(96<=pressKey&&pressKey<=111)){return true;} if(me.mType=='date'||me.mType=='currency'||me.mType=='percentage'||me.validate=='Real'||me.validate=='Int'){if((48<=pressKey&&pressKey<=57)||(pressKey==109||pressKey==190||pressKey==188||pressKey==189)||(96<=pressKey&&pressKey<=111)){return true;}
@@ -982,7 +982,7 @@ switch(keyCode){case 9:case 13:return true;break;}
var swShiftKey=((me.mType=='currency')||(me.mType=='percentage')||(me.validate=='Real')||(me.validate=='Int'))?false:true;if(window.event){if(window.event.altKey){return true;} var swShiftKey=((me.mType=='currency')||(me.mType=='percentage')||(me.validate=='Real')||(me.validate=='Int'))?false:true;if(window.event){if(window.event.altKey){return true;}
if(window.event.ctrlKey){return true;}}else{if(event.altKey){return true;} if(window.event.ctrlKey){return true;}}else{if(event.altKey){return true;}
if(event.ctrlKey){return true;}} if(event.ctrlKey){return true;}}
me.checkBrowser();if((me.browser.name=='Firefox')&&(keyCode==8)&&(me.validate!='NodeName')){if(me.browser.name=='Chrome'||me.browser.name=='Safari'){event.returnValue=false;} me.checkBrowser();if((me.browser.name=='Firefox')&&(keyCode==8)&&(me.validate!='NodeName')){if(me.browser.name=='Chrome'||me.browser.name=='Safari'||me.browser.name=='Firefox'){event.returnValue=false;}
else{return false;}} else{return false;}}
else{var pressKey=(window.event)?window.event.keyCode:event.which;keyValid=true;updateOnChange=true;switch(me.validate){case'Any':keyValid=true;break;case'Int':patron=/[0-9\-]/;key=String.fromCharCode(pressKey);keyValid=patron.test(key);break;case'Real':if(typeof me.comma_separator!='undefined'){patron=/[0-9\-]/;} else{var pressKey=(window.event)?window.event.keyCode:event.which;keyValid=true;updateOnChange=true;switch(me.validate){case'Any':keyValid=true;break;case'Int':patron=/[0-9\-]/;key=String.fromCharCode(pressKey);keyValid=patron.test(key);break;case'Real':if(typeof me.comma_separator!='undefined'){patron=/[0-9\-]/;}
else{patron=/[0-9,\.]/;} else{patron=/[0-9,\.]/;}
@@ -999,7 +999,7 @@ else{me.applyMask(pressKey);}
if(updateOnChange){me.sendOnChange();}} if(updateOnChange){me.sendOnChange();}}
if(me.browser.name=='Firefox'){if(keyCode==0)return true;} if(me.browser.name=='Firefox'){if(keyCode==0)return true;}
if(me.browser.name=='Microsoft Internet Explorer'||me.browser.name=='Netscape'){if(window.event.preventDefault){window.event.preventDefault();}else{window.event.returnValue=false;}} if(me.browser.name=='Microsoft Internet Explorer'||me.browser.name=='Netscape'){if(window.event.preventDefault){window.event.preventDefault();}else{window.event.returnValue=false;}}
if(me.browser.name=='Chrome'||me.browser.name=='Safari'){event.returnValue=false;} if(me.browser.name=='Chrome'||me.browser.name=='Safari'||me.browser.name=='Firefox'){event.returnValue=false;}
else{return false;}}};if(this.element){this.element.onblur=function(event) else{return false;}}};if(this.element){this.element.onblur=function(event)
{var evt=event||window.event;var keyPressed=evt.which||evt.keyCode;if((me.mask!='')&&((me.mType=='currency')||(me.mType=='percentage')||((me.validate=="Real")&&(me.mType=='text')))&&(me.mask.indexOf('-')==-1)&&(me.element.value!='')){masks=me.mask;aMasks=masks.split(';');for(m=0;m<aMasks.length;m++){var separatorField=",";if(typeof(me.comma_separator)!='undefined'){separatorField=me.comma_separator;}else{txtRealMask=aMasks[m].split('');p=txtRealMask.length-1;for(;p>=0;p--){if(txtRealMask[p]!='#'&&txtRealMask[p]!='%'&&txtRealMask[p]!=' '){separatorField=txtRealMask[p];break;}}} {var evt=event||window.event;var keyPressed=evt.which||evt.keyCode;if((me.mask!='')&&((me.mType=='currency')||(me.mType=='percentage')||((me.validate=="Real")&&(me.mType=='text')))&&(me.mask.indexOf('-')==-1)&&(me.element.value!='')){masks=me.mask;aMasks=masks.split(';');for(m=0;m<aMasks.length;m++){var separatorField=",";if(typeof(me.comma_separator)!='undefined'){separatorField=me.comma_separator;}else{txtRealMask=aMasks[m].split('');p=txtRealMask.length-1;for(;p>=0;p--){if(txtRealMask[p]!='#'&&txtRealMask[p]!='%'&&txtRealMask[p]!=' '){separatorField=txtRealMask[p];break;}}}
var partsMaskSep=aMasks[m].split(separatorField);if(partsMaskSep.length==2){var countDecimal=0;txtRealMask=aMasks[m].split('');p=txtRealMask.length-1;for(;p>=0;p--){if(txtRealMask[p]=='#'){countDecimal++;} var partsMaskSep=aMasks[m].split(separatorField);if(partsMaskSep.length==2){var countDecimal=0;txtRealMask=aMasks[m].split('');p=txtRealMask.length-1;for(;p>=0;p--){if(txtRealMask[p]=='#'){countDecimal++;}

24
resources/assets/js/home/TaskMetrics/VueChartLvTwo.vue
View File

@@ -34,6 +34,8 @@
}" }"
:placeholder="$t('ID_DELEGATE_DATE_TO')" :placeholder="$t('ID_DELEGATE_DATE_TO')"
v-model="dateTo" v-model="dateTo"
:min="dateFrom"
:state="stateDateTo"
@input="changeOption" @input="changeOption"
></b-form-datepicker> ></b-form-datepicker>
</div> </div>
@@ -144,6 +146,7 @@ export default {
}, },
}, },
series: [], series: [],
stateDateTo: null,
}; };
}, },
created() {}, created() {},
@@ -151,7 +154,14 @@ export default {
this.getBodyHeight(); this.getBodyHeight();
this.changeOption(); this.changeOption();
}, },
watch: {}, watch: {
dateFrom () {
this.validateDateTo();
},
dateTo () {
this.validateDateTo();
}
},
computed: {}, computed: {},
updated() {}, updated() {},
beforeCreate() {}, beforeCreate() {},
@@ -266,6 +276,18 @@ export default {
}); });
eventBus.$emit("home::sidebar::click-item", taskList); eventBus.$emit("home::sidebar::click-item", taskList);
}, },
/**
* Validate range date
*/
validateDateTo() {
if (this.dateFrom !== '' && this.dateTo !== '') {
if (this.dateFrom > this.dateTo) {
this.stateDateTo = false;
} else {
this.stateDateTo = null;
}
}
},
}, },
}; };
</script> </script>

2
workflow/engine/classes/Cases.php
View File

@@ -814,7 +814,7 @@ class Cases
// Update case title // Update case title
if (!empty($appUid) && !empty($appFields['APP_NUMBER']) && $appFields['APP_NUMBER'] > 0 && !empty($appFields['DEL_INDEX'])) { if (!empty($appUid) && !empty($appFields['APP_NUMBER']) && $appFields['APP_NUMBER'] > 0 && !empty($appFields['DEL_INDEX'])) {
$threadInfo = $this->updateThreadTitle($appUid, $appFields['APP_NUMBER'], $appFields['DEL_INDEX'], $appFields['APP_DATA']); $threadInfo = $this->updateThreadTitle($appUid, $appFields['APP_NUMBER'], $appFields['DEL_INDEX'], $appData);
$Fields['APP_TITLE'] = $threadInfo['title']; $Fields['APP_TITLE'] = $threadInfo['title'];
$Fields['APP_DESCRIPTION'] = $threadInfo['description']; $Fields['APP_DESCRIPTION'] = $threadInfo['description'];
} }

7
workflow/engine/controllers/appProxy.php
View File

@@ -403,11 +403,6 @@ class AppProxy extends HttpProxyController
'label' => G::LoadTranslation('ID_CASE_NUMBER') . ': ', 'label' => G::LoadTranslation('ID_CASE_NUMBER') . ': ',
'value' => $appFields['APP_NUMBER'], 'value' => $appFields['APP_NUMBER'],
], ],
$i++ => [ // Case Title
'id' => 'CASE_TITLE',
'label' => G::LoadTranslation('ID_TASK_TITLE') . ': ',
'value' => $appFields['TITLE'],
],
$i++ => [ // Case Status $i++ => [ // Case Status
'id' => 'CASE_STATUS', 'id' => 'CASE_STATUS',
'label' => G::LoadTranslation('ID_CASE_STATUS') . ': ', 'label' => G::LoadTranslation('ID_CASE_STATUS') . ': ',
@@ -420,7 +415,7 @@ class AppProxy extends HttpProxyController
], ],
$i++ => [ // Delegate Date $i++ => [ // Delegate Date
'id' => 'DEL_DELEGATE_DATE', 'id' => 'DEL_DELEGATE_DATE',
'label' => G::LoadTranslation('DEL_DELEGATE_DATE') . ': ', 'label' => G::LoadTranslation('ID_TASK_DELEGATE_DATE') . ': ',
'value' => DateTime::convertUtcToTimeZone($delegateDateLabel), 'value' => DateTime::convertUtcToTimeZone($delegateDateLabel),
], ],
$i++ => [ // Duration $i++ => [ // Duration

4
workflow/engine/src/ProcessMaker/Services/Api/Light.php
View File

@@ -1830,6 +1830,10 @@ class Light extends Api
try { try {
$usr_uid = $this->getUserId(); $usr_uid = $this->getUserId();
$cases = new BusinessModelCases(); $cases = new BusinessModelCases();
//for propel connection is required $_SESSION['PROCESS']
if (!empty($pro_uid)) {
$_SESSION['PROCESS'] = $pro_uid;
}
$response = $cases->getCaseVariables($app_uid, $usr_uid, $dyn_uid, $pro_uid, $act_uid, $app_index); $response = $cases->getCaseVariables($app_uid, $usr_uid, $dyn_uid, $pro_uid, $act_uid, $app_index);
return DateTime::convertUtcToTimeZone($response); return DateTime::convertUtcToTimeZone($response);