fernando/luos
1
0
Fork 0
Code Releases Activity

More updates to handling PUT request for /project endpoint

Browse Source
This commit is contained in:
Erik Amaru Ortiz
2014-01-28 17:01:26 -04:00
parent d44fa7c702
commit 6370e4257e
5 changed files with 125 additions and 166 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
workflow/engine/src/ProcessMaker/Adapter/Bpmn/Model.php
View File

@@ -27,7 +27,9 @@ use \BpmnArtifactPeer as ArtifactPeer;
use \ProcessMaker\Util\Hash;
use \BasePeer;
use Symfony\Component\Yaml\Exception\RuntimeException;
use \ProcessMaker\Util\Logger;
use System;
/**
@@ -390,8 +392,8 @@ class Model
$lanes = self::getBpmnCollectionBy('Lane', LanePeer::PRJ_UID, $prjUid, true);
//$activities = self::getBpmnCollectionBy('Activity', ActivityPeer::PRJ_UID, $prjUid, true);
//$activities = Activity::getAll(null, null, null, 'object', CASE_LOWER);
$activities = Activity::getAll(array('changeCaseTo' => CASE_LOWER));
//$activities = Activity::getAll($prjUid, null, null, null, 'object', CASE_LOWER);
$activities = Activity::getAll(array('prjUid' => $prjUid, 'changeCaseTo' => CASE_LOWER));
//print_r($activities); die;
$events = self::getBpmnCollectionBy('Event', EventPeer::PRJ_UID, $prjUid, true);
@@ -495,26 +497,25 @@ class Model
$savedProject = self::loadProject($prjUid);
$diff = self::getDiffFromProjects($savedProject, $projectUpdated);
self::updateDiagram($prjUid, $process->getProUid(), $diff);
$result = self::updateDiagram($prjUid, $process->getProUid(), $diff);
return $result;
}
public static function updateDiagram($prjUid, $proUid, $diff)
{
echo 'DIFF'. PHP_EOL;
print_r($diff);
self::log('executing: updateDiagram() with params -> ', $prjUid, $proUid, $diff);
//return false;
$mapId = array();
$uids = array();
// Updating objects
foreach ($diff['updated'] as $element => $items) {
foreach ($items as $data) {
$data = array_change_key_case((array) $data, CASE_UPPER);
//print_r($data); die;
// the calls in switch sentence are setting and saving the related BpmnBound objects too,
// because methods: save(), fromArray(), toArray() are beautifully extended
// of Activity, Event and Gateway classes ;) atte. @erik
switch ($element) {
case 'laneset':
@@ -614,6 +615,7 @@ class Model
}
}
return $uids;
}
public function deleteProject($prjUid)
@@ -905,5 +907,17 @@ class Model
return sha1($data);
}
protected static function log()
{
if (System::isDebugMode()) {
$me = Logger::getInstance();
$args = func_get_args();
array_unshift($args, 'Class '.__CLASS__.': ');
call_user_func_array(array($me, 'setLog'), $args);
}
}
}

22
workflow/engine/src/ProcessMaker/Util/Logger.php
View File

@@ -16,7 +16,7 @@ class Logger
protected function __construct()
{
$this->logFile = sys_get_temp_dir() . '/processmaker.log';
$this->logFile = rtrim(sys_get_temp_dir(), DIRECTORY_SEPARATOR) . DIRECTORY_SEPARATOR . 'processmaker.log';
$this->fp = fopen($this->logFile, "a+");
}
@@ -29,19 +29,25 @@ class Logger
return self::$instance;
}
public function setLog($data)
public function setLog()
{
if (! is_string($data)) {
$data = print_r($data, true);
}
$args = func_get_args();
fwrite($this->fp, "PM LOG: ".date('Y-m-d H:i:s') . " " . $data . PHP_EOL);
foreach ($args as $arg) {
if (! is_string($arg)) {
$arg = print_r($arg, true);
}
$stat = fwrite($this->fp, "- " . date('Y-m-d H:i:s') . " " . $arg . PHP_EOL);
}
}
public static function log($data)
public static function log()
{
$me = Logger::getInstance();
$me->setLog($data);
$args = func_get_args();
call_user_func_array(array($me, 'setLog'), $args);
}
}