CONSOLIDATED

workflow/engine/classes/class.consolidatedCases.php

@@ -0,0 +1,287 @@
+<?php
+G::LoadClass("pmFunctions");
+G::LoadClass("reportTables");
+
+
+class ConsolidatedCases
+{
+    function cochalo ($data)
+    {
+        $sTasUid        = $data['tas_uid'];
+        $sDynUid        = $data['dyn_uid'];
+        $sStatus        = $data['status'];
+        $sProUid        = $data['pro_uid'];
+        $sRepTabUid     = $data['rep_uid'];
+        $tableName      = $data['table_name'];
+        $title          = $data['title'];
+        $swOverwrite    = $data['overwrite'];
+        $isBPMN         = $data['isBPMN'];
+
+        if ($sStatus == "1" && $sDynUid != "") {
+            switch ($swOverwrite) {
+                case 1:
+                    //Delete report table
+                    $criteria = new Criteria();
+
+                    $criteria->addSelectColumn(ReportTablePeer::REP_TAB_UID);
+                    $criteria->add(ReportTablePeer::REP_TAB_NAME, $tableName);
+
+                    $rsCriteria = ReportTablePeer::doSelectRS($criteria);
+
+                    $rptUid = null;
+
+                    if ($rsCriteria->next()) {
+                        $row = $rsCriteria->getRow();
+
+                        $rptUid = $row[0];
+                    }
+
+                    $rpts = new ReportTables();
+
+                    if ($rptUid != null) {
+                        $rpts->deleteReportTable($rptUid);
+                    }
+
+                    $sRepTabUid = "";
+                    break;
+                case 2:
+                    //Delete table
+                    $rpts = new ReportTables();
+                    $rpts->dropTable($tableName, "wf");
+
+                    $sRepTabUid = "";
+                    break;
+            }
+
+            $criteria = new Criteria();
+            $criteria->addSelectColumn(ReportTablePeer::REP_TAB_UID);
+            //$criteria->add(ReportTablePeer::PRO_UID, $sProUid);
+            $criteria->add(ReportTablePeer::REP_TAB_NAME, $tableName);
+
+            $result = ReportTablePeer::doSelectRS($criteria);
+            $result->setFetchmode(ResultSet::FETCHMODE_ASSOC);
+            if ($result->next()) {
+                $dataRes = $result->getRow();
+
+                if ($dataRes["REP_TAB_UID"] != $sRepTabUid) {
+                    return 1;
+                }
+            } else {
+                //check if table $tableName exists
+                $con = Propel::getConnection("workflow");
+                $stmt = $con->createStatement();
+
+                $sql="SHOW TABLES";
+                $rs1 = $stmt->executeQuery($sql, ResultSet::FETCHMODE_NUM);
+                $rs1->next();
+                while ( is_array($row = $rs1->getRow() )) {
+                    if ( $row[0] == $tableName ) {
+                        return 2;
+                    }
+                    $rs1->next();
+                }
+            }
+
+            if ($isBPMN) {
+                $_POST['form']['PRO_UID'] = $sProUid;
+                $_POST['form']['REP_TAB_UID']  = $sRepTabUid;
+                $_POST['form']['REP_TAB_NAME'] = $tableName;
+                $_POST['form']['REP_TAB_TYPE'] = "NORMAL";
+                $_POST['form']['REP_TAB_GRID'] = '';
+                $_POST['form']['REP_TAB_CONNECTION'] = 'wf';
+                $_POST['form']['REP_TAB_CREATE_DATE'] = date("Y-m-d H:i:s");
+                $_POST['form']['REP_TAB_STATUS'] = 'ACTIVE';
+                $_POST['form']['REP_TAB_TITLE'] = $title;
+            } else {
+                $_POST['form']['PRO_UID'] = $sProUid;
+                $_POST['form']['REP_TAB_UID']  = $sRepTabUid;
+                $_POST['form']['REP_TAB_NAME'] = $tableName;
+                $_POST['form']['REP_TAB_TYPE'] = "GRID";
+                $_POST['form']['REP_TAB_GRID'] = $sProUid . "-" . $sDynUid;
+                $_POST['form']['REP_TAB_CONNECTION'] = 'wf';
+                $_POST['form']['REP_TAB_CREATE_DATE'] = date("Y-m-d H:i:s");
+                $_POST['form']['REP_TAB_STATUS'] = 'ACTIVE';
+                $_POST['form']['REP_TAB_TITLE'] = $title;
+            }
+
+            $_POST['form']['FIELDS'] = array();
+
+            G::LoadClass("reportTables");
+
+            $oReportTable = new ReportTable();
+            //if (!isset($_POST['form']['REP_TAB_CONNECTION'])) {
+            //  $_POST['form']['REP_TAB_CONNECTION'] = 'report';
+            //}
+            if ($_POST['form']['REP_TAB_UID'] != "") {
+                $aReportTable   = $oReportTable->load($_POST['form']['REP_TAB_UID']);
+                $sOldTableName  = $aReportTable['REP_TAB_NAME'];
+                $sOldConnection = $aReportTable['REP_TAB_CONNECTION'];
+            } else {
+
+                $sOldTableName  = $_POST['form']['REP_TAB_NAME'];
+                $sOldConnection = $_POST['form']['REP_TAB_CONNECTION'];
+                $_POST['form']['REP_TAB_TYPE'] = 'NORMAL';
+                $oReportTable->create($_POST['form']);
+                $_POST['form']['REP_TAB_UID'] = $oReportTable->getRepTabUid();
+            }
+
+            $_POST['form']['REP_TAB_TYPE'] = 'NORMAL';
+            $oReportTable->update($_POST['form']);
+
+            $oReportVar = new ReportVar();
+            $oReportTables = new ReportTables();
+            $oReportTables->deleteAllReportVars($_POST['form']['REP_TAB_UID']);
+
+            $aFields = array();
+
+            if ($isBPMN) {
+                G::LoadClass("pmDynaform");
+                $pmDyna = new pmDynaform(array());
+                $pmDyna->fields["CURRENT_DYNAFORM"] = $sDynUid;
+                $dataDyna = $pmDyna->getDynaform();
+                $json = G::json_decode($dataDyna["DYN_CONTENT"]);
+                $fieldsDyna = $json->items[0]->items;
+                foreach ($fieldsDyna as $value) {
+                    $_POST['form']['FIELDS'][] = $value[0]->name . '-' . $value[0]->type;
+                }
+            } else {
+                $aAux = explode('-', $_POST['form']['REP_TAB_GRID']);
+                global $G_FORM;
+
+                require_once "classes/class.formBatchRouting.php";
+
+                $G_FORM = new FormBatchRouting($_POST["form"]["PRO_UID"] . PATH_SEP . $aAux[1], PATH_DYNAFORM, SYS_LANG, false);
+                $aAux = $G_FORM->getVars(false);
+
+                foreach ($aAux as $aField) {
+                    $_POST['form']['FIELDS'][] = $aField['sName'] . '-' . $aField['sType'];
+                }
+            }
+
+            $aFieldsClases = array();
+            $i = 1;
+            $aFieldsClases[$i]['FLD_NAME'] = 'APP_UID';
+            $aFieldsClases[$i]['FLD_NULL'] = 'off';
+            $aFieldsClases[$i]['FLD_KEY'] = 'on';
+            $aFieldsClases[$i]['FLD_AUTO_INCREMENT'] = 'off';
+            $aFieldsClases[$i]['FLD_DESCRIPTION'] = '';
+            $aFieldsClases[$i]['FLD_TYPE'] = 'VARCHAR' ;
+            $aFieldsClases[$i]['FLD_SIZE'] = 32;
+            $i++;
+            $aFieldsClases[$i]['FLD_NAME'] = 'APP_NUMBER';
+            $aFieldsClases[$i]['FLD_NULL'] = 'off';
+            $aFieldsClases[$i]['FLD_KEY'] = 'on';
+            $aFieldsClases[$i]['FLD_AUTO_INCREMENT'] = 'off';
+            $aFieldsClases[$i]['FLD_DESCRIPTION'] = '';
+            $aFieldsClases[$i]['FLD_TYPE'] = 'VARCHAR' ;
+            $aFieldsClases[$i]['FLD_SIZE'] = 255;
+
+            foreach ($_POST['form']['FIELDS'] as $sField) {
+                $aField = explode('-', $sField);
+                $i++;
+                $aFieldsClases[$i]['FLD_NAME'] = $aField[0];
+                $aFieldsClases[$i]['FLD_NULL'] = 'off';
+                $aFieldsClases[$i]['FLD_KEY'] = 'off';
+                $aFieldsClases[$i]['FLD_AUTO_INCREMENT'] = 'off';
+                $aFieldsClases[$i]['FLD_DESCRIPTION'] = '';
+
+                switch ($aField[1]) {
+                    case 'currency':
+                    case 'percentage':
+                        $sType = 'number';
+                        $aFieldsClases[$i]['FLD_TYPE'] = 'FLOAT' ;
+                        $aFieldsClases[$i]['FLD_SIZE'] = 255;
+                        break;
+                    case 'text':
+                    case 'password':
+                    case 'dropdown':
+                    case 'yesno':
+                    case 'checkbox':
+                    case 'radiogroup':
+                    case 'hidden':
+                    case "link":
+                        $sType = 'char';
+                        $aFieldsClases[$i]['FLD_TYPE'] = 'VARCHAR' ;
+                        $aFieldsClases[$i]['FLD_SIZE'] = 255;
+                        break;
+                    case 'textarea':
+                        $sType = 'text';
+                        $aFieldsClases[$i]['FLD_TYPE'] = 'TEXT' ;
+                        $aFieldsClases[$i]['FLD_SIZE'] = '';
+                        break;
+                    case 'date':
+                        $sType = 'date';
+                        $aFieldsClases[$i]['FLD_TYPE'] = 'DATE' ;
+                        $aFieldsClases[$i]['FLD_SIZE'] = '';
+                        break;
+                    default:
+                        $sType = 'char';
+                        $aFieldsClases[$i]['FLD_TYPE'] = 'VARCHAR' ;
+                        $aFieldsClases[$i]['FLD_SIZE'] = 255;
+                        break;
+                }
+
+                $oReportVar->create(array('REP_TAB_UID'  => $_POST['form']['REP_TAB_UID'],
+                                          'PRO_UID'      => $_POST['form']['PRO_UID'],
+                                          'REP_VAR_NAME' => $aField[0],
+                                          'REP_VAR_TYPE' => $sType));
+                $aFields[] = array('sFieldName' => $aField[0], 'sType' => $sType);
+            }
+
+            $_POST['form']['REP_TAB_TYPE'] = "NORMAL";
+            $oReportTables->dropTable($sOldTableName, $sOldConnection);
+            $oReportTables->createTable($_POST['form']['REP_TAB_NAME'], $_POST['form']['REP_TAB_CONNECTION'], $_POST['form']['REP_TAB_TYPE'], $aFields);
+            $oReportTables->populateTable($_POST['form']['REP_TAB_NAME'], $_POST['form']['REP_TAB_CONNECTION'], $_POST['form']['REP_TAB_TYPE'], $aFields, $_POST['form']['PRO_UID'], '');
+
+            $sRepTabUid = $_POST['form']['REP_TAB_UID'];
+
+            //clases
+        } else {
+            $oReportTables = new ReportTables();
+            if ($sRepTabUid != "") {
+                $oReportTables->deleteReportTable($sRepTabUid);
+            }
+            $sRepTabUid = "";
+        }
+
+        require_once ("classes/model/CaseConsolidatedPeer.php");
+        require_once ("classes/model/CaseConsolidated.php");
+
+        $oCaseConsolidated = CaseConsolidatedPeer::retrieveByPK($sTasUid);
+
+        if (!(is_object($oCaseConsolidated)) || get_class($oCaseConsolidated) != 'CaseConsolidated') {
+            $oCaseConsolidated = new CaseConsolidated();
+            $oCaseConsolidated->setTasUid($sTasUid);
+        }
+
+        if ($sStatus == '1') {
+            $oCaseConsolidated->setConStatus('ACTIVE');
+        } else {
+            $oCaseConsolidated->setConStatus('INACTIVE');
+        }
+
+        $oCaseConsolidated->setDynUid($sDynUid);
+        $oCaseConsolidated->setRepTabUid($sRepTabUid);
+        $oCaseConsolidated->save();
+
+        $sClassName = $tableName;//'__' . $sTasUid;
+
+        if ($sStatus == '1') {
+            //$oAdditionalTables->createPropelClasses($sTableName, $sClassName, $aFields, $sAddTabUid)
+            //require_once 'classes/model/AdditionalTables.php';
+            //$oAdditionalTables = new AdditionalTables();
+            $oAdditionalTables = new AdditionalTables();//AdditionalTablesConsolidated
+
+            $oAdditionalTables->createPropelClasses($tableName, $sClassName, $aFieldsClases, $sTasUid);
+        } else {
+            $sPath = PATH_DB . SYS_SYS . PATH_SEP . 'classes' . PATH_SEP;
+            @unlink($sPath . $sClassName . '.php');
+            @unlink($sPath . $sClassName . 'Peer.php');
+            @unlink($sPath . PATH_SEP . 'map' . PATH_SEP . $sClassName . 'MapBuilder.php');
+            @unlink($sPath . PATH_SEP . 'om' . PATH_SEP . 'Base' . $sClassName . '.php');
+            @unlink($sPath . PATH_SEP . 'om' . PATH_SEP . 'Base' . $sClassName . 'Peer.php');
+        }
+
+
+    }
+}

