minor changes and improving display issues

git-svn-id: http://webgoat.googlecode.com/svn/trunk@362 4033779f-a91e-0410-96ef-6bf7bf53c507

webgoat/main/project/WebContent/javascript/clientSideValidation.js

@@ -75,8 +75,7 @@ function ajaxFunction(coupon)
       {
       if(xmlHttp.readyState==4)
         {
-        document.form.GRANDTOT.value = document.form.SUBTOT.value * xmlHttp.responseText;
-        document.form.GRANDTOT.value = dollarRound(document.form.GRANDTOT.value);
+        document.form.GRANDTOT.value = calcTot(document.form.SUBTOT.value , xmlHttp.responseText);
         }
       }
     xmlHttp.open("GET","lessons/Ajax/clientSideValidation.jsp?coupon=" + coupon,true);
@@ -88,26 +87,59 @@ function ajaxFunction(coupon)
 
 	f = document.form;
 	
-	f.TOT1.value = dollarRound(f.QTY1.value * f.PRC1.value);
-	f.TOT2.value = dollarRound(f.QTY2.value * f.PRC2.value);
-	f.TOT3.value = dollarRound(f.QTY3.value * f.PRC3.value);
-	f.TOT4.value = dollarRound(f.QTY4.value * f.PRC4.value);
+	f.TOT1.value = calcTot(f.PRC1.value , f.QTY1.value);
+	f.TOT2.value = calcTot(f.PRC2.value , f.QTY2.value);
+	f.TOT3.value = calcTot(f.PRC3.value , f.QTY3.value);
+	f.TOT4.value = calcTot(f.PRC4.value , f.QTY4.value);	
 	
-	f.SUBTOT.value = dollarRound(parseFloat(f.TOT1.value) + parseFloat(f.TOT2.value) + parseFloat(f.TOT3.value) + parseFloat(f.TOT4.value));
-
+	f.SUBTOT.value = formatCurrency(unFormat(f.TOT1.value) 
+							+ unFormat(f.TOT2.value) 
+							+ unFormat(f.TOT3.value) 
+							+ unFormat(f.TOT4.value));
 	
-	f.GRANDTOT.value = f.SUBTOT.value;
+	f.GRANDTOT.value = f.SUBTOT.value;	
 	
 	isValidCoupon(f.field1.value);
+	
+	
+}
+
+function unFormat(price){
+	
+	price = parseFloat(unFormatCurrency(price));
+
+	if(isNaN(price))
+		price = 0;
+	
+	return price;
 
 }
 
 function calcTot( price,  qty){
 	
-	return parseInt(qty * price *100)/100;
-
+	price = unFormatCurrency(price);
+	
+	return formatCurrency(price*qty);
 }
 
-function dollarRound(price){
-	return parseInt(price *100)/100;
+
+function unFormatCurrency(price){
+	price = price.toString().replace(/\$|\,/g,'');
+	return price;
+}
+
+function formatCurrency(num) {
+	num = num.toString().replace(/\$|\,/g,'');
+	if(isNaN(num))
+		num = "0";
+	sign = (num == (num = Math.abs(num)));
+	num = Math.floor(num*100+0.50000000001);
+	cents = num%100;
+	num = Math.floor(num/100).toString();
+	if(cents<10)
+		cents = "0" + cents;
+	for (var i = 0; i < Math.floor((num.length-(1+i))/3); i++)
+		num = num.substring(0,num.length-(4*i+3))+','+
+	num.substring(num.length-(4*i+3));
+	return (((sign)?'':'-') + '$' + num + '.' + cents);
 }

webgoat/main/project/WebContent/lesson_plans/HtmlClues.html

@@ -4,7 +4,7 @@
  
 <p><b>Concept / Topic To Teach:</b> </p>
 <!-- Start Instructions -->
- Developers are notorious for leaving statements like TODO's, Code Broken, Hack, etc... inside the source code. &nbsp;Review the source code for any comments denoting&nbsp; passwords, backdoors, or something doesn't work right.&nbsp;
+ Developers are notorious for leaving statements like FIXME's, TODO's, Code Broken, Hack, etc... inside the source code. &nbsp;Review the source code for any comments denoting&nbsp; passwords, backdoors, or something doesn't work right.&nbsp;
 <!-- Stop Instructions -->
 <br>
 <p><b>General Goal(s):</b> </p>

webgoat/main/project/WebContent/lessons/Ajax/employees.xml

@@ -247,5 +247,8 @@
         <Comments></Comments>
         <DisciplinaryExplanation></DisciplinaryExplanation>
         <DisciplinaryDate>112005</DisciplinaryDate>        
+        <Managers>
+		<Manager>112</Manager>
+	</Managers>
     </Employee>
 </Employees>