--- loncom/interface/lonparmset.pm	2006/09/28 23:58:53	1.338
+++ loncom/interface/lonparmset.pm	2006/10/13 17:40:12	1.342
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Handler to set parameters for assessments
 #
-# $Id: lonparmset.pm,v 1.338 2006/09/28 23:58:53 banghart Exp $
+# $Id: lonparmset.pm,v 1.342 2006/10/13 17:40:12 banghart Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -3215,13 +3215,103 @@ sub output_row {
     }
     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'));
+    $r->print(&Apache::lonhtmlcommon::breadcrumbs('Order Metadata Fields'));
+    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;
+	&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('<table>');
+    my $num_fields = scalar(@fields_in_order);
+    foreach my $key (@fields_in_order) {
+        $r->print('<tr><td>');
+        $r->print('<form method="post" action="">');
+        $r->print('<select name="newpos" onChange="this.form.submit()">');
+        for (my $i = 1;$i le $num_fields;$i ++) {
+            if ($i eq $idx) {
+                $r->print('<option value="'.$i.'"  SELECTED>('.$i.')</option>');
+            } else {
+                $r->print('<option value="'.$i.'">'.$i.'</option>');
+            }
+        }
+        $r->print('</select></td><td>');
+        $r->print('<input type="hidden" name="currentpos" value="'.$idx.'" />');
+        $r->print('<input type="hidden" name="storeorder" value="true" />');
+        $r->print('</form>');
+        $r->print($$fields{$key}.'</td></tr>');
+        $idx ++;
+    }
+    $r->print('</table>');
+    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 <strong>'.$env{'course.'.$env{'request.course.id'}.'.metadata.'.$meta_field.'.added'}."</strong> with result ".$put_result.'<br />');
+        }
+        $r->print('<form action="" method="post">');
+        $r->print('<input type="hidden" name="action" value="setrestrictmeta" />');
+        $r->print('<input type="submit" value="Continue" />');
+    } elsif (exists($env{'form.fieldname'})) {
         my $meta_field = $env{'form.fieldname'};
         my $display_field = $env{'form.fieldname'};
         $meta_field =~ s/\W/_/g;
@@ -3232,7 +3322,17 @@ sub addmetafield {
                              'metadata.'.$meta_field.'.options'=>""},$dom,$crs);
         $r->print('Added new Metadata Field '.$env{'form.fieldname'}." with result ".$put_result);
     } else {
-        $r->print('<form method="post" action="/adm/parmset?action=addmetadata"');
+        my $fields = &get_deleted_meta_fieldnames();
+        if ($fields) {
+            $r->print('You may undelete previously deleted fields.<br />Check those you wish to undelete and click Undelete.<br />');
+            $r->print('<form method="post" action="">');
+            foreach my $key(keys(%$fields)) {
+                $r->print('<input type="checkbox" name="undelete" value="'.$key.'" />'.$$fields{$key}.'<br /');
+            }
+            $r->print('<input type="submit" name="undelete" value="Undelete" />');
+            $r->print('</form>');
+        }
+        $r->print('<hr /><strong>Or</strong> you may enter a new metadata field name.<form method="post" action="/adm/parmset?action=addmetadata"');
         $r->print('<input type="text" name="fieldname" /><br />');
         $r->print('<input type="submit" value="Add Metadata Field" />');
         $r->print('</form>');
@@ -3304,6 +3404,10 @@ sub setrestrictmeta {
         <form method="post" action="/adm/parmset?action=addmetadata" name="form">
         <input type="submit" name="restrictmeta" value="Add a Metadata Field">
         </form>
+        </form><br />
+        <form method="post" action="/adm/parmset?action=ordermetadata" name="form">
+        <input type="submit" name="restrictmeta" value="Order Metadata Fields">
+        </form>
 ENDenv
     $r->print(&Apache::loncommon::end_page());
     return 'ok';
@@ -3311,7 +3415,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;
@@ -3321,6 +3424,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) = @_;
 
@@ -3769,6 +3886,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"});