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

PM-3342

Browse Source 
./processmaker upgrade no termina de realizar el upgrade correctamente

se valido las secciones que generaban warning
This commit is contained in:
marcelo.cuiza
2015-08-25 18:20:46 -04:00
parent bc4f80e92d
commit 71d5a45cc2
7 changed files with 83 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
workflow/engine/classes/model/ListParticipatedLast.php
View File

@@ -54,6 +54,10 @@ class ListParticipatedLast extends BaseListParticipatedLast
$users->refreshTotal($data['USR_UID'], 'add', 'participated');
}
}
if($this->primaryKeysExists($data)) {
return;
}
$con = Propel::getConnection( ListParticipatedLastPeer::DATABASE_NAME );
try {
@@ -324,5 +328,22 @@ class ListParticipatedLast extends BaseListParticipatedLast
return $data;
}
public function primaryKeysExists($data) {
$criteria = new Criteria("workflow");
$criteria->add(ListParticipatedLastPeer::APP_UID, $data['APP_UID']);
$criteria->add(ListParticipatedLastPeer::USR_UID, $data['USR_UID']);
$criteria->add(ListParticipatedLastPeer::DEL_INDEX, $data['DEL_INDEX']);
$dataset = UsersPeer::doSelectRS($criteria);
$dataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
$dataset->next();
$aRow = $dataset->getRow();
if(is_array($aRow)) {
if(sizeof($aRow)) {
return true;
}
}
return false;
}
}

8
workflow/engine/classes/model/map/ListCanceledMapBuilder.php
View File

@@ -75,13 +75,13 @@ class ListCanceledMapBuilder
$tMap->addColumn('APP_NUMBER', 'AppNumber', 'int', CreoleTypes::INTEGER, true, null);
$tMap->addColumn('APP_TITLE', 'AppTitle', 'string', CreoleTypes::VARCHAR, true, 255);
$tMap->addColumn('APP_TITLE', 'AppTitle', 'string', CreoleTypes::VARCHAR, false, 255);
$tMap->addColumn('APP_PRO_TITLE', 'AppProTitle', 'string', CreoleTypes::VARCHAR, true, 255);
$tMap->addColumn('APP_PRO_TITLE', 'AppProTitle', 'string', CreoleTypes::VARCHAR, false, 255);
$tMap->addColumn('APP_TAS_TITLE', 'AppTasTitle', 'string', CreoleTypes::VARCHAR, true, 255);
$tMap->addColumn('APP_TAS_TITLE', 'AppTasTitle', 'string', CreoleTypes::VARCHAR, false, 255);
$tMap->addColumn('APP_CANCELED_DATE', 'AppCanceledDate', 'int', CreoleTypes::TIMESTAMP, true, null);
$tMap->addColumn('APP_CANCELED_DATE', 'AppCanceledDate', 'int', CreoleTypes::TIMESTAMP, false, null);
$tMap->addColumn('DEL_INDEX', 'DelIndex', 'int', CreoleTypes::INTEGER, true, null);

8
workflow/engine/classes/model/map/ListCompletedMapBuilder.php
View File

@@ -75,13 +75,13 @@ class ListCompletedMapBuilder
$tMap->addColumn('APP_NUMBER', 'AppNumber', 'int', CreoleTypes::INTEGER, true, null);
$tMap->addColumn('APP_TITLE', 'AppTitle', 'string', CreoleTypes::VARCHAR, true, 255);
$tMap->addColumn('APP_TITLE', 'AppTitle', 'string', CreoleTypes::VARCHAR, false, 255);
$tMap->addColumn('APP_PRO_TITLE', 'AppProTitle', 'string', CreoleTypes::VARCHAR, true, 255);
$tMap->addColumn('APP_PRO_TITLE', 'AppProTitle', 'string', CreoleTypes::VARCHAR, false, 255);
$tMap->addColumn('APP_TAS_TITLE', 'AppTasTitle', 'string', CreoleTypes::VARCHAR, true, 255);
$tMap->addColumn('APP_TAS_TITLE', 'AppTasTitle', 'string', CreoleTypes::VARCHAR, false, 255);
$tMap->addColumn('APP_CREATE_DATE', 'AppCreateDate', 'int', CreoleTypes::TIMESTAMP, true, null);
$tMap->addColumn('APP_CREATE_DATE', 'AppCreateDate', 'int', CreoleTypes::TIMESTAMP, false, null);
$tMap->addColumn('APP_FINISH_DATE', 'AppFinishDate', 'int', CreoleTypes::TIMESTAMP, true, null);

