From d6ed80c6cfe38f77f6935c9a490e0431f1d4abd4 Mon Sep 17 00:00:00 2001 From: Fabio Guachalla Date: Tue, 21 Sep 2021 16:40:49 -0400 Subject: [PATCH 1/5] PMCORE-3359:TASKS > and fields are not validating correctly --- .../js/home/TaskMetrics/VueChartLvTwo.vue | 21 ++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/resources/assets/js/home/TaskMetrics/VueChartLvTwo.vue b/resources/assets/js/home/TaskMetrics/VueChartLvTwo.vue index 76b2470eb..e2c57b5ff 100644 --- a/resources/assets/js/home/TaskMetrics/VueChartLvTwo.vue +++ b/resources/assets/js/home/TaskMetrics/VueChartLvTwo.vue @@ -32,6 +32,8 @@ }" :placeholder="$t('ID_DELEGATE_DATE_TO')" v-model="dateTo" + :min="dateFrom" + :state="stateDateTo" @input="changeOption" > @@ -131,13 +133,21 @@ export default { }, }, series: [], + stateDateTo: null, }; }, created() {}, mounted() { this.getBodyHeight(); }, - watch: {}, + watch: { + dateFrom () { + this.validateDateTo(); + }, + dateTo () { + this.validateDateTo(); + } + }, computed: {}, updated() {}, beforeCreate() {}, @@ -199,6 +209,15 @@ export default { }, ]); }, + validateDateTo() { + if (this.dateFrom !== '' && this.dateTo !== '') { + if (this.dateFrom > this.dateTo) { + this.stateDateTo = false; + } else { + this.stateDateTo = null; + } + } + }, }, }; From e3ce25547122ea59113dd846c5c9299b3d1d2db4 Mon Sep 17 00:00:00 2001 From: Roly Gutierrez Date: Tue, 21 Sep 2021 17:03:26 -0400 Subject: [PATCH 2/5] PMCORE-3244 'No connection params' error logged on successful Oracle connections --- workflow/engine/src/ProcessMaker/Services/Api/Light.php | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/workflow/engine/src/ProcessMaker/Services/Api/Light.php b/workflow/engine/src/ProcessMaker/Services/Api/Light.php index 1a06f1c1c..398014e30 100644 --- a/workflow/engine/src/ProcessMaker/Services/Api/Light.php +++ b/workflow/engine/src/ProcessMaker/Services/Api/Light.php @@ -1830,6 +1830,10 @@ class Light extends Api try { $usr_uid = $this->getUserId(); $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); return DateTime::convertUtcToTimeZone($response); From 1562b763ae0645ce410b9f228a4c621c2784f7bb Mon Sep 17 00:00:00 2001 From: Paula Quispe Date: Wed, 22 Sep 2021 10:38:52 -0400 Subject: [PATCH 3/5] PMCORE-3266 --- workflow/engine/classes/Cases.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/workflow/engine/classes/Cases.php b/workflow/engine/classes/Cases.php index ac2fa3b61..b72b2d999 100644 --- a/workflow/engine/classes/Cases.php +++ b/workflow/engine/classes/Cases.php @@ -814,7 +814,7 @@ class Cases // Update case title 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_DESCRIPTION'] = $threadInfo['description']; } From 6199938950fbcc5f98d1c9360f1c4acc70476a45 Mon Sep 17 00:00:00 2001 From: Paula Quispe Date: Wed, 22 Sep 2021 11:15:46 -0400 Subject: [PATCH 4/5] PMCORE-1004 --- workflow/engine/controllers/appProxy.php | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/workflow/engine/controllers/appProxy.php b/workflow/engine/controllers/appProxy.php index 6fb7a04d0..f5014252a 100644 --- a/workflow/engine/controllers/appProxy.php +++ b/workflow/engine/controllers/appProxy.php @@ -403,11 +403,6 @@ class AppProxy extends HttpProxyController 'label' => G::LoadTranslation('ID_CASE_NUMBER') . ': ', 'value' => $appFields['APP_NUMBER'], ], - $i++ => [ // Case Title - 'id' => 'CASE_TITLE', - 'label' => G::LoadTranslation('ID_TASK_TITLE') . ': ', - 'value' => $appFields['TITLE'], - ], $i++ => [ // Case Status 'id' => 'CASE_STATUS', 'label' => G::LoadTranslation('ID_CASE_STATUS') . ': ', @@ -420,7 +415,7 @@ class AppProxy extends HttpProxyController ], $i++ => [ // Delegate Date 'id' => 'DEL_DELEGATE_DATE', - 'label' => G::LoadTranslation('DEL_DELEGATE_DATE') . ': ', + 'label' => G::LoadTranslation('ID_TASK_DELEGATE_DATE') . ': ', 'value' => DateTime::convertUtcToTimeZone($delegateDateLabel), ], $i++ => [ // Duration From af9e09f168d00611a8f6e0e1783b8e82aafee756 Mon Sep 17 00:00:00 2001 From: Andrea Adamczyk Date: Wed, 22 Sep 2021 16:05:15 -0400 Subject: [PATCH 5/5] PMCORE-1192-A --- gulliver/js/form/core/form.js | 6 +++--- gulliver/js/maborak/core/maborak.js | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/gulliver/js/form/core/form.js b/gulliver/js/form/core/form.js index 30878c613..b7a2e1e6a 100644 --- a/gulliver/js/form/core/form.js +++ b/gulliver/js/form/core/form.js @@ -1249,7 +1249,7 @@ function G_Text(form, element, name) if ((pressKey == 8 || pressKey == 46) && (me.validate != 'Login' && me.validate != 'NodeName')) me.sendOnChange(); 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; } 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) && (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; } 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; } else{ diff --git a/gulliver/js/maborak/core/maborak.js b/gulliver/js/maborak/core/maborak.js index 324f9723e..e415fa2c0 100644 --- a/gulliver/js/maborak/core/maborak.js +++ b/gulliver/js/maborak/core/maborak.js @@ -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(me.validate=="Email"&&pressKey!=8&&(me.element.value.length>me.element.maxLength-1)){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;} 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;} @@ -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;} if(window.event.ctrlKey){return true;}}else{if(event.altKey){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{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,\.]/;} @@ -999,7 +999,7 @@ else{me.applyMask(pressKey);} if(updateOnChange){me.sendOnChange();}} 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=='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) {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=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++;}