Merged master into dashboards2

This commit is contained in:
Dante Loayza
2015-04-16 08:45:32 -04:00
41 changed files with 1423 additions and 372 deletions

View File

@@ -11,8 +11,9 @@ CREATE TABLE `APP_CACHE_VIEW`
`PRO_UID` VARCHAR(32) default '' NOT NULL,
`DEL_DELEGATE_DATE` DATETIME NOT NULL,
`DEL_INIT_DATE` DATETIME,
`DEL_TASK_DUE_DATE` DATETIME,
`DEL_FINISH_DATE` DATETIME,
`DEL_TASK_DUE_DATE` DATETIME,
`DEL_RISK_DATE` DATETIME,
`DEL_THREAD_STATUS` VARCHAR(32) default 'OPEN',
`APP_THREAD_STATUS` VARCHAR(32) default 'OPEN',
`APP_TITLE` VARCHAR(255) default '' NOT NULL,

View File

@@ -13,8 +13,9 @@ INSERT INTO APP_CACHE_VIEW (
PRO_UID,
DEL_DELEGATE_DATE,
DEL_INIT_DATE,
DEL_TASK_DUE_DATE,
DEL_FINISH_DATE,
DEL_TASK_DUE_DATE,
DEL_RISK_DATE,
DEL_THREAD_STATUS,
APP_THREAD_STATUS,
APP_TITLE,
@@ -57,8 +58,9 @@ SELECT
APP_DELEGATION.PRO_UID,
substring(APP_DELEGATION.DEL_DELEGATE_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),
substring(APP_DELEGATION.DEL_TASK_DUE_DATE,1,19),
substring(APP_DELEGATION.DEL_RISK_DATE,1,19),
APP_DELEGATION.DEL_THREAD_STATUS,
APP_THREAD.APP_THREAD_STATUS,
APP_TITLE.CON_VALUE AS APP_TITLE,

View File

@@ -55,8 +55,9 @@ BEGIN
PRO_UID,
DEL_DELEGATE_DATE,
DEL_INIT_DATE,
DEL_TASK_DUE_DATE,
DEL_FINISH_DATE,
DEL_TASK_DUE_DATE,
DEL_RISK_DATE,
DEL_THREAD_STATUS,
APP_THREAD_STATUS,
APP_TITLE,
@@ -88,8 +89,9 @@ BEGIN
NEW.PRO_UID,
NEW.DEL_DELEGATE_DATE,
NEW.DEL_INIT_DATE,
NEW.DEL_TASK_DUE_DATE,
NEW.DEL_FINISH_DATE,
NEW.DEL_TASK_DUE_DATE,
NEW.DEL_RISK_DATE,
NEW.DEL_THREAD_STATUS,
@APP_THREAD_STATUS,
@APP_TITLE,

View File

@@ -53,8 +53,9 @@ BEGIN
PRO_UID = NEW.PRO_UID,
DEL_DELEGATE_DATE = NEW.DEL_DELEGATE_DATE,
DEL_INIT_DATE = NEW.DEL_INIT_DATE,
DEL_TASK_DUE_DATE = NEW.DEL_TASK_DUE_DATE,
DEL_FINISH_DATE = NEW.DEL_FINISH_DATE,
DEL_TASK_DUE_DATE = NEW.DEL_TASK_DUE_DATE,
DEL_RISK_DATE = NEW.DEL_RISK_DATE,
DEL_THREAD_STATUS = NEW.DEL_THREAD_STATUS,
APP_THREAD_STATUS = @APP_THREAD_STATUS,
APP_TITLE = @APP_TITLE,