List issues

2015-03-02 11:15:23 -04:00
parent 23d5a6708a
commit 6ede532d79
18 changed files with 28 additions and 19 deletions
--- a/workflow/engine/classes/class.case.php
+++ b/workflow/engine/classes/class.case.php
@@ -1060,13 +1060,13 @@ class Cases

                $appAssignSelfServiceValue->remove($sAppUid);
            }
+            
            /*----------------------------------********---------------------------------*/
            if(!isset($Fields['DEL_INDEX'])){
              $Fields['DEL_INDEX'] = 1;
            }
            $inbox = new ListInbox();
-            $inbox->update($Fields);
-            
+            $inbox->update($Fields);            
            /*----------------------------------********---------------------------------*/

            //Return
--- a/workflow/engine/classes/class.configuration.php
+++ b/workflow/engine/classes/class.configuration.php
@@ -1,5 +1,6 @@
 <?php

+
 /**
 * class.configuration.php
 *
--- a/workflow/engine/classes/class.derivation.php
+++ b/workflow/engine/classes/class.derivation.php
@@ -974,13 +974,14 @@ class Derivation
                $oCase->updateCase( $aSA['APP_PARENT'], $aParentCase );
                /*----------------------------------********---------------------------------*/
                $inbox = new ListInbox();
-                $inbox->update($aParentCase);
-                
+                $inbox->update($aParentCase);                
                /*----------------------------------********---------------------------------*/
+                
                //Update table SUB_APPLICATION
                $oSubApplication = new SubApplication();
                $oSubApplication->update( array ('APP_UID' => $sApplicationUID,'APP_PARENT' => $aSA['APP_PARENT'],'DEL_INDEX_PARENT' => $aSA['DEL_INDEX_PARENT'],'DEL_THREAD_PARENT' => $aSA['DEL_THREAD_PARENT'],'SA_STATUS' => 'FINISHED','SA_VALUES_IN' => serialize( $aNewFields ),'SA_FINISH_DATE' => date( 'Y-m-d H:i:s' )
                ) );
+                
                //Derive the parent case
                $aDeriveTasks = $this->prepareInformation( array ('USER_UID' => - 1,'APP_UID' => $aSA['APP_PARENT'],'DEL_INDEX' => $aSA['DEL_INDEX_PARENT']
                ) );