8
workflow/engine/classes/model/map/ListInboxMapBuilder.php
View File

@@ -79,13 +79,13 @@ class ListInboxMapBuilder
$tMap->addColumn('APP_STATUS', 'AppStatus', 'string', CreoleTypes::VARCHAR, false, 32);
$tMap->addColumn('APP_TITLE', 'AppTitle', 'string', CreoleTypes::VARCHAR, true, 255);
$tMap->addColumn('APP_TITLE', 'AppTitle', 'string', CreoleTypes::VARCHAR, false, 255);
$tMap->addColumn('APP_PRO_TITLE', 'AppProTitle', 'string', CreoleTypes::VARCHAR, true, 255);
$tMap->addColumn('APP_PRO_TITLE', 'AppProTitle', 'string', CreoleTypes::VARCHAR, false, 255);
$tMap->addColumn('APP_TAS_TITLE', 'AppTasTitle', 'string', CreoleTypes::VARCHAR, true, 255);
$tMap->addColumn('APP_TAS_TITLE', 'AppTasTitle', 'string', CreoleTypes::VARCHAR, false, 255);
$tMap->addColumn('APP_UPDATE_DATE', 'AppUpdateDate', 'int', CreoleTypes::TIMESTAMP, true, null);
$tMap->addColumn('APP_UPDATE_DATE', 'AppUpdateDate', 'int', CreoleTypes::TIMESTAMP, false, null);
$tMap->addColumn('DEL_PREVIOUS_USR_UID', 'DelPreviousUsrUid', 'string', CreoleTypes::VARCHAR, false, 32);

2
workflow/engine/classes/model/om/BaseListParticipatedLast.php
View File

@@ -1784,7 +1784,7 @@ abstract class BaseListParticipatedLast extends BaseObject implements Persistent
$copyObj->setUsrUid(''); // this is a pkey column, so set to default value
$copyObj->setDelIndex('0'); // this is a pkey column, so set to default value
$copyObj->setDelIndex(''); // this is a pkey column, so set to default value
}

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

