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

PM-2576 "Support for Timer-Event (End-points and Backend)" SOLVED

Browse Source 
Issue:
    En la opcion every no se puede configurar horas y/o minutos menores a 10 ya que se muestra un error
Cause:
    Se valida el formato de los numeros
Solution:
    Se a cambiado el formato de validacion de numeros, ahora es posible
    definir "00, 01, ..., 09, ..." o "0, 1, ..., 9, ..."
This commit is contained in:
Victor Saisa Lopez
2015-07-13 16:58:36 -04:00
parent 39fdf60e3b
commit 560788e926
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
workflow/engine/src/ProcessMaker/BusinessModel/TimerEvent.php
View File

@@ -104,7 +104,7 @@ class TimerEvent
try {
$arrayData = array();
if (preg_match("/^([1-9]\d{3})\-(0[1-9]|1[0-2])\-([0][1-9]|[12][0-9]|3[01])(?:\s([0-1]\d|2[0-3])\:([0-5]\d)\:([0-5]\d))?$/", $datetime, $arrayMatch)) {
if (preg_match("/^([1-9]\d{3})\-(0[1-9]|1[0-2])\-(0[1-9]|[12][0-9]|3[01])(?:\s([0-1]\d|2[0-3])\:([0-5]\d)\:([0-5]\d))?$/", $datetime, $arrayMatch)) {
$arrayData[] = $arrayMatch[1]; //Year
$arrayData[] = $arrayMatch[2]; //Month
$arrayData[] = $arrayMatch[3]; //Day
@@ -498,9 +498,9 @@ class TimerEvent
$arrayFieldDefinition = array();
$arrayValidateData = array(
"TMREVN_DAY" => array("/^(?:[0][1-9]|[12][0-9]|3[01])$/", $this->arrayFieldNameForException["timerEventDay"]),
"TMREVN_HOUR" => array("/^(?:[0-1]\d|2[0-3])$/", $this->arrayFieldNameForException["timerEventHour"]),
"TMREVN_MINUTE" => array("/^(?:[0-5]\d)$/", $this->arrayFieldNameForException["timerEventMinute"])
"TMREVN_DAY" => array("/^(?:0[1-9]|[12][0-9]|3[01])$/", $this->arrayFieldNameForException["timerEventDay"]),
"TMREVN_HOUR" => array("/^(?:[0-1]\d|2[0-3])$/", $this->arrayFieldNameForException["timerEventHour"]),
"TMREVN_MINUTE" => array("/^(?:[0-5]\d)$/", $this->arrayFieldNameForException["timerEventMinute"])
);
switch ($arrayFinalData["TMREVN_OPTION"]) {
@@ -536,8 +536,8 @@ class TimerEvent
"TMREVN_MINUTE" => array("type" => "string", "required" => true, "empty" => false, "defaultValues" => array(), "fieldNameAux" => "timerEventMinute")
);
$arrayValidateData["TMREVN_HOUR"][0] = "/^(?:0|[1-9]\d*)$/";
$arrayValidateData["TMREVN_MINUTE"][0] = "/^(?:0|[1-9]\d*)$/";
$arrayValidateData["TMREVN_HOUR"][0] = "/^(?:0?\d|[1-9]\d*)$/";
$arrayValidateData["TMREVN_MINUTE"][0] = "/^(?:0?\d|[1-9]\d*)$/";
break;
case "ONE-DATE-TIME":
$arrayFieldDefinition = array(
@@ -548,9 +548,9 @@ class TimerEvent
//TMREVN_DAY
//TMREVN_HOUR
//TMREVN_MINUTE
$arrayValidateData["TMREVN_DAY"][0] = "/^(?:0|[1-9]\d*)$/";
$arrayValidateData["TMREVN_HOUR"][0] = "/^(?:0|[1-9]\d*)$/";
$arrayValidateData["TMREVN_MINUTE"][0] = "/^(?:0|[1-9]\d*)$/";
$arrayValidateData["TMREVN_DAY"][0] = "/^(?:0?\d|[1-9]\d*)$/";
$arrayValidateData["TMREVN_HOUR"][0] = "/^(?:0?\d|[1-9]\d*)$/";
$arrayValidateData["TMREVN_MINUTE"][0] = "/^(?:0?\d|[1-9]\d*)$/";
break;
case "WAIT-UNTIL-SPECIFIED-DATE-TIME":
$arrayFieldDefinition = array(