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

add new translations and fix observations

Browse Source
This commit is contained in:
Henry Jordan
2020-06-15 20:00:43 +00:00
parent 09cbb6061d
commit 56a9d5e114
5 changed files with 226 additions and 172 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

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

@@ -51877,3 +51877,45 @@ msgstr "KPI Calculate app"
#: LABEL/ID_TASK_SCHEDULER_CALCULATE_APP_DESC
msgid "Recalculate main KPI board information"
msgstr "Recalculate main KPI board information"
# TRANSLATION
# LABEL/ID_CUSTOM_SCHEDULE_SETTINGS
#: LABEL/ID_CUSTOM_SCHEDULE_SETTINGS
msgid "Custom schedule settings"
msgstr "Custom schedule settings"
# TRANSLATION
# LABEL/ID_CHOOSE_TIME
#: LABEL/ID_CHOOSE_TIME
msgid "Choose a time"
msgstr "Choose a time"
# TRANSLATION
# LABEL/ID_STARTING_TIME
#: LABEL/ID_STARTING_TIME
msgid "Starting time"
msgstr "Starting time"
# TRANSLATION
# LABEL/ID_ENDING_TIME
#: LABEL/ID_ENDING_TIME
msgid "Ending time"
msgstr "Ending time"
# TRANSLATION
# LABEL/ID_REPEAT_EVERY
#: LABEL/ID_REPEAT_EVERY
msgid "Repeat every"
msgstr "Repeat every"
# TRANSLATION
# LABEL/ID_REPEAT_ON
#: LABEL/ID_REPEAT_ON
msgid "Repeat on"
msgstr "Repeat on"
# TRANSLATION
# LABEL/ID_CUSTOM_SETTINGS
#: LABEL/ID_CUSTOM_SETTINGS
msgid "Custom settings"
msgstr "Custom settings"

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

