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

Merged master into dashboards2

Browse Source
This commit is contained in:
Dante Loayza
2015-04-08 11:22:01 -04:00
parent f14bf926cc 0b40862053
commit 57c25e7018
22 changed files with 515 additions and 267 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
workflow/engine/bin/cron_single.php
View File

@@ -1,4 +1,15 @@
<?php
register_shutdown_function(
create_function(
"",
"
if (class_exists(\"Propel\")) {
Propel::close();
}
"
)
);
/**
* cron_single.php
* @package workflow-engine-bin

11
workflow/engine/bin/messageeventcron_single.php
View File

@@ -1,4 +1,15 @@
<?php
register_shutdown_function(
create_function(
"",
"
if (class_exists(\"Propel\")) {
Propel::close();
}
"
)
);
ini_set("memory_limit", "512M");
try {

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

@@ -76,7 +76,7 @@ class PMLicensedFeatures
$value = $padl->_decrypt($featureName);
if (is_array($value)) {
$trueValue = $value[0];
$value = $value[0];
}
$trueValue = $value;
$enable = in_array($trueValue, $licenseManager->licensedfeatures);

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

@@ -930,7 +930,7 @@ class System
}
//#1067 - Invalid default value for int field
if (substr( $newField['Type'], 0, 3 ) == "int" && isset( $newField['Default'] ) && $newField['Default'] == '') {
if (substr( $newField['Type'], 0, 3 ) == "INT" && isset( $newField['Default'] ) && $newField['Default'] == '') {
$changeDefaultAttr = false;
}

8
workflow/engine/classes/model/UsersProperties.php
View File

@@ -433,6 +433,14 @@ class UsersProperties extends BaseUsersProperties
$url = 'dashboard/main';
}
break;
/*----------------------------------********---------------------------------*/
case 'PM_STRATEGIC_DASHBOARD':
$licensedFeatures = & PMLicensedFeatures::getSingleton();
if ($licensedFeatures->verifyfeature('r19Vm5DK1UrT09MenlLYjZxejlhNUZ1b1NhV0JHWjBsZEJ6dnpJa3dTeWVLVT0=') && $RBAC->userCanAccess( 'PM_SETUP' ) == 1) {
$url = 'strategicDashboard/main';
}
break;
/*----------------------------------********---------------------------------*/
}
}

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

File diff suppressed because one or more lines are too long

