Merged develop into bugfix/HOR-3295

This commit is contained in:
Paula Quispe
2017-08-01 15:02:20 -04:00
435 changed files with 1056 additions and 67638 deletions

View File

@@ -2215,6 +2215,10 @@ INSERT INTO TRANSLATION (TRN_CATEGORY,TRN_ID,TRN_LANG,TRN_VALUE,TRN_UPDATE_DATE
( 'LABEL','ID_CLEAR_CACHE_MSG1','en','All cache data was deleted','2014-01-15') ,
( 'LABEL','ID_CLEAR_CACHE_MSG2','en','The cache directory is empty','2014-01-15') ,
( 'LABEL','ID_CASESLIST_APP_UID','en','Case Id','2014-01-15') ,
( 'LABEL','ID_ABE_FORM_ALREADY_FILLED','en','The form has already been filled and sent.','2017-06-09') ,
( 'LABEL','ID_ABE_INFORMATION_SUBMITTED','en','The information was submitted. Thank you.','2017-06-19') ,
( 'LABEL','ID_ABE_ANSWER_SUBMITTED','en','The answer has been submitted. Thank you.','2017-06-19') ,
( 'LABEL','ID_ABE_RESPONSE_SENT','en','The response has already been sent.','2017-06-19') ,
( 'LABEL','ID_CASESLIST_DEL_INDEX','en','Case Index','2014-01-15') ,
( 'LABEL','ID_CASESLIST_APP_NUMBER','en','#','2014-01-15') ,
( 'LABEL','ID_CASESLIST_APP_STATUS','en','Status','2014-01-15') ,

View File

@@ -828,6 +828,7 @@ CREATE TABLE `APP_DELAY`
`APP_DELAY_UID` VARCHAR(32) default '' NOT NULL,
`PRO_UID` VARCHAR(32) default '0' NOT NULL,
`APP_UID` VARCHAR(32) default '0' NOT NULL,
`APP_NUMBER` INTEGER default 0,
`APP_THREAD_INDEX` INTEGER default 0 NOT NULL,
`APP_DEL_INDEX` INTEGER default 0 NOT NULL,
`APP_TYPE` VARCHAR(20) default '0' NOT NULL,
@@ -839,7 +840,12 @@ CREATE TABLE `APP_DELAY`
`APP_DISABLE_ACTION_USER` VARCHAR(32) default '0',
`APP_DISABLE_ACTION_DATE` DATETIME,
`APP_AUTOMATIC_DISABLED_DATE` DATETIME,
`APP_DELEGATION_USER_ID` INTEGER default 0,
`PRO_ID` INTEGER default 0,
PRIMARY KEY (`APP_DELAY_UID`),
KEY `INDEX_APP_NUMBER`(`APP_NUMBER`),
KEY `INDEX_USR_ID`(`APP_DELEGATION_USER_ID`),
KEY `INDEX_PRO_ID`(`PRO_ID`),
KEY `indexAppDelay`(`PRO_UID`, `APP_UID`, `APP_THREAD_INDEX`, `APP_DEL_INDEX`, `APP_NEXT_TASK`, `APP_DELEGATION_USER`, `APP_DISABLE_ACTION_USER`),
KEY `indexAppUid`(`APP_UID`)
)ENGINE=InnoDB DEFAULT CHARSET='utf8' COMMENT='APP_DELAY';