--- loncom/interface/lonparmset.pm 2006/09/08 20:49:19 1.335 +++ loncom/interface/lonparmset.pm 2006/11/15 22:33:13 1.346 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Handler to set parameters for assessments # -# $Id: lonparmset.pm,v 1.335 2006/09/08 20:49:19 banghart Exp $ +# $Id: lonparmset.pm,v 1.346 2006/11/15 22:33:13 banghart Exp $ # # Copyright Michigan State University Board of Trustees # @@ -1514,7 +1514,7 @@ sub assessparms { $message="\n
\n".&mt("Full Name").": ".
$name{'firstname'}.' '.$name{'middlename'}.' '
.$name{'lastname'}.' '.$name{'generation'}.
- "
\n".&mt('ID').": ".$name{'id'}.'
';
+ "
\n".&mt('ID').": ".$name{'id'}.'
';
}
@usersgroups = &Apache::lonnet::get_users_groups(
$udom,$uname,$env{'request.course.id'});
@@ -1562,7 +1562,7 @@ sub assessparms {
foreach ('tolerance','date_default','date_start','date_end',
'date_interval','int','float','string') {
$r->print('');
+ $env{'form.recent_'.$_}.'" name="recent_'.$_.'" />');
}
if (!$pssymb) {
@@ -1639,7 +1639,7 @@ sub assessparms {
);
$r->print(<
$output
-
+
$lt{'csv'}
+
($csuname $lt{'at'} $csudom)$lt{'csv'}
($csuname $lt{'at'} $csudom)$lt{'ic'} $lt{'rl'}
$lt{'ic'}
@@ -1740,8 +1740,8 @@ ENDTABLEHEADFOUR
"$title");
+ "', 'metadatafile', '450', '500', 'no', 'yes');\"".
+ " target=\"_self\">$title");
if ($thistitle) {
$r->print(' ('.$thistitle.')');
@@ -2005,7 +2005,7 @@ sub crsenv {
('environment',
{'top level map backup '.$bkuptime => $tmp[1] },
$dom,$crs).
- '
';
+ '
';
}
#
# Deal with modified default spreadsheets
@@ -2116,7 +2116,7 @@ sub crsenv {
'default_xml_style' => ''.&mt('Default XML Style File').' '.
'$SelectStyleFile
",
+ ",'sty')\">$SelectStyleFile
",
'question.email' => ''.&mt('Feedback Addresses for Resource Content Question').
'
(user:domain,'.
'user:domain(section;section;...;*;...),...)',
@@ -2193,7 +2193,7 @@ sub crsenv {
' Tabloid [11x17 in], Executive [7 1/2x10 in], A2 [420x594 mm],'.
' A3 [297x420 mm], A4 [210x297 mm], A5 [148x210 mm], A6 [105x148 mm])',
'print_header_format'
- => 'Print header format; substitutions: %n student name %c course id %a assignment',
+ => 'Print header format; substitutions: %n student name %c course id %a assignment note, numbers after the % limit the field size',
'anonymous_quiz'
=> ''.&mt('Anonymous quiz/exam').'
'.
' ('.&mt('yes').' '.&mt('to avoid print students names').' )',
@@ -3188,45 +3188,166 @@ ENDMAINFORMHEAD
}
### Set portfolio metadata
sub output_row {
- my ($r, $field_name, $field_text) = @_;
+ my ($r, $field_name, $field_text, $added_flag, $alt_row) = @_;
+ my $row_class;
+ if ($alt_row) {
+ $row_class = ' class="LC_metadata_light" ';
+ } else {
+ $row_class = ' class="LC_metadata_dark" ';
+ }
my $output;
+ $output = "";
my $options=$env{'course.'.$env{'request.course.id'}.'.metadata.'.$field_name.'.options'};
my $values=$env{'course.'.$env{'request.course.id'}.'.metadata.'.$field_name.'.values'};
- unless (defined($options)) {
+ if (!defined($options)) {
$options = 'active,stuadd';
$values = '';
}
- $output.=''.$field_text.':';
- $output.='
';
-
- my @options= ( ['active', 'Show to student'],
+ if (!($options =~ /deleted/)) {
+ $output = "";
+ $output .= ' \n";
+ my @options= ( ['active', 'Show to student'],
['onlyone','Student may select only one choice'],
['stuadd', 'Student may type choices']);
- foreach my $opt (@options) {
- my $checked = ($options =~ m/$opt->[0]/) ? ' checked="checked" ' : '' ;
- $output.=(' 'x5).' ';
+ $output .= ' ';
+ $output .= "
';
+ if ($added_flag) {
+ push @options,['deleted', 'Delete Metadata Field'];
+ }
+ foreach my $opt (@options) {
+ my $checked = ($options =~ m/$opt->[0]/) ? ' checked="checked" ' : '' ;
+ $output .= ' '."\n";
+ }
+
}
return ($output);
}
+sub order_meta_fields {
+ my ($r)=@_;
+ my $idx = 1;
+ my $dom = $env{'course.'.$env{'request.course.id'}.'.domain'};
+ my $crs = $env{'course.'.$env{'request.course.id'}.'.num'};
+ $r->print(&Apache::loncommon::start_page('Order Metadata Fields'));
+ &Apache::lonhtmlcommon::add_breadcrumb
+ ({href=>"/adm/parmset?action=setrestrictmeta",
+ text=>"Restrict Metadata"},
+ {text=>"Order Metadata"});
+ $r->print(&Apache::lonhtmlcommon::breadcrumbs('Order Metadata'));
+ if ($env{'form.storeorder'}) {
+ my $newpos = $env{'form.newpos'} - 1;
+ my $currentpos = $env{'form.currentpos'} - 1;
+ my @neworder = ();
+ my @oldorder = split /,/,$env{'course.'.$env{'request.course.id'}.'.metadata.addedorder'};
+ my $i;
+ if ($newpos > $currentpos) {
+ # moving stuff up
+ for ($i=0;$i<$currentpos;$i++) {
+ $neworder[$i]=$oldorder[$i];
+ }
+ for ($i=$currentpos;$i<$newpos;$i++) {
+ $neworder[$i]=$oldorder[$i+1];
+ }
+ $neworder[$newpos]=$oldorder[$currentpos];
+ for ($i=$newpos+1;$i<=$#oldorder;$i++) {
+ $neworder[$i]=$oldorder[$i];
+ }
+ } else {
+ # moving stuff down
+ for ($i=0;$i<$newpos;$i++) {
+ $neworder[$i]=$oldorder[$i];
+ }
+ $neworder[$newpos]=$oldorder[$currentpos];
+ for ($i=$newpos+1;$i<$currentpos+1;$i++) {
+ $neworder[$i]=$oldorder[$i-1];
+ }
+ for ($i=$currentpos+1;$i<=$#oldorder;$i++) {
+ $neworder[$i]=$oldorder[$i];
+ }
+ }
+ my $ordered_fields = join ",", @neworder;
+ my $put_result = &Apache::lonnet::put('environment',
+ {'metadata.addedorder'=>$ordered_fields},$dom,$crs);
+ &Apache::lonnet::appenv('course.'.$env{'request.course.id'}.'.metadata.addedorder' => $ordered_fields);
+ }
+ my $fields = &get_added_meta_fieldnames();
+ my $ordered_fields;
+ my @fields_in_order = split /,/,$env{'course.'.$env{'request.course.id'}.'.metadata.addedorder'};
+ if (!@fields_in_order) {
+ # no order found, pick sorted order then create metadata.addedorder key.
+ foreach my $key (sort keys %$fields) {
+ push @fields_in_order, $key;
+ $ordered_fields = join ",", @fields_in_order;
+ }
+ my $put_result = &Apache::lonnet::put('environment',
+ {'metadata.addedorder'=>$ordered_fields},$dom,$crs);
+ }
+ $r->print(''.(' ' x 5).' ');
+ my $num_fields = scalar(@fields_in_order);
+ foreach my $key (@fields_in_order) {
+ $r->print('
');
+ return 'ok';
+}
sub addmetafield {
my ($r)=@_;
$r->print(&Apache::loncommon::start_page('Add Metadata Field'));
$r->print(&Apache::lonhtmlcommon::breadcrumbs('Add Metadata Field'));
my $dom = $env{'course.'.$env{'request.course.id'}.'.domain'};
my $crs = $env{'course.'.$env{'request.course.id'}.'.num'};
- if (exists($env{'form.fieldname'})) {
+ if (exists($env{'form.undelete'})) {
+ my @meta_fields = &Apache::loncommon::get_env_multiple('form.undelete');
+ foreach my $meta_field(@meta_fields) {
+ my $options = $env{'course.'.$env{'request.course.id'}.'.metadata.'.$meta_field.'.options'};
+ $options =~ s/deleted//;
+ $options =~ s/,,/,/;
+ my $put_result = &Apache::lonnet::put('environment',
+ {'metadata.'.$meta_field.'.options'=>$options},$dom,$crs);
+
+ $r->print('Undeleted Metadata Field '.$env{'course.'.$env{'request.course.id'}.'.metadata.'.$meta_field.'.added'}." with result ".$put_result.' ');
+ $idx ++;
+ }
+ $r->print('');
+ $r->print(' ');
+ $r->print('');
+ $r->print('');
+ $r->print('');
+ $r->print($$fields{$key}.'
');
+ }
+ $r->print('');
+ }
+ $r->print('
Or you may enter a new metadata field name.');
@@ -3261,6 +3382,10 @@ sub setrestrictmeta {
if ($env{'form.'.$meta_field.'_active'}) {
$options.='active,';
}
+ if ($env{'form.'.$meta_field.'_deleted'}) {
+ $options.='deleted,';
+ }
+
my $name = $save_field;
$put_result = &Apache::lonnet::put('environment',
{'metadata.'.$meta_field.'.options'=>$options,
@@ -3276,22 +3401,31 @@ sub setrestrictmeta {
my %metadata_fields = &Apache::lonmeta::fieldnames('portfolio');
# Now get possible added metadata fields
my $added_metadata_fields = &get_added_meta_fieldnames(\%metadata_fields);
+ my $row_alt = 1;
+ $output .= '';
foreach my $field (sort(keys(%metadata_fields))) {
if ($field ne 'courserestricted') {
- $output.= &output_row($r, $field, $metadata_fields{$field});
+ $row_alt = $row_alt ? 0 : 1;
+ $output.= &output_row($r, $field, $metadata_fields{$field}, undef, $row_alt);
}
}
+ my $added_flag = 1;
foreach my $field (sort(keys(%$added_metadata_fields))) {
- $output.= &output_row($r, $field, $$added_metadata_fields{$field});
+ $row_alt = $row_alt ? 0 : 1;
+ $output.= &output_row($r, $field, $$added_metadata_fields{$field},$added_flag, $row_alt);
}
+ $output .= "
";
$r->print(<
-
+
ENDenv
$r->print(&Apache::loncommon::end_page());
@@ -3300,7 +3434,6 @@ ENDenv
##################################################
sub get_added_meta_fieldnames {
my %fields;
- my ($default_fields) = @_;
foreach my $key(%env) {
if ($key =~ m/\.metadata\.(.+)\.added$/) {
my $field_name = $1;
@@ -3310,6 +3443,20 @@ sub get_added_meta_fieldnames {
}
return \%fields;
}
+sub get_deleted_meta_fieldnames {
+ my %fields;
+ my ($default_fields) = @_;
+ foreach my $key(%env) {
+ if ($key =~ m/\.metadata\.(.+)\.added$/) {
+ my $field_name = $1;
+ if ($env{'course.'.$env{'request.course.id'}.'.metadata.'.$field_name.'.options'} =~ m/deleted/) {
+ my ($display_field_name) = $env{$key};
+ $fields{$field_name} = $display_field_name;
+ }
+ }
+ }
+ return \%fields;
+}
sub defaultsetter {
my ($r) = @_;
@@ -3758,6 +3905,10 @@ sub handler {
&Apache::lonhtmlcommon::add_breadcrumb({href=>'/adm/parmset?action=addmetadata',
text=>"Add Metadata Field"});
&addmetafield($r);
+ } elsif ($env{'form.action'} eq 'ordermetadata' && $parm_permission) {
+ &Apache::lonhtmlcommon::add_breadcrumb({href=>'/adm/parmset?action=addmetadata',
+ text=>"Add Metadata Field"});
+ &order_meta_fields($r);
} elsif ($env{'form.action'} eq 'setrestrictmeta' && $parm_permission) {
&Apache::lonhtmlcommon::add_breadcrumb({href=>'/adm/parmset?action=setrestrictmeta',
text=>"Restrict Metadata"});