160
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-03-24 14:24:23\n"
"PO-Revision-Date: 2015-04-07 17:56:03\n"
"Last-Translator: \n"
"Language-Team: Colosa Developers Team <developers@colosa.com>\n"
"MIME-Version: 1.0\n"
@@ -13258,8 +13258,8 @@ msgstr "Failure to do so could lead your ProcessMaker installation not functioni
# TRANSLATION
# LABEL/ID_PROCESSMAKER_REQUIREMENTS_DESCRIPTION_STEP1_1
#: LABEL/ID_PROCESSMAKER_REQUIREMENTS_DESCRIPTION_STEP1_1
msgid "If any of these items is not supported (marked as No), then please take actions to correct them."
msgstr "If any of these items is not supported (marked as No), then please take actions to correct them."
msgid "If any of these items are not supported (marked as No), then please take actions to correct them."
msgstr "If any of these items are not supported (marked as No), then please take actions to correct them."
# TRANSLATION
# LABEL/ID_LDAP_OPTIONAL
@@ -14524,8 +14524,8 @@ msgstr "Check again"
# TRANSLATION
# LABEL/ID_PROCESSMAKER_REQUIREMENTS_DESCRIPTION
#: LABEL/ID_PROCESSMAKER_REQUIREMENTS_DESCRIPTION
msgid "If any of these items is not supported (marked as No) then please take actions to correct them.<br />"
msgstr "If any of these items is not supported (marked as No) then please take actions to correct them.<br />"
msgid "If any of these items are not supported (marked as No), then please take actions to correct them.<br />"
msgstr "If any of these items are not supported (marked as No), then please take actions to correct them.<br />"
# TRANSLATION
# LABEL/ID_PROCESSMAKER_REQUIREMENTS_DESCRIPTION2
@@ -18448,14 +18448,14 @@ msgstr "Owner Dashboard has been deleted correctly."
# TRANSLATION
# LABEL/ID_PROCESS_EFFICIENCE
#: LABEL/ID_PROCESS_EFFICIENCE
msgid "Process Efficience Index"
msgstr "Process Efficience Index"
msgid "Process Efficiency Index"
msgstr "Process Efficiency Index"
# TRANSLATION
# LABEL/ID_PROCESS_INEFFICIENCE
#: LABEL/ID_PROCESS_INEFFICIENCE
msgid "Process Inefficience Cost"
msgstr "Process Inefficience Cost"
msgid "Process Inefficiency Cost"
msgstr "Process Inefficiency Cost"
# TRANSLATION
# LABEL/ID_EMPLYEE_EFFICIENCIE
@@ -18472,14 +18472,14 @@ msgstr "Inefficience Cost By User"
# TRANSLATION
# LABEL/ID_OVER_DUE
#: LABEL/ID_OVER_DUE
msgid "% Over due"
msgstr "% Over due"
msgid "% Overdue"
msgstr "% Overdue"
# TRANSLATION
# LABEL/ID_NEW_CASES
#: LABEL/ID_NEW_CASES
msgid "New Cases"
msgstr "New Cases"
msgid "% New Cases"
msgstr "% New Cases"
# TRANSLATION
# LABEL/ID_COMPLETED_CASES
@@ -18490,8 +18490,8 @@ msgstr "Completed Cases"
# TRANSLATION
# LABEL/ID_WORKING_CASES
#: LABEL/ID_WORKING_CASES
msgid "Working Cases"
msgstr "Working Cases"
msgid "% In Progress"
msgstr "% In Progress"
# TRANSLATION
# LABEL/ID_BARS
@@ -18604,8 +18604,8 @@ msgstr "The field Type of indicator \"{0}\" is required."
# TRANSLATION
# LABEL/ID_MAX_INDICATOR_DASHBOARD
#: LABEL/ID_MAX_INDICATOR_DASHBOARD
msgid "Maximum number of tabs"
msgstr "Maximum number of tabs"
msgid "Maximum number of Indicators"
msgstr "Maximum number of Indicators"
# TRANSLATION
# LABEL/ID_USER_NAME_ALREADY_EXISTS
@@ -18649,6 +18649,132 @@ msgstr "The process has no type template Dynaform grid, this Dynaform is require
msgid "The user: {0} is other department manager."
msgstr "The user: {0} is other department manager."
# TRANSLATION
# LABEL/ID_STRATEGIC_DASHBOARD
#: LABEL/ID_STRATEGIC_DASHBOARD
msgid "KPI"
msgstr "KPI"
# TRANSLATION
# LABEL/ID_MANAGERS_DASHBOARDS
#: LABEL/ID_MANAGERS_DASHBOARDS
msgid "Managers dashboard"
msgstr "Managers dashboard"
# TRANSLATION
# LABEL/ID_PRO_EFFICIENCY_INDEX
#: LABEL/ID_PRO_EFFICIENCY_INDEX
msgid "[LABEL/ID_PRO_EFFICIENCY_INDEX] Process Efficiency Index"
msgstr "Process Efficiency Index"
# TRANSLATION
# LABEL/ID_EFFICIENCY_USER
#: LABEL/ID_EFFICIENCY_USER
msgid "User Efficiency"
msgstr "User Efficiency"
# TRANSLATION
# LABEL/ID_WELL_DONE
#: LABEL/ID_WELL_DONE
msgid "Well Done!"
msgstr "Well Done!"
# TRANSLATION
# LABEL/ID_NUMBER_CASES
#: LABEL/ID_NUMBER_CASES
msgid "Number cases"
msgstr "Number cases"
# TRANSLATION
# LABEL/ID_EFFICIENCY_INDEX
#: LABEL/ID_EFFICIENCY_INDEX
msgid "Efficiency Index"
msgstr "Efficiency Index"
# TRANSLATION
# LABEL/ID_INEFFICIENCY_COST
#: LABEL/ID_INEFFICIENCY_COST
msgid "Inefficiency Cost"
msgstr "Inefficiency Cost"
# TRANSLATION
# LABEL/ID_EFFICIENCY_COST
#: LABEL/ID_EFFICIENCY_COST
msgid "Efficiency cost"
msgstr "Efficiency cost"
# TRANSLATION
# LABEL/ID_RELATED_PROCESS
#: LABEL/ID_RELATED_PROCESS
msgid "Related Process"
msgstr "Related Process"
# TRANSLATION
# LABEL/ID_RELATED_GROUPS
#: LABEL/ID_RELATED_GROUPS
msgid "Related Groups"
msgstr "Related Groups"
# TRANSLATION
# LABEL/ID_RELATED_TASKS
#: LABEL/ID_RELATED_TASKS
msgid "Related Tasks"
msgstr "Related Tasks"
# TRANSLATION
# LABEL/ID_RELATED_USERS
#: LABEL/ID_RELATED_USERS
msgid "Related Users"
msgstr "Related Users"
# TRANSLATION
# LABEL/ID_PROCESS_TASKS
#: LABEL/ID_PROCESS_TASKS
msgid "Process's Task"
msgstr "Process's Task"
# TRANSLATION
# LABEL/ID_TIME_HOURS
#: LABEL/ID_TIME_HOURS
msgid "Time (Hours)"
msgstr "Time (Hours)"
# TRANSLATION
# LABEL/ID_HELP
#: LABEL/ID_HELP
msgid "Help"
msgstr "Help"
# TRANSLATION
# LABEL/ID_MIN_INDICATOR_DASHBOARD
#: LABEL/ID_MIN_INDICATOR_DASHBOARD
msgid "You can not delete more Indicators."
msgstr "You can not delete more Indicators."
# TRANSLATION
# LABEL/ID_DELETE_INDICATOR_SURE
#: LABEL/ID_DELETE_INDICATOR_SURE
msgid "Are you sure you want to delete this Indicator?"
msgstr "Are you sure you want to delete this Indicator?"
# TRANSLATION
# LABEL/ID_DIRECTION
#: LABEL/ID_DIRECTION
msgid "Direction"
msgstr "Direction"
# TRANSLATION
# LABEL/ID_UNTITLED_TASK
#: LABEL/ID_UNTITLED_TASK
msgid "Untitled task"
msgstr "Untitled task"
# TRANSLATION
# LABEL/ID_GOAL_HELP
#: LABEL/ID_GOAL_HELP
msgid "(Goal value)"
msgstr "(Goal value)"
# additionalTables/additionalTablesData.xml?ADD_TAB_NAME
# additionalTables/additionalTablesData.xml
#: text - ADD_TAB_NAME

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

