Merge branch 'master' of git@github.com:colosa/processmaker.git

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 );

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 );

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}
+

workflow/engine/xmlform/dynaforms/fields/_options.xml

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <dynaForm name="_options" type="grid" width="100%" editRow="0" insertRow="0">
-<NAME type="text" validate="Field" size="25">
+<NAME type="text" validate="Field" size="19">
     <en>Value</en>
 </NAME>
-<LABEL type="text" size="25">
+<LABEL type="text" size="19">
     <en>Label</en>
 </LABEL>
 <OPTGROUP type="checkbox" value="1" falsevalue="0" defaultvalue="0">

workflow/engine/xmlform/dynaforms/fields/dropdown.xml

@@ -123,7 +123,7 @@ function gridOptionOptGroupColumn(show, swDelete)
                 lblOptGroup = tableGrid.rows[i].cells[j].innerHTML;
             }
 
-            tableGrid.rows[i].cells[j].style.width = "20%";
+            tableGrid.rows[i].cells[j].style.width = "25%";
             tableGrid.rows[i].cells[j].innerHTML = (show == 1)? lblOptGroup : "";
         }
     }

workflow/engine/xmlform/triggers/triggersCustom.html

@@ -17,7 +17,7 @@
               <td colspan="2">{$form.TRI_UID}</td>
              </tr>
                                                 <tr>
-              <td class='FormLabel' width="{$form_labelWidth}">{$TRI_TITLE}</td>
+              <td class='FormLabel' width="{$form_labelWidth}"><font color="red">* </font> {$TRI_TITLE}</td>
               <!-- <td class='FormFieldContent' width="{$form_width}" >{$form.TRI_TITLE} </td>  //-->
               <td class='FormFieldContent' width='{$form_fieldContentWidth}' >{$form.TRI_TITLE}</td>
               </tr>

workflow/engine/xmlform/triggers/triggersCustom.xml

@@ -9,7 +9,7 @@
 </TITLE>
 <TRI_UID type="hidden"/>
 
-<TRI_TITLE type="text" size="80" maxlength="100">
+<TRI_TITLE type="text" size="80" maxlength="100" required="1">
   <en>Title</en>
 </TRI_TITLE>
 <TRI_PARAM type="hidden" value=""/>
@@ -104,4 +104,4 @@ function cancel(){
 }
 
 ]]></JS>
-</dynaForm>
+</dynaForm>