--- a/workflow/engine/classes/model/AppDelegation.php
+++ b/workflow/engine/classes/model/AppDelegation.php
@@ -151,6 +151,7 @@ class AppDelegation extends BaseAppDelegation
        if ($this->validate()) {
            try {
                $res = $this->save();
+                
                /*----------------------------------********---------------------------------*/
                $task = TaskPeer::retrieveByPK( $this->getTasUid() );
                $taskType = $task->getTasType();
@@ -158,8 +159,7 @@ class AppDelegation extends BaseAppDelegation
                  $inbox = new ListInbox();
                  $res = $this->toArray(BasePeer::TYPE_FIELDNAME);                
                  $inbox->newRow($this->toArray(BasePeer::TYPE_FIELDNAME), $delPreviusUsrUid);
-                }
-                
+                }                
                /*----------------------------------********---------------------------------*/
            } catch (PropelException $e) {
                throw ($e);
--- a/workflow/engine/classes/model/ListInbox.php
+++ b/workflow/engine/classes/model/ListInbox.php
@@ -13,6 +13,7 @@ require_once 'classes/model/om/BaseListInbox.php';
 *
 * @package    classes.model
 */
+ 
 class ListInbox extends BaseListInbox
 {
    /**
--- a/workflow/engine/classes/model/ListParticipatedLast.php
+++ b/workflow/engine/classes/model/ListParticipatedLast.php
@@ -14,6 +14,7 @@ require_once 'classes/model/om/BaseListParticipatedLast.php';
 *
 * @package    classes.model
 */
+
 class ListParticipatedLast extends BaseListParticipatedLast
 {
    /**
--- a/workflow/engine/classes/model/map/ListInboxMapBuilder.php
+++ b/workflow/engine/classes/model/map/ListInboxMapBuilder.php
@@ -15,6 +15,7 @@ include_once 'creole/CreoleTypes.php';
 *
 * @package    workflow.classes.model.map
 */
+ 
 class ListInboxMapBuilder
 {

--- a/workflow/engine/classes/model/map/ListParticipatedLastMapBuilder.php
+++ b/workflow/engine/classes/model/map/ListParticipatedLastMapBuilder.php
@@ -15,6 +15,7 @@ include_once 'creole/CreoleTypes.php';
 *
 * @package    workflow.classes.model.map
 */
+ 
 class ListParticipatedLastMapBuilder
 {

--- a/workflow/engine/classes/model/om/BaseListInbox.php
+++ b/workflow/engine/classes/model/om/BaseListInbox.php
@@ -16,7 +16,8 @@ include_once 'classes/model/ListInboxPeer.php';
 * 
 *
 * @package    workflow.classes.model.om
- */
+*/
+ 
 abstract class BaseListInbox extends BaseObject implements Persistent
 {

--- a/workflow/engine/classes/model/om/BaseListInboxPeer.php
+++ b/workflow/engine/classes/model/om/BaseListInboxPeer.php
@@ -13,7 +13,8 @@ include_once 'classes/model/ListInbox.php';
 * 
 *
 * @package    workflow.classes.model.om
- */
+*/
+ 
 abstract class BaseListInboxPeer
 {

--- a/workflow/engine/classes/model/om/BaseListParticipatedLast.php
+++ b/workflow/engine/classes/model/om/BaseListParticipatedLast.php
@@ -16,7 +16,8 @@ include_once 'classes/model/ListParticipatedLastPeer.php';
 * 
 *
 * @package    workflow.classes.model.om
- */
+*/
+
 abstract class BaseListParticipatedLast extends BaseObject implements Persistent
 {

--- a/workflow/engine/classes/model/om/BaseListParticipatedLastPeer.php
+++ b/workflow/engine/classes/model/om/BaseListParticipatedLastPeer.php
@@ -12,7 +12,8 @@ include_once 'classes/model/ListParticipatedLast.php';
 * 
 *
 * @package    workflow.classes.model.om
- */
+*/
+
 abstract class BaseListParticipatedLastPeer
 {

--- a/workflow/engine/methods/cases/casesListExtJs.php
+++ b/workflow/engine/methods/cases/casesListExtJs.php
@@ -3,8 +3,8 @@ unset($_SESSION['APPLICATION']);

 //get the action from GET or POST, default is todo
 $action = isset( $_GET['action'] ) ? $_GET['action'] : (isset( $_POST['action'] ) ? $_POST['action'] : 'todo');
-//fix a previous inconsistency

+//fix a previous inconsistency
 $urlProxy = 'proxyCasesList';
 if ($action == 'selfservice') {
    $action = 'unassigned';
--- a/workflow/engine/src/ProcessMaker/BusinessModel/Lists.php
+++ b/workflow/engine/src/ProcessMaker/BusinessModel/Lists.php
@@ -1,6 +1,5 @@
 <?php
 namespace ProcessMaker\BusinessModel;
-
 use \G;

 /**
--- a/workflow/engine/templates/cases/casesList.js
+++ b/workflow/engine/templates/cases/casesList.js
@@ -2272,7 +2272,7 @@ var gridForm = new Ext.FormPanel({
  }
  comboAllUsers.setValue("CURRENT_USER");

-  // hidding the buttons for the reassign
+// hidding the buttons for the reassign
 //  if (action=='to_reassign'){
 //    btnSelectAll.hide();
 //    btnUnSelectAll.hide();
--- a/workflow/engine/xmlform/cases/cases_Resume.xml
+++ b/workflow/engine/xmlform/cases/cases_Resume.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
+
 <dynaForm name="cases_Resume" type="xmlform" width="550px" labelWidth="150px">
  <TITLE1 type="title">
    <en><![CDATA[Case Properties]]></en>
@@ -29,6 +30,5 @@
  </UPDATE_DATE>
  <DESCRIPTION type="text" mode="view">
    <en><![CDATA[Case Description]]></en>
-  </DESCRIPTION>
-  
+  </DESCRIPTION>  
 </dynaForm>
--- a/workflow/engine/xmlform/cases/cases_Resume_Current_Task.xml
+++ b/workflow/engine/xmlform/cases/cases_Resume_Current_Task.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
+
 <dynaForm name="cases_Resume_Current_Task" type="xmlform" width="550px" labelWidth="150px">
  <TAS_TITLE type="text" mode="view">
    <en><![CDATA[Task]]></en>
@@ -17,6 +18,5 @@
  </DEL_TASK_DUE_DATE>
  <DEL_FINISH_DATE type="text" mode="view">
    <en><![CDATA[Finish Date]]></en>
-  </DEL_FINISH_DATE>
-  
+  </DEL_FINISH_DATE>  
 </dynaForm>
--- a/workflow/engine/xmlform/cases/cases_Resume_Current_Task_Title.xml
+++ b/workflow/engine/xmlform/cases/cases_Resume_Current_Task_Title.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
+
 <dynaForm name="cases_Resume_Current_Task" type="xmlform" width="550px" labelWidth="150px">
  <TITLE2 type="title">
    <en><![CDATA[Current Task(s) Properties]]></en>
-  </TITLE2>
-  
+  </TITLE2>  
 </dynaForm>