From dd63a4384b070231619b6e824eaaae64e2a5a420 Mon Sep 17 00:00:00 2001 From: davidcallizaya Date: Fri, 4 Aug 2017 10:31:18 -0400 Subject: [PATCH] HOR-3620 Fix class dynaform to Dynaform --- .../engine/classes/class.dynaformEditor.php | 8 +- .../methods/dynaforms/dynaforms_Delete.php | 4 +- .../methods/dynaforms/dynaforms_Edit.php | 2 +- .../methods/dynaforms/dynaforms_Editor.php | 2 +- .../dynaforms/dynaforms_FlatEditor.php | 2 +- .../methods/dynaforms/dynaforms_NewPlugin.php | 2 +- .../methods/dynaforms/dynaforms_Save_as.php | 2 +- .../methods/dynaforms/dynaforms_Saveas.php | 2 +- .../engine/methods/tracker/tracker_Show.php | 206 ++++++------- .../engine/templates/cases/cases_toRevise.php | 290 +++++++++--------- 10 files changed, 260 insertions(+), 260 deletions(-) diff --git a/workflow/engine/classes/class.dynaformEditor.php b/workflow/engine/classes/class.dynaformEditor.php index d34e89eba..27108fdce 100644 --- a/workflow/engine/classes/class.dynaformEditor.php +++ b/workflow/engine/classes/class.dynaformEditor.php @@ -686,7 +686,7 @@ class dynaformEditorAjax extends dynaformEditor implements iDynaformEditorAjax $file = G::decrypt($A, URL_KEY); $tmp = self::_getTmpData(); if (!(isset($tmp['Properties']) && isset($tmp['useTmpCopy']))) { - $dynaform = new dynaform(); + $dynaform = new Dynaform(); $dynaform->load($DYN_UID); $form = new Form($file, PATH_DYNAFORM, SYS_LANG, true); $Properties = array('A' => $A, 'DYN_UID' => $dynaform->getDynUid(), 'PRO_UID' => $dynaform->getProUid(), 'DYN_TITLE' => $dynaform->getDynTitle(), 'DYN_TYPE' => $dynaform->getDynType(), 'DYN_DESCRIPTION' => $dynaform->getDynDescription(), 'WIDTH' => $form->width, @@ -727,7 +727,7 @@ class dynaformEditorAjax extends dynaformEditor implements iDynaformEditorAjax $file = G::decrypt($A, URL_KEY); $tmp = self::_getTmpData(); if (!isset($tmp['useTmpCopy'])) { - $dynaform = new dynaform(); + $dynaform = new Dynaform(); $dynaform->update($Fields); } else { $tmp['Properties'] = $Fields; @@ -828,7 +828,7 @@ class dynaformEditorAjax extends dynaformEditor implements iDynaformEditorAjax } if (isset($tmp['useTmpCopy'])) { /* Save Register */ - $dynaform = new dynaform(); + $dynaform = new Dynaform(); $dynaform->update($tmp['Properties']); /* Save file */ $copyFirst = implode('', file(PATH_DYNAFORM . $fileFirst . '.xml')); @@ -958,7 +958,7 @@ class dynaformEditorAjax extends dynaformEditor implements iDynaformEditorAjax $file = G::decrypt($A, URL_KEY); try { /* Compare Properties */ - $dynaform = new dynaform(); + $dynaform = new Dynaform(); $dynaform->load($DYN_UID); $form = new Form($file, PATH_DYNAFORM, SYS_LANG, true); $sp = array('A' => $A, 'DYN_UID' => $dynaform->getDynUid(), 'PRO_UID' => $dynaform->getProUid(), 'DYN_TITLE' => $dynaform->getDynTitle(), 'DYN_TYPE' => $dynaform->getDynType(), 'DYN_DESCRIPTION' => $dynaform->getDynDescription(), 'WIDTH' => $form->width, 'ENABLETEMPLATE' => $form->enableTemplate, 'MODE' => $form->mode diff --git a/workflow/engine/methods/dynaforms/dynaforms_Delete.php b/workflow/engine/methods/dynaforms/dynaforms_Delete.php index e9787929d..f5c5c6626 100644 --- a/workflow/engine/methods/dynaforms/dynaforms_Delete.php +++ b/workflow/engine/methods/dynaforms/dynaforms_Delete.php @@ -61,7 +61,7 @@ switch ($sfunction) { return print $result; break; case 'deleteDynaform': - $dynaform = new dynaform(); + $dynaform = new Dynaform(); if (! isset( $_POST['DYN_UID'] )) { return; @@ -145,7 +145,7 @@ switch ($sfunction) { $DYN_UIDS = explode( ',', $_POST['DYN_UID'] ); foreach ($DYN_UIDS as $i => $DYN_UID) { - $dynaform = new dynaform(); + $dynaform = new Dynaform(); //in table dynaform $dynaform->remove( $DYN_UID ); diff --git a/workflow/engine/methods/dynaforms/dynaforms_Edit.php b/workflow/engine/methods/dynaforms/dynaforms_Edit.php index fb077ca61..186ae1845 100644 --- a/workflow/engine/methods/dynaforms/dynaforms_Edit.php +++ b/workflow/engine/methods/dynaforms/dynaforms_Edit.php @@ -53,7 +53,7 @@ $_DBArray['ADDITIONAL_TABLES'] = $aTablesList; $_SESSION['_DBArray'] = $_DBArray; $dynUid = (isset( $_GET['DYN_UID'] )) ? urldecode( $_GET['DYN_UID'] ) : ''; -$dynaform = new dynaform(); +$dynaform = new Dynaform(); if ($dynUid == '') { $aFields['DYN_UID'] = $dynUid; } else { diff --git a/workflow/engine/methods/dynaforms/dynaforms_Editor.php b/workflow/engine/methods/dynaforms/dynaforms_Editor.php index 3ece42946..6021f5d7e 100644 --- a/workflow/engine/methods/dynaforms/dynaforms_Editor.php +++ b/workflow/engine/methods/dynaforms/dynaforms_Editor.php @@ -59,7 +59,7 @@ if ($process->exists( $PRO_UID )) { print ("$PRO_UID doesn't exist, continue? yes") ; } -$dynaform = new dynaform(); +$dynaform = new Dynaform(); if ($dynaform->exists( $DYN_UID )) { $dynaform->load( $DYN_UID ); diff --git a/workflow/engine/methods/dynaforms/dynaforms_FlatEditor.php b/workflow/engine/methods/dynaforms/dynaforms_FlatEditor.php index 00956c2a7..04149031f 100644 --- a/workflow/engine/methods/dynaforms/dynaforms_FlatEditor.php +++ b/workflow/engine/methods/dynaforms/dynaforms_FlatEditor.php @@ -44,7 +44,7 @@ $PRO_UID = isset( $_POST['PRO_UID'] ) ? $_POST['PRO_UID'] : '746B734DC23311'; $process = new Process( $dbc ); $process->Load( $PRO_UID ); -$dynaform = new dynaform( $dbc ); +$dynaform = new Dynaform( $dbc ); $dynaform->Fields['DYN_UID'] = (isset( $_POST['DYN_UID'] )) ? urldecode( $_POST['DYN_UID'] ) : '0'; $dynaform->Load( $dynaform->Fields['DYN_UID'] ); diff --git a/workflow/engine/methods/dynaforms/dynaforms_NewPlugin.php b/workflow/engine/methods/dynaforms/dynaforms_NewPlugin.php index 563702b9c..3cd6d9c3d 100644 --- a/workflow/engine/methods/dynaforms/dynaforms_NewPlugin.php +++ b/workflow/engine/methods/dynaforms/dynaforms_NewPlugin.php @@ -53,7 +53,7 @@ if (($RBAC_Response = $RBAC->userCanAccess( "PM_FACTORY" )) != 1) { require_once ('classes/model/Dynaform.php'); $dynUid = (isset( $_GET['DYN_UID'] )) ? urldecode( $_GET['DYN_UID'] ) : ''; -$dynaform = new dynaform(); +$dynaform = new Dynaform(); if ($dynUid == '') { $aFields['DYN_UID'] = $dynUid; } else { diff --git a/workflow/engine/methods/dynaforms/dynaforms_Save_as.php b/workflow/engine/methods/dynaforms/dynaforms_Save_as.php index fc4c9f880..f076538a1 100644 --- a/workflow/engine/methods/dynaforms/dynaforms_Save_as.php +++ b/workflow/engine/methods/dynaforms/dynaforms_Save_as.php @@ -47,7 +47,7 @@ try { $oFieldCondition = new FieldCondition(); $aConditions = $oFieldCondition->getAllByDynUid( $DYN_UID ); - $dynaform = new dynaform(); + $dynaform = new Dynaform(); $arrayData = array(); $arrayData["PRO_UID"] = $PRO_UID; diff --git a/workflow/engine/methods/dynaforms/dynaforms_Saveas.php b/workflow/engine/methods/dynaforms/dynaforms_Saveas.php index 5b6729bcd..860ba8c0b 100644 --- a/workflow/engine/methods/dynaforms/dynaforms_Saveas.php +++ b/workflow/engine/methods/dynaforms/dynaforms_Saveas.php @@ -31,7 +31,7 @@ if (($RBAC_Response = $RBAC->userCanAccess( "PM_FACTORY" )) != 1) { require_once ('classes/model/Dynaform.php'); $dynUid = (isset( $_GET['DYN_UID'] )) ? urldecode( $_GET['DYN_UID'] ) : ''; -$dynaform = new dynaform(); +$dynaform = new Dynaform(); $aFields = $dynaform->load( $dynUid ); //print_r($aFields); diff --git a/workflow/engine/methods/tracker/tracker_Show.php b/workflow/engine/methods/tracker/tracker_Show.php index d1d347535..15f12500a 100644 --- a/workflow/engine/methods/tracker/tracker_Show.php +++ b/workflow/engine/methods/tracker/tracker_Show.php @@ -1,103 +1,103 @@ -. - * - * For more information, contact Colosa Inc, 2566 Le Jeune Rd., - * Coral Gables, FL, 33134, USA, or email info@colosa.com. - */ - -/* -* dynaforms & documents for Case Tracker -* -* @author Everth S. Berrios Morales -* -*/ - -if (! isset( $_SESSION['PROCESS'] )) { - G::header( 'location: login' ); -} - -global $_DBArray; -if (! isset( $_DBArray )) { - $_DBArray = array (); -} - -$G_MAIN_MENU = 'caseTracker'; -$G_ID_MENU_SELECTED = 'DYNADOC'; -global $G_PUBLISH; - -switch ($_GET['CTO_TYPE_OBJ']) { - case 'DYNAFORM': - - $oCase = new Cases(); - $Fields = $oCase->loadCase( $_SESSION['APPLICATION'] ); - $Fields['APP_DATA']['__DYNAFORM_OPTIONS']['PREVIOUS_STEP_LABEL'] = ''; - $Fields['APP_DATA']['__DYNAFORM_OPTIONS']['NEXT_STEP_LABEL'] = ''; - $Fields['APP_DATA']['__DYNAFORM_OPTIONS']['NEXT_STEP'] = '#'; - $Fields['APP_DATA']['__DYNAFORM_OPTIONS']['NEXT_ACTION'] = 'alert("Sample"); return false;'; - $Fields['APP_DATA']['__DYNAFORM_OPTIONS']['PRINT_PREVIEW'] = '#'; - $Fields['APP_DATA']['__DYNAFORM_OPTIONS']['PRINT_PREVIEW_ACTION'] = 'tracker_PrintView?CTO_UID_OBJ=' . $_GET['CTO_UID_OBJ'] . '&CTO_TYPE_OBJ=PRINT_PREVIEW'; - $_SESSION['CTO_UID_OBJ'] = $_GET['CTO_UID_OBJ']; - - $dynaForm = new Dynaform(); - $arrayDynaFormData = $dynaForm->Load($_GET["CTO_UID_OBJ"]); - - if (isset($arrayDynaFormData["DYN_VERSION"]) && $arrayDynaFormData["DYN_VERSION"] == 2) { - - $Fields["PRO_UID"] = $_SESSION["PROCESS"]; - $Fields["CURRENT_DYNAFORM"] = $_GET["CTO_UID_OBJ"]; - - $pmDynaForm = new pmDynaform($Fields); - - if ($pmDynaForm->isResponsive()) { - $pmDynaForm->printTracker(); - } - } else { - $G_PUBLISH = new Publisher(); - $G_PUBLISH->AddContent("dynaform", "xmlform", $_SESSION["PROCESS"] . "/" . $_GET["CTO_UID_OBJ"], "", $Fields["APP_DATA"], "", "", "view"); - G::RenderPage("publish"); - } - break; - case 'INPUT_DOCUMENT': - - $oCase = new Cases(); - $c = $oCase->getAllUploadedDocumentsCriteriaTracker( $_SESSION['PROCESS'], $_SESSION['APPLICATION'], $_GET['CTO_UID_OBJ'] ); - - $oHeadPublisher = & headPublisher::getSingleton(); - $oHeadPublisher->addScriptFile( '/jscore/tracker/tracker.js' ); - - $G_PUBLISH = new Publisher(); - $G_PUBLISH->AddContent( 'propeltable', 'paged-table', 'tracker/tracker_Inputdocs', $c ); - G::RenderPage( 'publish' ); - break; - - case 'OUTPUT_DOCUMENT': - - $oCase = new Cases(); - $c = $oCase->getAllGeneratedDocumentsCriteriaTracker( $_SESSION['PROCESS'], $_SESSION['APPLICATION'], $_GET['CTO_UID_OBJ'] ); - - $oHeadPublisher = & headPublisher::getSingleton(); - $oHeadPublisher->addScriptFile( '/jscore/tracker/tracker.js' ); - - $G_PUBLISH = new Publisher(); - $G_PUBLISH->AddContent( 'propeltable', 'paged-table', 'tracker/tracker_Outputdocs', $c ); - G::RenderPage( 'publish' ); - break; -} - +. + * + * For more information, contact Colosa Inc, 2566 Le Jeune Rd., + * Coral Gables, FL, 33134, USA, or email info@colosa.com. + */ + +/* +* dynaforms & documents for Case Tracker +* +* @author Everth S. Berrios Morales +* +*/ + +if (! isset( $_SESSION['PROCESS'] )) { + G::header( 'location: login' ); +} + +global $_DBArray; +if (! isset( $_DBArray )) { + $_DBArray = array (); +} + +$G_MAIN_MENU = 'caseTracker'; +$G_ID_MENU_SELECTED = 'DYNADOC'; +global $G_PUBLISH; + +switch ($_GET['CTO_TYPE_OBJ']) { + case 'DYNAFORM': + + $oCase = new Cases(); + $Fields = $oCase->loadCase( $_SESSION['APPLICATION'] ); + $Fields['APP_DATA']['__DYNAFORM_OPTIONS']['PREVIOUS_STEP_LABEL'] = ''; + $Fields['APP_DATA']['__DYNAFORM_OPTIONS']['NEXT_STEP_LABEL'] = ''; + $Fields['APP_DATA']['__DYNAFORM_OPTIONS']['NEXT_STEP'] = '#'; + $Fields['APP_DATA']['__DYNAFORM_OPTIONS']['NEXT_ACTION'] = 'alert("Sample"); return false;'; + $Fields['APP_DATA']['__DYNAFORM_OPTIONS']['PRINT_PREVIEW'] = '#'; + $Fields['APP_DATA']['__DYNAFORM_OPTIONS']['PRINT_PREVIEW_ACTION'] = 'tracker_PrintView?CTO_UID_OBJ=' . $_GET['CTO_UID_OBJ'] . '&CTO_TYPE_OBJ=PRINT_PREVIEW'; + $_SESSION['CTO_UID_OBJ'] = $_GET['CTO_UID_OBJ']; + + $dynaForm = new Dynaform(); + $arrayDynaFormData = $dynaForm->Load($_GET["CTO_UID_OBJ"]); + + if (isset($arrayDynaFormData["DYN_VERSION"]) && $arrayDynaFormData["DYN_VERSION"] == 2) { + + $Fields["PRO_UID"] = $_SESSION["PROCESS"]; + $Fields["CURRENT_DYNAFORM"] = $_GET["CTO_UID_OBJ"]; + + $pmDynaForm = new pmDynaform($Fields); + + if ($pmDynaForm->isResponsive()) { + $pmDynaForm->printTracker(); + } + } else { + $G_PUBLISH = new Publisher(); + $G_PUBLISH->AddContent("dynaform", "xmlform", $_SESSION["PROCESS"] . "/" . $_GET["CTO_UID_OBJ"], "", $Fields["APP_DATA"], "", "", "view"); + G::RenderPage("publish"); + } + break; + case 'INPUT_DOCUMENT': + + $oCase = new Cases(); + $c = $oCase->getAllUploadedDocumentsCriteriaTracker( $_SESSION['PROCESS'], $_SESSION['APPLICATION'], $_GET['CTO_UID_OBJ'] ); + + $oHeadPublisher = & headPublisher::getSingleton(); + $oHeadPublisher->addScriptFile( '/jscore/tracker/tracker.js' ); + + $G_PUBLISH = new Publisher(); + $G_PUBLISH->AddContent( 'propeltable', 'paged-table', 'tracker/tracker_Inputdocs', $c ); + G::RenderPage( 'publish' ); + break; + + case 'OUTPUT_DOCUMENT': + + $oCase = new Cases(); + $c = $oCase->getAllGeneratedDocumentsCriteriaTracker( $_SESSION['PROCESS'], $_SESSION['APPLICATION'], $_GET['CTO_UID_OBJ'] ); + + $oHeadPublisher = & headPublisher::getSingleton(); + $oHeadPublisher->addScriptFile( '/jscore/tracker/tracker.js' ); + + $G_PUBLISH = new Publisher(); + $G_PUBLISH->AddContent( 'propeltable', 'paged-table', 'tracker/tracker_Outputdocs', $c ); + G::RenderPage( 'publish' ); + break; +} + diff --git a/workflow/engine/templates/cases/cases_toRevise.php b/workflow/engine/templates/cases/cases_toRevise.php index 823aee8c2..74f80d1ab 100644 --- a/workflow/engine/templates/cases/cases_toRevise.php +++ b/workflow/engine/templates/cases/cases_toRevise.php @@ -1,145 +1,145 @@ -. - * - * For more information, contact Colosa Inc, 2566 Le Jeune Rd., - * Coral Gables, FL, 33134, USA, or email info@colosa.com. - * - */ - -$tree = new Tree(); -$tree->name = 'Groups'; -$tree->nodeType = "base"; -$tree->width = "200px"; -$tree->contentWidth = "220"; -$tree->value = ' -
-
- - - - - -
Steps List
-
-
- '; -$tree->showSign = false; - -$o = new Cases(); -$steps = $o->getAllDynaformsStepsToRevise($_GET['APP_UID']); -$APP_UID = $_GET['APP_UID']; -$DEL_INDEX = $_GET['DEL_INDEX']; - - -$html = " - - - - -
Dynaforms
"; - - $ch = &$tree->addChild("", $html, array('nodeType' => 'child')); - $ch->point = ''; - $i=1; - $PRO_UID=''; - $DYN_UID=''; -foreach ($steps as $step) { - require_once 'classes/model/Dynaform.php'; - $od = new Dynaform(); - $dynaformF = $od->Load($step['STEP_UID_OBJ']); - - $n = $step['STEP_POSITION']; - $TITLE = " - ".$dynaformF['DYN_TITLE']; - $DYN_UID = $dynaformF['DYN_UID']; - $PRO_UID = $step['PRO_UID']; - - $html = " - - - - - - -
  $n   - {$TITLE} -
"; - - $ch = &$tree->addChild("", $html, array('nodeType' => 'child')); - $ch->point = ''; - $i++; -} - -$html = " - - - - - -
-   Input Documents -
"; - $ch = &$tree->addChild("", $html, array('nodeType' => 'child')); - $ch->point = ''; - -$steps = $o->getAllInputsStepsToRevise($_GET['APP_UID']); -//$i=1; - -foreach ($steps as $step) { - require_once 'classes/model/InputDocument.php'; - $od = new InputDocument(); - $IDF = $od->Load($step['STEP_UID_OBJ']); - - $n = $step['STEP_POSITION']; - $TITLE = " - ".$IDF['INP_DOC_TITLE']; - $INP_DOC_UID = $IDF['INP_DOC_UID']; - $PRO_UID = $step['PRO_UID']; - - $html = " - - - - - - -
  $n   - {$TITLE} -
"; - - $ch = &$tree->addChild("", $html, array('nodeType' => 'child')); - $ch->point = ''; - $i++; -} - -$i++; -$html = " - - - - - -
-   Output Documents -
"; - - $ch = &$tree->addChild("", $html, array('nodeType' => 'child')); - $ch->point = ''; - -print ($tree->render()); -// +. + * + * For more information, contact Colosa Inc, 2566 Le Jeune Rd., + * Coral Gables, FL, 33134, USA, or email info@colosa.com. + * + */ + +$tree = new Tree(); +$tree->name = 'Groups'; +$tree->nodeType = "base"; +$tree->width = "200px"; +$tree->contentWidth = "220"; +$tree->value = ' +
+
+ + + + + +
Steps List
+
+
+ '; +$tree->showSign = false; + +$o = new Cases(); +$steps = $o->getAllDynaformsStepsToRevise($_GET['APP_UID']); +$APP_UID = $_GET['APP_UID']; +$DEL_INDEX = $_GET['DEL_INDEX']; + + +$html = " + + + + +
Dynaforms
"; + + $ch = &$tree->addChild("", $html, array('nodeType' => 'child')); + $ch->point = ''; + $i=1; + $PRO_UID=''; + $DYN_UID=''; +foreach ($steps as $step) { + require_once 'classes/model/Dynaform.php'; + $od = new Dynaform(); + $dynaformF = $od->Load($step['STEP_UID_OBJ']); + + $n = $step['STEP_POSITION']; + $TITLE = " - ".$dynaformF['DYN_TITLE']; + $DYN_UID = $dynaformF['DYN_UID']; + $PRO_UID = $step['PRO_UID']; + + $html = " + + + + + + +
  $n   + {$TITLE} +
"; + + $ch = &$tree->addChild("", $html, array('nodeType' => 'child')); + $ch->point = ''; + $i++; +} + +$html = " + + + + + +
+   Input Documents +
"; + $ch = &$tree->addChild("", $html, array('nodeType' => 'child')); + $ch->point = ''; + +$steps = $o->getAllInputsStepsToRevise($_GET['APP_UID']); +//$i=1; + +foreach ($steps as $step) { + require_once 'classes/model/InputDocument.php'; + $od = new InputDocument(); + $IDF = $od->Load($step['STEP_UID_OBJ']); + + $n = $step['STEP_POSITION']; + $TITLE = " - ".$IDF['INP_DOC_TITLE']; + $INP_DOC_UID = $IDF['INP_DOC_UID']; + $PRO_UID = $step['PRO_UID']; + + $html = " + + + + + + +
  $n   + {$TITLE} +
"; + + $ch = &$tree->addChild("", $html, array('nodeType' => 'child')); + $ch->point = ''; + $i++; +} + +$i++; +$html = " + + + + + +
+   Output Documents +
"; + + $ch = &$tree->addChild("", $html, array('nodeType' => 'child')); + $ch->point = ''; + +print ($tree->render()); +//