Peter M. Groen / knowledgetree

Commit 2d4da6ab315578ac9f2eef6d7c82d9d46d93f6d6

Authored by michael
1 parent 02619b23

added isBlank function and altered validDate function 


git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/trunk@1919 c91229c3-7414-0410-bfa2-8a42b809f60b
Inline Side-by-side
Showing 1 changed file with 36 additions and 5 deletions
presentation/lookAndFeel/knowledgeTree/js/misc.js
  View file @2d4da6a
@@ -24,6 +24,37 @@ function isEmailAddr(email) @@ -24,6 +24,37 @@ function isEmailAddr(email)
24 return result; 24 return result;
25 } 25 }
26 26
  27 +function isBlank(formField) {
  28 + var result = false;
  29 + if (formField){
  30 + switch(formField.type){
  31 + case "select-one":
  32 + if (formField.selectedIndex == 0 || formField.options[formField.selectedIndex].text == "" || formField.options[formField.selectedIndex].text == "None"){
  33 + result = true;
  34 + }
  35 + break;
  36 + case "select-multiple":
  37 + if (formField.selectedIndex == -1){
  38 + result = true;
  39 + }
  40 + break;
  41 + case "text":
  42 + case "textarea":
  43 + if (formField.value == "" || formField.value == null){
  44 + result = true;
  45 + }
  46 + break;
  47 + default:
  48 + if (formField.value == "" || formField.value == null){
  49 + result = true;
  50 + }
  51 + }
  52 + } else {
  53 + result = true;
  54 + }
  55 + return result;
  56 +}
  57 +
27 function validRequired(formField,fieldLabel) 58 function validRequired(formField,fieldLabel)
28 { 59 {
29 var result = true; 60 var result = true;
@@ -155,15 +186,15 @@ function validDate(formField,fieldLabel,required) @@ -155,15 +186,15 @@ function validDate(formField,fieldLabel,required)
155 186
156 if (result) 187 if (result)
157 { 188 {
158 - var elems = formField.value.split("/"); 189 + var elems = formField.value.split("-");
159 190
160 result = (elems.length == 3); // should be three components 191 result = (elems.length == 3); // should be three components
161 192
162 if (result) 193 if (result)
163 { 194 {
164 - var month = parseInt(elems[0],10);  
165 - var day = parseInt(elems[1],10);  
166 - var year = parseInt(elems[2],10); 195 + var year = parseInt(elems[0],10);
  196 + var month = parseInt(elems[1],10);
  197 + var day = parseInt(elems[2],10);
167 result = allDigits(elems[0]) && (month > 0) && (month < 13) && 198 result = allDigits(elems[0]) && (month > 0) && (month < 13) &&
168 allDigits(elems[1]) && (day > 0) && (day < 32) && 199 allDigits(elems[1]) && (day > 0) && (day < 32) &&
169 allDigits(elems[2]) && ((elems[2].length == 2) || (elems[2].length == 4)); 200 allDigits(elems[2]) && ((elems[2].length == 2) || (elems[2].length == 4));
@@ -171,7 +202,7 @@ function validDate(formField,fieldLabel,required) @@ -171,7 +202,7 @@ function validDate(formField,fieldLabel,required)
171 202
172 if (!result) 203 if (!result)
173 { 204 {
174 - alert('Please enter a date in the format MM/DD/YYYY for the "' + fieldLabel +'" field.'); 205 + alert('Please enter a date in the format YYYY-MM-DD for the "' + fieldLabel +'" field.');
175 formField.focus(); 206 formField.focus();
176 } 207 }
177 } 208 }