fernando/luos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

updating designer controller & view, and build-vendor.php, to use new js projects new features, to build normal and debug mode.

Browse Source
This commit is contained in:
Erik Amaru Ortiz
2014-01-29 21:04:12 -04:00
parent 3a6dcccc81
commit a5550971fe
4 changed files with 82 additions and 147 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@@ -25,5 +25,6 @@ vendor/
workflow/engine/config/schema-transformed.xml workflow/engine/config/schema-transformed.xml
workflow/engine/config/_databases_.php workflow/engine/config/_databases_.php
workflow/public_html/lib/ workflow/public_html/lib/
workflow/public_html/lib-dev/
session.data session.data
behat.yml behat.yml

136
build-vendor.php
View File

@@ -8,6 +8,10 @@
* @author Erik Amaru Ortiz * @author Erik Amaru Ortiz
*/ */
$config = @parse_ini_file("workflow/engine/config/env.ini");
$debug = !empty($config) && isset($config['debug']) ? $config['debug'] : 0;
define('DS', DIRECTORY_SEPARATOR); define('DS', DIRECTORY_SEPARATOR);
// --no-ansi wins over --ansi // --no-ansi wins over --ansi
@@ -39,145 +43,21 @@ $projects = array(
'colosa/pmUI' 'colosa/pmUI'
); );
echo PHP_EOL;
out("Building JS Projects ", 'info');
out("--------------------", 'info');
foreach ($projects as $project) { foreach ($projects as $project) {
echo PHP_EOL; echo PHP_EOL;
out("=> Building project: ", 'info', false); out("=> Building project: ", 'info', false);
echo $project.' '.PHP_EOL; echo $project.' '.PHP_EOL;
chdir($vendorDir.DS.$project); chdir($vendorDir.DS.$project);
echo `rake`; if ($debug)
echo `rake pmBuildDebug`;
else
echo `rake pmBuild`;
out("Completed!", 'success'); out("Completed!", 'success');
} }
echo PHP_EOL; echo PHP_EOL;
out("Copying project files to its destination", 'info', true);
out("----------------------------------------", 'info', true);
$destinationDir = dirname(__FILE__) . DS . 'workflow/public_html/lib';
if (! is_dir($destinationDir)) {
mkdir($destinationDir, 0777);
}
if (! is_dir($destinationDir.'/js')) {
mkdir($destinationDir.'/js', 0777);
}
if (! is_dir($destinationDir.'/css')) {
mkdir($destinationDir.'/css', 0777);
}
if (! is_dir($destinationDir.'/img')) {
mkdir($destinationDir.'/img', 0777);
}
if (! is_dir($destinationDir.'/mafe')) {
mkdir($destinationDir.'/mafe', 0777);
}
if (! is_dir($destinationDir.'/pmUI')) {
mkdir($destinationDir.'/pmUI', 0777);
}
$filesCollection = array(
// Libs
"jquery/jquery/jquery-1.10.2.min.js" => "js/jquery-1.10.2.min.js",
"underscore/underscore/underscore-min.js" => "js/underscore-min.js",
"colosa/pmUI/libraries/restclient/restclient-min.js" => "js/restclient-min.js",
// MichelangeloFE
"colosa/MichelangeloFE/lib/wz_jsgraphics/wz_jsgraphics.js" => "js/wz_jsgraphics.js",
"colosa/MichelangeloFE/build/js/designer.js" => "mafe/designer.js",
"colosa/MichelangeloFE/build/js/mafe.min.js" => "mafe/mafe.min.js",
"colosa/MichelangeloFE/build/css/mafe.css" => "mafe/mafe.css",
"colosa/MichelangeloFE/build/img/*" => "img/",
// pmUI
"colosa/pmUI/libraries/jquery.layout/LayoutPanel.css" => "css/jquery.layout.css",
"colosa/pmUI/libraries/jquery-ui/css/css-customized/jquery-ui-1.10.3.custom.css" => "css/jquery-ui-1.10.3.custom.min.css",
"colosa/pmUI/libraries/dataTables/css/jquery.dataTables.css" => "css/jquery.dataTables.css",
"colosa/pmUI/libraries/jquery.layout/jquery.layout.min.js" => "js/jquery.layout.min.js",
"colosa/pmUI/libraries/jquery-ui/js/jquery-ui-1.10.3.custom.min.js" => "js/jquery-ui-1.10.3.custom.min.js",
"colosa/pmUI/libraries/dataTables/js/jquery.dataTables.min.js" => "js/jquery.dataTables.min.js",
array(
"try_files" => array("colosa/pmUI/build/js/min/pmui-1.0.0.min.js", "colosa/pmUI/build/js/pmui-1.0.0.js"),
"to_file" => "pmUI/pmui-1.0.0.js"
),
"colosa/pmUI/build/css/pmui-1.0.0.css" => "pmUI/pmui-1.0.0.css",
"colosa/pmUI/build/img/*" => "img/",
);
out("* Destination dir: ", 'info', false);
echo $destinationDir . PHP_EOL.PHP_EOL;
$successCount = 0;
foreach ($filesCollection as $source => $target) {
if (! is_array($target)) {
if (strpos($source, '*') !== false) {
out("Create dir: ", 'info', false);
echo $target;
out(" from source: ", 'info', false);
echo $source;
out(" [DONE]", "success", true) . PHP_EOL;
echo `cp -Rf $vendorDir/$source $destinationDir/$target`;
$successCount++;
} else {
out("Create file: ", 'info', false);
echo $target;
out(" from source: ", 'info', false);
echo $source;
if (file_exists("$vendorDir/$source")) {
out(" [DONE]", "success", true) . PHP_EOL;
echo `cp -Rf $vendorDir/$source $destinationDir/$target`;
$successCount++;
} else {
out(" [FAILED]", "error", true) . PHP_EOL;
}
}
} else {
out("Create file: ", 'info', false);
echo $target['to_file'];
out(" from source: ", 'info', false);
$sw = true;
$files = $target['try_files'];
$target = $target['to_file'];
foreach ($files as $file) {
if (file_exists("$vendorDir/$file")) {
echo $file;
out(" [DONE]", "success", true) . PHP_EOL;
echo `cp -Rf $vendorDir/$file $destinationDir/$target`;
$successCount++;
$sw = false;
break;
}
}
if ($sw) {
echo '('.implode(', ', $files).')';
out(" [FAILED]", "error", true) . PHP_EOL;
}
}
}
$n = count($filesCollection);
echo PHP_EOL;
echo sprintf("- Finished, Copied [%s/%s] files.", $successCount, $n).PHP_EOL;
if ($successCount == count($filesCollection)) {
out(sprintf("- All files copied successfully!", $successCount, $n), "success", true);
} else {
out("- Finished but with errors while copying!", "error", true);
}
echo PHP_EOL;
///////////////////// /////////////////////

