diff --git a/config/dmsDefaults.php b/config/dmsDefaults.php
index bb49b0f..7a08106 100644
--- a/config/dmsDefaults.php
+++ b/config/dmsDefaults.php
@@ -109,7 +109,7 @@ $default->owl_system_settings_table = "system_settings";
// Table with unit information
$default->owl_units_table = "units_lookup";
// Table with unit organisation link tables
-$default->owl_units_organisations_link_table = "units_organisations_link";
+$default->owl_units_organisations_table = "units_organisations_link";
// Table with user info
$default->owl_users_table = "users";
// links groups to users
@@ -183,8 +183,8 @@ $default->siteMap->addPage("deleteFolderCollaboration", "/presentation/lookAndFe
$default->siteMap->addDefaultPage("administration", "/admin.php", "Administration", UnitAdmin, "Administration");
$default->siteMap->addPage("userManagement", "/admin.php?sectionName=UserAdministration", "Administration", UnitAdmin, "User Management");
$default->siteMap->addPage("groupManagement", "/admin.php?sectionName=groupAdministration", "Administration", UnitAdmin, "Group Management");
-$default->siteMap->addPage("unitManagement", "/admin.php?sectionName=SystemAdministration", "Administration", SysAdmin, "Unit Management");
-$default->siteMap->addPage("orgManagement", "/admin.php?sectionName=SystemAdministration", "Administration", SysAdmin, "Organisation Management");
+$default->siteMap->addPage("unitManagement", "/admin.php?sectionName=unitAdministration", "Administration", SysAdmin, "Unit Management");
+$default->siteMap->addPage("orgManagement", "/admin.php?sectionName=orgAdministration", "Administration", SysAdmin, "Organisation Management");
$default->siteMap->addPage("roleManagement", "/admin.php?sectionName=SystemAdministration", "Administration", SysAdmin, "Role Management");
$default->siteMap->addPage("systemAdministration", "/presentation/admin.php?sectionName=SystemAdministration", "Administration", SysAdmin, "System Settings");
@@ -198,6 +198,20 @@ $default->siteMap->addPage("removeGroup", "/presentation/lookAndFeel/knowledgeTr
$default->siteMap->addPage("assignGroupToUnit", "/presentation/lookAndFeel/knowledgeTree/administration/groupmanagement/assignGroupToUnitBL.php", "groupAdministration", UnitAdmin, "Assign Group to Unit");
$default->siteMap->addPage("removeGroupFromUnit", "/presentation/lookAndFeel/knowledgeTree/administration/groupmanagement/removeGroupFromUnitBL.php", "groupAdministration", UnitAdmin, "Remove Group From Unit");
+//Unit management
+$default->siteMap->addPage("addUnit", "/presentation/lookAndFeel/knowledgeTree/administration/unitmanagement/addUnitBL.php", "unitAdministration", SysAdmin, "Add A Unit");
+$default->siteMap->addPage("editUnit", "/presentation/lookAndFeel/knowledgeTree/administration/unitmanagement/editUnitBL.php", "unitAdministration", SysAdmin, "Edit Unit Properties");
+$default->siteMap->addPage("addUnitSuccess", "/presentation/lookAndFeel/knowledgeTree/administration/unitmanagement/addUnitSuccess.php", "unitAdministration", SysAdmin, "Unit added Successfully",false);
+$default->siteMap->addPage("removeUnit", "/presentation/lookAndFeel/knowledgeTree/administration/unitmanagement/removeUnitBL.php", "unitAdministration", SysAdmin, "Remove a Unit");
+//$default->siteMap->addPage("assignGroupToUnit", "/presentation/lookAndFeel/knowledgeTree/administration/groupmanagement/assignGroupToUnitBL.php", "groupAdministration", UnitAdmin, "Assign Group to Unit");
+//$default->siteMap->addPage("removeGroupFromUnit", "/presentation/lookAndFeel/knowledgeTree/administration/groupmanagement/removeGroupFromUnitBL.php", "groupAdministration", UnitAdmin, "Remove Group From Unit");
+
+//Organisation management
+$default->siteMap->addPage("addOrg", "/presentation/lookAndFeel/knowledgeTree/administration/orgmanagement/addOrgBL.php", "orgAdministration", SysAdmin, "Add An Organisation");
+$default->siteMap->addPage("editOrg", "/presentation/lookAndFeel/knowledgeTree/administration/orgmanagement/editOrgBL.php", "orgAdministration", SysAdmin, "Edit Organisation Properties");
+$default->siteMap->addPage("addOrgSuccess", "/presentation/lookAndFeel/knowledgeTree/administration/orgmanagement/addOrgSuccess.php", "orgAdministration", SysAdmin, "Organisation added Successfully",false);
+$default->siteMap->addPage("removeOrg", "/presentation/lookAndFeel/knowledgeTree/administration/orgmanagement/removeOrgBL.php", "orgAdministration", SysAdmin, "Remove an Organisation");
+
//user management
$default->siteMap->addPage("addUser", "/tests/groups/adduser.php", "UserAdministration", UnitAdmin, "Add User to System");
$default->siteMap->addPage("editUser", "/tests/groups/adduser.php", "UserAdministration", UnitAdmin, "Edit User Properties");
diff --git a/presentation/lookAndFeel/knowledgeTree/administration/groupmanagement/editGroupUI.inc b/presentation/lookAndFeel/knowledgeTree/administration/groupmanagement/editGroupUI.inc
index 196f934..cbc1963 100644
--- a/presentation/lookAndFeel/knowledgeTree/administration/groupmanagement/editGroupUI.inc
+++ b/presentation/lookAndFeel/knowledgeTree/administration/groupmanagement/editGroupUI.inc
@@ -58,7 +58,6 @@ function getAddFailPage() {
global $default;
-
$sToRender .= "
\n";
$sToRender .= " \n";
$sToRender .= "Add Group Failed: \n";
@@ -72,11 +71,8 @@ function getAddFailPage() {
$sToRender .= "\n";
$sToRender .= "
\n";
-
return $sToRender;
-
-
}
// if its the manual edit page..then display normally
diff --git a/presentation/lookAndFeel/knowledgeTree/administration/groupmanagement/removeGroupFromUnitBL.php b/presentation/lookAndFeel/knowledgeTree/administration/groupmanagement/removeGroupFromUnitBL.php
index af18ec8..bcfaffd 100644
--- a/presentation/lookAndFeel/knowledgeTree/administration/groupmanagement/removeGroupFromUnitBL.php
+++ b/presentation/lookAndFeel/knowledgeTree/administration/groupmanagement/removeGroupFromUnitBL.php
@@ -12,7 +12,7 @@ require_once("../../../../../config/dmsDefaults.php");
if (checkSession()) {
require_once("$default->owl_fs_root/lib/visualpatterns/PatternListBox.inc");
require_once("$default->owl_fs_root/lib/visualpatterns/PatternCreate.inc");
- require_once("removeGroupFromUnit.inc");
+ require_once("removeGroupFromUnitUI.inc");
require_once("$default->owl_fs_root/lib/unitmanagement/Unit.inc");
require_once("$default->owl_fs_root/lib/groups/Group.inc");
require_once("$default->owl_fs_root/lib/groups/GroupUnitLink.inc");
diff --git a/presentation/lookAndFeel/knowledgeTree/administration/groupmanagement/removeGroupFromUnitUI.inc b/presentation/lookAndFeel/knowledgeTree/administration/groupmanagement/removeGroupFromUnitUI.inc
new file mode 100644
index 0000000..4721982
--- /dev/null
+++ b/presentation/lookAndFeel/knowledgeTree/administration/groupmanagement/removeGroupFromUnitUI.inc
@@ -0,0 +1,189 @@
+Are you sure you wish to remove the Group from the Unit? \n";
+ }else{
+ $heading = "Please select a Group: \n";
+ }
+
+ // when unitid is gotten show the name
+ if (isset($iUnitID)) {
+ $oUnit = Unit::get($iUnitID);
+ $unitdisplay = "Unit Name: " . getUnitDisplay($oUnit) . " \n";
+
+ }
+ else{
+ $unitdisplay = "";
+ }
+
+ $sToRender .= " \n";
+ $sToRender .= "Select a Group to Remove from its Unit: \n";
+ $sToRender .= "\n";
+ $sToRender .= " \n";
+ $sToRender .= $heading;
+ $sToRender .= " \n";
+ $sToRender .= "\n";
+ $sToRender .= " \n";
+ $sToRender .= "Group Name: " . getGroupDisplay($oGroup) . " \n";
+ $sToRender .= "\n";
+ $sToRender .= " \n";
+ $sToRender .= "\n";
+ $sToRender .= $unitdisplay;
+ $sToRender .= " \n";
+ $sToRender .= "\n";
+ $sToRender .= " \n";
+ $sToRender .= "\n";
+ $sToRender .= " \n";
+ $sToRender .= "" . getDeleteButton($oGroup);
+ $sToRender .= " " . getCancelButton($oGroup);
+ $sToRender .= "
\n";
+
+
+ return $sToRender;
+}
+
+// show paig if deletion fails
+function getPageFail($iGroupID) {
+ global $default;
+ $oGroup = null;
+ $oUnit = null;
+
+ if (isset($iGroupID)) {
+ $oGroup = Group::get($iGroupID);
+ }
+
+ $iUnitID = GroupUnitLink::groupBelongsToUnit($iGroupID);
+
+ $oUnit= Unit::get($iUnitID);
+
+ $sToRender .= " \n";
+ $sToRender .= "Sorry, Removal Failed \n";
+ $sToRender .= "\n";
+
+
+ return $sToRender;
+}
+// if no group selected show selection fail page
+function getPageNotSelected() {
+ global $default;
+
+ $sToRender .= " \n";
+ $sToRender .= "Sorry, Selection Failed \n";
+ $sToRender .= "\n";
+ $sToRender .= " \n";
+ $sToRender .= " \n";
+ $sToRender .= "Please select a Group \n";
+ $sToRender .= " \n";
+ $sToRender .= " \n";
+ $sToRender .= "\n";
+ $sToRender .= " owl_graphics_url/widgets/back.gif\" border = \"0\" /> \n";
+ $sToRender .= " \n";
+ $sToRender .= "
\n";
+
+
+ return $sToRender;
+}
+// show success page if removed from unit successfully
+function getPageSuccess() {
+ global $default;
+
+ $sToRender .= " \n";
+ $sToRender .= "Success! \n";
+ $sToRender .= "\n";
+ $sToRender .= " \n";
+ $sToRender .= " \n";
+ $sToRender .= "The Group was successfully removed from the Unit \n";
+ $sToRender .= " \n";
+ $sToRender .= " \n";
+ $sToRender .= "\n";
+ $sToRender .= " owl_graphics_url/widgets/back.gif\" border = \"0\" /> \n";
+ $sToRender .= " \n";
+ $sToRender .= "
\n";
+
+
+ return $sToRender;
+}
+// show listbox of groups belonging to groups_units_link table
+function getGroupDisplay($oGroup) {
+ global $default;
+ // added clauses to get those groups belonging to the groups_units_link table
+ $from = "," . $default->owl_groups_units_table . " AS GU";
+ $where = "(ST.id = GU.group_id)";
+
+
+ if (!isset($oGroup)) {
+ $oPatternListBox = & new PatternListBox($default->owl_groups_table, "name", "id", "fGroupID");
+ $oPatternListBox->setWhereClause($where);
+ $oPatternListBox->setFromClause($from);
+ //$oPatternListBox->setIncludeDefaultValue(true);
+ //$oPatternListBox->setPostBackOnChange(true);
+ return $oPatternListBox->render();
+ } else {
+ return " iId . "\">\n" .
+ $oGroup->getName();
+ }
+
+}
+
+// show unit details on confirm deletion page
+function getUnitDisplay($oUnit) {
+ global $default;
+ if (!isset($oUnit)) {
+ //$oPatternListBox = & new PatternListBox($default->owl_units_table, "name", "id", "fUnitID");
+ //$oPatternLiListBoxstBox->setPostBackOnChange(true);
+ //return $oPatternListBox->render();
+ } else {
+ return " iId . "\">\n" .
+ $oUnit->getName();
+ }
+
+}
+
+// show delete button or select button
+function getDeleteButton($oGroup) {
+ global $default;
+ if (!isset($oGroup)) {
+ return " owl_graphics_url/widgets/select.gif\" value=\"submit\" /> \n";
+ } else {
+ return " owl_graphics_url/widgets/delete.gif\" value=\"submit\" /> \n";
+ }
+}
+
+// show cancel button
+function getCancelButton($oGroup) {
+ global $default;
+ if (!isset($oGroup)) {
+ //return " owl_graphics_url/widgets/cancel.gif\" value=\"cancel\" /> \n";
+ } else {
+ return " owl_graphics_url/widgets/cancel.gif\" border = \"0\" /> \n";
+ }
+}
+
+
+?>
\ No newline at end of file
diff --git a/presentation/lookAndFeel/knowledgeTree/administration/orgmanagement/addOrgBL.php b/presentation/lookAndFeel/knowledgeTree/administration/orgmanagement/addOrgBL.php
new file mode 100644
index 0000000..ea839d0
--- /dev/null
+++ b/presentation/lookAndFeel/knowledgeTree/administration/orgmanagement/addOrgBL.php
@@ -0,0 +1,30 @@
+owl_fs_root/lib/visualpatterns/PatternListBox.inc");
+ require_once("$default->owl_fs_root/lib/visualpatterns/PatternCreate.inc");
+ require_once("addOrgUI.inc");
+ require_once("$default->owl_fs_root/lib/unitmanagement/UnitOrganisationLink.inc");
+ require_once("$default->owl_fs_root/lib/security/permission.inc");
+ require_once("$default->owl_fs_root/presentation/webpageTemplate.inc");
+ require_once("$default->owl_fs_root/lib/visualpatterns/PatternCustom.inc");
+ require_once("$default->owl_fs_root/lib/foldermanagement/Folder.inc");
+ require_once("$default->owl_fs_root/presentation/lookAndFeel/knowledgeTree/foldermanagement/folderUI.inc");
+ require_once("$default->owl_fs_root/presentation/Html.inc");
+
+ $oPatternCustom = & new PatternCustom();
+ $oPatternCustom->setHtml(getPage());
+ $main->setCentralPayload($oPatternCustom);
+ $main->setFormAction("$default->owl_root_url/presentation/lookAndFeel/knowledgeTree/create.php?fRedirectURL=".urlencode("$default->owl_root_url/control.php?action=addOrgSuccess&fedit=1"));
+ $main->render();
+}
+?>
diff --git a/presentation/lookAndFeel/knowledgeTree/administration/orgmanagement/addOrgSuccess.php b/presentation/lookAndFeel/knowledgeTree/administration/orgmanagement/addOrgSuccess.php
new file mode 100644
index 0000000..a242767
--- /dev/null
+++ b/presentation/lookAndFeel/knowledgeTree/administration/orgmanagement/addOrgSuccess.php
@@ -0,0 +1,46 @@
+owl_fs_root/presentation/webPageTemplate.inc");
+
+$Center = " \n" ;
+$Center .= "\n";
+$Center .= "\n";
+$Center .= "Organisation added Successfully! \n";
+$Center .= " \n";
+$Center .= " \n";
+$Center .= " \n";
+$Center .= " \n";
+$Center .= " \n";
+$Center .= "\n";
+$Center .= " owl_graphics_url/widgets/back.gif\" border = \"0\" /> \n";
+$Center .= " \n";
+$Center .= "
\n";
+
+
+$oPatternCustom = & new PatternCustom();
+$oPatternCustom->setHtml($Center);
+$main->setCentralPayload($oPatternCustom);
+$main->render();
+
+
+
+
+}
+
+?>
\ No newline at end of file
diff --git a/presentation/lookAndFeel/knowledgeTree/administration/orgmanagement/addOrgUI.inc b/presentation/lookAndFeel/knowledgeTree/administration/orgmanagement/addOrgUI.inc
new file mode 100644
index 0000000..8f19adc
--- /dev/null
+++ b/presentation/lookAndFeel/knowledgeTree/administration/orgmanagement/addOrgUI.inc
@@ -0,0 +1,44 @@
+"document_types_lookup");
+
+ // create a text field that is required
+ $oPatternCreate = & new PatternCreate("Organisation", "Orgmanagement\\Organisation.inc",$aDisplayRowNames, $aParameterNumbers, $aDisplayColumnTypes, $aRequired);
+ $oPatternCreate->setUniqueName("organisation");
+
+ $sToRender .= " \n";
+ $sToRender .= "Add a New Organisation to the System: \n";
+ $sToRender .= "\n";
+
+ return $sToRender;
+
+
+
+}
+?>
\ No newline at end of file
diff --git a/presentation/lookAndFeel/knowledgeTree/administration/orgmanagement/editOrgBL.php b/presentation/lookAndFeel/knowledgeTree/administration/orgmanagement/editOrgBL.php
new file mode 100644
index 0000000..2c5745e
--- /dev/null
+++ b/presentation/lookAndFeel/knowledgeTree/administration/orgmanagement/editOrgBL.php
@@ -0,0 +1,57 @@
+owl_fs_root/lib/visualpatterns/PatternListBox.inc");
+ require_once("$default->owl_fs_root/lib/visualpatterns/PatternEditableListFromQuery.inc");
+ require_once("editOrgUI.inc");
+ require_once("$default->owl_fs_root/lib/security/permission.inc");
+ require_once("$default->owl_fs_root/lib/Orgmanagement/Organisation.inc");
+ require_once("$default->owl_fs_root/presentation/webpageTemplate.inc");
+ require_once("$default->owl_fs_root/lib/visualpatterns/PatternCustom.inc");
+ require_once("$default->owl_fs_root/lib/foldermanagement/Folder.inc");
+ require_once("$default->owl_fs_root/presentation/lookAndFeel/knowledgeTree/foldermanagement/folderUI.inc");
+ require_once("$default->owl_fs_root/presentation/Html.inc");
+
+
+ $oPatternCustom = & new PatternCustom();
+
+ // if a new Org has been added
+ // coming from manual edit page
+ if (isset($fForStore)) {
+ $oOrg = Organisation::get($fOrgID);
+ $oOrg->setName($fOrgName);
+
+ if ($oOrg->update()) {
+ // if successfull print out success message
+ $oPatternCustom->setHtml(getEditPageSuccess());
+
+ } else {
+ // if fail print out fail message
+ $oPatternCustom->setHtml(getEditPageFail());
+ }
+ } else if (isset($fOrgID)){
+ // post back on Org select from manual edit page
+ $oPatternCustom->setHtml(getEditPage($fOrgID));
+ $main->setFormAction($_SERVER["PHP_SELF"] . "?fForStore=1");
+
+
+ } else {
+ // if nothing happens...just reload edit page
+ $oPatternCustom->setHtml(getEditPage(null));
+ $main->setFormAction($_SERVER["PHP_SELF"]);
+
+ }
+ //render the page
+ $main->setCentralPayload($oPatternCustom);
+ $main->render();
+}
+?>
diff --git a/presentation/lookAndFeel/knowledgeTree/administration/orgmanagement/editOrgUI.inc b/presentation/lookAndFeel/knowledgeTree/administration/orgmanagement/editOrgUI.inc
new file mode 100644
index 0000000..f920f7e
--- /dev/null
+++ b/presentation/lookAndFeel/knowledgeTree/administration/orgmanagement/editOrgUI.inc
@@ -0,0 +1,120 @@
+\n";
+ $sToRender .= "Edit Organisation Properties: \n";
+ $sToRender .= "\n";
+ $sToRender .= " \n";
+ $sToRender .= " \n";
+ $sToRender .= "\n";
+ $sToRender .= "Organisation Name: " . getOrgDisplay($oOrg) . " \n";
+ $sToRender .= " \n";
+ $sToRender .= "\n";
+ $sToRender .= " \n";
+ $sToRender .= "\n";
+ $sToRender .= " \n";
+ $sToRender .= " \n";
+ $sToRender .= " " . getUpdateButton($oOrg);
+ $sToRender .= getCancelButton($oOrg);
+ $sToRender .= "
\n";
+
+
+ return $sToRender;
+}
+
+// if edition is successful print otu success page
+function getEditPageSuccess() {
+ global $default;
+
+ $sToRender .= " \n";
+ $sToRender .= "Success! \n";
+ $sToRender .= "\n";
+ $sToRender .= " \n";
+ $sToRender .= " \n";
+ $sToRender .= "The Organisation was successfully modified \n";
+ $sToRender .= " \n";
+ $sToRender .= " \n";
+ $sToRender .= "\n";
+ $sToRender .= " owl_graphics_url/widgets/back.gif\" border = \"0\" /> \n";
+ $sToRender .= " \n";
+ $sToRender .= "
\n";
+
+
+ return $sToRender;
+}
+
+
+// gets the page if edition fails
+function getEditPageFail() {
+ global $default;
+
+ $sToRender .= " \n";
+ $sToRender .= "Success! \n";
+ $sToRender .= "\n";
+ $sToRender .= " \n";
+ $sToRender .= " \n";
+ $sToRender .= "Organisation modification Failed! \n";
+ $sToRender .= " \n";
+ $sToRender .= " \n";
+ $sToRender .= "\n";
+ $sToRender .= " owl_graphics_url/widgets/back.gif\" border = \"0\" /> \n";
+ $sToRender .= " \n";
+ $sToRender .= "
\n";
+
+
+ return $sToRender;
+}
+
+// show the list box when no Org selected
+// then shows a text box with the Org's name
+function getOrgDisplay($oOrg) {
+ global $default;
+ if (!isset($oOrg)) {
+ $oPatternListBox = & new PatternListBox($default->owl_organisations_table, "name", "id", "fOrgID");
+ //$oPatternListBox->setIncludeDefaultValue(true);
+ $oPatternListBox->setPostBackOnChange(true);
+ return $oPatternListBox->render();
+ } else {
+ return " iId . "\">\n" .
+ " getName() . "\">";
+ }
+
+}
+
+
+// gets the updatebutton when a Org is selected
+function getUpdateButton($oOrg) {
+ global $default;
+ if (!isset($oOrg)) {
+ return "Please select a Organisation: ";
+ } else {
+ return " owl_graphics_url/widgets/update.gif\" value=\"submit\" /> \n";
+ }
+}
+
+// gets the cancel button when a Org is selected
+function getCancelButton($oOrg) {
+ global $default;
+ if (!isset($oOrg)) {
+ //return " owl_graphics_url/widgets/cancel.gif\" value=\"cancel\" /> \n";
+ } else {
+ return " owl_graphics_url/widgets/cancel.gif\" border = \"0\" /> \n";
+ }
+}
+?>
\ No newline at end of file
diff --git a/presentation/lookAndFeel/knowledgeTree/administration/orgmanagement/removeOrgBL.php b/presentation/lookAndFeel/knowledgeTree/administration/orgmanagement/removeOrgBL.php
new file mode 100644
index 0000000..7c6495b
--- /dev/null
+++ b/presentation/lookAndFeel/knowledgeTree/administration/orgmanagement/removeOrgBL.php
@@ -0,0 +1,54 @@
+owl_fs_root/lib/visualpatterns/PatternListBox.inc");
+ require_once("$default->owl_fs_root/lib/visualpatterns/PatternEditableListFromQuery.inc");
+ require_once("removeOrgUI.inc");
+ require_once("$default->owl_fs_root/lib/security/permission.inc");
+ require_once("$default->owl_fs_root/lib/Orgmanagement/Organisation.inc");
+ require_once("$default->owl_fs_root/presentation/webpageTemplate.inc");
+ require_once("$default->owl_fs_root/lib/visualpatterns/PatternCustom.inc");
+ require_once("$default->owl_fs_root/lib/foldermanagement/Folder.inc");
+ require_once("$default->owl_fs_root/presentation/lookAndFeel/knowledgeTree/foldermanagement/folderUI.inc");
+ require_once("$default->owl_fs_root/presentation/Html.inc");
+
+ $oPatternCustom = & new PatternCustom();
+
+ // get main page
+ if (isset($fOrgID)) {
+
+ $oPatternCustom->setHtml(getDeletePage($fOrgID));
+ $main->setFormAction($_SERVER["PHP_SELF"] . "?fForDelete=1");
+
+ // get delete page
+ } else {
+ $oPatternCustom->setHtml(getDeletePage(null));
+ $main->setFormAction($_SERVER["PHP_SELF"]);
+ }
+
+ // if delete entry
+ if (isset($fForDelete)) {
+ $oOrg = Organisation::get($fOrgID);
+ $oOrg->setName($fOrgName);
+
+ if ($oOrg->delete()) {
+ $oPatternCustom->setHtml(getDeleteSuccessPage());
+
+ } else {
+ $oPatternCustom->setHtml(getDeleteFailPage());
+ }
+ }
+
+ $main->setCentralPayload($oPatternCustom);
+ $main->render();
+}
+?>
diff --git a/presentation/lookAndFeel/knowledgeTree/administration/orgmanagement/removeOrgUI.inc b/presentation/lookAndFeel/knowledgeTree/administration/orgmanagement/removeOrgUI.inc
new file mode 100644
index 0000000..5d1dcc0
--- /dev/null
+++ b/presentation/lookAndFeel/knowledgeTree/administration/orgmanagement/removeOrgUI.inc
@@ -0,0 +1,116 @@
+\n";
+ $sToRender .= "Are you sure you wish to Remove this Organisation?: \n";
+ }
+ else{
+ $sToRender .= " \n";
+ $sToRender .= "Remove Organisation From System: \n";
+ }
+
+ $sToRender .= "\n";
+ $sToRender .= " \n";
+ $sToRender .= " \n";
+ $sToRender .= "\n";
+ $sToRender .= "Organisation Name: " . getOrgDisplay($oOrg) . " \n";
+ $sToRender .= " \n";
+ $sToRender .= "\n";
+ $sToRender .= " \n";
+ $sToRender .= "\n";
+ $sToRender .= " \n";
+ $sToRender .= "\n";
+ $sToRender .= " \n";
+ $sToRender .= "\n";
+ $sToRender .= " \n";
+ $sToRender .= getDeleteButton($oOrg);
+ $sToRender .= "
\n";
+
+
+ return $sToRender;
+}
+
+// get successfully deletion page
+function getDeleteSuccessPage() {
+
+global $default;
+
+$sToRender = " \n" ;
+$sToRender .= "\n";
+$sToRender .= "\n";
+$sToRender .= "Organisation SuccessFully Removed! \n";
+$sToRender .= " \n";
+$sToRender .= " \n";
+$sToRender .= " \n";
+$sToRender .= " \n";
+$sToRender .= " \n";
+$sToRender .= "\n";
+$sToRender .= " owl_graphics_url/widgets/back.gif\" border = \"0\" /> \n";
+$sToRender .= " \n";
+$sToRender .= "
\n";
+
+return $sToRender;
+}
+
+// get deletion failed page
+function getDeleteFailPage() {
+
+global $default;
+
+$sToRender = " \n" ;
+$sToRender .= "\n";
+$sToRender .= "\n";
+$sToRender .= "Deletion Failed! \n";
+$sToRender .= " \n";
+$sToRender .= " \n";
+$sToRender .= " \n";
+$sToRender .= "Please Ensure that the Org has been Removed from any Organisation it belongs to \n";
+$sToRender .= "Also Ensure that the Org has no groups belonging to it \n";
+$sToRender .= " \n";
+$sToRender .= "\n";
+$sToRender .= " owl_graphics_url/widgets/back.gif\" border = \"0\" /> \n";
+$sToRender .= "
\n";
+
+return $sToRender;
+}
+
+// show listbox...or the text name
+function getOrgDisplay($oOrg) {
+ global $default;
+ if (!isset($oOrg)) {
+ $oPatternListBox = & new PatternListBox($default->owl_organisations_table, "name", "id", "fOrgID");
+ $oPatternListBox->setIncludeDefaultValue(true);
+ $oPatternListBox->setPostBackOnChange(true);
+ return $oPatternListBox->render();
+ } else {
+ return " iId . "\">\n" .
+ "" . $oOrg->getName() . " ";
+ }
+
+}
+
+
+// show delete button
+function getDeleteButton($oOrg) {
+ global $default;
+ if (!isset($oOrg)) {
+ return "Please select a Org: ";
+ } else {
+ return " owl_graphics_url/widgets/Delete.gif\" value=\"submit\" /> \n".
+ " owl_graphics_url/widgets/Cancel.gif\" border = \"0\" /> \n";
+ }
+}
+?>
diff --git a/presentation/lookAndFeel/knowledgeTree/administration/unitmanagement/addUnitBL.php b/presentation/lookAndFeel/knowledgeTree/administration/unitmanagement/addUnitBL.php
new file mode 100644
index 0000000..a28afc5
--- /dev/null
+++ b/presentation/lookAndFeel/knowledgeTree/administration/unitmanagement/addUnitBL.php
@@ -0,0 +1,75 @@
+owl_fs_root/lib/visualpatterns/PatternListBox.inc");
+ require_once("$default->owl_fs_root/lib/visualpatterns/PatternCreate.inc");
+ require_once("addUnitUI.inc");
+ require_once("$default->owl_fs_root/lib/unitmanagement/Unit.inc");
+ require_once("$default->owl_fs_root/lib/unitmanagement/UnitOrganisationLink.inc");
+ require_once("$default->owl_fs_root/lib/security/permission.inc");
+ require_once("$default->owl_fs_root/presentation/webpageTemplate.inc");
+ require_once("$default->owl_fs_root/lib/visualpatterns/PatternCustom.inc");
+ require_once("$default->owl_fs_root/lib/foldermanagement/Folder.inc");
+ require_once("$default->owl_fs_root/presentation/lookAndFeel/knowledgeTree/foldermanagement/folderUI.inc");
+ require_once("$default->owl_fs_root/presentation/Html.inc");
+
+ $oPatternCustom = & new PatternCustom();
+
+ if (isset($fForStore)) {
+
+ if($fUnitName != "" and $fOrgID !=-1)
+ {
+ $oUnit = new Unit($fUnitName);
+
+ //$oOrg = Organisation($
+ // if creation is successfull..get the unit id
+ if ($oUnit->create()) {
+ $unitID = $oUnit->getID();
+ $oUnitOrg = new UnitOrganisationLink($unitID,$fOrgID);
+
+ if($oUnitOrg->create()){
+ // if successfull print out success message
+ $oPatternCustom->setHtml(getAddPageSuccess());
+ }else{
+
+ // if fail print out fail message
+ $oPatternCustom->setHtml(getAddToOrgFail());
+ }
+
+
+ } else {
+ // if fail print out fail message
+ $oPatternCustom->setHtml(getAddPageFail());
+ }
+ }else{
+
+ $oPatternCustom->setHtml(getPageFail());
+ }
+
+ } else if (isset($fUnitID)){
+ // post back on Unit select from manual edit page
+ $oPatternCustom->setHtml(getAddPage($fUnitID));
+ $main->setFormAction($_SERVER["PHP_SELF"] . "?fForStore=1");
+ }else {
+ // if nothing happens...just reload edit page
+ $oPatternCustom->setHtml(getAddPage(null));
+ $main->setFormAction($_SERVER["PHP_SELF"]. "?fForStore=1");
+
+ }
+
+ //$oPatternCustom->setHtml(getPage());
+
+ //$main->setFormAction("$default->owl_root_url/presentation/lookAndFeel/knowledgeTree/create.php?fRedirectURL=".urlencode("$default->owl_root_url/control.php?action=addUnitSuccess&fUnit"));
+ $main->setCentralPayload($oPatternCustom);
+ $main->render();
+}
+?>
diff --git a/presentation/lookAndFeel/knowledgeTree/administration/unitmanagement/addUnitSuccess.php b/presentation/lookAndFeel/knowledgeTree/administration/unitmanagement/addUnitSuccess.php
new file mode 100644
index 0000000..0a5a9e2
--- /dev/null
+++ b/presentation/lookAndFeel/knowledgeTree/administration/unitmanagement/addUnitSuccess.php
@@ -0,0 +1,46 @@
+owl_fs_root/presentation/webPageTemplate.inc");
+
+$Center = " \n" ;
+$Center .= "\n";
+$Center .= "\n";
+$Center .= "Unit added Successfully! \n";
+$Center .= " \n";
+$Center .= " \n";
+$Center .= " \n";
+$Center .= " \n";
+$Center .= " \n";
+$Center .= "\n";
+$Center .= " owl_graphics_url/widgets/back.gif\" border = \"0\" /> \n";
+$Center .= " \n";
+$Center .= "
\n";
+
+
+$oPatternCustom = & new PatternCustom();
+$oPatternCustom->setHtml($Center);
+$main->setCentralPayload($oPatternCustom);
+$main->render();
+
+
+
+
+}
+
+?>
\ No newline at end of file
diff --git a/presentation/lookAndFeel/knowledgeTree/administration/unitmanagement/addUnitUI.inc b/presentation/lookAndFeel/knowledgeTree/administration/unitmanagement/addUnitUI.inc
new file mode 100644
index 0000000..93f2143
--- /dev/null
+++ b/presentation/lookAndFeel/knowledgeTree/administration/unitmanagement/addUnitUI.inc
@@ -0,0 +1,151 @@
+"document_types_lookup");
+
+ // create a text field that is required
+ //$oPatternCreate = & new PatternCreate("Unit", "unitmanagement\\Unit.inc",$aDisplayRowNames, $aParameterNumbers, $aDisplayColumnTypes, $aRequired);
+ //$oPatternCreate->setUniqueName("unit");
+
+ $sToRender .= " \n";
+ $sToRender .= "Add a New Unit to the System: \n";
+ $sToRender .= "\n";
+
+ return $sToRender;
+
+}
+
+// if edition is successful print otu success page
+function getAddPageSuccess() {
+ global $default;
+
+ $sToRender .= " \n";
+ $sToRender .= "Addition Successful! \n";
+ $sToRender .= "\n";
+ $sToRender .= " \n";
+ $sToRender .= " \n";
+ $sToRender .= "New Unit was successfully added \n";
+ $sToRender .= " \n";
+ $sToRender .= " \n";
+ $sToRender .= "\n";
+ $sToRender .= " owl_graphics_url/widgets/back.gif\" border = \"0\" /> \n";
+ $sToRender .= " \n";
+ $sToRender .= "
\n";
+
+ return $sToRender;
+}
+
+// if edition is successful print otu success page
+function getAddPageFail() {
+ global $default;
+
+ $sToRender .= " \n";
+ $sToRender .= "Addition Unsuccessful \n";
+ $sToRender .= "\n";
+ $sToRender .= " \n";
+ $sToRender .= " \n";
+ $sToRender .= "The Unit was not added. Unit Name Already exists! \n";
+ $sToRender .= " \n";
+ $sToRender .= " \n";
+ $sToRender .= "\n";
+ $sToRender .= " owl_graphics_url/widgets/back.gif\" border = \"0\" /> \n";
+ $sToRender .= " \n";
+ $sToRender .= "
\n";
+
+
+ return $sToRender;
+}
+
+
+// if edition is successful print otu success page
+function getPageFail() {
+ global $default;
+
+ $sToRender .= " \n";
+ $sToRender .= "Addition Unsuccessful \n";
+ $sToRender .= "\n";
+ $sToRender .= " \n";
+ $sToRender .= " \n";
+ $sToRender .= "Please enter a name AND Select the Organisation \n";
+ $sToRender .= " \n";
+ $sToRender .= " \n";
+ $sToRender .= "\n";
+ $sToRender .= " owl_graphics_url/widgets/back.gif\" border = \"0\" /> \n";
+ $sToRender .= " \n";
+ $sToRender .= "
\n";
+
+
+ return $sToRender;
+}
+// if edition is successful print otu success page
+function getAddPageToOrgFail() {
+ global $default;
+
+ $sToRender .= " \n";
+ $sToRender .= "Addition to Organisation Unsuccessful \n";
+ $sToRender .= "\n";
+ $sToRender .= " \n";
+ $sToRender .= " \n";
+ $sToRender .= "The Unit was not added to the Organisation. \n";
+ $sToRender .= " \n";
+ $sToRender .= " \n";
+ $sToRender .= "\n";
+ $sToRender .= " owl_graphics_url/widgets/back.gif\" border = \"0\" /> \n";
+ $sToRender .= " \n";
+ $sToRender .= "
\n";
+
+
+ return $sToRender;
+}
+
+
+// show the list box when no unit selected
+// then shows a text box with the unit's name
+function getOrgDisplay($oOrg) {
+ global $default;
+ if (!isset($oOrg)) {
+ $oPatternListBox = & new PatternListBox($default->owl_organisations_table, "name", "id", "fOrgID");
+ //$oPatternListBox->setIncludeDefaultValue(true);
+ //$oPatternListBox->setPostBackOnChange(true);
+ return $oPatternListBox->render();
+ } else {
+ return " iId . "\">\n" .
+ "" . $oOrg->getName() . "\">";
+ }
+
+}
+
+?>
\ No newline at end of file
diff --git a/presentation/lookAndFeel/knowledgeTree/administration/unitmanagement/editUnitBL.php b/presentation/lookAndFeel/knowledgeTree/administration/unitmanagement/editUnitBL.php
new file mode 100644
index 0000000..c34dd87
--- /dev/null
+++ b/presentation/lookAndFeel/knowledgeTree/administration/unitmanagement/editUnitBL.php
@@ -0,0 +1,57 @@
+owl_fs_root/lib/visualpatterns/PatternListBox.inc");
+ require_once("$default->owl_fs_root/lib/visualpatterns/PatternEditableListFromQuery.inc");
+ require_once("editUnitUI.inc");
+ require_once("$default->owl_fs_root/lib/security/permission.inc");
+ require_once("$default->owl_fs_root/lib/unitmanagement/Unit.inc");
+ require_once("$default->owl_fs_root/presentation/webpageTemplate.inc");
+ require_once("$default->owl_fs_root/lib/visualpatterns/PatternCustom.inc");
+ require_once("$default->owl_fs_root/lib/foldermanagement/Folder.inc");
+ require_once("$default->owl_fs_root/presentation/lookAndFeel/knowledgeTree/foldermanagement/folderUI.inc");
+ require_once("$default->owl_fs_root/presentation/Html.inc");
+
+
+ $oPatternCustom = & new PatternCustom();
+
+ // if a new unit has been added
+ // coming from manual edit page
+ if (isset($fForStore)) {
+ $oUnit = Unit::get($fUnitID);
+ $oUnit->setName($fUnitName);
+
+ if ($oUnit->update()) {
+ // if successfull print out success message
+ $oPatternCustom->setHtml(getEditPageSuccess());
+
+ } else {
+ // if fail print out fail message
+ $oPatternCustom->setHtml(getEditPageFail());
+ }
+ } else if (isset($fUnitID)){
+ // post back on Unit select from manual edit page
+ $oPatternCustom->setHtml(getEditPage($fUnitID));
+ $main->setFormAction($_SERVER["PHP_SELF"] . "?fForStore=1");
+
+
+ } else {
+ // if nothing happens...just reload edit page
+ $oPatternCustom->setHtml(getEditPage(null));
+ $main->setFormAction($_SERVER["PHP_SELF"]);
+
+ }
+ //render the page
+ $main->setCentralPayload($oPatternCustom);
+ $main->render();
+}
+?>
diff --git a/presentation/lookAndFeel/knowledgeTree/administration/unitmanagement/editUnitUI.inc b/presentation/lookAndFeel/knowledgeTree/administration/unitmanagement/editUnitUI.inc
new file mode 100644
index 0000000..755609b
--- /dev/null
+++ b/presentation/lookAndFeel/knowledgeTree/administration/unitmanagement/editUnitUI.inc
@@ -0,0 +1,120 @@
+\n";
+ $sToRender .= "Edit Unit Properties: \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 .= " " . getUpdateButton($oUnit);
+ $sToRender .= getCancelButton($oUnit);
+ $sToRender .= "
\n";
+
+
+ return $sToRender;
+}
+
+// if edition is successful print otu success page
+function getEditPageSuccess() {
+ global $default;
+
+ $sToRender .= " \n";
+ $sToRender .= "Success! \n";
+ $sToRender .= "\n";
+ $sToRender .= " \n";
+ $sToRender .= " \n";
+ $sToRender .= "The Unit was successfully modified \n";
+ $sToRender .= " \n";
+ $sToRender .= " \n";
+ $sToRender .= "\n";
+ $sToRender .= " owl_graphics_url/widgets/back.gif\" border = \"0\" /> \n";
+ $sToRender .= " \n";
+ $sToRender .= "
\n";
+
+
+ return $sToRender;
+}
+
+
+// gets the page if edition fails
+function getEditPageFail() {
+ global $default;
+
+ $sToRender .= " \n";
+ $sToRender .= "Success! \n";
+ $sToRender .= "\n";
+ $sToRender .= " \n";
+ $sToRender .= " \n";
+ $sToRender .= "Unit modification Failed! \n";
+ $sToRender .= " \n";
+ $sToRender .= " \n";
+ $sToRender .= "\n";
+ $sToRender .= " owl_graphics_url/widgets/back.gif\" border = \"0\" /> \n";
+ $sToRender .= " \n";
+ $sToRender .= "
\n";
+
+
+ return $sToRender;
+}
+
+// show the list box when no unit selected
+// then shows a text box with the unit's 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" .
+ " getName() . "\">";
+ }
+
+}
+
+
+// gets the updatebutton when a unit is selected
+function getUpdateButton($oUnit) {
+ global $default;
+ if (!isset($oUnit)) {
+ return "Please select a unit: ";
+ } else {
+ return " owl_graphics_url/widgets/update.gif\" value=\"submit\" /> \n";
+ }
+}
+
+// gets the cancel button when a unit is selected
+function getCancelButton($oUnit) {
+ global $default;
+ if (!isset($oUnit)) {
+ //return " owl_graphics_url/widgets/cancel.gif\" value=\"cancel\" /> \n";
+ } else {
+ return " owl_graphics_url/widgets/cancel.gif\" border = \"0\" /> \n";
+ }
+}
+?>
\ No newline at end of file
diff --git a/presentation/lookAndFeel/knowledgeTree/administration/unitmanagement/removeUnitBL.php b/presentation/lookAndFeel/knowledgeTree/administration/unitmanagement/removeUnitBL.php
new file mode 100644
index 0000000..28d901e
--- /dev/null
+++ b/presentation/lookAndFeel/knowledgeTree/administration/unitmanagement/removeUnitBL.php
@@ -0,0 +1,57 @@
+owl_fs_root/lib/visualpatterns/PatternListBox.inc");
+ require_once("$default->owl_fs_root/lib/visualpatterns/PatternEditableListFromQuery.inc");
+ require_once("removeUnitUI.inc");
+ require_once("$default->owl_fs_root/lib/security/permission.inc");
+ require_once("$default->owl_fs_root/lib/unitmanagement/Unit.inc");
+ require_once("$default->owl_fs_root/presentation/webpageTemplate.inc");
+ require_once("$default->owl_fs_root/lib/visualpatterns/PatternCustom.inc");
+ require_once("$default->owl_fs_root/lib/foldermanagement/Folder.inc");
+ require_once("$default->owl_fs_root/presentation/lookAndFeel/knowledgeTree/foldermanagement/folderUI.inc");
+ require_once("$default->owl_fs_root/presentation/Html.inc");
+
+ $oPatternCustom = & new PatternCustom();
+
+ // get main page
+ if (isset($fUnitID)) {
+
+ $oPatternCustom->setHtml(getDeletePage($fUnitID));
+ $main->setFormAction($_SERVER["PHP_SELF"] . "?fForDelete=1");
+
+ // get delete page
+ } else {
+ $oPatternCustom->setHtml(getDeletePage(null));
+ $main->setFormAction($_SERVER["PHP_SELF"]);
+ }
+
+ // if delete entry
+ if (isset($fForDelete)) {
+ $oUnit = Unit::get($fUnitID);
+ $oUnit->setName($fUnitName);
+
+ //$fUnitID = GroupUnitLink::groupBelongsToUnit($fGroupID)
+
+ 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
new file mode 100644
index 0000000..c00660b
--- /dev/null
+++ b/presentation/lookAndFeel/knowledgeTree/administration/unitmanagement/removeUnitUI.inc
@@ -0,0 +1,116 @@
+\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;
+}
+
+// get successfully deletion page
+function getDeleteSuccessPage() {
+
+global $default;
+
+$sToRender = " \n" ;
+$sToRender .= "\n";
+$sToRender .= "\n";
+$sToRender .= "Unit SuccessFully Removed! \n";
+$sToRender .= " \n";
+$sToRender .= " \n";
+$sToRender .= " \n";
+$sToRender .= " \n";
+$sToRender .= " \n";
+$sToRender .= "\n";
+$sToRender .= " owl_graphics_url/widgets/back.gif\" border = \"0\" /> \n";
+$sToRender .= " \n";
+$sToRender .= "
\n";
+
+return $sToRender;
+}
+
+// get deletion failed page
+function getDeleteFailPage() {
+
+global $default;
+
+$sToRender = " \n" ;
+$sToRender .= "\n";
+$sToRender .= "\n";
+$sToRender .= "Deletion Failed! \n";
+$sToRender .= " \n";
+$sToRender .= " \n";
+$sToRender .= " \n";
+$sToRender .= "Please Ensure that the unit has no groups belonging to it \n";
+$sToRender .= " \n";
+$sToRender .= "\n";
+$sToRender .= " owl_graphics_url/widgets/back.gif\" border = \"0\" /> \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() . " ";
+ }
+
+}
+
+
+// show delete button
+function getDeleteButton($oUnit) {
+ global $default;
+ if (!isset($oUnit)) {
+ return "Please select a Unit: ";
+ } else {
+ return " owl_graphics_url/widgets/Delete.gif\" value=\"submit\" /> \n".
+ " owl_graphics_url/widgets/Cancel.gif\" border = \"0\" /> \n";
+ }
+}
+?>