Merged in dheeyi/processmaker/MT-51 (pull request #3956)

MT-51

workflow/engine/classes/class.processes.php

@@ -3041,6 +3041,50 @@ class Processes
         }
     }
 
+    /**
+     * @param $sProUid
+     * @return mixed
+     * @throws Exception
+     */
+    public function getReportTables($sProUid)
+    {
+        try {
+
+            $additionalTables = new AdditionalTables();
+            $getalldditionalTables = $additionalTables->getReportTables($sProUid);
+            return $getalldditionalTables;
+        } catch (Exception $oError) {
+            throw $oError;
+        }
+    }
+
+    /**
+     * @param $sProUid
+     * @return mixed
+     * @throws Exception
+     */
+    public function getReportTablesVar($sProUid)
+    {
+        try {
+            $fieldsReportTables = array();
+            $additionalTables = new AdditionalTables();
+            $getalldditionalTables = $additionalTables->getReportTables($sProUid);
+
+            foreach ($getalldditionalTables as $row) {
+                $additionalTables->setAddTabUid($row['ADD_TAB_UID']);
+                $fieldsAdditionalTables = $additionalTables->getFields();
+                foreach ($fieldsAdditionalTables as $rowField) {
+                    $rowField['ADD_TAB_UID'] = $row['ADD_TAB_UID'];
+                    array_push($fieldsReportTables, $rowField);
+                }
+            }
+
+            return $fieldsReportTables;
+        } catch (Exception $oError) {
+            throw $oError;
+        }
+    }
+
     /**
      * Get Report Tables Vars Rows for a Process
      *

workflow/engine/classes/model/AdditionalTables.php

@@ -964,6 +964,31 @@ class AdditionalTables extends BaseAdditionalTables
         }
     }
 
+    /**
+     * @param $proUid
+     * @return array
+     */
+    public function getReportTables($proUid)
+    {
+        $reportTables = array();
+        $oCriteria = new Criteria('workflow');
+        $oCriteria->addSelectColumn(AdditionalTablesPeer::ADD_TAB_UID);
+        $oCriteria->addSelectColumn(AdditionalTablesPeer::ADD_TAB_NAME);
+        $oCriteria->addSelectColumn(AdditionalTablesPeer::ADD_TAB_DESCRIPTION);
+        $oCriteria->addSelectColumn(AdditionalTablesPeer::ADD_TAB_TYPE);
+        $oCriteria->addSelectColumn(AdditionalTablesPeer::ADD_TAB_TAG);
+        $oCriteria->addSelectColumn(AdditionalTablesPeer::PRO_UID);
+        $oCriteria->addSelectColumn(AdditionalTablesPeer::DBS_UID);
+        $oCriteria->add(AdditionalTablesPeer::PRO_UID, $proUid, Criteria::EQUAL);
+        $dt = ContentPeer::doSelectRS($oCriteria);
+        $dt->setFetchmode(ResultSet::FETCHMODE_ASSOC);
+        while ($dt->next()) {
+            $row = $dt->getRow();
+            array_push($reportTables, $row);
+        }
+        return $reportTables;
+    }
+    
     public function getAll($start = 0, $limit = 20, $filter = '', $process = null)
     {
         $oCriteria = new Criteria('workflow');

workflow/engine/src/ProcessMaker/BusinessModel/Migrator/AssignmentRulesMigrator.php

@@ -66,8 +66,8 @@ class AssignmentRulesMigrator implements Importable, Exportable
     {
         try {
             $oAssignRules = new \StdClass();
-            $oAssignRules->tasks = $this->processes->getTaskRows($prj_uid);
+            $oAssignRulesTasks = $this->processes->getTaskRows($prj_uid);
-            $oAssignRules->taskusers = $this->processes->getTaskUserRows($oAssignRules->tasks);
+            $oAssignRules->taskusers = $this->processes->getTaskUserRows($oAssignRulesTasks);
 
             $result = array(
                 'workflow-definition' => (array)$oAssignRules

workflow/engine/src/ProcessMaker/BusinessModel/Migrator/GranularImporter.php

@@ -148,7 +148,7 @@ class GranularImporter
                 $objClass = $this->factory->create($data['name']);
                 if (is_object($objClass)) {
                     $dataImport = $data['data'][$data['name']];
-                    $replace = ($data['value'] == 'merge') ? true : false;
+                    $replace = ($data['value'] == 'replace') ? true : false;
                     $migratorData = $objClass->import($dataImport, $replace);
                 }
             }

workflow/engine/src/ProcessMaker/BusinessModel/Migrator/ProcessDefinitionMigrator.php

@@ -68,10 +68,8 @@ class ProcessDefinitionMigrator implements Importable, Exportable
             $bpmnStruct["LANESET"] = \BpmnLaneset::getAll($prj_uid);
             $bpmnStruct["PARTICIPANT"] = \BpmnParticipant::getAll($prj_uid);
             $bpmnStruct["PROCESS"] = \BpmnProcess::getAll($prj_uid);
-            $bpmnStruct["PROJECT"] = array(\BpmnProjectPeer::retrieveByPK($prj_uid)->toArray());
 
             $oData = new \StdClass();
-            $oData->process = $this->processes->getProcessRow($prj_uid, false);
             $oData->tasks = $this->processes->getTaskRows($prj_uid);
 
             $oDataTask = new \StdClass();
@@ -83,7 +81,6 @@ class ProcessDefinitionMigrator implements Importable, Exportable
             $oData->steps = $this->processes->getStepRows($prj_uid);
             $oData->groupwfs = $this->processes->getGroupwfRows($oDataTask->taskusers);
             $oData->steptriggers = $this->processes->getStepTriggerRows($oData->tasks);
-            $oData->reportTablesVars = $this->processes->getReportTablesVarsRows($prj_uid);
             $oData->subProcess = $this->processes->getSubProcessRow($prj_uid);
             $oData->caseTracker = $this->processes->getCaseTrackerRow($prj_uid);
             $oData->caseTrackerObject = $this->processes->getCaseTrackerObjectRow($prj_uid);

workflow/engine/src/ProcessMaker/BusinessModel/Migrator/ReportTablesMigrator.php

@@ -56,7 +56,8 @@ class ReportTablesMigrator implements Importable, Exportable
     {
         try {
             $oData = new \StdClass();
-            $oData->reportTables = $this->processes->getReportTablesRows($prj_uid);
+            $oData->reportTables = $this->processes->getReportTables($prj_uid);
+            $oData->reportTablesVars = $this->processes->getReportTablesVar($prj_uid);
 
             $result = array(
                 'workflow-definition' => (array)$oData

workflow/engine/src/ProcessMaker/BusinessModel/Migrator/TriggersMigrator.php

@@ -58,9 +58,7 @@ class TriggersMigrator implements Importable, Exportable
     {
         try {
             $oData = new \StdClass();
-            $oDataTasks = $this->processes->getTaskRows($prj_uid);
             $oData->triggers = $this->processes->getTriggerRows($prj_uid);
-            $oData->steptriggers = $this->processes->getStepTriggerRows($oDataTasks);
 
             $result = array(
                 'workflow-definition' => (array)$oData