@@ -1410,7 +1410,7 @@ SELECT 'LABEL','ID_LOGOUT','en','Logout','2014-01-15'
UNION ALL
SELECT 'LABEL','ID_MY_ACCOUNT','en','My account','2014-01-15'
UNION ALL
SELECT 'LABEL','ID_USERS','en','Users','2014-01-15'
SELECT 'LABEL','ID_USERS','en','Users','2015-03-30'
UNION ALL
SELECT 'LABEL','ID_CASES','en','HOME','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 is 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-01-16'
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 is 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 />','2014-01-15'
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
@@ -7610,21 +7610,21 @@ SELECT 'LABEL','ID_SECOND_FIGURE','en','Second Graph','2015-03-09'
UNION ALL
SELECT 'LABEL','ID_DASHBOARD_OWNER_SUCCESS_DELETE','en','Owner Dashboard has been deleted correctly.','2015-03-09'
UNION ALL
SELECT 'LABEL','ID_PROCESS_EFFICIENCE','en','Process Efficience Index','2015-03-09'
SELECT 'LABEL','ID_PROCESS_EFFICIENCE','en','Process Efficiency Index','2015-04-01'
UNION ALL
SELECT 'LABEL','ID_PROCESS_INEFFICIENCE','en','Process Inefficience Cost','2015-03-09'
SELECT 'LABEL','ID_PROCESS_INEFFICIENCE','en','Process Inefficiency Cost','2015-04-01'
UNION ALL
SELECT 'LABEL','ID_EMPLYEE_EFFICIENCIE','en','Employee Efficience Index','2015-03-09'
UNION ALL
SELECT 'LABEL','ID_USER_INEFFICIENCE','en','Inefficience Cost By User','2015-03-09'
UNION ALL
SELECT 'LABEL','ID_OVER_DUE','en','% Over due','2015-03-09'
SELECT 'LABEL','ID_OVER_DUE','en','% Overdue','2015-04-01'
UNION ALL
SELECT 'LABEL','ID_NEW_CASES','en','New Cases','2015-03-09'
SELECT 'LABEL','ID_NEW_CASES','en','% New Cases','2015-04-06'
UNION ALL
SELECT 'LABEL','ID_COMPLETED_CASES','en','Completed Cases','2015-03-09'
UNION ALL
SELECT 'LABEL','ID_WORKING_CASES','en','Working Cases','2015-03-09'
SELECT 'LABEL','ID_WORKING_CASES','en','% In Progress','2015-04-06'
UNION ALL
SELECT 'LABEL','ID_BARS','en','Bars','2015-03-09'
UNION ALL
@@ -7636,7 +7636,7 @@ SELECT 'LABEL','ID_QUARTER','en','Quarter','2015-03-09'
UNION ALL
SELECT 'LABEL','ID_SEMESTER','en','Semester','2015-03-09'
UNION ALL
SELECT 'LABEL','ID_YEAR','en','Year','2015-03-09'
SELECT 'LABEL','ID_YEAR','en','Year','2015-03-30'
UNION ALL
SELECT 'LABEL','ID_SET_MANAGER','en','Set Manager','2015-03-09'
UNION ALL
@@ -7662,7 +7662,7 @@ SELECT 'LABEL','ID_INDICATOR_TITLE_REQUIRED','en','The field Title of indicator
UNION ALL
SELECT 'LABEL','ID_INDICATOR_TYPE_REQUIRED','en','The field Type of indicator "{0}" is required.','2015-03-18'
UNION ALL
SELECT 'LABEL','ID_MAX_INDICATOR_DASHBOARD','en','Maximum number of tabs','2015-03-18'
SELECT 'LABEL','ID_MAX_INDICATOR_DASHBOARD','en','Maximum number of Indicators','2015-03-31'
UNION ALL
SELECT 'LABEL','ID_USER_NAME_ALREADY_EXISTS','en','The User Name with {0}: "{1}" already exists.','2015-03-23'
UNION ALL
@@ -7677,6 +7677,50 @@ SELECT 'LABEL','ID_CONSOLIDATED_CASE_LIST','en','Consolidated Case List','2015-0
SELECT 'LABEL','ID_CONSOLIDATED_DYNAFORM_REQUIRED','en','The process has no type template Dynaform grid, this Dynaform is required','2015-03-24'
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'
UNION ALL
SELECT 'LABEL','ID_MANAGERS_DASHBOARDS','en','Managers dashboard','2015-03-30'
UNION ALL
SELECT 'LABEL','ID_PRO_EFFICIENCY_INDEX','en','Process Efficiency Index','2015-03-30'
UNION ALL
SELECT 'LABEL','ID_EFFICIENCY_USER','en','User Efficiency','2015-03-30'
UNION ALL
SELECT 'LABEL','ID_WELL_DONE','en','Well Done!','2015-03-30'
UNION ALL
SELECT 'LABEL','ID_NUMBER_CASES','en','Number cases','2015-03-30'
UNION ALL
SELECT 'LABEL','ID_EFFICIENCY_INDEX','en','Efficiency Index','2015-03-30'
UNION ALL
SELECT 'LABEL','ID_INEFFICIENCY_COST','en','Inefficiency Cost','2015-03-30'
UNION ALL
SELECT 'LABEL','ID_EFFICIENCY_COST','en','Efficiency cost','2015-03-30'
UNION ALL
SELECT 'LABEL','ID_RELATED_PROCESS','en','Related Process','2015-03-30'
UNION ALL
SELECT 'LABEL','ID_RELATED_GROUPS','en','Related Groups','2015-03-30'
UNION ALL
SELECT 'LABEL','ID_RELATED_TASKS','en','Related Tasks','2015-03-30'
UNION ALL
SELECT 'LABEL','ID_RELATED_USERS','en','Related Users','2015-03-30'
UNION ALL
SELECT 'LABEL','ID_PROCESS_TASKS','en','Process''s Task','2015-03-30'
;
INSERT INTO [TRANSLATION] ([TRN_CATEGORY],[TRN_ID],[TRN_LANG],[TRN_VALUE],[TRN_UPDATE_DATE])
SELECT 'LABEL','ID_TIME_HOURS','en','Time (Hours)','2015-03-30'
UNION ALL
SELECT 'LABEL','ID_HELP','en','Help','2015-04-06'
UNION ALL
SELECT 'LABEL','ID_MIN_INDICATOR_DASHBOARD','en','You can not delete more Indicators.','2015-03-31'
UNION ALL
SELECT 'LABEL','ID_DELETE_INDICATOR_SURE','en','Are you sure you want to delete this Indicator?','2015-03-31'
UNION ALL
SELECT 'LABEL','ID_DIRECTION','en','Direction','2015-03-31'
UNION ALL
SELECT 'LABEL','ID_UNTITLED_TASK','en','Untitled task','2015-04-01'
UNION ALL
SELECT 'LABEL','ID_GOAL_HELP','en','(Goal value)','2015-04-06'
;
INSERT INTO ISO_LOCATION ([IC_UID],[IL_UID],[IL_NAME],[IL_NORMAL_NAME],[IS_UID])

46
workflow/engine/data/mysql/insert.sql
View File

