version 1.244, 2005/08/29 22:57:09
|
version 1.253, 2005/09/28 23:19:25
|
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 ($r, $field_name) = @_; |
|
my $output; |
|
my $active=$env{'course.'.$env{'request.course.id'}.'.metadata.'.$field_name.'.active'}; |
|
my $onlyone=$env{'course.'.$env{'request.course.id'}.'.metadata.'.$field_name.'.onlyone'}; |
|
my $stuadd=$env{'course.'.$env{'request.course.id'}.'.metadata.'.$field_name.'.stuadd'}; |
|
my $values=$env{'course.'.$env{'request.course.id'}.'.metadata.'.$field_name.'.values'}; |
|
my $checked; |
|
unless (defined($active)) { |
|
$active = 'no'; |
|
$stuadd = 'yes'; |
|
$values = 'Type a list of values separated by commas.'; |
|
$onlyone = 'no'; |
|
} |
|
$output.='<tr><td><strong>'.$field_name.'</strong></td>'; |
|
$output.='<td><input name="'.$field_name.'_values" type="text" value="'.$values.'" /></td>'; |
|
if ($onlyone eq 'no') { |
|
$checked = ' CHECKED '; |
|
} else { |
|
$checked = ' '; |
|
} |
|
$output.='<td><center><input type="checkbox" name="'.$field_name.'_onlyone"" value="yes"'.$checked.' /></center></td>'; |
|
if ($stuadd eq 'yes') { |
|
$checked = ' CHECKED '; |
|
} else { |
|
$checked = ' '; |
|
} |
|
$output.='<td><input type="checkbox" name="'.$field_name.'_stuadd" value="yes"'.$checked.' /></td>'; |
|
$output.='</tr>'; |
|
return ($output); |
|
} |
sub setinstmeta { |
sub setinstmeta { |
my ($r)=@_; |
my ($r)=@_; |
my $next_meta; |
my $next_meta; |
my $output; |
my $output; |
if ($env{'form.serial'}) { |
my $item_num; |
$next_meta = $env{'form.serial'}; |
my $put_result; |
} 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 2744 sub setinstmeta {
|
Line 2797 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.'}; |
if ($env{'form.state'}eq 'add') { |
my $save_field = ''; |
$r->print('<strong>Compose a new metadata item:</strong><br />'); |
my $stuadd; |
$r->print('<form method="post" action="/adm/parmset">'); |
my $onlyone; |
$r->print ('Title of item: '.&Apache::lonhtmlcommon::textbox("title",undef,undef,undef).'<br />'); |
my $active; |
$r->print ('List if items (comma separated): '.&Apache::lonhtmlcommon::textbox("values",undef,undef,undef).'<br />'); |
if ($env{'form.instmeta'}) { |
$r->print ('Select one: <input type="radio" name="type" value="one"><br />'); |
foreach my $field (sort %env) { |
$r->print ('Select many: <input type="radio" name="type" value="many"><br />'); |
if ($field=~m/^form.(.+)_(.+)$/) { |
$r->print('<input type="hidden" name="serial" value="'.$next_meta.'" />'); |
my $meta_field = $1; |
$r->print('<input type="hidden" name="action" value="setinstmeta" />'); |
my $meta_key = $2; |
$r->print('<input type="hidden" name="state" value="save" />'); |
if ($save_field ne $meta_field) { |
$r->print('<input type="submit" value="Save Metadata">'); |
$save_field = $meta_field; |
$r->print('</form>'); |
if ($env{'form.'.$meta_field.'_stuadd'}) { |
} elsif ($env{'form.state'}eq 'save') { |
$stuadd='yes'; |
$r->print('Here we save the metadata'); |
} else { |
$key_base.=$env{'form.serial'}.'.'; |
$stuadd='no'; |
$r->print('The title: '.$env{'form.title'}.'<br>'); |
} |
$r->print('The values: '.$env{'form.values'}.'<br>'); |
if ($env{'form.'.$meta_field.'_onlyone'}) { |
$r->print('The type: '.$env{'form.type'}.'<br>'); |
$onlyone='no'; |
$r->print('The number: '.$env{'form.serial'}.'<br>'); |
} else { |
my $name = 'metadata.'.$env{'form.serial'}.'.title'; |
$onlyone='yes'; |
my $value = $env{'form.title'}; |
} |
my $put_result = &Apache::lonnet::put('environment', |
$active='yes'; |
{$name=>$value},$dom,$crs); |
my $name = 'metadata.'.$save_field; |
$r->print('the put result was: '.$put_result.'<br />'); |
$put_result = &Apache::lonnet::put('environment', |
$name = 'metadata.'.$env{'form.serial'}.'.type'; |
{'metadata.'.$meta_field.'.stuadd'=>$stuadd, |
$value = $env{'form.type'}; |
'metadata.'.$meta_field.'.onlyone'=>$onlyone, |
$put_result = &Apache::lonnet::put('environment', |
'metadata.'.$meta_field.'.active'=>$active, |
{$name=>$value},$dom,$crs); |
'metadata.'.$meta_field.'.values'=>$env{'form.'.$meta_field.'_values'}, |
$name = 'metadata.'.$env{'form.serial'}.'.values'; |
},$dom,$crs); |
$value = $env{'form.values'}; |
|
$put_result = &Apache::lonnet::put('environment', |
|
{$name=>$value},$dom,$crs); |
|
&Apache::lonnet::coursedescription($env{'request.course.id'}); |
|
} else { |
|
|
|
foreach my $key (sort keys %env) { |
|
if ($key=~m/^course\.$env{'request.course.id'}\.metadata\.\d+\.title$/) { |
|
$key=~m/^course\.$env{'request.course.id'}\.metadata\.(\d+)\.title/; |
|
|
|
if ($1 ge $next_meta) { |
|
$next_meta = $1 + 1; |
|
} |
} |
$output.='<tr><td>'.$env{$key}.'</td>'; |
|
$output.='<td>Select one: <input type="radio" name="type" value="one" /><br />'; |
|
$output.='Select many: <input type="radio" name="type" value="many" /></td>'; |
|
$output.='<td><input type="text" value="'.$env{$key.'.values'}.'" /></td></tr>'; |
|
} |
} |
} |
} |
$output.='<tr><td><i>Create new instructor metadata item</i><br />'; |
|
$output.='<input type="text" name="instmeta" /></td><td>Options here</td>'; |
} |
$output.='<td><input type="hidden" name="serial" value="'.$next_meta.'" /></td></tr>'; |
foreach my $field (%env) { |
|
# start by looking for populated fields |
|
if ($field=~m/type(\d+)/) { |
|
my $name; |
|
my $value; |
|
# $put_result = &Apache::lonnet::put('environment', |
|
# {$name=>$value},$dom,$crs); |
|
# $put_result = &Apache::lonnet::put('environment', |
|
# {$name=>$value},$dom,$crs); |
|
} |
|
if ($field=~m/newfield/) { |
|
my $name = 'metadata.'.$env{'form.titlenew'}; |
|
my %meta_hash = {values=>[$env{'form.valuesnew'}], |
|
allow_pick=>'many', |
|
allow_type=>'no'}; |
|
|
|
my $value = \%meta_hash; |
|
# $put_result = &Apache::lonnet::put('environment', |
|
# {$name=>$value},$dom,$crs); |
|
} |
|
} |
|
&Apache::lonnet::coursedescription($env{'request.course.id'}); |
|
$output.= &output_row($r, "Title"); |
|
$output.= &output_row($r, "Subject"); |
|
$output.= &output_row($r, "Keywords"); |
$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"> |
Line 2808 sub setinstmeta {
|
Line 2869 sub setinstmeta {
|
|
|
ENDenv |
ENDenv |
|
|
} |
|
$r->print('</body> |
$r->print('</body> |
</html>'); |
</html>'); |
return 'ok'; |
return 'ok'; |