workflow/engine/classes/class.pmDynaform.php

@@ -19,8 +19,10 @@ class pmDynaform
     public function __construct($fields)
     {
         $this->fields = $fields;
-        $this->getDynaform();
+        if (count($fields) && count($fields['APP_DATA'])) {
-        $this->getCredentials();
+            $this->getDynaform();
+            $this->getCredentials();    
+        }
         if (isset($this->fields["APP_UID"])) {
             //current
             $cases = new \ProcessMaker\BusinessModel\Cases();

workflow/engine/methods/cases/caseConsolidated.php

@@ -0,0 +1,277 @@
+<?php
+G::LoadClass("pmFunctions");
+G::LoadClass("reportTables");
+
+$sTasUid        = $_REQUEST['tas_uid'];
+$sDynUid        = $_REQUEST['dyn_uid'];
+$sStatus        = $_REQUEST['status'];
+$sProUid        = $_REQUEST['pro_uid'];
+$sRepTabUid     = $_REQUEST['rep_uid'];
+$tableName      = $_REQUEST['table_name'];
+$title          = $_REQUEST['title'];
+$swOverwrite    = $_REQUEST['overwrite'];
+$isBPMN         = $_REQUEST['isBPMN'];
+
+if ($sStatus == "1" && $sDynUid != "") {
+    switch ($swOverwrite) {
+        case 1:
+            //Delete report table
+            $criteria = new Criteria();
+
+            $criteria->addSelectColumn(ReportTablePeer::REP_TAB_UID);
+            $criteria->add(ReportTablePeer::REP_TAB_NAME, $tableName);
+
+            $rsCriteria = ReportTablePeer::doSelectRS($criteria);
+
+            $rptUid = null;
+
+            if ($rsCriteria->next()) {
+                $row = $rsCriteria->getRow();
+
+                $rptUid = $row[0];
+            }
+
+            $rpts = new ReportTables();
+
+            if ($rptUid != null) {
+                $rpts->deleteReportTable($rptUid);
+            }
+
+            $sRepTabUid = "";
+            break;
+        case 2:
+            //Delete table
+            $rpts = new ReportTables();
+            $rpts->dropTable($tableName, "wf");
+
+            $sRepTabUid = "";
+            break;
+    }
+
+    $criteria = new Criteria();
+    $criteria->addSelectColumn(ReportTablePeer::REP_TAB_UID);
+    //$criteria->add(ReportTablePeer::PRO_UID, $sProUid);
+    $criteria->add(ReportTablePeer::REP_TAB_NAME, $tableName);
+
+    $result = ReportTablePeer::doSelectRS($criteria);
+    $result->setFetchmode(ResultSet::FETCHMODE_ASSOC);
+
+    if ($result->next()) {
+        $dataRes = $result->getRow();
+
+        if ($dataRes["REP_TAB_UID"] != $sRepTabUid) {
+            return 1;
+        }
+    } else {
+        //check if table $tableName exists
+        $con = Propel::getConnection("workflow");
+        $stmt = $con->createStatement();
+
+        $sql="SHOW TABLES";
+        $rs1 = $stmt->executeQuery($sql, ResultSet::FETCHMODE_NUM);
+        $rs1->next();
+        while ( is_array($row = $rs1->getRow() )) {
+            if ( $row[0] == $tableName ) {
+                return 2;
+            }
+            $rs1->next();
+        }
+    }
+
+    if ($isBPMN) {
+        $_POST['form']['PRO_UID'] = $sProUid;
+        $_POST['form']['REP_TAB_UID']  = $sRepTabUid;
+        $_POST['form']['REP_TAB_NAME'] = $tableName;
+        $_POST['form']['REP_TAB_TYPE'] = "NORMAL";
+        $_POST['form']['REP_TAB_GRID'] = '';
+        $_POST['form']['REP_TAB_CONNECTION'] = 'wf';
+        $_POST['form']['REP_TAB_CREATE_DATE'] = date("Y-m-d H:i:s");
+        $_POST['form']['REP_TAB_STATUS'] = 'ACTIVE';
+        $_POST['form']['REP_TAB_TITLE'] = $title;
+    } else {
+        $_POST['form']['PRO_UID'] = $sProUid;
+        $_POST['form']['REP_TAB_UID']  = $sRepTabUid;
+        $_POST['form']['REP_TAB_NAME'] = $tableName;
+        $_POST['form']['REP_TAB_TYPE'] = "GRID";
+        $_POST['form']['REP_TAB_GRID'] = $sProUid . "-" . $sDynUid;
+        $_POST['form']['REP_TAB_CONNECTION'] = 'wf';
+        $_POST['form']['REP_TAB_CREATE_DATE'] = date("Y-m-d H:i:s");
+        $_POST['form']['REP_TAB_STATUS'] = 'ACTIVE';
+        $_POST['form']['REP_TAB_TITLE'] = $title;
+    }
+
+    $_POST['form']['FIELDS'] = array();
+
+    G::LoadClass("reportTables");
+
+    $oReportTable = new ReportTable();
+    //if (!isset($_POST['form']['REP_TAB_CONNECTION'])) {
+    //  $_POST['form']['REP_TAB_CONNECTION'] = 'report';
+    //}
+    if ($_POST['form']['REP_TAB_UID'] != "") {
+        $aReportTable   = $oReportTable->load($_POST['form']['REP_TAB_UID']);
+        $sOldTableName  = $aReportTable['REP_TAB_NAME'];
+        $sOldConnection = $aReportTable['REP_TAB_CONNECTION'];
+    } else {
+        $sOldTableName  = $_POST['form']['REP_TAB_NAME'];
+        $sOldConnection = $_POST['form']['REP_TAB_CONNECTION'];
+        $_POST['form']['REP_TAB_TYPE'] = 'NORMAL';
+        $oReportTable->create($_POST['form']);
+        $_POST['form']['REP_TAB_UID'] = $oReportTable->getRepTabUid();
+    }
+
+    $_POST['form']['REP_TAB_TYPE'] = 'NORMAL';
+    $oReportTable->update($_POST['form']);
+
+    $oReportVar = new ReportVar();
+    $oReportTables = new ReportTables();
+    $oReportTables->deleteAllReportVars($_POST['form']['REP_TAB_UID']);
+
+    $aFields = array();
+
+    if ($isBPMN) {
+        G::LoadClass("pmDynaform");
+
+        $pmDyna = new pmDynaform(array());
+        $pmDyna->fields["CURRENT_DYNAFORM"] = $sDynUid;
+        $dataDyna = $pmDyna->getDynaform();
+        $json = G::json_decode($dataDyna["DYN_CONTENT"]);
+        $data = $pmDyna->jsonr($json);
+        G::pr($data); die;
+    } else {
+        $aAux = explode('-', $_POST['form']['REP_TAB_GRID']);
+        global $G_FORM;
+
+        require_once "classes/class.formBatchRouting.php";
+
+        $G_FORM = new FormBatchRouting($_POST["form"]["PRO_UID"] . PATH_SEP . $aAux[1], PATH_DYNAFORM, SYS_LANG, false);
+        $aAux = $G_FORM->getVars(false);
+
+        foreach ($aAux as $aField) {
+            $_POST['form']['FIELDS'][] = $aField['sName'] . '-' . $aField['sType'];
+        }
+    }
+
+    $aFieldsClases = array();
+    $i = 1;
+    $aFieldsClases[$i]['FLD_NAME'] = 'APP_UID';
+    $aFieldsClases[$i]['FLD_NULL'] = 'off';
+    $aFieldsClases[$i]['FLD_KEY'] = 'on';
+    $aFieldsClases[$i]['FLD_AUTO_INCREMENT'] = 'off';
+    $aFieldsClases[$i]['FLD_DESCRIPTION'] = '';
+    $aFieldsClases[$i]['FLD_TYPE'] = 'VARCHAR' ;
+    $aFieldsClases[$i]['FLD_SIZE'] = 32;
+    $i++;
+    $aFieldsClases[$i]['FLD_NAME'] = 'APP_NUMBER';
+    $aFieldsClases[$i]['FLD_NULL'] = 'off';
+    $aFieldsClases[$i]['FLD_KEY'] = 'on';
+    $aFieldsClases[$i]['FLD_AUTO_INCREMENT'] = 'off';
+    $aFieldsClases[$i]['FLD_DESCRIPTION'] = '';
+    $aFieldsClases[$i]['FLD_TYPE'] = 'VARCHAR' ;
+    $aFieldsClases[$i]['FLD_SIZE'] = 255;
+
+    foreach ($_POST['form']['FIELDS'] as $sField) {
+        $aField = explode('-', $sField);
+        $i++;
+        $aFieldsClases[$i]['FLD_NAME'] = $aField[0];
+        $aFieldsClases[$i]['FLD_NULL'] = 'off';
+        $aFieldsClases[$i]['FLD_KEY'] = 'off';
+        $aFieldsClases[$i]['FLD_AUTO_INCREMENT'] = 'off';
+        $aFieldsClases[$i]['FLD_DESCRIPTION'] = '';
+
+        switch ($aField[1]) {
+            case 'currency':
+            case 'percentage':
+                $sType = 'number';
+                $aFieldsClases[$i]['FLD_TYPE'] = 'FLOAT' ;
+                $aFieldsClases[$i]['FLD_SIZE'] = 255;
+                break;
+            case 'text':
+            case 'password':
+            case 'dropdown':
+            case 'yesno':
+            case 'checkbox':
+            case 'radiogroup':
+            case 'hidden':
+            case "link":
+                $sType = 'char';
+                $aFieldsClases[$i]['FLD_TYPE'] = 'VARCHAR' ;
+                $aFieldsClases[$i]['FLD_SIZE'] = 255;
+                break;
+            case 'textarea':
+                $sType = 'text';
+                $aFieldsClases[$i]['FLD_TYPE'] = 'TEXT' ;
+                $aFieldsClases[$i]['FLD_SIZE'] = '';
+                break;
+            case 'date':
+                $sType = 'date';
+                $aFieldsClases[$i]['FLD_TYPE'] = 'DATE' ;
+                $aFieldsClases[$i]['FLD_SIZE'] = '';
+                break;
+            default:
+                $sType = 'char';
+                $aFieldsClases[$i]['FLD_TYPE'] = 'VARCHAR' ;
+                $aFieldsClases[$i]['FLD_SIZE'] = 255;
+                break;
+        }
+
+        $oReportVar->create(array('REP_TAB_UID'  => $_POST['form']['REP_TAB_UID'],
+                                  'PRO_UID'      => $_POST['form']['PRO_UID'],
+                                  'REP_VAR_NAME' => $aField[0],
+                                  'REP_VAR_TYPE' => $sType));
+        $aFields[] = array('sFieldName' => $aField[0], 'sType' => $sType);
+    }
+
+    $_POST['form']['REP_TAB_TYPE'] = "NORMAL";
+    $oReportTables->dropTable($sOldTableName, $sOldConnection);
+    $oReportTables->createTable($_POST['form']['REP_TAB_NAME'], $_POST['form']['REP_TAB_CONNECTION'], $_POST['form']['REP_TAB_TYPE'], $aFields);
+    $oReportTables->populateTable($_POST['form']['REP_TAB_NAME'], $_POST['form']['REP_TAB_CONNECTION'], $_POST['form']['REP_TAB_TYPE'], $aFields, $_POST['form']['PRO_UID'], '');
+
+    $sRepTabUid = $_POST['form']['REP_TAB_UID'];
+
+    //clases
+} else {
+    $oReportTables = new ReportTables();
+    if ($sRepTabUid != "") {
+        $oReportTables->deleteReportTable($sRepTabUid);
+    }
+    $sRepTabUid = "";
+}
+
+require_once ("classes/model/CaseConsolidatedPeer.php");
+require_once ("classes/model/CaseConsolidated.php");
+
+$oCaseConsolidated = CaseConsolidatedPeer::retrieveByPK($sTasUid);
+
+if (!(is_object($oCaseConsolidated)) || get_class($oCaseConsolidated) != 'CaseConsolidated') {
+    $oCaseConsolidated = new CaseConsolidated();
+    $oCaseConsolidated->setTasUid($sTasUid);
+}
+
+if ($sStatus == '1') {
+    $oCaseConsolidated->setConStatus('ACTIVE');
+} else {
+    $oCaseConsolidated->setConStatus('INACTIVE');
+}
+
+$oCaseConsolidated->setDynUid($sDynUid);
+$oCaseConsolidated->setRepTabUid($sRepTabUid);
+$oCaseConsolidated->save();
+
+$sClassName = $tableName;//'__' . $sTasUid;
+
+if ($sStatus == '1') {
+    //$oAdditionalTables->createPropelClasses($sTableName, $sClassName, $aFields, $sAddTabUid)
+    //require_once 'classes/model/AdditionalTables.php';
+    //$oAdditionalTables = new AdditionalTables();
+    $oAdditionalTables = new AdditionalTables();//AdditionalTablesConsolidated
+
+    $oAdditionalTables->createPropelClasses($tableName, $sClassName, $aFieldsClases, $sTasUid);
+} else {
+    $sPath = PATH_DB . SYS_SYS . PATH_SEP . 'classes' . PATH_SEP;
+    @unlink($sPath . $sClassName . '.php');
+    @unlink($sPath . $sClassName . 'Peer.php');
+    @unlink($sPath . PATH_SEP . 'map' . PATH_SEP . $sClassName . 'MapBuilder.php');
+    @unlink($sPath . PATH_SEP . 'om' . PATH_SEP . 'Base' . $sClassName . '.php');
+    @unlink($sPath . PATH_SEP . 'om' . PATH_SEP . 'Base' . $sClassName . 'Peer.php');
+}

workflow/engine/src/ProcessMaker/BusinessModel/Consolidated.php

@@ -432,14 +432,47 @@ class Consolidated
             $dateFormat = "Y/m/d";
         }
 
-        $filename = $pro_uid . PATH_SEP . $dyn_uid . ".xml";
+        $oDyna = new \Dynaform();
+        $dataTask = $oDyna->load($dyn_uid);
+        if ($dataTask['DYN_VERSION'] > 0) {
+            G::LoadClass("pmDynaform");
+            $pmDyna = new \pmDynaform(array('APP_DATA' => array()));
+            $pmDyna->fields["CURRENT_DYNAFORM"] = $dyn_uid;
+            $json = G::json_decode($dataTask["DYN_CONTENT"]);
+            $pmDyna->jsonr($json);
+            $fieldsDyna = $json->items[0]->items;
+            
+            $xmlfrm = new \stdclass();
+            $xmlfrm->fields = array();
+            foreach ($fieldsDyna as $key => $value) {
+                //$temp = $value[0];
+                $temp = new \stdclass();
+                $temp->type = $value[0]->type;
+                $temp->label = $value[0]->label;
+                $temp->name = $value[0]->name;
+                $temp->required = $value[0]->required;
+                $temp->mode = $value[0]->mode;
 
-        if (!class_exists('Smarty')) {
+                $temp->storeData = '[';
-            require_once(PATH_THIRDPARTY . 'smarty' . PATH_SEP . 'libs' . PATH_SEP . 'Smarty.class.php');  
+                foreach ($value[0]->options as $valueOption) {
+                    $temp->storeData .= '{"value":"' . $valueOption['value'] . '", "text":"' . $valueOption['value'] . '"},';
+                }
+                $temp->storeData = substr($temp->storeData,0,-1);
+                $temp->storeData .= ']';
+
+                $temp->readOnly = ($value[0]->mode == 'view') ? "0" : "1";
+                $temp->colWidth = 200;
+                $xmlfrm->fields[] = $temp;
+            }
+        } else {
+            $filename = $pro_uid . PATH_SEP . $dyn_uid . ".xml";
+            if (!class_exists('Smarty')) {
+                require_once(PATH_THIRDPARTY . 'smarty' . PATH_SEP . 'libs' . PATH_SEP . 'Smarty.class.php');  
+            }
+            $xmlfrm = new \XmlForm();
+            $xmlfrm->home = PATH_DYNAFORM;
+            $xmlfrm->parseFile($filename, SYS_LANG, true);    
         }
-        $xmlfrm = new \XmlForm();
-        $xmlfrm->home = PATH_DYNAFORM;
-        $xmlfrm->parseFile($filename, SYS_LANG, true);
 
         $caseColumns      = array();
         $caseReaderFields = array();
@@ -482,7 +515,6 @@ class Consolidated
                 case "dropdown":
                     $dropList[] = $field->name;
                     $align = "left";
-
                     $editor = "* new Ext.form.ComboBox({
                                    id: \"cbo" . $field->name . "_" . $pro_uid . "\",
 
@@ -491,18 +523,14 @@ class Consolidated
 
                                    /*store: comboStore,*/
                                    store: new Ext.data.JsonStore({
-                                     storeId: \"store" . $field->name . "_" . $pro_uid . "\",
+                                     data: " . htmlspecialchars_decode($field->storeData) . ",
-                                     proxy: new Ext.data.HttpProxy({
-                                       url: 'proxyDataCombobox'
-                                     }),
-                                     root: 'records',
                                      fields: [{name: 'value'},
                                               {name: 'text'}
                                              ]
                                    }),
 
-                                   triggerAction: 'all',
+
-                                   mode:     'local',
+                                   queryMode: 'local',
                                    editable: false,
                                    disabled: $fieldDisabled,
                                    lazyRender: false,
@@ -512,9 +540,9 @@ class Consolidated
                                    $fieldValidate
                                    cls: \"\"
                                  }) *";
