PM-937 "Add Gateway to Gateway support" SOLVED

Issue:
    Add Gateway to Gateway support
Cause:
    Nueva solicitud de funciones
Solution:
    - Se ha implementado esta nueva funcionalidad "Gateway to Gateway" de un BPMN-Project a un ProcessMaker-Project
    - Se ha agregado un nuevo tipo de Task (GATEWAYTOGATEWAY) que sirve de puente para conectar un Gateway con otro Gateway

-----
Merge branch 'master' of bitbucket.org:colosa/processmaker into PM-937

Conflicts:
	workflow/engine/classes/model/map/TaskMapBuilder.php
-----

workflow/engine/classes/model/map/TaskMapBuilder.php

@@ -156,9 +156,9 @@ class TaskMapBuilder
         $tMap->addColumn('TAS_SELFSERVICE_TIME_UNIT', 'TasSelfserviceTimeUnit', 'string', CreoleTypes::VARCHAR, false, 15);
 
         $tMap->addColumn('TAS_SELFSERVICE_TRIGGER_UID', 'TasSelfserviceTriggerUid', 'string', CreoleTypes::VARCHAR, false, 32);
-        /*----------------------------------********---------------------------------*/
+
         $tMap->addColumn('TAS_SELFSERVICE_EXECUTION', 'TasSelfserviceExecution', 'string', CreoleTypes::VARCHAR, false, 15);
-        /*----------------------------------********---------------------------------*/
+
         $tMap->addValidator('TAS_TYPE', 'validValues', 'propel.validator.ValidValuesValidator', 'NORMAL|ADHOC|SUBPROCESS|HIDDEN|GATEWAYTOGATEWAY', 'Please enter a valid value for TAS_TYPE');
 
         $tMap->addValidator('TAS_TIMEUNIT', 'validValues', 'propel.validator.ValidValuesValidator', 'MINUTES|HOURS|DAYS|WEEKS|MONTHS', 'Please select a valid value for TAS_TIMEUNIT.');

workflow/engine/js/processmap/core/processes_Map.js

@@ -118,9 +118,7 @@ var saveDataTaskTemporal = function(iForm)
         oTaskData.TAS_SELFSERVICE_TIME = (sw == 1)? getField("TAS_SELFSERVICE_TIME").value : "";
         oTaskData.TAS_SELFSERVICE_TIME_UNIT = (sw == 1)? getField("TAS_SELFSERVICE_TIME_UNIT").value : "";
         oTaskData.TAS_SELFSERVICE_TRIGGER_UID = (sw == 1)? getField("TAS_SELFSERVICE_TRIGGER_UID").value : "";
-        /*----------------------------------********---------------------------------*/
         oTaskData.TAS_SELFSERVICE_EXECUTION = (sw == 1)? getField("TAS_SELFSERVICE_EXECUTION").value : "";
-        /*----------------------------------********---------------------------------*/
         break;
       case 3:
       case '3':

workflow/engine/templates/cases/missRequiredFields.php

@@ -78,8 +78,12 @@
 		$html .= '<input type="button" value="Back" class="module_app_button___gray" />';
 		$html .= '</a>';
 	} else{
+	/*----------------------------------********---------------------------------*/
+
 		$html .= '<input type="button" value="Back" class="module_app_button___gray" onclick="javascript:history.back()">';
 		$html .= '<input type="button" value="Continue" class="module_app_button___gray" onclick="javascript:location.href=\''.$netxpage.'\'">';
+
+	/*----------------------------------********---------------------------------*/
 	}
 	/*----------------------------------********---------------------------------*/
 

workflow/engine/templates/pmTables/edit.js

