modules/gci/londocsgci.pm - diff

Return to londocsgci.pm CVS log

Up to [LON-CAPA] / modules / gci

Diff for /modules/gci/londocsgci.pm between versions 1.5 and 1.17

version 1.5, 2009/12/20 04:32:03	version 1.17, 2010/12/05 17:48:54
Line 44 use LONCAPA qw(:DEFAULT :match);	Line 44 use LONCAPA qw(:DEFAULT :match);
my $path;	my $path;
my $version;	my $version;
my $reqnum;	my $reqnum;
	my @mandcats;
	my @bincats;
my @categories;	my @categories;
my @allprobs;	my @allprobs;
my %probcat;	my %probcat;
my %prereqs;	my %prereqs;
	my %revreqs;
my @defchosen;	my @defchosen;
my @chosen;	my @chosen;
my @mandprobs;	my @mandprobs;
Line 55 my @bins;	Line 58 my @bins;
my @optional;	my @optional;
my %mandatory;	my %mandatory;
my @development;	my @development;
my %developmentitems;

sub setdefaults {	sub setdefaults {
$path='/res/gci/gci';	my ($cdom) = @_;
$version='GCIv2-1-1';	if ($cdom eq 'gcitest') {
$reqnum=15;	$path='/res/gci/gci';
@allprobs=('01','02','37','2004_73','03','04','05','06','07',	$version='GCIv2-1-1';
'08','10',	$reqnum=15;
'09',	@allprobs=('01','02','37','2004_73','03','04','05','06','07',
'11','12','13','14','15','16','17',	'08','10',
'18','69',	'09',
'19','20',	'11','12','13','14','15','16','17',
'21','22','23','24','25','26','27','28','29','30',	'18','69',
'31','32','33','34','35','36','38',	'19','20',
'39A','39B',	'21','22','23','24','25','26','27','28','29','30',
'40',	'31','32','33','34','35','36','38',
'41','42','43','44','45','46','47','48','49','50',	'39A','39B',
'51',	'40',
'52','57',	'41','42','43','44','45','46','47','48','49','50',
'53','54','55','56','58',	'51',
'60',	'52','57',
'61','62','63','64','65','66','67','68','70',	'53','54','55','56','58',
'71');	'60',
@bins = ( ['03','04','06'],	'61','62','63','64','65','66','67','68','70',
['07','08','09'],	'71');
['10','12','13','14','15','16','17'],	@bins = ( ['03','04','06'],
['18','19','20','21','22','23','24','25'],	['07','08','09'],
['26','27','28','30'],	['10','12','13','14','15','16','17'],
['32','33','34','35','36'],	['18','19','20','21','22','23','24','25'],
['38','39A','39B','40','41','42','43','44','45','46'],	['26','27','28','30'],
['47','48','49','50','51','52','53'],	['32','33','34','35','36'],
['54','55','56','57','58','60','61','62'],	['38','39A','39B','40','41','42','43','44','45','46'],
['63','64','65'],	['47','48','49','50','51','52','53'],
['66','67','68','69','70','71']);	['54','55','56','57','58','60','61','62'],
@optional = ('05','11','29','31');	['63','64','65'],
	['66','67','68','69','70','71']);
@categories=('M1','M2','M3','M4',	@optional = ('05','11','29','31');
'A','B','C','D','E','F','G','H','I','J','K');	@mandcats = ('M1','M2','M3','M4');
%probcat =('01' => 'M1' ,'02' => 'M2' ,'37' => 'M3' ,'2004_73' => 'M4' ,	@bincats = ('A','B','C','D','E','F','G','H','I','J','K');
'03' => 'A' ,'04' => 'A','05' => '' ,'06' => 'A' ,'07' => 'B' ,	@categories=(@mandcats,@bincats);
'08' => 'B' ,'09' => 'B' ,'10' => 'C' ,'11' => '' ,'12' => 'C' ,	%probcat =('01' => 'M1' ,'02' => 'M2' ,'37' => 'M3' ,'2004_73' => 'M4' ,
'13' => 'C' ,'14' => 'C' ,'15' => 'C' ,'16' => 'C' ,'17' => 'C' ,'18' => 'D' ,'19' => 'D' ,'20' => 'D' ,	'03' => 'A' ,'04' => 'A','05' => '' ,'06' => 'A' ,'07' => 'B' ,
'21' => 'D' ,'22' => 'D' ,'23' => 'D' ,'24' => 'D' ,'25' => 'D' ,'26' => 'E' ,'27' => 'E' ,'28' => 'E' ,'29' => '' ,'30' => 'E' ,	'08' => 'B' ,'09' => 'B' ,'10' => 'C' ,'11' => '' ,'12' => 'C' ,
'31' => '' ,'32' => 'F' ,'33' => 'F' ,'34' => 'F' ,'35' => 'F' ,'36' => 'F' ,'38' => 'G' ,	'13' => 'C' ,'14' => 'C' ,'15' => 'C' ,'16' => 'C' ,'17' => 'C' ,'18' => 'D' ,'19' => 'D' ,'20' => 'D' ,
'39A'=> 'G' ,'39B'=> 'G' ,	'21' => 'D' ,'22' => 'D' ,'23' => 'D' ,'24' => 'D' ,'25' => 'D' ,'26' => 'E' ,'27' => 'E' ,'28' => 'E' ,'29' => '' ,'30' => 'E' ,
'40' => 'G' ,	'31' => '' ,'32' => 'F' ,'33' => 'F' ,'34' => 'F' ,'35' => 'F' ,'36' => 'F' ,'38' => 'G' ,
'41' => 'G' ,'42' => 'G' ,'43' => 'G' ,'44' => 'G' ,'45' => 'G' ,'46' => 'G' ,'47' => 'H' ,'48' => 'H' ,'49' => 'H' ,'50' => 'H' ,	'39A'=> 'G' ,'39B'=> 'G' ,
'51' => 'H' ,'52' => 'H' ,'53' => 'H' ,'54' => 'I' ,'55' => 'I' ,'56' => 'I' ,'57' => 'I' ,'58' => 'I' ,	'40' => 'G' ,
'60' => 'I' ,	'41' => 'G' ,'42' => 'G' ,'43' => 'G' ,'44' => 'G' ,'45' => 'G' ,'46' => 'G' ,'47' => 'H' ,'48' => 'H' ,'49' => 'H' ,'50' => 'H' ,
'61' => 'I' ,'62' => 'I' ,'63' => 'J' ,'64' => 'J' ,'65' => 'J' ,'66' => 'K' ,'67' => 'K' ,'68' => 'K' ,'69' => 'K' ,'70' => 'K' ,	'51' => 'H' ,'52' => 'H' ,'53' => 'H' ,'54' => 'I' ,'55' => 'I' ,'56' => 'I' ,'57' => 'I' ,'58' => 'I' ,
'71' => 'K');	'60' => 'I' ,
%mandatory=('01' => 1 ,'02' => 1,'37' => 1, '2004_73' => 1);	'61' => 'I' ,'62' => 'I' ,'63' => 'J' ,'64' => 'J' ,'65' => 'J' ,'66' => 'K' ,'67' => 'K' ,'68' => 'K' ,'69' => 'K' ,'70' => 'K' ,
@mandprobs = ('01','02','37','2004_73');	'71' => 'K');
%prereqs=('10' => '08', '57' => '52', '69' => '18');	%mandatory=('01' => 1 ,'02' => 1,'37' => 1, '2004_73' => 1);
@defchosen=('01','02','03','07','12','18','26','32','37','38','47','54','63','66','2004_73');	@mandprobs = ('01','02','37','2004_73');
@development = ('100','101','102');	%prereqs=('10' => '08', '57' => '52', '69' => '18');
%developmentitems = ('100' => 1, '101' => '1', '102' => '1');	foreach my $item (keys(%prereqs)) {
	$revreqs{$prereqs{$item}} = $item;
	}
	@defchosen=('01','02','03','07','12','18','26','32','37','38','47','54','63','66','2004_73');
	@development = ('001','002','003','004','005','006','007','008','009','010','011','012','013','014','015','016','017','018','019','020','021','022','023','024','025','026','027');
	}
}	}