@@ -1400,7 +1400,7 @@ INSERT INTO TRANSLATION (TRN_CATEGORY,TRN_ID,TRN_LANG,TRN_VALUE,TRN_UPDATE_DATE
( 'LABEL','ID_AVAILABLE_TRIGGERS','en','Available Triggers','2014-01-15') ,
( 'LABEL','ID_LOGOUT','en','Logout','2014-01-15') ,
( 'LABEL','ID_MY_ACCOUNT','en','My account','2014-01-15') ,
( 'LABEL','ID_USERS','en','Users','2014-01-15') ,
( 'LABEL','ID_USERS','en','Users','2015-03-30') ,
( 'LABEL','ID_CASES','en','HOME','2014-01-15') ,
( 'LABEL','ID_APPLICATIONS','en','DESIGNER','2014-01-15') ,
( 'LABEL','ID_RULES_AND_USER_GROUPS','en','Rules and user groups','2014-01-15') ,
@@ -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 is 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-01-16') ,
( '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 is 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 />','2014-01-15') ,
( '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') ,
@@ -4538,20 +4538,20 @@ INSERT INTO TRANSLATION (TRN_CATEGORY,TRN_ID,TRN_LANG,TRN_VALUE,TRN_UPDATE_DATE
( 'LABEL','ID_PERIODICITY','en','Periodicity','2015-03-09') ,
( 'LABEL','ID_SECOND_FIGURE','en','Second Graph','2015-03-09') ,
( 'LABEL','ID_DASHBOARD_OWNER_SUCCESS_DELETE','en','Owner Dashboard has been deleted correctly.','2015-03-09') ,
( 'LABEL','ID_PROCESS_EFFICIENCE','en','Process Efficience Index','2015-03-09') ,
( 'LABEL','ID_PROCESS_INEFFICIENCE','en','Process Inefficience Cost','2015-03-09') ,
( 'LABEL','ID_PROCESS_EFFICIENCE','en','Process Efficiency Index','2015-04-01') ,
( 'LABEL','ID_PROCESS_INEFFICIENCE','en','Process Inefficiency Cost','2015-04-01') ,
( 'LABEL','ID_EMPLYEE_EFFICIENCIE','en','Employee Efficience Index','2015-03-09') ,
( 'LABEL','ID_USER_INEFFICIENCE','en','Inefficience Cost By User','2015-03-09') ,
( 'LABEL','ID_OVER_DUE','en','% Over due','2015-03-09') ,
( 'LABEL','ID_NEW_CASES','en','New Cases','2015-03-09') ,
( 'LABEL','ID_OVER_DUE','en','% Overdue','2015-04-01') ,
( 'LABEL','ID_NEW_CASES','en','% New Cases','2015-04-06') ,
( 'LABEL','ID_COMPLETED_CASES','en','Completed Cases','2015-03-09') ,
( 'LABEL','ID_WORKING_CASES','en','Working Cases','2015-03-09') ,
( 'LABEL','ID_WORKING_CASES','en','% In Progress','2015-04-06') ,
( 'LABEL','ID_BARS','en','Bars','2015-03-09') ,
( 'LABEL','ID_LINES','en','Lines','2015-03-09') ,
( 'LABEL','ID_MONTH','en','Month','2015-03-09') ,
( 'LABEL','ID_QUARTER','en','Quarter','2015-03-09') ,
( 'LABEL','ID_SEMESTER','en','Semester','2015-03-09') ,
( 'LABEL','ID_YEAR','en','Year','2015-03-09') ,
( 'LABEL','ID_YEAR','en','Year','2015-03-30') ,
( 'LABEL','ID_SET_MANAGER','en','Set Manager','2015-03-09') ,
( 'LABEL','ID_SET_MANAGER_SUCCESS','en','Manager assigned correctly','2015-03-09') ,
( 'LABEL','ID_DELETE_MANAGER','en','You cannot unassign the manager','2015-03-09') ,
@@ -4564,14 +4564,37 @@ INSERT INTO TRANSLATION (TRN_CATEGORY,TRN_ID,TRN_LANG,TRN_VALUE,TRN_UPDATE_DATE
( 'LABEL','ID_INDICATOR_PROCESS_REQUIRED','en','The field Process of indicator "{0}" is required.','2015-03-18') ,
( 'LABEL','ID_INDICATOR_TITLE_REQUIRED','en','The field Title of indicator "{0}" is required.','2015-03-18') ,
( 'LABEL','ID_INDICATOR_TYPE_REQUIRED','en','The field Type of indicator "{0}" is required.','2015-03-18') ,
( 'LABEL','ID_MAX_INDICATOR_DASHBOARD','en','Maximum number of tabs','2015-03-18') ,
( 'LABEL','ID_MAX_INDICATOR_DASHBOARD','en','Maximum number of Indicators','2015-03-31') ,
( 'LABEL','ID_USER_NAME_ALREADY_EXISTS','en','The User Name with {0}: "{1}" already exists.','2015-03-23') ,
( 'LABEL','ID_LESS_THAN','en','less than','2015-03-23') ,
( 'LABEL','ID_MORE_THAN','en','more than','2015-03-23') ,
( 'LABEL','ID_CASE_NO_CURRENT_TASKS_BECAUSE_CASE_ITS_COMPLETED','en','There are no current tasks because case {0}: {1} has COMPLETED status','2015-03-24') ,
( '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_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_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') ,
( 'LABEL','ID_WELL_DONE','en','Well Done!','2015-03-30') ,
( 'LABEL','ID_NUMBER_CASES','en','Number cases','2015-03-30') ,
( 'LABEL','ID_EFFICIENCY_INDEX','en','Efficiency Index','2015-03-30') ,
( 'LABEL','ID_INEFFICIENCY_COST','en','Inefficiency Cost','2015-03-30') ,
( 'LABEL','ID_EFFICIENCY_COST','en','Efficiency cost','2015-03-30') ,
( 'LABEL','ID_RELATED_PROCESS','en','Related Process','2015-03-30') ,
( 'LABEL','ID_RELATED_GROUPS','en','Related Groups','2015-03-30') ,
( 'LABEL','ID_RELATED_TASKS','en','Related Tasks','2015-03-30') ,
( 'LABEL','ID_RELATED_USERS','en','Related Users','2015-03-30') ,
( 'LABEL','ID_PROCESS_TASKS','en','Process''s Task','2015-03-30') ;
INSERT INTO TRANSLATION (TRN_CATEGORY,TRN_ID,TRN_LANG,TRN_VALUE,TRN_UPDATE_DATE ) VALUES
( 'LABEL','ID_TIME_HOURS','en','Time (Hours)','2015-03-30') ,
( 'LABEL','ID_HELP','en','Help','2015-04-06') ,
( 'LABEL','ID_MIN_INDICATOR_DASHBOARD','en','You can not delete more Indicators.','2015-03-31') ,
( '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') ;
INSERT INTO ISO_LOCATION (IC_UID,IL_UID,IL_NAME,IL_NORMAL_NAME,IS_UID) VALUES
('AD','','',' ','') ,
@@ -59958,4 +59981,3 @@ INSERT INTO CATALOG (CAT_UID, CAT_LABEL_ID, CAT_TYPE, CAT_FLAG, CAT_OBSERVATION,
('1060','ID_NEW_CASES','INDICATOR','','','2015-03-04','2015-03-04'),
('1070','ID_COMPLETED_CASES','INDICATOR','','','2015-03-04','2015-03-04'),
('1080','ID_WORKING_CASES','INDICATOR','','','2015-03-04','2015-03-04');

5
workflow/engine/menus/processmaker.php
View File

@@ -48,11 +48,11 @@ if ($RBAC->userCanAccess('PM_DASHBOARD') == 1) {
// ADMIN MODULE
if ($RBAC->userCanAccess('PM_SETUP') == 1 || $RBAC->userCanAccess('PM_USERS') == 1) {
$G_TMP_MENU->AddIdRawOption('SETUP', 'setup/main', G::LoadTranslation('ID_SETUP'), '', '', '', 'x-pm-setup');
$G_TMP_MENU->AddIdRawOption('SETUP', 'setup/main', strtolower(G::LoadTranslation('ID_SETUP')), '', '', '', 'x-pm-setup');
}
/*----------------------------------********---------------------------------*/
// NEW DASHBOARD MODULE
/*NEW DASHBOARD MODULE*/
$licensedFeatures = & PMLicensedFeatures::getSingleton();
if ($licensedFeatures->verifyfeature('r19Vm5DK1UrT09MenlLYjZxejlhNUZ1b1NhV0JHWjBsZEJ6dnpJa3dTeWVLVT0=') && ($RBAC->userCanAccess('PM_SETUP') == 1 || $RBAC->userCanAccess('PM_USERS') == 1)) {
$G_TMP_MENU->AddIdRawOption('DASHBOARD+', 'strategicDashboard/main', G::LoadTranslation('ID_STRATEGIC_DASHBOARD'), '', '', '', 'x-pm-dashboard');
@@ -63,4 +63,3 @@ if ($licensedFeatures->verifyfeature('r19Vm5DK1UrT09MenlLYjZxejlhNUZ1b1NhV0JHWjB
if( file_exists(PATH_CORE . 'menus/plugin.php') ) {
require_once(PATH_CORE . 'menus/plugin.php');
}

2
workflow/engine/methods/services/soap2.php
View File

@@ -761,7 +761,7 @@ function NewCase ($params)
if (! is_object( $val->value )) {
$val->name = $filter->validateInput($val->name);
$val->value = $filter->validateInput($val->value);
eval( "\$field[" . $val->name . "]= \$val->value;" );
eval( "\$field['" . $val->name . "']= \$val->value;" );
}
}
}

17
workflow/engine/methods/users/usersAjax.php
View File

@@ -158,7 +158,10 @@ switch ($_POST['action']) {
$lastName = $form['USR_LASTNAME'] ? " - Last Name: ". $form['USR_LASTNAME'] : "";
$email = $form['USR_EMAIL'] ? " - Email: ". $form['USR_EMAIL'] : "";
$dueDate = $form['USR_DUE_DATE'] ? " - Due Date: ". $form['USR_DUE_DATE'] : "";
$status = $form['USR_STATUS'] ? " - Status: ". $form['USR_STATUS'] : "";
$status = "";
if(isset($form['USR_STATUS'])){
$status = $form['USR_STATUS'] ? " - Status: ". $form['USR_STATUS'] : "";
}
$address = $form['USR_ADDRESS'] ? " - Address: ". $form['USR_ADDRESS'] : "";
$phone = $form['USR_PHONE'] ? " - Phone: ". $form['USR_PHONE'] : "";
$zipCode = $form['USR_ZIP_CODE'] ? " - Zip Code: ". $form['USR_ZIP_CODE'] : "";
@@ -539,6 +542,10 @@ switch ($_POST['action']) {
$menuSelected = strtoupper(G::LoadTranslation('ID_DASHBOARD'));
break;
}
} else {
if($aFields['PREF_DEFAULT_MENUSELECTED'] == 'PM_STRATEGIC_DASHBOARD'){
$menuSelected = strtoupper(G::LoadTranslation('ID_STRATEGIC_DASHBOARD'));
}
}
}
}
@@ -595,6 +602,14 @@ switch ($_POST['action']) {
case 'PM_DASHBOARD':
$rows[] = Array('id' => 'PM_DASHBOARD', 'name' => strtoupper(G::LoadTranslation('ID_DASHBOARD'))
);
/*----------------------------------********---------------------------------*/
// NEW DASHBOARD MODULE
$licensedFeatures = & PMLicensedFeatures::getSingleton();
if ($licensedFeatures->verifyfeature('r19Vm5DK1UrT09MenlLYjZxejlhNUZ1b1NhV0JHWjBsZEJ6dnpJa3dTeWVLVT0=')) {
$rows[] = Array('id' => 'PM_STRATEGIC_DASHBOARD', 'name' => strtoupper(G::LoadTranslation('ID_STRATEGIC_DASHBOARD'))
);
}
/*----------------------------------********---------------------------------*/
break;
}
}

100
workflow/engine/skinEngine/base/error404.php
View File

@@ -1,3 +1,39 @@
<?php
$http = (isset($_SERVER["HTTPS"]) && $_SERVER["HTTPS"] == "on")? "https" : "http";
$host = $_SERVER["SERVER_NAME"] . (($_SERVER["SERVER_PORT"] != "80")? ":" . $_SERVER["SERVER_PORT"] : "");
$urlLogin = $http . "://" . $host . "/sys/en/neoclassic/login/login";
$urlHome = $urlLogin;
if (isset($_GET["url"]) && $_GET["url"] != "") {
$url = urldecode($_GET["url"]);
$url = explode("/", $url);
$sysSys = "";
$sysLang = "";
$sysSkin = "";
if (isset($url[1]) && preg_match("/^sys(.+)$/", $url[1], $match)) {
$sysSys = $match[1];
}
if (isset($url[2])) {
$sysLang = $url[2];
}
if (isset($url[3])) {
$sysSkin = $url[3];
}
if ($sysSys != "" && $sysLang != "" && $sysSkin != "") {
$urlLogin = $http . "://" . $host . "/sys" . $sysSys . "/" . $sysLang . "/" . $sysSkin . "/login/login";
$urlHome = $http . "://" . $host . "/sys" . $sysSys . "/" . $sysLang . "/" . $sysSkin . "/cases/main";
}
}
?>
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<META http-equiv="Content-Type" content="text/html; charset=utf-8" />
@@ -16,15 +52,14 @@
<!-- Header -->
<div id="header">
<table border="0" cellspacing="0" cellpadding="0" width="90%"><tr>
<td align="left"><img src="images/colosa.png" alt="www.colosa.com" id="colosa" /></td>
<td align="center">
<h2>Oops, page not found!</h2>
<h5>This page may be busy or the URL incorrect.</h5>
</td>
<td align="right"><img src="images/processmaker.logo2.png" alt="www.colosa.com" id="colosa" /></td>
</tr></table>
<table border="0" cellspacing="0" cellpadding="0" width="90%">
<tr>
<td align="center">
<h2>Oops, page not found!</h2>
<h5>This page may be busy or the URL incorrect.</h5>
</td>
</tr>
</table>
</div>
<!-- End Header -->
@@ -43,16 +78,14 @@
</ul>
<ul>
<br/>
<h3>Lost? We suggest...</h3>
<h3>What you can do?</h3>
<!-- End info text -->
<br/>
<!-- Page links -->
<ul id="textInfo">
<li><a href="http://www.processmakerblog.com/" target="_blank">PROCESSMAKER BLOG</a></li>
<li><a href="http://wiki.processmaker.com/index.php/Main_Page" target="_blank">DOCUMENTATION</a></li>
<li><a href="http://forum.processmaker.com/" target="_blank">FORUM</a></li>
<li><a href="http://library.processmaker.com/" target="_blank">LIBRARY</a></li>
<li><a href="http://bugs.processmaker.com/my_view_page.php" target="_blank">BUG TRACKER</a></li>
<li>You might try retyping the URL and trying again.</li>
<li>Or we could take you back to the <a href="<?php echo $urlHome; ?>">home page.</a></li>
<li>Or you could start again from the <a href="<?php echo $urlLogin; ?>">login page.</a></li>
</ul>
<!-- End page links -->
</div>
@@ -69,41 +102,8 @@
<!-- Footer -->
<div id="footer">
<!-- Twitter -->
<img src="images/pm.png" alt="twitter" id="twitter" />
<p id="twitter_text">
<a href= "http://www.processmaker.com/privacy-statement" target="_blank"> Privacy Statement </a>| <a href= "http://www.processmaker.com/security-statement" target="_blank">Security Statement </a> | <a href= "http://www.processmaker.com/terms-of-service" target="_blank"> Terms of Service </a> | <a href= "http://www.processmaker.com/commercial-license" target="_blank"> Commercial License </a> | <a href= "http://www.processmaker.com/contact-us" target="_blank"> Contact Us </a>| <a href= "http://feeds.feedburner.com/processmaker" target="_blank"> RSS </a>
&#169; Copyright 2000 - <?php echo date('Y'); ?> Colosa, Inc. <a href= "http://www.colosa.com/" target="_blank"> www.colosa.com </a>
</p>
<!-- End Twitter -->
<div id="socialmedia" style="float: left; text-align: right;margin-top: 20px;">
<a href="https://www.facebook.com/processmaker" target="_blank">
<img height="25" width="25" alt="Facebook" src="images/socialmedia/fb.png">
</a>
<a href="http://twitter.com/processmaker" target="_blank">
<img height="25" width="25" alt="Twitter" src="images/socialmedia/tw.png">
</a>
<a href="http://www.youtube.com/processmaker#play/uploads" target="_blank">
<img height="25" width="25" alt="YouTube" src="images/socialmedia/yb.png">
</a>
<a href="http://feeds.feedburner.com/processmaker" target="_blank">
<img height="25" width="25" alt="RSS" src="images/socialmedia/rs.png">
</a>
</div>
<!-- Search Form -->
<!--<form action="#" method="post">
<p id="searchform">
<input type="submit" name="submit" id="submit" value="Search" />
<input type="text" name="search" id="search" />
</p>
</form>-->
<!-- End Search form -->
<div style="clear:both;"></div>
<div id="footer" style="padding-top: 10px; color: #878787; font-size: 10px; text-align: center;">
<span>&#169; Copyright 2000 - <?php echo date("Y"); ?> </span>
</div>
<!-- End Footer -->

32
workflow/engine/skinEngine/neoclassic/css/style.css
View File

@@ -486,14 +486,7 @@ span.XtreeMinus:hover {
/* Theme leimnud.module.grid END */
/* Menues */
TD.mainMenuBG {
background-image: url(/skins/neoclassic/images/ext/gray/toolbar/bg.gif);
background-repeat: repeat-x;
/*height: 25px;*/
left: 46px;
top: 72px;
direction: ltr;
text-align: left;
vertical-align: top;
}
TD.mainMenu {
background-image: url(/skins/neoclassic/images/classic/bm.jpg);
@@ -3262,7 +3255,6 @@ table.DynarchCalendar-titleCont {
}
/*Menu Principal*/
#pm_main_table .mainMenuBG {
background: #676767;
}
ul#pm_menu {
list-style: none;
@@ -3272,21 +3264,27 @@ ul#pm_menu {
ul#pm_menu li {
float: left;
padding: 0;
height: 25px;
margin-top: 6.5px;
}
ul#pm_menu a {
color: #fff;
font-size: 13px;
color: #7b7c80;
font-size: 15px;
text-decoration: none;
display: block;
padding: 0px 25px;
text-transform: uppercase;
line-height: 25px;
text-transform: capitalize;
font-weight: bold;
padding: 16px 3px 3px 3px;
margin: 0 12px 0 12px;
}
ul#pm_menu a:hover {
color:#3397e1;
}
ul#pm_menu li.SelectedMenu a{
color:#3397e1;
border-bottom: 2px solid #3397e1;
}
ul#pm_menu li.SelectedMenu,
ul#pm_menu li:hover {
background: #00a1e4;
}
ul#pm_submenu {
list-style: none;
@@ -3485,5 +3483,5 @@ button.x-btn-text:focus,
}
.logo_company {
padding-left: 10px;
padding: 7px 10px;
}

