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

Validacion para aceptar vacio para el campo out_doc_pdf_security_permissions en OUTPUTDOCUMENTS

Browse Source
This commit is contained in:
Freddy Daniel Rojas Valda
2014-01-16 09:35:11 -04:00
parent e8b4d3d9c1
commit be2d3434aa
3 changed files with 32 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

83
workflow/engine/src/BusinessModel/CaseScheduler.php
View File

@@ -144,6 +144,7 @@ class CaseScheduler
$sDateTmp = date( 'Y-m-d' ); $sDateTmp = date( 'Y-m-d' );
} }
$sTimeTmp = $aData['SCH_START_TIME']; $sTimeTmp = $aData['SCH_START_TIME'];
//echo $sDateTmp ." ------- " .$sTimeTmp; die();
// $aData['SCH_START_TIME'] = date( 'Y-m-d', strtotime( $sDateTmp ) ) . ' ' . date( 'H:i:s', strtotime( $sTimeTmp ) ); // $aData['SCH_START_TIME'] = date( 'Y-m-d', strtotime( $sDateTmp ) ) . ' ' . date( 'H:i:s', strtotime( $sTimeTmp ) );
// $aData['SCH_START_DATE'] = date( 'Y-m-d', strtotime( $sDateTmp ) ) . ' ' . date( 'H:i:s', strtotime( $sTimeTmp ) ); // $aData['SCH_START_DATE'] = date( 'Y-m-d', strtotime( $sDateTmp ) ) . ' ' . date( 'H:i:s', strtotime( $sTimeTmp ) );
$nActualTime = $aData['SCH_START_TIME']; // time(); $nActualTime = $aData['SCH_START_TIME']; // time();
@@ -167,8 +168,8 @@ class CaseScheduler
$aData['SCH_WEEK_DAYS'] = '1|2|3|4|5|'; //check $aData['SCH_WEEK_DAYS'] = '1|2|3|4|5|'; //check
break; break;
case '3': // Every [n] Days case '3': // Every [n] Days
$sDaysPerformTask = $aData['SCH_DAYS_PERFORM_TASK_OPT_3']; $sDaysPerformTask = $aData['SCH_DAYS_PERFORM_TASK'];
$aData['SCH_DAYS_PERFORM_TASK'] = $aData['SCH_DAYS_PERFORM_TASK'] . '|' . $aData['SCH_DAYS_PERFORM_TASK_OPT_3']; $aData['SCH_DAYS_PERFORM_TASK'] = $aData['SCH_DAYS_PERFORM_TASK'];
break; break;
} }
break; break;
@@ -182,47 +183,22 @@ class CaseScheduler
$sWeeks = ''; $sWeeks = '';
if (! empty( $aData['SCH_WEEK_DAYS'] )) { if (! empty( $aData['SCH_WEEK_DAYS'] )) {
$aWeekDays = $aData['SCH_WEEK_DAYS']; $aWeekDays = $aData['SCH_WEEK_DAYS'];
foreach ($aWeekDays as $value) {
$sWeeks = $sWeeks . $value . '|';
}
}
if (! empty( $aData['SCH_WEEK_DAYS_2'] )) {
$aWeekDays2 = $aData['SCH_WEEK_DAYS_2'];
foreach ($aWeekDays2 as $value) {
$sWeeks = $sWeeks . $value . '|';
}
} }
$sStartTime = $aData['SCH_START_TIME']; $sStartTime = $aData['SCH_START_TIME'];
$aData['SCH_WEEK_DAYS'] = $sWeeks; $sWeeks = $aData['SCH_WEEK_DAYS'];
break; break;
case '3': case '3':
$nStartDay = $aData['SCH_START_DAY']; $nStartDay = $aData['SCH_START_DAY'];
if ($nStartDay == 1) { if ($nStartDay == 1) {
$aData['SCH_START_DAY'] = $nStartDay . '|' . $aData['SCH_START_DAY_OPT_1']; $aData['SCH_START_DAY'] = $nStartDay . '|' . $aData['SCH_START_DAY_OPT_1'];
} else { } else {
$aData['SCH_START_DAY'] = $nStartDay . '|' . $aData['SCH_START_DAY_OPT_2_WEEKS'] . '|' . $aData['SCH_START_DAY_OPT_2_DAYS_WEEK']; $aData['SCH_START_DAY'] = $nStartDay . '|' . $aData['SCH_START_DAY_OPT_2'];
} }
$sMonths = ''; $sMonths = '';
if (! empty( $aData['SCH_MONTHS'] )) { if (! empty( $aData['SCH_MONTHS'] )) {
$aMonths = $aData['SCH_MONTHS']; $aMonths = $aData['SCH_MONTHS'];
foreach ($aMonths as $value) {
$sMonths = $sMonths . $value . '|';
} }
} $sMonths = $aData['SCH_MONTHS'];
if (! empty( $aData['SCH_MONTHS_2'] )) {
$aMonths2 = $aData['SCH_MONTHS_2'];
foreach ($aMonths2 as $value) {
$sMonths = $sMonths . $value . '|';
}
}
if (! empty( $aData['SCH_MONTHS_3'] )) {
$aMonths3 = $aData['SCH_MONTHS_3'];
foreach ($aMonths3 as $value) {
$sMonths = $sMonths . $value . '|';
}
}
$aData['SCH_MONTHS'] = $sMonths;
$sStartDay = $aData['SCH_START_DAY']; $sStartDay = $aData['SCH_START_DAY'];
$sValue = $nStartDay; $sValue = $nStartDay;
break; break;
@@ -246,16 +222,11 @@ class CaseScheduler
} }
} }
} else { } else {
/* echo $sOption; echo " - ";
echo $sValue; echo " - "; echo $nActualTime; echo " - "; echo $sDaysPerformTask; echo " - "; echo $sWeeks;
echo " - "; echo $sStartDay; echo " - "; echo $sMonths; echo " - "; echo $sDateTmp; die();
*/ echo "1*".$sOption." 2*". $sValue." 3*". $nActualTime." 4*". $sDaysPerformTask." 5*". $sWeeks." 6*". $sStartDay ." 7*". $sMonths."<br>";
echo $sOption."*". $sValue."*". $nActualTime."*". $sDaysPerformTask."*". $sWeeks."*". $sStartDay ."*". $sMonths."<br>";
$aData['SCH_TIME_NEXT_RUN'] = $oCaseScheduler->updateNextRun( $sOption, $sValue, $nActualTime, $sDaysPerformTask, $sWeeks, $sStartDay, $sMonths, $sDateTmp ); $aData['SCH_TIME_NEXT_RUN'] = $oCaseScheduler->updateNextRun( $sOption, $sValue, $nActualTime, $sDaysPerformTask, $sWeeks, $sStartDay, $sMonths, $sDateTmp );
echo $aData['SCH_TIME_NEXT_RUN']; die (); echo "<br> SCH_TIME_NEXT_RUN ".$aData['SCH_TIME_NEXT_RUN'];
} }
} else { } else {
if ($sOption == '4') { if ($sOption == '4') {
$aData['SCH_END_DATE'] = $aData['SCH_START_TIME']; $aData['SCH_END_DATE'] = $aData['SCH_START_TIME'];
@@ -350,8 +321,8 @@ class CaseScheduler
$aData['SCH_WEEK_DAYS'] = '1|2|3|4|5|'; $aData['SCH_WEEK_DAYS'] = '1|2|3|4|5|';
break; break;
case '3': // Every [n] Days case '3': // Every [n] Days
$sDaysPerformTask = $aData['SCH_DAYS_PERFORM_TASK_OPT_3']; $sDaysPerformTask = $aData['SCH_DAYS_PERFORM_TASK'];
$aData['SCH_DAYS_PERFORM_TASK'] = $aData['SCH_DAYS_PERFORM_TASK'] . '|' . $aData['SCH_DAYS_PERFORM_TASK_OPT_3']; $aData['SCH_DAYS_PERFORM_TASK'] = $aData['SCH_DAYS_PERFORM_TASK'];
break; break;
} }
break; break;
@@ -366,51 +337,25 @@ class CaseScheduler
$sWeeks = ''; $sWeeks = '';
if (! empty( $aData['SCH_WEEK_DAYS'] )) { if (! empty( $aData['SCH_WEEK_DAYS'] )) {
$aWeekDays = $aData['SCH_WEEK_DAYS']; $aWeekDays = $aData['SCH_WEEK_DAYS'];
foreach ($aWeekDays as $value) {
$sWeeks = $sWeeks . $value . '|';
}
}
if (! empty( $aData['SCH_WEEK_DAYS_2'] )) {
$aWeekDays2 = $aData['SCH_WEEK_DAYS_2'];
foreach ($aWeekDays2 as $value) {
$sWeeks = $sWeeks . $value . '|';
}
} }
$sStartTime = $aData['SCH_START_TIME']; $sStartTime = $aData['SCH_START_TIME'];
$aData['SCH_WEEK_DAYS'] = $sWeeks; $sWeeks = $aData['SCH_WEEK_DAYS'];
break; break;
case '3': case '3':
$nStartDay = $aData['SCH_START_DAY']; $nStartDay = $aData['SCH_START_DAY'];
if ($nStartDay == 1) { /* if ($nStartDay == 1) {
$aData['SCH_START_DAY'] = $nStartDay . '|' . $aData['SCH_START_DAY_OPT_1']; $aData['SCH_START_DAY'] = $nStartDay;
} else { } else {
$aData['SCH_START_DAY'] = $nStartDay . '|' . $aData['SCH_START_DAY_OPT_2_WEEKS'] . '|' . $aData['SCH_START_DAY_OPT_2_DAYS_WEEK']; $aData['SCH_START_DAY'] = $nStartDay . '|' . $aData['SCH_START_DAY_OPT_2_WEEKS'] . '|' . $aData['SCH_START_DAY_OPT_2_DAYS_WEEK'];
} }*/
$sMonths = ''; $sMonths = '';
if (! empty( $aData['SCH_MONTHS'] )) { if (! empty( $aData['SCH_MONTHS'] )) {
$aMonths = $aData['SCH_MONTHS']; $aMonths = $aData['SCH_MONTHS'];
foreach ($aMonths as $value) {
$sMonths = $sMonths . $value . '|';
}
}
if (! empty( $aData['SCH_MONTHS_2'] )) {
$aMonths2 = $aData['SCH_MONTHS_2'];
foreach ($aMonths2 as $value) {
$sMonths = $sMonths . $value . '|';
}
}
if (! empty( $aData['SCH_MONTHS_3'] )) {
$aMonths3 = $aData['SCH_MONTHS_3'];
foreach ($aMonths3 as $value) {
$sMonths = $sMonths . $value . '|';
}
} }
$aData['SCH_MONTHS'] = $sMonths; $aData['SCH_MONTHS'] = $sMonths;
$sStartDay = $aData['SCH_START_DAY']; $sStartDay = $aData['SCH_START_DAY'];
$sValue = $nStartDay; $sValue = $nStartDay;
break; break;
} }
if (trim( $aData['SCH_END_DATE'] ) != '') { if (trim( $aData['SCH_END_DATE'] ) != '') {
$aData['SCH_END_DATE'] = $aData['SCH_END_DATE']; $aData['SCH_END_DATE'] = $aData['SCH_END_DATE'];

4
workflow/engine/src/BusinessModel/OutputDocument.php
View File

@@ -231,7 +231,7 @@ class OutputDocument
$pemission = $aData['out_doc_pdf_security_permissions']; $pemission = $aData['out_doc_pdf_security_permissions'];
$pemission = explode("|", $pemission); $pemission = explode("|", $pemission);
foreach ($pemission as $row) { foreach ($pemission as $row) {
if ($row == "print" || $row == "modify" || $row == "copy" || $row == "forms") { if ($row == "print" || $row == "modify" || $row == "copy" || $row == "forms" || $row == "") {
$aData['out_doc_pdf_security_permissions'] = $aData['out_doc_pdf_security_permissions']; $aData['out_doc_pdf_security_permissions'] = $aData['out_doc_pdf_security_permissions'];
} else { } else {
throw (new \Exception( 'invalid value specified for `out_doc_pdf_security_permissions`')); throw (new \Exception( 'invalid value specified for `out_doc_pdf_security_permissions`'));
@@ -288,7 +288,7 @@ class OutputDocument
$pemission = $aData['out_doc_pdf_security_permissions']; $pemission = $aData['out_doc_pdf_security_permissions'];
$pemission = explode("|", $pemission); $pemission = explode("|", $pemission);
foreach ($pemission as $row) { foreach ($pemission as $row) {
if ($row == "print" || $row == "modify" || $row == "copy" || $row == "forms") { if ($row == "print" || $row == "modify" || $row == "copy" || $row == "forms" || $row == "") {
$aData['out_doc_pdf_security_permissions'] = $aData['out_doc_pdf_security_permissions']; $aData['out_doc_pdf_security_permissions'] = $aData['out_doc_pdf_security_permissions'];
} else { } else {
throw (new \Exception( 'invalid value specified for `out_doc_pdf_security_permissions`')); throw (new \Exception( 'invalid value specified for `out_doc_pdf_security_permissions`'));

11
workflow/engine/src/Services/Api/ProcessMaker/Project/CaseScheduler.php
View File

@@ -205,10 +205,19 @@ class CaseSchedulerStructure
public $sch_week_days; public $sch_week_days;
/** /**
* @var string {@from body} {@min 0} {@max 6} * @var string {@from body} {@choice 1,2}
*/ */
public $sch_start_day; public $sch_start_day;
/**
* @var string {@from body}
*/
public $sch_start_day_opt_1;
/**
* @var string {@from body}
*/
public $sch_start_day_opt_2;
/** /**
* @var string {@from body} {@min 0} {@max 24} * @var string {@from body} {@min 0} {@max 24}
*/ */