@@ -160,14 +160,12 @@ Ext.onReady(function(){
           hidden: true,
           hideable:false
       },
-      /*----------------------------------********---------------------------------*/
       {
           id: 'field_index',
           dataIndex: 'field_index',
           hidden: true,
           hideable:false
       },
-      /*----------------------------------********---------------------------------*/
       {
           id: 'field_null',
           dataIndex: 'field_null',
@@ -306,7 +304,9 @@ Ext.onReady(function(){
             disabled: true,
             inputValue: 'always'
         }
-      }, {
+      }      
+      /*----------------------------------********---------------------------------*/
+      , {
         xtype: 'booleancolumn',
         header: _('ID_INDEX'),
         dataIndex: 'field_index',
@@ -320,7 +320,8 @@ Ext.onReady(function(){
             disabled: true,
             inputValue: 'always'
         }
-      }
+      }      
+      /*----------------------------------********---------------------------------*/
   ];
 
   //if permissions plugin is enabled
@@ -1074,12 +1075,14 @@ function editorFieldsEnableDisable(fieldTypeValue, fieldNull, fieldPrimaryKey, f
         fieldPrimaryKey.setValue(false);
     }
 
+    /*----------------------------------********---------------------------------*/
     if (swI == 1) {
         fieldIndex.enable();
     } else {
         fieldIndex.disable();
         fieldIndex.setValue(false);
     }
+    /*----------------------------------********---------------------------------*/
 
     if (swAI == 1) {
         fieldInc.enable();

workflow/engine/templates/pmTables/editReport.js

@@ -408,7 +408,9 @@ Ext.onReady(function(){
             disabled: true,
             inputValue: 'always'
         }
-        }, {
+        }
+        /*----------------------------------********---------------------------------*/
+        , {
             xtype: 'booleancolumn',
             header: _('ID_INDEX'),
             dataIndex: 'field_index',
@@ -423,6 +425,7 @@ Ext.onReady(function(){
                 inputValue: 'always'
             }
         }
+        /*----------------------------------********---------------------------------*/
   ];
   
 function validateFieldSizeAutoincrement(valueType, defaultValue) {
@@ -1300,14 +1303,14 @@ function editorFieldsEnableDisable(fieldTypeValue, fieldIndex, fieldInc, sizeEdi
         swAI = 0;
         swI = 0;
     }
-
+/*----------------------------------********---------------------------------*/
     if (swI == 1) {
         fieldIndex.enable();
     } else {
         fieldIndex.disable();
         fieldIndex.setValue(false);
     }
-
+/*----------------------------------********---------------------------------*/
     if (swAI == 1) {
         fieldInc.enable();
     } else {

workflow/engine/templates/processes/main.js

@@ -61,8 +61,9 @@ Ext.onReady(function(){
         {name : 'CASES_COUNT_TO_DO', type:'float'},
         {name : 'CASES_COUNT_COMPLETED', type:'float'},
         {name : 'CASES_COUNT_CANCELLED', type:'float'},
-        {name : 'PROJECT_TYPE', type:'string'}/*----------------------------------********---------------------------------*/,
+        {name : 'PROJECT_TYPE', type:'string'}
-        {name : "PRO_TYPE_PROCESS", type: "string"}
+        /*----------------------------------********---------------------------------*/
+        ,{name : "PRO_TYPE_PROCESS", type: "string"}
         /*----------------------------------********---------------------------------*/
       ]
     }),
@@ -219,8 +220,9 @@ Ext.onReady(function(){
         {header: _('ID_COMPLETED'), dataIndex: 'CASES_COUNT_COMPLETED', width: 70, align:'right'},
         {header: _('ID_CANCELLED'), dataIndex: 'CASES_COUNT_CANCELLED', width: 70, align:'right'},
         {header: _('ID_TOTAL_CASES'), dataIndex: 'CASES_COUNT', width: 75,renderer:function(v){return "<b>"+v+"</b>";}, align:'right'},
-        {header: _('ID_PRO_DEBUG'), dataIndex: 'PRO_DEBUG_LABEL', width: 50, align:'center'}/*----------------------------------********---------------------------------*/,
+        {header: _('ID_PRO_DEBUG'), dataIndex: 'PRO_DEBUG_LABEL', width: 50, align:'center'}
-        {header: _("ID_TYPE_PROCESS"), dataIndex: "PRO_TYPE_PROCESS", width: 75, align:"left"}
+        /*----------------------------------********---------------------------------*/
+        ,{header: _("ID_TYPE_PROCESS"), dataIndex: "PRO_TYPE_PROCESS", width: 75, align:"left"}
         /*----------------------------------********---------------------------------*/
       ]
     }),