From e30cb812d7e1bb4d5a94f85167538b205f8631c4 Mon Sep 17 00:00:00 2001 From: jennylee Date: Thu, 4 Apr 2013 11:12:36 -0400 Subject: [PATCH 1/3] BUG 11093 'Delegated Date' in Advanced Search, doesn't work if you set 'Date From' equals 'Date To'. Was added a validation to search by 'Delegated Date' using the same 'Date From' and 'Date To' fields. --- workflow/engine/classes/class.applications.php | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/workflow/engine/classes/class.applications.php b/workflow/engine/classes/class.applications.php index 684a6392f..4069afc03 100644 --- a/workflow/engine/classes/class.applications.php +++ b/workflow/engine/classes/class.applications.php @@ -232,7 +232,12 @@ class Applications if ($dateFrom != '') { if ($dateTo != '') { - $Criteria->add( $Criteria->getNewCriterion( AppCacheViewPeer::DEL_DELEGATE_DATE, $dateFrom, Criteria::GREATER_EQUAL )->addAnd( $Criteria->getNewCriterion( AppCacheViewPeer::DEL_DELEGATE_DATE, $dateTo, Criteria::LESS_EQUAL ) ) ); + if ($dateFrom == $dateTo) { + $dateAux = $dateFrom; + $dateFrom = $dateAux . " 00:00:00"; + $dateTo = $dateAux . " 23:23:59"; + } + $Criteria->add( $Criteria->getNewCriterion( AppCacheViewPeer::DEL_DELEGATE_DATE, $dateFrom, Criteria::GREATER_EQUAL )->addAnd( $Criteria->getNewCriterion( AppCacheViewPeer::DEL_DELEGATE_DATE, $dateTo, Criteria::LESS_EQUAL ) ) ); $CriteriaCount->add( $CriteriaCount->getNewCriterion( AppCacheViewPeer::DEL_DELEGATE_DATE, $dateFrom, Criteria::GREATER_EQUAL )->addAnd( $Criteria->getNewCriterion( AppCacheViewPeer::DEL_DELEGATE_DATE, $dateTo, Criteria::LESS_EQUAL ) ) ); } else { $Criteria->add( AppCacheViewPeer::DEL_DELEGATE_DATE, $dateFrom, Criteria::GREATER_EQUAL ); From 243ba79e04d57fcba33665779fc6c6ba8ba86a75 Mon Sep 17 00:00:00 2001 From: Luis Fernando Saisa Lopez Date: Thu, 4 Apr 2013 15:25:10 +0000 Subject: [PATCH 2/3] BUG 11073 "Custom triggers. Campo Title no esta marcado como..." SOLVED - Custom triggers. Campo Title no esta marcado como requerido. - Problema resuelto, Custom triggers. Campo Title se valida como campo requerido. * Available from version ProcessMaker-2.0.47 (2.5.1) --- workflow/engine/xmlform/triggers/triggersCustom.html | 2 +- workflow/engine/xmlform/triggers/triggersCustom.xml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/workflow/engine/xmlform/triggers/triggersCustom.html b/workflow/engine/xmlform/triggers/triggersCustom.html index 5a5760df5..904f7ce64 100755 --- a/workflow/engine/xmlform/triggers/triggersCustom.html +++ b/workflow/engine/xmlform/triggers/triggersCustom.html @@ -17,7 +17,7 @@ {$form.TRI_UID} - {$TRI_TITLE} + * {$TRI_TITLE} {$form.TRI_TITLE} diff --git a/workflow/engine/xmlform/triggers/triggersCustom.xml b/workflow/engine/xmlform/triggers/triggersCustom.xml index 32767e3e5..8147c9d69 100755 --- a/workflow/engine/xmlform/triggers/triggersCustom.xml +++ b/workflow/engine/xmlform/triggers/triggersCustom.xml @@ -9,7 +9,7 @@ - + Title @@ -104,4 +104,4 @@ function cancel(){ } ]]> - + \ No newline at end of file From ad84ab69bcd05c6bfb8b7a942d0dbb5624da6b00 Mon Sep 17 00:00:00 2001 From: Victor Saisa Lopez Date: Thu, 4 Apr 2013 11:28:09 -0400 Subject: [PATCH 3/3] BUG 11141 "Javascript doesn't execute when you open a..." SOLVED - Javascript doesn't execute when you open a dynaform fort the first time - Solved problem, JavaScript execute when you open a dynaform in mode preview * Available from version ProcessMaker-2.0.47 (2.5.1) --- gulliver/system/class.xmlform.php | 26 +++++++++++++++++++ workflow/engine/templates/xmlform.html | 15 ++++++++--- .../xmlform/dynaforms/fields/_options.xml | 4 +-- .../xmlform/dynaforms/fields/dropdown.xml | 2 +- 4 files changed, 40 insertions(+), 7 deletions(-) diff --git a/gulliver/system/class.xmlform.php b/gulliver/system/class.xmlform.php index 6e140833d..3539c79ad 100755 --- a/gulliver/system/class.xmlform.php +++ b/gulliver/system/class.xmlform.php @@ -5499,6 +5499,32 @@ class xmlformTemplate extends Smarty */ public function printJSFile (&$form) { + //JS designer>preview + if (isset($_SERVER["HTTP_REFERER"]) && !empty($_SERVER["HTTP_REFERER"]) && preg_match("/^.*dynaforms_Editor\?.*PRO_UID=.*DYN_UID=.*$/", $_SERVER["HTTP_REFERER"]) && preg_match("/^.*dynaforms\/dynaforms_Ajax.*$/", $_SERVER["REQUEST_URI"])) { + $js = null; + + foreach ($form->fields as $index => $value) { + $field = $value; + + if ($field->type == "javascript" && !empty($field->code)) { + $js = $js . " " . $field->code; + } + } + + if ($js != null) { + $form->jsDesignerPreview = " + //JS designer>preview + $js + + loadForm_" . $form->id . "(\"../gulliver/defaultAjaxDynaform\"); + + if (typeof(dynaformOnload) != \"undefined\") { + dynaformOnload(); + } + "; + } + } + $this->assign( 'form', $form ); $this->assign( 'printTemplate', false ); $this->assign( 'printJSFile', true ); diff --git a/workflow/engine/templates/xmlform.html b/workflow/engine/templates/xmlform.html index 3a78672f2..e52702280 100755 --- a/workflow/engine/templates/xmlform.html +++ b/workflow/engine/templates/xmlform.html @@ -114,6 +114,7 @@ sub.sendObj = false; {/literal} {/if} + {foreach from=$form->fields item=field key=name} i = myForm.aElements.length; @@ -174,8 +175,14 @@ {/if} {/if} {/foreach} - {literal}}{/literal} - {/if} - {if $printJavaScript} - leimnud.event.add(window,'load',function(){literal}{{/literal}loadForm_{$form->id}('{$form->ajaxServer}');if (typeof(dynaformOnload) !== 'undefined') {literal}{dynaformOnload();}}{/literal}); + {literal}}{/literal} + + {if (isset($form->jsDesignerPreview))} + {$form->jsDesignerPreview} {/if} +{/if} + +{if $printJavaScript} + leimnud.event.add(window,'load',function(){literal}{{/literal}loadForm_{$form->id}('{$form->ajaxServer}');if (typeof(dynaformOnload) != 'undefined') {literal}{dynaformOnload();}}{/literal}); +{/if} + diff --git a/workflow/engine/xmlform/dynaforms/fields/_options.xml b/workflow/engine/xmlform/dynaforms/fields/_options.xml index a530fa866..d722eccc1 100755 --- a/workflow/engine/xmlform/dynaforms/fields/_options.xml +++ b/workflow/engine/xmlform/dynaforms/fields/_options.xml @@ -1,9 +1,9 @@ - + Value -