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

update translation and menu reporting

Browse Source
This commit is contained in:
Henry Jordan
2020-06-10 17:49:54 +00:00
parent 250ce984ee
commit 00d03dc450
5 changed files with 207 additions and 151 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

File diff suppressed because one or more lines are too long

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

@@ -51609,18 +51609,6 @@ msgstr "Clean self service tables"
msgid "Clean unused records for Self-Service Value-Based feature. It is a maintenance command"
msgstr "Clean unused records for Self-Service Value-Based feature. It is a maintenance command"
# TRANSLATION
# LABEL/ID_TASK_SCHEDULER_REPORT_USERS
#: LABEL/ID_TASK_SCHEDULER_REPORT_USERS
msgid "Report by users"
msgstr "Report by users"
# TRANSLATION
# LABEL/ID_TASK_SCHEDULER_REPORT_PROCESS
#: LABEL/ID_TASK_SCHEDULER_REPORT_PROCESS
msgid "Report by process"
msgstr "Report by process"
# TRANSLATION
# LABEL/ID_TASK_SCHEDULER_MESSAGE_EVENTS
#: LABEL/ID_TASK_SCHEDULER_MESSAGE_EVENTS
@@ -51645,13 +51633,6 @@ msgstr "Unassigned case"
msgid "Run the trigger for self-service cases that have a configured timeout setting"
msgstr "Run the trigger for self-service cases that have a configured timeout setting"
# TRANSLATION
# LABEL/ID_TASK_SCHEDULER_CALCULATE_APP
#: LABEL/ID_TASK_SCHEDULER_CALCULATE_APP
msgid "Calculate app data"
msgstr "Calculate app data"
# TRANSLATION
# LABEL/ID_TASK_SCHEDULER_CALCULATE_ELAPSED
#: LABEL/ID_TASK_SCHEDULER_CALCULATE_ELAPSED
@@ -51728,10 +51709,15 @@ msgstr "Years"
# LABEL/ID_MONTHS
#: LABEL/ID_MONTHS
msgid "Months"
msgstr "Months"
msgstr "Months"#
# TRANSLATION
# LABEL/ID_WEEK
TRANSLATION
# LABEL/ID_TASK_SCHEDULER_SEND_NOTIFICATIONS
#: LABEL/ID_TASK_SCHEDULER_SEND_NOTIFICATIONS
msgid "Actions by email response account email revision"
msgstr "Actions by email response account email revision"
ID_TASK_SCHEDULER_SEND_NOTIFICATIONS
#: LABEL/ID_WEEK
msgid "Week"
msgstr "Week"
@@ -51802,3 +51788,50 @@ msgstr "time in ${0}"
msgid "every ${0} ${1}"
msgstr "every ${0} ${1}"
# TRANSLATION
# LABEL/ID_TASK_SCHEDULER_REPORTING
#: LABEL/ID_TASK_SCHEDULER_REPORTING
msgid "Reporting"
msgstr "Reporting"
# TRANSLATION
# LABEL/ID_EVERY_HOUR
#: LABEL/ID_EVERY_HOUR
msgid "Every hour"
msgstr "Every hour"
# TRANSLATION
# LABEL/ID_TASK_SCHEDULER_REPORT_USERS
#: LABEL/ID_TASK_SCHEDULER_REPORT_USERS
msgid "KPI Report by user"
msgstr "KPI Report by user"
# TRANSLATION
# LABEL/ID_TASK_SCHEDULER_REPORT_USERS_DESC
#: LABEL/ID_TASK_SCHEDULER_REPORT_USERS_DESC
msgid "Recalculate KPI's information by user"
msgstr "Recalculate KPI's information by user"
# TRANSLATION
# LABEL/ID_TASK_SCHEDULER_REPORT_PROCESS
#: LABEL/ID_TASK_SCHEDULER_REPORT_PROCESS
msgid "KPI Report by process"
msgstr "KPI Report by process"
# TRANSLATION
# LABEL/ID_TASK_SCHEDULER_REPORT_PROCESS_DESC
#: LABEL/ID_TASK_SCHEDULER_REPORT_PROCESS_DESC
msgid "Recalculate KPI's information by process"
msgstr "Recalculate KPI's information by process"
# TRANSLATION
# LABEL/ID_TASK_SCHEDULER_CALCULATE_APP
#: LABEL/ID_TASK_SCHEDULER_CALCULATE_APP
msgid "KPI Calculate app"
msgstr "KPI Calculate app"
# TRANSLATION
# LABEL/ID_TASK_SCHEDULER_CALCULATE_APP_DESC
#: LABEL/ID_TASK_SCHEDULER_CALCULATE_APP_DESC
msgid "Recalculate main KPI board information"
msgstr "Recalculate main KPI board information"

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