@@ -1265,7 +1265,7 @@
<rule name="validValues" value="TRUE|FALSE" message="Please select a valid value for TAS_ALERT."/>
</validator>
<validator column="TAS_ASSIGN_TYPE">
<rule name="validValues" value="BALANCED|MANUAL|EVALUATE|REPORT_TO|SELF_SERVICE|STATIC_MI|CANCEL_MI" message="Please select a valid value for TAS_ASSIGN_TYPE."/>
<rule name="validValues" value="BALANCED|MANUAL|EVALUATE|REPORT_TO|SELF_SERVICE|STATIC_MI|CANCEL_MI|MULTIPLE_INSTANCE|MULTIPLE_INSTANCE_VALUE_BASED" message="Please set a valid value for TAS_ASSIGN_TYPE" />
</validator>
<validator column="TAS_ASSIGN_LOCATION">
<rule name="validValues" value="TRUE|FALSE" message="Please select a valid value for TAS_ASSIGN_LOCATION."/>
@@ -3957,10 +3957,10 @@
<column name="PRO_UID" type="VARCHAR" size="32" required="true" default=""/>
<column name="APP_NUMBER" type="INTEGER" required="true" default="0"/>
<column name="APP_STATUS" type="VARCHAR" size="32" required="false" default="0"/>
<column name="APP_TITLE" type="VARCHAR" size="255" required="true" default=""/>
<column name="APP_PRO_TITLE" type="VARCHAR" size="255" required="true" default=""/>
<column name="APP_TAS_TITLE" type="VARCHAR" size="255" required="true" default=""/>
<column name="APP_UPDATE_DATE" type="TIMESTAMP" required="true"/>
<column name="APP_TITLE" type="VARCHAR" size="255" required="false" default=""/>
<column name="APP_PRO_TITLE" type="VARCHAR" size="255" required="false" default=""/>
<column name="APP_TAS_TITLE" type="VARCHAR" size="255" required="false" default=""/>
<column name="APP_UPDATE_DATE" type="TIMESTAMP" required="false"/>
<column name="DEL_PREVIOUS_USR_UID" type="VARCHAR" size="32" default=""/>
<column name="DEL_PREVIOUS_USR_USERNAME" type="VARCHAR" size="100" default=""/>
<column name="DEL_PREVIOUS_USR_FIRSTNAME" type="VARCHAR" size="50" default=""/>
@@ -3980,6 +3980,17 @@
<parameter name="Seq_in_index" value="1"/>
</vendor>
</index>
<index name="indexInboxUserStatusUpdateDate">
<index-column name="USR_UID"/>
<index-column name="APP_STATUS"/>
<index-column name="APP_UPDATE_DATE"/>
<vendor type="mysql">
<parameter name="Table" value="LIST_INBOX"/>
<parameter name="Non_unique" value="1"/>
<parameter name="Key_name" value="indexInboxUserStatusUpdateDate"/>
<parameter name="Seq_in_index" value="1"/>
</vendor>
</index>
</table>
<table name="LIST_PARTICIPATED_HISTORY">
<vendor type="mysql">
@@ -4076,6 +4087,15 @@
<column name="DEL_DUE_DATE" type="TIMESTAMP" required="false"/>
<column name="DEL_PRIORITY" type="VARCHAR" size="32" required="true" default="3"/>
<column name="DEL_THREAD_STATUS" type="VARCHAR" size="32" required="true" default="OPEN"/>
<index name="usrIndex">
<index-column name="USR_UID"/>
<vendor type="mysql">
<parameter name="Table" value="LIST_PARTICIPATED_LAST"/>
<parameter name="Non_unique" value="1"/>
<parameter name="Key_name" value="usrIndex"/>
<parameter name="Seq_in_index" value="1"/>
</vendor>
</index>
</table>
<table name="LIST_COMPLETED">
<vendor type="mysql">
@@ -4103,10 +4123,10 @@
<column name="TAS_UID" type="VARCHAR" size="32" required="true" default=""/>
<column name="PRO_UID" type="VARCHAR" size="32" required="true" default=""/>
<column name="APP_NUMBER" type="INTEGER" required="true" default="0"/>
<column name="APP_TITLE" type="VARCHAR" size="255" required="true" default=""/>
<column name="APP_PRO_TITLE" type="VARCHAR" size="255" required="true" default=""/>
<column name="APP_TAS_TITLE" type="VARCHAR" size="255" required="true" default=""/>
<column name="APP_CREATE_DATE" type="TIMESTAMP" required="true"/>
<column name="APP_TITLE" type="VARCHAR" size="255" required="false" default=""/>
<column name="APP_PRO_TITLE" type="VARCHAR" size="255" required="false" default=""/>
<column name="APP_TAS_TITLE" type="VARCHAR" size="255" required="false" default=""/>
<column name="APP_CREATE_DATE" type="TIMESTAMP" required="false"/>
<column name="APP_FINISH_DATE" type="TIMESTAMP" required="true"/>
<column name="DEL_INDEX" type="INTEGER" required="true" default="0"/>
<column name="DEL_PREVIOUS_USR_UID" type="VARCHAR" size="32" default=""/>
@@ -4193,10 +4213,10 @@
<column name="TAS_UID" type="VARCHAR" size="32" required="true" default=""/>
<column name="PRO_UID" type="VARCHAR" size="32" required="true" default=""/>
<column name="APP_NUMBER" type="INTEGER" required="true" default="0"/>
<column name="APP_TITLE" type="VARCHAR" size="255" required="true" default=""/>
<column name="APP_PRO_TITLE" type="VARCHAR" size="255" required="true" default=""/>
<column name="APP_TAS_TITLE" type="VARCHAR" size="255" required="true" default=""/>
<column name="APP_CANCELED_DATE" type="TIMESTAMP" required="true"/>
<column name="APP_TITLE" type="VARCHAR" size="255" required="false" default=""/>
<column name="APP_PRO_TITLE" type="VARCHAR" size="255" required="false" default=""/>
<column name="APP_TAS_TITLE" type="VARCHAR" size="255" required="false" default=""/>
<column name="APP_CANCELED_DATE" type="TIMESTAMP" required="false"/>
<column name="DEL_INDEX" type="INTEGER" required="true" default="0"/>
<column name="DEL_PREVIOUS_USR_UID" type="VARCHAR" size="32" default=""/>
<column name="DEL_CURRENT_USR_USERNAME" type="VARCHAR" size="100" default=""/>

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

