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

Merge branch 'master' of bitbucket.org:marcoAntonioNina/processmaker into dashboards2

Browse Source
This commit is contained in:
Marco Antonio Nina Mena
2015-04-20 14:46:33 -04:00
parent 7c3def1b82 8b064277dd
commit 9257e9f7ba
33 changed files with 864 additions and 471 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
gulliver/system/class.publisher.php
View File

@@ -294,10 +294,10 @@ class Publisher
//This dynaform has show/hide field conditions
if (isset($_SESSION['CURRENT_DYN_UID']) && $_SESSION['CURRENT_DYN_UID'] != '') {
$ConditionalShowHideRoutines = $oFieldCondition->getConditionScript($_SESSION["CURRENT_DYN_UID"]); //lsl
$ConditionalShowHideRoutines = $oFieldCondition->getConditionScript($_SESSION["CURRENT_DYN_UID"]);
} else {
if (isset($_SESSION['CONDITION_DYN_UID']) && $_SESSION['CONDITION_DYN_UID'] != '') {
$ConditionalShowHideRoutines = $oFieldCondition->getConditionScript($_SESSION["CONDITION_DYN_UID"]); //lsl
$ConditionalShowHideRoutines = $oFieldCondition->getConditionScript($_SESSION["CONDITION_DYN_UID"]);
}
}
}
@@ -649,4 +649,3 @@ class Publisher
$G_TABLE = null;
}
}

30
workflow/engine/classes/class.indicatorsCalculator.php
View File

@@ -337,6 +337,36 @@ class indicatorsCalculator
return $retval;
}
public function ueiCostHistoric($employeeId, $initDate, $endDate, $periodicity)
{
if (!is_a($initDate, 'DateTime')) throw new InvalidArgumentException ('initDate parameter must be a DateTime object.', 0);
if (!is_a($endDate, 'DateTime')) throw new InvalidArgumentException ('endDate parameter must be a DateTime object.', 0);
$periodicitySelectFields = $this->periodicityFieldsForSelect($periodicity);
$periodicityGroup = $this->periodicityFieldsForGrouping($periodicity);
$initYear = $initDate->format("Y");
$initMonth = $initDate->format("m");
$initDay = $endDay = 1;
$endYear = $endDate->format("Y");
$endMonth = $endDate->format("m");
//$params[":initYear"] = $initYear;
//$params[":initMonth"] = $initMonth;
$params[":endYear"] = $endYear;
$params[":endMonth"] = $endMonth;
$sqlString = "SELECT $periodicitySelectFields " . $this->ueiCostFormula . " as EEC
FROM USR_REPORTING
WHERE
IF(`YEAR` = :endYear, `MONTH`, `YEAR`) <= IF (`YEAR` = :endYear, :endMonth, :endYear)"
. $periodicityGroup;
$retval = $this->pdoExecutor($sqlString, $params);
//$retval = $this->propelExecutor($sqlString);
return $retval;
}
public function generalIndicatorData($indicatorId, $initDate, $endDate, $periodicity) {
if (!is_a($initDate, 'DateTime')) throw new InvalidArgumentException ('initDate parameter must be a DateTime object.', 0);
if (!is_a($endDate, 'DateTime')) throw new InvalidArgumentException ('endDate parameter must be a DateTime object.', 0);

247
workflow/engine/classes/class.licensedFeatures.php
View File

@@ -27,6 +27,127 @@ class PMLicensedFeatures
{
private $featuresDetails = array ();
private $features = array ();
private $newFeatures = array(
0 => array(
"description" => "Enables de Actions By Email feature.",
"enabled" => false,
"id" => "actionsByEmail",
"latest_version" => "",
"log" => null,
"name" => "actionsByEmail",
"nick" => "actionsByEmail",
"progress" => 0,
"publisher" => "Colosa",
"release_type" => "localRegistry",
"status" => "ready",
"store" => "00000000000000000000000000010004",
"type" => "features",
"url" => "",
"version" => ""
),
1 => array(
"description" => "Enables de Batch Routing feature.",
"enabled" => false,
"id" => "pmConsolidatedCL",
"latest_version" => "",
"log" => null,
"name" => "pmConsolidatedCL",
"nick" => "pmConsolidatedCL",
"progress" => 0,
"publisher" => "Colosa",
"release_type" => "localRegistry",
"status" => "ready",
"store" => "00000000000000000000000000010005",
"type" => "features",
"url" => "",
"version" => ""
),
2 => array(
"description" => "Dashboard with improved charting graphics and optimized to show strategic information like Process Efficiency and User Efficiency indicators.",
"enabled" => false,
"id" => "strategicDashboards",
"latest_version" => "",
"log" => null,
"name" => "strategicDashboards",
"nick" => "Strategic Dashboards",
"progress" => 0,
"publisher" => "Colosa",
"release_type" => "localRegistry",
"status" => "ready",
"store" => "00000000000000000000000000010006",
"type" => "features",
"url" => "",
"version" => ""
),
3 => array(
"description" => "Enables the configuration of a second database connection in order to divide the database requests in read and write operations. This features is used with database clusters to improve the application performance.",
"enabled" => false,
"id" => "secondDatabaseConnection",
"latest_version" => "",
"log" => null,
"name" => "secondDatabaseConnection",
"nick" => "secondDatabaseConnection",
"progress" => 0,
"publisher" => "Colosa",
"release_type" => "localRegistry",
"status" => "ready",
"store" => "00000000000000000000000000010000",
"type" => "features",
"url" => "",
"version" => ""
),
4 => array(
"description" => "Registers every admin action in a log. The actions in administration settings options are registered in the log.",
"enabled" => false,
"id" => "auditLog",
"latest_version" => "",
"log" => null,
"name" => "auditLog",
"nick" => "auditLog",
"progress" => 0,
"publisher" => "Colosa",
"release_type" => "localRegistry",
"status" => "ready",
"store" => "00000000000000000000000000010001",
"type" => "features",
"url" => "",
"version" => ""
),
5 => array(
"description" => "A more secure option to store user passwords in ProcessMaker. The modern algorithm SHA-2 is used to store the passwords.",
"enabled" => false,
"id" => "secureUserPasswordHash",
"latest_version" => "",
"log" => null,
"name" => "secureUserPasswordHash",
"nick" => "secureUserPasswordHash",
"progress" => 0,
"publisher" => "Colosa",
"release_type" => "localRegistry",
"status" => "ready",
"store" => "00000000000000000000000000010002",
"type" => "features",
"url" => "",
"version" => ""
),
6 => array(
"description" => "This functionality enables the flexibility to send mails from different email servers or configurations.",
"enabled" => false,
"id" => "sendEmailFromDifferentEmailServers",
"latest_version" => "",
"log" => null,
"name" => "sendEmailFromDifferentEmailServers",
"nick" => "sendEmailFromDifferentEmailServers",
"progress" => 0,
"publisher" => "Colosa",
"release_type" => "localRegistry",
"status" => "ready",
"store" => "00000000000000000000000000010003",
"type" => "features",
"url" => "",
"version" => ""
)
);
private static $instancefeature = null;
@@ -87,6 +208,132 @@ class PMLicensedFeatures
$this->featuresDetails[$value[0]]->enabled = $enable;
return $enable;
}
public function addNewFeatures ($data)
{
$newFeaturesList = $this->newFeatures;
$newData = array();
$newFeaturesIds = array();
foreach($newFeaturesList as $val) {
$newFeaturesIds[] = $val['id'];
}
$criteria = new Criteria();
$criteria->addSelectColumn(AddonsManagerPeer::ADDON_ID);
$criteria->add(AddonsManagerPeer::ADDON_ID, $newFeaturesIds, Criteria::IN);
$criteria->add(AddonsManagerPeer::ADDON_TYPE, 'features');
$rs = AddonsManagerPeer::doSelectRS($criteria);
$rs->next();
$row = $rs->getRow();
if(sizeof($row)) {
while (is_array($row)) {
$ids[] = $row[0];
$rs->next();
$row = $rs->getRow();
}
$toUpdate = array_diff($newFeaturesIds,$ids);
if(sizeof($toUpdate)){
$newFeaturesListAux = array();
foreach($toUpdate as $index => $v) {
$newFeaturesListAux[] = $newFeaturesList[$index];
}
unset($newFeaturesList);
$newFeaturesList = array_values($newFeaturesListAux);
} else {
return $data;
}
}
foreach($newFeaturesList as $k => $newFeature){
$newData[] = array (
'db' => 'wf',
'table' => 'ADDONS_MANAGER',
'keys' =>
array (
0 => 'ADDON_ID',
),
'data' =>
array (
0 =>
array (
'field' => 'ADDON_DESCRIPTION',
'type' => 'text',
'value' => $newFeature['description'],
),
1 =>
array (
'field' => 'ADDON_ID',
'type' => 'text',
'value' => $newFeature['id'],
),
2 =>
array (
'field' => 'ADDON_NAME',
'type' => 'text',
'value' => $newFeature['name'],
),
3 =>
array (
'field' => 'ADDON_NICK',
'type' => 'text',
'value' => $newFeature['nick'],
),
4 =>
array (
'field' => 'ADDON_PUBLISHER',
'type' => 'text',
'value' => $newFeature['publisher'],
),
5 =>
array (
'field' => 'ADDON_RELEASE_TYPE',
'type' => 'text',
'value' => $newFeature['release_type'],
),
6 =>
array (
'field' => 'ADDON_STATUS',
'type' => 'text',
'value' => $newFeature['status'],
),
7 =>
array (
'field' => 'STORE_ID',
'type' => 'text',
'value' => $newFeature['store'],
),
8 =>
array (
'field' => 'ADDON_TYPE',
'type' => 'text',
'value' => $newFeature['type'],
),
9 =>
array (
'field' => 'ADDON_DOWNLOAD_URL',
'type' => 'text',
'value' => $newFeature['url'],
),
10 =>
array (
'field' => 'ADDON_VERSION',
'type' => 'text',
'value' => $newFeature['version'],
),
11 =>
array (
'field' => 'ADDON_DOWNLOAD_PROGRESS',
'type' => 'text',
'value' => $newFeature['progress'],
)
),
'action' => 1,
);
$i++;
}
return array_merge($data, $newData);
}
/*----------------------------------********---------------------------------*/
}

3
workflow/engine/classes/class.plugin.php
View File

