CODE STYLE class/model/ files
This commit is contained in:
@@ -18,10 +18,10 @@ require_once 'classes/model/om/BaseAppHistory.php';
|
||||
*
|
||||
* @package workflow.engine.classes.model
|
||||
*/
|
||||
class AppHistory extends BaseAppHistory {
|
||||
|
||||
function insertHistory($aData){
|
||||
|
||||
class AppHistory extends BaseAppHistory
|
||||
{
|
||||
public function insertHistory($aData)
|
||||
{
|
||||
$this->setAppUid($aData['APP_UID']);
|
||||
$this->setDelIndex($aData['DEL_INDEX']);
|
||||
$this->setProUid($aData['PRO_UID']);
|
||||
@@ -32,28 +32,20 @@ class AppHistory extends BaseAppHistory {
|
||||
$this->setHistoryDate($aData['APP_UPDATE_DATE']);
|
||||
$this->setHistoryData($aData['APP_DATA']);
|
||||
|
||||
|
||||
if ($this->validate() ) {
|
||||
$res = $this->save();
|
||||
}
|
||||
else {
|
||||
// Something went wrong. We can now get the validationFailures and handle them.
|
||||
$msg = '';
|
||||
$validationFailuresArray = $this->getValidationFailures();
|
||||
foreach($validationFailuresArray as $objValidationFailure) {
|
||||
$msg .= $objValidationFailure->getMessage() . "<br/>";
|
||||
}
|
||||
krumo($msg);
|
||||
//return array ( 'codError' => -100, 'rowsAffected' => 0, 'message' => $msg );
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
$res = $this->save();
|
||||
} else {
|
||||
// Something went wrong. We can now get the validationFailures and handle them.
|
||||
$msg = '';
|
||||
$validationFailuresArray = $this->getValidationFailures();
|
||||
foreach ($validationFailuresArray as $objValidationFailure) {
|
||||
$msg .= $objValidationFailure->getMessage() . "<br/>";
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
function getDynaformHistory($PRO_UID,$TAS_UID,$APP_UID,$DYN_UID=""){
|
||||
public function getDynaformHistory($PRO_UID, $TAS_UID, $APP_UID, $DYN_UID = "")
|
||||
{
|
||||
G::LoadClass('case');
|
||||
$oCase = new Cases();
|
||||
|
||||
@@ -62,37 +54,30 @@ class AppHistory extends BaseAppHistory {
|
||||
$aObjectPermissions = $oCase->getAllObjects($PRO_UID, $APP_UID, $TAS_UID, $_SESSION['USER_LOGGED']);
|
||||
|
||||
if (!is_array($aObjectPermissions)) {
|
||||
$aObjectPermissions = array('DYNAFORMS' => array(-1), 'INPUT_DOCUMENTS' => array(-1), 'OUTPUT_DOCUMENTS' => array(-1));
|
||||
$aObjectPermissions = array('DYNAFORMS' => array(-1), 'INPUT_DOCUMENTS' => array(-1), 'OUTPUT_DOCUMENTS' => array(-1));
|
||||
}
|
||||
if (!isset($aObjectPermissions['DYNAFORMS'])) {
|
||||
$aObjectPermissions['DYNAFORMS'] = array(-1);
|
||||
}
|
||||
else {
|
||||
if (!is_array($aObjectPermissions['DYNAFORMS'])) {
|
||||
$aObjectPermissions['DYNAFORMS'] = array(-1);
|
||||
}
|
||||
} else {
|
||||
if (!is_array($aObjectPermissions['DYNAFORMS'])) {
|
||||
$aObjectPermissions['DYNAFORMS'] = array(-1);
|
||||
}
|
||||
}
|
||||
if (!isset($aObjectPermissions['INPUT_DOCUMENTS'])) {
|
||||
$aObjectPermissions['INPUT_DOCUMENTS'] = array(-1);
|
||||
}
|
||||
else {
|
||||
if (!is_array($aObjectPermissions['INPUT_DOCUMENTS'])) {
|
||||
$aObjectPermissions['INPUT_DOCUMENTS'] = array(-1);
|
||||
}
|
||||
} else {
|
||||
if (!is_array($aObjectPermissions['INPUT_DOCUMENTS'])) {
|
||||
$aObjectPermissions['INPUT_DOCUMENTS'] = array(-1);
|
||||
}
|
||||
}
|
||||
if (!isset($aObjectPermissions['OUTPUT_DOCUMENTS'])) {
|
||||
$aObjectPermissions['OUTPUT_DOCUMENTS'] = array(-1);
|
||||
}
|
||||
else {
|
||||
if (!is_array($aObjectPermissions['OUTPUT_DOCUMENTS'])) {
|
||||
$aObjectPermissions['OUTPUT_DOCUMENTS'] = array(-1);
|
||||
}
|
||||
} else {
|
||||
if (!is_array($aObjectPermissions['OUTPUT_DOCUMENTS'])) {
|
||||
$aObjectPermissions['OUTPUT_DOCUMENTS'] = array(-1);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
$c = new Criteria('workflow');
|
||||
$c->addSelectColumn(AppHistoryPeer::APP_UID);
|
||||
$c->addSelectColumn(AppHistoryPeer::DEL_INDEX);
|
||||
@@ -108,12 +93,11 @@ class AppHistory extends BaseAppHistory {
|
||||
$c->addAsColumn('USR_NAME', "CONCAT(USR_LASTNAME, ' ', USR_FIRSTNAME)");
|
||||
$c->addJoin(AppHistoryPeer::USR_UID, UsersPeer::USR_UID, Criteria::LEFT_JOIN);
|
||||
|
||||
|
||||
//WHERE
|
||||
$c->add(AppHistoryPeer::DYN_UID, $aObjectPermissions['DYNAFORMS'], Criteria::IN);
|
||||
$c->add(AppHistoryPeer::PRO_UID, $PRO_UID);
|
||||
$c->add(AppHistoryPeer::APP_UID, $APP_UID);
|
||||
if((isset($DYN_UID))&&($DYN_UID!="")){
|
||||
if ((isset($DYN_UID))&&($DYN_UID!="")) {
|
||||
$c->add(AppHistoryPeer::DYN_UID, $DYN_UID);
|
||||
}
|
||||
|
||||
@@ -121,7 +105,6 @@ class AppHistory extends BaseAppHistory {
|
||||
$c->clearOrderByColumns();
|
||||
$c->addDescendingOrderByColumn(AppHistoryPeer::HISTORY_DATE);
|
||||
|
||||
|
||||
//Execute
|
||||
$oDataset = AppHistoryPeer::doSelectRS($c);
|
||||
$oDataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
|
||||
@@ -129,38 +112,37 @@ class AppHistory extends BaseAppHistory {
|
||||
|
||||
$aDynHistory = array();
|
||||
$aDynHistory[] = array(
|
||||
'DYN_TITLE' => 'char'
|
||||
'DYN_TITLE' => 'char'
|
||||
);
|
||||
|
||||
while ($aRow = $oDataset->getRow()) {
|
||||
|
||||
$o = new Dynaform();
|
||||
$o->setDynUid($aRow['DYN_UID']);
|
||||
$aRow['DYN_TITLE'] = $o->getDynTitle();
|
||||
$changedValues=unserialize($aRow['HISTORY_DATA']);
|
||||
$html="<table border='0' cellpadding='0' cellspacing='0'>";
|
||||
$sw_add=false;
|
||||
foreach($changedValues as $key =>$value){
|
||||
if(($value!=NULL)&&(!is_array($value))){
|
||||
foreach ($changedValues as $key => $value) {
|
||||
if (($value!=null) && (!is_array($value))) {
|
||||
$sw_add=true;
|
||||
$html.="<tr>";
|
||||
$html.="<td><b>$key:</b> </td>";
|
||||
$html.="<td>$value</td>";
|
||||
$html.="</tr>";
|
||||
}
|
||||
if(is_array($value)){
|
||||
if (is_array($value)) {
|
||||
$html.="<tr>";
|
||||
$html.="<td><b>$key (grid):</b> </td>";
|
||||
$html.="<td>";
|
||||
$html.="<table>";
|
||||
foreach($value as $key1 =>$value1){
|
||||
foreach ($value as $key1 => $value1) {
|
||||
$html.="<tr>";
|
||||
$html.="<td><b>$key1</b></td>";
|
||||
$html.="<td>";
|
||||
if(is_array($value1)){
|
||||
if (is_array($value1)) {
|
||||
$sw_add=true;
|
||||
$html.="<table>";
|
||||
foreach($value1 as $key2 =>$value2){
|
||||
foreach ($value1 as $key2 => $value2) {
|
||||
$html.="<tr>";
|
||||
$html.="<td><b>$key2</b></td>";
|
||||
$html.="<td>$value2</td>";
|
||||
@@ -170,7 +152,6 @@ class AppHistory extends BaseAppHistory {
|
||||
}
|
||||
$html.="</td>";
|
||||
$html.="</tr>";
|
||||
|
||||
}
|
||||
$html.="</table>";
|
||||
$html.="</td>";
|
||||
@@ -182,7 +163,7 @@ class AppHistory extends BaseAppHistory {
|
||||
|
||||
$aRow['FIELDS'] = $html;
|
||||
|
||||
if($sw_add){
|
||||
if ($sw_add) {
|
||||
$aDynHistory[] = $aRow;
|
||||
}
|
||||
$oDataset->next();
|
||||
@@ -196,7 +177,6 @@ class AppHistory extends BaseAppHistory {
|
||||
$oCriteria->setDBArrayTable('DynaformsHistory');
|
||||
$oCriteria->addDescendingOrderByColumn(AppHistoryPeer::HISTORY_DATE);
|
||||
return $oCriteria;
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
} // AppHistory
|
||||
|
||||
Reference in New Issue
Block a user