@@ -58142,6 +58142,7 @@ INSERT INTO TRANSLATION (TRN_CATEGORY,TRN_ID,TRN_LANG,TRN_VALUE,TRN_UPDATE_DATE
( 'LABEL','ID_EVERY','en','every ${0} ${1}','2014-01-15') ,
( 'LABEL','ID_EVERY_MINUTE','en','Every minute','2014-01-15') ,
( 'LABEL','ID_EVERY_FIVE_MINUTES','en','Every five minutes','2014-01-15') ,
( 'LABEL','ID_EVERY_HOUR','en','Every hour','2014-01-15') ,
( 'LABEL','ID_EVERY_TEN_MINUTES','en','Every ten minutes','2014-01-15') ,
( 'LABEL','ID_EVERY_FIFTEEN_MINUTES','en','Every fifteen minutes','2014-01-15') ,
( 'LABEL','ID_EVERY_THIRTY_MINUTES','en','Every thirty minutes','2014-01-15') ,
@@ -61091,11 +61092,12 @@ INSERT INTO TRANSLATION (TRN_CATEGORY,TRN_ID,TRN_LANG,TRN_VALUE,TRN_UPDATE_DATE
( 'LABEL','ID_TASK_PROPERTIES_SAVE','en','Task properties has been saved successfully','2014-01-15') ,
( 'LABEL','ID_TASK_TRANSFER','en','Task Transfer Date','2014-01-15') ,
( 'LABEL','ID_TASK_WAS_ASSIGNED_TO_USER','en','Manual assignment shouldn''t be used with sub-processes.<br>The task "{0}" from case {1} was assigned to user <b>{2}</b> ( {3} {4} )','2015-02-24') ,
( 'LABEL','ID_TAS_DURATION_REQUIRE','en','Duration task required','2014-01-15') ,
( 'LABEL','ID_TAS_DURATION_REQUIRE','en','Duration task required','2014-0f-15') ,
( 'LABEL','ID_TASK_SCHEDULER','en','Task Scheduler','2014-01-15') ,
( 'LABEL','ID_TASK_SCHEDULER_ACTION_EMAIL','en','Action by Email Response','2014-01-15') ,
( 'LABEL','ID_TASK_SCHEDULER_ACTION_EMAIL_DESC','en','Action by email response account email revision','2014-01-15') ,
( 'LABEL','ID_TASK_SCHEDULER_CALCULATE_APP','en','Calculate app data','2014-01-15') ,
( 'LABEL','ID_TASK_SCHEDULER_CALCULATE_APP','en','KPI Calculate app','2014-01-15') ,
( 'LABEL','ID_TASK_SCHEDULER_CALCULATE_APP_DESC','en','Recalculate main KPI board information','2014-01-15') ,
( 'LABEL','ID_TASK_SCHEDULER_CALCULATE_ELAPSED','en','Calculated the elapsed time','2014-01-15') ,
( 'LABEL','ID_TASK_SCHEDULER_CALCULATE_ELAPSED_DESC','en','Calculates the elapsed time according to the configured calendar of all open tasks in active cases','2014-01-15') ,
( 'LABEL','ID_TASK_SCHEDULER_CASE_ACTIONS','en','Case actions','2014-01-15') ,
@@ -61113,8 +61115,11 @@ INSERT INTO TRANSLATION (TRN_CATEGORY,TRN_ID,TRN_LANG,TRN_VALUE,TRN_UPDATE_DATE
( 'LABEL','ID_TASK_SCHEDULER_PM_SYNC','en','ProcessMaker sync','2014-01-15') ,
( 'LABEL','ID_TASK_SCHEDULER_PM_EVENTS','en','ProcessMaker events','2014-01-15') ,
( 'LABEL','ID_TASK_SCHEDULER_PM_SCHEDULER','en','ProcessMaker scheduler','2014-01-15') ,
( 'LABEL','ID_TASK_SCHEDULER_REPORT_USERS','en','Report by users','2014-01-15') ,
( 'LABEL','ID_TASK_SCHEDULER_REPORT_PROCESS','en','Report by process','2014-01-15') ,
( 'LABEL','ID_TASK_SCHEDULER_REPORT_USERS','en','KPI Report by user','2014-01-15') ,
( 'LABEL','ID_TASK_SCHEDULER_REPORT_USERS_DESC','en',"Recalculate KPI's information by user",'2014-01-15') ,
( 'LABEL','ID_TASK_SCHEDULER_REPORTING','en','Reporting','2014-01-15') ,
( 'LABEL','ID_TASK_SCHEDULER_REPORT_PROCESS','en','KPI Report by process','2014-01-15') ,
( 'LABEL','ID_TASK_SCHEDULER_REPORT_PROCESS_DESC','en',"Recalculate KPI's information by process",'2014-01-15') ,
( 'LABEL','ID_TASK_SCHEDULER_SEND_NOT','en','Send notifications','2014-01-15') ,
( 'LABEL','ID_TASK_SCHEDULER_SEND_NOT_DESC','en','ProcessMaker mobile notifications','2014-01-15') ,
( 'LABEL','ID_TASK_SCHEDULER_UNASSIGNED','en','Unassigned case','2014-01-15') ,

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

@@ -317,4 +317,9 @@ if ($RBAC->userCanAccess('PM_TASK_SCHEDULER_ADMIN') === 1) {
G::LoadTranslation("ID_TASK_SCHEDULER_PM_SYNC"),
'', '', G::LoadTranslation("ID_TASK_SCHEDULER")
);
$G_TMP_MENU->AddIdRawOption(
'ID_MENU_REPORTING', '../scheduler/index?category=reporting',
G::LoadTranslation("ID_TASK_SCHEDULER_REPORTING"),
'', '', G::LoadTranslation("ID_TASK_SCHEDULER")
);
}

255
workflow/engine/src/ProcessMaker/BusinessModel/TaskSchedulerBM.php
View File

@@ -53,122 +53,83 @@ class TaskSchedulerBM
$arraySystemConfiguration = System::getSystemConfiguration('', '', config("system.workspace"));
$toSave = array();
$services = array(
array(
"title" => "ProcessMaker Events",
"service" => "events",
"category" => "case_actions",
"file" => "workflow/engine/bin/cron.php",
"startingTime" => "0:00",
"endingTime" => "23:59",
"expression" => "* * * * *",
"description" => "Unpauses any case whose pause time has expired"
),
array(
"title" => "ProcessMaker Scheduler",
"enable" => "1",
"service" => "scheduler",
"category" => "case_actions",
"file" => "workflow/engine/bin/cron.php",
"startingTime" => "0:00",
"endingTime" => "23:59",
"expression" => "* * */1 * *",
"description" => "Unpauses any case whose pause time has expired"
),
array(
"title" => "ID_TASK_SCHEDULER_UNPAUSE",
"enable" => "0",
"service" => "unpause",
"category" => "case_actions",
"file" => "workflow/engine/bin/cron.php",
"startingTime" => "0:00",
"endingTime" => "23:59",
"expression" => "* */1 * * *",
"startingTime" => null,
"endingTime" => null,
"everyOn" => "1",
"interval" => "week",
"expression" => "0 */1 * * 0,1,2,3,4,5,6",
"description" => "ID_TASK_SCHEDULER_UNPAUSE_DESC"
),
array(
"title" => "ID_TASK_SCHEDULER_CALCULATE_ELAPSED",
"enable" => "0",
"service" => "calculate",
"category" => "case_actions",
"file" => "workflow/engine/bin/cron.php",
"startingTime" => "0:00",
"endingTime" => "0:30",
"everyOn" => "1",
"interval" => "week",
"expression" => "0 */1 * * 0,1,2,3,4,5,6",
"description" => 'ID_TASK_SCHEDULER_CALCULATE_ELAPSED_DESC'
),
array(
"title" => "ID_TASK_SCHEDULER_UNASSIGNED",
"enable" => "0",
"service" => "unassigned-case",
"category" => "case_actions",
"file" => "workflow/engine/bin/cron.php",
"startingTime" => null,
"endingTime" => null,
"everyOn" => "1",
"interval" => "week",
"expression" => "0 */1 * * 0,1,2,3,4,5,6",
"description" => 'ID_TASK_SCHEDULER_UNASSIGNED_DESC'
),
array(
"title" => "ID_TASK_SCHEDULER_CLEAN_SELF",
"enable" => "0",
"service" => "clean-self-service-tables",
"category" => "case_actions",
"file" => "workflow/engine/bin/cron.php",
"startingTime" => "0:00",
"endingTime" => "0:30",
"everyOn" => "1",
"interval" => "week",
"expression" => "0 */1 * * 0,1,2,3,4,5,6",
"description" => 'ID_TASK_SCHEDULER_CLEAN_SELF_DESC'
),
array(
"title" => "ID_TASK_SCHEDULER_CASE_EMAILS",
"enable" => "1",
"service" => "emails",
"category" => "emails_notifications",
"file" => "workflow/engine/bin/cron.php",
"startingTime" => "0:00",
"endingTime" => "23:59",
"expression" => "*/5 * * * *",
"startingTime" => null,
"endingTime" => null,
"everyOn" => "1",
"interval" => "week",
"expression" => "*/5 * * * 0,1,2,3,4,5,6",
"description" => "ID_TASK_SCHEDULER_CASE_EMAILS_DESC"
),
array(
"title" => "ID_TASK_SCHEDULER_PM_PLUGINS",
"enable" => "0",
"service" => "plugins",
"category" => "plugins",
"file" => "workflow/engine/bin/cron.php",
"startingTime" => "0:00",
"endingTime" => "23:59",
"expression" => "* * */1 * *",
"description" => "ID_TASK_SCHEDULER_PM_PLUGINS_DESC"
),
array(
"title" => "ID_TASK_SCHEDULER_CALCULATE_ELAPSED",
"service" => "calculate",
"category" => "case_actions",
"file" => "workflow/engine/bin/cron.php",
"startingTime" => "0:00",
"endingTime" => "23:59",
"expression" => "* * */1 * *",
"description" => 'ID_TASK_SCHEDULER_CALCULATE_ELAPSED_DESC'
),
array(
"title" => "Calculate App data",
"service" => "calculateapp",
"category" => "case_actions",
"file" => "workflow/engine/bin/cron.php",
"startingTime" => "0:00",
"endingTime" => "23:59",
"expression" => "* * */1 * *",
"description" => 'Calculates the elapsed time "according to the configured calendar" of all open tasks in active cases'
),
array(
"title" => "ID_TASK_SCHEDULER_UNASSIGNED",
"service" => "unassigned-case",
"category" => "case_actions",
"file" => "workflow/engine/bin/cron.php",
"startingTime" => "0:00",
"endingTime" => "23:59",
"expression" => "* */1 * * *",
"description" => 'ID_TASK_SCHEDULER_UNASSIGNED_DESC'
),
array(
"title" => "ID_TASK_SCHEDULER_CLEAN_SELF",
"service" => "clean-self-service-tables",
"category" => "case_actions",
"file" => "workflow/engine/bin/cron.php",
"startingTime" => "0:00",
"endingTime" => "23:59",
"expression" => "* * */1 * *",
"description" => 'ID_TASK_SCHEDULER_CLEAN_SELF_DESC'
),
array(
"title" => "Report by Users",
"enable" => "0",
"service" => "report_by_user",
"category" => "case_actions",
"file" => "workflow/engine/bin/cron.php",
"startingTime" => "0:00",
"endingTime" => "23:59",
"expression" => "* */1 * * *",
"description" => "Report by Users"
),
array(
"title" => "Report by process",
"enable" => "0",
"service" => "report_by_process",
"category" => "case_actions",
"file" => "workflow/engine/bin/cron.php",
"startingTime" => "0:00",
"endingTime" => "23:59",
"expression" => "* */1 * * *",
"description" => "Report by process"
"title" => "ID_TASK_SCHEDULER_ACTION_EMAIL",
"enable" => "1",
"service" => "",
"category" => "emails_notifications",
"file" => "workflow/engine/bin/actionsByEmailEmailResponse.php",
"startingTime" => null,
"endingTime" => null,
"everyOn" => "1",
"interval" => "week",
"expression" => "*/5 * * * 0,1,2,3,4,5,6",
"description" => "ID_TASK_SCHEDULER_ACTION_EMAIL_DESC"
),
array(
"title" => "ID_TASK_SCHEDULER_MESSAGE_EVENTS",
@@ -176,21 +137,64 @@ class TaskSchedulerBM
"service" => "",
"category" => "emails_notifications",
"file" => "workflow/engine/bin/messageeventcron.php",
"startingTime" => "0:00",
"endingTime" => "23:59",
"expression" => "*/5 * * * *",
"startingTime" => null,
"endingTime" => null,
"everyOn" => "1",
"interval" => "week",
"expression" => "*/5 * * * 0,1,2,3,4,5,6",
"description" => "ID_TASK_SCHEDULER_MESSAGE_EVENTS_DESC"
),
array(
"title" => "ProcessMaker timer event cron",
"enable" => "0",
"title" => "ID_TASK_SCHEDULER_SEND_NOT",
"enable" => "1",
"service" => "",
"category" => "case_actions",
"file" => "workflow/engine/bin/timereventcron.php",
"startingTime" => "0:00",
"endingTime" => "23:59",
"expression" => "* * */1 * *",
"description" => "ProcessMaker timer event cron"
"category" => "emails_notifications",
"file" => "workflow/engine/bin/sendnotificationscron.php",
"startingTime" => null,
"endingTime" => null,
"everyOn" => "1",
"interval" => "week",
"expression" => "*/5 * * * 0,1,2,3,4,5,6",
"description" => "ID_TASK_SCHEDULER_SEND_NOT_DESC"
),
array(
"title" => "ID_TASK_SCHEDULER_REPORT_BY_USER",
"enable" => "0",
"service" => "report_by_user",
"category" => "reporting",
"file" => "workflow/engine/bin/cron.php",
"startingTime" => null,
"endingTime" => null,
"everyOn" => "1",
"interval" => "week",
"expression" => "*/10 * * * 0,1,2,3,4,5,6",
"description" => "ID_TASK_SCHEDULER_REPORT_BY_USER_DESC"
),
array(
"title" => "ID_TASK_SCHEDULER_REPORT_BY_PROCESS",
"enable" => "0",
"service" => "report_by_process",
"category" => "reporting",
"file" => "workflow/engine/bin/cron.php",
"startingTime" => null,
"endingTime" => null,
"everyOn" => "1",
"interval" => "week",
"expression" => "*/10 * * * 0,1,2,3,4,5,6",
"description" => "ID_TASK_SCHEDULER_REPORT_BY_PROCESS_DESC"
),
array(
"title" => "ID_TASK_SCHEDULER_CALCULATE_APP",
"enable" => "0",
"service" => "report_by_process",
"category" => "reporting",
"file" => "workflow/engine/bin/cron.php",
"startingTime" => null,
"endingTime" => null,
"everyOn" => "1",
"interval" => "week",
"expression" => "*/10 * * * 0,1,2,3,4,5,6",
"description" => "ID_TASK_SCHEDULER_CALCULATE_APP_DESC"
),
array(
"title" => "ID_TASK_SCHEDULER_LDAP",
@@ -199,15 +203,24 @@ class TaskSchedulerBM
"category" => "processmaker_sync",
"file" => "workflow/engine/bin/ldapcron.php",
"startingTime" => "0:00",
"endingTime" => "23:59",
"expression" => "* * */1 * *",
"service" => "",
"category" => "emails_notifications",
"file" => "workflow/engine/bin/actionsByEmailEmailResponse.php",
"endingTime" => "0:30",
"everyOn" => "1",
"interval" => "week",
"expression" => "0 */1 * * 0,1,2,3,4,5,6",
"description" => "ID_TASK_SCHEDULER_LDAP"
),
array(
"title" => "ID_TASK_SCHEDULER_PLUGINS",
"enable" => "0",
"service" => "plugins",
"category" => "plugins",
"file" => "workflow/engine/bin/ldapcron.php",
"startingTime" => "0:00",
"endingTime" => "23:59",
"expression" => "*/5 * * * *",
"description" => "ID_TASK_SCHEDULER_ACTION_EMAIL_DESC"
"endingTime" => "0:30",
"everyOn" => "1",
"interval" => "week",
"expression" => "0 */1 * * 0,1,2,3,4,5,6",
"description" => "ID_TASK_SCHEDULER_PLUGINS_DESC"
)
);
@@ -222,10 +235,10 @@ class TaskSchedulerBM
$task->expression = $services[$i]["expression"];
$task->type = "shell";
$task->system = 1;
$task->timezone = $arraySystemConfiguration['time_zone'];
//$task->timezone = $arraySystemConfiguration['time_zone'];
$task->enable = $services[$i]["enable"];
$task->startingTime = "0:00";
$task->endingTime = "23:59";
$task->everyOn = $services[$i]["everyOn"];
$task->interval = $services[$i]["interval"];
$task->save();
}
}