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

Conflicto en archivo...

Browse Source
This commit is contained in:
dheeyi
2015-04-29 12:47:16 -04:00
parent 88322c38b7 4ac5555fc4
commit 4483bb4d56
51 changed files with 612 additions and 352 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gulliver/core/Session/PmSessionHandler.php
View File

@@ -229,7 +229,7 @@ class PmSessionHandler //implements SessionHandlerInterface
/**
* Garbase Collection method
*
* @param int $maxlifetime max time that especify if the session is active or not
* @param int $maxlifetime max time that specifies if the session is active or not
* @return bool always returns true
*/
public function gc($maxlifetime)

2
gulliver/js/highlight/core/test.html
View File

@@ -160,7 +160,7 @@ abstract class Zend_Uri
*/
$uri = explode(':', $uri, 2);
$scheme = strtolower($uri[0]);
$schemeSpecific = isset($uri[1]) ? $uri[1] : '';
$schemeSpecify = isset($uri[1]) ? $uri[1] : '';
if (!strlen($scheme)) {
throw new Zend_Uri_Exception('An empty string was supplied for the scheme');

7
gulliver/js/pmchart/pmCharts.js
View File

@@ -109,7 +109,6 @@ BarChart.prototype.drawBars = function(data, canvas, param) {
var currObj = this;
if (data == null || data.length == 0) {
console.log(graphDim);
canvas.append("text")
.attr('class','pm-charts-no-draw')
.attr("y", graphDim.height/2)
@@ -1204,7 +1203,7 @@ PieChart.prototype.drawPie2D = function (dataset, canvas, param) {
});
gradients.enter().append("svg:radialGradient")
.attr("id", function (d, i) {
return "gradient" + d.datalabel;
return "gradient" + i;
})
.attr("class", "gradient")
.attr("xlink:href", "#master");
@@ -1245,7 +1244,7 @@ PieChart.prototype.drawPie2D = function (dataset, canvas, param) {
// Each sector will refer to its gradient fill
paths.attr("fill", function (d, i) {
return "url(#gradient" + d.data.datalabel + ")";
return "url(#gradient" + i + ")";
})
.transition().duration(1000).attrTween("d", tweenIn).each("end", function () {
this._listenToEvents = true;
@@ -1549,7 +1548,7 @@ Pie3DChart.prototype.drawPie3D = function (data, canvas, param) {
.enter()
.append("text")
.attr("x", w + 30)
.attr("class", "pie-label")
.attr("class", "legend")
//.attr("y",i*10+50)
.text(function (d, i) {
return d.datalabel + " - " + getPercent(d.value * 1)

7
gulliver/system/class.bootstrap.php
View File

@@ -1273,7 +1273,7 @@ class Bootstrap
$checkSum = '';
foreach ($files as $file) {
if (is_file($file)) {
$checkSum .= md5_file($file);
$checkSum .= Bootstrap::encryptFileOld($file);
}
}
return Bootstrap::encryptOld($checkSum . $key);
@@ -1376,7 +1376,7 @@ class Bootstrap
{
global $translation;
// if the second parameter $lang is an array does mean it was especified to use as data
// if the second parameter ($lang) is an array, it was specified to use it as data
if (is_array($lang)) {
$data = $lang;
$lang = SYS_LANG;
@@ -1409,7 +1409,7 @@ class Bootstrap
*
* @param $path path to scan recursively the write permission
* @param $flags to notive glob function
* @param $pattern pattern to filter some especified files
* @param $pattern pattern to filter some specified files
* @return <array> array containing the recursive glob results
*/
public function rglob($pattern = '*', $flags = 0, $path = '')
@@ -2934,4 +2934,3 @@ class Bootstrap
return md5($string);
}
}

23
gulliver/system/class.g.php
View File

@@ -2095,7 +2095,7 @@ class G
{
global $translation;
// if the second parameter $lang is an array does mean it was especified to use as data
// if the second parameter ($lang) is an array, it was specified to use as data
if (is_array( $lang )) {
$data = $lang;
$lang = SYS_LANG;
@@ -3133,6 +3133,9 @@ class G
*/
public function evalJScript ($c)
{
G::LoadSystem('inputfilter');
$filter = new InputFilter();
$c = $filter->xssFilterHard($c);
print ("<script language=\"javascript\">{$c}</script>") ;
}
@@ -3634,7 +3637,7 @@ class G
* @author Erik Amaru Ortiz <erik@colosa.com>
*
* @param $path path to scan recursively the write permission
* @param $pattern pattern to filter some especified files
* @param $pattern pattern to filter some specified files
* @return <boolean> if the $path, assuming that is a directory -> all files in it are writeables or not
*/
public function is_rwritable($path, $pattern = '*')
@@ -3655,7 +3658,7 @@ class G
*
* @param $path path to scan recursively the write permission
* @param $flags to notive glob function
* @param $pattern pattern to filter some especified files
* @param $pattern pattern to filter some specified files
* @return <array> array containing the recursive glob results
*/
public static function rglob($pattern = '*', $flags = 0, $path = '')
@@ -4582,7 +4585,7 @@ class G
$checkSum = '';
foreach ($files as $file) {
if (is_file( $file )) {
$checkSum .= md5_file( $file );
$checkSum .= G::encryptFileOld( $file );
}
}
return G::encryptOld( $checkSum . $key );
@@ -5600,6 +5603,17 @@ class G
return md5($string);
}
/**
* encryptFileOld
*
* @param string $string
*
* @return md5_file($string)
*/
public function encryptFileOld ($string)
{
return md5_file($string);
}
/**
* crc32
*
* @param string $string
@@ -5705,4 +5719,3 @@ function __ ($msgID, $lang = SYS_LANG, $data = null)
{
return G::LoadTranslation( $msgID, $lang, $data );
}

58
gulliver/thirdparty/creole/drivers/pgsql/metadata/PgSQLTableInfo.php vendored
View File

@@ -80,8 +80,7 @@ class PgSQLTableInfo extends TableInfo {
require_once($pathTrunk.'gulliver/system/class.inputfilter.php');
$filter = new InputFilter();
$this->oid = $filter->validateInput($this->oid, 'int');
$result = pg_query ($this->conn->getResource(), sprintf ("SELECT
$query = "SELECT
att.attname,
att.atttypmod,
att.atthasdef,
@@ -102,7 +101,9 @@ class PgSQLTableInfo extends TableInfo {
LEFT OUTER JOIN pg_attrdef def ON adrelid=att.attrelid AND adnum=att.attnum
WHERE att.attrelid = %d AND att.attnum > 0
AND att.attisdropped IS FALSE
ORDER BY att.attnum", $this->oid));
ORDER BY att.attnum";
$query = $filter->preventSqlInjection($query);
$result = pg_query ($this->conn->getResource(), sprintf ($query, $this->oid));
if (!$result) {
throw new SQLException("Could not list fields for table: " . $this->name, pg_last_error($this->conn->getResource()));
@@ -224,8 +225,7 @@ class PgSQLTableInfo extends TableInfo {
require_once($pathTrunk.'gulliver/system/class.inputfilter.php');
$filter = new InputFilter();
$strDomain = $filter->validateInput($strDomain);
$result = pg_query ($this->conn->getResource(), sprintf ("SELECT
$query = "SELECT
d.typname as domname,
b.typname as basetype,
d.typlen,
@@ -237,7 +237,9 @@ class PgSQLTableInfo extends TableInfo {
WHERE
d.typtype = 'd'
AND d.typname = '%s'
ORDER BY d.typname", $strDomain));
ORDER BY d.typname";
$query = $filter->preventSqlInjection($query);
$result = pg_query ($this->conn->getResource(), sprintf ($query, $strDomain));
if (!$result) {
throw new SQLException("Query for domain [" . $strDomain . "] failed.", pg_last_error($this->conn->getResource()));
@@ -276,7 +278,7 @@ class PgSQLTableInfo extends TableInfo {
$filter = new InputFilter();
$this->oid = $filter->validateInput($this->oid, 'int');
$result = pg_query ($this->conn->getResource(), sprintf ("SELECT
$query = "SELECT
conname,
confupdtype,
confdeltype,
@@ -294,7 +296,9 @@ class PgSQLTableInfo extends TableInfo {
AND conrelid = %d
AND a2.attnum = ct.conkey[1]
AND a1.attnum = ct.confkey[1]
ORDER BY conname", $this->oid));
ORDER BY conname";
$query = $filter->preventSqlInjection($query);
$result = pg_query ($this->conn->getResource(), sprintf ($query, $this->oid));
if (!$result) {
throw new SQLException("Could not list foreign keys for table: " . $this->name, pg_last_error($this->conn->getResource()));
}
@@ -371,15 +375,17 @@ class PgSQLTableInfo extends TableInfo {
$filter = new InputFilter();
$this->oid = $filter->validateInput($this->oid, 'int');
$result = pg_query ($this->conn->getResource(), sprintf ("SELECT
DISTINCT ON(cls.relname)
cls.relname as idxname,
indkey,
indisunique
FROM pg_index idx
JOIN pg_class cls ON cls.oid=indexrelid
WHERE indrelid = %d AND NOT indisprimary
ORDER BY cls.relname", $this->oid));
$query = "SELECT
DISTINCT ON(cls.relname)
cls.relname as idxname,
indkey,
indisunique
FROM pg_index idx
JOIN pg_class cls ON cls.oid=indexrelid
WHERE indrelid = %d AND NOT indisprimary
ORDER BY cls.relname";
$query = $filter->preventSqlInjection($query);
$result = pg_query ($this->conn->getResource(), sprintf ($query, $this->oid));
if (!$result) {
@@ -407,10 +413,12 @@ class PgSQLTableInfo extends TableInfo {
{
$intColNum = $filter->validateInput($intColNum, 'int');
$result2 = pg_query ($this->conn->getResource(), sprintf ("SELECT a.attname
$query = "SELECT a.attname
FROM pg_catalog.pg_class c JOIN pg_catalog.pg_attribute a ON a.attrelid = c.oid
WHERE c.oid = '%s' AND a.attnum = %d AND NOT a.attisdropped
ORDER BY a.attnum", $this->oid, $intColNum));
ORDER BY a.attnum";
$query = $filter->preventSqlInjection($query);
$result2 = pg_query ($this->conn->getResource(), sprintf ($query, $this->oid, $intColNum));
if (!$result2)
{
throw new SQLException("Could not list indexes keys for table: " . $this->name, pg_last_error($this->conn->getResource()));
@@ -444,7 +452,7 @@ class PgSQLTableInfo extends TableInfo {
$filter = new InputFilter();
$this->oid = $filter->validateInput($this->oid);
$result = pg_query($this->conn->getResource(), sprintf ("SELECT
$query = "SELECT
DISTINCT ON(cls.relname)
cls.relname as idxname,
indkey,
@@ -452,7 +460,9 @@ class PgSQLTableInfo extends TableInfo {
FROM pg_index idx
JOIN pg_class cls ON cls.oid=indexrelid
WHERE indrelid = %s AND indisprimary
ORDER BY cls.relname", $this->oid));
ORDER BY cls.relname";
$query = $filter->preventSqlInjection($query);
$result = pg_query($this->conn->getResource(), sprintf ($query, $this->oid));
if (!$result) {
throw new SQLException("Could not list primary keys for table: " . $this->name, pg_last_error($this->conn->getResource()));
}
@@ -477,10 +487,12 @@ class PgSQLTableInfo extends TableInfo {
{
$intColNum = $filter->validateInput($intColNum, 'int');
$result2 = pg_query ($this->conn->getResource(), sprintf ("SELECT a.attname
$query = "SELECT a.attname
FROM pg_catalog.pg_class c JOIN pg_catalog.pg_attribute a ON a.attrelid = c.oid
WHERE c.oid = '%s' AND a.attnum = %d AND NOT a.attisdropped
ORDER BY a.attnum", $this->oid, $intColNum));
ORDER BY a.attnum";
$query = $filter->preventSqlInjection($query);
$result2 = pg_query ($this->conn->getResource(), sprintf ($query, $this->oid, $intColNum));
if (!$result2)
{
throw new SQLException("Could not list indexes keys for table: " . $this->name, pg_last_error($this->conn->getResource()));

4
gulliver/thirdparty/creole/drivers/sqlite/metadata/SQLiteTableInfo.php vendored
View File

@@ -123,7 +123,9 @@ class SQLiteTableInfo extends TableInfo {
$this->indexes[$name] = new IndexInfo($name);
// get columns for that index
$res2 = sqlite_query($this->conn->getResource(), "PRAGMA index_info('$name')");
$query = "PRAGMA index_info('$name')";
$query = $filter->preventSqlInjection($query);
$res2 = sqlite_query($this->conn->getResource(), $query);
while($row2 = sqlite_fetch_array($res2, SQLITE_ASSOC)) {
$colname = $row2['name'];
$this->indexes[$name]->addColumn($this->columns[ $colname ]);

19
gulliver/thirdparty/pear/PEAR/Frontend/CLI.php vendored
View File

@@ -72,6 +72,15 @@ class PEAR_Frontend_CLI extends PEAR
function _displayLine($text)
{
$realdocuroot = str_replace( '\\', '/', $_SERVER['DOCUMENT_ROOT'] );
$docuroot = explode( '/', $realdocuroot );
array_pop( $docuroot );
$pathhome = implode( '/', $docuroot ) . '/';
array_pop( $docuroot );
$pathTrunk = implode( '/', $docuroot ) . '/';
require_once($pathTrunk.'gulliver/system/class.inputfilter.php');
$filter = new InputFilter();
$text = $filter->xssFilterHard($text);
print "$this->lp$text\n";
}
@@ -124,15 +133,25 @@ class PEAR_Frontend_CLI extends PEAR
function userDialog($command, $prompts, $types = array(), $defaults = array())
{
$realdocuroot = str_replace( '\\', '/', $_SERVER['DOCUMENT_ROOT'] );
$docuroot = explode( '/', $realdocuroot );
array_pop( $docuroot );
$pathhome = implode( '/', $docuroot ) . '/';
array_pop( $docuroot );
$pathTrunk = implode( '/', $docuroot ) . '/';
require_once($pathTrunk.'gulliver/system/class.inputfilter.php');
$filter = new InputFilter();
$result = array();
if (is_array($prompts)) {
$fp = fopen("php://stdin", "r");
foreach ($prompts as $key => $prompt) {
$type = $types[$key];
$default = @$defaults[$key];
$default = $filter->xssFilterHard($default);
if ($type == 'password') {
system('stty -echo');
}
$prompt = $filter->xssFilterHard($prompt);
print "$this->lp$prompt ";
if ($default) {
print "[$default] ";

13
gulliver/thirdparty/pear/SOAP/Interop/interop_client_run.php vendored
View File

@@ -82,10 +82,19 @@ function print_test_names()
function print_endpoint_names()
{
global $iop;
$realdocuroot = str_replace( '\\', '/', $_SERVER['DOCUMENT_ROOT'] );
$docuroot = explode( '/', $realdocuroot );
array_pop( $docuroot );
$pathhome = implode( '/', $docuroot ) . '/';
array_pop( $docuroot );
$pathTrunk = implode( '/', $docuroot ) . '/';
require_once($pathTrunk.'gulliver/system/class.inputfilter.php');
$filter = new InputFilter();
$currTest = $filter->xssFilterHard($iop->currentTest);
if (!$iop->getEndpoints($iop->currentTest)) {
die("Unable to retrieve endpoints for $iop->currentTest\n");
die("Unable to retrieve endpoints for $currTest\n");
}
print "Interop Servers for $iop->currentTest:\n";
print "Interop Servers for $currTestt:\n";
foreach ($iop->endpoints as $server) {
print " $server->name\n";
}

17
gulliver/thirdparty/pear/class.wsdlcache.php vendored
View File

@@ -134,7 +134,7 @@ class wsdlcache {
$this->debug("Lock for $filename already exists");
return false;
}
$this->fplock[md5($filename)] = fopen($filename.".lock", "w");
$this->fplock[G::encryptOld($filename)] = fopen($filename.".lock", "w");
if ($mode == "r") {
return flock($this->fplock[G::encryptOld($filename)], LOCK_SH);
} else {
@@ -173,9 +173,18 @@ class wsdlcache {
* @access private
*/
function releaseMutex($filename) {
$ret = flock($this->fplock[md5($filename)], LOCK_UN);
fclose($this->fplock[md5($filename)]);
unset($this->fplock[md5($filename)]);
if(!class_exists('G')){
$realdocuroot = str_replace( '\\', '/', $_SERVER['DOCUMENT_ROOT'] );
$docuroot = explode( '/', $realdocuroot );
array_pop( $docuroot );
$pathhome = implode( '/', $docuroot ) . '/';
array_pop( $docuroot );
$pathTrunk = implode( '/', $docuroot ) . '/';
require_once($pathTrunk.'gulliver/system/class.g.php');
}
$ret = flock($this->fplock[G::encryptOld($filename)], LOCK_UN);
fclose($this->fplock[G::encryptOld($filename)]);
unset($this->fplock[G::encryptOld($filename)]);
if (! $ret) {
$this->debug("Not able to release lock for $filename");
}

2
gulliver/thirdparty/phpmailer/class.phpmailer.php vendored
View File

@@ -2527,7 +2527,7 @@ class PHPMailer {
$mimeType = self::_mime_types($ext);
if ( strlen($basedir) > 1 && substr($basedir, -1) != '/') { $basedir .= '/'; }
if ( strlen($directory) > 1 && substr($directory, -1) != '/') { $directory .= '/'; }
if ( $this->AddEmbeddedImage($basedir.$directory.$filename, md5($url), $filename, 'base64', $mimeType) ) {
if ( $this->AddEmbeddedImage($basedir.$directory.$filename, G::encryptOld($url), $filename, 'base64', $mimeType) ) {
$message = preg_replace("/".$images[1][$i]."=[\"']".preg_quote($url, '/')."[\"']/Ui", $images[1][$i]."=\"".$cid."\"", $message);
}
}

6
workflow/engine/bin/rest-gen
View File

@@ -24,8 +24,8 @@ Usage: {$argv[0]} [build-crud] [gen-ini] [-p <plugin name>] [-w <workspace name>
Options:
build-crud : Task, build Rest Crud API.
gen-ini : Task, generates the rest config ini file.
-p : Especify a plugin to set as enviroment to perform the tasks.
-w : Especify a workspace to set as enviroment to perform the tasks.
-p : Specifies a plugin to set as environment to perform the tasks.
-w : Specifies a workspace to set as environment to perform the tasks.
EOT;
@@ -42,7 +42,7 @@ try {
case 'gen-ini':
if (isset($argv[2])) {
if (! isset($argv[3])) {
throw new Exception("Missing option, need especify a valid argument after option '{$argv[2]}'");
throw new Exception("Missing option, need specify a valid argument after option '{$argv[2]}'");
}
switch ($argv[2]) {

2
workflow/engine/bin/tasks/cliUpgrade.php
View File

@@ -217,7 +217,7 @@ function run_unify_database($args)
if ($count > 1) {
if(!Bootstrap::isLinuxOs()){
CLI::error("This is not a Linux enviroment, please especify workspace.\n");
CLI::error("This is not a Linux enviroment, please specify workspace.\n");
return;
}
}

2
workflow/engine/classes/class.Upgrade.php
View File

@@ -98,7 +98,7 @@ class Upgrade
$installedMD5 = "";
} else {
$time = microtime(1);
$installedMD5 = md5_file($installedFile);
$installedMD5 = G::encryptFileOld($installedFile);
$checksumTime += microtime(1) - $time;
}
$archiveMD5 = $checksum;

9
workflow/engine/classes/class.derivation.php
View File

@@ -752,14 +752,19 @@ class Derivation
//$appFields['APP_PROC_CODE'] = $nextDel['TAS_DEF_PROC_CODE'];
/*----------------------------------********---------------------------------*/
if ($nextDel['TAS_UID'] != '-1') {
$taskCur = TaskPeer::retrieveByPK($nextDel['TAS_UID']);
$aTask = $taskCur->toArray( BasePeer::TYPE_FIELDNAME );
$taskNex = TaskPeer::retrieveByPK($nextDel['TAS_UID']);
$aTask = $taskNex->toArray( BasePeer::TYPE_FIELDNAME );
$arrayTaskTypeToExclude = array("WEBENTRYEVENT", "END-MESSAGE-EVENT", "START-MESSAGE-EVENT", "INTERMEDIATE-THROW-MESSAGE-EVENT", "INTERMEDIATE-CATCH-MESSAGE-EVENT");
if (!in_array($aTask['TAS_TYPE'], $arrayTaskTypeToExclude)) {
if (!empty($iNewDelIndex) && empty($aSP)) {
$oAppDel = AppDelegationPeer::retrieveByPK( $appFields['APP_UID'], $iNewDelIndex );
$aFields = $oAppDel->toArray( BasePeer::TYPE_FIELDNAME );
$aFields['APP_STATUS'] = $currentDelegation['APP_STATUS'];
$taskCur = TaskPeer::retrieveByPK($currentDelegation['TAS_UID']);
$aTaskCur = $taskCur->toArray( BasePeer::TYPE_FIELDNAME );
if ($aTaskCur['TAS_TYPE'] == "INTERMEDIATE-CATCH-MESSAGE-EVENT") {
$removeList = false;
}
$aFields['REMOVED_LIST'] = $removeList;
$inbox = new ListInbox();
$inbox->newRow($aFields, $appFields['CURRENT_USER_UID'], false, array(), ($nextDel['TAS_ASSIGN_TYPE'] == 'SELF_SERVICE' ? true : false));

4
workflow/engine/classes/class.system.php
View File

@@ -260,7 +260,7 @@ class System
continue;
}
if (file_exists( realpath( $filename ) )) {
if (strcmp( $checksum, md5_file( realpath( $filename ) ) ) != 0) {
if (strcmp( $checksum, G::encryptFileOld( realpath( $filename ) ) ) != 0) {
$result['diff'][] = $filename;
}
} else {
@@ -542,7 +542,7 @@ class System
$file = PATH_TRUNK . trim( $line[2] );
if (is_readable( $file )) {
$size = sprintf( "%07d", filesize( $file ) );
$checksum = sprintf( "%010u", crc32( file_get_contents( $file ) ) );
$checksum = sprintf( "%010u", G::encryptCrc32( file_get_contents( $file ) ) );
if (! ($line[0] == $size && $line[1] == $checksum) && substr( $file, - 4 ) != '.xml') {
$distinctFiles .= $file . "\n";
$distinct ++;

2
workflow/engine/classes/model/AddonsManager.php
View File

@@ -61,7 +61,7 @@ class AddonsManager extends BaseAddonsManager
if ($download_md5 == null) {
return null;
}
return (strcasecmp(md5_file($filename), $download_md5) == 0);
return (strcasecmp(G::encryptFileOld($filename), $download_md5) == 0);
}
/**

19
workflow/engine/classes/model/AppDelegation.php
View File

@@ -133,7 +133,7 @@ class AppDelegation extends BaseAppDelegation
//The function return an array now. By JHL
$delTaskDueDate = $this->calculateDueDate($sNextTasParam);
$delRiskDate = $this->calculateRiskDate($delTaskDueDate, $this->getRisk());
$delRiskDate = $this->calculateRiskDate($sNextTasParam, $this->getRisk());
//$this->setDelTaskDueDate( $delTaskDueDate['DUE_DATE'] ); // Due date formatted
$this->setDelTaskDueDate($delTaskDueDate);
@@ -379,8 +379,18 @@ class AppDelegation extends BaseAppDelegation
public function calculateRiskDate($dueDate, $risk)
{
try {
$riskTime = strtotime($dueDate) - strtotime($this->getDelDelegateDate()); //Seconds
$riskTime = $riskTime - ($riskTime * $risk);
$data = array();
if (isset( $sNextTasParam['NEXT_TASK']['TAS_TRANSFER_HIDDEN_FLY'] ) && $sNextTasParam['NEXT_TASK']['TAS_TRANSFER_HIDDEN_FLY'] == 'true') {
$data['TAS_DURATION'] = $sNextTasParam['NEXT_TASK']['TAS_DURATION'];
$data['TAS_TIMEUNIT'] = $sNextTasParam['NEXT_TASK']['TAS_TIMEUNIT'];
} else {
$task = TaskPeer::retrieveByPK( $this->getTasUid() );
$data['TAS_DURATION'] = $task->getTasDuration();
$data['TAS_TIMEUNIT'] = $task->getTasTimeUnit();
}
$riskTime = $data['TAS_DURATION'] - ($data['TAS_DURATION'] * $risk);
//Calendar - Use the dates class to calculate dates
$calendar = new calendar();
@@ -394,9 +404,8 @@ class AppDelegation extends BaseAppDelegation
}
//Risk date
$riskDate = $calendar->dashCalculateDate($this->getDelDelegateDate(), round($riskTime / (60 * 60)), "HOURS", $arrayCalendarData);
$riskDate = $calendar->dashCalculateDate($this->getDelDelegateDate(), round($riskTime), $data['TAS_TIMEUNIT'], $arrayCalendarData);
//Return
return $riskDate;
} catch (Exception $e) {
throw $e;

2
workflow/engine/classes/model/Application.php
View File

@@ -367,7 +367,7 @@ class Application extends BaseApplication
$pin = G::generateCode(4, 'ALPHANUMERIC');
$this->setAppData(serialize(array('PIN' => $pin)));
$this->setAppPin(md5($pin));
$this->setAppPin(G::encryptOld($pin));
$c = new Criteria();
$c->clearSelectColumns();

34
workflow/engine/classes/model/DashboardDasInd.php
View File

@@ -108,10 +108,40 @@ class DashboardDasInd extends BaseDashboardDasInd
}
}
public function getOwnerByDashboard ($dasUid)
public function loadOwnerByUserId ($usrId)
{
try {
$criteria = new Criteria('workflow');
$criteria->add(DashboardDasIndPeer::OWNER_UID, $usrId);
$criteria->add(DashboardDasIndPeer::OWNER_TYPE, "USER");
$dataset = DashboardDasIndPeer::doSelectRS($criteria);
$dataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
$fields = array();
while ($dataset->next()) {
$auxField = $dataset->getRow();
$fields[] = $auxField;
}
$criteria = new Criteria('workflow');
$criteria->add(DashboardDasIndPeer::OWNER_TYPE, "GROUP");
$criteria->add(GroupUserPeer::USR_UID, $usrId);
$criteria->addJoin(GroupUserPeer::GRP_UID, DashboardDasIndPeer::OWNER_UID);
$dataset = DashboardDasIndPeer::doSelectRS($criteria);
$dataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
while ($dataset->next()) {
$auxField = $dataset->getRow();
$fields[] = $auxField;
}
return $fields;
} catch (Exception $error) {
throw $error;
}
}
}

31
workflow/engine/classes/model/ListCompleted.php
View File

@@ -25,6 +25,15 @@ class ListCompleted extends BaseListCompleted
*/
public function create($data)
{
$criteria = new Criteria();
$criteria->addSelectColumn(ListCompletedPeer::APP_UID);
$criteria->add( ListCompletedPeer::APP_UID, $data['APP_UID'], Criteria::EQUAL );
$dataset = ListCompletedPeer::doSelectRS($criteria);
$dataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
if ($dataset->next()) {
return 1;
}
$criteria = new Criteria();
$criteria->addSelectColumn(ContentPeer::CON_VALUE);
$criteria->add( ContentPeer::CON_ID, $data['APP_UID'], Criteria::EQUAL );
@@ -97,9 +106,27 @@ class ListCompleted extends BaseListCompleted
$users = new Users();
$users->refreshTotal($data['USR_UID'], 'add', 'completed');
if ($data['DEL_PREVIOUS'] != 0) {
$users->refreshTotal($data['USR_UID'], 'remove', 'inbox');
$criteria = new Criteria();
$criteria->addSelectColumn(TaskPeer::TAS_TYPE);
$criteria->add( TaskPeer::TAS_UID, $data['TAS_UID'], Criteria::EQUAL );
$dataset = TaskPeer::doSelectRS($criteria);
$dataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
$dataset->next();
$aRow = $dataset->getRow();
if ($aRow['TAS_TYPE'] != 'SUBPROCESS') {
$users->refreshTotal($data['USR_UID'], 'remove', 'inbox');
}
} else {
$users->refreshTotal($data['USR_UID'], 'remove', 'draft');
$criteria = new Criteria();
$criteria->addSelectColumn(SubApplicationPeer::APP_UID);
$criteria->add( SubApplicationPeer::APP_UID, $data['APP_UID'], Criteria::EQUAL );
$dataset = SubApplicationPeer::doSelectRS($criteria);
$dataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
if ($dataset->next()) {
$users->refreshTotal($data['USR_UID'], 'remove', 'inbox');
} else {
$users->refreshTotal($data['USR_UID'], 'remove', 'draft');
}
}
$con = Propel::getConnection( ListCompletedPeer::DATABASE_NAME );

8
workflow/engine/controllers/installer.php
View File

@@ -848,7 +848,7 @@ class Installer extends Controller
// Write the paths_installed.php file (contains all the information configured so far)
if (! file_exists( FILE_PATHS_INSTALLED )) {
$sh = md5( filemtime( PATH_GULLIVER . '/class.g.php' ) );
$sh = G::encryptOld( filemtime( PATH_GULLIVER . '/class.g.php' ) );
$h = G::encrypt( $db_hostname . $sh . $db_username . $sh . $db_password, $sh );
$dbText = "<?php\n";
$dbText .= sprintf( " define('PATH_DATA', '%s');\n", $pathShared );
@@ -1152,18 +1152,18 @@ class Installer extends Controller
$query = sprintf( "USE %s;", $wf );
$this->mssqlQuery( $query );
$query = sprintf( "UPDATE USERS SET USR_USERNAME = '%s', USR_PASSWORD = '%s' WHERE USR_UID = '00000000000000000000000000000001' ", $adminUsername, md5( $adminPassword ) );
$query = sprintf( "UPDATE USERS SET USR_USERNAME = '%s', USR_PASSWORD = '%s' WHERE USR_UID = '00000000000000000000000000000001' ", $adminUsername, G::encryptOld( $adminPassword ) );
$this->mssqlQuery( $query );
$query = sprintf( "USE %s;", $wf );
$this->mssqlQuery( $query );
$query = sprintf( "UPDATE RBAC_USERS SET USR_USERNAME = '%s', USR_PASSWORD = '%s' WHERE USR_UID = '00000000000000000000000000000001' ", $adminUsername, md5( $adminPassword ) );
$query = sprintf( "UPDATE RBAC_USERS SET USR_USERNAME = '%s', USR_PASSWORD = '%s' WHERE USR_UID = '00000000000000000000000000000001' ", $adminUsername, G::encryptOld( $adminPassword ) );
$this->mssqlQuery( $query );
// Write the paths_installed.php file (contains all the information configured so far)
if (! file_exists( FILE_PATHS_INSTALLED )) {
$sh = md5( filemtime( PATH_GULLIVER . '/class.g.php' ) );
$sh = G::encryptOld( filemtime( PATH_GULLIVER . '/class.g.php' ) );
$h = G::encrypt( $db_hostname . $sh . $db_username . $sh . $db_password . '1', $sh );
$dbText = "<?php\n";
$dbText .= sprintf( " define ('PATH_DATA', '%s' );\n", $pathShared );

26
workflow/engine/controllers/strategicDashboard.php
View File

@@ -14,6 +14,7 @@ class StrategicDashboard extends Controller
private $urlProxy;
private $clientToken;
private $usrId;
private $usrUnitCost;
// Class constructor
public function __construct ()
@@ -32,6 +33,13 @@ class StrategicDashboard extends Controller
die;
}
$this->usrId = $RBAC->aUserInfo['USER_INFO']['USR_UID'];
$user = new Users();
$user = $user->load($RBAC->aUserInfo['USER_INFO']['USR_UID']);
$this->usrUnitCost = '$';
if (isset($user['USR_UNIT_COST'])) {
$this->usrUnitCost = $user['USR_UNIT_COST'];
}
$this->urlProxy = '/api/1.0/' . SYS_SYS . '/';
//change
$clientId = 'x-pm-local-client';
@@ -170,13 +178,12 @@ class StrategicDashboard extends Controller
}
$this->setView( 'strategicDashboard/viewDashboard' );
$this->setVar('urlProxy',$this->urlProxy);
$this->setVar('usrId',$this->usrId);
$this->setVar('credentials',$this->clientToken);
$this->setVar('urlProxy', $this->urlProxy);
$this->setVar('usrId', $this->usrId);
$this->setVar('credentials', $this->clientToken);
$this->setVar('unitCost', $this->usrUnitCost);
$translation = array();
$translation['ID_MANAGERS_DASHBOARDS'] = G::LoadTranslation( 'ID_MANAGERS_DASHBOARDS');
$translation['ID_PRO_EFFICIENCY_INDEX'] = G::LoadTranslation( 'ID_PRO_EFFICIENCY_INDEX');
$translation['ID_EFFICIENCY_USER'] = G::LoadTranslation( 'ID_EFFICIENCY_USER');
@@ -203,6 +210,7 @@ class StrategicDashboard extends Controller
$translation['ID_OVERDUE'] = G::LoadTranslation( 'ID_OVERDUE');
$translation['ID_AT_RISK'] = G::LoadTranslation( 'ID_AT_RISK');
$translation['ID_ON_TIME'] = G::LoadTranslation( 'ID_ON_TIME');
$this->setVar('translation', $translation);
$this->render();
} catch (Exception $error) {
@@ -215,12 +223,12 @@ class StrategicDashboard extends Controller
{
try {
$this->setView( 'strategicDashboard/viewDashboardIE' );
$this->setVar('urlProxy',$this->urlProxy);
$this->setVar('usrId',$this->usrId);
$this->setVar('credentials',$this->clientToken);
$this->setVar('urlProxy', $this->urlProxy);
$this->setVar('usrId', $this->usrId);
$this->setVar('credentials', $this->clientToken);
$this->setVar('unitCost', $this->usrUnitCost);
$translation = array();
$translation['ID_MANAGERS_DASHBOARDS'] = G::LoadTranslation( 'ID_MANAGERS_DASHBOARDS');
$translation['ID_PRO_EFFICIENCY_INDEX'] = G::LoadTranslation( 'ID_PRO_EFFICIENCY_INDEX');
$translation['ID_EFFICIENCY_USER'] = G::LoadTranslation( 'ID_EFFICIENCY_USER');

151
workflow/engine/js/strategicDashboard/viewDashboardPresenter.js
View File

@@ -100,7 +100,7 @@ ViewDashboardPresenter.prototype.dashboardIndicatorsViewModel = function(data) {
//to be sure that percentages sum up to 100 (the rounding will lost decimals)%
newObject.percentageOnTime = 100 - newObject.percentageOverdue - newObject.percentageAtRisk;
newObject.overdueVisibility = (newObject.percentageOverdue > 0)? "visible" : "hidden";
newObject.atRiskVisiblity = (newObject.percentageAtRisk > 0)? "visible" : "hidden";
newObject.atRiskVisibility = (newObject.percentageAtRisk > 0)? "visible" : "hidden";
newObject.onTimeVisibility = (newObject.percentageOnTime > 0)? "visible" : "hidden";
returnList.push(newObject);
i++;
@@ -164,25 +164,8 @@ ViewDashboardPresenter.prototype.peiViewModel = function(data) {
"inefficiencyCost" : "value"
};
var newObject = that.helper.merge(originalObject, {}, map);
var shortLabel = (newObject.datalabel == null)
? ""
: newObject.datalabel.substring(0,15);
newObject.datalabel = shortLabel;
//use positive values for drawing;
if (newObject.value > 0) {
newObject.value = 0;
}
if (newObject.value < 0) {
newObject.value = Math.abs(newObject.value);
}
if (newObject.value > 0) {
graphData.push(newObject);
}
originalObject.inefficiencyCostToShow = "$ " + Math.round(originalObject.inefficiencyCost);
graphData.push(newObject);
originalObject.inefficiencyCostToShow = Math.round(originalObject.inefficiencyCost);
originalObject.efficiencyIndexToShow = Math.round(originalObject.efficiencyIndex * 100) / 100;
originalObject.indicatorId = data.id;
originalObject.json = JSON.stringify(originalObject);
@@ -190,16 +173,11 @@ ViewDashboardPresenter.prototype.peiViewModel = function(data) {
var retval = {};
retval = data;
graphData.sort(function(a,b) {
var retval = 0;
retval = ((a.value*1.0 <= b.value*1.0) ? -1 : 1);
return retval;
})
retval.dataToDraw = graphData.splice(0,7);
this.makeShortLabel(graphData, 10);
retval.dataToDraw = this.adaptGraphData(graphData);
//TODO aumentar el símbolo de moneda $
retval.inefficiencyCostToShow = "$ " +Math.round(retval.inefficiencyCost);
retval.inefficiencyCostToShow = Math.round(retval.inefficiencyCost);
retval.efficiencyIndexToShow = Math.round(retval.efficiencyIndex * 100) / 100;
return retval;
};
@@ -216,23 +194,8 @@ ViewDashboardPresenter.prototype.ueiViewModel = function(data) {
"deviationTime" : "dispersion"
};
var newObject = that.helper.merge(originalObject, {}, map);
var shortLabel = (newObject.datalabel == null)
? ""
: newObject.datalabel.substring(0,7);
newObject.datalabel = shortLabel;
//use positive values for drawing;
if (newObject.value > 0) {
newObject.value = 0;
}
if (newObject.value < 0) {
newObject.value = Math.abs(newObject.value);
}
if (newObject.value > 0) {
graphData.push(newObject);
}
originalObject.inefficiencyCostToShow = "$ " + Math.round(originalObject.inefficiencyCost);
graphData.push(newObject);
originalObject.inefficiencyCostToShow = Math.round(originalObject.inefficiencyCost);
originalObject.efficiencyIndexToShow = Math.round(originalObject.efficiencyIndex * 100) / 100;
originalObject.indicatorId = data.id;
originalObject.json = JSON.stringify(originalObject);
@@ -240,15 +203,10 @@ ViewDashboardPresenter.prototype.ueiViewModel = function(data) {
var retval = {};
retval = data;
graphData.sort(function(a,b) {
var retval = 0;
retval = ((a.value*1.0 <= b.value*1.0) ? 1 : -1);
return retval;
})
retval.dataToDraw = graphData.splice(0,7);
this.makeShortLabel(graphData, 10);
retval.dataToDraw = this.adaptGraphData(graphData);
//TODO aumentar el símbolo de moneda $
retval.inefficiencyCostToShow = "$ " + Math.round(retval.inefficiencyCost);
retval.inefficiencyCostToShow = Math.round(retval.inefficiencyCost);
retval.efficiencyIndexToShow = Math.round(retval.efficiencyIndex * 100) / 100;
return retval;
};
@@ -263,20 +221,18 @@ ViewDashboardPresenter.prototype.statusViewModel = function(indicatorId, data) {
$.each(data.dataList, function(index, originalObject) {
originalObject.taskTitle = that.helper.labelIfEmpty(originalObject.taskTitle);
//TODO use more that 10 chars when the label and color problem in pie 2D is solved.
var title = originalObject.taskTitle.substring(0,10);
//TODO Do not use the str. replace when color and lable in pie 2D is solved.
var newObject1 = {
datalabel : title.trim().replace(" ", "_"),
datalabel : title,
value : originalObject.percentageTotalOverdue
};
var newObject2 = {
datalabel : title.trim().replace(" ", "_"),
datalabel : title,
value : originalObject.percentageTotalAtRisk
};
var newObject3 = {
datalabel : title.trim().replace(" ", "_"),
datalabel : title,
value : originalObject.percentageTotalOnTime
};
@@ -298,7 +254,6 @@ ViewDashboardPresenter.prototype.statusViewModel = function(indicatorId, data) {
retval.graph1Data = this.orderGraphData(graph1Data, "down").splice(0,7)
retval.graph2Data = this.orderGraphData(graph2Data, "down").splice(0,7)
retval.graph3Data = this.orderGraphData(graph3Data, "down").splice(0,7)
//TODO correct 2D Pie so we don't depend on label name
$.each(retval.graph1Data, function(index, item) { item.datalabel = (index + 1) + "." + item.datalabel; });
$.each(retval.graph2Data, function(index, item) { item.datalabel = (index + 1) + "." + item.datalabel; });
@@ -370,29 +325,15 @@ ViewDashboardPresenter.prototype.returnIndicatorSecondLevelPei = function(modelD
"deviationTime" : "dispersion"
};
var newObject = that.helper.merge(originalObject, {}, map);
newObject.datalabel = ((newObject.datalabel == null) ? "" : newObject.datalabel.substring(0, 7));
originalObject.inefficiencyCostToShow = "$ " + Math.round(originalObject.inefficiencyCost);
originalObject.inefficiencyCostToShow = Math.round(originalObject.inefficiencyCost);
originalObject.efficiencyIndexToShow = Math.round(originalObject.efficiencyIndex * 100) / 100;
originalObject.deviationTimeToShow = Math.round(originalObject.deviationTime);
//use positive values for drawing;
if (newObject.value > 0) {
newObject.value = 0;
}
if (newObject.value < 0) {
newObject.value = Math.abs(newObject.value);
}
if (newObject.value > 0) {
graphData.push(newObject);
}
originalObject.rankToShow = originalObject.rank + "/" + modelData.length;
graphData.push(newObject);
});
var retval = {};
graphData.sort(function(a,b) {
var retval = 0;
retval = ((a.value*1.0 <= b.value*1.0) ? 1 : -1);
return retval;
})
retval.dataToDraw = graphData.splice(0,7);
this.makeShortLabel(graphData, 10);
retval.dataToDraw = this.adaptGraphData(graphData);
retval.entityData = modelData;
return retval;
};
@@ -411,30 +352,16 @@ ViewDashboardPresenter.prototype.returnIndicatorSecondLevelUei = function(modelD
"deviationTime" : "dispersion"
};
var newObject = that.helper.merge(originalObject, {}, map);
newObject.datalabel = ((newObject.datalabel == null) ? "" : newObject.datalabel.substring(0, 7));
originalObject.inefficiencyCostToShow = "$ " +Math.round(originalObject.inefficiencyCost);
originalObject.inefficiencyCostToShow = Math.round(originalObject.inefficiencyCost);
originalObject.efficiencyIndexToShow = Math.round(originalObject.efficiencyIndex * 100) / 100;
originalObject.deviationTimeToShow = Math.round(originalObject.deviationTime);
//use positive values for drawing;
if (newObject.value > 0) {
newObject.value = 0;
}
if (newObject.value < 0) {
newObject.value = Math.abs(newObject.value);
}
if (newObject.value > 0) {
graphData.push(newObject);
}
originalObject.rankToShow = originalObject.rank + "/" + modelData.length;
graphData.push(newObject);
});
var retval = {};
graphData.sort(function(a,b) {
var retval = 0;
retval = ((a.value*1.0 <= b.value*1.0) ? 1 : -1);
return retval;
})
retval.dataToDraw = graphData.splice(0,7);
this.makeShortLabel(graphData, 10);
retval.dataToDraw = this.adaptGraphData(graphData);
retval.entityData = modelData;
return retval;
};
@@ -479,3 +406,33 @@ ViewDashboardPresenter.prototype.orderGraphData = function(listData, orderDirect
}
return listData.sort(orderToUse);
}
ViewDashboardPresenter.prototype.adaptGraphData = function(listData) {
var workList = this.orderGraphData(listData, "up");
var newList = [];
$.each(workList, function(index, item) {
item.datalabel = (index + 1) + "." + item.datalabel;
//use positive values for drawing;
if (item.value > 0) {
item.value = 0;
}
if (item.value < 0) {
item.value = Math.abs(item.value);
}
if (item.value > 0) {
newList.push(item);
}
});
return newList.splice(0,7);
}
ViewDashboardPresenter.prototype.makeShortLabel = function(listData, labelLength) {
$.each(listData, function(index, item) {
var shortLabel = (item.datalabel == null)
? ""
: item.datalabel.substring(0,labelLength);
item.datalabel = shortLabel;
item.datalabel = shortLabel;
});
}

78
workflow/engine/js/strategicDashboard/viewDashboardView.js
View File

@@ -141,13 +141,41 @@ WidgetBuilder.prototype.buildSpecialIndicatorSecondView = function (secondViewDa
return $retval;
};
WidgetBuilder.prototype.buildSpecialIndicatorSecondViewDetail = function (oneItemDetail) {
WidgetBuilder.prototype.buildSpecialIndicatorSecondViewDetailPei = function (oneItemDetail) {
if (oneItemDetail == null){throw new Error("oneItemDetail is null ");}
if (!typeof(oneItemDetail) === 'object'){throw new Error( "detailData is not and object ->" + oneItemDetail);}
if (!oneItemDetail.hasOwnProperty("name")){throw new Error("buildSpecialIndicatorFirstViewDetail -> detailData has not the name param. Has it the correct Type? ->" + oneItemDetail);}
_.templateSettings.variable = "detailData";
var template = _.template ($("script.specialIndicatorSencondViewDetail").html());
var template = _.template ($("script.specialIndicatorSecondViewDetailPei").html());
var $retval = $(template(oneItemDetail));
$retval.find(".detail-efficiency-selector").text(G_STRING.ID_EFFICIENCY_INDEX);
$retval.find(".detail-cost-selector").text(G_STRING.ID_INEFFICIENCY_COST);
this.setColorForInefficiency($retval.find(".detail-cost-number-selector"), oneItemDetail);
return $retval;
}
WidgetBuilder.prototype.buildSpecialIndicatorSecondViewDetailUei = function (oneItemDetail) {
if (oneItemDetail == null){throw new Error("oneItemDetail is null ");}
if (!typeof(oneItemDetail) === 'object'){throw new Error( "detailData is not and object ->" + oneItemDetail);}
if (!oneItemDetail.hasOwnProperty("name")){throw new Error("buildSpecialIndicatorFirstViewDetail -> detailData has not the name param. Has it the correct Type? ->" + oneItemDetail);}
_.templateSettings.variable = "detailData";
var template = _.template ($("script.specialIndicatorSecondViewDetailUei").html());
var $retval = $(template(oneItemDetail));
$retval.find(".detail-efficiency-selector").text(G_STRING.ID_EFFICIENCY_INDEX);
$retval.find(".detail-cost-selector").text(G_STRING.ID_INEFFICIENCY_COST);
this.setColorForInefficiency($retval.find(".detail-cost-number-selector"), oneItemDetail);
return $retval;
}
WidgetBuilder.prototype.buildSpecialIndicatorSecondViewDetaiUei = function (oneItemDetail) {
if (oneItemDetail == null){throw new Error("oneItemDetail is null ");}
if (!typeof(oneItemDetail) === 'object'){throw new Error( "detailData is not and object ->" + oneItemDetail);}
if (!oneItemDetail.hasOwnProperty("name")){throw new Error("buildSpecialIndicatorFirstViewDetail -> detailData has not the name param. Has it the correct Type? ->" + oneItemDetail);}
_.templateSettings.variable = "detailData";
var template = _.template ($("script.specialIndicatorSencondViewDetailUei").html());
var $retval = $(template(oneItemDetail));
$retval.find(".detail-efficiency-selector").text(G_STRING.ID_EFFICIENCY_INDEX);
$retval.find(".detail-cost-selector").text(G_STRING.ID_INEFFICIENCY_COST);
@@ -366,10 +394,27 @@ var hideScrollIfAllDivsAreVisible = function(){
$('#scrollImg').hide();
}
else {
$('#scrollImg').css('visibility', 'visible');
$('#scrollImg').show();
}
}
var hideTitleAndSortDiv = function(){
if (window.currentIndicator == null) {
$('#relatedLabel').hide();
}
switch (window.currentIndicator.type) {
case "1010":
case "1030":
$('#relatedLabel').css('visibility', 'visible');
$('#relatedLabel').show();
break;
default:
$('#relatedLabel').hide();
break;
}
}
var selectedOrderOfDetailList = function () {
return ($('#sortListButton').hasClass('fa-chevron-up') ? "up" : "down");
}
@@ -407,6 +452,8 @@ var loadIndicator = function (indicatorId, initDate, endDate) {
break;
}
});
hideScrollIfAllDivsAreVisible();
hideTitleAndSortDiv();
}
var setIndicatorActiveMarker = function () {
@@ -507,7 +554,7 @@ var fillStatusIndicatorFirstView = function (presenterData) {
allowDrillDown:true,
allowTransition:true,
showTip: true,
showTip: false,
allowZoom: false,
showLabels: true
}
@@ -526,7 +573,6 @@ var fillStatusIndicatorFirstView = function (presenterData) {
var indicatorPrincipalData = widgetBuilder.getIndicatorLoadedById(presenterData.id)
setIndicatorActiveMarker();
$('#relatedLabel').hide();
}
var fillStatusIndicatorFirstViewDetail = function(presenterData) {
@@ -550,7 +596,6 @@ var fillStatusIndicatorFirstViewDetail = function(presenterData) {
}
var fillSpecialIndicatorFirstView = function(presenterData) {
$('#relatedLabel').show();
var widgetBuilder = new WidgetBuilder();
var panel = $('#indicatorsDataGridStack').data('gridstack');
panel.remove_all();
@@ -587,8 +632,8 @@ var fillSpecialIndicatorFirstView = function(presenterData) {
graph: {
allowDrillDown:false,
allowTransition:true,
axisX:{ showAxis: true, label: G_STRING.ID_GROUPS},
axisY:{ showAxis: true, label: G_STRING.ID_COSTS},
axisX:{ showAxis: true, label: G_STRING['ID_GROUPS']},
axisY:{ showAxis: true, label: G_STRING['ID_COSTS']},
gridLinesX:false,
gridLinesY:true,
showTip: true,
@@ -669,8 +714,8 @@ var fillSpecialIndicatorSecondView = function(presenterData) {
gridLinesX: true,
gridLinesY: true,
area: {visible: false, css:"area"},
axisX:{ showAxis: true, label: G_STRING.ID_USER },
axisY:{ showAxis: true, label: G_STRING.ID_COSTS },
axisX:{ showAxis: true, label: G_STRING['ID_USER'] },
axisY:{ showAxis: true, label: G_STRING['ID_COSTS'] },
showErrorBars: true
}
@@ -679,7 +724,7 @@ var fillSpecialIndicatorSecondView = function(presenterData) {
var indicatorPrincipalData = widgetBuilder.getIndicatorLoadedById(window.currentEntityData.indicatorId);
if (window.currentIndicator.type == "1010") {
detailParams.graph.axisX.label = G_STRING.ID_TASK;
detailParams.graph.axisX.label = G_STRING['ID_TASK'] ;
var graph = new BarChart(presenterData.dataToDraw, detailParams, null, null);
graph.drawChart();
}
@@ -704,7 +749,14 @@ var fillSpecialIndicatorSecondViewDetail = function (list) {
window.currentDetailFunction = fillSpecialIndicatorSecondViewDetail;
$.each(list, function(index, dataItem) {
var $widget = widgetBuilder.buildSpecialIndicatorSecondViewDetail(dataItem);
if (window.currentIndicator.type == "1010") {
var $widget = widgetBuilder.buildSpecialIndicatorSecondViewDetailPei(dataItem);
}
if (window.currentIndicator.type == "1030") {
var $widget = widgetBuilder.buildSpecialIndicatorSecondViewDetailUei(dataItem);
}
var x = (index % 2 == 0) ? 6 : 0;
//the first 2 elements are not hidden
if (index < 2) {
@@ -788,7 +840,7 @@ var fillGeneralIndicatorFirstView = function (presenterData) {
allowDrillDown:false,
allowTransition:true,
axisX:{ showAxis: true, label: G_STRING.ID_YEAR },
axisY:{ showAxis: true, label: G_STRING.ID_COSTS},
axisY:{ showAxis: true, label: G_STRING.ID_TIME_HOURS },
gridLinesX:false,
gridLinesY:true,
showTip: true,
@@ -810,7 +862,7 @@ var fillGeneralIndicatorFirstView = function (presenterData) {
allowDrillDown:false,
allowTransition:true,
axisX:{ showAxis: true, label: G_STRING.ID_YEAR },
axisY:{ showAxis: true, label: G_STRING.ID_COSTS },
axisY:{ showAxis: true, label: G_STRING.ID_TIME_HOURS },
gridLinesX:false,
gridLinesY:true,
showTip: true,

2
workflow/engine/methods/cases/caseHistory_Ajax.php
View File

@@ -137,7 +137,7 @@ if ($actionAjax == "showDynaformHistoryGetNomDynaform_JXP") {
$dynTitle = $contentObjeto->getConValue();
}
$md5Hash = md5( $idDin . $dynDate );
$md5Hash = G::encryptOld( $idDin . $dynDate );
//assign task
$result = new stdClass();

2
workflow/engine/methods/cases/cases_StepToRevise.php
View File

@@ -138,7 +138,7 @@ if (! isset( $_GET['ex'] )) {
// DEPRECATED this JS section is marked for removal
function setSelect()
{
var ex=<?php echo $_GET['ex']?>;
var ex=<?php echo $filter->xssFilterHard($_GET['ex'])?>;
try {
for(i=1; i<50; i++) {
if (i == ex) {

2
workflow/engine/methods/cases/cases_StepToReviseInputs.php
View File

@@ -140,7 +140,7 @@ G::RenderPage( 'publish', 'blank' );
//Deprecated Section since the interface are now movig to ExtJS
function setSelect()
{
var ex=<?php echo $_GET['ex']?>;
var ex=<?php echo $filter->xssFilterHard($_GET['ex'])?>;
try {
for (i=1; i<50; i++) {
if (i == ex) {

2
workflow/engine/methods/cases/cases_StepToReviseOutputs.php
View File

@@ -84,7 +84,7 @@ if (! isset( $_GET['ex'] )) {
//Deprecated Section since the interface are now movig to ExtJS
function setSelect()
{
var ex=<?php echo $_GET['ex']?>;
var ex=<?php echo $filter->xssFilterHard($_GET['ex'])?>;
try{
for (i=1; i<50; i++) {
if (i == ex) {

2
workflow/engine/methods/cases/cases_ToReviseOutputDocView.php
View File

@@ -104,7 +104,7 @@ if (! isset( $_GET['ex'] )) {
/*------------------------------ To Revise Routines ---------------------------*/
function setSelect()
{
var ex=<?php echo $_GET['ex']?>;
var ex=<?php echo $filter->xssFilterHard($_GET['ex'])?>;
try{
for(i=1; i<50; i++)
{

12
workflow/engine/methods/dynaforms/dynaforms_FlatEditor.php
View File

@@ -170,12 +170,12 @@ G::RenderPage( "publish", "raw" );
<script>
var toolbar = document.getElementById('fields_Toolbar')
var fieldsList = document.getElementById('dynaformEditor[0]')
var tableHeight=<?php echo $config['FieldsList']['height'] ?>;
var tableWidth=<?php echo $config['FieldsList']['width'] ?>;
var toolbarTop=<?php echo $config['Toolbar']['top'] ?>;
var toolbarLeft=<?php echo $config['Toolbar']['left'] ?>;
var fieldsListTop=<?php echo $config['FieldsList']['top'] ?>//(toolbarTop+toolbar.clientHeight+44+8 );
var fieldsListLeft=<?php echo $config['FieldsList']['left'] ?>;
var tableHeight=<?php echo $filter->xssFilterHard($config['FieldsList']['height']) ?>;
var tableWidth=<?php echo $filter->xssFilterHard($config['FieldsList']['width']) ?>;
var toolbarTop=<?php echo $filter->xssFilterHard($config['Toolbar']['top']) ?>;
var toolbarLeft=<?php echo $filter->xssFilterHard($config['Toolbar']['left']) ?>;
var fieldsListTop=<?php echo $filter->xssFilterHard($config['FieldsList']['top']) ?>//(toolbarTop+toolbar.clientHeight+44+8 );
var fieldsListLeft=<?php echo $filter->xssFilterHard($config['FieldsList']['left']) ?>;
mainPanel.elements.headerBar.style.backgroundColor='#CBDAEF';
mainPanel.elements.headerBar.style.borderBottom='1px solid #808080';
mainPanel.elements.headerBar.appendChild(toolbar);

2
workflow/engine/methods/enterprise/addonsStoreAction.php
View File

@@ -269,7 +269,7 @@ try {
}
///////
$boundary = "---------------------" . substr(md5(rand(0, 32000)), 0, 10);
$boundary = "---------------------" . substr(G::encryptOld(rand(0, 32000)), 0, 10);
$data = null;
$data = $data . "--$boundary\n";

18
workflow/engine/methods/install/r.php
View File

@@ -2,25 +2,25 @@
G::LoadSystem('inputfilter');
$filter = new InputFilter();
if(isset($_GET['srv'])) {
$_GET['srv'] = $filter->xssFilterHard($_GET['srv']);
$srv = $filter->xssFilterHard($_GET['srv']);
}
if(isset($_GET['usr'])) {
$_GET['usr'] = $filter->xssFilterHard($_GET['usr']);
$usr = $filter->xssFilterHard($_GET['usr']);
}
if(isset($_GET['pass'])) {
$_GET['pass'] = $filter->xssFilterHard($_GET['pass']);
$pass = $filter->xssFilterHard($_GET['pass']);
}
if(isset($_GET['gen'])) {
$_GET['gen'] = $filter->xssFilterHard($_GET['gen']);
$gen = $filter->xssFilterHard($_GET['gen']);
}
?>
<form action="r">
Server: <input type="text" name="srv"
value="<?php echo isset($_GET['srv'])?$_GET['srv']:'';?>"> User: <input
value="<?php echo isset($srv)? $srv:'';?>"> User: <input
type="text" name="usr"
value="<?php echo isset($_GET['usr'])?$_GET['usr']:'';?>" /> Passwd: <input
value="<?php echo isset($usr)? $usr:'';?>" /> Passwd: <input
type="text" name="pass"
value="<?php echo isset($_GET['pass'])?$_GET['pass']:'';?>" /> <input
value="<?php echo isset($pass)? $pass:'';?>" /> <input
type="submit" value="Gen" name="gen" /> <input type="submit"
value="Regenerate paths_installed" name="reg" /><br />
</form>
@@ -28,14 +28,18 @@ if(isset($_GET['gen'])) {
if (isset( $_GET['gen'] )) {
$sh = G::encryptOld( filemtime( PATH_GULLIVER . "/class.g.php" ) );
$sh = $filter->xssFilterHard($sh);
$h = G::encrypt( $_GET['srv'] . $sh . $_GET['usr'] . $sh . $_GET['pass'] . $sh . (1), $sh );
$h = $filter->xssFilterHard($h);
echo "HASH_INSTALLATION<br/>";
echo "<textarea cols=120>$h</textarea><br/>";
echo "SYSTEM_HASH<br/>";
echo "<textarea cols=120>$sh</textarea>";
} elseif (isset( $_GET['reg'] )) {
$sh = G::encryptOld( filemtime( PATH_GULLIVER . "/class.g.php" ) );
$sh = $filter->xssFilterHard($sh);
$h = G::encrypt( $_GET['srv'] . $sh . $_GET['usr'] . $sh . $_GET['pass'] . $sh . (1), $sh );
$h = $filter->xssFilterHard($h);
echo "HASH_INSTALLATION<br/>";
echo "<textarea cols=120>$h</textarea><br/>";
echo "SYSTEM_HASH<br/>";

2
workflow/engine/methods/setup/appCacheViewAjax.php
View File

@@ -302,7 +302,7 @@ switch ($request) {
list($sucess, $msgErr) = testConnection(DB_ADAPTER, $serverName, $user, $passwd, $port);
if ($sucess) {
$sh = md5( filemtime( PATH_GULLIVER . "/class.g.php" ) );
$sh = G::encryptOld( filemtime( PATH_GULLIVER . "/class.g.php" ) );
$h = G::encrypt( $_POST['host'] . $sh . $_POST['user'] . $sh . $_POST['password'] . $sh . (1), $sh );
$insertStatements = "define ( 'HASH_INSTALLATION','{$h}' ); \ndefine ( 'SYSTEM_HASH', '{$sh}' ); \n";
$lines = array ();

5
workflow/engine/methods/setup/pluginsRemove.php
View File

@@ -39,7 +39,8 @@ switch ($RBAC->userCanAccess('PM_SETUP_ADVANCE'))
}*/
G::LoadClass( "plugin" );
G::LoadSystem('inputfilter');
$filter = new InputFilter();
$pluginName = $_REQUEST["pluginUid"];
if (file_exists( PATH_PLUGINS . $pluginName . ".php" )) {
@@ -50,5 +51,5 @@ if (file_exists( PATH_PLUGINS . $pluginName . ".php" )) {
$pluginRegistry->unSerializeInstance( file_get_contents( PATH_DATA_SITE . "plugin.singleton" ) );
}
G::auditLog("RemovePlugin","Plugin Name: ".$pluginName);
echo $pluginName . " " . nl2br( G::LoadTranslation( "ID_MSG_REMOVE_PLUGIN_SUCCESS" ) );
echo $pluginName . " " . nl2br( $filter->xssFilterHard(G::LoadTranslation( "ID_MSG_REMOVE_PLUGIN_SUCCESS" )) );

4
workflow/engine/skinEngine/neoclassic/layout.html
View File

@@ -15,7 +15,7 @@
<tr>
{if $user_logged neq '' or $tracker neq ''}
<td rowspan="2" style="vertical-align:top;width: 245px;"><img src="{$logo_company}" class="logo_company"/></td>
<td class="mainMenuBG" rowspan="2" valign="center" >
<td id="mainMenuBG" class="mainMenuBG" rowspan="2" valign="center" >
{include file="$tpl_menu"}
{if (count($subMenus)>0) }
{include file= "$tpl_submenu"}
@@ -30,7 +30,7 @@
<label class="textBlue"><a href="../../uxs/home">{$switch_interface_label}</a> | </label>
{/if}
<a href="{$linklogout}" class="tableOption">{$logout}</a>&nbsp;&nbsp;<br/>
<label class="textBlack"><b>{$rolename}</b> {$workspace_label} <b><u>{$workspace}</u></b> &nbsp; &nbsp; <br/>
<label class="textBlack"><b>{$rolename}</b> {$workspace_label} <b><u>{$workspace}</u></b><br />
{$udate}</label>&nbsp; &nbsp;
{else}
{if $tracker eq 1}

43
workflow/engine/src/ProcessMaker/BusinessModel/Dashboard.php
View File

@@ -23,7 +23,7 @@ class Dashboard {
require_once (PATH_HOME . "engine" . PATH_SEP . "classes" . PATH_SEP . "model" . PATH_SEP . "DashboardDasInd.php");
$oDashboardDasInd = new \DashboardDasInd();
$response = $oDashboardDasInd->loadByOwner($usr_uid);
$response = $oDashboardDasInd->loadOwnerByUserId($usr_uid);
return $response;
}
@@ -40,27 +40,32 @@ class Dashboard {
{
$resp = array();
$dashboards = $this->getDashboardsUidByUser($usr_uid);
$existFavorite = false;
foreach($dashboards as $i=>$x) {
$resp[$i] = $this->getDashboard($x['DAS_UID']);
$Dashboard = new \ProcessMaker\BusinessModel\Dashboard();
$dashConfig = $Dashboard->getConfig($usr_uid);
$resp[$i]['DAS_FAVORITE'] = 0;
foreach ($dashConfig as $dashId=>$dashData) {
if($dashId == $x['DAS_UID'] ) {
$resp[$i]['DAS_FAVORITE'] = $dashData['dashFavorite'];
if ($dashData['dashFavorite']==1) {
$existFavorite = true;
}
$existFavorite = false;
foreach($dashboards as $i=>$x) {
//$resp[$i] = $this->getDashboard($x['DAS_UID']);
$dashboardUser = $this->getDashboard($x['DAS_UID']);
if ($dashboardUser['DAS_STATUS'] == 0) {
continue;
}
$resp[$i] = $dashboardUser;
$Dashboard = new \ProcessMaker\BusinessModel\Dashboard();
$dashConfig = $Dashboard->getConfig($usr_uid);
$resp[$i]['DAS_FAVORITE'] = 0;
foreach ($dashConfig as $dashId=>$dashData) {
if($dashId == $x['DAS_UID'] ) {
$resp[$i]['DAS_FAVORITE'] = $dashData['dashFavorite'];
if ($dashData['dashFavorite']==1) {
$existFavorite = true;
}
}
}
//if no favorite is set, the default vavorite is the first one
if ($existFavorite == false && $dashboards != null && sizeof($dashboards)>0) {
$resp[0]['DAS_FAVORITE'] = 1;
}
}
return $resp;
//if no favorite is set, the default favorite is the first one
if ($existFavorite == false && $resp != null && sizeof($resp)>0) {
$resp[0]['DAS_FAVORITE'] = 1;
}
return $resp;
}
/**

16
workflow/engine/src/ProcessMaker/Project/Bpmn.php
View File

@@ -1348,13 +1348,15 @@ class Bpmn extends Handler
$oCriteria->add( \BpmnFlowPeer::FLO_POSITION, $iPosition, '>' );
$oDataset = \BpmnFlowPeer::doSelectRS( $oCriteria );
$oDataset->setFetchmode( ResultSet::FETCHMODE_ASSOC );
$oDataset->next();
$aRow = $oDataset->getRow();
$oCriteria2 = new Criteria('workflow');
$oCriteria2->add( \BpmnFlowPeer::FLO_POSITION, $aRow['FLO_POSITION'] - 1);
BasePeer::doUpdate($oCriteria, $oCriteria2, $con);
$oDataset->next();
while ($oDataset->next()) {
$aRow = $oDataset->getRow();
$newPosition = ((int)$aRow['FLO_POSITION'])-1;
$oCriteriaTemp = new Criteria( 'workflow' );
$oCriteriaTemp->add( \BpmnFlowPeer::FLO_UID, $aRow['FLO_UID'] );
$oCriteria2 = new Criteria('workflow');
$oCriteria2->add(\BpmnFlowPeer::FLO_POSITION, $newPosition);
BasePeer::doUpdate($oCriteriaTemp, $oCriteria2, $con);
}
} catch (Exception $oException) {
throw $oException;
}

4
workflow/engine/src/ProcessMaker/Services/Api/Project/DynaForm.php
View File

@@ -47,6 +47,10 @@ class DynaForm extends Api
$dynaForm->setArrayFieldNameForException(array("processUid" => "prj_uid"));
$arrayData = $dynaForm->executeCreate($prj_uid, $request_data);
if (!array_key_exists('dyn_content', $request_data)) {
$request_data['dyn_content']="{}";
}
$arrayData = $dynaForm->update($arrayData['dyn_uid'], $request_data);
$response = $arrayData;

26
workflow/engine/templates/admin/calendarEdit.js
View File

@@ -753,12 +753,23 @@ Ext.onReady( function() {
name : 'name' ,
allowBlank : false,
msgTarget: 'side',
validator: function(valueField){
if(valueField.length<=100){
return true;
}else{
Ext.MessageBox.alert(_('ID_WARNING'), _("ID_PPP_MAXIMUM_LENGTH")+":100", function(){ return true;});
return false;
enableKeyEvents: true,
listeners: {
focus : function(textfield){
var element = document.getElementById('dynaformCalendarName');
element.setAttribute('maxlength','100');
element.onpaste = function (e){
var textValue = undefined;
if(window.clipboardData && window.clipboardData.getData) {
textValue = window.clipboardData.getData('Text');
}else if(e.clipboardData && e.clipboardData.getData) {
textValue = e.clipboardData.getData('text/plain');
}
if(textValue.length>99){
Ext.MessageBox.alert(_('ID_WARNING'), _("ID_PPP_MAXIMUM_LENGTH")+":100", function(){ return true;});
}
return true;
}
}
}
},
@@ -944,6 +955,9 @@ Ext.onReady( function() {
Ext.getCmp('dynaformCalendarName').setValue(Ext.getCmp('dynaformCalendarName').getValue().trim());
var canlendarName = Ext.getCmp('dynaformCalendarName').getValue().trim();
if(canlendarName === ""){
Ext.apply(Ext.getCmp('dynaformCalendarName'), {allowBlank: false}, {});
Ext.Msg.alert(_('ID_WARNING'), _("ID_FIELD_REQUIRED", _("ID_NAME")));
Ext.getCmp('dynaformCalendarName').setValue("");
return;
}
Ext.Ajax.request({

6
workflow/engine/templates/cases/cases_ScreenDerivation.html
View File

@@ -68,8 +68,7 @@
</tr>
{else}
<tr>
<td class="FormLabel" width="100"></td>
<td class="FormFieldContent">{$data.NEXT_TASK.TAS_TITLE}{$data.NEXT_TASK.TAS_HIDDEN_FIELD}</td>
<td class="FormFieldContent" colspan="2" style="text-align: center">{$data.NEXT_TASK.TAS_TITLE}{$data.NEXT_TASK.TAS_HIDDEN_FIELD}</td>
</tr>
{/if}
{/if}
@@ -93,8 +92,7 @@
</tr>
{else}
<tr>
<td class="FormLabel" width="100"></td>
<td class="FormFieldContent">{$data.NEXT_TASK.USR_HIDDEN_FIELD}</td>
<td class="FormFieldContent" colspan="2" style="text-align: center">{$data.NEXT_TASK.USR_HIDDEN_FIELD}</td>
</tr>
{/if}
{/if}

33
workflow/engine/templates/processes/mainLoad.php
View File

@@ -25,13 +25,32 @@
document.getElementById('pm_submenu').style.display = 'none';
document.documentElement.style.overflowY = 'hidden';
function autoResizeScreen() {
oCasesFrame = document.getElementById('frameMain');
oClientWinSize = getClientWindowSize();
height = oClientWinSize.height-105;
oCasesFrame.style.height = height;
if (oCasesFrame.height ) {
oCasesFrame.height = height;
}
var containerList1, containerList2;
oCasesFrame = document.getElementById('frameMain');
containerList1 = document.getElementById("pm_header");
if (document.getElementById("mainMenuBG") &&
document.getElementById("mainMenuBG").parentNode &&
document.getElementById("mainMenuBG").parentNode.parentNode &&
document.getElementById("mainMenuBG").parentNode.parentNode.parentNode &&
document.getElementById("mainMenuBG").parentNode.parentNode.parentNode.parentNode
){
containerList2 = document.getElementById("mainMenuBG").parentNode.parentNode.parentNode.parentNode;
}
if (containerList1 === containerList2) {
height = oClientWinSize.height - containerList1.clientHeight;
oCasesFrame.style.height = height;
if (oCasesFrame.height ) {
oCasesFrame.height = height;
}
} else {
oCasesFrame = document.getElementById('frameMain');
oClientWinSize = getClientWindowSize();
height = oClientWinSize.height-105;
oCasesFrame.style.height = height;
if (oCasesFrame.height ) {
oCasesFrame.height = height;
}
}
//oCasesSubFrame = oCasesFrame.contentWindow.document.getElementById('casesSubFrame');
//oCasesSubFrame.style.height = height-10;
}

23
workflow/engine/templates/processes/webentryPost.tpl
View File

@@ -22,11 +22,32 @@ try {
throw (new Exception("function ws_open() is not defined. File wsClient.php is missing"));
}
/*
* PMDynaform
* DYN_VERSION is 1: classic Dynaform,
* DYN_VERSION is 2: responsive form, Pmdynaform.
*/
$a = new Criteria("workflow");
$a->addSelectColumn(DynaformPeer::DYN_VERSION);
$a->add(DynaformPeer::DYN_UID, "{dynaformUid}", Criteria::EQUAL);
$a = ProcessPeer::doSelectRS($a);
$a->setFetchmode(ResultSet::FETCHMODE_ASSOC);
$a->next();
$row = $a->getRow();
$swpmdynaform = isset($row) && $row["DYN_VERSION"] == 2;
if ($swpmdynaform) {
$pmdynaform = $_POST["form"];
}
$oForm = new Form("{processUid}" . "/" . "{dynaformUid}", PATH_DYNAFORM);
$oForm->validatePost();
ws_open();
$result = ws_newCase("{processUid}", "{taskUid}", convertFormToWSObjects($_POST["form"]));
if ($swpmdynaform) {
$result = ws_newCase("{processUid}", "{taskUid}", convertFormToWSObjects($pmdynaform));
} else {
$result = ws_newCase("{processUid}", "{taskUid}", convertFormToWSObjects($_POST["form"]));
}
if ($result->status_code == 0) {
$caseId = $result->caseId;

2
workflow/engine/templates/reportTables/mainLoad.php
View File

@@ -20,7 +20,7 @@ if(isset($_GET['gui'])) {
}
</style>
<body onresize="autoResizeScreen()" onload="autoResizeScreen()">
<iframe name="frameMain" id="frameMain" src ="../reportTables/mainInit?PRO_UID=<?php echo $gui?>" width="99%" height="200" frameborder="0">
<iframe name="frameMain" id="frameMain" src ="../reportTables/mainInit?PRO_UID=<?php echo $filter->xssFilterHard($gui)?>" width="99%" height="200" frameborder="0">
<p>Your browser does not support iframes.</p>
</iframe>
</body>

32
workflow/engine/templates/services/login_getStarted.html
View File

@@ -33,7 +33,7 @@
border-right: #fff 1px solid;
padding-right: 10px;
border-top: #fff 1px solid;
padding-top: 10px;
padding-top: 5px;
border-left: #fff 1px solid;
padding-left: 10px;
border-bottom: #fff 1px solid;
@@ -47,6 +47,16 @@
span.cLow {
color: #002c72;
}
span.cLow-min {
color: #002c72;
font-size: 13px;
line-height: 1.3em;
}
span.cLow-autor {
color: #002c72;
font-size: 15px;
line-height: 1.3em;
}
</style>
<!--[if IE]>
@@ -68,23 +78,23 @@
<a target="_blank" href="http://www.processmaker.com"><img src="/images/get_started.png" border="0" width="163" height="438"></a>
</td>
<td class="cell2" valign="top">
<p><span class="cLow">Welcome to ProcessMaker!</span></p>
<p><span class="cLow">To get started, log in using the following credentials. You can change them later:</span></p>
<p><b><span class="cLow">Welcome to ProcessMaker 3.</span></b></p>
<p style="text-align: justify;"><span class="cLow-min">This new version features a new process designer based upon the Business Process Management Notation 2 standard. It offers a new form designer with flexible layouts for desktops, tablets and cellphones and a new REST API to remotely access ProcessMaker.</span></p>
<p style="text-align: justify;"><span class="cLow-min">To get started, log in using the following credentials. You can change them later:</span></p>
<span class="cNeg">Username:</span><span class="cLow"> {name}</span><br>
<span class="cNeg">Password:</span><span class="cLow"> {pass}</span>
<p><span class="cLow">We suggest you follow our 7 easy videos to automate your workflow. You can see a demo of each step at&nbsp;<a target="_blank" href="http://www.processmaker.com/demos/">http://www.processmaker.com/demos/</a> </span></p>
<span class="cNeg">Password:</span><span class="cLow"> {pass}</span><br><br>
<p style="text-align: justify;"><span class="cLow-min">We suggest you follow our 7 easy videos to automate your workflow. You can see a demo of each step at <a target="_blank" href="http://www.processmaker.com/tutorials">http://www.processmaker.com/tutorials/</a></span></p>
<span class="cLow">Other Resources:</span><br/><br/>
<b><span class="cLow">Other Resources:</span></b><br/><br/>
<span class="cLow"><a target="_blank" href="http://wiki.processmaker.com">PM Wiki </a>- Manuals</span><br/>
<span class="cLow"><a target="_blank" href="http://forum.processmaker.com">PM Forum </a>- Ask Questions</span><br/>
<span class="cLow"><a target="_blank" href="http://forum.processmaker.com">PM Forum </a>- Ask Questions</span><br/><br/>
<p><span class="cLow">We hope you enjoy using ProcessMaker. For more information about our enterprise support and consulting services <a target="_blank" href="http://www.processmaker.com/contact-us">contact us.</a>
</span></p>
<p><span class="cLow">The ProcessMaker Team</span></p>
<p style="text-align: justify;"><span class="cLow-min">We hope you enjoy using ProcessMaker. For more information about our enterprise support and consulting services <a target="_blank" href="http://www.processmaker.com/contact-us">contact us.</a></span></p>
<p><b><span class="cLow-autor">The ProcessMaker Team</span></b></p>
<input type="checkbox" name="getStarted" id="getStarted" onclick="saveConfig();"><span class="cLow">Don't show me again</span>
<input type="checkbox" name="getStarted" id="getStarted" onclick="saveConfig();"><span class="cLow"> Don't show me again</span>
</td>
</tr>
</table>

16
workflow/engine/templates/strategicDashboard/dashboardList.js
View File

@@ -76,6 +76,8 @@ Ext.onReady(function() {
statusButton = new Ext.Action({
text: _('ID_STATUS'),
icon : '',
id : 'activator',
iconCls: 'silk-add',
handler: statusDashboard,
disabled: true
@@ -105,18 +107,18 @@ Ext.onReady(function() {
}
}
var activator = Ext.getCmp('activator');
if( record.data.DAS_STATUS == 1 ){
statusButton.setIconClass('icon-activate');
statusButton.setText( _('ID_DEACTIVATE') );
activator.setIcon('/images/deactivate.png');
activator.setText( _('ID_DEACTIVATE') );
editButton.enable();
deleteButton.enable();
//statusButton.enable();
} else {
statusButton.setIconClass('icon-deactivate');
statusButton.setText( _('ID_ACTIVATE') );
activator.setIcon('/images/activate.png');
activator.setText( _('ID_ACTIVATE') );
editButton.disable();
deleteButton.disable();
//statusButton.disable();
}
},
rowdeselect: function(sm, index, record){
@@ -237,7 +239,7 @@ Ext.onReady(function() {
viewConfig: {
forceFit:true
},
title : _('ID_DASHBOARD'),
title : _('ID_STRATEGIC_DASHBOARD'),
store: store,
cm: cmodel,
sm: smodel,

68
workflow/engine/templates/strategicDashboard/formDashboard.js
View File

@@ -79,13 +79,11 @@ Ext.onReady( function() {
items : [
{
id : 'DAS_TITLE',
fieldLabel : _('ID_DASHBOARD_TITLE')+ ' *',
fieldLabel : _('ID_DASHBOARD_TITLE'),
xtype : 'textfield',
anchor : '85%',
maxLength : 250,
maskRe : /([a-zA-Z0-9_'\s]+)$/,
regex : /([a-zA-Z0-9_'\s]+)$/,
regexText : _('ID_INVALID_VALUE', _('ID_DASHBOARD_TITLE')),
maskRe : /([a-zA-Z0-9\s]+)$/,
allowBlank : false
},
{
@@ -94,7 +92,7 @@ Ext.onReady( function() {
fieldLabel : _('ID_DESCRIPTION'),
labelSeparator : '',
anchor : '85%',
maskRe : /([a-zA-Z0-9_'\s]+)$/,
maskRe : /([a-zA-Z0-9\s]+)$/,
height : 50,
}
]
@@ -530,14 +528,13 @@ Ext.onReady( function() {
flag = true;
break;
case 'yes':
tabPanel.getItem(component.id).show();
flag = false;
var dasIndUid = Ext.getCmp('DAS_IND_UID_'+component.id).getValue();
if (typeof dasIndUid != 'undefined' && dasIndUid != '') {
removeIndicator(dasIndUid);
}
tabActivate.remove(component.id);
tabPanel.remove(component, true);
tabPanel.remove(component);
break;
}
},
@@ -674,6 +671,7 @@ Ext.onReady( function() {
]
});
ownerInfoGrid.store.load();
ownerInfoGrid.on("afterrender", function(component) {
component.getBottomToolbar().refresh.hideParent = true;
component.getBottomToolbar().refresh.hide();
@@ -700,7 +698,6 @@ Ext.onReady( function() {
}
dashboardOwnerFields.items.items[0].bindStore(dataUserGroup);
} );
storeUsers.on( 'load', function( store, records, options ) {
for (var i=0; i< store.data.length; i++) {
row = [];
@@ -754,13 +751,11 @@ var addTab = function (flag) {
hidden : true
},
{
fieldLabel : _('ID_INDICATOR_TITLE')+ ' *',
fieldLabel : _('ID_INDICATOR_TITLE'),
id : 'IND_TITLE_'+ indexTab,
xtype : 'textfield',
anchor : '85%',
maskRe : /([a-zA-Z0-9_'\s]+)$/,
regex : /([a-zA-Z0-9_'\s]+)$/,
regexText : _('ID_INVALID_VALUE', _('ID_INDICATOR_TITLE')),
maskRe : /([a-zA-Z0-9\s]+)$/,
maxLength : 250,
allowBlank : false
},
@@ -768,7 +763,7 @@ var addTab = function (flag) {
anchor : '85%',
editable : false,
id : 'IND_TYPE_'+ indexTab,
fieldLabel : _('ID_INDICATOR_TYPE')+ ' *',
fieldLabel : _('ID_INDICATOR_TYPE'),
displayField : 'CAT_LABEL_ID',
valueField : 'CAT_UID',
forceSelection : false,
@@ -787,7 +782,6 @@ var addTab = function (flag) {
var fields = ['DAS_IND_FIRST_FIGURE_'+index,'DAS_IND_FIRST_FREQUENCY_'+index,'DAS_IND_SECOND_FIGURE_'+index, 'DAS_IND_SECOND_FREQUENCY_'+index];
if (value == '1050') {
field = Ext.getCmp('IND_PROCESS_'+index);
field.setValue('0');
field.disable();
field.hide();
} else {
@@ -880,17 +874,18 @@ var addTab = function (flag) {
new Ext.form.ComboBox({
anchor : '85%',
editable : false,
fieldLabel : _('ID_PROCESS')+ ' *',
fieldLabel : _('ID_PROCESS'),
id : 'IND_PROCESS_'+ indexTab,
displayField : 'prj_name',
valueField : 'prj_uid',
forceSelection : true,
forceSelection : false,
emptyText : _('ID_EMPTY_PROCESSES'),
selectOnFocus : true,
hidden : true,
typeAhead : true,
autocomplete : true,
triggerAction : 'all',
value : '0',
store : storeProject
}),
new Ext.form.ComboBox({
@@ -1091,6 +1086,7 @@ var saveDashboard = function () {
},
data: JSON.stringify(data),
success: function (response) {
var jsonResp = Ext.util.JSON.decode(response.responseText);
saveAllDashboardOwner(DAS_UID);
saveAllIndicators(DAS_UID);
myMask.hide();
@@ -1113,25 +1109,11 @@ var saveAllIndicators = function (DAS_UID) {
tabPanel.getItem(tabActivate[tab]).show();
var fieldsTab = tabPanel.getItem(tabActivate[tab]).items.items[0].items.items[0].items.items;
if (fieldsTab[1].getValue().trim() == '') {
PMExt.warning(_('ID_DASHBOARD'), _('ID_INDICATOR_TITLE_REQUIRED', tabPanel.getItem(tabActivate[tab]).title));
fieldsTab[1].focus(true,10);
return false;
} else if (fieldsTab[2].getValue().trim() == '') {
PMExt.warning(_('ID_DASHBOARD'), _('ID_INDICATOR_TYPE_REQUIRED', tabPanel.getItem(tabActivate[tab]).title));
fieldsTab[2].focus(true,10);
return false;
} else if (fieldsTab[2].getValue() != '1050' && fieldsTab[4].getValue().trim() == '') {
PMExt.warning(_('ID_DASHBOARD'), _('ID_INDICATOR_PROCESS_REQUIRED', tabPanel.getItem(tabActivate[tab]).title));
fieldsTab[4].focus(true,10);
return false;
}
var goal = fieldsTab[3];
fieldsTab.push(goal.items.items[0]);
fieldsTab.push(goal.items.items[1]);
var data = [];
data = [];
data['DAS_UID'] = DAS_UID;
for (var index in fieldsTab) {
@@ -1140,12 +1122,12 @@ var saveAllIndicators = function (DAS_UID) {
continue;
}
var id = node.id;
id = node.id;
if (typeof id == 'undefined' || id.indexOf('fieldSet_') != -1 ) {
continue;
}
id = id.split('_');
var field = '';
field = '';
for (var part = 0; part<id.length-1; part++) {
if (part == 0) {
field = id[part];
@@ -1153,7 +1135,25 @@ var saveAllIndicators = function (DAS_UID) {
field = field+'_'+id[part];
}
}
var value = node.getValue();
value = node.getValue();
if (field == 'IND_TITLE' && value.trim() == '') {
PMExt.warning(_('ID_DASHBOARD'), _('ID_INDICATOR_TITLE_REQUIRED', tabPanel.getItem(tabActivate[tab]).title));
node.focus(true,10);
return false;
} else if (field == 'IND_TYPE' && value.trim() == '') {
PMExt.warning(_('ID_DASHBOARD'), _('ID_INDICATOR_TYPE_REQUIRED', tabPanel.getItem(tabActivate[tab]).title));
node.focus(true,10);
return false;
} else if (field == 'IND_GOAL' && value.trim() == '') {
PMExt.warning(_('ID_DASHBOARD'), _('ID_INDICATOR_GOAL_REQUIRED', tabPanel.getItem(tabActivate[tab]).title));
node.focus(true,10);
return false;
} else if (field == 'IND_PROCESS' && value.trim() == '') {
PMExt.warning(_('ID_DASHBOARD'), _('ID_INDICATOR_PROCESS_REQUIRED', tabPanel.getItem(tabActivate[tab]).title));
node.focus(true,10);
return false;
}
field = field == 'IND_TITLE' ? 'DAS_IND_TITLE' : field;
field = field == 'IND_TYPE' ? 'DAS_IND_TYPE' : field;

63
workflow/engine/templates/strategicDashboard/viewDashboard.html
View File

@@ -29,18 +29,21 @@
var urlProxy = '{$urlProxy}';
var pageUserId = '{$usrId}';
var token = '{$credentials.access_token}';
var moneyUnit = '{$unitCost}';
var G_STRING = [];
{foreach from=$translation key=index item=option}
G_STRING['{$index}'] = "{$option}";
{/foreach}
</script>
<!-- View Dashboard Files-->
<script type="text/javascript" src="/jscore/strategicDashboard/viewDashboardHelper.js"></script>
<script type="text/javascript" src="/jscore/strategicDashboard/viewDashboardModel.js"></script>
<script type="text/javascript" src="/jscore/strategicDashboard/viewDashboardPresenter.js"></script>
<script type="text/javascript" src="/jscore/strategicDashboard/viewDashboardView.js"></script>
<script type="text/template" class="specialIndicatorButtonTemplate">
<div class="col-lg-3 col-md-6 dashPro ind-button-selector"
id="indicatorButton-<%- indicator.id %>"
@@ -104,7 +107,7 @@
</div>
</div>
</div>
<div class="panel-footer text-center ind-title-selector" style="clear:both;">
<div class="panel-footer text-center ind-title-selector" style="clear:both; color:#606368;">
<%- indicator.title %>
</div>
</a>
@@ -157,11 +160,11 @@
<div class="text-center huge">
<div class="col-xs-3 vcenter">
<div class="green"><%- indicator.efficiencyIndexToShow %></div>
<div class="blue"><%- indicator.efficiencyIndexToShow %></div>
<div class="small grey sind-index-selector ellipsis"></div>
</div>
<div class="col-xs-3 vcenter" style="margin-right:40px">
<div class="red sind-cost-number-selector"><%- indicator.inefficiencyCostToShow %></div>
<div class="red sind-cost-number-selector">{$unitCost} <%- indicator.inefficiencyCostToShow %></div>
<div class="small grey sind-cost-selector ellipsis"></div>
</div>
<div class="col-xs-6" id="specialIndicatorGraph" style="width:540px;height:300px;"></div>
@@ -190,7 +193,7 @@
<div class="small grey detail-efficiency-selector ellipsis"></div>
</div>
<div class="col-xs-3 text-center ">
<div class="red detail-cost-number-selector"><%- detailData.inefficiencyCostToShow %></div>
<div class="red detail-cost-number-selector">{$unitCost}<%- detailData.inefficiencyCostToShow %></div>
<div class="small grey detail-cost-selector ellipsis"></div>
</div>
<div class="col-xs-1 text-right arrow"><i class="fa fa-chevron-right fa-fw"></i></div>
@@ -200,28 +203,56 @@
</div>
</script>
<script type="text/template" class="specialIndicatorSencondViewDetail">
<script type="text/template" class="specialIndicatorSecondViewDetailUei">
<div class="process-div well hideme detail-button-selector" data-gs-no-resize="true"
id="detailData-<%- detailData.uid %>"
data-indicator-id="<%- detailData.indicatorId %>"
data-detail-id="<%- detailData.uid %>">
<div class="panel-heading greenbg">
<div class="col-xs-12 text-center detail-title-selector"><i class="fa fa-tasks fa-fw"></i> <span id="usrName"><%- detailData.name %></span> </div>
<div class="col-xs-12 text-center detail-title-selector">
<i class="fa fa-tasks fa-fw"></i>
<span id="usrName"><%- detailData.name %> </span>
<span>(<%- detailData.rankToShow %>)</span>
</div>
<div class="clearfix"></div>
</div>
<div class="text-center huge">
<div class="col-xs-12 vcenter-task">
<div class="col-xs-4 ">
<div class="col-xs-6 ">
<div class="blue small"><%- detailData.efficiencyIndexToShow%></div>
<div class="smallB grey detail-efficiency-selector ellipsis"></div>
</div>
<div class="col-xs-4 ">
<div class="small detail-cost-number-selector"><%- detailData.inefficiencyCostToShow%></div>
<div class="col-xs-6 ">
<div class="small detail-cost-number-selector">{$unitCost}<%- detailData.inefficiencyCostToShow%></div>
<div class="smallB grey detail-cost-selector ellipsis"></div>
</div>
<div class="col-xs-4 ">
<div class="blue small"><%- detailData.deviationTimeToShow%></div>
<div class="smallB grey detail-sdv-selector ellipsis">SDV</div>
</div>
<div class="clearfix"></div>
</div>
</div>
</script>
<script type="text/template" class="specialIndicatorSecondViewDetailPei">
<div class="process-div well hideme detail-button-selector" data-gs-no-resize="true"
id="detailData-<%- detailData.uid %>"
data-indicator-id="<%- detailData.indicatorId %>"
data-detail-id="<%- detailData.uid %>">
<div class="panel-heading greenbg">
<div class="col-xs-12 text-center detail-title-selector">
<i class="fa fa-tasks fa-fw"></i>
<span id="usrName"><%- detailData.name %> </span>
</div>
<div class="clearfix"></div>
</div>
<div class="text-center huge">
<div class="col-xs-12 vcenter-task">
<div class="col-xs-6 ">
<div class="blue small"><%- detailData.efficiencyIndexToShow%></div>
<div class="smallB grey detail-efficiency-selector ellipsis"></div>
</div>
<div class="col-xs-6 ">
<div class="small detail-cost-number-selector">{$unitCost}<%- detailData.inefficiencyCostToShow%></div>
<div class="smallB grey detail-cost-selector ellipsis"></div>
</div>
</div>
<div class="clearfix"></div>
@@ -312,8 +343,9 @@
</head>
<body id="page-top" class="index">
<img id="scrollImg" class="floating" src="/images/scrolldown.gif" width="80" height="80" style="border-radius:85px;"/>
<img id="scrollImg" class="floating" src="/images/scrolldown.gif" width="80" height="80" style="border-radius:85px; visibility:hidden;"/>
<div id="wrapper">
<div id="page-wrapper">
<!--Cabezera-->
@@ -400,12 +432,12 @@
</div>
</div>
<div id="relatedLabel" style="clear:both;">
<div id="relatedLabel" style="clear:both; visibility:hidden;">
<div>
<center><h3></h3></center>
</div>
<div>
Sort by Cost: &nbsp; &nbsp;<a id="sortListButton" class="fa fa-chevron-up fa-1x" style="color:#000;" href="#"></a>
{translate label="ID_SORT_BY"} {translate label="ID_COSTS"} : &nbsp; <a id="sortListButton" class="fa fa-chevron-up fa-1x" style="color:#000;" href="#"></a>
</div>
</div>
@@ -418,7 +450,6 @@
</div>
</div>
</body>
</html>

16
workflow/engine/templates/strategicDashboard/viewDashboardIE.html
View File

@@ -343,7 +343,7 @@
<div class="title-process" style="margin-top:50px; width:500px; clear:both; border:1px solid #999; margin:0 auto; padding:15px;">
This is just a basic view of your indexes. For better compatibility with Internet Explorer, a new tab with the KPIs has been opened. Please select this new tab on the tab list above to see all our KPIs functionality.
</div>
<!--Cabezera-->
<!--[>Cabezera<]
<div class="row" style="visibility:hidden;">
<div class="col-lg-12">
<div class="panel panel-default">
@@ -401,7 +401,7 @@
<div class="well">
<p class="text-center">{translate label="ID_DASH_CLICK_TO_VIEW"}</p>
<p>
<!-- Split button -->
[> Split button <]
<div id="dashboardsList">
</div>
</p>
@@ -411,19 +411,19 @@
</div>
</div>
</div>
<!-- /.col-lg-12 -->
[> /.col-lg-12 <]
</div>
<!-- Indicators -->
[> Indicators <]
<div class="row">
<div class="indicators">
<div id="indicatorsGridStack" class="grid-stack" data-gs-width="12" data-gs-animate="no" >
<!--Here are added dynamically the Indicators-->
[>Here are added dynamically the Indicators<]
</div>
</div>
<!-- Details by Indicator -->
[> Details by Indicator <]
<div class="col-lg-12 col-md-12 bottom">
<div id="indicatorsDataGridStack" class="grid-stack" data-gs-width="12" data-gs-animate="no" >
<!--Here are added dynamically the Dat by indicator-->
[>Here are added dynamically the Dat by indicator<]
</div>
</div>
@@ -441,7 +441,7 @@
data-gs-animate="no" style="clear:both;">
</div>
</div>
</div>
</div>-->
</div>
</div>

4
workflow/public_html/bootstrap.php
View File

@@ -342,7 +342,7 @@
}
else {
if(SYS_TARGET=="dbInfo"){ //Show dbInfo when no SYS_SYS
$pathFile = PATH_METHODS . "login/dbInfo.php";
$pathFile = PATH_METHODS . 'login/dbInfo.php';
$pathFile = $filter->validateInput($pathFile,'path');
require_once($pathFile);
}
@@ -361,7 +361,7 @@
}
}
else { // classic sysLogin interface
$pathFile = PATH_METHODS . "login/sysLogin.php";
$pathFile = PATH_METHODS . 'login/sysLogin.php';
$pathFile = $filter->validateInput($pathFile,'path');
require_once($pathFile) ;
die();

3
workflow/public_html/css/general.css
View File

@@ -39,8 +39,7 @@
.status-indicator-low,
.status-indicator-medium,
.status-indicator-high {
padding:0px;
padding-top:30px;
padding:30px 0px 0px 0;
color:#444;
float:left;
}