Peter M. Groen / knowledgetree

Commit 7c8d9b8048ed6fb4a61cfc37a23b9223f99f8bbf

Authored by Michael Joseph
1 parent 4f1be64d

(#2765) tidied, removed unnecessary code and added javascript validation 


git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/trunk@2393 c91229c3-7414-0410-bfa2-8a42b809f60b
Inline Side-by-side
Showing 1 changed file with 18 additions and 25 deletions
presentation/lookAndFeel/knowledgeTree/administration/unitmanagement/addUnitUI.inc
  View file @7c8d9b8
@@ -8,13 +8,9 @@ @@ -8,13 +8,9 @@
8 * 8 *
9 */ 9 */
10 // get add pages 10 // get add pages
11 -function getAddPage($unitID) { 11 +function getAddPage() {
12 global $default; 12 global $default;
13 13
14 - if (isset($iOrgID)) {  
15 - $oOrg = Organisation::get($iOrgID);  
16 - }  
17 -  
18 $sToRender .= renderHeading("Add Unit"); 14 $sToRender .= renderHeading("Add Unit");
19 $sToRender .= "<table>\n"; 15 $sToRender .= "<table>\n";
20 $sToRender .= "<tr></tr>\n"; 16 $sToRender .= "<tr></tr>\n";
@@ -22,13 +18,21 @@ function getAddPage($unitID) { @@ -22,13 +18,21 @@ function getAddPage($unitID) {
22 $sToRender .= "<td>Unit Name: </td><td><input size = \"40\" type=\"text\" name=\"fUnitName\"> </td>\n"; 18 $sToRender .= "<td>Unit Name: </td><td><input size = \"40\" type=\"text\" name=\"fUnitName\"> </td>\n";
23 $sToRender .= "</tr>\n"; 19 $sToRender .= "</tr>\n";
24 $sToRender .= "<tr>\n"; 20 $sToRender .= "<tr>\n";
25 - $sToRender .= "<td>Select an Organisation: </td><td>" . getOrgDisplay($oOrg) ; 21 + $sToRender .= "<td>Select an Organisation: </td><td>" . getOrgDisplay() ;
26 $sToRender .= "</tr>\n"; 22 $sToRender .= "</tr>\n";
27 $sToRender .= "<tr>\n"; 23 $sToRender .= "<tr>\n";
28 $sToRender .= "</tr>\n"; 24 $sToRender .= "</tr>\n";
29 $sToRender .= "<td></td><td align = right><input type=\"image\" src =\"$default->graphicsUrl/widgets/add.gif\" value=\"Submit\" border=\"0\"/></td>\n"; 25 $sToRender .= "<td></td><td align = right><input type=\"image\" src =\"$default->graphicsUrl/widgets/add.gif\" value=\"Submit\" border=\"0\"/></td>\n";
30 $sToRender .= "</table>\n"; 26 $sToRender .= "</table>\n";
31 27
  28 + // javascript validation
  29 + $sToRender .= "\n\n<script language=\"javascript\">\n<!--\n";
  30 + $sToRender .= "function validateForm(theForm) {\n";
  31 + $sToRender .= "\tif (!validRequired(theForm.fUnitName,'Unit Name') || !validRequired(theForm.fOrgID, 'Organisation')) {\n";
  32 + $sToRender .= "\t\treturn false;\n\t}\n";
  33 + $sToRender .= "return true;\n}\n";
  34 + $sToRender .= "//-->\n</script>\n\n";
  35 +
32 return $sToRender; 36 return $sToRender;
33 } 37 }
34 38
@@ -44,7 +48,7 @@ function getAddPageSuccess() { @@ -44,7 +48,7 @@ function getAddPageSuccess() {
44 $sToRender .= "<tr></tr>\n"; 48 $sToRender .= "<tr></tr>\n";
45 $sToRender .= "<tr></tr>\n"; 49 $sToRender .= "<tr></tr>\n";
46 $sToRender .= "<tr>\n"; 50 $sToRender .= "<tr>\n";
47 - $sToRender .= "<td></td><td align = right><a href=\"$default->rootUrl/control.php?action=addUnit\"><img src =\"$default->graphicsUrl/widgets/back.gif\" border = \"0\" /></a></td>\n"; 51 + $sToRender .= "<td></td><td align = right>" . generateControllerLink("listUnits", "", "<img src =\"$default->graphicsUrl/widgets/back.gif\" border = \"0\" />") . "</td>\n";
48 $sToRender .= "</tr>\n"; 52 $sToRender .= "</tr>\n";
49 $sToRender .= "</table>\n"; 53 $sToRender .= "</table>\n";
50 54
@@ -71,8 +75,6 @@ function getAddPageFail() { @@ -71,8 +75,6 @@ function getAddPageFail() {
71 return $sToRender; 75 return $sToRender;
72 } 76 }
73 77
74 -  
75 -// if edition is successful print otu success page  
76 function getPageFail() { 78 function getPageFail() {
77 global $default; 79 global $default;
78 80
@@ -87,10 +89,9 @@ function getPageFail() { @@ -87,10 +89,9 @@ function getPageFail() {
87 $sToRender .= "</tr>\n"; 89 $sToRender .= "</tr>\n";
88 $sToRender .= "</table>\n"; 90 $sToRender .= "</table>\n";
89 91
90 -  
91 return $sToRender; 92 return $sToRender;
92 } 93 }
93 -// if edition is successful print otu success page 94 +
94 function getAddPageToOrgFail() { 95 function getAddPageToOrgFail() {
95 global $default; 96 global $default;
96 97
@@ -106,23 +107,15 @@ function getAddPageToOrgFail() { @@ -106,23 +107,15 @@ function getAddPageToOrgFail() {
106 $sToRender .= "</tr>\n"; 107 $sToRender .= "</tr>\n";
107 $sToRender .= "</table>\n"; 108 $sToRender .= "</table>\n";
108 109
109 -  
110 return $sToRender; 110 return $sToRender;
111 } 111 }
112 112
113 -  
114 -// show the list box when no unit selected  
115 -// then shows a text box with the unit's name  
116 -function getOrgDisplay($oOrg) { 113 +/**
  114 + * Displays a drop down list of organisations
  115 + */
  116 +function getOrgDisplay() {
117 global $default; 117 global $default;
118 - if (!isset($oOrg)) {  
119 - $oPatternListBox = & new PatternListBox($default->owl_organisations_table, "name", "id", "fOrgID");  
120 - return $oPatternListBox->render();  
121 - } else {  
122 - return "<input type=\"hidden\" name=\"fOrgID\" value=\"" . $oOrg->iId . "\">\n" .  
123 - "" . $oOrg->getName() . "\">";  
124 - }  
125 - 118 + $oPatternListBox = & new PatternListBox($default->owl_organisations_table, "name", "id", "fOrgID");
  119 + return $oPatternListBox->render();
126 } 120 }
127 -  
128 ?> 121 ?>
129 \ No newline at end of file 122 \ No newline at end of file