--- rat/client/parameter.html 2003/04/19 15:34:06 1.22
+++ rat/client/parameter.html 2007/02/24 02:04:20 1.42
@@ -3,7 +3,7 @@
The LearningOnline Network with CAPA
Parameter Input Window
//
-// $Id: parameter.html,v 1.22 2003/04/19 15:34:06 www Exp $
+// $Id: parameter.html,v 1.42 2007/02/24 02:04:20 albertel Exp $
//
// Copyright Michigan State University Board of Trustees
//
@@ -27,9 +27,6 @@ Parameter Input Window
//
// http://www.lon-capa.org/
//
-06/16/00,06/17,11/17,11/18,11/23,11/27,11/28,12/15,12/16,
-03/21/01,03/24,06/26 Gerd Kortemeyer
-08/08 Gerd Kortemeyer
-->
LON-CAPA
@@ -45,6 +42,10 @@ var pscat='';
var pmarker='';
var pname='';
+var defhour=0;
+var defmin=0;
+var defsec=0;
+
var svalue;
var stype;
var smarker;
@@ -175,6 +176,7 @@ function year() {
var thisyear=cdate.getFullYear();
var nowdate=new Date();
var nowyear=nowdate.getFullYear();
+ if ( !thisyear ) { thisyear=nowyear; }
var loweryear=thisyear-2;
var upperyear=thisyear+5;
if (thisyear>nowyear) { loweryear=nowyear-2; }
@@ -304,6 +306,17 @@ function stringeval() {
draw();
}
+function radiostringeval(newval) {
+ svalue=newval;
+ draw();
+}
+
+function callradiostringeval(newval) {
+ return 'onChange="parent.radiostringeval(\''
+ +newval+'\')" onClick="parent.radiostringeval(\''
+ +newval+'\')"';
+}
+
function intervaldis() {
csecs=svalue;
cdays=Math.floor(csecs/86400);
@@ -323,10 +336,10 @@ function pickcolor(picked) {
function colorfield(ir,ig,ib) {
var col=new Array;
- col=["00","11","22","33","44","55","66","77","88","99","AA","BB","CC","DD","EE","FF"];
+ col=["00","11","22","44","66","88","AA","CC","DD","EE","FF"];
var color='#'+col[ir]+col[ig]+col[ib];
- var selection=" ";
- if (color==svalue) { selection="X"; }
+ var selection="X ";
+ if (color==svalue) { selection="X "; }
choicewrite(''+selection+' Value: ');
- choicewrite(' Value: ');
+ choicewrite(' Value: ');
+ choicewrite(' Value: ');
+ choicewrite(' Value: ');
+ choicewrite(' Value: ');
+ choicewrite(' Value: ');
+ choicewrite(' Value: ');
+ choicewrite(' ');
}
}
@@ -534,13 +647,13 @@ function draw() {
tablestart('Choose a Color');
choicewrite('');
if (svalue) {
- choicewrite('Current choice: Current choice: ');
- for (var ib=1; ib<=15; ib++) {
+ for (var ib=0; ib<=10; ib++) {
colorfield(ir,ig,ib);
}
choicewrite(' ');
@@ -549,7 +662,7 @@ function draw() {
choicewrite('
');
}
- choicewrite('');
+ choicewrite('');
choiceend();
}
@@ -569,7 +682,7 @@ function catchange() {
function assemble() {
if ((ptype=='date') && (pscat!='interval')) {
- svalue=Math.round(cdate.getTime()/1000);
+ svalue=Math.floor(cdate.getTime()/1000);
}
if (ptype=='tolerance') {
if (pscat=='relative_sym') {
@@ -638,6 +751,11 @@ function init() {
if (pair[0]=='call') { pcode=pair[1]; }
if (pair[0]=='marker') { pmarker=pair[1]; }
if (pair[0]=='name') { pname=pair[1]; }
+ if (pair[0]=='defhour' && pair[1] >= 0 && pair[1] < 24 ) {
+ defhour=pair[1];
+ }
+ if (pair[0]=='defmin' && pair[1] >= 0 && pair[1] < 60) { defmin=pair[1]; }
+ if (pair[0]=='defsec' && pair[1] >= 0 && pair[1] < 60) { defsec=pair[1]; }
}
svalue=pvalue;
@@ -682,6 +800,10 @@ function init() {
if ((pvalue!='') && (typeof(pvalue)!="undefined")) {
cdate.setTime(pvalue*1000);
+ } else {
+ cdate.setSeconds(defsec);
+ cdate.setMinutes(defmin);
+ cdate.setHours(defhour);
}
months[0]='January';
@@ -717,7 +839,7 @@ function init() {
if (ptype=='string') {
sopt('default','Default');
- sopt('string','String Value');
+ sopt('any','String Value');
}
if (ptype=='color') {