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

BUG 7162 Adjustment adding default value for Case Scheduler schema.

Browse Source
This commit is contained in:
Hector Cortez
2011-07-04 16:50:57 -04:00
parent 1ff483f45e
commit 80728423c4
4 changed files with 28 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
workflow/engine/classes/model/om/BaseCaseScheduler.php
View File

@@ -102,14 +102,14 @@ abstract class BaseCaseScheduler extends BaseObject implements Persistent {
* The value for the sch_last_state field. * The value for the sch_last_state field.
* @var string * @var string
*/ */
protected $sch_last_state; protected $sch_last_state = '';
/** /**
* The value for the usr_uid field. * The value for the usr_uid field.
* @var string * @var string
*/ */
protected $usr_uid; protected $usr_uid = '';
/** /**
@@ -137,7 +137,7 @@ abstract class BaseCaseScheduler extends BaseObject implements Persistent {
* The value for the sch_days_perform_task field. * The value for the sch_days_perform_task field.
* @var string * @var string
*/ */
protected $sch_days_perform_task; protected $sch_days_perform_task = '';
/** /**
@@ -158,7 +158,7 @@ abstract class BaseCaseScheduler extends BaseObject implements Persistent {
* The value for the sch_start_day field. * The value for the sch_start_day field.
* @var string * @var string
*/ */
protected $sch_start_day; protected $sch_start_day = '';
/** /**
@@ -179,14 +179,14 @@ abstract class BaseCaseScheduler extends BaseObject implements Persistent {
* The value for the sch_repeat_every field. * The value for the sch_repeat_every field.
* @var string * @var string
*/ */
protected $sch_repeat_every; protected $sch_repeat_every = '';
/** /**
* The value for the sch_repeat_until field. * The value for the sch_repeat_until field.
* @var string * @var string
*/ */
protected $sch_repeat_until; protected $sch_repeat_until = '';
/** /**
@@ -830,7 +830,7 @@ abstract class BaseCaseScheduler extends BaseObject implements Persistent {
$v = (string) $v; $v = (string) $v;
} }
if ($this->sch_last_state !== $v) { if ($this->sch_last_state !== $v || $v === '') {
$this->sch_last_state = $v; $this->sch_last_state = $v;
$this->modifiedColumns[] = CaseSchedulerPeer::SCH_LAST_STATE; $this->modifiedColumns[] = CaseSchedulerPeer::SCH_LAST_STATE;
} }
@@ -852,7 +852,7 @@ abstract class BaseCaseScheduler extends BaseObject implements Persistent {
$v = (string) $v; $v = (string) $v;
} }
if ($this->usr_uid !== $v) { if ($this->usr_uid !== $v || $v === '') {
$this->usr_uid = $v; $this->usr_uid = $v;
$this->modifiedColumns[] = CaseSchedulerPeer::USR_UID; $this->modifiedColumns[] = CaseSchedulerPeer::USR_UID;
} }
@@ -944,7 +944,7 @@ abstract class BaseCaseScheduler extends BaseObject implements Persistent {
$v = (string) $v; $v = (string) $v;
} }
if ($this->sch_days_perform_task !== $v) { if ($this->sch_days_perform_task !== $v || $v === '') {
$this->sch_days_perform_task = $v; $this->sch_days_perform_task = $v;
$this->modifiedColumns[] = CaseSchedulerPeer::SCH_DAYS_PERFORM_TASK; $this->modifiedColumns[] = CaseSchedulerPeer::SCH_DAYS_PERFORM_TASK;
} }
@@ -1010,7 +1010,7 @@ abstract class BaseCaseScheduler extends BaseObject implements Persistent {
$v = (string) $v; $v = (string) $v;
} }
if ($this->sch_start_day !== $v) { if ($this->sch_start_day !== $v || $v === '') {
$this->sch_start_day = $v; $this->sch_start_day = $v;
$this->modifiedColumns[] = CaseSchedulerPeer::SCH_START_DAY; $this->modifiedColumns[] = CaseSchedulerPeer::SCH_START_DAY;
} }
@@ -1078,7 +1078,7 @@ abstract class BaseCaseScheduler extends BaseObject implements Persistent {
$v = (string) $v; $v = (string) $v;
} }
if ($this->sch_repeat_every !== $v) { if ($this->sch_repeat_every !== $v || $v === '') {
$this->sch_repeat_every = $v; $this->sch_repeat_every = $v;
$this->modifiedColumns[] = CaseSchedulerPeer::SCH_REPEAT_EVERY; $this->modifiedColumns[] = CaseSchedulerPeer::SCH_REPEAT_EVERY;
} }
@@ -1100,7 +1100,7 @@ abstract class BaseCaseScheduler extends BaseObject implements Persistent {
$v = (string) $v; $v = (string) $v;
} }
if ($this->sch_repeat_until !== $v) { if ($this->sch_repeat_until !== $v || $v === '') {
$this->sch_repeat_until = $v; $this->sch_repeat_until = $v;
$this->modifiedColumns[] = CaseSchedulerPeer::SCH_REPEAT_UNTIL; $this->modifiedColumns[] = CaseSchedulerPeer::SCH_REPEAT_UNTIL;
} }

12
workflow/engine/config/schema.xml
View File

@@ -2563,19 +2563,19 @@
<column name="SCH_TIME_NEXT_RUN" type="TIMESTAMP" required="true"/> <column name="SCH_TIME_NEXT_RUN" type="TIMESTAMP" required="true"/>
<column name="SCH_LAST_RUN_TIME" type="TIMESTAMP" required="false"/> <column name="SCH_LAST_RUN_TIME" type="TIMESTAMP" required="false"/>
<column name="SCH_STATE" type="VARCHAR" size="15" required="true" default="ACTIVE"/> <column name="SCH_STATE" type="VARCHAR" size="15" required="true" default="ACTIVE"/>
<column name="SCH_LAST_STATE" type="VARCHAR" size="60" required="true"/> <column name="SCH_LAST_STATE" type="VARCHAR" size="60" required="true" default="" />
<column name="USR_UID" type="VARCHAR" size="32" required="true"/> <column name="USR_UID" type="VARCHAR" size="32" required="true" default="" />
<column name="SCH_OPTION" type="TINYINT" required="true" default="0"/> <column name="SCH_OPTION" type="TINYINT" required="true" default="0"/>
<column name="SCH_START_TIME" type="TIMESTAMP" required="true"/> <column name="SCH_START_TIME" type="TIMESTAMP" required="true"/>
<column name="SCH_START_DATE" type="TIMESTAMP" required="true"/> <column name="SCH_START_DATE" type="TIMESTAMP" required="true"/>
<column name="SCH_DAYS_PERFORM_TASK" type="CHAR" size="5" required="true"/> <column name="SCH_DAYS_PERFORM_TASK" type="CHAR" size="5" required="true" default="" />
<column name="SCH_EVERY_DAYS" type="TINYINT" required="false" default="0"/> <column name="SCH_EVERY_DAYS" type="TINYINT" required="false" default="0"/>
<column name="SCH_WEEK_DAYS" type="CHAR" size="14" required="true" default="0|0|0|0|0|0|0"/> <column name="SCH_WEEK_DAYS" type="CHAR" size="14" required="true" default="0|0|0|0|0|0|0"/>
<column name="SCH_START_DAY" type="CHAR" size="6" required="true"/> <column name="SCH_START_DAY" type="CHAR" size="6" required="true" default="" />
<column name="SCH_MONTHS" type="CHAR" size="24" required="true" default="0|0|0|0|0|0|0|0|0|0|0|0"/> <column name="SCH_MONTHS" type="CHAR" size="24" required="true" default="0|0|0|0|0|0|0|0|0|0|0|0"/>
<column name="SCH_END_DATE" type="TIMESTAMP" required="false"/> <column name="SCH_END_DATE" type="TIMESTAMP" required="false"/>
<column name="SCH_REPEAT_EVERY" type="VARCHAR" size="15" required="true"/> <column name="SCH_REPEAT_EVERY" type="VARCHAR" size="15" required="true" default="" />
<column name="SCH_REPEAT_UNTIL" type="VARCHAR" size="15" required="true"/> <column name="SCH_REPEAT_UNTIL" type="VARCHAR" size="15" required="true" default="" />
<column name="SCH_REPEAT_STOP_IF_RUNNING" type="TINYINT" required="false" default="0"/> <column name="SCH_REPEAT_STOP_IF_RUNNING" type="TINYINT" required="false" default="0"/>
<column name="CASE_SH_PLUGIN_UID" type="VARCHAR" size="100" required="false"/> <column name="CASE_SH_PLUGIN_UID" type="VARCHAR" size="100" required="false"/>
</table> </table>

12
workflow/engine/data/mysql/schema.sql
View File

@@ -1239,19 +1239,19 @@ CREATE TABLE `CASE_SCHEDULER`
`SCH_TIME_NEXT_RUN` DATETIME NOT NULL, `SCH_TIME_NEXT_RUN` DATETIME NOT NULL,
`SCH_LAST_RUN_TIME` DATETIME, `SCH_LAST_RUN_TIME` DATETIME,
`SCH_STATE` VARCHAR(15) default 'ACTIVE' NOT NULL, `SCH_STATE` VARCHAR(15) default 'ACTIVE' NOT NULL,
`SCH_LAST_STATE` VARCHAR(60) NOT NULL, `SCH_LAST_STATE` VARCHAR(60) default '' NOT NULL,
`USR_UID` VARCHAR(32) NOT NULL, `USR_UID` VARCHAR(32) default '' NOT NULL,
`SCH_OPTION` TINYINT default 0 NOT NULL, `SCH_OPTION` TINYINT default 0 NOT NULL,
`SCH_START_TIME` DATETIME NOT NULL, `SCH_START_TIME` DATETIME NOT NULL,
`SCH_START_DATE` DATETIME NOT NULL, `SCH_START_DATE` DATETIME NOT NULL,
`SCH_DAYS_PERFORM_TASK` CHAR(5) NOT NULL, `SCH_DAYS_PERFORM_TASK` CHAR(5) default '' NOT NULL,
`SCH_EVERY_DAYS` TINYINT default 0, `SCH_EVERY_DAYS` TINYINT default 0,
`SCH_WEEK_DAYS` CHAR(14) default '0|0|0|0|0|0|0' NOT NULL, `SCH_WEEK_DAYS` CHAR(14) default '0|0|0|0|0|0|0' NOT NULL,
`SCH_START_DAY` CHAR(6) NOT NULL, `SCH_START_DAY` CHAR(6) default '' NOT NULL,
`SCH_MONTHS` CHAR(24) default '0|0|0|0|0|0|0|0|0|0|0|0' NOT NULL, `SCH_MONTHS` CHAR(24) default '0|0|0|0|0|0|0|0|0|0|0|0' NOT NULL,
`SCH_END_DATE` DATETIME, `SCH_END_DATE` DATETIME,
`SCH_REPEAT_EVERY` VARCHAR(15) NOT NULL, `SCH_REPEAT_EVERY` VARCHAR(15) default '' NOT NULL,
`SCH_REPEAT_UNTIL` VARCHAR(15) NOT NULL, `SCH_REPEAT_UNTIL` VARCHAR(15) default '' NOT NULL,
`SCH_REPEAT_STOP_IF_RUNNING` TINYINT default 0, `SCH_REPEAT_STOP_IF_RUNNING` TINYINT default 0,
`CASE_SH_PLUGIN_UID` VARCHAR(100), `CASE_SH_PLUGIN_UID` VARCHAR(100),
PRIMARY KEY (`SCH_UID`) PRIMARY KEY (`SCH_UID`)

5
workflow/engine/methods/cases/cases_Scheduler_Save.php
View File

@@ -82,7 +82,10 @@ try {
$sMonths = ''; $sMonths = '';
$sStartDay = ''; $sStartDay = '';
$nSW = 0; $nSW = 0;
$aData['SCH_START_DAY'] = '';
$aData['SCH_REPEAT_EVERY'] = '';
$aData['SCH_REPEAT_UNTIL'] = '';
$aData['SCH_DAYS_PERFORM_TASK'] = '';
switch($sOption){ switch($sOption){
case '1' : // Option 1 case '1' : // Option 1
$sValue = $_POST['form']['SCH_DAYS_PERFORM_TASK']; $sValue = $_POST['form']['SCH_DAYS_PERFORM_TASK'];