diff --git a/presentation/lookAndFeel/knowledgeTree/administration/unitmanagement/removeUnitBL.php b/presentation/lookAndFeel/knowledgeTree/administration/unitmanagement/removeUnitBL.php
index c5d8dc5..ea3a4c6 100644
--- a/presentation/lookAndFeel/knowledgeTree/administration/unitmanagement/removeUnitBL.php
+++ b/presentation/lookAndFeel/knowledgeTree/administration/unitmanagement/removeUnitBL.php
@@ -10,63 +10,53 @@
require_once("../../../../../config/dmsDefaults.php");
if (checkSession()) {
- require_once("$default->fileSystemRoot/lib/visualpatterns/PatternListBox.inc");
- require_once("$default->fileSystemRoot/lib/visualpatterns/PatternEditableListFromQuery.inc");
- require_once("removeUnitUI.inc");
- require_once("$default->fileSystemRoot/lib/security/permission.inc");
- require_once("$default->fileSystemRoot/lib/unitmanagement/Unit.inc");
- require_once("$default->fileSystemRoot/lib/orgmanagement/Organisation.inc");
- require_once("$default->fileSystemRoot/lib/unitmanagement/UnitOrganisationLink.inc");
- require_once("$default->fileSystemRoot/presentation/webpageTemplate.inc");
- require_once("$default->fileSystemRoot/lib/visualpatterns/PatternCustom.inc");
- require_once("$default->fileSystemRoot/lib/foldermanagement/Folder.inc");
- require_once("$default->fileSystemRoot/presentation/lookAndFeel/knowledgeTree/foldermanagement/folderUI.inc");
- require_once("$default->fileSystemRoot/presentation/Html.inc");
-
- $oPatternCustom = & new PatternCustom();
-
- // get main page
- if (isset($fUnitID)) {
-
- $fOrgID = UnitOrganisationLink::unitBelongsToOrg($fUnitID);
-
-
- $oPatternCustom->setHtml(getDeleteConfirmedPage($fUnitID,$fOrgID));
- $main->setFormAction($_SERVER["PHP_SELF"] . "?fForDeleteConfirmed=1");
- }
- else {
- $oPatternCustom->setHtml(getDeletePage(null));
- $main->setFormAction($_SERVER["PHP_SELF"]);
- }
-
- if (isset($fForDeleteConfirmed)) {
-
- // get unitorg object
- $oUnitOrg = new UnitOrganisationLink($fUnitID,$fOrgID);
- $oUnitOrg->setUnitOrgID($fUnitID);
-
- //get unit object
- $oUnit = Unit::get($fUnitID);
- $oUnit->setName($fUnitName);
-
- //delete unitorgobject
- $oUnitOrg->delete();
-
- //delet unit object
- if ($oUnit->delete()) {
-
- $oPatternCustom->setHtml(getDeleteSuccessPage());
-
- } else {
- $oPatternCustom->setHtml(getDeleteFailPage());
- }
-
- }
-
-
-
-
- $main->setCentralPayload($oPatternCustom);
- $main->render();
+ require_once("$default->fileSystemRoot/lib/visualpatterns/PatternListBox.inc");
+ require_once("$default->fileSystemRoot/lib/visualpatterns/PatternEditableListFromQuery.inc");
+ require_once("removeUnitUI.inc");
+ require_once("../adminUI.inc");
+ require_once("$default->fileSystemRoot/lib/security/permission.inc");
+ require_once("$default->fileSystemRoot/lib/unitmanagement/Unit.inc");
+ require_once("$default->fileSystemRoot/lib/orgmanagement/Organisation.inc");
+ require_once("$default->fileSystemRoot/lib/unitmanagement/UnitOrganisationLink.inc");
+ require_once("$default->fileSystemRoot/presentation/webpageTemplate.inc");
+ require_once("$default->fileSystemRoot/lib/visualpatterns/PatternCustom.inc");
+ require_once("$default->fileSystemRoot/lib/foldermanagement/Folder.inc");
+ require_once("$default->fileSystemRoot/presentation/lookAndFeel/knowledgeTree/foldermanagement/folderUI.inc");
+ require_once("$default->fileSystemRoot/presentation/Html.inc");
+
+ $oPatternCustom = & new PatternCustom();
+
+ // get main page
+ if (isset($fUnitID)) {
+ $fOrgID = UnitOrganisationLink::unitBelongsToOrg($fUnitID);
+ $oPatternCustom->setHtml(getDeleteConfirmedPage($fUnitID,$fOrgID));
+ $main->setFormAction($_SERVER["PHP_SELF"] . "?fForDeleteConfirmed=1");
+ } else {
+ $oPatternCustom->setHtml(getDeletePage(null));
+ $main->setFormAction($_SERVER["PHP_SELF"]);
+ }
+
+ if (isset($fForDeleteConfirmed)) {
+ // get unitorg object
+ $oUnitOrg = new UnitOrganisationLink($fUnitID,$fOrgID);
+ $oUnitOrg->setUnitOrgID($fUnitID);
+
+ //get unit object
+ $oUnit = Unit::get($fUnitID);
+ $oUnit->setName($fUnitName);
+
+ //delete unitorgobject
+ $oUnitOrg->delete();
+
+ //delete unit object
+ if ($oUnit->delete()) {
+ $oPatternCustom->setHtml(getDeleteSuccessPage());
+ } else {
+ $oPatternCustom->setHtml(getDeleteFailPage());
+ }
+ }
+
+ $main->setCentralPayload($oPatternCustom);
+ $main->render();
}
?>
diff --git a/presentation/lookAndFeel/knowledgeTree/administration/unitmanagement/removeUnitUI.inc b/presentation/lookAndFeel/knowledgeTree/administration/unitmanagement/removeUnitUI.inc
index df1f5b1..5a997fa 100644
--- a/presentation/lookAndFeel/knowledgeTree/administration/unitmanagement/removeUnitUI.inc
+++ b/presentation/lookAndFeel/knowledgeTree/administration/unitmanagement/removeUnitUI.inc
@@ -9,174 +9,158 @@
*
*/
// gets the delete stuff
-function getDeletePage($iUnitID) {
- global $default;
- $oUnit = null;
- if (isset($iUnitID)) {
- $oUnit = Unit::get($iUnitID);
- $sToRender .= "
\n";
- $sToRender .= "Are you sure you wish to Remove this Unit?:\n";
- }
- else{
- $sToRender .= "
\n";
- $sToRender .= "Remove Unit From System:\n";
- }
-
- $sToRender .= "
\n";
- $sToRender .= "
\n";
- $sToRender .= "
\n";
- $sToRender .= "\n";
- $sToRender .= "| Unit Name: " . getUnitDisplay($oUnit) . " | \n";
- $sToRender .= "
\n";
- $sToRender .= "\n";
- $sToRender .= "
\n";
- $sToRender .= "\n";
- $sToRender .= "
\n";
- $sToRender .= "\n";
- $sToRender .= "
\n";
- $sToRender .= "\n";
-
- $sToRender .= getDeleteButton($oUnit);
- $sToRender .= "
\n";
- $sToRender .= "
\n";
-
-
- return $sToRender;
+function getDeletePage($iUnitID) {
+ global $default;
+ $oUnit = null;
+ if (isset($iUnitID)) {
+ $oUnit = Unit::get($iUnitID);
+ $sHeading .= "Are you sure you wish to Remove this Unit?:\n";
+ } else {
+ $sHeading .= "Please select a Unit: ";
+ }
+
+ $sToRender .= "" . renderHeading("Remove Unit") . "
";
+ $sToRender .= "\n";
+ $sToRender .= "| $sHeading |
\n";
+ $sToRender .= "\n";
+ $sToRender .= "| Unit Name: " . getUnitDisplay($oUnit) . " | \n";
+ $sToRender .= "
\n";
+ $sToRender .= "\n";
+ $sToRender .= "
\n";
+ $sToRender .= "\n";
+ $sToRender .= "
\n";
+ $sToRender .= "\n";
+ $sToRender .= "
\n";
+ $sToRender .= "\n";
+
+ $sToRender .= getDeleteButton($oUnit);
+ $sToRender .= "
\n";
+ $sToRender .= "
\n";
+
+
+ return $sToRender;
}
// get successfully deletion page
-function getDeleteSuccessPage() {
-
-global $default;
-
-$sToRender = "
\n" ;
-$sToRender .= "\n";
-
-return $sToRender;
+function getDeleteSuccessPage() {
+
+ global $default;
+
+ $sToRender .= "" . renderHeading("Remove Unit") . "
";
+ $sToRender .= "\n";
+
+ return $sToRender;
}
// get deletion failed page
-function getDeleteFailPage() {
-
-global $default;
-
-$sToRender = "
\n" ;
-$sToRender .= "\n";
-
-return $sToRender;
+function getDeleteFailPage() {
+
+ global $default;
+
+ $sToRender .= "" . renderHeading("Remove Unit") . "
";
+ $sToRender .= "\n";
+
+ return $sToRender;
}
-function getDeleteConfirmedPage($iUnitID,$iOrgID) {
- global $default;
- $oUnit = null;
- if (isset($iUnitID)) {
- $oUnit = Unit::get($iUnitID);
- $sToRender .= "
\n";
- $sToRender .= "Are you sure you wish to Remove this Unit?:\n";
- }
- else{
- $sToRender .= "
\n";
- $sToRender .= "Remove Unit From System:\n";
- }
-
- if (isset($iOrgID)) {
- $oOrg = Organisation::get($iOrgID);
-
- }
-
- $sToRender .= "\n";
- $sToRender .= "
\n";
- $sToRender .= "
\n";
- $sToRender .= "\n";
- $sToRender .= "| Unit Name: " . getUnitDisplay($oUnit) . " | \n";
- $sToRender .= "
\n";
- $sToRender .= "\n";
- $sToRender .= "
\n";
- $sToRender .= "\n";
- $sToRender .= "| Organisation Name: " . getOrgDisplay($oOrg) . " | \n";
- $sToRender .= "
\n";
- $sToRender .= "\n";
- $sToRender .= "
\n";
- $sToRender .= "\n";
- $sToRender .= getDeleteButton($oUnit);
- $sToRender .= "
\n";
- $sToRender .= "
\n";
-
-
- return $sToRender;
+function getDeleteConfirmedPage($iUnitID,$iOrgID) {
+ global $default;
+ $oUnit = null;
+ if (isset($iUnitID)) {
+ $oUnit = Unit::get($iUnitID);
+ }
+
+ if (isset($iOrgID)) {
+ $oOrg = Organisation::get($iOrgID);
+ }
+
+ $sToRender .= "" . renderHeading("Remove Unit") . "
";
+ $sToRender .= "\n";
+ $sToRender .= "| Are you sure you wish to Remove this Unit?: |
\n";
+ $sToRender .= "\n";
+ $sToRender .= "| Unit Name: " . getUnitDisplay($oUnit) . " | \n";
+ $sToRender .= "
\n";
+ $sToRender .= "\n";
+ $sToRender .= "
\n";
+ $sToRender .= "\n";
+ $sToRender .= "| Organisation Name: " . getOrgDisplay($oOrg) . " | \n";
+ $sToRender .= "
\n";
+ $sToRender .= "\n";
+ $sToRender .= "
\n";
+ $sToRender .= "\n";
+ $sToRender .= getDeleteButton($oUnit);
+ $sToRender .= "
\n";
+ $sToRender .= "
\n";
+
+ return $sToRender;
}
// show listbox...or the text name
function getUnitDisplay($oUnit) {
- global $default;
- if (!isset($oUnit)) {
- $oPatternListBox = & new PatternListBox($default->owl_units_table, "name", "id", "fUnitID");
- $oPatternListBox->setIncludeDefaultValue(true);
- $oPatternListBox->setPostBackOnChange(true);
- return $oPatternListBox->render();
- } else {
- return "iId . "\">\n" .
- "" . $oUnit->getName() . "";
- }
-
+ global $default;
+ if (!isset($oUnit)) {
+ $oPatternListBox = & new PatternListBox($default->owl_units_table, "name", "id", "fUnitID");
+ $oPatternListBox->setIncludeDefaultValue(true);
+ $oPatternListBox->setPostBackOnChange(true);
+ return $oPatternListBox->render();
+ } else {
+ return "iId . "\">\n" .
+ "" . $oUnit->getName() . "";
+ }
+
}
// show listbox...or the text name
function getOrgDisplay($oOrg) {
- global $default;
- if (!isset($oOrg)) {
-
- } else {
- return "iId . "\">\n" .
- "" . $oOrg->getName() . "";
- }
-
+ global $default;
+ if (isset($oOrg)) {
+ return "iId . "\">\n" .
+ "" . $oOrg->getName() . "";
+ }
}
// show delete button
function getDeleteButton($oUnit) {
- global $default;
- if (!isset($oUnit)) {
- return "Please select a Unit: ";
- } else {
- return "graphicsUrl/widgets/delete.gif\" value=\"submit\" border=\"0\"/> | \n".
- "rootUrl/control.php?action=removeUnit\"> graphicsUrl/widgets/cancel.gif\" border = \"0\" /> | \n";
- }
+ global $default;
+ if (isset($oUnit)) {
+ return "graphicsUrl/widgets/delete.gif\" value=\"submit\" border=\"0\"/> | \n".
+ "rootUrl/control.php?action=removeUnit\"> graphicsUrl/widgets/cancel.gif\" border = \"0\" /> | \n";
+ }
}
// show cancel button
function getCancelButton($oUnit) {
- global $default;
- if (!isset($oUnit)) {
- //return "rootUrl/control.php?action=groupManagement\"> graphicsUrl/widgets/cancel.gif\" value=\"cancel\" /> | \n";
- } else {
- return "rootUrl/control.php?action=removeUnit\"> graphicsUrl/widgets/cancel.gif\" border = \"0\" /> | \n";
- }
+ global $default;
+ if (!isset($oUnit)) {
+ return "rootUrl/control.php?action=unitManagement\"> graphicsUrl/widgets/cancel.gif\" value=\"cancel\" /> | \n";
+ } else {
+ return "rootUrl/control.php?action=removeUnit\"> graphicsUrl/widgets/cancel.gif\" border = \"0\" /> | \n";
+ }
}
?>