--- rat/client/parameter.html	2007/05/02 01:34:37	1.43
+++ rat/client/parameter.html	2009/04/23 17:31:29	1.51
@@ -3,7 +3,7 @@
 The LearningOnline Network with CAPA
 Parameter Input Window
 //
-// $Id: parameter.html,v 1.43 2007/05/02 01:34:37 albertel Exp $
+// $Id: parameter.html,v 1.51 2009/04/23 17:31:29 bisitz Exp $
 //
 // Copyright Michigan State University Board of Trustees
 //
@@ -32,7 +32,7 @@ Parameter Input Window
 <title>LON-CAPA</title>
 </head>
 
-<script>
+<script type="text/javascript">
 
 var ptype='';
 var pvalue='';
@@ -81,15 +81,23 @@ function choicewrite(text) {
 }
 
 function tablestart(headtext) {
-  choicewrite('<table><tr bgcolor="#AAFFAA"><th colspan=3>'+
+  choicewrite('<table><tr bgcolor="#AAFFAA"><th colspan="3">'+
               headtext+'</th></tr>');
 }
 
 function valline(text,id1,id2) {
   choicewrite('<tr bgcolor="#AAFFAA"><td>'+text+
-              '</td><td><input type=text size=4 name=val'+
-              id1+'></td><td>incl:<input type=checkbox name=val'+
-              id2+'></td></tr>');
+              '</td><td><input type="text" size="4" name="val'+
+              id1+'"></td><td>incl:<input type="checkbox" name="val'+
+              id2+'"></td></tr>');
+}
+
+function escapeHTML(text) {
+  text = text.replace(/&/g, '&amp;');
+  text = text.replace(/"/g, '&quot;');
+  text = text.replace(/</g, '&lt;');
+  text = text.replace(/>/g, '&gt;');
+  return text;
 }
 
 function datecalc() {
@@ -108,7 +116,7 @@ function datecalc() {
 function hour() {
    var thishour=cdate.getHours();
     var i; var j;
-    choicewrite('<select name=hours onChange="parent.datecalc();">');
+    choicewrite('<select name="hours" onChange="parent.datecalc();">');
     for (i=0;i<=23;i++) {
         choicewrite('<option value='+i);
         if (i==thishour) {
@@ -132,7 +140,7 @@ function hour() {
 function minute() {
    var thisminutes=cdate.getMinutes();
     var i;
-    choicewrite('<select name=minutes onChange="parent.datecalc();">');
+    choicewrite('<select name="minutes" onChange="parent.datecalc();">');
     for (i=0;i<=59;i++) {
         choicewrite('<option value='+i);
         if (i==thisminutes) {
@@ -146,7 +154,7 @@ function minute() {
 function second() {
    var thisseconds=cdate.getSeconds();
     var i;
-    choicewrite('<select name=seconds onChange="parent.datecalc();">');
+    choicewrite('<select name="seconds" onChange="parent.datecalc();">');
     for (i=0;i<=59;i++) {
         choicewrite('<option value='+i);
         if (i==thisseconds) {
@@ -161,7 +169,7 @@ function second() {
 function date() {
    var thisdate=cdate.getDate();
     var i;
-    choicewrite('<select name=date onChange="parent.datecalc();">');
+    choicewrite('<select name="date" onChange="parent.datecalc();">');
     for (i=1;i<=31;i++) {
         choicewrite('<option value='+i);
         if (i==thisdate) {
@@ -182,7 +190,7 @@ function year() {
    if (thisyear>nowyear) { loweryear=nowyear-2; }
    if (thisyear<nowyear) { upperyear=nowyear+5; } 
     var i;
-    choicewrite('<select name=year onChange="parent.datecalc();">');
+    choicewrite('<select name="year" onChange="parent.datecalc();">');
     for (i=loweryear;i<=upperyear;i++) {
         choicewrite('<option value='+i);
         if (i==thisyear) {
@@ -196,7 +204,7 @@ function year() {
 function month() {
     var thismonth=cdate.getMonth();
     var i;
-    choicewrite('<select name=month onChange="parent.datecalc();">');
+    choicewrite('<select name="month" onChange="parent.datecalc();">');
     for (i=0;i<=11;i++) {
         choicewrite('<option value='+i);
         if (i==thismonth) {
@@ -211,7 +219,7 @@ function month() {
 function intminute() {
    var thisminutes=cmins;
     var i;
-    choicewrite('<select name=minutes onChange="parent.intcalc();">');
+    choicewrite('<select name="minutes" onChange="parent.intcalc();">');
     for (i=0;i<=59;i++) {
         choicewrite('<option value='+i);
         if (i==thisminutes) {
@@ -225,7 +233,7 @@ function intminute() {
 function inthour() {
    var thishours=chours;
     var i;
-    choicewrite('<select name=hours onChange="parent.intcalc();">');
+    choicewrite('<select name="hours" onChange="parent.intcalc();">');
     for (i=0;i<=23;i++) {
         choicewrite('<option value='+i);
         if (i==thishours) {
@@ -239,7 +247,7 @@ function inthour() {
 function intsecond() {
    var thisseconds=csecs;
     var i;
-    choicewrite('<select name=seconds onChange="parent.intcalc();">');
+    choicewrite('<select name="seconds" onChange="parent.intcalc();">');
     for (i=0;i<=59;i++) {
         choicewrite('<option value='+i);
         if (i==thisseconds) {
@@ -254,7 +262,7 @@ function intsecond() {
 function intday() {
    var thisdate=cdays;
     var i;
-    choicewrite('<select name=date onChange="parent.intcalc();">');
+    choicewrite('<select name="date" onChange="parent.intcalc();">');
     for (i=0;i<=31;i++) {
         choicewrite('<option value='+i);
         if (i==thisdate) {
@@ -347,7 +355,7 @@ function colorfield(ir,ig,ib) {
 
 function draw() {
    choicestart();
-   choicewrite('<form name=sch');
+   choicewrite('<form name="sch"');
    if (ptype=='int') {
       choicewrite(' action="javascript:integereval();"');
    }
@@ -440,21 +448,21 @@ function draw() {
       }
       if (pscat=='interval') {
          tablestart('Time interval');
-         choicewrite('<tr bgcolor="#AAFFAA"><td colspan=3>');
+         choicewrite('<tr bgcolor="#AAFFAA"><td colspan="3">');
          intervaldis();
          choicewrite('</td></tr><tr bgcolor="#AAFFAA"><td>Time:'
-         +'</td><td colspan=2>');
+         +'</td><td colspan="2">');
          intday();choicewrite('days ');
          inthour();choicewrite('hours ');
          intminute(); choicewrite('mins '); intsecond();
          choicewrite('secs</td></tr></table>');         
       } else { 
-         choicewrite('<tr bgcolor="#AAFFAA"><td colspan=3>'
+         choicewrite('<tr bgcolor="#AAFFAA"><td colspan="3">'
          +cdate.toString()+
-         '</td></tr><tr bgcolor="#AAFFAA"><td>Date:</td><td colspan=2>');
+         '</td></tr><tr bgcolor="#AAFFAA"><td>Date:</td><td colspan="2">');
          month();date();year();
          choicewrite('</td></tr><tr bgcolor="#AAFFAA"><td>Time:'
-         +'</td><td colspan=2>');hour();choicewrite('h ');minute();
+         +'</td><td colspan="2">');hour();choicewrite('h ');minute();
          choicewrite('m ');second();
          choicewrite('s</td></tr></table>');
       }
@@ -472,11 +480,11 @@ function draw() {
        if (pscat=='range') {
          tablestart('Integer range');      
          choicewrite('<tr bgcolor="#AAFFAA"><td>Lower Value:'+
-              '</td><td colspan=2><input type=text size=4 name=val2'+
-              '></td></tr>');
+              '</td><td colspan="2"><input type="text" size="4" name="val2'+
+              '"></td></tr>');
          choicewrite('<tr bgcolor="#AAFFAA"><td>Upper Value:'+
-              '</td><td colspan=2><input type=text size=4 name=val4'+
-              '></td></tr></table>');
+              '</td><td colspan="2"><input type="text" size="4" name="val4'+
+              '"></td></tr></table>');
          var range=new Array;
          if ((svalue!='') && (typeof(svalue)!="undefined")) {
             range=svalue.split(',');
@@ -499,8 +507,8 @@ function draw() {
         if (pscat=='any') {
            tablestart('Integer');
         }
-        choicewrite('<tr bgcolor="#AAFFAA"><td>Value:</td><td colspan=2>');
-        choicewrite('<input name=intval size=10 value="'+svalue+
+        choicewrite('<tr bgcolor="#AAFFAA"><td>Value:</td><td colspan="2">');
+        choicewrite('<input name="intval" size="10" value="'+escapeHTML(svalue)+
                     '" name=intval onChange="parent.integereval()">');
         choicewrite('</td></table>');
       }
@@ -521,8 +529,8 @@ function draw() {
         if (pscat=='any') {
            tablestart('Floating point number');
         }
-        choicewrite('<tr bgcolor="#AAFFAA"><td>Value:</td><td colspan=2>');
-        choicewrite('<input name=floatval size=10 value="'+svalue+
+        choicewrite('<tr bgcolor="#AAFFAA"><td>Value:</td><td colspan="2">');
+        choicewrite('<input name="floatval" size="10" value="'+escapeHTML(svalue)+
                     '" name=floatval onChange="parent.floateval()">');
         choicewrite('</td></table>');
       }
@@ -532,13 +540,13 @@ function draw() {
         if ((pscat=='any') || (pscat=='') || (pscat=='default') ||  
             (typeof(pscat)=='undefined')) {
            tablestart('Text');
-	   choicewrite('<tr bgcolor="#AAFFAA"><td>Value:</td><td colspan=2>');
-           choicewrite('<input name="stringval" size="20" value="'+svalue+
+	   choicewrite('<tr bgcolor="#AAFFAA"><td>Value:</td><td colspan="2">');
+           choicewrite('<input name="stringval" size="20" value="'+escapeHTML(svalue)+
                     '" type="text" onChange="parent.stringeval()">');
         }
         if (pscat=='yesno') {
            tablestart('Yes/No');
-	   choicewrite('<tr bgcolor="#AAFFAA"><td>Value:</td><td colspan=2>');
+	   choicewrite('<tr bgcolor="#AAFFAA"><td>Value:</td><td colspan="2">');
            choicewrite('<label><input name="stringval" value="yes"'+
                   ' type="radio" '+callradiostringeval('yes'));
            if (svalue=='yes') { choicewrite(' checked'); }
@@ -548,9 +556,29 @@ function draw() {
            if (svalue=='no') { choicewrite(' checked'); }
            choicewrite('> No</label><br />');
         }
+        if (pscat=='problemstatus') {
+           tablestart('Problem Status');
+	   choicewrite('<tr bgcolor="#AAFFAA"><td>Value:</td><td colspan="2">');
+           choicewrite('<label><input name="stringval" value="yes"'+
+                  ' type="radio" '+callradiostringeval('yes'));
+           if (svalue=='yes') { choicewrite(' checked'); }
+           choicewrite('> Yes</label><br />');
+           choicewrite('<label><input name="stringval" value="answer"'+
+                  ' type="radio" '+callradiostringeval('answer'));
+           if (svalue=='answer') { choicewrite(' checked'); }
+           choicewrite('> Yes, and show correct answer if they exceed the maximum number of tries.</label><br />');
+           choicewrite('<label><input name="stringval" value="no"'+
+                  ' type="radio" '+callradiostringeval('no'));
+           if (svalue=='no') { choicewrite(' checked'); }
+           choicewrite('> No, don\'t show correct/incorrect feedback.</label><br />');
+           choicewrite('<label><input name="stringval" value="no_feedback_ever"'+
+                  ' type="radio" '+callradiostringeval('no_feedback_ever'));
+           if (svalue=='no_feedback_ever') { choicewrite(' checked'); }
+           choicewrite('> No, show no feedback at all.</label><br />');
+        }
         if (pscat=='examtype') {
            tablestart('Exam Type');
-	   choicewrite('<tr bgcolor="#AAFFAA"><td>Value:</td><td colspan=2>');
+	   choicewrite('<tr bgcolor="#AAFFAA"><td>Value:</td><td colspan="2">');
            choicewrite('<label><input name="stringval" value="online"'+
                 ' type="radio" '+callradiostringeval('online'));
            if (svalue=='online') { choicewrite(' checked'); }
@@ -562,7 +590,7 @@ function draw() {
        }
         if (pscat=='questiontype') {
            tablestart('Question Type');
-	   choicewrite('<tr bgcolor="#AAFFAA"><td>Value:</td><td colspan=2>');
+	   choicewrite('<tr bgcolor="#AAFFAA"><td>Value:</td><td colspan="2">');
            choicewrite('<label><input name="stringval" value="problem"'+
                ' type="radio" '+callradiostringeval('problem'));
            if (svalue=='problem') { choicewrite(' checked'); }
@@ -598,13 +626,13 @@ function draw() {
         }
         if (pscat=='ip') {
            tablestart('IP Number/Name');
-	   choicewrite('<tr bgcolor="#AAFFAA"><td>Value:</td><td colspan=2>');
-           choicewrite('<input name="stringval" size="20" value="'+svalue+
+	   choicewrite('<tr bgcolor="#AAFFAA"><td>Value:</td><td colspan="2">');
+           choicewrite('<input name="stringval" size="20" value="'+escapeHTML(svalue)+
                     '" onChange="parent.stringeval()">');
         }
         if (pscat=='fileext') {
             tablestart('Allowed File Extensions');
-	   choicewrite('<tr bgcolor="#AAFFAA"><td>Value:</td><td colspan=2>');
+	   choicewrite('<tr bgcolor="#AAFFAA"><td>Value:</td><td colspan="2">');
            choicewrite('<label><input name="radstringval" value="txt"'+
                ' type="radio" '+callradiostringeval('txt'));
            if (svalue=='txt') { choicewrite(' checked'); }
@@ -617,12 +645,12 @@ function draw() {
                ' type="radio" '+callradiostringeval('doc,xls,ppt'));
            if (svalue=='doc,xls,ppt') { choicewrite(' checked'); }
            choicewrite('> Office Document</label><br />');
-           choicewrite('<input name="stringval" size="20" value="'+svalue+
+           choicewrite('<input name="stringval" size="20" value="'+escapeHTML(svalue)+
                     '" onChange="parent.stringeval()">');
        }
        if (pscat=='useslots') {
            tablestart('Slots control access');
-	   choicewrite('<tr bgcolor="#AAFFAA"><td>Value:</td><td colspan=2>');
+	   choicewrite('<tr bgcolor="#AAFFAA"><td>Value:</td><td colspan="2">');
            choicewrite('<label><input name="stringval" value="no"'+
                   ' type="radio" '+callradiostringeval('no'));
            if (svalue=='no') { choicewrite(' checked'); }
@@ -648,7 +676,7 @@ function draw() {
       choicewrite('<table>');
       if (svalue) {
          choicewrite('<tr><td colspan="9">Current choice:</td><td bgcolor="'+
-                     svalue+'" colspan="2">&nbsp;</td></tr>');
+                     escapeHTML(svalue)+'" colspan="2">&nbsp;</td></tr>');
       }
       for (var ir=0; ir<=10; ir++) {
           for (var ig=0; ig<=10; ig++) {
@@ -781,7 +809,7 @@ function init() {
   this.window.selector.document.clear();
   selwrite('<html><body bgcolor="#FFFFFF">');
 
-  selwrite('<form name="fsel"><b>'+pname+'</b><br>');
+  selwrite('<form name="fsel"><b>'+pname+'</b><br />');
   selwrite('<select name="fcat" onChange="parent.catchange();">');
 
   if (ptype=='tolerance') {
@@ -793,11 +821,14 @@ function init() {
   }
 
   if (ptype=='date') {
-     sopt('default','Default');
-     sopt('start','Starting Date');
-     sopt('end','Ending Date');
-     sopt('interval','Time Interval');
-     
+     if (pscat != 'interval') {
+         sopt('default','Default');
+	 sopt('start','Starting Date');
+	 sopt('end','Ending Date');
+     } else {
+         sopt('interval','Time Interval');
+     }
+
      if ((pvalue!='') && (typeof(pvalue)!="undefined")) {
         cdate.setTime(pvalue*1000);
      } else {        
@@ -838,7 +869,15 @@ function init() {
   }
 
   if (ptype=='string') {
-     sopt('default','Default');
+     //sopt('default','Default');
+     if (pscat == 'yesno')        { sopt('yesno','Yes/No'); }
+     else if (pscat == 'problemstatus'){ sopt('problemstatus','Problem Status'); }
+     else if (pscat == 'examtype')     { sopt('examtype','Exam Type'); }
+     else if (pscat == 'questiontype') { sopt('questiontype','Question Type'); }
+     else if (pscat == 'ip')           { sopt('ip','IP Number/Name'); }
+     else if (pscat == 'fileext')      { sopt('fileext','File Extension'); }
+     else if (pscat == 'useslots')     { sopt('useslots','Slots control access'); }
+     else { pscat = 'any'; }
      sopt('any','String Value');
   }
 
@@ -907,8 +946,8 @@ function init() {
 </script>
 
 <frameset rows="120,*" onLoad="init();">
-<frame name=selector src="empty.html">
-<frame name=choices src="empty.html">
+<frame name="selector" src="empty.html">
+<frame name="choices" src="empty.html">
 </frameset>