');
if (ptype=='tolerance') {
// 0: pscat
@@ -464,16 +577,54 @@ function draw() {
tablestart('Date and time');
}
if (pscat=='interval') {
+ var proctorkeytype = 'hidden';
+ var donebuttontext = 'none';
+ if (pmodval == '_done_proctor') {
+ proctorkeytype = 'text';
+ donebuttontext = 'block';
+ }
+ if (pmodval == '_done') {
+ donebuttontext = 'block';
+ }
tablestart('Time interval');
- choicewrite('| ');
- intervaldis();
- choicewrite(' |
| Time:'
- +' | ');
- intday();choicewrite('days ');
- inthour();choicewrite('hours ');
- intminute(); choicewrite('mins '); intsecond();
- choicewrite('secs |
');
- } else {
+ choicewrite( [
+ '| '+intervaldis()+' |
',
+ '| Time: | ',
+ ''+intday()+' days ',
+ ''+inthour()+' hours',
+ ''+intminute()+' mins',
+ ''+intsecond()+' secs',
+ ' |
',
+ '',
+ '
',
+ ].join("\n"));
+ tablestart('Provide a "Done" button to students?');
+ choicewrite('| Value: | ');
+ choicewrite('
');
+ choicewrite('
');
+ choicewrite(''+
+ '');
+ choicewrite('
'+
+ ''+
+ '
'+
+ 'Button text:'+
+ ' ');
+ choicewrite(' |
');
+ } else {
choicewrite('| '
+cdate.toString()+
' |
| Date: | ');
@@ -648,12 +799,47 @@ function draw() {
' type="radio" '+callradiostringeval('anonsurveycred'));
if (svalue=='anonsurveycred') { choicewrite(' checked="checked"'); }
choicewrite('> Anonymous Survey (credit for submission)
');
-
+ choicewrite('
');
choicewrite('
');
}
+ if (pscat=='lenient') {
+ tablestart('Lenient Grading (Partial Credit)');
+ choicewrite(' |
| Value: | ');
+ choicewrite('
');
+ choicewrite('
');
+ choicewrite('
');
+ }
+ if (pscat=='discussvote') {
+ tablestart('Discussion Voting');
+ choicewrite(' |
| Value: | ');
+ choicewrite('
');
+ choicewrite('
');
+ choicewrite('
');
+ }
if (pscat=='ip') {
tablestart('IP Number/Name');
choicewrite(' |
| Value: | ');
@@ -789,6 +975,10 @@ function assemble() {
function init() {
var i;
var subs=new Array();
+ var doneRegExp = /_done(|\:[^\:]+\:)/;
+ var doneproctorRegExp = /_done(|\:[^\:]+\:)_proctor/;
+ var proctorkeyRegExp = /^(\d+)_(.+)$/;
+ var donetextRegExp = /\:([^\:]+)\:/;
var namevalue=this.window.location.search.split('&');
namevalue[0]=namevalue[0].substr(1,namevalue[0].length-1);
@@ -810,6 +1000,7 @@ 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]=='modal') { pmodal=pair[1]; }
if (pair[0]=='defhour' && pair[1] >= 0 && pair[1] < 24 ) {
defhour=pair[1];
}
@@ -817,6 +1008,47 @@ function init() {
if (pair[0]=='defsec' && pair[1] >= 0 && pair[1] < 60) { defsec=pair[1]; }
}
+ if (ptype=='date' && pscat == 'interval') {
+ if (doneproctorRegExp.test(pvalue)) {
+ var current = pvalue.match(doneproctorRegExp);
+ if (current.length == 2) {
+ var textstr = current[1];
+ if (textstr != '') {
+ var textvals = textstr.match(donetextRegExp);
+ if (textvals.length == 2) {
+ pextravaltwo = textvals[1];
+ }
+ }
+ }
+ var intervalwithkey = pvalue.replace(doneproctorRegExp,'');
+ if (proctorkeyRegExp.test(intervalwithkey)) {
+ var currvals = intervalwithkey.match(proctorkeyRegExp);
+ if (currvals.length == 3) {
+ pvalue = currvals[1];
+ pextraval = currvals[2];
+ pmodval = '_done_proctor';
+ } else {
+ pmodval = '';
+ }
+ }
+ } else {
+ if (doneRegExp.test(pvalue)) {
+ var current = pvalue.match(doneRegExp);
+ if (current.length == 2) {
+ var textstr = current[1];
+ if (textstr != '') {
+ var textvals = textstr.match(donetextRegExp);
+ if (textvals.length == 2) {
+ pextravaltwo = textvals[1];
+ }
+ }
+ }
+ var pnumval = pvalue.replace(doneRegExp,'');
+ pmodval = '_done';
+ pvalue = pnumval;
+ }
+ }
+ }
svalue=pvalue;
if (((ptype=='float') || (ptype=='string') || (ptype=='int')) &&
(pscat=='default') &&
@@ -837,9 +1069,12 @@ function init() {
}
}
- this.window.selector.document.clear();
- selwrite('');
+ this.window.selector.document.open();
+ selwrite('');
+ selwrite('');
selwrite('');
+ selwrite('');
+ selwrite('LON-CAPA');
selwrite('');
selwrite('');
- selwrite(' |