sub checkvalid {	sub checkvalid {
	my ($cdom) = @_;
my %covered=();	my %covered=();
my %chosenproblems=();	my %chosenproblems=();
my @errors=();	my @errors=();
Line 134 sub checkvalid {	Line 142 sub checkvalid {
foreach my $item (@chosen) {	foreach my $item (@chosen) {
if ($prereqs{$item}) {	if ($prereqs{$item}) {
unless ($chosenproblems{$prereqs{$item}}) {	unless ($chosenproblems{$prereqs{$item}}) {
push(@errors,&mt('Problem [_1] requires problem [_2].',$item,$prereqs{$item}));	my $url = &fullurl($item,$cdom);
	my $title = &Apache::lonnet::metadata($url,'title');
	my $prerequrl = &fullurl($prereqs{$item},$cdom);
	my $prereqtitle = &Apache::lonnet::metadata($prerequrl,'title');
	push(@errors,&mt('[_1] requires [_2].',"'$title'","'$prereqtitle'"));
}	}
}	}
}	}
Line 142 sub checkvalid {	Line 154 sub checkvalid {
}	}

sub fullurl {	sub fullurl {
my ($item)=@_;	my ($item,$cdom,$catname)=@_;
unless ($item=~/\_/) { $item='_'.$item; }	if ($cdom eq 'gcitest') {
return $path.'/'.$version.'/GCI'.$item.'.problem';	unless ($item=~/\_/) { $item='_'.$item; }
	if ($catname eq 'development') {
	return $path.'/pilot/pilot'.$item.'.problem';
	}
	return $path.'/'.$version.'/GCI'.$item.'.problem';
	}
	}

	sub item_from_url {
	my ($url)=@_;
	if ($url =~ m{\Q$path\E/\Q$version\E/GCI_?([^.]+)\.problem$}) {
	return $1;
	}
}	}

sub validcheck {	sub validcheck {
my ($r)=@_;	my ($r,$cdom)=@_;
my @errors=&checkvalid();	my @errors=&checkvalid($cdom);
if ($#errors>-1) {	if ($#errors>-1) {
$r->print('<span class="LC_error">'.&mt('Your test is not yet valid.').'</span><p>'.&mt('The following issues must be addressed before you can use the test:').'<ul>');	$r->print('<span class="LC_error">'.&mt('Your test is not yet valid.').'</span><p>'.&mt('The following issues must be addressed before you can use the test:').'<ul>');
foreach my $message (@errors) {	foreach my $message (@errors) {
Line 164 sub validcheck {	Line 188 sub validcheck {
sub listresources {	sub listresources {
my ($r,$context,$cdom,$cnum)=@_;	my ($r,$context,$cdom,$cnum)=@_;
my $numchosen = scalar(@chosen);	my $numchosen = scalar(@chosen);
	my $multipart = 0;
	my $composites;
	if ($numchosen > 0) {
	foreach my $key (keys(%prereqs)) {
	if (grep(/^\Q$key\E/,@chosen)) {
	$multipart ++;
	$numchosen --;
	}
	}
	if ($multipart) {
	$composites = &mt(' (of which [quant,_1,is a combination question,are combination questions] in which students select both an answer, and the reasoning used).',$multipart).'<br />';
	} else {
	$composites = '. ';
	}
	}
unless ($numchosen > 0) {	unless ($numchosen > 0) {
$r->print('<h3>'.&mt('Create a Concept Test').'</h3>'.	$r->print('<h3>'.&mt('Create a Concept Test').'</h3>'.
'<p>'.&mt('Choose how the test should be built:').'<br />'.	'<p>'.&mt('Choose how the test should be built:').'<br />'.
Line 174 sub listresources {	Line 213 sub listresources {
'<input type="submit" name="choosetest" value="'.&mt('Next').'"></p>');	'<input type="submit" name="choosetest" value="'.&mt('Next').'"></p>');
return;	return;
}	}
if ((!&validcheck($r)) \|\| ($env{'form.concepttest'} eq 'editmyown')) {	if ((!&validcheck($r,$cdom)) \|\| ($env{'form.concepttest'} eq 'editmyown')) {
&editor($r,$context,$cdom,$cnum);	&editor($r,$context,$cdom,$cnum);
} else {	} else {
my $numsub = &get_submissions_count($cdom,$cnum);	my $numsub = &get_submissions_count($cdom,$cnum);
unless ($env{'form.phase'} eq 'storemap') {	unless ($env{'form.phase'} eq 'storemap') {
$r->print('<p>'.&mt('This course contains a valid concept test which includes [quant,_1,question].',$numchosen).' <a href="/adm/navmaps" target="_coursecontents">'.&mt('Display Contents').'</a><br />');	$r->print('<p>'.&mt('This course contains a valid concept test which includes [quant,_1,question]',$numchosen).$composites.'<a href="/adm/navmaps" target="_coursecontents">'.&mt('Display Contents').'</a><br />');
}	}
if ($numsub > 0) {	if ($numsub > 0) {
$r->print(&mt('As there are existing student submissions, modification of the [_1]contents[_2] of the Concept Test will result in loss of student performance data, and is [_3]not[_4] permitted.','<i>','</i>','<b>','</b>').'<br />'.&mt('Modification of open and close dates [_1]is[_2] permitted.','<b>','</b>').'</p>');	$r->print(&mt('As there are existing student submissions, modification of the [_1]contents[_2] of the Concept Test will result in loss of student performance data, and is [_3]not[_4] permitted.','<i>','</i>','<b>','</b>').'<br />'.&mt('Modification of open and close dates [_1]is[_2] permitted.','<b>','</b>').'</p>');
} else {	} else {
$r->print('<fieldset><legend>'.&mt('Modify Test').'</legend>'.	$r->print('<fieldset><legend>'.&mt('Modify Test').'</legend>'.
&mt('Currently no student submissions have been recorded, so you may modify the contents of the Concept Test.').	&mt('Currently no student submissions have been recorded, so you may modify the contents of the Concept Test.').
'<br /><form name="changetest" method="post" action="/adm/coursedocs">'.	'<br /><br /><form name="changetest" method="post" action="/adm/coursedocs">'.
'<input type="hidden" name="concepttest" value="editmyown" />'.	'<input type="hidden" name="concepttest" value="editmyown" />'.
'<input type="submit" name="modifytest" value="'.&mt('Edit Concept Test').'" /></form></fieldset></p>');	'<input type="submit" name="modifytest" value="'.&mt('Edit Concept Test').'" /></form></fieldset></p>');
}	}
my ($crsparms,$ineffect,$parmlev) = &current_parms($cdom,$cnum);	my ($crsparms,$ineffect,$parmlev) = &current_parms($cdom,$cnum);
my $formname = 'datesform';	my $formname = 'datesform';
my $datebutton = &mt('Save');	my $datebutton = &mt('Save');
	my $hide_timezone = 1;
my $startform =	my $startform =
&Apache::lonhtmlcommon::date_setter($formname,'opendate',	&Apache::lonhtmlcommon::date_setter($formname,'opendate',
$crsparms->{'opendate'});	$crsparms->{'opendate'},'','','',
	'','','','','',$hide_timezone);
my $endform =	my $endform =
&Apache::lonhtmlcommon::date_setter($formname,'duedate',	&Apache::lonhtmlcommon::date_setter($formname,'duedate',
$crsparms->{'duedate'});	$crsparms->{'duedate'},'','','',
	'','','','','',$hide_timezone);
	my $includeempty = 1;
	my $timezone = &Apache::lonlocal::gettimezone();
	my $tzform = &Apache::loncommon::select_timezone('timezone',$timezone,
	undef,$includeempty);
$r->print('<p><fieldset><legend>'.&mt('Test Availability').'</legend>'.	$r->print('<p><fieldset><legend>'.&mt('Test Availability').'</legend>'.
&mt('Open and close dates for test items for the concept test are currently set as follows:').	&mt('Open and close dates for test items for the concept test are currently set as follows:').
'<br />'.	'<br /><br />'.
'<form name="'.$formname.'" method="post" '.	'<form name="'.$formname.'" method="post" '.
'action="/adm/coursedocs">'.	'action="/adm/coursedocs">'.
&Apache::lonhtmlcommon::start_pick_box().	&Apache::lonhtmlcommon::start_pick_box().
	&Apache::lonhtmlcommon::row_title(&mt('Time zone')).
	$tzform.
	&Apache::lonhtmlcommon::row_closure(1).
&Apache::lonhtmlcommon::row_title(&mt('Open date')).	&Apache::lonhtmlcommon::row_title(&mt('Open date')).
$startform.	$startform.
&Apache::lonhtmlcommon::row_closure().	&Apache::lonhtmlcommon::row_closure(1).
&Apache::lonhtmlcommon::row_title(&mt('Close date')).	&Apache::lonhtmlcommon::row_title(&mt('Close date')).
$endform.	$endform.
&Apache::lonhtmlcommon::end_pick_box().'<br />'.	&Apache::lonhtmlcommon::row_closure(1).
	&Apache::lonhtmlcommon::end_pick_box().'<br />'.
'<input type="hidden" name="phase" value="storeparms" />'.	'<input type="hidden" name="phase" value="storeparms" />'.
'<input type="submit" value="'.$datebutton.'" />'.	'<input type="submit" value="'.$datebutton.'" />'.
'</form></fieldset></p>');	'</form></fieldset></p>');
Line 229 sub editor {	Line 279 sub editor {
$r->print('<form name="selecteditems" method="post" action="/adm/coursedocs"	$r->print('<form name="selecteditems" method="post" action="/adm/coursedocs"
onsubmit="return validTestCheck()">');	onsubmit="return validTestCheck()">');
$r->print(&mt('Select test items from the numbered bins below and then press [_1]"Store Problem Selection"[_2] at the bottom of the page.','<i>','</i>').'<br />');	$r->print(&mt('Select test items from the numbered bins below and then press [_1]"Store Problem Selection"[_2] at the bottom of the page.','<i>','</i>').'<br />');
$r->print('<ul>'.	if ($cdom eq 'gcitest') {
'<li>'.&mt('Tests will contain a minimum of [_1] questions from the GCI 2 Inventory.',"<b>$reqnum</b>").'</li>'.	$r->print('<ul>'.
'<li>'.&mt('Tests must contain [_1]four[_2] mandatory questions and at least one item from each of [_1]eleven[_2] other bins.','<b>','</b>').'</li>'.	'<li>'.&mt('Tests will contain a minimum of [_1] questions from the GCI 2 Inventory.',"<b>$reqnum</b>").'</li>'.
'<li>'.&mt('All tests conclude with [_1]two[_2] questions selected by the system (at random) from a pool of development questions being piloted by the GCI team.','<b>','</b>').'</li>'.	'<li>'.&mt('Tests must contain [_1]four[_2] mandatory questions and at least one item from each of [_1]eleven[_2] other bins.','<b>','</b>').'</li>'.
'</ul>');	'<li>'.&mt('All tests conclude with [_1]two[_2] questions selected by the system (at random) from a pool of development questions being piloted by the GCI team.','<b>','</b>').'</li>'.
	'</ul>');
	}
my $mandleg = &mt('Mandatory Questions');	my $mandleg = &mt('Mandatory Questions');
$r->print(&display_questions(\@mandprobs,'mandatory',$mandleg,\%chosenitems));	$r->print(&display_questions(\@mandprobs,'mandatory',$mandleg,\%chosenitems,$cdom));
for (my $i=0; $i<@bins; $i++) {	for (my $i=0; $i<@bins; $i++) {
my $num = $i+1;	my $num = $i+1;
my $legend = &mt('Bin [_1]',$num);	my $legend = &mt('Bin [_1]',$num);
my $catname = 'bin'.$i;	my $catname = 'bin'.$i;
$r->print(&display_questions($bins[$i],$catname,$legend,\%chosenitems));	$r->print(&display_questions($bins[$i],$catname,$legend,\%chosenitems,$cdom));
}	}
my $optleg = &mt('Optional Questions');	my $optleg = &mt('Optional Questions');
$r->print(&display_questions(\@optional,'optional',$optleg,\%chosenitems));	$r->print(&display_questions(\@optional,'optional',$optleg,\%chosenitems,$cdom));
my $devleg = &mt('Development Questions');	my $devleg = &mt('Development Questions');
$r->print(&display_questions(\@devitems,'development',$devleg,\%chosenitems));	$r->print(&display_questions(\@devitems,'development',$devleg,\%chosenitems,$cdom));
$r->print('<input type="hidden" name="phase" value="storemap" />'.	$r->print('<input type="hidden" name="phase" value="storemap" />'.
'<input type="hidden" name="context" value="'.$context.'" />'.	'<input type="hidden" name="context" value="'.$context.'" />'.
	'<input type="hidden" name="concepttest" value="'.$env{'form.concepttest'}.'" />'.
'<input type="submit" value="'.&mt('Store Problem Selection').'" />'.	'<input type="submit" value="'.&mt('Store Problem Selection').'" />'.
'</form>');	'</form>');
&Apache::lonnet::delenv('request.gcicontext');	&Apache::lonnet::delenv('request.gcicontext');
}	}

sub display_questions {	sub display_questions {
my ($questions,$catname,$catlegend,$chosenitems) = @_;	my ($questions,$catname,$catlegend,$chosenitems,$cdom) = @_;
return unless((ref($questions) eq 'ARRAY') && (ref($chosenitems) eq 'HASH'));	return unless((ref($questions) eq 'ARRAY') && (ref($chosenitems) eq 'HASH'));
my $total = 0;	my $total = 0;
foreach my $item (@{$questions}) {	foreach my $item (@{$questions}) {
Line 276 sub display_questions {	Line 329 sub display_questions {
'value="'.$fixed{$catname}.'" readonly="readonly" />').'</legend>';	'value="'.$fixed{$catname}.'" readonly="readonly" />').'</legend>';
} else {	} else {
$output .= '<legend>'.&mt('[_1]: currently [_2] selected',$catlegend,	$output .= '<legend>'.&mt('[_1]: currently [_2] selected',$catlegend,
'<input type="text" name="'.$countid.'" size="1" value="'.	'<input type="text" name="'.$countid.'" id="'.$countid.'" size="1" value="'.
$total.'" readonly="readonly" />').'</legend>';	$total.'" readonly="readonly" />').'</legend>';
}	}
$output .= '<span id="'.$titleid.'">'.	$output .= '<span id="'.$titleid.'">'.
'<a href="javascript:showQuestions('."'$fieldid','$titleid'".')">'.	'<a href="javascript:showQuestions('."'$fieldid','$titleid'".')">'.
&mt('Show').'</a> ...</span><br />'.	&mt('Show').'</a> ...</span><br />'.
'<div id="'.$fieldid.'">'.	'<div id="'.$fieldid.'" style="display: none">'.
&Apache::loncommon::start_data_table().	&Apache::loncommon::start_data_table().
&Apache::loncommon::start_data_table_header_row();	&Apache::loncommon::start_data_table_header_row();
unless (($catname eq 'development') \|\| ($catname eq 'mandatory')) {	unless (($catname eq 'development') \|\| ($catname eq 'mandatory')) {
Line 292 sub display_questions {	Line 345 sub display_questions {
'</th><th>'.&mt('Preview').'</th>'.	'</th><th>'.&mt('Preview').'</th>'.
&Apache::loncommon::end_data_table_header_row();	&Apache::loncommon::end_data_table_header_row();
foreach my $item (@{$questions}) {	foreach my $item (@{$questions}) {
my $url = &fullurl($item);	my $url = &fullurl($item,$cdom,$catname);
my $title = &Apache::lonnet::metadata($url,'title');	my $title = &Apache::lonnet::metadata($url,'title');
$output .= &Apache::loncommon::start_data_table_row().'<td>';	$output .= &Apache::loncommon::start_data_table_row().'<td>';
if (($catname eq 'mandatory') \|\| ($catname eq 'development')) {	if ($catname eq 'mandatory') {
$output .= '<input type="hidden" name="item'.$item.'" value="checked" />';	$output .= '<input type="hidden" name="item'.$item.'" value="checked" />';
	} elsif ($catname eq 'development') {
	$output .= '<input type="hidden" name="pilot'.$item.'" value="checked" />';
} else {	} else {
$output .= '<input type="checkbox" name="item'.$item.'"';	$output .= '<input type="checkbox" name="item'.$item.'" id="item'.$item.'"';
if ($chosenitems->{$item}) { $output .= ' checked="checked"'; }	if ($chosenitems->{$item}) { $output .= ' checked="checked"'; }
$output .= 'onclick="javascript:countChecked('."'$catname'".');" />'.	$output .= ' onclick="countChecked('."'$catname'".');';
	my $binname;
	if ($prereqs{$item}) {
	for (my $i=0; $i<@bincats; $i++) {
	if ($bincats[$i] eq $probcat{$prereqs{$item}}) {
	$binname = 'bin'.$i;
	last;
	}
	}
	$output .= 'checkPrereqs('."'dep','$item','$prereqs{$item}','$binname'".');';
	} elsif ($revreqs{$item}) {
	for (my $i=0; $i<@bincats; $i++) {
	if ($bincats[$i] eq $probcat{$item}) {
	$binname = 'bin'.$i;
	last;
	}
	}
	$output .= 'checkPrereqs('."'pre','$revreqs{$item}','$item','$binname'".');';
	}
	$output .= '" />'.
'<input type="hidden" name="container'.$item.'" value="'.	'<input type="hidden" name="container'.$item.'" value="'.
$catname.'"></td><td>';	$catname.'"></td><td>';
}	}
$output .= '<b>'.$title.'</b></td>';	$output .= '<b>'.$title.'</b></td>';
my $content=&Apache::lonindexer::showpreview($url);	my $content=&Apache::lonindexer::showpreview($url);
	my $startformtag = '<form name="lonhomework" enctype="multipart/form-data" method="post" action="'.$url.'?inhibitmenu=yes" >';
	my $endtag = '<table><tr><td><input onmouseup="javascript:setSubmittedPart';
	$content =~ s/^\Q$startformtag\E//;
	$content =~ s/\Q$endtag\E.+$//s;
$output .= '<td> '.($content eq '' ? ' ':$content).' </td>'."\n".	$output .= '<td> '.($content eq '' ? ' ':$content).' </td>'."\n".
&Apache::loncommon::end_data_table_row();	&Apache::loncommon::end_data_table_row();
}	}
Line 340 sub evaluate {	Line 418 sub evaluate {
sub mapread_gci {	sub mapread_gci {
my $coursedom=$env{'course.'.$env{'request.course.id'}.'.domain'};	my $coursedom=$env{'course.'.$env{'request.course.id'}.'.domain'};
my $coursenum=$env{'course.'.$env{'request.course.id'}.'.num'};	my $coursenum=$env{'course.'.$env{'request.course.id'}.'.num'};
	my $sequence = &Apache::loncommon::get_citest_map($coursedom);
return	return
&LONCAPA::map::mapread('/uploaded/'.$coursedom.'/'.$coursenum.'/default_1261144274.sequence');	&LONCAPA::map::mapread('/uploaded/'.$coursedom.'/'.$coursenum.'/'.$sequence);
}	}

sub storemap_gci {	sub storemap_gci {
Line 352 sub storemap_gci {	Line 431 sub storemap_gci {
}	}
return ('unauthorized',2) if (($coursedom eq '') \|\| ($coursedom eq '') \|\|	return ('unauthorized',2) if (($coursedom eq '') \|\| ($coursedom eq '') \|\|
(!&Apache::lonnet::allowed('mdc',$coursedom.'_'.$coursenum)));	(!&Apache::lonnet::allowed('mdc',$coursedom.'_'.$coursenum)));
my ($outtext,$errtext)=	my $sequence = &Apache::loncommon::get_citest_map($coursedom);
&LONCAPA::map::storemap('/uploaded/'.$coursedom.'/'.$coursenum.'/default_1261144274.sequence',1);	my ($outtext,$errtext);
	if ($sequence) {
	($outtext,$errtext)=
	&LONCAPA::map::storemap('/uploaded/'.$coursedom.'/'.$coursenum.'/'.$sequence,1);
	}
if ($errtext) { return ($errtext,2); }	if ($errtext) { return ($errtext,2); }
return ($errtext,0);	return ($errtext,0);
}	}

sub chosen_to_map {	sub chosen_to_map {
	my ($cdom) = @_;
my %chosenproblems=();	my %chosenproblems=();
foreach my $item (@chosen) {	foreach my $item (@chosen) {
$chosenproblems{$item}=1;	$chosenproblems{$item}=1;
Line 366 sub chosen_to_map {	Line 450 sub chosen_to_map {
@LONCAPA::map::order=();	@LONCAPA::map::order=();
@LONCAPA::map::resources=();	@LONCAPA::map::resources=();
my $counter = 0;	my $counter = 0;
	my $residx;
for (my $idx=0;$idx<=$#allprobs;$idx++) {	for (my $idx=0;$idx<=$#allprobs;$idx++) {
my $residx=$idx+1;	$residx=$idx+1;
if ($chosenproblems{$allprobs[$idx]}) {	if ($chosenproblems{$allprobs[$idx]}) {
	my $url = &LONCAPA::map::qtunescape(&fullurl($allprobs[$idx],$cdom));
	if (($revreqs{$allprobs[$idx]}) &&
	($chosenproblems{$revreqs{$allprobs[$idx]}})) {
	my $probnum = '_'.$allprobs[$idx].'_'.$revreqs{$allprobs[$idx]};
	$url = &LONCAPA::map::qtunescape(&fullurl($probnum,$cdom));
	} elsif ($prereqs{$allprobs[$idx]}) {
	next;
	}
push(@LONCAPA::map::order,$residx);	push(@LONCAPA::map::order,$residx);
$counter ++;	$counter ++;
my $url = &LONCAPA::map::qtunescape(&fullurl($allprobs[$idx]));
my $name = &LONCAPA::map::qtunescape('Problem '.$counter);	my $name = &LONCAPA::map::qtunescape('Problem '.$counter);
$LONCAPA::map::resources[$residx]=join(':', ($name, $url, 'false', 'normal', 'res'));	$LONCAPA::map::resources[$residx]=join(':', ($name, $url, 'false', 'normal', 'res'));
}	}
}	}
	foreach my $devitem (@development) {
	if ($env{'form.pilot'.$devitem}) {
	my $url = &LONCAPA::map::qtunescape(&fullurl($devitem,$cdom,'development'));
	$residx ++;
	push(@LONCAPA::map::order,$residx);
	$counter ++;
	my $name = &LONCAPA::map::qtunescape('Problem '.$counter);
	$LONCAPA::map::resources[$residx]=join(':', ($name, $url, 'false', 'normal', 'res'));
	}
	}
}	}

sub map_to_chosen {	sub map_to_chosen {
@chosen=();	@chosen=();
foreach my $idx (@LONCAPA::map::order) {	foreach my $idx (@LONCAPA::map::order) {
my ($title,$url)=split(':',$LONCAPA::map::resources[$LONCAPA::map::order[$idx]]);	my ($title,$url)=split(':',$LONCAPA::map::resources[$idx]);
	my $item;
unless ($url eq '') {	unless ($url eq '') {
push(@chosen,$allprobs[$idx-1]);	$item = &item_from_url($url);
	if (($item =~ /^(\d+)_(\d+)$/) && ($prereqs{$2} eq $1)) {
	push(@chosen,($1,$2));
	} else {
	push(@chosen,$item);
	}
}	}
}	}
if (($env{'form.concepttest'} eq 'defchosen') \|\|	if (($env{'form.concepttest'} eq 'defchosen') \|\|
Line 397 sub store {	Line 505 sub store {
if ($env{'form.concepttest'} eq 'defchosen') {	if ($env{'form.concepttest'} eq 'defchosen') {
@chosen = @defchosen;	@chosen = @defchosen;
}	}
my @errors=&checkvalid();	my @errors=&checkvalid($cdom);
if (@errors > 0) {	if (@errors > 0) {
if (($caller eq 'requestcrs') && ($env{'form.concepttest'} eq 'defchosen')) {	if (($caller eq 'requestcrs') && ($env{'form.concepttest'} eq 'defchosen')) {
return 'Invalid concept test.';	return &mt('Invalid concept test.');
} else {	} else {
return;	my $errormsg = '<span class="LC_warning">'.&mt('Invalid concept test:');
	if (@errors > 1) {
	$errormsg .= '<ul><li>'.join('</li><li>',@errors).'</li></ul>';
	} else {
	$errormsg .= '<br />'.$errors[0];
	}
	$errormsg .= '</span>';
	return $errormsg;
}	}
}	}
&chosen_to_map();	&chosen_to_map();
Line 428 sub store {	Line 543 sub store {
}	}

sub load {	sub load {
	my ($cdom) = @_;
&mapread_gci();	&mapread_gci();
&map_to_chosen();	&map_to_chosen();
if (@chosen > 0) {	if (@chosen > 0) {
my @errors=&checkvalid();	my @errors=&checkvalid($cdom);
if ($#errors>1) { @chosen=@defchosen; }	if ($#errors>1) { @chosen=@defchosen; }
}	}
}	}
Line 456 sub current_parms {	Line 572 sub current_parms {
sub store_dates_parms {	sub store_dates_parms {
my ($cdom,$cnum) = @_;	my ($cdom,$cnum) = @_;
my $topsymb = '___0___uploaded/'.$cdom.'/'.$cnum.'/default.sequence';	my $topsymb = '___0___uploaded/'.$cdom.'/'.$cnum.'/default.sequence';
	my $tz_change;
	my $timezone = &Apache::lonlocal::gettimezone();
	if ($env{'form.timezone'} ne '') {
	if (&Apache::lonlocal::gettimezone($env{'form.timezone'}) ne 'local') {
	if ($timezone ne $env{'form.timezone'}) {
	$tz_change = 1;
	$timezone = $env{'form.timezone'};
	}
	}
	}
my ($opendate,$duedate) =	my ($opendate,$duedate) =
&Apache::lonuserutils::get_dates_from_form('opendate','duedate');	&Apache::lonuserutils::get_dates_from_form('opendate','duedate',$timezone);
my %dates = (	my %dates = (
opendate => {	opendate => {
value => $opendate,	value => $opendate,
Line 475 sub store_dates_parms {	Line 601 sub store_dates_parms {
'0_'.$date,14,$dates{$date}{'value'},	'0_'.$date,14,$dates{$date}{'value'},
$dates{$date}{'type'},undef,$cdom);	$dates{$date}{'type'},undef,$cdom);
}	}
	if ($tz_change) {
	&Apache::lonnet::appenv({'course.'.$env{'request.course.id'}.'.timezone' => $timezone});
	}
my $output = &mt('Open and Close dates set for test items').'<ul>'.	my $output = &mt('Open and Close dates set for test items').'<ul>'.
'<li>'.&mt('Concept Test Questions open:').' '.	'<li>'.&mt('Concept Test Questions open:').' '.
&Apache::lonlocal::locallocaltime($opendate).'</li>'.	&Apache::lonlocal::locallocaltime($opendate,$timezone).'</li>'.
'<li>'.&mt('Concept Test Questions close:').' '.	'<li>'.&mt('Concept Test Questions close:').' '.
&Apache::lonlocal::locallocaltime($duedate).'</li>'.	&Apache::lonlocal::locallocaltime($duedate,$timezone).'</li>'.
'</ul>';	'</ul>';
return $output;	return $output;
}	}
Line 491 sub get_submissions_count {	Line 620 sub get_submissions_count {
my $itemserror = '<span class="LC_warning">'.&mt('An error occurred retrieving information about the course.').'<br />'.&mt('It is recommended that you [_1]re-select the course[_2].','<a href="/adm/roles">','</a>').'</span>';	my $itemserror = '<span class="LC_warning">'.&mt('An error occurred retrieving information about the course.').'<br />'.&mt('It is recommended that you [_1]re-select the course[_2].','<a href="/adm/roles">','</a>').'</span>';
return $itemserror;	return $itemserror;
}	}
my @allres=$navmap->retrieveResources('/uploaded/'.$cdom.'/'.$cnum.'/default_1261144274.sequence',sub {if ($_[0]->is_problem) { $_[0]->parts();} return 1;});	my (%resourcetracker,$submissioncount,@allres);
my (%resourcetracker,$submissioncount);	my $sequence = &Apache::loncommon::get_citest_map($cdom);
my %resourcetracker = &Apache::lonnet::dump('nohist_resourcetracker',	@allres=$navmap->retrieveResources('/uploaded/'.$cdom.'/'.$cnum.'/'.$sequence,sub {if ($_[0]->is_problem) { $_[0]->parts();} return 1;});
$cdom,$cnum);	%resourcetracker = &Apache::lonnet::dump('nohist_resourcetracker',
	$cdom,$cnum);
foreach my $resource (@allres) {	foreach my $resource (@allres) {
my $symb = $resource->symb();	my $symb = $resource->symb();
my @parts = @{$resource->parts()};	my @parts = @{$resource->parts()};
Line 514 sub get_submissions_count {	Line 644 sub get_submissions_count {
}	}

sub builder_javascript {	sub builder_javascript {
	my ($cdom) = @_;
my %lt = &Apache::lonlocal::texthash(	my %lt = &Apache::lonlocal::texthash(
show => 'Show',	show => 'Show',
hide => 'Hide',	hide => 'Hide',
);	);
	my $prereqjs = "
	function checkPrereqs(caller,item,prereq,binname) {
	var changedPrereq = 0;
	element = document.getElementById('item'+item);
	if (element.checked == false) {
	return;
	} else {
	prereqelement = document.getElementById('item'+prereq);
	if (!prereqelement.checked) {
	prereqelement.checked = true;
	changedPrereq = 1;
	countChecked(binname);
	}
	}
	";

	my ($hasdep,$prereq,$hasdeptitle,$prereqtitle) = ('','','','');
	foreach my $item (sort(keys(%prereqs))) {
	$hasdep .= "'$item',";
	$prereq .= "'$prereqs{$item}',";
	my $url = &fullurl($item,$cdom);
	$hasdeptitle .= "'".&Apache::lonnet::metadata($url,'title')."',";
	my $purl = &fullurl($prereqs{$item},$cdom);
	$prereqtitle .= "'".&Apache::lonnet::metadata($purl,'title')."',";
	}
	$hasdep =~ s/,$//;
	$prereq =~ s/,$//;
	$hasdeptitle =~ s/,$//;
	$prereqtitle =~ s/,$//;

	$prereqjs .= <<"ENDFN";

	var hasDeps = Array($hasdep);
	var preReqs = Array($prereq);
	var hasDepTitles = Array($hasdeptitle);
	var preReqTitles = Array($prereqtitle);
	for (var i=0; i<hasDeps.length; i++) {
	if (hasDeps[i] == item) {
	var msg = hasDepTitles[i]+' question has a prerequisite: '+preReqTitles[i]+'.\\nThe two questions will appear together in a composite question.';
	if (changedPrereq == 1) {
	msg = msg+'\\n\\nAs the prerequisite was not checked, inclusion of '+hasDepTitles[i]+' has now caused '+preReqTitles[i]+' to also be checked automatically.';
	}
	if (caller == 'pre') {
	msg = msg +'\\n\\nIf you do not wish to include '+preReqTitles[i]+' you will first need to uncheck '+hasDepTitles[i]+', then uncheck '+preReqTitles[i]+' again.'
	}
	alert(msg);
	break;
	}
	}
	return;
	}

	ENDFN

return <<ENDJS;	return <<ENDJS;
function showQuestions(content,title) {	function showQuestions(content,title) {
document.getElementById(content).style.display = "";	document.getElementById(content).style.display = "";
Line 531 function hideQuestions(content,title) {	Line 716 function hideQuestions(content,title) {
return;	return;
}	}

function setInitialVisibility() {
if (document.getElementById('GCI_mandatory_q') == null) {
return;
}
document.getElementById('GCI_mandatory_q').style.display = "none";
document.getElementById('GCI_bin0_q').style.display = "none";
document.getElementById('GCI_bin1_q').style.display = "none";
document.getElementById('GCI_bin2_q').style.display = "none";
document.getElementById('GCI_bin3_q').style.display = "none";
document.getElementById('GCI_bin4_q').style.display = "none";
document.getElementById('GCI_bin5_q').style.display = "none";
document.getElementById('GCI_bin6_q').style.display = "none";
document.getElementById('GCI_bin7_q').style.display = "none";
document.getElementById('GCI_bin8_q').style.display = "none";
document.getElementById('GCI_bin9_q').style.display = "none";
document.getElementById('GCI_bin10_q').style.display = "none";
document.getElementById('GCI_optional_q').style.display = "none";
document.getElementById('GCI_development_q').style.display = "none";
}

function countChecked(binname) {	function countChecked(binname) {
var count = 0;	var count = 0;
for (var i=0; i<document.selecteditems.elements.length; i++) {	for (var i=0; i<document.selecteditems.elements.length; i++) {
Line 558 function countChecked(binname) {	Line 723 function countChecked(binname) {
if (document.selecteditems.elements[i].value == binname) {	if (document.selecteditems.elements[i].value == binname) {
var itemname = document.selecteditems.elements[i].name;	var itemname = document.selecteditems.elements[i].name;
var itemnum = itemname.substr(9);	var itemnum = itemname.substr(9);
if (document.selecteditems.elements['item'+itemnum].checked) {	element = document.getElementById('item'+itemnum);
	if (element.checked) {
count ++;	count ++;
}	}
}	}
}	}
}	}
document.selecteditems.elements['GCI_'+binname+'_count'].value = count;	countelement = document.getElementById('GCI_'+binname+'_count');
	countelement.value = count;
}	}

function validTestCheck() {	function validTestCheck() {
Line 572 function validTestCheck() {	Line 739 function validTestCheck() {
for (var i=0; i<11; i++) {	for (var i=0; i<11; i++) {
var binname = 'GCI_bin'+i+'_count';	var binname = 'GCI_bin'+i+'_count';
var j = i+1;	var j = i+1;
if (document.selecteditems.elements[binname].value < 1) {	countelement = document.getElementById(binname);
	if (countelement.value < 1) {
empty = empty +' '+j;	empty = empty +' '+j;
}	}
}	}
Line 589 function setDocsPhase() {	Line 757 function setDocsPhase() {
if (document.choices.concepttest[i].checked) {	if (document.choices.concepttest[i].checked) {
if (document.choices.concepttest[i].value == 'defchosen') {	if (document.choices.concepttest[i].value == 'defchosen') {
document.choices.phase.value = 'storemap';	document.choices.phase.value = 'storemap';
alert("Setting value for phase to "+document.choices.phase.value);

}	}
}	}
}	}
Line 598 function setDocsPhase() {	Line 764 function setDocsPhase() {
return;	return;
}	}

	$prereqjs

ENDJS	ENDJS

}	}

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>

Removed from v.1.5
changed lines
	Added in v.1.17