version 1.246, 2005/08/30 01:25:53
|
version 1.252, 2005/09/28 13:29:17
|
Line 1921 sub crsenv {
|
Line 1921 sub crsenv {
|
'disablesigfigs' |
'disablesigfigs' |
=> '<b>'.&mt('Disable checking of Significant Figures').'</b><br />'. |
=> '<b>'.&mt('Disable checking of Significant Figures').'</b><br />'. |
' ('.&mt('"[_1]" to disable, anything else if not','<tt>yes</tt>').')', |
' ('.&mt('"[_1]" to disable, anything else if not','<tt>yes</tt>').')', |
|
'disableexampointprint' |
|
=> '<b>'.&mt('Disable automatically printing point values onto exams.').'</b><br />'. |
|
' ('.&mt('"[_1]" to disable, anything else if not','<tt>yes</tt>').')', |
'tthoptions' |
'tthoptions' |
=> '<b>'.&mt('Default set of options to pass to tth/m when converting tex').'</b>' |
=> '<b>'.&mt('Default set of options to pass to tth/m when converting tex').'</b>' |
); |
); |
Line 1947 sub crsenv {
|
Line 1950 sub crsenv {
|
'default_enrollment_start_date', |
'default_enrollment_start_date', |
'default_enrollment_end_date', |
'default_enrollment_end_date', |
'tthoptions', |
'tthoptions', |
'disablesigfigs' |
'disablesigfigs', |
|
'disableexampointprint' |
); |
); |
foreach my $parameter (sort(keys(%values))) { |
foreach my $parameter (sort(keys(%values))) { |
unless (($parameter =~ m/^internal\./)||($parameter =~ m/^metadata\./)) { |
unless (($parameter =~ m/^internal\./)||($parameter =~ m/^metadata\./)) { |
Line 2189 sub listdata {
|
Line 2193 sub listdata {
|
my $pointer=0; |
my $pointer=0; |
$tableopen=0; |
$tableopen=0; |
my $foundkeys=0; |
my $foundkeys=0; |
|
my %keyorder=&standardkeyorder(); |
foreach my $thiskey (sort { |
foreach my $thiskey (sort { |
if ($sortorder eq 'realmstudent') { |
if ($sortorder eq 'realmstudent') { |
my ($astudent,$arealm)=($a=~/^$env{'request.course.id'}\.([^\.]+)\.(.+)\.[^\.]+$/); |
my ($astudent,$arealm)=($a=~/^\Q$env{'request.course.id'}\E\.\[([^\.]+)\]\.(.+)\.[^\.]+$/); |
my ($bstudent,$brealm)=($b=~/^$env{'request.course.id'}\.([^\.]+)\.(.+)\.[^\.]+$/); |
my ($bstudent,$brealm)=($b=~/^\Q$env{'request.course.id'}\E\.\[([^\.]+)\]\.(.+)\.[^\.]+$/); |
if (!defined($astudent) && !defined($bstudent) && |
if (!defined($astudent)) { |
!defined($arealm) && !defined($brealm)) { |
($arealm)=($a=~/^\Q$env{'request.course.id'}\E\.(.+)$/); |
($arealm)=($a=~/^$env{'request.course.id'}\.(.+)\.[^\.]+$/); |
} |
($brealm)=($b=~/^$env{'request.course.id'}\.(.+)\.[^\.]+$/); |
if (!defined($bstudent)) { |
|
($brealm)=($b=~/^\Q$env{'request.course.id'}\E\.(.+)$/); |
|
} |
|
$arealm=~s/\.type//; |
|
my ($ares, $aparm) = ($arealm=~/^(.*)\.(.*)$/); |
|
$aparm=$keyorder{'parameter_0_'.$aparm}; |
|
$brealm=~s/\.type//; |
|
my ($bres, $bparm) = ($brealm=~/^(.*)\.(.*)$/); |
|
$bparm=$keyorder{'parameter_0_'.$bparm}; |
|
if ($ares eq $bres) { |
|
if (defined($aparm) && defined($bparm)) { |
|
($aparm <=> $bparm); |
|
} elsif (defined($aparm)) { |
|
-1; |
|
} elsif (defined($bparm)) { |
|
1; |
|
} else { |
|
($arealm cmp $brealm) || ($astudent cmp $bstudent); |
|
} |
|
} else { |
|
($arealm cmp $brealm) || ($astudent cmp $bstudent); |
} |
} |
($arealm cmp $brealm) || ($astudent cmp $bstudent); |
|
} else { |
} else { |
$a cmp $b; |
$a cmp $b; |
} |
} |
} keys %{$listdata}) { |
} keys %{$listdata}) { |
|
|
if ($$listdata{$thiskey.'.type'}) { |
if ($$listdata{$thiskey.'.type'}) { |
my $thistype=$$listdata{$thiskey.'.type'}; |
my $thistype=$$listdata{$thiskey.'.type'}; |
if ($$resourcedata{$thiskey.'.type'}) { |
if ($$resourcedata{$thiskey.'.type'}) { |
Line 2725 ENDMAINFORMHEAD
|
Line 2750 ENDMAINFORMHEAD
|
return; |
return; |
} |
} |
### Set instructor defined metadata |
### Set instructor defined metadata |
|
sub output_row { |
|
my ($field_name) = @_; |
|
my $output; |
|
my $meta_hash_ref=$env{'course.'.$env{'request.course.id'}.'.metadata.'.$field_name}; |
|
my $values=$$meta_hash_ref{'values'}; |
|
my $checked; |
|
unless (defined($$meta_hash_ref{'active'})) { |
|
$$meta_hash_ref{'active'} = 'no'; |
|
$$meta_hash_ref{'stu_add_values'} = 'yes'; |
|
$$meta_hash_ref{'values'} = 'Type a list of values separated by commas.'; |
|
$$meta_hash_ref{'stu_pick_many'} = 'yes'; |
|
} |
|
$output.='<tr><td><strong>'.$field_name.'</strong></td>'; |
|
$output.='<td><input name="'.$field_name.'_values" type="text" value="'.$$meta_hash_ref{'values'}.'" /></td>'; |
|
if ($$meta_hash_ref{'stu_add_values'}eq'yes') { |
|
$checked = ' CHECKED '; |
|
} else { |
|
$checked = ' '; |
|
} |
|
$output.='<td><center><input type="checkbox" name="'.$field_name.'_onlyone"" value="one"'.$checked.' /></center></td>'; |
|
if ($$meta_hash_ref{'stu_pick_many'}eq'yes') { |
|
$checked = ' CHECKED '; |
|
} else { |
|
$checked = ' '; |
|
} |
|
$output.='<td><input type="checkbox" name="'.$field_name.'_stuadd" value="one"'.$checked.' /></td>'; |
|
$output.='</tr>'; |
|
|
|
return ($output); |
|
} |
sub setinstmeta { |
sub setinstmeta { |
my ($r)=@_; |
my ($r)=@_; |
my $next_meta; |
my $next_meta; |
my $output; |
my $output; |
my $item_num; |
my $item_num; |
my $put_result; |
my $put_result; |
if ($env{'form.serial'}) { |
|
$next_meta = $env{'form.serial'}; |
|
} else { |
|
$next_meta = 1; |
|
} |
|
$r->print(&Apache::lonxml::xmlbegin()); |
$r->print(&Apache::lonxml::xmlbegin()); |
$r->print('<head> |
$r->print('<head> |
<title>LON-CAPA Set Instructor Metadata</title> |
<title>LON-CAPA Set Instructor Metadata</title> |
Line 2746 sub setinstmeta {
|
Line 2796 sub setinstmeta {
|
my $dom = $env{'course.'.$env{'request.course.id'}.'.domain'}; |
my $dom = $env{'course.'.$env{'request.course.id'}.'.domain'}; |
my $crs = $env{'course.'.$env{'request.course.id'}.'.num'}; |
my $crs = $env{'course.'.$env{'request.course.id'}.'.num'}; |
my $key_base = $env{'course.'.$env{'request.course.id'}.'.metadata.'}; |
my $key_base = $env{'course.'.$env{'request.course.id'}.'.metadata.'}; |
|
my $save_field = ''; |
|
my %meta_hash; |
|
if ($env{'form.instmeta'}) { |
|
foreach my $field (sort %env) { |
|
if ($field=~m/^form.(.+)_(.+)$/) { |
|
my $meta_field = $1; |
|
my $meta_key = $2; |
|
if ($save_field eq $meta_field) { |
|
%meta_hash = {$meta_key=>[$env{$field}]}; |
|
} else { |
|
if ($save_field ne '') { |
|
%meta_hash = {active=>'yes'}; |
|
my $value = \%meta_hash; |
|
my $name = $save_field; |
|
$r->print('Saving '.$name.' meta<br />'); |
|
$put_result = &Apache::lonnet::put('environment', |
|
{$name=>$value},$dom,$crs); |
|
} |
|
$save_field = $meta_field; |
|
%meta_hash = {$meta_key=>[$env{$field}]}; |
|
} |
|
} |
|
|
|
|
|
} |
|
%meta_hash = {active=>'yes'}; |
|
my $value = \%meta_hash; |
|
my $name = $save_field; |
|
$r->print('Saving '.$name.' meta<br />'); |
|
$put_result = &Apache::lonnet::put('environment', |
|
{$name=>$value},$dom,$crs); |
|
} |
foreach my $field (%env) { |
foreach my $field (%env) { |
# start by looking for populated fields |
# start by looking for populated fields |
if ($field=~m/type(\d+)/) { |
if ($field=~m/type(\d+)/) { |
my $item_num = $1; |
my $name; |
my $name = 'metadata.'.$item_num.'.type'; |
my $value; |
my $value = $env{'form.type'.$item_num}; |
|
$put_result = &Apache::lonnet::put('environment', |
$put_result = &Apache::lonnet::put('environment', |
{$name=>$value},$dom,$crs); |
{$name=>$value},$dom,$crs); |
$name = 'metadata.'.$item_num.'.values'; |
|
$value = $env{'form.values'.$item_num}; |
|
$put_result = &Apache::lonnet::put('environment', |
$put_result = &Apache::lonnet::put('environment', |
{$name=>$value},$dom,$crs); |
{$name=>$value},$dom,$crs); |
} |
} |
if ($field=~m/newfield/) { |
if ($field=~m/newfield/) { |
my $item_num = $env{'form.serial'}; |
my $name = 'metadata.'.$env{'form.titlenew'}; |
my $name = 'metadata.'.$item_num.'.type'; |
my %meta_hash = {values=>[$env{'form.valuesnew'}], |
my $value = $env{'form.typenew'}; |
allow_pick=>'many', |
$put_result = &Apache::lonnet::put('environment', |
allow_type=>'no'}; |
{$name=>$value},$dom,$crs); |
|
$name = 'metadata.'.$item_num.'.values'; |
my $value = \%meta_hash; |
$value = $env{'form.valuesnew'}; |
|
$put_result = &Apache::lonnet::put('environment', |
$put_result = &Apache::lonnet::put('environment', |
{$name=>$value},$dom,$crs); |
{$name=>$value},$dom,$crs); |
$name = 'metadata.'.$item_num.'.title'; |
|
$value = $env{'form.titlenew'}; |
|
$put_result = &Apache::lonnet::put('environment', |
|
{$name=>$value},$dom,$crs); |
|
|
|
} |
} |
|
|
|
|
} |
} |
&Apache::lonnet::coursedescription($env{'request.course.id'}); |
&Apache::lonnet::coursedescription($env{'request.course.id'}); |
foreach my $key (sort keys %env) { |
$output.= &output_row("Title"); |
if ($key=~m/^course\.$env{'request.course.id'}\.metadata\.\d+\.title$/) { |
$output.= &output_row("Subject"); |
$key=~m/(^course\.$env{'request.course.id'}\.metadata\.)(\d+)\.title/; |
$output.= &output_row("Keywords"); |
$key_base = $1; |
# foreach my $key (sort keys %env) { |
$item_num = $2; |
# if ($key=~m/^course\.$env{'request.course.id'}\.metadata\.(.+)$/) { |
if ($item_num ge $next_meta) { |
# my $meta_data_item = $1; |
$next_meta = $item_num + 1; |
# my $meta_hash=$env{$key}; |
} |
# # keys are 'values', stu_pick_many, stu_add_values, active |
$output.='<tr><td>'.$env{$key}.'</td>'; |
# |
$output.='<td>Select one: <input type="radio" name="type'.$item_num.'" value="one" /><br />'; |
# $output.='<tr><td>'.$meta_data_item.'</td>'; |
$output.='Select many: <input type="radio" name="type'.$item_num.'" value="many" /></td>'; |
# $output.='<td>Select one: <input type="checkbox" name="" value="one" /><br />'; |
$output.='<td><input name="values'.$item_num.'" type="text" value="'.$env{$key_base.$item_num.'.values'}.'" /></td></tr>'; |
# $output.='Select many: <input type="checkbox" name="type" value="many" /></td>'; |
} |
# $output.='<td><input name="values" type="text" value="$env{$key_base.$item_num.'.'" /></td></tr>'; |
} |
# } |
$output.='<tr><td><i>Create new instructor metadata item</i><br />'; |
# } |
$output.='<input type="text" name="titlenew" /></td>'; |
# $output.='<tr><td><i>Create new instructor metadata item</i><br />'; |
$output.='<td>Select one: <input type="radio" name="typenew" value="one" /><br />'; |
# $output.='<input type="text" name="titlenew" /></td>'; |
$output.='Select many: <input type="radio" name="typenew" value="many" /></td>'; |
# $output.='<td>students must pick only one: <input type="checkbox" name="pickonenew" value="one" /><br />'; |
$output.='<td><input name="valuesnew" type="text" value="" /></td></tr>'; |
# $output.='Allow student to type extra info: <input type="checkbox" name="typeextranew" value="extra" /></td>'; |
$output.='<input type="hidden" name="serial" value="'.$next_meta.'" />'; |
# $output.='<td><input name="valuesnew" type="text" value="" /></td></tr>'; |
$output.='<input type="hidden" name="state" value="save" /></tr>'; |
# $output.='<input type="hidden" name="serial" value="'.$next_meta.'" />'; |
|
# $output.='<input type="hidden" name="state" value="save" /></tr>'; |
$r->print(<<ENDenv); |
$r->print(<<ENDenv); |
<form method="post" action="/adm/parmset?action=setinstmeta" name="form"> |
<form method="post" action="/adm/parmset?action=setinstmeta" name="form"> |
|
|
<p> |
<p> |
<table border=2> |
<table border=2> |
<tr><th>Title</th><th>Options</th><th>Choices</th></tr> |
<tr><th>Metadata Item</th><th>Values</th><th>Only One Choice</th><th>Student Can Add Choices</th></tr> |
$output |
$output |
</table> |
</table> |
<input type="submit" name="instmeta" value="Update Instructor Metadata"> |
<input type="submit" name="instmeta" value="Update Instructor Metadata"> |