Solving conflicts with branch 3.1-CONTENT

This commit is contained in:
Julio Cesar Laura Avendaño
2016-07-20 16:28:13 -04:00
74 changed files with 2694 additions and 2826 deletions

View File

@@ -13,6 +13,8 @@ DROP TABLE IF EXISTS `APPLICATION`;
CREATE TABLE `APPLICATION`
(
`APP_UID` VARCHAR(32) default '' NOT NULL,
`APP_TITLE` MEDIUMTEXT NOT NULL,
`APP_DESCRIPTION` MEDIUMTEXT,
`APP_NUMBER` INTEGER default 0 NOT NULL,
`APP_PARENT` VARCHAR(32) default '0' NOT NULL,
`APP_STATUS` VARCHAR(100) default '' NOT NULL,
@@ -37,7 +39,6 @@ CREATE TABLE `APPLICATION`
KEY `indexAppStatus`(`APP_STATUS`),
KEY `indexAppCreateDate`(`APP_CREATE_DATE`)
)ENGINE=InnoDB DEFAULT CHARSET='utf8' COMMENT='The application';
#-----------------------------------------------------------------------------
#-- APP_SEQUENCE
#-----------------------------------------------------------------------------
@@ -205,6 +206,7 @@ DROP TABLE IF EXISTS `DEPARTMENT`;
CREATE TABLE `DEPARTMENT`
(
`DEP_UID` VARCHAR(32) default '' NOT NULL,
`DEP_TITLE` MEDIUMTEXT NOT NULL,
`DEP_PARENT` VARCHAR(32) default '' NOT NULL,
`DEP_MANAGER` VARCHAR(32) default '' NOT NULL,
`DEP_LOCATION` INTEGER default 0 NOT NULL,
@@ -244,6 +246,7 @@ DROP TABLE IF EXISTS `GROUPWF`;
CREATE TABLE `GROUPWF`
(
`GRP_UID` VARCHAR(32) NOT NULL,
`GRP_TITLE` MEDIUMTEXT NOT NULL,
`GRP_STATUS` CHAR(8) default 'ACTIVE' NOT NULL,
`GRP_LDAP_DN` VARCHAR(255) default '' NOT NULL,
`GRP_UX` VARCHAR(128) default 'NORMAL',
@@ -287,6 +290,8 @@ CREATE TABLE `INPUT_DOCUMENT`
(
`INP_DOC_UID` VARCHAR(32) default '' NOT NULL,
`PRO_UID` VARCHAR(32) default '0' NOT NULL,
`INP_DOC_TITLE` MEDIUMTEXT NOT NULL,
`INP_DOC_DESCRIPTION` MEDIUMTEXT,
`INP_DOC_FORM_NEEDED` VARCHAR(20) default 'REAL' NOT NULL,
`INP_DOC_ORIGINAL` VARCHAR(20) default 'COPY' NOT NULL,
`INP_DOC_PUBLISHED` VARCHAR(20) default 'PRIVATE' NOT NULL,
@@ -418,6 +423,8 @@ DROP TABLE IF EXISTS `PROCESS`;
CREATE TABLE `PROCESS`
(
`PRO_UID` VARCHAR(32) default '' NOT NULL,
`PRO_TITLE` MEDIUMTEXT NOT NULL,
`PRO_DESCRIPTION` MEDIUMTEXT,
`PRO_PARENT` VARCHAR(32) default '0' NOT NULL,
`PRO_TIME` DOUBLE default 1 NOT NULL,
`PRO_TIMEUNIT` VARCHAR(20) default 'DAYS' NOT NULL,
@@ -599,6 +606,13 @@ CREATE TABLE `TASK`
(
`PRO_UID` VARCHAR(32) default '' NOT NULL,
`TAS_UID` VARCHAR(32) default '' NOT NULL,
`TAS_TITLE` MEDIUMTEXT NOT NULL,
`TAS_DESCRIPTION` MEDIUMTEXT,
`TAS_DEF_TITLE` MEDIUMTEXT,
`TAS_DEF_SUBJECT_MESSAGE` MEDIUMTEXT,
`TAS_DEF_PROC_CODE` MEDIUMTEXT,
`TAS_DEF_MESSAGE` MEDIUMTEXT,
`TAS_DEF_DESCRIPTION` MEDIUMTEXT,
`TAS_TYPE` VARCHAR(50) default 'NORMAL' NOT NULL,
`TAS_DURATION` DOUBLE default 0 NOT NULL,
`TAS_DELAY_TYPE` VARCHAR(30) default '' NOT NULL,