');
@@ -570,7 +667,7 @@ function draw() {
}
if (ptype=='string') {
- if ((pscat=='any') || (pscat=='') || (pscat=='default') ||
+ if ((pscat=='any') || (pscat=='') || (pscat=='default') ||
(typeof(pscat)=='undefined')) {
tablestart('Text');
choicewrite('
Value:
');
@@ -639,7 +736,7 @@ function draw() {
choicewrite(' ');
+ choicewrite(' /> Bubblesheet Exam ');
// choicewrite(' ');
+ choicewrite(' /> Yes, and the scope of student selected slot is a single resource. ');
choicewrite(' ');
+ choicewrite(' /> Yes, and the scope of student selected slot is the enclosing map/folder. When checking in, it applies to only one resource. ');
choicewrite(' ');
+ choicewrite(' /> Yes, and the scope of student selected slot is the enclosing map/folder. When checking in, all resources in the map/folder are checked in. ');
choicewrite('
');
}
}
@@ -840,6 +937,9 @@ function assemble() {
function init() {
var i;
var subs=new Array();
+ var doneRegExp = /_done/;
+ var doneproctorRegExp = /_done_proctor/;
+ var proctorkeyRegExp = /^(\d+)_(.+)$/;
var namevalue=this.window.location.search.split('&');
namevalue[0]=namevalue[0].substr(1,namevalue[0].length-1);
@@ -869,6 +969,27 @@ function init() {
if (pair[0]=='defsec' && pair[1] >= 0 && pair[1] < 60) { defsec=pair[1]; }
}
+ if (ptype=='date' && pscat == 'interval') {
+ if (doneproctorRegExp.test(pvalue)) {
+ pmodval = pvalue.match(doneproctorRegExp);
+ var intervalwithkey = pvalue.replace(doneproctorRegExp,'');
+ if (proctorkeyRegExp.test(intervalwithkey)) {
+ var currvals = intervalwithkey.match(proctorkeyRegExp);
+ if (currvals.length == 3) {
+ pvalue = currvals[1];
+ pextraval = currvals[2];
+ } else {
+ pmodval = '';
+ }
+ }
+ } else {
+ if (doneRegExp.test(pvalue)) {
+ var pnumval = pvalue.replace(doneRegExp,'');
+ pmodval = pvalue.match(doneRegExp);
+ pvalue = pnumval;
+ }
+ }
+ }
svalue=pvalue;
if (((ptype=='float') || (ptype=='string') || (ptype=='int')) &&
(pscat=='default') &&
@@ -990,8 +1111,12 @@ function init() {
var targ='parent.opener';
if (pmodal==1) {
targ='parent.parent';
- }
- selwrite('