Adicion de ARTIFACTS en PROJECTS

workflow/engine/src/ProcessMaker/Project/Adapter/BpmnWorkflow.php

@@ -600,6 +600,41 @@ class BpmnWorkflow extends Project\Bpmn
             }
         }
 
+        /*
+         * Diagram's Artifacts Handling
+         */
+        $whiteList = array();
+        foreach ($diagram["artifacts"] as $i => $artifactData) {
+            $artifactData = array_change_key_case($artifactData, CASE_UPPER);
+            unset($artifactData["_EXTENDED"]);
+            $artifact = $bwp->getArtifact($artifactData["ART_UID"]);
+
+            if (is_null($artifact)) {
+                if ($generateUid) {
+                    $oldArtUid = $artifactData["ART_UID"];
+
+                    $artifactData["ART_UID"] = Util\Common::generateUID();
+                    $result[] = array("object" => "artifact", "new_uid" => $artifactData["ART_UID"], "old_uid" => $oldArtUid);
+                }
+
+                $bwp->addArtifact($artifactData);
+            } elseif (! $bwp->isEquals($artifact, $artifactData)) {
+                $bwp->updateArtifact($artifactData["ART_UID"], $artifactData);
+            } else {
+                Util\Logger::log("Update Artifact ({$artifactData["GAT_UID"]}) Skipped - No changes required");
+            }
+
+            $diagram["artifacts"][$i] = $artifactData;
+            $whiteList[] = $artifactData["ART_UID"];
+        }
+
+        $artifacts = $bwp->getArtifacts();
+        // looking for removed elements
+        foreach ($artifacts as $artifactData) {
+            if (! in_array($artifactData["ART_UID"], $whiteList)) {
+                $bwp->removeArtifact($artifactData["ART_UID"]);
+            }
+        }
 
         /*
          * Diagram's Gateways Handling

workflow/engine/src/ProcessMaker/Project/Bpmn.php

@@ -67,6 +67,10 @@ class Bpmn extends Handler
         "gateway" => array("BOU_ELEMENT", "BOU_ELEMENT_TYPE", "BOU_REL_POSITION", "BOU_SIZE_IDENTICAL", "BOU_UID",
             "DIA_UID", "ELEMENT_UID", "PRJ_UID", "PRO_UID"
         ),
+        "artifact" => array(
+            "PRJ_UID", "PRO_UID", "BOU_ELEMENT", "BOU_ELEMENT_TYPE", "BOU_REL_POSITION",
+            "BOU_SIZE_IDENTICAL", "DIA_UID", "BOU_UID", "ELEMENT_UID"
+        ),
         "flow" => array("PRJ_UID", "DIA_UID", "FLO_ELEMENT_DEST_PORT", "FLO_ELEMENT_ORIGIN_PORT")
     );
 
@@ -682,18 +686,83 @@ class Bpmn extends Handler
 
     public function addArtifact($data)
     {
-        // TODO: Implement update() method.
+        // setting defaults
+        $data['ART_UID'] = array_key_exists('ART_UID', $data) ? $data['ART_UID'] : Common::generateUID();
+        try {
+            self::log("Add Artifact with data: ", $data);
+            $artifact = new Artifact();
+            $artifact->fromArray($data, BasePeer::TYPE_FIELDNAME);
+            $artifact->setPrjUid($this->getUid());
+            $artifact->setProUid($this->getProcess("object")->getProUid());
+            $artifact->save();
+            self::log("Add Artifact Success!");
+        } catch (\Exception $e) {
+            self::log("Exception: ", $e->getMessage(), "Trace: ", $e->getTraceAsString());
+            throw $e;
+        }
+
+        return $artifact->getArtUid();
     }
 
-    public function getArtifact($artUid)
+    public function updateArtifact($artUid, $data)
     {
-        // TODO: Implement update() method.
+        try {
+            self::log("Update Artifact: $artUid", "With data: ", $data);
+
+            $artifact = ArtifactPeer::retrieveByPk($artUid);
+
+            $artifact->fromArray($data);
+            $artifact->save();
+
+            self::log("Update Artifact Success!");
+        } catch (\Exception $e) {
+            self::log("Exception: ", $e->getMessage(), "Trace: ", $e->getTraceAsString());
+            throw $e;
+        }
     }
 
-    public function getArtifacts()
+    public function getArtifact($artUid, $retType = 'array')
     {
-        // TODO: Implement update() method.
-        return array();
+        $artifact = ArtifactPeer::retrieveByPK($artUid);
+
+        if ($retType != "object" && ! empty($artifact)) {
+            $artifact = $artifact->toArray();
+            $artifact = self::filterArrayKeys($artifact, self::$excludeFields["artifact"]);
+        }
+
+        return $artifact;
+    }
+
+    public function getArtifacts($start = null, $limit = null, $filter = '', $changeCaseTo = CASE_UPPER)
+    {
+        if (is_array($start)) {
+            extract($start);
+        }
+
+        $filter = $changeCaseTo != CASE_UPPER ? array_map("strtolower", self::$excludeFields["artifact"]) : self::$excludeFields["artifact"];
+
+        return self::filterCollectionArrayKeys(
+            Artifact::getAll($this->getUid(), $start, $limit, $filter, $changeCaseTo),
+            $filter
+        );
+    }
+
+    public function removeArtifact($artUid)
+    {
+        try {
+            self::log("Remove Artifact: $artUid");
+
+            $artifact = ArtifactPeer::retrieveByPK($artUid);
+            $artifact->delete();
+
+            // remove related object (flows)
+            Flow::removeAllRelated($artUid);
+
+            self::log("Remove Artifact Success!");
+        } catch (\Exception $e) {
+            self::log("Exception: ", $e->getMessage(), "Trace: ", $e->getTraceAsString());
+            throw $e;
+        }
     }
 
     public function addLane($data)

workflow/engine/src/ProcessMaker/Services/Api/Cases.php

@@ -514,7 +514,7 @@ class Cases extends Api
         $cat_uid = '',
         $pro_uid = '',
         $app_status = '',
-        $user = '',
+        $usr_uid = '',
         $date_from = '',
         $date_to = '',
         $search = ''
@@ -532,7 +532,7 @@ class Cases extends Api
             $dataList['category'] = $cat_uid;
             $dataList['process'] = $pro_uid;
             $dataList['status'] = $app_status;
-            $dataList['user'] = $user;
+            $dataList['user'] = $usr_uid;
             $dataList['dateFrom'] = $date_from;
             $dataList['dateTo'] = $date_to;
             $dataList['search'] = $search;