-
+                    $editor = eregi_replace("[\n|\r|\n\r]", ' ', $editor);
                     $width = $field->colWidth;
-
+                    
                     $caseColumns[] = array("xtype" => "combocolumn", "gridId" => "gridId", "header" => $fieldLabel, "dataIndex" => $field->name, "width" => (int)($width), "align" => $align, "editor" => $editor, "frame" => "true", "clicksToEdit" => "1");
                     $caseReaderFields[] = array("name" => $field->name);
                     break;

workflow/engine/src/ProcessMaker/BusinessModel/Task.php

@@ -383,6 +383,23 @@ class Task
             }
 
             $result = $task->update($arrayProperty);
+            if (!empty($arrayProperty['CONSOLIDATE_DATA'])) {
+                G::LoadClass("consolidatedCases");
+                $consolidated = new \ConsolidatedCases();
+                $dataConso = array(
+                    'tas_uid'       => $arrayProperty['TAS_UID'],
+                    'dyn_uid'       => $arrayProperty['CONSOLIDATE_DATA']['consolidated_dynaform'],
+                    'status'        => true,
+                    'pro_uid'       => $arrayProperty['PRO_UID'],
+                    'rep_uid'       => '',
+                    'table_name'    => $arrayProperty['CONSOLIDATE_DATA']['consolidated_table'],
+                    'title'         => $arrayProperty['CONSOLIDATE_DATA']['consolidated_title'],
+                    'overwrite'     => true,
+                    'isBPMN'        => true
+                );
+                $consolidated->cochalo($dataConso);
+                
+            }
             $arrayResult["status"] = "OK";
 
             if ($result == 3) {

workflow/engine/templates/cases/casesListConsolidated.js

@@ -895,13 +895,6 @@ function generateGrid(proUid, tasUid, dynUid)
                //currentFieldEdited = e.field;
                //comboStore.load();
 
-               storeAux = Ext.StoreMgr.get("store" + e.field + "_" + proUid);
-               storeAux.setBaseParam("appUid", selRow.data["APP_UID"]);
-               storeAux.setBaseParam("dynUid", dynUid);
-               storeAux.setBaseParam("proUid", proUid);
-               storeAux.setBaseParam("fieldName", e.field);
-               //currentFieldEdited = e.field;
-               storeAux.load();
              }
            },