diff --git a/presentation/lookAndFeel/knowledgeTree/administration/docfieldmanagement/addDocFieldBL.php b/presentation/lookAndFeel/knowledgeTree/administration/docfieldmanagement/addDocFieldBL.php
index 5a24593..32f0e6e 100644
--- a/presentation/lookAndFeel/knowledgeTree/administration/docfieldmanagement/addDocFieldBL.php
+++ b/presentation/lookAndFeel/knowledgeTree/administration/docfieldmanagement/addDocFieldBL.php
@@ -13,6 +13,7 @@ if (checkSession()) {
require_once("$default->fileSystemRoot/lib/visualpatterns/PatternListBox.inc");
require_once("$default->fileSystemRoot/lib/visualpatterns/PatternCreate.inc");
require_once("addDocFieldUI.inc");
+ require_once("../adminUI.inc");
//require_once("$default->fileSystemRoot/lib/documentmanagement/DocumentField.inc");
require_once("$default->fileSystemRoot/lib/security/permission.inc");
require_once("$default->fileSystemRoot/presentation/webpageTemplate.inc");
diff --git a/presentation/lookAndFeel/knowledgeTree/administration/docfieldmanagement/addDocFieldSuccess.php b/presentation/lookAndFeel/knowledgeTree/administration/docfieldmanagement/addDocFieldSuccess.php
index 6098354..fe7ee79 100644
--- a/presentation/lookAndFeel/knowledgeTree/administration/docfieldmanagement/addDocFieldSuccess.php
+++ b/presentation/lookAndFeel/knowledgeTree/administration/docfieldmanagement/addDocFieldSuccess.php
@@ -9,51 +9,43 @@
*/
require_once("../../../../../config/dmsDefaults.php");
+require_once("../adminUI.inc");
global $default;
-
-if(checkSession())
-{
-
-// include the page template (with navbar)
-require_once("$default->fileSystemRoot/presentation/webpageTemplate.inc");
-
-$Center = "\n";
-$Center .= "\n";
-if($fDocTypeID == -1){
- $Center .= "Document Field addition Unsuccessful! \n";
- $Center .= "\n";
- $Center .= "Document Type already exists \n";
- $Center .= " \n";
-
-}else{
- $Center .= "Document Field added Successfully! \n";
-$Center .= "rootUrl/control.php?action=addDocField\"> \n";
-$Center .= "
\n";
-
-
-$oPatternCustom = & new PatternCustom();
-$oPatternCustom->setHtml($Center);
-$main->setCentralPayload($oPatternCustom);
-$main->render();
-
-
-
+if(checkSession()) {
+
+ // include the page template (with navbar)
+ require_once("$default->fileSystemRoot/presentation/webpageTemplate.inc");
+
+ $Center .= "" . renderHeading("Add Document Field") . "
";
+ $Center .= "\n";
+ $Center .= "\n";
+ if ($fDocTypeID == -1) {
+ $Center .= "Document Field addition Unsuccessful! \n";
+ $Center .= "\n";
+ $Center .= "Document Type already exists \n";
+ $Center .= " \n";
+
+ } else {
+ $Center .= "Document Field added Successfully! \n";
+ $Center .= "rootUrl/control.php?action=addDocField\"> \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/docfieldmanagement/addDocFieldUI.inc b/presentation/lookAndFeel/knowledgeTree/administration/docfieldmanagement/addDocFieldUI.inc
index 8dd558e..d6074b4 100644
--- a/presentation/lookAndFeel/knowledgeTree/administration/docfieldmanagement/addDocFieldUI.inc
+++ b/presentation/lookAndFeel/knowledgeTree/administration/docfieldmanagement/addDocFieldUI.inc
@@ -23,10 +23,8 @@ function getPage() {
$oPatternCreate = & new PatternCreate("DocumentField", "documentmanagement/DocumentField.inc",$aDisplayRowNames, $aParameterNumbers, $aDisplayColumnTypes, $aRequired,$aDropDownListTableNames,$aDropDownListValueColumns,$aDropDownListDisplayColumns);
$oPatternCreate->setUniqueName("DocField");
- $sToRender .= "Add a New Document Field to the System: \n";
+ $sToRender .= "" . renderHeading("Add Document Field") . "
";
$sToRender .= "\n";
return $sToRender;
-
-
-
}
?>
\ No newline at end of file
diff --git a/presentation/lookAndFeel/knowledgeTree/administration/docfieldmanagement/editDocFieldBL.php b/presentation/lookAndFeel/knowledgeTree/administration/docfieldmanagement/editDocFieldBL.php
index 81542ab..9ca022d 100644
--- a/presentation/lookAndFeel/knowledgeTree/administration/docfieldmanagement/editDocFieldBL.php
+++ b/presentation/lookAndFeel/knowledgeTree/administration/docfieldmanagement/editDocFieldBL.php
@@ -13,6 +13,7 @@ if (checkSession()) {
require_once("$default->fileSystemRoot/lib/visualpatterns/PatternListBox.inc");
require_once("$default->fileSystemRoot/lib/visualpatterns/PatternEditableListFromQuery.inc");
require_once("editDocFieldUI.inc");
+ require_once("../adminUI.inc");
require_once("$default->fileSystemRoot/lib/security/permission.inc");
require_once("$default->fileSystemRoot/lib/documentmanagement/DocumentField.inc");
require_once("$default->fileSystemRoot/presentation/webpageTemplate.inc");
diff --git a/presentation/lookAndFeel/knowledgeTree/administration/docfieldmanagement/editDocFieldUI.inc b/presentation/lookAndFeel/knowledgeTree/administration/docfieldmanagement/editDocFieldUI.inc
index 7172e41..d861fe9 100644
--- a/presentation/lookAndFeel/knowledgeTree/administration/docfieldmanagement/editDocFieldUI.inc
+++ b/presentation/lookAndFeel/knowledgeTree/administration/docfieldmanagement/editDocFieldUI.inc
@@ -12,188 +12,173 @@
// if its the manual edit page..then display normally
-function getEditPage($iDocFieldID) {
- global $default;
- $oDocField = null;
- if (isset($iDocFieldID)) {
- $oDocField = DocumentField::get($iDocFieldID);
- $checkBox = $oDocField->isFieldLinkedToType();
- $aDataTypes = $oDocField->getAllDataTypes();
- $currentDataType = $oDocField->getDataType();
-
- }
-
-
-
- $sToRender .= "Edit Document Field Properties: \n";
- $sToRender .= "\n";
-
-
- return $sToRender;
+function getEditPage($iDocFieldID) {
+ global $default;
+ $oDocField = null;
+ if (isset($iDocFieldID)) {
+ $oDocField = DocumentField::get($iDocFieldID);
+ $checkBox = $oDocField->isFieldLinkedToType();
+ $aDataTypes = $oDocField->getAllDataTypes();
+ $currentDataType = $oDocField->getDataType();
+
+ }
+
+ $sToRender .= "" . renderHeading("Edit Document Field") . "
";
+ $sToRender .= "\n";
+
+ return $sToRender;
}
// if edition is successful print otu success page
-function getEditPageSuccess() {
- global $default;
-
- $sToRender .= "Success! \n";
- $sToRender .= "\n";
-
-
- return $sToRender;
+function getEditPageSuccess() {
+ global $default;
+
+ $sToRender .= "" . renderHeading("Edit Document Field") . "
";
+ $sToRender .= "Success! \n";
+ $sToRender .= "\n";
+
+ return $sToRender;
}
// gets the page if edition fails
-function getEditPageFail() {
- global $default;
-
- $sToRender .= "FAILURE! \n";
- $sToRender .= "\n";
-
-
- return $sToRender;
+function getEditPageFail() {
+ global $default;
+
+ $sToRender .= "" . renderHeading("Edit Document Field") . "
";
+ $sToRender .= "FAILURE! \n";
+ $sToRender .= "\n";
+
+ return $sToRender;
}
// show the list box when no DocField selected
// then shows a text box with the DocField's name
function getDocFieldDisplay($oDocField) {
- global $default;
- if (!isset($oDocField)) {
- $oPatternListBox = & new PatternListBox($default->owl_fields_table, "name", "id", "fDocFieldID");
- //$oPatternListBox->setIncludeDefaultValue(true);
- $oPatternListBox->setPostBackOnChange(true);
- return $oPatternListBox->render();
- } else {
- return "";
-
- for ($i=0;$i < count($aDataTypes);$i++){
-
- if($aDataTypes[$i]["name"] == $sCurrent){
- $Options .= "". $aDataTypes[$i]["name"] ." \n";
- }else{
- // $oDocField= DocField::get($aAllSpecific[$i]["id"]);
- $Options .= "". $aDataTypes[$i]["name"] ." \n";
- }
-
- }
-
- $sDataype .= $Options . " ";
-
- return $sDataype;
-
+ global $default;
+
+ $sDataype = "";
+
+ for ($i=0;$i < count($aDataTypes);$i++) {
+
+ if($aDataTypes[$i]["name"] == $sCurrent) {
+ $Options .= "". $aDataTypes[$i]["name"] ." \n";
+ } else {
+ // $oDocField= DocField::get($aAllSpecific[$i]["id"]);
+ $Options .= "". $aDataTypes[$i]["name"] ." \n";
+ }
+ }
+ $sDataype .= $Options . " ";
+ return $sDataype;
}
// returns the checkbox ticked or unticked
function getIsGenericCheckBox($oDocField) {
- if (!isset($oDocField)) {
- return "";
- } else {
- return "rootUrl/control.php?action=DocFieldManagement\"> rootUrl/control.php?action=editDocField\"> rootUrl/control.php?action=docfield\"> rootUrl/control.php?action=editDocField\"> Remove Document Field From System: \n";
-
- }
- else{
-
- $oDocField = DocumentField::get($fDocFieldID);
- $sToRender .= "Are you sure you wish to Remove this Document Field?: \n";
- }
-
- $sToRender .= "\n";
- $sToRender .= "\n";
- $sToRender .= "Document Field Name: " . getDocFieldDisplay($oDocField) . " \n";
- $sToRender .= " \n";
- $sToRender .= "\n";
- $sToRender .= "" . getDocFieldDataType($oDocField) . " \n";
- $sToRender .= " \n";
- $sToRender .= "\n";
- $sToRender .= " \n";
- $sToRender .= "\n";
- $sToRender .= " \n";
- $sToRender .= "\n";
- $sToRender .= " \n";
- $sToRender .= "\n";
- $sToRender .= " \n";
- $sToRender .= "
\n";
-
-
- return $sToRender;
+function getDeletePage($fDocFieldID) {
+ global $default;
+ $oDocField = null;
+ if (isset($fDocFieldID)) {
+ $oDocField = DocumentField::get($fDocFieldID);
+ $sHeading = "Are you sure you wish to Remove this Document Field?: \n";
+ } else {
+ $sHeading = "Please select a Document Field:";
+ }
+
+ $sToRender .= "" . renderHeading("Remove Document Field") . "
";
+ $sToRender .= "\n";
+ $sToRender .= "$sHeading \n";
+ $sToRender .= "Document Field Name: " . getDocFieldDisplay($oDocField) . " \n";
+ $sToRender .= " \n";
+ $sToRender .= "\n";
+ $sToRender .= "" . getDocFieldDataType($oDocField) . " \n";
+ $sToRender .= " \n";
+ $sToRender .= "\n";
+ $sToRender .= " \n";
+ $sToRender .= "\n";
+ $sToRender .= " \n";
+ $sToRender .= "\n";
+ $sToRender .= " \n";
+ $sToRender .= "\n";
+ $sToRender .= " \n";
+ $sToRender .= "
\n";
+
+
+ return $sToRender;
}
// get successfully deletion page
-function getDeleteSuccessPage() {
-
-global $default;
-
-$sToRender = "" . renderHeading("Remove Document Field") . "
";
+ $sToRender .= "\n";
+
+ return $sToRender;
}
// get deletion failed page
-function getDeleteFailPage() {
-
-global $default;
-
-$sToRender = "" . renderHeading("Remove Document Field") . "
";
+ $sToRender .= "\n";
+
+ return $sToRender;
}
// show listbox...or the text name
function getDocFieldDisplay($oDocField) {
- global $default;
- if (!isset($oDocField)) {
- $oPatternListBox = & new PatternListBox($default->owl_fields_table, "name", "id", "fDocFieldID");
- //$oPatternListBox->setIncludeDefaultValue(true);
- $oPatternListBox->setPostBackOnChange(true);
- return $oPatternListBox->render();
- } else {
-
- return "" . $oDocField->getName() . " ";
- }
-
+ global $default;
+ if (!isset($oDocField)) {
+ $oPatternListBox = & new PatternListBox($default->owl_fields_table, "name", "id", "fDocFieldID");
+ $oPatternListBox->setFromClause("LEFT OUTER JOIN $default->owl_document_fields_table DFL ON ST.id=DFL.document_field_id");
+ $oPatternListBox->setWhereClause("ISNULL(DFL.value)");
+ $oPatternListBox->setPostBackOnChange(true);
+ return $oPatternListBox->render();
+ } else {
+ return "" . $oDocField->getName() . " ";
+ }
}
-
// show listbox...or the text name
function getDocFieldDataType($oDocField) {
- global $default;
- if (!isset($oDocField)) {
- return "";
- } else {
- return "Data Type: " . $oDocField->getDataType();
- }
-
+ global $default;
+ if (!isset($oDocField)) {
+ return "";
+ } else {
+ return "Data Type: " . $oDocField->getDataType();
+ }
}
-
-
// show delete button
function getDeleteButton($oDocField) {
- global $default;
- if (!isset($oDocField)) {
- return "Please select a Document Field: ";
- } else {
- return " rootUrl/control.php?action=removeDocField\"> rootUrl/control.php?action=removeDocField\"> rootUrl/control.php?action=docfield\"> rootUrl/control.php?action=editDocField\">