@@ -56872,6 +56872,7 @@ INSERT INTO TRANSLATION (TRN_CATEGORY,TRN_ID,TRN_LANG,TRN_VALUE,TRN_UPDATE_DATE
( 'JAVASCRIPT','ID_EMPTY_NODENAME','en','The field name contains spaces or it''s empty!','2014-01-15') ,
( 'JAVASCRIPT','ID_ENABLE_WORKSPACE_CONFIRM','en','Do you want enable the selected workspace?','2014-01-15') ,
( 'JAVASCRIPT','ID_END_OF_PROCESS','en','End of process','2014-01-15') ,
( 'JAVASCRIPT','ID_ENDING_TIME','en','End of process','2014-01-15') ,
( 'JAVASCRIPT','ID_EVENTS','en','Events','2014-01-15') ,
( 'JAVASCRIPT','ID_EVENT_CONDITIONAL','en','Conditional Event','2014-01-15') ,
( 'JAVASCRIPT','ID_EVENT_MESSAGE','en','Message Event','2014-01-15') ;
@@ -57521,6 +57522,7 @@ INSERT INTO TRANSLATION (TRN_CATEGORY,TRN_ID,TRN_LANG,TRN_VALUE,TRN_UPDATE_DATE
( 'LABEL','ID_CHECK_WORKSPACE_CONFIGURATION','en','Check Workspace Configuration','2014-01-15') ,
( 'LABEL','ID_CHOOSE_OPTION','en','Choose an option','2014-01-15') ,
( 'LABEL','ID_CHOOSE_PROVIDER','en','Please select provider','2014-08-27') ,
( 'LABEL','ID_CHOOSE_TIME','en','Choose a time','2014-08-27') ,
( 'LABEL','ID_CLAIM','en','Claim','2014-01-15') ,
( 'LABEL','ID_CLASSIC_EDITOR','en','Classic Editor','2014-01-15') ,
( 'LABEL','ID_CLASS_ALREADY_EXISTS','en','Class already exists','2014-01-15') ,
@@ -57676,6 +57678,8 @@ INSERT INTO TRANSLATION (TRN_CATEGORY,TRN_ID,TRN_LANG,TRN_VALUE,TRN_UPDATE_DATE
( 'LABEL','ID_CUSTOM_CASES_LISTS','en','Custom Case List','2017-02-21') ,
( 'LABEL','ID_CUSTOM_TRIGGER','en','Custom Trigger','2014-01-15') ,
( 'LABEL','ID_CUSTOM_TRIGGER_DESCRIPTION','en','Custom Trigger','2014-01-15') ,
( 'LABEL','ID_CUSTOM_SCHEDULE_SETTINGS','en','Custom schedule settings','2014-01-15') ,
( 'LABEL','ID_CUSTOM_SETTINGS','en','Custom settings','2014-01-15') ,
( 'LABEL','ID_CYCLIC_ASSIGNMENT','en','Cyclic Assignment','2014-01-15') ,
( 'LABEL','ID_DASHBOARD','en','Dashboards','2015-03-09') ,
( 'LABEL','ID_DASHBOARD_BTNCOLUMNS1','en','One Column','2014-01-15') ,
@@ -58566,6 +58570,7 @@ INSERT INTO TRANSLATION (TRN_CATEGORY,TRN_ID,TRN_LANG,TRN_VALUE,TRN_UPDATE_DATE
( 'LABEL','ID_INVALID_SCH_START_TIME','en','Invalid value specified for sch_start_time. Expecting time in HH:MM format (The time can not be greater than 23:59)','2014-10-21') ,
( 'LABEL','ID_INVALID_START','en','Invalid value specified for start','2014-05-22') ,
( 'LABEL','ID_INVALID_START_HOURS','en','The following start hours rows are invalid:','2014-01-15') ,
( 'LABEL','ID_INVALID_STARTING_TIME','en','Starting time','2014-01-15') ,
( 'LABEL','ID_INVALID_TRIGGER','en','Invalid trigger ''{TRIGGER_INDEX}''','2014-01-15') ,
( 'LABEL','ID_INVALID_VALUE','en','Invalid value for "{0}".','2014-05-20') ,
( 'LABEL','ID_INVALID_VALUE_ARRAY','en','Invalid value for ''{0}''. It must be an array.','2014-10-21') ,
@@ -60688,6 +60693,8 @@ INSERT INTO TRANSLATION (TRN_CATEGORY,TRN_ID,TRN_LANG,TRN_VALUE,TRN_UPDATE_DATE
( 'LABEL','ID_RENAME','en','Rename','2014-01-15') ,
( 'LABEL','ID_RENEW','en','Renew','2014-09-18') ,
( 'LABEL','ID_REOPEN','en','re-open','2014-01-15') ,
( 'LABEL','ID_REPEAT_EVERY','en','Repeat every','2014-01-15') ,
( 'LABEL','ID_REPEAT_EVERY','en','Repeat on','2014-01-15') ,
( 'LABEL','ID_REPLACED_BY','en','Replaced by','2014-01-15') ,
( 'LABEL','ID_REPLACED_LOGO','en','The logo was replaced','2014-01-15') ,
( 'LABEL','ID_REPLACE_ALL','en','Replace all','2016-03-30') ,

15
workflow/engine/methods/scheduler/index.php
View File

@@ -17,11 +17,16 @@ try {
$fields["category"] = $category;
$fields["lang"] = SYS_LANG;
$fields["workspace"] = config("system.workspace");
$fields["translation"] = "/js/ext/translation.".SYS_LANG.".".G::browserCacheFilesGetUid().".js";
$fields["translation"] = "/js/ext/translation." . SYS_LANG . "." . G::browserCacheFilesGetUid() . ".js";
$G_PUBLISH->addContent('smarty','scheduler/index.html','', '', $fields); //Adding a HTML file .html
$G_PUBLISH->addContent('smarty',PATH_HOME . 'public_html/lib/taskscheduler/index.html'); //Adding a HTML file .html
G::RenderPage("publish", "raw");
$G_PUBLISH->addContent('smarty' , 'scheduler/index.html' , '', '' , $fields); //Adding a HTML file .html
$G_PUBLISH->addContent('smarty' , PATH_HOME . 'public_html/lib/taskscheduler/index.html'); //Adding a HTML file .html
G::RenderPage("publish" , "raw");
} catch (Exception $e) {
echo($e);
$message = [];
$message['MESSAGE'] = $e->getMessage();
$G_PUBLISH = new Publisher();
$G_PUBLISH->AddContent('xmlform', 'xmlform', 'login/showMessage', '', $message);
G::RenderPage('publish', 'blank');
die();
}

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

@@ -2,58 +2,12 @@
namespace ProcessMaker\BusinessModel;
use ProcessMaker\Model\TaskScheduler;
use ProcessMaker\Core\System;
use ProcessMaker\Model\TaskScheduler;
class TaskSchedulerBM
{
/**
* Return the records in Schedule Table by category
*/
public static function getSchedule($category)
{
$tasks = TaskScheduler::all();
$count = $tasks->count();
if ($count == 0) {
TaskSchedulerBM::generateInitialData();
$tasks = TaskScheduler::all();
}
if (is_null($category)) {
return $tasks;
} else {
return TaskScheduler::where('category', $category)->get();
}
}
/**
* Save the record Schedule in Schedule Table
*/
public static function saveSchedule(array $request)
{
$task = TaskScheduler::find($request['id']);
if (isset($request['enable'])) {
$task->enable = $request['enable'];
}
if (isset($request['expression'])) {
$task->expression = $request['expression'];
$task->startingTime = $request['startingTime'];
$task->endingTime = $request['endingTime'];
$task->timezone = $request['timezone'];
$task->everyOn = $request['everyOn'];
$task->interval = $request['interval'];
}
$task->save();
return $task;
}
/**
* Initial data for Schedule Table, with default values
*/
public static function generateInitialData()
{
$arraySystemConfiguration = System::getSystemConfiguration('', '', config("system.workspace"));
$toSave = [];
$services = [
public static $services = [
[
"title" => "ID_TASK_SCHEDULER_UNPAUSE",
"enable" => "0",
@@ -214,8 +168,54 @@ class TaskSchedulerBM
"description" => "ID_TASK_SCHEDULER_PM_PLUGINS_DESC"
]
];
/**
* Return the records in Schedule Table by category
*/
public static function getSchedule($category)
{
$tasks = TaskScheduler::all();
$count = $tasks->count();
if ($count == 0) {
TaskSchedulerBM::generateInitialData();
$tasks = TaskScheduler::all();
}
if (is_null($category)) {
return $tasks;
} else {
return TaskScheduler::where('category', $category)->get();
}
}
/**
* Save the record Schedule in Schedule Table
*/
public static function saveSchedule(array $request)
{
$task = TaskScheduler::find($request['id']);
if (isset($request['enable'])) {
$task->enable = $request['enable'];
}
foreach ($services as $service) {
if (isset($request['expression'])) {
$task->expression = $request['expression'];
$task->startingTime = $request['startingTime'];
$task->endingTime = $request['endingTime'];
$task->timezone = $request['timezone'];
$task->everyOn = $request['everyOn'];
$task->interval = $request['interval'];
}
$task->save();
return $task;
}
/**
* Initial data for Schedule Table, with default values
*/
public static function generateInitialData()
{
$arraySystemConfiguration = System::getSystemConfiguration('', '', config("system.workspace"));
$toSave = [];
foreach (TaskSchedulerBM::$services as $service) {
$task = new TaskScheduler;
$task->title = $service["title"];
$task->category = $service["category"];