@@ -2235,10 +2235,10 @@ CREATE TABLE `LIST_INBOX`
`PRO_UID` VARCHAR(32) default '' NOT NULL,
`APP_NUMBER` INTEGER default 0 NOT NULL,
`APP_STATUS` VARCHAR(32) default '0',
`APP_TITLE` VARCHAR(255) default '' NOT NULL,
`APP_PRO_TITLE` VARCHAR(255) default '' NOT NULL,
`APP_TAS_TITLE` VARCHAR(255) default '' NOT NULL,
`APP_UPDATE_DATE` DATETIME NOT NULL,
`APP_TITLE` VARCHAR(255) default '',
`APP_PRO_TITLE` VARCHAR(255) default '',
`APP_TAS_TITLE` VARCHAR(255) default '',
`APP_UPDATE_DATE` DATETIME,
`DEL_PREVIOUS_USR_UID` VARCHAR(32) default '',
`DEL_PREVIOUS_USR_USERNAME` VARCHAR(100) default '',
`DEL_PREVIOUS_USR_FIRSTNAME` VARCHAR(50) default '',
@@ -2249,7 +2249,8 @@ CREATE TABLE `LIST_INBOX`
`DEL_RISK_DATE` DATETIME,
`DEL_PRIORITY` VARCHAR(32) default '3' NOT NULL,
PRIMARY KEY (`APP_UID`,`DEL_INDEX`),
KEY `indexInboxUser`(`USR_UID`, `DEL_DELEGATE_DATE`)
KEY `indexInboxUser`(`USR_UID`, `DEL_DELEGATE_DATE`),
KEY `indexInboxUserStatusUpdateDate`(`USR_UID`, `APP_STATUS`, `APP_UPDATE_DATE`)
)ENGINE=InnoDB DEFAULT CHARSET='utf8' COMMENT='Inbox list';
#-----------------------------------------------------------------------------
#-- LIST_PARTICIPATED_HISTORY
@@ -2314,7 +2315,8 @@ CREATE TABLE `LIST_PARTICIPATED_LAST`
`DEL_DUE_DATE` DATETIME,
`DEL_PRIORITY` VARCHAR(32) default '3' NOT NULL,
`DEL_THREAD_STATUS` VARCHAR(32) default 'OPEN' NOT NULL,
PRIMARY KEY (`APP_UID`,`USR_UID`,`DEL_INDEX`)
PRIMARY KEY (`APP_UID`,`USR_UID`,`DEL_INDEX`),
KEY `usrIndex`(`USR_UID`)
)ENGINE=InnoDB DEFAULT CHARSET='utf8' COMMENT='Participated last list';
#-----------------------------------------------------------------------------
#-- LIST_COMPLETED
@@ -2330,10 +2332,10 @@ CREATE TABLE `LIST_COMPLETED`
`TAS_UID` VARCHAR(32) default '' NOT NULL,
`PRO_UID` VARCHAR(32) default '' NOT NULL,
`APP_NUMBER` INTEGER default 0 NOT NULL,
`APP_TITLE` VARCHAR(255) default '' NOT NULL,
`APP_PRO_TITLE` VARCHAR(255) default '' NOT NULL,
`APP_TAS_TITLE` VARCHAR(255) default '' NOT NULL,
`APP_CREATE_DATE` DATETIME NOT NULL,
`APP_TITLE` VARCHAR(255) default '',
`APP_PRO_TITLE` VARCHAR(255) default '',
`APP_TAS_TITLE` VARCHAR(255) default '',
`APP_CREATE_DATE` DATETIME,
`APP_FINISH_DATE` DATETIME NOT NULL,
`DEL_INDEX` INTEGER default 0 NOT NULL,
`DEL_PREVIOUS_USR_UID` VARCHAR(32) default '',
@@ -2390,10 +2392,10 @@ CREATE TABLE `LIST_CANCELED`
`TAS_UID` VARCHAR(32) default '' NOT NULL,
`PRO_UID` VARCHAR(32) default '' NOT NULL,
`APP_NUMBER` INTEGER default 0 NOT NULL,
`APP_TITLE` VARCHAR(255) default '' NOT NULL,
`APP_PRO_TITLE` VARCHAR(255) default '' NOT NULL,
`APP_TAS_TITLE` VARCHAR(255) default '' NOT NULL,
`APP_CANCELED_DATE` DATETIME NOT NULL,
`APP_TITLE` VARCHAR(255) default '',
`APP_PRO_TITLE` VARCHAR(255) default '',
`APP_TAS_TITLE` VARCHAR(255) default '',
`APP_CANCELED_DATE` DATETIME,
`DEL_INDEX` INTEGER default 0 NOT NULL,
`DEL_PREVIOUS_USR_UID` VARCHAR(32) default '',
`DEL_CURRENT_USR_USERNAME` VARCHAR(100) default '',