\n" .
@@ -387,7 +393,7 @@ class pmDynaform
{
if ($this->debugMode) {
echo "
";
- echo G::json_encode($json);
+ echo G::json_encode(array($this->app_data, $this->data));
echo "";
}
}
diff --git a/workflow/engine/js/cases/core/pmDynaform.js b/workflow/engine/js/cases/core/pmDynaform.js
index befaa4abd..bc6ddf189 100644
--- a/workflow/engine/js/cases/core/pmDynaform.js
+++ b/workflow/engine/js/cases/core/pmDynaform.js
@@ -75,4 +75,7 @@ $(window).load(function () {
form.submit();
return false;
};
+ if (triggerDebug === true) {
+ showdebug();
+ }
});
\ No newline at end of file
diff --git a/workflow/engine/methods/cases/cases_Step.php b/workflow/engine/methods/cases/cases_Step.php
index 5daf495cc..6ee2a1c8d 100755
--- a/workflow/engine/methods/cases/cases_Step.php
+++ b/workflow/engine/methods/cases/cases_Step.php
@@ -272,6 +272,7 @@ try {
$a = new pmDynaform($_GET['UID'], $Fields['APP_DATA']);
if ($a->isResponsive()) {
$a->app_data["PRO_SHOW_MESSAGE"] = $noShowTitle;
+ $a->app_data["TRIGGER_DEBUG"] = $_SESSION['TRIGGER_DEBUG']['ISSET'];
$a->printEdit((!isset($_SESSION["PM_RUN_OUTSIDE_MAIN_APP"])) ? "true" : "false", $_SESSION['APPLICATION'], $array, $oStep->getStepMode());
} else {
$G_PUBLISH->AddContent('dynaform', 'xmlform', $_SESSION['PROCESS'] . '/' . $_GET['UID'], '', $Fields['APP_DATA'], 'cases_SaveData?UID=' . $_GET['UID'] . '&APP_UID=' . $_SESSION['APPLICATION'], '', (strtolower($oStep->getStepMode()) != 'edit' ? strtolower($oStep->getStepMode()) : ''));
diff --git a/workflow/engine/src/ProcessMaker/BusinessModel/Light.php b/workflow/engine/src/ProcessMaker/BusinessModel/Light.php
index 2d423184f..c55094132 100644
--- a/workflow/engine/src/ProcessMaker/BusinessModel/Light.php
+++ b/workflow/engine/src/ProcessMaker/BusinessModel/Light.php
@@ -55,6 +55,7 @@ class Light
$task->setFormatFieldNameInUppercase(false);
$task->setArrayParamException(array("taskUid" => "act_uid", "stepUid" => "step_uid"));
+ $response = array();
foreach ($processList as $key => $processInfo) {
$tempTreeChildren = array ();
foreach ($processList[$key] as $keyChild => $processInfoChild) {
@@ -78,7 +79,7 @@ class Light
$tempTreeChildren[] = $tempTreeChild;
}
}
- $response = $tempTreeChildren;
+ $response = array_merge($response, $tempTreeChildren);
}
} catch (\Exception $e) {
throw $e;
@@ -592,4 +593,78 @@ class Light
return $response;
}
+
+ /**
+ * Get information for status paused and participated or other status
+ *
+ * @param $userUid
+ * @param $type
+ * @param $app_uid
+ * @throws \Exception
+ */
+ public function getInformation($userUid, $type, $app_uid)
+ {
+ switch ($type) {
+ case 'paused':
+ case 'participated':
+ $oCase = new \Cases();
+ $iDelIndex = $oCase->getCurrentDelegationCase( $app_uid );
+ $aFields = $oCase->loadCase( $app_uid, $iDelIndex );
+ $this->getInfoResume($userUid, $aFields, $type);
+ break;
+ }
+ }
+
+ /**
+ * view in html response for status
+ *
+ * @param $userUid
+ * @param $Fields
+ * @param $type
+ * @throws \Exception
+ */
+ public function getInfoResume($userUid, $Fields, $type)
+ {
+ //print_r($Fields);die;
+ /* Includes */
+ G::LoadClass( 'case' );
+ /* Prepare page before to show */
+ //$oCase = new \Cases();
+
+// $participated = $oCase->userParticipatedInCase( $Fields['APP_UID'], $userUid );
+// if ($RBAC->userCanAccess( 'PM_ALLCASES' ) < 0 && $participated == 0) {
+// /*if (strtoupper($Fields['APP_STATUS']) != 'COMPLETED') {
+// $oCase->thisIsTheCurrentUser($_SESSION['APPLICATION'], $_SESSION['INDEX'], $_SESSION['USER_LOGGED'], 'SHOW_MESSAGE');
+// }*/
+// $aMessage['MESSAGE'] = G::LoadTranslation( 'ID_NO_PERMISSION_NO_PARTICIPATED' );
+// $G_PUBLISH = new Publisher();
+// $G_PUBLISH->AddContent( 'xmlform', 'xmlform', 'login/showMessage', '', $aMessage );
+// G::RenderPage( 'publishBlank', 'blank' );
+// die();
+// }
+
+ $objProc = new \Process();
+ $aProc = $objProc->load( $Fields['PRO_UID'] );
+ $Fields['PRO_TITLE'] = $aProc['PRO_TITLE'];
+
+ $objTask = new \Task();
+
+ if (isset($_SESSION['ACTION']) && ($_SESSION['ACTION'] == 'jump')) {
+ $task = explode('-', $Fields['TAS_UID']);
+ $Fields['TAS_TITLE'] = '';
+ for( $i = 0; $i < sizeof($task)-1; $i ++ ) {
+ $aTask = $objTask->load( $task[$i] );
+ $Fields['TAS_TITLE'][] = $aTask['TAS_TITLE'];
+ }
+ $Fields['TAS_TITLE'] = implode(" - ", array_values($Fields['TAS_TITLE']));
+ } else {
+ $aTask = $objTask->load( $Fields['TAS_UID'] );
+ $Fields['TAS_TITLE'] = $aTask['TAS_TITLE'];
+ }
+
+ require_once(PATH_GULLIVER .'../thirdparty/smarty/libs/Smarty.class.php');
+ $G_PUBLISH = new \Publisher();
+ $G_PUBLISH->AddContent( 'xmlform', 'xmlform', 'cases/cases_Resume.xml', '', $Fields, '' );
+ $G_PUBLISH->RenderContent();
+ }
}
diff --git a/workflow/engine/src/ProcessMaker/Services/Api/Light.php b/workflow/engine/src/ProcessMaker/Services/Api/Light.php
index bac12171a..1148d746e 100644
--- a/workflow/engine/src/ProcessMaker/Services/Api/Light.php
+++ b/workflow/engine/src/ProcessMaker/Services/Api/Light.php
@@ -713,4 +713,22 @@ class Light extends Api
}
return $files;
}
+
+ /**
+ * @url GET /:type/case/:app_uid
+ *
+ * @param $access
+ * @param $refresh
+ * @return mixed
+ */
+ public function getInformation($type, $app_uid)
+ {
+ try {
+ $userUid = $this->getUserId();
+ $oMobile = new \ProcessMaker\BusinessModel\Light();
+ $oMobile->getInformation($userUid, $type, $app_uid);
+ } catch (\Exception $e) {
+ throw (new RestException(Api::STAT_APP_EXCEPTION, $e->getMessage()));
+ }
+ }
}
diff --git a/workflow/engine/src/ProcessMaker/Services/OAuth2/Server.php b/workflow/engine/src/ProcessMaker/Services/OAuth2/Server.php
index fde833117..6ff57df53 100644
--- a/workflow/engine/src/ProcessMaker/Services/OAuth2/Server.php
+++ b/workflow/engine/src/ProcessMaker/Services/OAuth2/Server.php
@@ -49,7 +49,7 @@ class Server implements iAuthenticate
$cnn = array('dsn' => self::$dsn, 'username' => self::$dbUser, 'password' => self::$dbPassword);
if (self::$isRBAC) {
- $config = array('user_table' => 'USERS');
+ $config = array();
$cnnrbac = array('dsn' => self::$dsnRBAC, 'username' => self::$dbUserRBAC, 'password' => self::$dbPasswordRBAC);
$this->storage = new PmPdo($cnn, $config, $cnnrbac);
} else {
diff --git a/workflow/engine/templates/cases/pmdynaform.html b/workflow/engine/templates/cases/pmdynaform.html
index e3920be59..b93895beb 100644
--- a/workflow/engine/templates/cases/pmdynaform.html
+++ b/workflow/engine/templates/cases/pmdynaform.html
@@ -7,9 +7,11 @@
+
+
@@ -19,6 +21,7 @@
###TEMPLATES###
+
{javascript}