100
workflow/engine/skinEngine/neoclassic/error404.php
View File

@@ -1,6 +1,40 @@
<?php if (function_exists("http_response_code")) {
http_response_code(404);
}?>
}
$http = (isset($_SERVER["HTTPS"]) && $_SERVER["HTTPS"] == "on")? "https" : "http";
$host = $_SERVER["SERVER_NAME"] . (($_SERVER["SERVER_PORT"] != "80")? ":" . $_SERVER["SERVER_PORT"] : "");
$urlLogin = $http . "://" . $host . "/sys/en/neoclassic/login/login";
$urlHome = $urlLogin;
if (isset($_GET["url"]) && $_GET["url"] != "") {
$url = urldecode($_GET["url"]);
$url = explode("/", $url);
$sysSys = "";
$sysLang = "";
$sysSkin = "";
if (isset($url[1]) && preg_match("/^sys(.+)$/", $url[1], $match)) {
$sysSys = $match[1];
}
if (isset($url[2])) {
$sysLang = $url[2];
}
if (isset($url[3])) {
$sysSkin = $url[3];
}
if ($sysSys != "" && $sysLang != "" && $sysSkin != "") {
$urlLogin = $http . "://" . $host . "/sys" . $sysSys . "/" . $sysLang . "/" . $sysSkin . "/login/login";
$urlHome = $http . "://" . $host . "/sys" . $sysSys . "/" . $sysLang . "/" . $sysSkin . "/cases/main";
}
}
?>
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<META http-equiv="Content-Type" content="text/html; charset=utf-8" />
@@ -19,15 +53,14 @@
<!-- Header -->
<div id="header">
<table border="0" cellspacing="0" cellpadding="0" width="90%"><tr>
<td align="left"><img src="images/colosa.png" alt="www.colosa.com" id="colosa" /></td>
<td align="center">
<h2>Oops, page not found!</h2>
<h5>This page may be busy or the URL incorrect.</h5>
</td>
<td align="right"><img src="images/processmaker.logo2.png" alt="www.colosa.com" id="colosa" /></td>
</tr></table>
<table border="0" cellspacing="0" cellpadding="0" width="90%">
<tr>
<td align="center">
<h2>Oops, page not found!</h2>
<h5>This page may be busy or the URL incorrect.</h5>
</td>
</tr>
</table>
</div>
<!-- End Header -->
@@ -46,16 +79,14 @@
</ul>
<ul>
<br/>
<h3>Lost? We suggest...</h3>
<h3>What you can do?</h3>
<!-- End info text -->
<br/>
<!-- Page links -->
<ul id="textInfo">
<li><a href="http://www.processmakerblog.com/" target="_blank">PROCESSMAKER BLOG</a></li>
<li><a href="http://wiki.processmaker.com/index.php/Main_Page" target="_blank">DOCUMENTATION</a></li>
<li><a href="http://forum.processmaker.com/" target="_blank">FORUM</a></li>
<li><a href="http://library.processmaker.com/" target="_blank">LIBRARY</a></li>
<li><a href="http://bugs.processmaker.com/my_view_page.php" target="_blank">BUG TRACKER</a></li>
<li>You might try retyping the URL and trying again.</li>
<li>Or we could take you back to the <a href="<?php echo $urlHome; ?>">home page.</a></li>
<li>Or you could start again from the <a href="<?php echo $urlLogin; ?>">login page.</a></li>
</ul>
<!-- End page links -->
</div>
@@ -72,41 +103,8 @@
<!-- Footer -->
<div id="footer">
<!-- Twitter -->
<img src="images/pm.png" alt="twitter" id="twitter" />
<p id="twitter_text">
<a href= "http://www.processmaker.com/privacy-statement" target="_blank"> Privacy Statement </a>| <a href= "http://www.processmaker.com/security-statement" target="_blank">Security Statement </a> | <a href= "http://www.processmaker.com/terms-of-service" target="_blank"> Terms of Service </a> | <a href= "http://www.processmaker.com/commercial-license" target="_blank"> Commercial License </a> | <a href= "http://www.processmaker.com/contact-us" target="_blank"> Contact Us </a>| <a href= "http://feeds.feedburner.com/processmaker" target="_blank"> RSS </a>
&#169; Copyright 2000 - <?php echo date('Y'); ?> Colosa, Inc. <a href= "http://www.colosa.com/" target="_blank"> www.colosa.com </a>
</p>
<!-- End Twitter -->
<div id="socialmedia" style="float: left; text-align: right;margin-top: 20px;">
<a href="https://www.facebook.com/processmaker" target="_blank">
<img height="25" width="25" alt="Facebook" src="images/socialmedia/fb.png">
</a>
<a href="http://twitter.com/processmaker" target="_blank">
<img height="25" width="25" alt="Twitter" src="images/socialmedia/tw.png">
</a>
<a href="http://www.youtube.com/processmaker#play/uploads" target="_blank">
<img height="25" width="25" alt="YouTube" src="images/socialmedia/yb.png">
</a>
<a href="http://feeds.feedburner.com/processmaker" target="_blank">
<img height="25" width="25" alt="RSS" src="images/socialmedia/rs.png">
</a>
</div>
<!-- Search Form -->
<!--<form action="#" method="post">
<p id="searchform">
<input type="submit" name="submit" id="submit" value="Search" />
<input type="text" name="search" id="search" />
</p>
</form>-->
<!-- End Search form -->
<div style="clear:both;"></div>
<div id="footer" style="padding-top: 10px; color: #878787; font-size: 10px; text-align: center;">
<span>&#169; Copyright 2000 - <?php echo date("Y"); ?> </span>
</div>
<!-- End Footer -->

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

