fernando/luos
1
0
Fork 0
Code Releases Activity

Merge pull request #206 from victorsl/BUG-9377

Browse Source 
BUG 9377 "APP_FINISH_DATE is set to 1902-01-01 00:00:00 when..." SOLVED
This commit is contained in:
julceslauhub
2012-07-10 08:09:57 -07:00
parent 5b420d115a 50b7c88f92
commit bb958e4c4f
6 changed files with 2987 additions and 2628 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4617
workflow/engine/classes/class.wsBase.php
View File

File diff suppressed because it is too large Load Diff

967
workflow/engine/classes/model/Application.php
View File

File diff suppressed because it is too large Load Diff

2
workflow/engine/classes/model/map/ApplicationMapBuilder.php
View File

@@ -88,7 +88,7 @@ class ApplicationMapBuilder {
$tMap->addColumn('APP_INIT_DATE', 'AppInitDate', 'int', CreoleTypes::TIMESTAMP, true, null);
$tMap->addColumn('APP_FINISH_DATE', 'AppFinishDate', 'int', CreoleTypes::TIMESTAMP, true, null);
$tMap->addColumn('APP_FINISH_DATE', 'AppFinishDate', 'int', CreoleTypes::TIMESTAMP, false, null);
$tMap->addColumn('APP_UPDATE_DATE', 'AppUpdateDate', 'int', CreoleTypes::TIMESTAMP, true, null);

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

@@ -33,7 +33,7 @@
<column name="APP_CUR_USER" type="VARCHAR" size="32" required="true" default=""/>
<column name="APP_CREATE_DATE" type="TIMESTAMP" required="true"/>
<column name="APP_INIT_DATE" type="TIMESTAMP" required="true"/>
<column name="APP_FINISH_DATE" type="TIMESTAMP" required="true"/>
<column name="APP_FINISH_DATE" type="TIMESTAMP" required="false"/>
<column name="APP_UPDATE_DATE" type="TIMESTAMP" required="true"/>
<column name="APP_DATA" type="LONGVARCHAR" required="true"/>
<column name="APP_PIN" type="VARCHAR" size="32" required="true" default=""/>
@@ -1172,7 +1172,7 @@
<column name="TAS_EVN_UID" type="VARCHAR" size="32" required="true" default=""/>
<column name="TAS_BOUNDARY" type="VARCHAR" size="32" required="true" default=""/>
<column name="TAS_DERIVATION_SCREEN_TPL" type="VARCHAR" size="128" default="" required="false"/>
<validator column="TAS_TYPE">
<rule name="validValues" value="NORMAL|ADHOC|SUBPROCESS|HIDDEN" message="Please select a valid value for TAS_TYPE."/>
</validator>

8
workflow/engine/methods/setup/setupSchemas/app_cache_view_insert.sql
View File

@@ -13,7 +13,7 @@ SELECT
APP_DELEGATION.TAS_UID,
APP_DELEGATION.PRO_UID,
substring(APP_DELEGATION.DEL_DELEGATE_DATE,1,19),
substring(APP_DELEGATION.DEL_INIT_DATE,1,19),
substring(APP_DELEGATION.DEL_INIT_DATE,1,19),
substring(APP_DELEGATION.DEL_TASK_DUE_DATE,1,19),
substring(APP_DELEGATION.DEL_FINISH_DATE,1,19),
APP_DELEGATION.DEL_THREAD_STATUS,
@@ -31,13 +31,13 @@ SELECT
if( APP_DELEGATION.DEL_FINISH_DATE IS NULL , 0 , 1 ),
APP_DELEGATION.DEL_DELAYED,
APPLICATION.APP_CREATE_DATE,
NULL,
IF (APPLICATION.APP_STATUS = 'COMPLETED', APPLICATION.APP_FINISH_DATE, NULL),
APPLICATION.APP_UPDATE_DATE,
APP_DELEGATION.APP_OVERDUE_PERCENTAGE
FROM
APPLICATION
APPLICATION
LEFT JOIN APP_DELEGATION ON (APPLICATION.APP_UID=APP_DELEGATION.APP_UID)
LEFT JOIN TASK ON (APP_DELEGATION.TAS_UID=TASK.TAS_UID)
LEFT JOIN TASK ON (APP_DELEGATION.TAS_UID=TASK.TAS_UID)
LEFT JOIN USERS ON (APP_DELEGATION.USR_UID=USERS.USR_UID)
LEFT JOIN APP_THREAD ON (APPLICATION.APP_UID=APP_THREAD.APP_UID AND APP_DELEGATION.DEL_THREAD=APP_THREAD.APP_THREAD_INDEX)
LEFT JOIN CONTENT APP_TITLE ON (APPLICATION.APP_UID=APP_TITLE.CON_ID AND APP_TITLE.CON_CATEGORY='APP_TITLE' AND APP_TITLE.CON_LANG = @DEFAULT_LANG)

17
workflow/engine/methods/setup/setupSchemas/triggerApplicationUpdate.sql
View File

@@ -4,19 +4,20 @@ FOR EACH ROW
BEGIN
DECLARE APP_STATUS VARCHAR(32);
SELECT APPLICATION.APP_STATUS into @APP_STATUS FROM APPLICATION WHERE APP_UID = NEW.APP_UID LIMIT 1;
DECLARE APP_FINISH_DATE DATETIME;
SELECT APPLICATION.APP_STATUS into @APP_STATUS FROM APPLICATION WHERE APP_UID = NEW.APP_UID LIMIT 1;
IF(OLD.APP_STATUS<>NEW.APP_STATUS) THEN
SET @APP_STATUS = NEW.APP_STATUS;
UPDATE APP_CACHE_VIEW SET APP_STATUS = @APP_STATUS WHERE APP_UID = NEW.APP_UID;
UPDATE APP_CACHE_VIEW SET APP_STATUS = @APP_STATUS WHERE APP_UID = NEW.APP_UID;
END IF;
IF(OLD.APP_DATA<>NEW.APP_DATA) THEN
UPDATE APP_CACHE_VIEW SET APP_UPDATE_DATE = NOW() WHERE APP_UID = NEW.APP_UID;
UPDATE APP_CACHE_VIEW SET APP_UPDATE_DATE = NOW() WHERE APP_UID = NEW.APP_UID;
END IF;
IF (NEW.APP_STATUS = 'COMPLETED') THEN
UPDATE APP_CACHE_VIEW SET APP_FINISH_DATE = NEW.APP_FINISH_DATE WHERE APP_UID = NEW.APP_UID;
END IF;
END