@@ -44,6 +44,9 @@ define('PM_GET_CASES_AJAX_LISTENER', 1015);
define('PM_BEFORE_CREATE_USER', 1016);
define('PM_AFTER_LOGIN', 1017);
define('PM_HASH_PASSWORD', 1018);
define('PM_SCHEDULER_CREATE_CASE_BEFORE', 1019);
define('PM_SCHEDULER_CREATE_CASE_AFTER', 1020);
/**
* @package workflow.engine.classes

112
workflow/engine/classes/class.pmDynaform.php
View File

@@ -3,7 +3,7 @@
/**
* class.pmDynaform.php
* Implementing pmDynaform library in the running case.
*
*
* @author Roly Rudy Gutierrez Pinto
* @package engine.classes
*/
@@ -80,19 +80,37 @@ class pmDynaform
public function jsonr(&$json)
{
foreach ($json as $key => $value) {
foreach ($json as $key => &$value) {
$sw1 = is_array($value);
$sw2 = is_object($value);
if ($sw1 || $sw2) {
$this->jsonr($value);
}
if (!$sw1 && !$sw2) {
//property
//set properties from trigger
$prefixs = array("@@", "@#", "@%", "@?", "@$", "@=");
if (is_string($value) && in_array(substr($value, 0, 2), $prefixs)) {
$triggerValue = substr($value, 2);
if (isset($this->fields["APP_DATA"][$triggerValue])) {
$json->$key = $this->fields["APP_DATA"][$triggerValue];
$json->{$key} = $this->fields["APP_DATA"][$triggerValue];
}
}
//set properties from 'formInstance' variable
if (isset($this->fields["APP_DATA"]["formInstance"])) {
$formInstance = $this->fields["APP_DATA"]["formInstance"];
if (!is_array($formInstance)) {
$formInstance = array($formInstance);
}
$nfi = count($formInstance);
for ($ifi = 0; $ifi < $nfi; $ifi++) {
$fi = $formInstance[$ifi];
if (is_object($fi) && isset($fi->id) && $key === "id" && $json->{$key} === $fi->id) {
foreach ($fi as $keyfi => $valuefi) {
if (isset($json->{$keyfi})) {
$json->{$keyfi} = $valuefi;
}
}
}
}
}
//query & options
@@ -136,11 +154,17 @@ class pmDynaform
array_push($json->options, $option);
}
} catch (Exception $e) {
}
}
if (isset($json->options[0])) {
$json->data = $json->options[0];
$no = count($json->options);
for ($io = 0; $io < $no; $io++) {
if ($json->options[$io]["value"] === $json->defaultValue) {
$json->data = $json->options[$io];
}
}
}
}
//data
@@ -187,7 +211,7 @@ class pmDynaform
if ($column->type === "text" || $column->type === "textarea" || $column->type === "dropdown" || $column->type === "datetime" || $column->type === "checkbox" || $column->type === "file" || $column->type === "link") {
array_push($cells, array(
"value" => isset($row[$column->name]) ? $row[$column->name] : "",
"label" => isset($row[$column->name . "_label"]) ? $row[$column->name . "_label"] : ""
"label" => isset($row[$column->name . "_label"]) ? $row[$column->name . "_label"] : (isset($row[$column->name]) ? $row[$column->name] : "")
));
}
if ($column->type === "suggest") {
@@ -208,11 +232,15 @@ class pmDynaform
$this->lang = $json->language;
}
if ($this->langs !== null) {
if (($key === "label" || $key === "hint" || $key === "placeholder" || $key === "validateMessage" || $key === "alternateText" || $key === "comment" || $key === "alt") && isset($json->{$key}) && isset($this->langs->{$this->lang})) {
if (($key === "label" || $key === "title" || $key === "hint" || $key === "placeholder" || $key === "validateMessage" || $key === "alternateText" || $key === "comment" || $key === "alt") && isset($this->langs->{$this->lang})) {
$langs = $this->langs->{$this->lang}->Labels;
foreach ($langs as $langsValue) {
if ($json->{$key} === $langsValue->msgid)
if (is_object($json) && $json->{$key} === $langsValue->msgid) {
$json->{$key} = $langsValue->msgstr;
}
if (is_array($json) && $json[$key] === $langsValue->msgid) {
$json[$key] = $langsValue->msgstr;
}
}
}
}
@@ -225,6 +253,72 @@ class pmDynaform
return $this->record != null && $this->record["DYN_VERSION"] == 2 ? true : false;
}
public function printViewWithoutSubmit()
{
ob_clean();
$json = G::json_decode($this->record["DYN_CONTENT"]);
foreach ($json->items[0]->items as $key => $value) {
switch ($json->items[0]->items[$key][0]->type) {
case "submit":
unset($json->items[0]->items[$key]);
break;
}
}
$this->jsonr($json);
$javascript = "
<script type=\"text/javascript\">
var jsondata = " . G::json_encode($json) . ";
var pm_run_outside_main_app = \"\";
var dyn_uid = \"" . $this->fields["CURRENT_DYNAFORM"] . "\";
var __DynaformName__ = \"" . $this->record["PRO_UID"] . "_" . $this->record["DYN_UID"] . "\";
var app_uid = \"" . $this->fields["APP_UID"] . "\";
var prj_uid = \"" . $this->fields["PRO_UID"] . "\";
var step_mode = \"\";
var workspace = \"" . SYS_SYS . "\";
var credentials = " . G::json_encode($this->credentials) . ";
var filePost = \"\";
var fieldsRequired = null;
var triggerDebug = false;
$(window).load(function ()
{
var data = jsondata;
data.items[0].mode = \"disabled\";
window.project = new PMDynaform.core.Project({
data: data,
keys: {
server: location.host,
projectId: prj_uid,
workspace: workspace
},
token: credentials,
submitRest: false
});
$(document).find(\"form\").submit(function (e) {
e.preventDefault();
return false;
});
});
</script>
<div style=\"margin: 10px 20px 10px 0;\">
<div style=\"float: right\"><a href=\"javascript: window.history.go(-1);\" style=\"text-decoration: none;\">&lt; " . G::LoadTranslation("ID_BACK") . "</a></div>
<div style=\"clear: both\"></div>
</div>
";
$file = file_get_contents(PATH_HOME . "public_html" . PATH_SEP . "lib" . PATH_SEP . "pmdynaform" . PATH_SEP . "build" . PATH_SEP . "pmdynaform.html");
$file = str_replace("{javascript}", $javascript, $file);
echo $file;
exit(0);
}
public function printView()
{
ob_clean();
@@ -409,6 +503,8 @@ class pmDynaform
$json->name = $newVariable["VAR_NAME"];
if (isset($json->dbConnection) && $json->dbConnection === $oldVariable["VAR_DBCONNECTION"])
$json->dbConnection = $newVariable["VAR_DBCONNECTION"];
if (isset($json->dbConnectionLabel) && $json->dbConnectionLabel === $oldVariable["VAR_DBCONNECTION_LABEL"])
$json->dbConnectionLabel = $newVariable["VAR_DBCONNECTION_LABEL"];
if (isset($json->sql) && $json->sql === $oldVariable["VAR_SQL"])
$json->sql = $newVariable["VAR_SQL"];
if (isset($json->options) && G::json_encode($json->options) === $oldVariable["VAR_ACCEPTED_VALUES"]) {

5
workflow/engine/classes/class.processMap.php
View File

@@ -1588,8 +1588,9 @@ class processMap
$numRows = DynaformPeer::doCount($oCriteria);
if ($numRows == 0) {
echo "<div style=\"margin:1em;\"><strong>".G::LoadTranslation('ID_ALERT')."</strong><br />".G::LoadTranslation('ID_CONSOLIDATED_DYNAFORM_REQUIRED')."</div>";
die;
$aFields['TITLE_ALERT'] = G::LoadTranslation('ID_ALERT');
$aFields['SUBTITLE_MESSAGE'] = G::LoadTranslation('ID_CONSOLIDATED_DYNAFORM_REQUIRED');
$sFilename = 'tasks/tasks_Consolidated_Error.xml';
}
}

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

@@ -919,6 +919,10 @@ class workspaceTools
if (file_exists(PATH_CORE . 'data' . PATH_SEP . 'check.data')) {
$checkData = unserialize(file_get_contents(PATH_CORE . 'data' . PATH_SEP . 'check.data'));
if (is_array($checkData)) {
/*----------------------------------********---------------------------------*/
$licensedFeatures = & PMLicensedFeatures::getSingleton();
$checkData = $licensedFeatures->addNewFeatures($checkData);
/*----------------------------------********---------------------------------*/
foreach ($checkData as $checkThis) {
$this->updateThisRegistry($checkThis);
}

20
workflow/engine/classes/model/CaseScheduler.php
View File

@@ -342,6 +342,7 @@ class CaseScheduler extends BaseCaseScheduler
@file_put_contents( PATH_DATA . "cron", serialize( $arrayCron ) );
}
$sSchedulerUid = $aRow['SCH_UID'];
$sOption = $aRow['SCH_OPTION'];
switch ($sOption) {
@@ -445,13 +446,23 @@ class CaseScheduler extends BaseCaseScheduler
$paramsLogResult = $paramsLogResultFromPlugin['paramsLogResult'];
$paramsRouteLogResult = $paramsLogResultFromPlugin['paramsRouteLogResult'];
} else {
eprint( " - Creating the new case............." );
$paramsAux = $params;
$paramsAux["executeTriggers"] = 1;
$oPluginRegistry = &PMPluginRegistry::getSingleton();
if ($oPluginRegistry->existsTrigger ( PM_SCHEDULER_CREATE_CASE_BEFORE )) {
$oPluginRegistry->executeTriggers(PM_SCHEDULER_CREATE_CASE_BEFORE, $paramsAux);
}
$result = $client->__SoapCall("NewCase", array($paramsAux));
if ($oPluginRegistry->existsTrigger ( PM_SCHEDULER_CREATE_CASE_AFTER )) {
$oPluginRegistry->executeTriggers(PM_SCHEDULER_CREATE_CASE_AFTER, $result);
}
if ($result->status_code == 0) {
eprintln( "OK+ CASE #{$result->caseNumber} was created!", 'green' );
@@ -568,8 +579,17 @@ class CaseScheduler extends BaseCaseScheduler
$paramsAux = $params;
$paramsAux["executeTriggers"] = 1;
$oPluginRegistry = &PMPluginRegistry::getSingleton();
if ($oPluginRegistry->existsTrigger ( PM_SCHEDULER_CREATE_CASE_BEFORE )) {
$oPluginRegistry->executeTriggers(PM_SCHEDULER_CREATE_CASE_BEFORE, $paramsAux);
}
$result = $client->__SoapCall("NewCase", array($paramsAux));
if ($oPluginRegistry->existsTrigger ( PM_SCHEDULER_CREATE_CASE_AFTER )) {
$oPluginRegistry->executeTriggers(PM_SCHEDULER_CREATE_CASE_AFTER, $result);
}
eprint( " - Creating the new case............." );
if ($result->status_code == 0) {
eprintln( "OK+ CASE #{$result->caseNumber} was created!", 'green' );

2
workflow/engine/content/languages/translation.en
View File

File diff suppressed because one or more lines are too long

36
workflow/engine/content/translations/english/processmaker.en.po
View File

@@ -2,7 +2,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ProcessMaker 3.0\n"
"POT-Creation-Date: \n"
"PO-Revision-Date: 2015-04-07 17:56:03\n"
"PO-Revision-Date: 2015-04-20 14:19:11\n"
"Last-Translator: \n"
"Language-Team: Colosa Developers Team <developers@colosa.com>\n"
"MIME-Version: 1.0\n"
@@ -5140,8 +5140,8 @@ msgstr "Detach"
# TRANSLATION
# LABEL/ID_PRO_USER
#: LABEL/ID_PRO_USER
msgid "User Owner"
msgstr "User Owner"
msgid "Assigned users"
msgstr "Assigned users"
# TRANSLATION
# LABEL/ID_SYSTEM
@@ -12838,8 +12838,8 @@ msgstr "the process uid is not defined!"
# TRANSLATION
# LABEL/ID_MYSQL_SUCCESS_CONNECT
#: LABEL/ID_MYSQL_SUCCESS_CONNECT
msgid "Succesfully connected to MySQL Server"
msgstr "Succesfully connected to MySQL Server"
msgid "Successfully connected to MySQL Server"
msgstr "Successfully connected to MySQL Server"
# TRANSLATION
# LABEL/ID_PROCESSMAKER_INSTALLATION
@@ -12850,8 +12850,8 @@ msgstr "ProcessMaker Installation"
# TRANSLATION
# LABEL/ID_MSSQL_SUCCESS_CONNECT
#: LABEL/ID_MSSQL_SUCCESS_CONNECT
msgid "Succesfully connected to MSSQL Server"
msgstr "Succesfully connected to MSSQL Server"
msgid "Successfully connected to MSSQL Server"
msgstr "Successfully connected to MSSQL Server"
# TRANSLATION
# LABEL/ID_CONNECTION_ERROR_SECURITYADMIN
@@ -16360,8 +16360,8 @@ msgstr "The filename is required."
# TRANSLATION
# LABEL/ID_VARIABLE_IN_USE
#: LABEL/ID_VARIABLE_IN_USE
msgid "The variable with var_uid: {0} is being used by dynaform with dyn_uid: {1}"
msgstr "The variable with var_uid: {0} is being used by dynaform with dyn_uid: {1}"
msgid "This variable can not be deleted because it is being used in DynaForm : {0}. To delete it, first remove it from the DynaForm."
msgstr "This variable can not be deleted because it is being used in DynaForm : {0}. To delete it, first remove it from the DynaForm."
# TRANSLATION
# LABEL/ID_ROUTE_IS_SECJOIN
@@ -17704,8 +17704,8 @@ msgstr "Email Servers"
# TRANSLATION
# LABEL/ID_EMAIL_SERVER_THIS_CONFIGURATION_IS_DEFAULT
#: LABEL/ID_EMAIL_SERVER_THIS_CONFIGURATION_IS_DEFAULT
msgid "Set that this configuration is the default"
msgstr "Set that this configuration is the default"
msgid "Set as default configuration"
msgstr "Set as default configuration"
# TRANSLATION
# LABEL/ID_EMAIL_SERVER_TESTING
@@ -18472,8 +18472,8 @@ msgstr "Inefficience Cost By User"
# TRANSLATION
# LABEL/ID_OVER_DUE
#: LABEL/ID_OVER_DUE
msgid "% Overdue"
msgstr "% Overdue"
msgid "[LABEL/ID_OVER_DUE] Status"
msgstr "Status"
# TRANSLATION
# LABEL/ID_NEW_CASES
@@ -18652,8 +18652,8 @@ msgstr "The user: {0} is other department manager."
# TRANSLATION
# LABEL/ID_STRATEGIC_DASHBOARD
#: LABEL/ID_STRATEGIC_DASHBOARD
msgid "KPI"
msgstr "KPI"
msgid "KPIs"
msgstr "KPIs"
# TRANSLATION
# LABEL/ID_MANAGERS_DASHBOARDS
@@ -18775,6 +18775,12 @@ msgstr "Untitled task"
msgid "(Goal value)"
msgstr "(Goal value)"
# TRANSLATION
# LABEL/ID_PLEASE_ENTER_CREDENTIALS
#: LABEL/ID_PLEASE_ENTER_CREDENTIALS
msgid "Please enter your credentials below"
msgstr "Please enter your credentials below"
# additionalTables/additionalTablesData.xml?ADD_TAB_NAME
# additionalTables/additionalTablesData.xml
#: text - ADD_TAB_NAME

20
workflow/engine/data/mssql/insert.sql
View File

@@ -3118,7 +3118,7 @@ SELECT 'LABEL','ID_OPEN_IN_:POPUP','en','Open in a popup','2014-01-15'
UNION ALL
SELECT 'LABEL','ID_DEATACH','en','Detach','2014-01-15'
UNION ALL
SELECT 'LABEL','ID_PRO_USER','en','User Owner','2014-01-15'
SELECT 'LABEL','ID_PRO_USER','en','Assigned users','2014-01-15'
UNION ALL
SELECT 'LABEL','ID_SYSTEM','en','System','2014-01-15'
UNION ALL
@@ -5716,11 +5716,11 @@ SELECT 'LABEL','ID_AGREE','en','I agree','2014-01-15'
UNION ALL
SELECT 'LABEL','ID_PROCESS_UID_NOT_DEFINED','en','the process uid is not defined!','2014-01-15'
UNION ALL
SELECT 'LABEL','ID_MYSQL_SUCCESS_CONNECT','en','Succesfully connected to MySQL Server','2014-01-15'
SELECT 'LABEL','ID_MYSQL_SUCCESS_CONNECT','en','Successfully connected to MySQL Server','2015-04-08'
UNION ALL
SELECT 'LABEL','ID_PROCESSMAKER_INSTALLATION','en','ProcessMaker Installation','2014-01-15'
UNION ALL
SELECT 'LABEL','ID_MSSQL_SUCCESS_CONNECT','en','Succesfully connected to MSSQL Server','2014-01-15'
SELECT 'LABEL','ID_MSSQL_SUCCESS_CONNECT','en','Successfully connected to MSSQL Server','2015-04-08'
UNION ALL
SELECT 'LABEL','ID_CONNECTION_ERROR_SECURITYADMIN','en','Connection Error: User "{0}" can''t create databases and Users <br>Please provide an user with sysadmin role or dbcreator and securityadmin roles.','2014-01-15'
UNION ALL
@@ -5858,7 +5858,7 @@ SELECT 'LABEL','ID_PROCESSMAKER_REQUIREMENTS_DESCRIPTION_STEP2_1','en','These se
UNION ALL
SELECT 'LABEL','ID_PROCESSMAKER_REQUIREMENTS_DESCRIPTION_STEP1_2','en','Failure to do so could lead your ProcessMaker installation not functioning correctly.','2015-01-16'
UNION ALL
SELECT 'LABEL','ID_PROCESSMAKER_REQUIREMENTS_DESCRIPTION_STEP1_1','en','If any of these items are not supported (marked as No), then please take actions to correct them.','2015-01-16'
SELECT 'LABEL','ID_PROCESSMAKER_REQUIREMENTS_DESCRIPTION_STEP1_1','en','If any of these items are not supported (marked as No), then please take actions to correct them.','2015-04-07'
UNION ALL
SELECT 'LABEL','ID_LDAP_OPTIONAL','en','LDAP is optional.','2014-01-15'
UNION ALL
@@ -6286,7 +6286,7 @@ SELECT 'LABEL','ID_CHECKING','en','Checking...','2014-01-15'
UNION ALL
SELECT 'LABEL','ID_CHECK_AGAIN','en','Check again','2014-01-15'
UNION ALL
SELECT 'LABEL','ID_PROCESSMAKER_REQUIREMENTS_DESCRIPTION','en','If any of these items are not supported (marked as No) then please take actions to correct them.<br />','2014-01-15'
SELECT 'LABEL','ID_PROCESSMAKER_REQUIREMENTS_DESCRIPTION','en','If any of these items are not supported (marked as No), then please take actions to correct them.<br />','2015-04-07'
UNION ALL
SELECT 'LABEL','ID_PROCESSMAKER_REQUIREMENTS_DESCRIPTION2','en','Failure to do so could lead your ProcessMaker installation not functioning correctly!<br />','2015-01-16'
UNION ALL
@@ -6906,7 +6906,7 @@ SELECT 'LABEL','ID_EXISTS_FILES','en','The file exists.','2014-07-17'
UNION ALL
SELECT 'LABEL','ID_FILENAME_REQUIRED','en','The filename is required.','2014-07-17'
UNION ALL
SELECT 'LABEL','ID_VARIABLE_IN_USE','en','The variable with var_uid: {0} is being used by dynaform with dyn_uid: {1}','2014-08-01'
SELECT 'LABEL','ID_VARIABLE_IN_USE','en','This variable can not be deleted because it is being used in DynaForm : {0}. To delete it, first remove it from the DynaForm.','2015-04-08'
UNION ALL
SELECT 'LABEL','ID_ROUTE_IS_SECJOIN','en','The route is of "SEC-JOIN" type.','2014-07-29'
UNION ALL
@@ -7358,7 +7358,7 @@ SELECT 'LABEL','ID_EMAIL_SERVER_RESULT_TESTING','en','Result Testing Email Serve
UNION ALL
SELECT 'LABEL','ID_EMAIL_SERVER_TITLE','en','Email Servers','2015-01-21'
UNION ALL
SELECT 'LABEL','ID_EMAIL_SERVER_THIS_CONFIGURATION_IS_DEFAULT','en','Set that this configuration is the default','2014-12-24'
SELECT 'LABEL','ID_EMAIL_SERVER_THIS_CONFIGURATION_IS_DEFAULT','en','Set as default configuration','2015-04-17'
UNION ALL
SELECT 'LABEL','ID_EMAIL_SERVER_TESTING','en','Testing Email Server','2014-12-24'
UNION ALL
@@ -7618,7 +7618,7 @@ SELECT 'LABEL','ID_EMPLYEE_EFFICIENCIE','en','Employee Efficience Index','2015-0
UNION ALL
SELECT 'LABEL','ID_USER_INEFFICIENCE','en','Inefficience Cost By User','2015-03-09'
UNION ALL
SELECT 'LABEL','ID_OVER_DUE','en','% Overdue','2015-04-01'
SELECT 'LABEL','ID_OVER_DUE','en','Status','2015-04-01'
UNION ALL
SELECT 'LABEL','ID_NEW_CASES','en','% New Cases','2015-04-06'
UNION ALL
@@ -7678,7 +7678,7 @@ SELECT 'LABEL','ID_CONSOLIDATED_DYNAFORM_REQUIRED','en','The process has no type
UNION ALL
SELECT 'LABEL','ID_DEPARTMENT_MANAGER_EXIST','en','The user: {0} is other department manager.','2015-03-24'
UNION ALL
SELECT 'LABEL','ID_STRATEGIC_DASHBOARD','en','KPI','2015-04-06'
SELECT 'LABEL','ID_STRATEGIC_DASHBOARD','en','KPIs','2015-04-06'
UNION ALL
SELECT 'LABEL','ID_MANAGERS_DASHBOARDS','en','Managers dashboard','2015-03-30'
UNION ALL
@@ -7721,6 +7721,8 @@ SELECT 'LABEL','ID_DIRECTION','en','Direction','2015-03-31'
SELECT 'LABEL','ID_UNTITLED_TASK','en','Untitled task','2015-04-01'
UNION ALL
SELECT 'LABEL','ID_GOAL_HELP','en','(Goal value)','2015-04-06'
UNION ALL
SELECT 'LABEL','ID_PLEASE_ENTER_CREDENTIALS','en','Please enter your credentials below','2015-04-09'
;
INSERT INTO ISO_LOCATION ([IC_UID],[IL_UID],[IL_NAME],[IL_NORMAL_NAME],[IS_UID])

30
workflow/engine/data/mysql/insert.sql Executable file → Normal file
View File

@@ -2264,7 +2264,7 @@ INSERT INTO TRANSLATION (TRN_CATEGORY,TRN_ID,TRN_LANG,TRN_VALUE,TRN_UPDATE_DATE
( 'JAVASCRIPT','ID_RSTDATAFIELD','en','Reset Data Field','2014-01-15') ,
( 'LABEL','ID_OPEN_IN_:POPUP','en','Open in a popup','2014-01-15') ,
( 'LABEL','ID_DEATACH','en','Detach','2014-01-15') ,
( 'LABEL','ID_PRO_USER','en','User Owner','2014-01-15') ,
( 'LABEL','ID_PRO_USER','en','Assigned users','2014-01-15') ,
( 'LABEL','ID_SYSTEM','en','System','2014-01-15') ,
( 'LABEL','ID_VARIABLES','en','Variables','2014-01-15') ,
( 'LABEL','ID_OPEN_CASE','en','Open Case','2014-01-15') ,
@@ -3579,9 +3579,9 @@ INSERT INTO TRANSLATION (TRN_CATEGORY,TRN_ID,TRN_LANG,TRN_VALUE,TRN_UPDATE_DATE
( 'LABEL','ID_NOT_HAVE_USERS','en','doesn''t have users.','2014-01-15') ,
( 'LABEL','ID_AGREE','en','I agree','2014-01-15') ,
( 'LABEL','ID_PROCESS_UID_NOT_DEFINED','en','the process uid is not defined!','2014-01-15') ,
( 'LABEL','ID_MYSQL_SUCCESS_CONNECT','en','Succesfully connected to MySQL Server','2014-01-15') ,
( 'LABEL','ID_MYSQL_SUCCESS_CONNECT','en','Successfully connected to MySQL Server','2015-04-08') ,
( 'LABEL','ID_PROCESSMAKER_INSTALLATION','en','ProcessMaker Installation','2014-01-15') ,
( 'LABEL','ID_MSSQL_SUCCESS_CONNECT','en','Succesfully connected to MSSQL Server','2014-01-15') ,
( 'LABEL','ID_MSSQL_SUCCESS_CONNECT','en','Successfully connected to MSSQL Server','2015-04-08') ,
( 'LABEL','ID_CONNECTION_ERROR_SECURITYADMIN','en','Connection Error: User "{0}" can''t create databases and Users <br>Please provide an user with sysadmin role or dbcreator and securityadmin roles.','2014-01-15') ,
( 'LABEL','ID_PHP_MSSQL_NOT_INSTALLED','en','php-mssql is Not Installed','2014-01-15') ,
( 'LABEL','ID_CONNECTION_ERROR_PRIVILEGE','en','Connection Error: User \"{0}\" can''t create databases and users. <br>Please, provide a user with SUPER privileges.','2015-01-16') ,
@@ -3651,7 +3651,7 @@ INSERT INTO TRANSLATION (TRN_CATEGORY,TRN_ID,TRN_LANG,TRN_VALUE,TRN_UPDATE_DATE
( 'LABEL','ID_PROCESSMAKER_REQUIREMENTS_DESCRIPTION_STEP2_2','en','However, ProcessMaker still operates if your settings do not match the recommended.','2015-01-16') ,
( 'LABEL','ID_PROCESSMAKER_REQUIREMENTS_DESCRIPTION_STEP2_1','en','These settings are recommended for PHP in order to ensure full compatibility with ProcessMaker.','2014-01-15') ,
( 'LABEL','ID_PROCESSMAKER_REQUIREMENTS_DESCRIPTION_STEP1_2','en','Failure to do so could lead your ProcessMaker installation not functioning correctly.','2015-01-16') ,
( 'LABEL','ID_PROCESSMAKER_REQUIREMENTS_DESCRIPTION_STEP1_1','en','If any of these items are not supported (marked as No), then please take actions to correct them.','2015-01-16') ,
( 'LABEL','ID_PROCESSMAKER_REQUIREMENTS_DESCRIPTION_STEP1_1','en','If any of these items are not supported (marked as No), then please take actions to correct them.','2015-04-07') ,
( 'LABEL','ID_LDAP_OPTIONAL','en','LDAP is optional.','2014-01-15') ,
( 'LABEL','ID_MSSQL_SUPPORT_OPTIONAL','en','MSSQL Support is optional.','2014-01-15') ,
( 'LABEL','ID_OPENSSL_OPTIONAL','en','OpenSSL is optional.','2014-01-15') ,
@@ -3868,7 +3868,7 @@ INSERT INTO TRANSLATION (TRN_CATEGORY,TRN_ID,TRN_LANG,TRN_VALUE,TRN_UPDATE_DATE
( 'LABEL','ID_PHP_INFO','en','PHP Information','2014-01-15') ,
( 'LABEL','ID_CHECKING','en','Checking...','2014-01-15') ,
( 'LABEL','ID_CHECK_AGAIN','en','Check again','2014-01-15') ,
( 'LABEL','ID_PROCESSMAKER_REQUIREMENTS_DESCRIPTION','en','If any of these items are not supported (marked as No) then please take actions to correct them.<br />','2014-01-15') ,
( 'LABEL','ID_PROCESSMAKER_REQUIREMENTS_DESCRIPTION','en','If any of these items are not supported (marked as No), then please take actions to correct them.<br />','2015-04-07') ,
( 'LABEL','ID_PROCESSMAKER_REQUIREMENTS_DESCRIPTION2','en','Failure to do so could lead your ProcessMaker installation not functioning correctly!<br />','2015-01-16') ,
( 'LABEL','ID_PROCESSMAKER_REQUIREMENTS_PHP','en','PHP Version >= 5.2.10','2014-01-15') ,
( 'LABEL','ID_PROCESSMAKER_REQUIREMENTS_MYSQL','en','MySQL Support','2014-01-15') ,
@@ -4182,7 +4182,7 @@ INSERT INTO TRANSLATION (TRN_CATEGORY,TRN_ID,TRN_LANG,TRN_VALUE,TRN_UPDATE_DATE
( 'LABEL','ID_OUTPUT_DOCUMENT_ITS_ASSIGNED','en','The Output Document with {0}: {1} it''s assigned in "{2}".','2014-07-01') ,
( 'LABEL','ID_EXISTS_FILES','en','The file exists.','2014-07-17') ,
( 'LABEL','ID_FILENAME_REQUIRED','en','The filename is required.','2014-07-17') ,
( 'LABEL','ID_VARIABLE_IN_USE','en','The variable with var_uid: {0} is being used by dynaform with dyn_uid: {1}','2014-08-01') ,
( 'LABEL','ID_VARIABLE_IN_USE','en','This variable can not be deleted because it is being used in DynaForm : {0}. To delete it, first remove it from the DynaForm.','2015-04-08') ,
( 'LABEL','ID_ROUTE_IS_SECJOIN','en','The route is of "SEC-JOIN" type.','2014-07-29') ,
( 'LABEL','ID_ROUTE_PARENT_DOES_NOT_EXIST_FOR_ROUTE_SECJOIN','en','The parent route does not exist for this route of "SEC-JOIN" type.','2014-07-29') ,
( 'LABEL','ID_GENERATE_BPMN_PROJECT','en','Generate BPMN Project','2014-07-24') ,
@@ -4410,7 +4410,7 @@ INSERT INTO TRANSLATION (TRN_CATEGORY,TRN_ID,TRN_LANG,TRN_VALUE,TRN_UPDATE_DATE
( 'LABEL','ID_EMAIL_SERVER_TITLE_TESTING','en','Testing Email Server','2014-12-24') ,
( 'LABEL','ID_EMAIL_SERVER_RESULT_TESTING','en','Result Testing Email Server','2014-12-24') ,
( 'LABEL','ID_EMAIL_SERVER_TITLE','en','Email Servers','2015-01-21') ,
( 'LABEL','ID_EMAIL_SERVER_THIS_CONFIGURATION_IS_DEFAULT','en','Set that this configuration is the default','2014-12-24') ,
( 'LABEL','ID_EMAIL_SERVER_THIS_CONFIGURATION_IS_DEFAULT','en','Set as default configuration','2015-04-17') ,
( 'LABEL','ID_EMAIL_SERVER_TESTING','en','Testing Email Server','2014-12-24') ,
( 'LABEL','ID_EMAIL_SERVER_CONFIRM_DELETE','en','Do you want to delete the Email Server?','2014-12-24') ,
( 'LABEL','ID_EMAIL_SERVER_PORT','en','Port','2014-12-24') ,
@@ -4572,7 +4572,7 @@ INSERT INTO TRANSLATION (TRN_CATEGORY,TRN_ID,TRN_LANG,TRN_VALUE,TRN_UPDATE_DATE
( 'LABEL','ID_CONSOLIDATED_CASE_LIST','en','Consolidated Case List','2015-03-24') ,
( 'LABEL','ID_CONSOLIDATED_DYNAFORM_REQUIRED','en','The process has no type template Dynaform grid, this Dynaform is required','2015-03-24') ,
( 'LABEL','ID_DEPARTMENT_MANAGER_EXIST','en','The user: {0} is other department manager.','2015-03-24') ,
( 'LABEL','ID_STRATEGIC_DASHBOARD','en','KPI','2015-04-06') ,
( 'LABEL','ID_STRATEGIC_DASHBOARD','en','KPIs','2015-04-06') ,
( 'LABEL','ID_MANAGERS_DASHBOARDS','en','Managers dashboard','2015-03-30') ,
( 'LABEL','ID_PRO_EFFICIENCY_INDEX','en','Process Efficiency Index','2015-03-30') ,
( 'LABEL','ID_EFFICIENCY_USER','en','User Efficiency','2015-03-30') ,
@@ -4594,7 +4594,8 @@ INSERT INTO TRANSLATION (TRN_CATEGORY,TRN_ID,TRN_LANG,TRN_VALUE,TRN_UPDATE_DATE
( 'LABEL','ID_DELETE_INDICATOR_SURE','en','Are you sure you want to delete this Indicator?','2015-03-31') ,
( 'LABEL','ID_DIRECTION','en','Direction','2015-03-31') ,
( 'LABEL','ID_UNTITLED_TASK','en','Untitled task','2015-04-01') ,
( 'LABEL','ID_GOAL_HELP','en','(Goal value)','2015-04-06') ;
( 'LABEL','ID_GOAL_HELP','en','(Goal value)','2015-04-06') ,
( 'LABEL','ID_PLEASE_ENTER_CREDENTIALS','en','Please enter your credentials below','2015-04-09') ;
INSERT INTO ISO_LOCATION (IC_UID,IL_UID,IL_NAME,IL_NORMAL_NAME,IS_UID) VALUES
('AD','','',' ','') ,
@@ -59976,4 +59977,13 @@ INSERT INTO CATALOG (CAT_UID, CAT_LABEL_ID, CAT_TYPE, CAT_FLAG, CAT_OBSERVATION,
('400','ID_YEAR','PERIODICITY','','','2015-03-04','2015-03-04'),
('1010','ID_PROCESS_EFFICIENCE','INDICATOR','','','2015-03-04','2015-03-04'),
('1030','ID_EMPLYEE_EFFICIENCIE','INDICATOR','','','2015-03-04','2015-03-04'),
('1050','ID_OVER_DUE','INDICATOR','%','Unit for displaying','2015-03-04','2015-03-04');
('1050','ID_OVER_DUE','INDICATOR','%','Unit for displaying','2015-03-04','2015-03-04'),
INSERT INTO ADDONS_MANAGER (ADDON_DESCRIPTION,ADDON_ID,ADDON_NAME,ADDON_NICK,ADDON_PUBLISHER,ADDON_RELEASE_TYPE,ADDON_STATUS,STORE_ID,ADDON_TYPE,ADDON_DOWNLOAD_URL,ADDON_VERSION,ADDON_DOWNLOAD_PROGRESS) VALUES
('Enables de Actions By Email feature.','actionsByEmail','actionsByEmail','actionsByEmail','Colosa','localRegistry','ready','00000000000000000000000000010004','features','','','0'),
('Enables de Batch Routing feature.','pmConsolidatedCL','pmConsolidatedCL','pmConsolidatedCL','Colosa','localRegistry','ready','00000000000000000000000000010005','features','','','0'),
('Dashboard with improved charting graphics and optimized to show strategic information like Process Efficiency and User Efficiency indicators.','strategicDashboards','strategicDashboards','Strategic Dashboards','Colosa','localRegistry','ready','00000000000000000000000000010006','features','','','0'),
('Enables the configuration of a second database connection in order to divide the database requests in read and write operations. This features is used with database clusters to improve the application performance.','secondDatabaseConnection','secondDatabaseConnection','secondDatabaseConnection','Colosa','localRegistry','ready','00000000000000000000000000010000','features','','','0'),
('A more secure option to store user passwords in ProcessMaker. The modern algorithm SHA-2 is used to store the passwords.','secureUserPasswordHash','secureUserPasswordHash','secureUserPasswordHash','Colosa','localRegistry','ready','00000000000000000000000000010002','features','','','0'),
('This functionality enables the flexibility to send mails from different email servers or configurations.','sendEmailFromDifferentEmailServers','sendEmailFromDifferentEmailServers','sendEmailFromDifferentEmailServers','Colosa','localRegistry','ready','00000000000000000000000000010003','features','','','0'),
('Registers every admin action in a log. The actions in administration settings options are registered in the log.','auditLog','auditLog','auditLog','Colosa','localRegistry','ready','00000000000000000000000000010001','features','','','0');

72
workflow/engine/js/strategicDashboard/viewDashboardModel.js
View File

@@ -2,8 +2,11 @@ var ViewDashboardModel = function (oauthToken, server, workspace) {
this.server = server;
this.workspace = workspace;
this.baseUrl = "/api/1.0/" + workspace + "/";
//this.baseUrl = "http://127.0.0.1:8080/api/1.0/workflow/";
this.oauthToken = oauthToken;
this.helper = new ViewDashboardHelper();
this.cache = [];
this.forceRemote=false; //if true, the next call will go to the remote server
};
ViewDashboardModel.prototype.userDashboards = function(userId) {
@@ -14,16 +17,16 @@ ViewDashboardModel.prototype.dashboardIndicators = function(dashboardId, initDat
return this.getJson('dashboard/' + dashboardId + '/indicator?dateIni=' + initDate + '&dateFin=' + endDate);
};
ViewDashboardModel.prototype.peiData = function(indicatorId, measureDate, compareDate) {
ViewDashboardModel.prototype.peiData = function(indicatorId, compareDate, measureDate) {
var endPoint = "ReportingIndicators/process-efficiency-data?" +
"indicator_uid=" + indicatorId +
"&measure_date=" + measureDate +
"&compare_date=" + compareDate +
"&measure_date=" + measureDate +
"&language=en";
return this.getJson(endPoint);
}
ViewDashboardModel.prototype.statusData = function(indicatorId, measureDate, compareDate) {
ViewDashboardModel.prototype.statusData = function() {
var endPoint = "ReportingIndicators/status-indicator";
return this.getJson(endPoint);
}
@@ -37,11 +40,11 @@ ViewDashboardModel.prototype.peiDetailData = function(process, initDate, endDate
return this.getJson(endPoint);
}
ViewDashboardModel.prototype.ueiData = function(indicatorId, measureDate, compareDate) {
ViewDashboardModel.prototype.ueiData = function(indicatorId, compareDate, measureDate ) {
var endPoint = "ReportingIndicators/employee-efficiency-data?" +
"indicator_uid=" + indicatorId +
"&measure_date=" + measureDate +
"&compare_date=" + compareDate +
"&measure_date=" + measureDate +
"&language=en";
return this.getJson(endPoint);
}
@@ -100,18 +103,34 @@ ViewDashboardModel.prototype.setPositionIndicator = function(data) {
ViewDashboardModel.prototype.getJson = function (endPoint) {
var that = this;
var callUrl = this.baseUrl + endPoint
return $.ajax({
url: callUrl,
type: 'GET',
datatype: 'json',
error: function(jqXHR, textStatus, errorThrown) {
throw new Error(callUrl + ' -- ' + errorThrown);
},
beforeSend: function (xhr) {
xhr.setRequestHeader('Authorization', 'Bearer ' + that.oauthToken);
//xhr.setRequestHeader('Access-Control-Allow-Origin', '*');
}
});
var requestFinished = $.Deferred();
var itemInCache = that.getCacheItem(endPoint);
if (itemInCache != null && !this.forceRemote) {
that.forceRemote = false;
requestFinished.resolve(itemInCache);
return requestFinished.promise();
}
else {
return $.ajax({
url: callUrl,
type: 'GET',
datatype: 'json',
success: function (data) {
that.forceRemote = false;
requestFinished.resolve(data);
that.putInCache(endPoint, data);
// return requestFinished.promise();
},
error: function(jqXHR, textStatus, errorThrown) {
throw new Error(callUrl + ' -- ' + errorThrown);
},
beforeSend: function (xhr) {
xhr.setRequestHeader('Authorization', 'Bearer ' + that.oauthToken);
//xhr.setRequestHeader('Access-Control-Allow-Origin', '*');
}
});
}
}
ViewDashboardModel.prototype.postJson = function (endPoint, data) {
@@ -154,3 +173,22 @@ ViewDashboardModel.prototype.putJson = function (endPoint, data) {
});
};
ViewDashboardModel.prototype.getCacheItem = function (endPoint) {
var retval = null;
$.each(this.cache, function(index, objectItem) {
if (objectItem.key == endPoint) {
retval = objectItem.value;
}
});
return retval;
}
ViewDashboardModel.prototype.putInCache = function (endPoint, data) {
var cacheItem = this.getCacheItem(endPoint);
if (cacheItem == null) {
this.cache.push ({ key: endPoint, value:data });
}
else {
cacheItem.value = data;
}
}

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

@@ -9,7 +9,7 @@ var ViewDashboardPresenter = function (model) {
ViewDashboardPresenter.prototype.getUserDashboards = function (userId) {
var that = this;
var requestFinished = $.Deferred();
this.model.userDashboards(userId)
that.model.userDashboards(userId)
.done(function(modelData){
var viewModel = that.userDashboardsViewModel(modelData)
requestFinished.resolve(viewModel);
@@ -159,7 +159,7 @@ ViewDashboardPresenter.prototype.peiViewModel = function(data) {
$.each(data.data, function(index, originalObject) {
var map = {
"name" : "datalabel",
"efficiencyIndex" : "value"
"inefficiencyCost" : "value"
};
var newObject = that.helper.merge(originalObject, {}, map);
var shortLabel = (newObject.datalabel == null)
@@ -168,18 +168,22 @@ ViewDashboardPresenter.prototype.peiViewModel = function(data) {
newObject.datalabel = shortLabel;
graphData.push(newObject);
originalObject.inefficiencyCostToShow = Math.round(originalObject.inefficiencyCost);
originalObject.inefficiencyCostToShow = "$ " + Math.round(originalObject.inefficiencyCost);
originalObject.efficiencyIndexToShow = Math.round(originalObject.efficiencyIndex * 100) / 100;
originalObject.indicatorId = data.id;
originalObject.json = JSON.stringify(originalObject);
});
var retval = {};
//TODO selecte de 7 worst cases no the first 7
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);
//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;
};
@@ -190,7 +194,7 @@ ViewDashboardPresenter.prototype.ueiViewModel = function(data) {
$.each(data.data, function(index, originalObject) {
var map = {
"name" : "datalabel",
"averageTime" : "value",
"inefficiencyCost" : "value",
"deviationTime" : "dispersion"
};
var newObject = that.helper.merge(originalObject, {}, map);
@@ -200,18 +204,22 @@ ViewDashboardPresenter.prototype.ueiViewModel = function(data) {
newObject.datalabel = shortLabel;
graphData.push(newObject);
originalObject.inefficiencyCostToShow = Math.round(originalObject.inefficiencyCost);
originalObject.inefficiencyCostToShow = "$ " + Math.round(originalObject.inefficiencyCost);
originalObject.efficiencyIndexToShow = Math.round(originalObject.efficiencyIndex * 100) / 100;
originalObject.indicatorId = data.id;
originalObject.json = JSON.stringify(originalObject);
});
var retval = {};
//TODO selecte de 7 worst cases no the first 7
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);
//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;
};
@@ -280,7 +288,9 @@ ViewDashboardPresenter.prototype.indicatorViewModel = function(data) {
ViewDashboardPresenter.prototype.getSpecialIndicatorSecondLevel = function (entityId, indicatorType, initDate, endDate) {
var that = this;
var requestFinished = $.Deferred();
//entityid is the process id or group id
//if modelData is passed (because it was cached on the view) no call is made to the server.
//and just a order is applied to the list
switch (indicatorType) {
case "1010":
this.model.peiDetailData(entityId, initDate, endDate)
@@ -307,6 +317,7 @@ ViewDashboardPresenter.prototype.returnIndicatorSecondLevelPei = function(modelD
//returns object {dataToDraw[], entityData[] //user/tasks data}
var that = this;
var graphData = [];
$.each(modelData, function(index, originalObject) {
var map = {
"name" : "datalabel",
@@ -315,7 +326,7 @@ ViewDashboardPresenter.prototype.returnIndicatorSecondLevelPei = function(modelD
};
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;
graphData.push(newObject);
});
@@ -330,6 +341,7 @@ ViewDashboardPresenter.prototype.returnIndicatorSecondLevelUei = function(modelD
//returns object {dataToDraw[], entityData[] //user/tasks data}
var that = this;
var graphData = [];
$.each(modelData, function(index, originalObject) {
var map = {
"name" : "datalabel",
@@ -338,7 +350,7 @@ ViewDashboardPresenter.prototype.returnIndicatorSecondLevelUei = function(modelD
};
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;
graphData.push(newObject);
});
@@ -349,11 +361,21 @@ ViewDashboardPresenter.prototype.returnIndicatorSecondLevelUei = function(modelD
};
/*-------SECOND LEVEL INDICATOR DATA*/
ViewDashboardPresenter.prototype.orderDataList = function(listData, orderDirection, orderFunction) {
//orderDirection is passed in case no order FUnction is passed (to use in the default ordering)
var orderToUse = orderFunction;
if (orderFunction == undefined) {
orderToUse = function (a ,b) {
var retval = 0;
if (orderDirection == "down") {
retval = ((a.inefficiencyCost*1.0 <= b.inefficiencyCost*1.0) ? 1 : -1);
}
else {
//the 1,-1 are flipped
retval = ((a.inefficiencyCost*1.0 <= b.inefficiencyCost*1.0) ? -1 : 1);
}
return retval;
}
}
return listData.sort(orderToUse);
}

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

@@ -80,6 +80,7 @@ WidgetBuilder.prototype.buildSpecialIndicatorFirstView = function (indicatorData
$retval.find('.breadcrumb').append ('<li><b>'+indicatorPrincipalData.title+'</b></li>')
$retval.find(".sind-index-selector").text(G_STRING.ID_EFFICIENCY_INDEX);
$retval.find(".sind-cost-selector").text(G_STRING.ID_INEFFICIENCY_COST);
this.setColorForInefficiency($retval.find(".sind-cost-number-selector"), indicatorData);
return $retval;
}
@@ -93,7 +94,8 @@ WidgetBuilder.prototype.buildSpecialIndicatorFirstViewDetail = function (oneItem
var template = _.template ($("script.specialIndicatorDetail").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_EFFICIENCY_COST);
$retval.find(".detail-cost-selector").text(G_STRING.ID_INEFFICIENCY_COST);
this.setColorForInefficiency($retval.find(".detail-cost-number-selector"), oneItemDetail);
return $retval;
}
@@ -136,6 +138,7 @@ WidgetBuilder.prototype.buildSpecialIndicatorSecondView = function (secondViewDa
$retval.find('.breadcrumb').find('li').remove();
$retval.find('.breadcrumb').append ('<li><a class="bread-back-selector" href="#"><i class="fa fa-chevron-left fa-fw"></i>' + window.currentIndicator.title + '</a></li>');
$retval.find('.breadcrumb').append ('<li><b>' + window.currentEntityData.name + '</b></li>');
this.setColorForInefficiency($retval.find(".sind-cost-number-selector"), window.currentEntityData);
return $retval;
};
@@ -145,10 +148,11 @@ WidgetBuilder.prototype.buildSpecialIndicatorSecondViewDetail = function (oneIte
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.ueiDetail").html());
var template = _.template ($("script.specialIndicatorSencondViewDetail").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_EFFICIENCY_COST);
$retval.find(".detail-cost-selector").text(G_STRING.ID_INEFFICIENCY_COST);
this.setColorForInefficiency($retval.find(".detail-cost-number-selector"), oneItemDetail);
return $retval;
}
@@ -172,6 +176,19 @@ WidgetBuilder.prototype.buildGeneralIndicatorFirstView = function (indicatorData
return $retval;
}
WidgetBuilder.prototype.setColorForInefficiency = function ($widget, indicatorData) {
//turn red/gree the font according if is positive or negative: var $widget = $retval.find(".sind-cost-number-selector");
$widget.removeClass("red");
$widget.removeClass("green");
if (indicatorData.inefficiencyCost >= 0) {
$widget.addClass("green");
}
else {
$widget.addClass("red");
}
}
/**********************************************************************/
helper = new ViewDashboardHelper();
var ws = urlProxy.split('/');
@@ -182,24 +199,37 @@ window.loadedIndicators = []; //updated in das-title-selector.click->fillIndicat
window.currentEntityData = null;
window.currentIndicator = null;//updated in ind-button-selector.click ->loadIndicator, ready->loadIndicator
window.currentDashboardId = null;
function hideScrollIfAllDivsAreVisible(){
if ($('.hideme').length <= 0) {
$('#scrollImg').hide();
}
else {
$('#scrollImg').show();
}
}
window.currentDetailFunction = null;
window.currentDetailList = null;
$(document).ready(function() {
$('#indicatorsGridStack').gridstack();
$('#indicatorsDataGridStack').gridstack();
$('#relatedDetailGridStack').gridstack();
$('#sortListButton').click(function() {
var btn = $(this);
if (btn.hasClass('fa-chevron-up')) {
btn.removeClass('fa-chevron-up');
btn.addClass('fa-chevron-down');
}
else {
btn.removeClass('fa-chevron-down');
btn.addClass('fa-chevron-up');
}
/* Show on scroll functionality... */
window.currentDetailFunction (presenter.orderDataList (
window.currentDetailList,
selectedOrderOfDetailList()));
//send scroll +1 and -1 to activate the show/hide event.
//both scrolls are sent cause if the scroll at the end
//scroll +1 has no effect but -1 yes
$(window).scrollTop($(window).scrollTop() + 1);
$(window).scrollTop($(window).scrollTop() - 1);
return false;
});
/* Show on scroll functionality */
$(window).scroll( function() {
/* Check the location of each desired element */
$('.hideme').each( function(i){
@@ -218,12 +248,12 @@ $(document).ready(function() {
$('#scrollImg').mouseover(function() {
isHover = true;
var interval = window.setInterval(function () {
var newPos = $(window).scrollTop() + 200;
var newPos = $(window).scrollTop() + 100;
$(window).scrollTop(newPos);
if (isHover == false) {
window.clearInterval(interval);
}
}, 100);
}, 200);
});
$('#scrollImg').mouseleave(function() {
@@ -282,6 +312,14 @@ $(document).ready(function() {
/*-------------------------------clicks----------------------------*/
$('body').on('click','.btn-compare', function() {
presenter.getDashboardIndicators(window.currentDashboardId, defaultInitDate(), defaultEndDate())
.done(function(indicatorsVM) {
fillIndicatorWidgets(indicatorsVM);
loadIndicator(getFavoriteIndicator().id, defaultInitDate(), defaultEndDate());
});
});
$('#dashboardsList').on('click','.das-title-selector', function() {
var dashboardId = $(this).parent().data('dashboard-id');
window.currentDashboardId = dashboardId;
@@ -311,7 +349,8 @@ $(document).ready(function() {
window.currentEntityData = {"entityId":$(this).data('detail-id'),
"indicatorId":$(this).data('indicator-id'),
"efficiencyIndexToShow":$(this).data('detail-index'),
"inefficiencyCostToShow":$(this).data('detail-cost'),
"inefficiencyCostToShow":$(this).data('detail-cost-to-show'),
"inefficiencyCost":$(this).data('detail-cost'),
"name":$(this).data('detail-name')
};
//TODO PASS REAL VALUES
@@ -319,12 +358,24 @@ $(document).ready(function() {
.done(function (viewModel) {
fillSpecialIndicatorSecondView(viewModel);
});
$('.breadcrum').find('ol').append('<li>lalal</li>');
});
initialDraw();
});
function initialDraw() {
var hideScrollIfAllDivsAreVisible = function(){
if ($('.hideme').length <= 0) {
$('#scrollImg').hide();
}
else {
$('#scrollImg').show();
}
}
var selectedOrderOfDetailList = function () {
return ($('#sortListButton').hasClass('fa-chevron-up') ? "up" : "down");
}
var initialDraw = function () {
presenter.getUserDashboards(pageUserId)
.then(function(dashboardsVM) {
fillDashboardsList(dashboardsVM);
@@ -337,7 +388,7 @@ function initialDraw() {
});
}
function loadIndicator(indicatorId, initDate, endDate) {
var loadIndicator = function (indicatorId, initDate, endDate) {
var builder = new WidgetBuilder();
window.currentIndicator = builder.getIndicatorLoadedById(indicatorId);
presenter.getIndicatorData(indicatorId, window.currentIndicator.type, initDate, endDate)
@@ -357,7 +408,7 @@ function loadIndicator(indicatorId, initDate, endDate) {
});
}
function setIndicatorActiveMarker () {
var setIndicatorActiveMarker = function () {
$('.panel-footer').each (function () {
$(this).removeClass('panel-active');
var indicatorId = $(this).parents('.ind-button-selector').data('indicator-id');
@@ -367,7 +418,7 @@ function setIndicatorActiveMarker () {
});
}
function getFavoriteIndicator() {
var getFavoriteIndicator = function() {
var retval = (window.loadedIndicators.length > 0)
? window.loadedIndicators[0]
: null;
@@ -381,21 +432,22 @@ function getFavoriteIndicator() {
return retval;
}
function defaultInitDate() {
var defaultInitDate = function() {
var date = new Date();
var dateMonth = date.getMonth();
var dateYear = date.getFullYear();
return "01-"+(dateMonth+1)+"-"+dateYear;
var initDate = $('#year').val() + '-' + $('#month').val() + '-' + '01';
return initDate;
}
function defaultEndDate() {
var defaultEndDate = function () {
var date = new Date();
var dateMonth = date.getMonth();
var dateYear = date.getFullYear();
return "30-"+(dateMonth)+"-"+dateYear;
return dateYear + "-" + (dateMonth + 1) + "-30";
}
function fillDashboardsList (presenterData) {
var fillDashboardsList = function (presenterData) {
if (presenterData == null || presenterData.length == 0) {
$('#dashboardsList').append(G_STRING['ID_NO_DATA_TO_DISPLAY']);
}
@@ -414,7 +466,7 @@ function fillDashboardsList (presenterData) {
};
function fillIndicatorWidgets (presenterData) {
var fillIndicatorWidgets = function (presenterData) {
var widgetBuilder = new WidgetBuilder();
var grid = $('#indicatorsGridStack').data('gridstack');
grid.remove_all();
@@ -433,7 +485,7 @@ function fillIndicatorWidgets (presenterData) {
});
}
function fillStatusIndicatorFirstView (presenterData) {
var fillStatusIndicatorFirstView = function (presenterData) {
var widgetBuilder = new WidgetBuilder();
var panel = $('#indicatorsDataGridStack').data('gridstack');
panel.remove_all();
@@ -475,11 +527,10 @@ function fillStatusIndicatorFirstView (presenterData) {
graph3.drawChart();
var indicatorPrincipalData = widgetBuilder.getIndicatorLoadedById(presenterData.id)
//this.fillStatusIndicatorFirstViewDetail(presenterData);
setIndicatorActiveMarker();
}
function fillStatusIndicatorFirstViewDetail (presenterData) {
var fillStatusIndicatorFirstViewDetail = function(presenterData) {
var widgetBuilder = new WidgetBuilder();
var gridDetail = $('#relatedDetailGridStack').data('gridstack');
//gridDetail.remove_all();
@@ -499,7 +550,7 @@ function fillStatusIndicatorFirstViewDetail (presenterData) {
}
}
function fillSpecialIndicatorFirstView (presenterData) {
var fillSpecialIndicatorFirstView = function(presenterData) {
var widgetBuilder = new WidgetBuilder();
var panel = $('#indicatorsDataGridStack').data('gridstack');
panel.remove_all();
@@ -519,7 +570,7 @@ function fillSpecialIndicatorFirstView (presenterData) {
allowTransition:true,
showTip: true,
allowZoom: false,
gapWidth:0.2,
gapWidth:0.3,
useShadows: true,
thickness: 30,
showLabels: true,
@@ -554,6 +605,8 @@ function fillSpecialIndicatorFirstView (presenterData) {
if (indicatorPrincipalData.type == "1010") {
var graph = new Pie3DChart(presenterData.dataToDraw, peiParams, null, null);
graph.drawChart();
//the pie chart goes to much upwards,so a margin is added:
$('#specialIndicatorGraph').css('margin-top','60px');
}
if (indicatorPrincipalData.type == "1030") {
@@ -561,21 +614,29 @@ function fillSpecialIndicatorFirstView (presenterData) {
graph.drawChart();
}
this.fillSpecialIndicatorFirstViewDetail(presenterData);
this.fillSpecialIndicatorFirstViewDetail(presenter.orderDataList(presenterData.data, selectedOrderOfDetailList()));
setIndicatorActiveMarker();
}
function fillSpecialIndicatorFirstViewDetail (presenterData) {
var fillSpecialIndicatorFirstViewDetail = function (list) {
//presenterData = { id: "indId", efficiencyIndex: "0.11764706", efficiencyVariation: -0.08235294,
// inefficiencyCost: "-127.5000", inefficiencyCostToShow: -127, efficiencyIndexToShow: 0.12
// data: {indicatorId, uid, name, averateTime...}, dataToDraw: [{datalabe, value}] }
var widgetBuilder = new WidgetBuilder();
var gridDetail = $('#relatedDetailGridStack').data('gridstack');
//gridDetail.remove_all();
gridDetail.remove_all();
$.each(presenterData.data, function(index, dataItem) {
window.currentDetailList = list;
window.currentDetailFunction = fillSpecialIndicatorFirstViewDetail;
$.each(list, function(index, dataItem) {
var $widget = widgetBuilder.buildSpecialIndicatorFirstViewDetail(dataItem);
var x = (index % 2 == 0) ? 6 : 0;
//the first 2 elements are not hidden
if (index < 2) {
$widget.removeClass("hideme");
}
gridDetail.add_widget($widget, x, 15, 6, 2, true);
});
if (window.currentIndicator.type == "1010") {
@@ -584,9 +645,10 @@ function fillSpecialIndicatorFirstViewDetail (presenterData) {
if (window.currentIndicator.type == "1030") {
$('#relatedLabel').find('h3').text(G_STRING['ID_RELATED_GROUPS']);
}
hideScrollIfAllDivsAreVisible();
}
function fillSpecialIndicatorSecondView (presenterData) {
var fillSpecialIndicatorSecondView = function(presenterData) {
//presenterData= object {dataToDraw[], entityData[] //user/tasks data}
var widgetBuilder = new WidgetBuilder();
var panel = $('#indicatorsDataGridStack').data('gridstack');
@@ -627,10 +689,10 @@ function fillSpecialIndicatorSecondView (presenterData) {
var graph = new BarChart(presenterData.dataToDraw, detailParams, null, null);
graph.drawChart();
}
this.fillSpecialIndicatorSecondViewDetail(presenterData);
this.fillSpecialIndicatorSecondViewDetail(presenter.orderDataList(presenterData.entityData, selectedOrderOfDetailList()));
}
function fillSpecialIndicatorSecondViewDetail (presenterData) {
var fillSpecialIndicatorSecondViewDetail = function (list) {
//presenterData = { entityData: Array[{name,uid,inefficiencyCost,
// inefficiencyIndex, deviationTime,
// averageTime}],
@@ -639,9 +701,16 @@ function fillSpecialIndicatorSecondViewDetail (presenterData) {
var gridDetail = $('#relatedDetailGridStack').data('gridstack');
gridDetail.remove_all();
$.each(presenterData.entityData, function(index, dataItem) {
window.currentDetailList = list;
window.currentDetailFunction = fillSpecialIndicatorSecondViewDetail;
$.each(list, function(index, dataItem) {
var $widget = widgetBuilder.buildSpecialIndicatorSecondViewDetail(dataItem);
var x = (index % 2 == 0) ? 6 : 0;
//the first 2 elements are not hidden
if (index < 2) {
$widget.removeClass("hideme");
}
gridDetail.add_widget($widget, x, 15, 6, 2, true);
});
@@ -651,9 +720,10 @@ function fillSpecialIndicatorSecondViewDetail (presenterData) {
if (window.currentIndicator.type == "1030") {
$('#relatedLabel').find('h3').text(G_STRING['ID_RELATED_USERS']);
}
hideScrollIfAllDivsAreVisible();
}
function fillGeneralIndicatorFirstView (presenterData) {
var fillGeneralIndicatorFirstView = function (presenterData) {
var widgetBuilder = new WidgetBuilder();
var panel = $('#indicatorsDataGridStack').data('gridstack');
panel.remove_all();
@@ -779,7 +849,7 @@ function fillGeneralIndicatorFirstView (presenterData) {
setIndicatorActiveMarker();
}
function animateProgress (indicatorItem, widget){
var animateProgress = function (indicatorItem, widget){
var getRequestAnimationFrame = function () {
return window.requestAnimationFrame ||
window.webkitRequestAnimationFrame ||

4
workflow/engine/methods/cases/cases_Step.php
View File

@@ -908,7 +908,7 @@ try {
$daysSelected = "selected = 'selected'";
}
$sAux = '<select name=' . $hiddenName . '[NEXT_TASK][TAS_TIMEUNIT] id= ' . $hiddenName . '[NEXT_TASK][TAS_TIMEUNIT] ';
$sAux = '<select name=' . $hiddenName . '[NEXT_TASK][TAS_TIMEUNIT] id= ' . $hiddenName . '[NEXT_TASK][TAS_TIMEUNIT] >';
$sAux .= "<option " . $hoursSelected . " value='HOURS'>Hours</option> ";
$sAux .= "<option " . $daysSelected . " value='DAYS'>Days</option> ";
$sAux .= '</select>';
@@ -921,7 +921,7 @@ try {
$calendarSelected = "selected = 'selected'";
}
$sAux = '<select name=' . $hiddenName . '[NEXT_TASK][TAS_TYPE_DAY] id= ' . $hiddenName . '[NEXT_TASK][TAS_TYPE_DAY] ';
$sAux = '<select name=' . $hiddenName . '[NEXT_TASK][TAS_TYPE_DAY] id= ' . $hiddenName . '[NEXT_TASK][TAS_TYPE_DAY] >';
$sAux .= "<option " . $workSelected . " value='1'>Work Days</option> ";
$sAux .= "<option " . $calendarSelected . " value='2'>Calendar Days</option> ";
$sAux .= '</select>';

1
workflow/engine/methods/cases/pmDynaform.php
View File

@@ -1,6 +1,7 @@
<?php
$DYN_UID = $_GET["dyn_uid"];
$_SESSION['PROCESS'] = $_GET["prj_uid"];
G::LoadClass('pmDynaform');
$a = new pmDynaform(array("CURRENT_DYNAFORM" => $DYN_UID));
$a->printPmDynaform();

24
workflow/engine/methods/tracker/tracker_Show.php
View File

@@ -54,11 +54,27 @@ switch ($_GET['CTO_TYPE_OBJ']) {
$Fields['APP_DATA']['__DYNAFORM_OPTIONS']['PRINT_PREVIEW'] = '#';
$Fields['APP_DATA']['__DYNAFORM_OPTIONS']['PRINT_PREVIEW_ACTION'] = 'tracker_PrintView?CTO_UID_OBJ=' . $_GET['CTO_UID_OBJ'] . '&CTO_TYPE_OBJ=PRINT_PREVIEW';
$_SESSION['CTO_UID_OBJ'] = $_GET['CTO_UID_OBJ'];
$G_PUBLISH = new Publisher();
$G_PUBLISH->AddContent( 'dynaform', 'xmlform', $_SESSION['PROCESS'] . '/' . $_GET['CTO_UID_OBJ'], '', $Fields['APP_DATA'], '', '', 'view' );
G::RenderPage( 'publish' );
break;
$dynaForm = new Dynaform();
$arrayDynaFormData = $dynaForm->Load($_GET["CTO_UID_OBJ"]);
if (isset($arrayDynaFormData["DYN_VERSION"]) && $arrayDynaFormData["DYN_VERSION"] == 2) {
G::LoadClass("pmDynaform");
$Fields["PRO_UID"] = $_SESSION["PROCESS"];
$Fields["CURRENT_DYNAFORM"] = $_GET["CTO_UID_OBJ"];
$pmDynaForm = new pmDynaform($Fields);
if ($pmDynaForm->isResponsive()) {
$pmDynaForm->printViewWithoutSubmit();
}
} else {
$G_PUBLISH = new Publisher();
$G_PUBLISH->AddContent("dynaform", "xmlform", $_SESSION["PROCESS"] . "/" . $_GET["CTO_UID_OBJ"], "", $Fields["APP_DATA"], "", "", "view");
G::RenderPage("publish");
}
break;
case 'INPUT_DOCUMENT':
G::LoadClass( 'case' );
$oCase = new Cases();

64
workflow/engine/skinEngine/neoclassic/css/loginStyle.css
View File

@@ -1,9 +1,18 @@
/*
* LOGIN PM3 STYLES
*/
@font-face {
font-family: "Chivo";
font-style: normal;
font-weight: normal;
src: local("?"), url("/fonts/Chivo-Regular.ttf") format("truetype");
}
body.login {
background: url("/images/backgroundpm3.jpg") repeat scroll 0 0 / cover rgba(0, 0, 0, 0);
//background-position-y: -30px;
//background-position-y: -30px;
font-family: "Chivo",sans-serif;
height: 100%;
}
.vertical-offset-100 {
@@ -48,7 +57,8 @@ img.img-responsive {
.module_app_input___gray {
background-color: #fff;
font-family: "Chivo",sans-serif;
background-color: #fff;
background-image: none;
border: 1px solid #ccc;
border-radius: 4px;
@@ -71,9 +81,11 @@ img.img-responsive {
color: #555;
display: block;
font-size: 14px;
height: 45px;
//height: 45px;
box-sizing: border-box;
//padding-top: 12px;
line-height: 1.42857;
padding: 9px 12px;
//padding: 9px 12px;
transition: border-color 0.15s ease-in-out 0s, box-shadow 0.15s ease-in-out 0s;
width: 100%;
}
@@ -82,6 +94,7 @@ img.img-responsive {
box-sizing: border-box;
color: #444;
font-family: "Open Sans",Arial,Helvetica,sans-serif;
//font-family: "Chivo",sans-serif;
font-size: 16px;
height: 45px;
padding: 10px;
@@ -89,6 +102,12 @@ img.img-responsive {
margin-bottom: 6px;
}
.form-signin .module_app_input___gray:-ms-input-placeholder {
font-family: "Open Sans",Arial,Helvetica,sans-serif;
color:#999;
}
.module_app_input___gray::-moz-placeholder {
color: #999;
opacity: 1;
@@ -159,7 +178,7 @@ p {
font-weight: 700;
//transition: all 0.3s ease-in-out 0s;
max-width: 400px;
filter:none;
filter:none;
}
.button-login-success:hover{
@@ -211,13 +230,10 @@ p {
font-size: 11px;
}
.footer-login .content{
.footer-login span{
color: white;
font-weight: 900;
}
.footer-login{
text-align: center;
font-size: 12px;
}
.login_result span{
@@ -227,6 +243,7 @@ p {
.login .module_app_inputFailed___gray{
font-family: "Chivo",sans-serif;
background-color: #fff;
background-image: none;
border: 1px solid #ccc;
@@ -241,4 +258,29 @@ p {
transition: border-color 0.15s ease-in-out 0s, box-shadow 0.15s ease-in-out 0s;
width: 100%;
border:1px solid #e14333;
}
}
.page-wrap{
height: auto;
margin: 0 auto -60px;
min-height: 95%;
padding: 0 0 60px;
}
.page-wrap:after{
width: 100%;
display:block;
clear:both;
}
.footer-login{
text-align: center;
height: auto;
margin: -0px auto 0;
}
#form[FORGOT_PASWORD_LINK]{
font-family: Chivo;
font-size: 14px;
padding-top: 10px;
}

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

@@ -78,10 +78,8 @@
</table>
</body>
{else}
<body id="page-top" class="login" data-spy="scroll" data-target=".navbar-custom">
<div style="display: none;" id="preloader">
<div style="display: none;" id="load"></div>
</div>
<body id="page-top" class="login" data-spy="scroll" data-target=".navbar-custom">
<div class="page-wrap">
<div class="container">
<div class="row vertical-offset-100">
<div class="col-sm-8 col-sm-offset-2 col-md-6 col-md-offset-3">
@@ -102,8 +100,13 @@
</div>
</div>
</div>
<div class ="footer-login">
<div class="content">{$footer}</div>
</div>
<div class="footer-login">
<div class="container">
<span>
{$footer}
</span>
</div>
</div>
</body>
{/if}

14
workflow/engine/skinEngine/skinEngine.php
View File

@@ -377,8 +377,8 @@ class SkinEngine
if (strpos($_SERVER['REQUEST_URI'], '/login/login') !== false) {
$freeOfChargeText = "";
if (! defined('SKIP_FREE_OF_CHARGE_TEXT'))
$freeOfChargeText = "Supplied free of charge with no support, certification, warranty, <br>maintenance nor indemnity by Colosa and its Certified Partners.";
if(class_exists('pmLicenseManager')) $freeOfChargeText="";
$freeOfChargeText = "Supplied free of charge with no support, certification, warranty, <br>maintenance nor indemnity by Processmaker and its Certified Partners.";
if(file_exists(PATH_CLASSES."class.pmLicenseManager.php")) $freeOfChargeText="";
$fileFooter = PATH_SKINS . SYS_SKIN . PATH_SEP . 'footer.html';
if (file_exists($fileFooter)) {
@@ -392,7 +392,7 @@ class SkinEngine
if (file_exists($fileFooter)) {
$footer .= file_get_contents($fileFooter);
} else {
$footer .= "<br />Copyright &copy; 2000-" . date('Y') . " <a href=\"http://www.processmaker.com\" alt=\"ProcessMaker Inc.\" target=\"_blank\">ProcessMaker Inc.</a> All rights reserved.<br /> $freeOfChargeText " . "<br><br/><a href=\"http://www.processmaker.com\" alt=\"Powered by ProcessMaker - Open Source Workflow & Business Process Management (BPM) Management Software\" title=\"Powered by ProcessMaker\" target=\"_blank\"></a>";
$footer .= "$freeOfChargeText <br />Copyright &copy; 2000-" . date('Y') . " <a href=\"http://www.processmaker.com\" alt=\"ProcessMaker Inc.\" target=\"_blank\">ProcessMaker </a>Inc. All rights reserved.<br />" . "<br><br/><a href=\"http://www.processmaker.com\" alt=\"Powered by ProcessMaker - Open Source Workflow & Business Process Management (BPM) Management Software\" title=\"Powered by ProcessMaker\" target=\"_blank\"></a>";
}
}
}
@@ -505,7 +505,7 @@ class SkinEngine
if (file_exists($fileFooter)) {
$footer .= file_get_contents($fileFooter);
} else {
$footer .= "<br />Copyright &copy; 2000-" . date('Y') . " <a href=\"http://www.processmaker.com\" alt=\"ProcessMaker Inc.\" target=\"_blank\">ProcessMaker Inc.</a> All rights reserved.<br /> $freeOfChargeText " . "<br><br/><a href=\"http://www.processmaker.com\" alt=\"Powered by ProcessMaker - Open Source Workflow & Business Process Management (BPM) Management Software\" title=\"Powered by ProcessMaker\" target=\"_blank\"></a>";
$footer .= "$freeOfChargeText <br />Copyright &copy; 2000-" . date('Y') . " <a href=\"http://www.processmaker.com\" alt=\"ProcessMaker Inc.\" target=\"_blank\">ProcessMaker </a>Inc. All rights reserved.<br /> " . "<br><br/><a href=\"http://www.processmaker.com\" alt=\"Powered by ProcessMaker - Open Source Workflow & Business Process Management (BPM) Management Software\" title=\"Powered by ProcessMaker\" target=\"_blank\"></a>";
}
}
}
@@ -698,8 +698,8 @@ class SkinEngine
if (strpos($_SERVER['REQUEST_URI'], '/login/login') !== false) {
$freeOfChargeText = "";
if (! defined('SKIP_FREE_OF_CHARGE_TEXT'))
$freeOfChargeText = "Supplied free of charge with no support, certification, warranty, maintenance nor indemnity by Colosa and its Certified Partners.";
if(class_exists('pmLicenseManager')) $freeOfChargeText="";
$freeOfChargeText = "Supplied free of charge with no support, certification, warranty, maintenance nor indemnity by ProcessMaker and its Certified Partners.";
if(file_exists(PATH_CLASSES."class.pmLicenseManager.php")) $freeOfChargeText="";
$fileFooter = PATH_SKINS . SYS_SKIN . PATH_SEP . 'footer.html';
if (file_exists($fileFooter)) {
@@ -713,7 +713,7 @@ class SkinEngine
if (file_exists($fileFooter)) {
$footer .= file_get_contents($fileFooter);
} else {
$footer .= " $freeOfChargeText <br />Copyright &copy; 2000-" . date('Y') . " <a href=\"http://www.processmaker.com\" alt=\"ProcessMaker Inc.\" target=\"_blank\">ProcessMaker Inc.</a> All rights reserved.<br />" . "<br><br/><a href=\"http://www.processmaker.com\" alt=\"Powered by ProcessMaker - Open Source Workflow & Business Process Management (BPM) Management Software\" title=\"Powered by ProcessMaker\" target=\"_blank\"></a>";
$footer .= "$freeOfChargeText <br />Copyright &copy; 2000-" . date('Y') . " <a href=\"http://www.processmaker.com\" alt=\"ProcessMaker Inc.\" target=\"_blank\">ProcessMaker </a>Inc. All rights reserved.<br />" . "<br><br/><a href=\"http://www.processmaker.com\" alt=\"Powered by ProcessMaker - Open Source Workflow & Business Process Management (BPM) Management Software\" title=\"Powered by ProcessMaker\" target=\"_blank\"></a>";
}
}
}

19
workflow/engine/src/ProcessMaker/BusinessModel/ReportingIndicators.php
View File

@@ -18,7 +18,7 @@ class ReportingIndicators
*
* return decimal value
*/
public function getPeiCompleteData($indicatorUid, $measureDate, $compareDate, $language)
public function getPeiCompleteData($indicatorUid, $compareDate, $measureDate, $language)
{
G::loadClass('indicatorsCalculator');
$calculator = new \IndicatorsCalculator();
@@ -33,6 +33,7 @@ class ReportingIndicators
$retval = array(
"id" => $indicatorUid,
"efficiencyIndex" => $peiValue,
"efficiencyIndexCompare" => $peiCompare,
"efficiencyVariation" => ($peiValue-$peiCompare),
"inefficiencyCost" => $peiCost,
"data"=>$processes);
@@ -49,29 +50,17 @@ class ReportingIndicators
*
* return decimal value
*/
public function getUeiCompleteData($indicatorUid, $measureDate, $compareDate, $language)
public function getUeiCompleteData($indicatorUid, $compareDate, $measureDate,$language)
{
G::loadClass('indicatorsCalculator');
$calculator = new \IndicatorsCalculator();
$groups = $calculator->ueiUserGroups($indicatorUid, $measureDate, $measureDate, $language);
$groupIds = array();
foreach($groups as $p) {
array_push($groupIds, $p['uid']);
}
if (sizeof($groupIds) == 0) {
$groupIds = null;
}
//TODO think what if each indicators has a group or user subset assigned. Now are all
$ueiValue = current(reset($calculator->ueiHistoric(null, $measureDate, $measureDate, \ReportingPeriodicityEnum::NONE)));
$arrCost = $calculator->ueiUserGroups($indicatorUid, $measureDate, $measureDate, $language);
$ueiCost = (sizeof($arrCost) > 0)
? $arrCost[0]['inefficiencyCost']
: null;
$ueiCost = current(reset($calculator->ueiCostHistoric(null, $measureDate, $measureDate, \ReportingPeriodicityEnum::NONE)));
$ueiCompare = current(reset($calculator->ueiHistoric(null, $compareDate, $compareDate, \ReportingPeriodicityEnum::NONE)));
$retval = array(

22
workflow/engine/src/ProcessMaker/BusinessModel/Variable.php
View File

@@ -129,10 +129,13 @@ class Variable
$cnn = \Propel::getConnection("workflow");
try {
$variable = \ProcessVariablesPeer::retrieveByPK($variableUid);
$dbConnection = \DbSourcePeer::retrieveByPK($variable->getVarDbconnection(), $variable->getPrjUid());
$oldVariable = array(
"VAR_NAME" => $variable->getVarName(),
"VAR_FIELD_TYPE" => $variable->getVarFieldType(),
"VAR_DBCONNECTION" => $variable->getVarDbconnection(),
"VAR_DBCONNECTION_LABEL" => $dbConnection !== null ? '[' . $dbConnection->getDbsServer() . ':' . $dbConnection->getDbsPort() . '] ' . $dbConnection->getDbsType() . ': ' . $dbConnection->getDbsDatabaseName() : 'PM Database',
"VAR_SQL" => $variable->getVarSql(),
"VAR_ACCEPTED_VALUES" => $variable->getVarAcceptedValues()
);
@@ -170,10 +173,12 @@ class Variable
$variable->save();
$cnn->commit();
//update dynaforms
$dbConnection = \DbSourcePeer::retrieveByPK($variable->getVarDbconnection(), $variable->getPrjUid());
$newVariable = array(
"VAR_NAME" => $variable->getVarName(),
"VAR_FIELD_TYPE" => $variable->getVarFieldType(),
"VAR_DBCONNECTION" => $variable->getVarDbconnection(),
"VAR_DBCONNECTION_LABEL" => $dbConnection !== null ? '[' . $dbConnection->getDbsServer() . ':' . $dbConnection->getDbsPort() . '] ' . $dbConnection->getDbsType() . ': ' . $dbConnection->getDbsDatabaseName() : 'PM Database',
"VAR_SQL" => $variable->getVarSql(),
"VAR_ACCEPTED_VALUES" => $variable->getVarAcceptedValues()
);
@@ -265,9 +270,14 @@ class Variable
$criteria->addSelectColumn(\ProcessVariablesPeer::VAR_NULL);
$criteria->addSelectColumn(\ProcessVariablesPeer::VAR_DEFAULT);
$criteria->addSelectColumn(\ProcessVariablesPeer::VAR_ACCEPTED_VALUES);
$criteria->addSelectColumn(\DbSourcePeer::DBS_SERVER);
$criteria->addSelectColumn(\DbSourcePeer::DBS_PORT);
$criteria->addSelectColumn(\DbSourcePeer::DBS_DATABASE_NAME);
$criteria->addSelectColumn(\DbSourcePeer::DBS_TYPE);
$criteria->add(\ProcessVariablesPeer::PRJ_UID, $processUid, \Criteria::EQUAL);
$criteria->add(\ProcessVariablesPeer::VAR_UID, $variableUid, \Criteria::EQUAL);
$criteria->addJoin(\ProcessVariablesPeer::VAR_DBCONNECTION, \DbSourcePeer::DBS_UID, \Criteria::LEFT_JOIN);
$rsCriteria = \ProcessVariablesPeer::doSelectRS($criteria);
@@ -283,7 +293,8 @@ class Variable
'var_field_type' => $aRow['VAR_FIELD_TYPE'],
'var_field_size' => (int)$aRow['VAR_FIELD_SIZE'],
'var_label' => $aRow['VAR_LABEL'],
'var_dbconnection' => $aRow['VAR_DBCONNECTION'],
'var_dbconnection' => $aRow['VAR_DBCONNECTION'] === 'none' ? 'workflow' : $aRow['VAR_DBCONNECTION'],
'var_dbconnection_label' => $aRow['DBS_SERVER'] !== null ? '[' . $aRow['DBS_SERVER'] . ':' . $aRow['DBS_PORT'] . '] ' . $aRow['DBS_TYPE'] . ': ' . $aRow['DBS_DATABASE_NAME'] : 'PM Database',
'var_sql' => $aRow['VAR_SQL'],
'var_null' => (int)$aRow['VAR_NULL'],
'var_default' => $aRow['VAR_DEFAULT'],
@@ -326,8 +337,13 @@ class Variable
$criteria->addSelectColumn(\ProcessVariablesPeer::VAR_NULL);
$criteria->addSelectColumn(\ProcessVariablesPeer::VAR_DEFAULT);
$criteria->addSelectColumn(\ProcessVariablesPeer::VAR_ACCEPTED_VALUES);
$criteria->addSelectColumn(\DbSourcePeer::DBS_SERVER);
$criteria->addSelectColumn(\DbSourcePeer::DBS_PORT);
$criteria->addSelectColumn(\DbSourcePeer::DBS_DATABASE_NAME);
$criteria->addSelectColumn(\DbSourcePeer::DBS_TYPE);
$criteria->add(\ProcessVariablesPeer::PRJ_UID, $processUid, \Criteria::EQUAL);
$criteria->addJoin(\ProcessVariablesPeer::VAR_DBCONNECTION, \DbSourcePeer::DBS_UID, \Criteria::LEFT_JOIN);
$rsCriteria = \ProcessVariablesPeer::doSelectRS($criteria);
@@ -343,7 +359,8 @@ class Variable
'var_field_type' => $aRow['VAR_FIELD_TYPE'],
'var_field_size' => (int)$aRow['VAR_FIELD_SIZE'],
'var_label' => $aRow['VAR_LABEL'],
'var_dbconnection' => $aRow['VAR_DBCONNECTION'],
'var_dbconnection' => $aRow['VAR_DBCONNECTION'] === 'none' ? 'workflow' : $aRow['VAR_DBCONNECTION'],
'var_dbconnection_label' => $aRow['DBS_SERVER'] !== null ? '[' . $aRow['DBS_SERVER'] . ':' . $aRow['DBS_PORT'] . '] ' . $aRow['DBS_TYPE'] . ': ' . $aRow['DBS_DATABASE_NAME'] : 'PM Database',
'var_sql' => $aRow['VAR_SQL'],
'var_null' => (int)$aRow['VAR_NULL'],
'var_default' => $aRow['VAR_DEFAULT'],
@@ -690,4 +707,3 @@ class Variable
}
}
}

221
workflow/engine/src/ProcessMaker/Services/Api/ReportingIndicators.php
View File

@@ -71,223 +71,6 @@ class ReportingIndicators extends Api
}
}
// /**
// * Returns the aggregate Efficiency of a employee or set of employees
// *
// * @param string $employee_list {@from path}
// * @param string $init_date {@from path}
// * @param string $end_date {@from path}
// * @return array
// *
// * @url GET /employee-efficiency-index
// */
// public function doGetEmployeeEfficiencyIndex($employee_list, $init_date, $end_date)
// {
// try {
// $indicatorsObj = new \ProcessMaker\BusinessModel\ReportingIndicators();
// $listArray = (strlen($employee_list) > 1)
// ? $listArray = explode(',', $employee_list)
// : null;
// $response = $indicatorsObj->getEmployeeEfficiencyIndex($listArray,
// new \DateTime($init_date),
// new \DateTime($end_date));
// return $response;
// } catch (\Exception $e) {
// throw (new RestException(Api::STAT_APP_EXCEPTION, $e->getMessage()));
// }
// }
//
// /**
// * Lists tasks of a employee and it's statistics (efficiency, average times, etc.)
// *
// * @param string $employee_list {@from path}
// * @param string $init_date {@from path}
// * @param string $end_date {@from path}
// * @param string $language {@from path}
// * @return array
// *
// * @url GET /employee-tasks
// */
// public function doGetEmployeeTasksInfo($employee_list, $init_date, $end_date, $language)
// {
// if ($employee_list == null || strlen($employee_list) <= 1)
// throw new InvalidArgumentException ('employee_list must have at least a value', 0);
//
// try {
// $indicatorsObj = new \ProcessMaker\BusinessModel\ReportingIndicators();
// $listArray = $listArray = explode(',', $employee_list);
// $response = $indicatorsObj->getEmployeeTasksInfoList($listArray,
// new \DateTime($init_date),
// new \DateTime($end_date),
// $language);
// return $response;
// } catch (\Exception $e) {
// throw (new RestException(Api::STAT_APP_EXCEPTION, $e->getMessage()));
// }
// }
//
// /**
// * Returns the percent of Cases with Overdue time
// *
// * @param string $$process_list {@from path}
// * @param string $init_date {@from path}
// * @param string $end_date {@from path}
// * @return array
// *
// * @url GET /percent-overdue-cases
// */
// public function doGetPercentOverdueByProcess($process_list, $init_date, $end_date)
// {
// try {
// $indicatorsObj = new \ProcessMaker\BusinessModel\ReportingIndicators();
// $listArray = (strlen($process_list) > 1)
// ? $listArray = explode(',', $process_list)
// : null;
// $response = $indicatorsObj->getPercentOverdueCasesByProcess($listArray,
// new \DateTime($init_date),
// new \DateTime($end_date));
// return $response;
// } catch (\Exception $e) {
// throw (new RestException(Api::STAT_APP_EXCEPTION, $e->getMessage()));
// }
// }
//
// /**
// * Returns the percent of Cases with Overdue time with the selected periodicity
// *
// * @param string $$process_list {@from path}
// * @param string $init_date {@from path}
// * @param string $end_date {@from path}
// * @param string $periodicity {@from path}
// * @return array
// *
// * @url GET /percent-overdue-cases-history
// */
// public function doGetPercentOverdueByProcessHistory($process_list, $init_date, $end_date, $periodicity)
// {
// try {
// $indicatorsObj = new \ProcessMaker\BusinessModel\ReportingIndicators();
// $listArray = (strlen($process_list) > 1)
// ? $listArray = explode(',', $process_list)
// : null;
// $response = $indicatorsObj->getPercentOverdueCasesByProcessHistory($listArray,
// new \DateTime($init_date),
// new \DateTime($end_date),
// $periodicity);
// return $response;
// } catch (\Exception $e) {
// throw (new RestException(Api::STAT_APP_EXCEPTION, $e->getMessage()));
// }
// }
//
// /**
// * Returns the total of Cases with New time
// *
// * @param string $$process_list {@from path}
// * @param string $init_date {@from path}
// * @param string $end_date {@from path}
// * @return array
// *
// * @url GET /total-new-cases
// */
// public function doGetTotalNewByProcess($process_list, $init_date, $end_date)
// {
// try {
// $indicatorsObj = new \ProcessMaker\BusinessModel\ReportingIndicators();
// $listArray = (strlen($process_list) > 1)
// ? $listArray = explode(',', $process_list)
// : null;
// $response = $indicatorsObj->getPercentNewCasesByProcess($listArray,
// new \DateTime($init_date),
// new \DateTime($end_date));
// return $response;
// } catch (\Exception $e) {
// throw (new RestException(Api::STAT_APP_EXCEPTION, $e->getMessage()));
// }
// }
//
// /**
// * Returns the total of Cases with New time with the selected periodicity
// *
// * @param string $$process_list {@from path}
// * @param string $init_date {@from path}
// * @param string $end_date {@from path}
// * @param string $periodicity {@from path}
// * @return array
// *
// * @url GET /total-new-cases-history
// */
// public function doGetTotalNewByProcessHistory($process_list, $init_date, $end_date, $periodicity)
// {
// try {
// $indicatorsObj = new \ProcessMaker\BusinessModel\ReportingIndicators();
// $listArray = (strlen($process_list) > 1)
// ? $listArray = explode(',', $process_list)
// : null;
// $response = $indicatorsObj->getPercentNewCasesByProcessHistory($listArray,
// new \DateTime($init_date),
// new \DateTime($end_date),
// $periodicity);
// return $response;
// } catch (\Exception $e) {
// throw (new RestException(Api::STAT_APP_EXCEPTION, $e->getMessage()));
// }
// }
//
// /**
// * Returns the total of Cases with Completed time
// *
// * @param string $$process_list {@from path}
// * @param string $init_date {@from path}
// * @param string $end_date {@from path}
// * @return array
// *
// * @url GET /total-completed-cases
// */
// public function doGetTotalCompletedByProcess($process_list, $init_date, $end_date)
// {
// try {
// $indicatorsObj = new \ProcessMaker\BusinessModel\ReportingIndicators();
// $listArray = (strlen($process_list) > 1)
// ? $listArray = explode(',', $process_list)
// : null;
// $response = $indicatorsObj->getPercentCompletedCasesByProcess($listArray,
// new \DateTime($init_date),
// new \DateTime($end_date));
// return $response;
// } catch (\Exception $e) {
// throw (new RestException(Api::STAT_APP_EXCEPTION, $e->getMessage()));
// }
// }
//
// /**
// * Returns the total of Cases with Completed time with the selected periodicity
// *
// * @param string $$process_list {@from path}
// * @param string $init_date {@from path}
// * @param string $end_date {@from path}
// * @param string $periodicity {@from path}
// * @return array
// *
// * @url GET /total-completed-cases-history
// */
// public function doGetTotalCompletedByProcessHistory($process_list, $init_date, $end_date, $periodicity)
// {
// try {
// $indicatorsObj = new \ProcessMaker\BusinessModel\ReportingIndicators();
// $listArray = (strlen($process_list) > 1)
// ? $listArray = explode(',', $process_list)
// : null;
// $response = $indicatorsObj->getPercentCompletedCasesByProcessHistory($listArray,
// new \DateTime($init_date),
// new \DateTime($end_date),
// $periodicity);
// return $response;
// } catch (\Exception $e) {
// throw (new RestException(Api::STAT_APP_EXCEPTION, $e->getMessage()));
// }
// }
//
/**
* Returns the total of Cases with Completed time with the selected periodicity
*
@@ -299,7 +82,7 @@ class ReportingIndicators extends Api
*
* @url GET /process-efficiency-data
*/
public function doGetProcessEficciencyData($indicator_uid, $measure_date, $compare_date, $language)
public function doGetProcessEficciencyData($indicator_uid, $compare_date, $measure_date, $language)
{
try {
$indicatorsObj = new \ProcessMaker\BusinessModel\ReportingIndicators();
@@ -324,7 +107,7 @@ class ReportingIndicators extends Api
*
* @url GET /employee-efficiency-data
*/
public function doGetEmployeeEficciencyData($indicator_uid, $measure_date, $compare_date, $language)
public function doGetEmployeeEficciencyData($indicator_uid, $compare_date, $measure_date, $language)
{
try {
$indicatorsObj = new \ProcessMaker\BusinessModel\ReportingIndicators();

4
workflow/engine/src/ProcessMaker/Services/OAuth2/PmPdo.php
View File

@@ -175,9 +175,11 @@ class PmPdo implements \OAuth2\Storage\AuthorizationCodeInterface,
{
$access_token = new \OauthAccessTokens();
$access_token->load($token);
$stmt = $this->db->prepare(sprintf('DELETE FROM %s WHERE ACCESS_TOKEN = :token', $this->config['access_token_table']));
$stmt->execute(compact('token'));
$stmt = $this->db->prepare(sprintf('DELETE FROM %s WHERE EXPIRES>%s', $this->config['refresh_token_table'], "'".Date('Y-m-d H:i:s')."'"));
$stmt = $this->db->prepare(sprintf("DELETE FROM %s WHERE EXPIRES < %s", $this->config["refresh_token_table"], "'" . date("Y-m-d H:i:s") . "'"));
return $stmt->execute(compact('token'));
}

13
workflow/engine/src/ProcessMaker/Services/OAuth2/Server.php
View File

@@ -68,7 +68,10 @@ class Server implements iAuthenticate
$this->server->addGrantType(new \ProcessMaker\Services\OAuth2\PmClientCredentials($this->storage));
// Add the "Refresh token" grant type
$this->server->addGrantType(new \OAuth2\GrantType\RefreshToken($this->storage));
$this->server->addGrantType(new \OAuth2\GrantType\RefreshToken(
$this->storage,
array("always_issue_new_refresh_token" => true)
));
// create some users in memory
//$users = array('bshaffer' => array('password' => 'brent123', 'first_name' => 'Brent', 'last_name' => 'Shaffer'));
@@ -261,7 +264,9 @@ class Server implements iAuthenticate
if ($returnResponse) {
return $response;
} else {
die($response->send());
$response->send();
exit(0);
}
}
@@ -279,9 +284,11 @@ class Server implements iAuthenticate
if ($request == null) {
$request = \OAuth2\Request::createFromGlobals();
}
$response = $this->server->handleTokenRequest($request);
$response = $this->server->handleTokenRequest($request); //Set/Get token //PmPdo->setAccessToken()
$token = $response->getParameters();
if (array_key_exists('access_token', $token)
&& array_key_exists('refresh_token', $token)
) {

48
workflow/engine/templates/enterprise/addonsStore.js
View File

@@ -1443,54 +1443,6 @@ Ext.onReady(function() {
}
return '';
}
},
{
id : "status-feature",
header : _('ID_STATUS'),
width : 60,
sortable : false,
hideable : false,
dataIndex: "status",
renderer: function (val) {
var str = "";
var text = "";
switch (val) {
case "available": text = _('ID_BUY_NOW'); break;
case "installed": text = _('ID_INSTALLED'); break;
case "ready": text = _('ID_INSTALL_NOW'); break;
case "upgrade": text = _('ID_UPGRADE_NOW'); break;
case "download": text = _('ID_CANCEL'); break;
case "install": text = _('ID_INSTALLING'); break;
case "cancel": text = _('ID_CANCELLING'); break;
case "disabled": text = _('ID_DISABLED'); break;
case "download-start": text = "<img src=\"/images/enterprise/loader.gif\" />"; break;
default: text = val; break;
}
switch (val) {
case "available":
case "ready":
case "upgrade":
case "download":
case "install":
case "cancel":
case "download-start":
str = "<div class=\"" + val + " roundedCorners\">" + text + "</div>";
break;
case "installed":
case "disabled":
str = "<div style=\"margin-right: 0.85em; font-weight: bold; text-align: center;\">" + text + "</div>";
break;
default:
str = "<div class=\"" + val + " roundedCorners\">" + text + "</div>";
break;
}
return (str);
}
}
]
});

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

@@ -35,10 +35,12 @@
{/foreach}
</script>
<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/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 %>"
@@ -156,11 +158,11 @@
<div class="green"><%- indicator.efficiencyIndexToShow %></div>
<div class="small grey sind-index-selector ellipsis"></div>
</div>
<div class="col-xs-3 vcenter" style="margin-right:80px">
<div id="proEfficCost" class="red"><%- indicator.inefficiencyCostToShow %></div>
<div class="col-xs-3 vcenter" style="margin-right:40px">
<div class="red sind-cost-number-selector"><%- indicator.inefficiencyCostToShow %></div>
<div class="small grey sind-cost-selector ellipsis"></div>
</div>
<div class="col-xs-6" id="specialIndicatorGraph" style="width:600px;height:300px;"></div>
<div class="col-xs-6" id="specialIndicatorGraph" style="width:540px;height:300px;"></div>
</div>
<div class="clearfix"></div>
</div>
@@ -172,7 +174,8 @@
data-indicator-id="<%- detailData.indicatorId %>"
data-detail-id="<%- detailData.uid %>"
data-detail-index="<%- detailData.efficiencyIndexToShow %>"
data-detail-cost="<%- detailData.inefficiencyCostToShow %>"
data-detail-cost-to-show="<%- detailData.inefficiencyCostToShow %>"
data-detail-cost="<%- detailData.inefficiencyCost%>"
data-detail-name="<%- detailData.name %>"
>
<div class="col-lg-12 vcenter-task">
@@ -181,11 +184,11 @@
<div class="small grey detail-title-selector"> <%- detailData.name %></div>
</div>
<div class="col-xs-3 text-center ">
<div class="blue"><%- detailData.efficiencyIndexToShow %></div>
<div class="blue"><%- detailData.efficiencyIndexToShow%></div>
<div class="small grey detail-efficiency-selector ellipsis"></div>
</div>
<div class="col-xs-3 text-center ">
<div class="blue"><%- detailData.inefficiencyCostToShow %></div>
<div class="red detail-cost-number-selector"><%- 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>
@@ -195,7 +198,7 @@
</div>
</script>
<script type="text/template" class="ueiDetail">
<script type="text/template" class="specialIndicatorSencondViewDetail">
<div class="process-div well hideme detail-button-selector" data-gs-no-resize="true"
id="detailData-<%- detailData.uid %>"
data-indicator-id="<%- detailData.indicatorId %>"
@@ -207,11 +210,11 @@
<div class="text-center huge">
<div class="col-xs-12 vcenter-task">
<div class="col-xs-5 ">
<div id="usrEffic" class="blue small"><%- detailData.efficiencyIndexToShow%></div>
<div class="blue small"><%- detailData.efficiencyIndexToShow%></div>
<div class="smallB grey fontMedium detail-efficiency-selector ellipsis"></div>
</div>
<div class="col-xs-5 ">
<div id="usrCost" class="blue small"><%- detailData.inefficiencyCostToShow%></div>
<div class="small detail-cost-number-selector"><%- detailData.inefficiencyCostToShow%></div>
<div class="smallB grey detail-cost-selector ellipsis"></div>
</div>
</div>
@@ -300,8 +303,9 @@
<div class="clearfix"></div>
</div>
</script>
</head>
<body id="page-top" class="index">
<img id="scrollImg" class="floating" src="/images/scrolldown.gif" width="80" height="80" style="border-radius:85px;"/>
<div id="wrapper">
@@ -340,7 +344,7 @@
{/literal}
</select>
<select id="mounth" class="form-control pull-right ">
<select id="month" class="form-control pull-right ">
<option value="1">{translate label="ID_MONTH_ABB_1"}</option>
<option value="2">{translate label="ID_MONTH_ABB_2"}</option>
<option value="3">{translate label="ID_MONTH_ABB_3"}</option>
@@ -389,7 +393,14 @@
</div>
</div>
<div id="relatedLabel" style="clear:both;"><center><h3></h3></center></div>
<div id="relatedLabel" style="clear:both;">
<div>
<center><h3></h3></center>
</div>
<div>
Sort: &nbsp; &nbsp;<a id="sortListButton" class="fa fa-chevron-down fa-1x" style="color:#000;" href="#"></a>
</div>
</div>
<div class="col-lg-12 col-md-12">
<div id="relatedDetailGridStack" class="grid-stack" data-gs-width="12"
@@ -404,6 +415,3 @@
</body>
</html>

2
workflow/engine/xmlform/login/forgotPasswordpm3.xml
View File

@@ -6,7 +6,7 @@
<USR_USERNAME type="text" size="30" maxlength="50" required="true" validate="Any" autocomplete="0">
<en><![CDATA[User]]></en>
</USR_USERNAME>
<USR_EMAIL type="text" size="30" required="true" maxlength="64" autocomplete="0">
<USR_EMAIL type="text" size="30" required="true" maxlength="254" autocomplete="0">
<en><![CDATA[Email]]></en>
</USR_EMAIL>
<URL type="hidden"/>

2
workflow/engine/xmlform/login/sysLoginNoWSpm3.xml
View File

@@ -29,7 +29,7 @@ window.onload= function(){
document.getElementById('form[USR_PASSWORD_MASK]').placeholder = _('ID_PASSWORD');
document.getElementById('form[USER_ENV]').placeholder = _('ID_WORKSPACE');
document.getElementById('form[BSUBMIT]').classList.remove('module_app_button___gray');
document.getElementById('form[BSUBMIT]').classList.add('button-login-success');
document.getElementById('form[BSUBMIT]').classList.add('button-login-success');
};
setFocus (getField ('USR_USERNAME'));

19
workflow/engine/xmlform/tasks/tasks_Consolidated_Error.xml Normal file
View File

@@ -0,0 +1,19 @@
<?xml version="1.0" encoding="UTF-8"?>
<dynaForm type="xmlform" name="" width="585" height="305" enabletemplate="0" mode="">
<PRO_UID type="hidden" />
<TAS_UID type="hidden" />
<SYS_LANG type="hidden" />
<REP_TAB_UID type="hidden" />
<INDEX type="hidden" />
<TABLE_NAME_DEFAULT type="hidden" />
<IFORM type="hidden" />
<TITLE_ALERT type="title">
<en><![CDATA[Alert]]></en>
<es><![CDATA[Alert]]></es>
</TITLE_ALERT>
<SUBTITLE_MESSAGE type="text" mode="view">
<en><![CDATA[Message]]></en>
<en><![CDATA[Mensaje]]></en>
</SUBTITLE_MESSAGE>
</dynaForm>

13
workflow/public_html/css/sb-admin-2.css
View File

@@ -566,7 +566,7 @@ table.dataTable thead .sorting:after {
}
.panel-active{
background-color: #000;
background-color: #D99058;
position: relative;
}
@@ -729,11 +729,18 @@ table.dataTable thead .sorting:after {
font-size: 14px;
}
.process-button .blue{
.process-button .blue,
.process-button .red,
.process-button .green{
font-size: 24px;
}
.process-button:hover .blue, .process-button:hover, .process-button:hover .grey{
.process-button:hover .blue,
.process-button:hover,
.process-button:hover .grey,
.process-button:hover .red,
.process-button:hover .green
{
background: #337AB8;
color:#fff !important;
}

BIN
workflow/public_html/fonts/Chivo-Regular.ttf Normal file
View File

Binary file not shown.