@@ -8,12 +8,18 @@
<body>
<table width="100%" height="100%" cellpadding="0" cellspacing="0" border="0" id="pm_main_table">
<tr>
<td id="pm_header" valign="top">
<td id="pm_header" valign="top" {if $user_logged neq '' or $tracker neq ''}style="border-bottom:1px solid #e7e7e7;"{/if}>
<table width="100%" height="32" border="0" cellspacing="0" cellpadding="0" bgcolor="#FFFFFF">
<tr>
{if $user_logged neq '' or $tracker neq ''}
<td width="50%" rowspan="2" valign="center"><img src="{$logo_company}" class="logo_company"/></td>
<td width="50%" height="16" align="right" valign="top">
<td rowspan="2" style="vertical-align:top;width: 245px;"><img src="{$logo_company}" class="logo_company"/></td>
<td class="mainMenuBG" rowspan="2" valign="center" >
{include file="$tpl_menu"}
{if (count($subMenus)>0) }
{include file= "$tpl_submenu"}
{/if}
</td>
<td height="16" align="right" valign="top">
<div align="right" class="logout">
<small>
{if $user_logged neq ''}
@@ -37,7 +43,7 @@
{/if}
</tr>
<tr>
<td width="50%" height="16" valign="bottom" class="title">
<td height="16" valign="bottom" class="title">
<div align="right"></div>
</td>
</tr>
@@ -47,25 +53,6 @@
<tr>
<td>
<table width="100%" cellspacing="0" cellpadding="0" border="0" >
<tr>
{if $user_logged neq '' or $tracker neq ''}
<td width="100%" class="mainMenuBG" style="height:25px">
{include file="$tpl_menu"}
</td>
{else}
<td width="100%" style="height:25px">
</td>
{/if}
</tr>
{if (count($subMenus)>0) }
<tr>
<td >
<table width="100%" cellpadding="0" cellspacing="0" border="0">
<tr><td width="100%" class="mainMenuBG">{include file= "$tpl_submenu"}</td></tr>
</table>
</td>
</tr>
{/if}
<tr>
<td width="100%" align="center">
{php}

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