1
workflow/engine/controllers/designer.php
View File

@@ -35,6 +35,7 @@ class Designer extends Controller
$credentials['authorization_code'] = $authCode; $credentials['authorization_code'] = $authCode;
$this->setVar('credentials', base64_encode(json_encode($credentials))); $this->setVar('credentials', base64_encode(json_encode($credentials)));
$this->setVar('isDebugMode', System::isDebugMode());
$this->setView('designer/index'); $this->setView('designer/index');
$this->render(); $this->render();
} }

91
workflow/engine/templates/designer/index.html
View File

@@ -1,21 +1,74 @@
<link rel="stylesheet" type="text/css" href="/lib/pmUI/pmui-1.0.0.css"> {if $isDebugMode}
<link rel="stylesheet" type="text/css" href="/lib/mafe/mafe.css"> <link rel="stylesheet" type="text/css" href="/lib-dev/pmUI/pmui.css">
<link rel="stylesheet" type="text/css" href="/lib/css/jquery.layout.css"> <!-- files that are built into mafe.css-->
<link rel="stylesheet" type="text/css" href="/lib/css/jquery-ui-1.10.3.custom.min.css"> <link rel="stylesheet" type="text/css" href="/lib-dev/mafe/toolbarpanel.css">
<link rel="stylesheet" type="text/css" href="/lib/css/jquery.dataTables.css"> <link rel="stylesheet" type="text/css" href="/lib-dev/mafe/bpmn.css">
<script type="text/javascript"> <link rel="stylesheet" type="text/css" href="/lib-dev/css/jquery.layout.css">
var prj_uid = "{$prj_uid}"; <link rel="stylesheet" type="text/css" href="/lib-dev/css/jquery-ui-1.10.3.custom.min.css">
var credentials = "{$credentials}"; <!--<link rel="stylesheet" type="text/css" href="/lib/css/jquery.dataTables.css">-->
</script>
<script type="text/javascript" src="/lib/js/wz_jsgraphics.js"></script> <script type="text/javascript">
<script type="text/javascript" src="/lib/js/jquery-1.10.2.min.js"></script> var prj_uid = "{$prj_uid}";
<script type="text/javascript" src="/lib/js/underscore-min.js"></script> var credentials = "{$credentials}";
<script type="text/javascript" src="/lib/js/jquery-ui-1.10.3.custom.min.js"></script> </script>
<script type="text/javascript" src="/lib/js/jquery.layout.min.js"></script> <script type="text/javascript" src="/lib-dev/js/wz_jsgraphics.js"></script>
<script type="text/javascript" src="/lib/js/restclient-min.js"></script> <script type="text/javascript" src="/lib-dev/js/jquery-1.10.2.min.js"></script>
<script type="text/javascript" src="/lib/js/jquery.dataTables.min.js"></script> <script type="text/javascript" src="/lib-dev/js/underscore-min.js"></script>
<script type="text/javascript" src="/lib/pmUI/pmui-1.0.0.js"></script> <script type="text/javascript" src="/lib-dev/js/jquery-ui-1.10.3.custom.min.js"></script>
<script type="text/javascript" src="/lib/mafe/mafe.min.js"></script> <script type="text/javascript" src="/lib-dev/js/jquery.layout.min.js"></script>
<script type="text/javascript" src="/lib/mafe/designer.js"></script> <script type="text/javascript" src="/lib-dev/js/restclient.min.js"></script>
<!--<script type="text/javascript" src="/lib/js/jquery.dataTables.min.js"></script>-->
<script type="text/javascript" src="/lib-dev/pmUI/pmui.js"></script>
<!-- files that are built into mafe.js-->
<script type="text/javascript" src="/lib-dev/mafe/commandreconnect.js"></script>
<script type="text/javascript" src="/lib-dev/mafe/connectiondrop.js"></script>
<script type="text/javascript" src="/lib-dev/mafe/toolbarpanel.js"></script>
<script type="text/javascript" src="/lib-dev/mafe/process.js"></script>
<script type="text/javascript" src="/lib-dev/mafe/canvas.js"></script>
<script type="text/javascript" src="/lib-dev/mafe/shape.js"></script>
<script type="text/javascript" src="/lib-dev/mafe/flow.js"></script>
<script type="text/javascript" src="/lib-dev/mafe/event.js"></script>
<script type="text/javascript" src="/lib-dev/mafe/activity.js"></script>
<script type="text/javascript" src="/lib-dev/mafe/gateway.js"></script>
<script type="text/javascript" src="/lib-dev/mafe/utils.js"></script>
<!-- files that are built into designer.js-->
<script type="text/javascript" src="/lib-dev/mafe/designer/designer.js"></script>
<script type="text/javascript" src="/lib-dev/mafe/designer/contextMenu.js"></script>
<script type="text/javascript" src="/lib-dev/mafe/designer/treePanel.js"></script>
<script type="text/javascript" src="/lib-dev/mafe/designer/shapeFactory.js"></script>
<script type="text/javascript" src="/lib-dev/mafe/designer/toolbarPanel.js"></script>
<script type="text/javascript" src="/lib-dev/mafe/designer/dynaformsModule.js"></script>
<script type="text/javascript" src="/lib-dev/mafe/designer/inputDocumentsModule.js"></script>
<script type="text/javascript" src="/lib-dev/mafe/designer/caseSchedulerModule.js"></script>
<script type="text/javascript" src="/lib-dev/mafe/designer/databaseConnectionModule.js"></script>
<script type="text/javascript" src="/lib-dev/mafe/designer/outputDocumentsModule.js"></script>
<script type="text/javascript" src="/lib-dev/mafe/designer/reportTablesModule.js"></script>
<script type="text/javascript" src="/lib-dev/mafe/designer/triggersModule.js"></script>
<script type="text/javascript" src="/lib-dev/mafe/designer/menuProcessmaker.js"></script>
<script type="text/javascript" src="/lib-dev/mafe/designer/propertiesTask.js"></script>
{else}
<link rel="stylesheet" type="text/css" href="/lib/pmUI/pmui.css">
<link rel="stylesheet" type="text/css" href="/lib/mafe/mafe.css">
<link rel="stylesheet" type="text/css" href="/lib/css/jquery.layout.css">
<link rel="stylesheet" type="text/css" href="/lib/css/jquery-ui-1.10.3.custom.min.css">
<!--<link rel="stylesheet" type="text/css" href="/lib/css/jquery.dataTables.css">-->
<script type="text/javascript">
var prj_uid = "{$prj_uid}";
var credentials = "{$credentials}";
</script>
<script type="text/javascript" src="/lib/js/wz_jsgraphics.js"></script>
<script type="text/javascript" src="/lib/js/jquery-1.10.2.min.js"></script>
<script type="text/javascript" src="/lib/js/underscore-min.js"></script>
<script type="text/javascript" src="/lib/js/jquery-ui-1.10.3.custom.min.js"></script>
<script type="text/javascript" src="/lib/js/jquery.layout.min.js"></script>
<script type="text/javascript" src="/lib/js/restclient.min.js"></script>
<!--<script type="text/javascript" src="/lib/js/jquery.dataTables.min.js"></script>-->
<script type="text/javascript" src="/lib/pmUI/pmui.min.js"></script>
<script type="text/javascript" src="/lib/mafe/mafe.min.js"></script>
<script type="text/javascript" src="/lib/mafe/designer.min.js"></script>
{/if}