@@ -1,5 +1,5 @@
<!DOCTYPE html>
<html>
<html style="height:97%">
<head>
<title>PMDynaform</title>
<meta charset="utf-8">
@@ -18,8 +18,8 @@
<script type="text/javascript" src="/lib/pmdynaform/libs/html5/html5.js"></script>
<script type="text/javascript" src="/lib/pmdynaform/libs/respondjs/respond.min.js"></script>
</head>
<body>
<div id="container"></div>
<body style="height:100%">
<div id="container" style="height:100% display:none"></div>
###TEMPLATES###
<script type="text/javascript" src="/lib/pmdynaform/libs/underscore/underscore-1.6.js"></script>
<script type="text/javascript" src="/lib/pmdynaform/build/js/PMDynaform.js"></script>

3
workflow/engine/templates/processes/main.js
View File

@@ -647,10 +647,11 @@ editProcess = function(typeParam)
if (type == "bpmn") {
url = '../designer?prj_uid=' + pro_uid;
openWindowIfIE(url);
} else {
url = 'processes_Map?PRO_UID=' + pro_uid;
location.href = url;
}
openWindowIfIE(url);
}
editNewProcess = function(){

15
workflow/engine/templates/setup/newSite.js
View File

@@ -39,8 +39,19 @@ Ext.onReady(function(){
xtype:'textfield',
value:'wf_sample',
width: 200,
regex: /^\w+$/,
autoCreate: {tag: 'input', type: 'text', size: '20', autocomplete: 'off', maxlength: '13'},
allowBlank: false
allowBlank: false,
msgTarget: 'under',
validator: function(v) {
var valueInputField= /^\w+$/.test(v)?true:"Invalid Workflow Database";
if (valueInputField==true) {
Ext.getCmp('_idTest').enable();
}else{
Ext.getCmp('_idTest').disable();
}
return valueInputField;
}
},
/*{
id: 'AO_DB_RB',
@@ -131,6 +142,7 @@ Ext.onReady(function(){
},
{
id: '_idTest',
text: _('ID_TEST'),
handler: TestSite
}
@@ -143,6 +155,7 @@ Ext.onReady(function(){
});
function resetfields(){
formNewSite.getForm().reset();
Ext.getCmp('_idTest').enable();
}
function TestSite(){
formNewSite.getForm().submit({

13
workflow/public_html/app.php
View File

@@ -1,4 +1,15 @@
<?php
register_shutdown_function(
create_function(
"",
"
if (class_exists(\"Propel\")) {
Propel::close();
}
"
)
);
/*
* ProcessMaker Web Application Bootstrap
*/
@@ -30,7 +41,7 @@ try {
}
$loader->add($rootDir . 'workflow/engine/src/', "ProcessMaker");
$loader->add($rootDir . 'workflow/engine/src/');
// add vendors to autoloader
$loader->add($rootDir . 'vendor/luracast/restler/vendor', "Luracast");
$loader->add($rootDir . 'vendor/bshaffer/oauth2-server-php/src/', "OAuth2");