--- loncom/interface/lonparmset.pm	2005/06/28 15:12:54	1.232
+++ loncom/interface/lonparmset.pm	2005/09/14 17:56:25	1.250
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Handler to set parameters for assessments
 #
-# $Id: lonparmset.pm,v 1.232 2005/06/28 15:12:54 albertel Exp $
+# $Id: lonparmset.pm,v 1.250 2005/09/14 17:56:25 banghart Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -904,12 +904,12 @@ ENDSCRIPT
     $r->print("\n<table><tr>");
     my $cnt=0;
     foreach $tempkey (&keysindisplayorder($allparms,$keyorder)) {
-	$r->print("\n<td><font size='-1'><input type='checkbox' name='pscat' ");
+	$r->print("\n<td><font size='-1'><label><input type='checkbox' name='pscat' ");
 	$r->print('value="'.$tempkey.'"');
 	if ($$pscat[0] eq "all" || grep $_ eq $tempkey, @{$pscat}) {
 	    $r->print(' checked');
 	}
-	$r->print('>'.$$allparms{$tempkey}.'</font></td>');
+	$r->print('>'.$$allparms{$tempkey}.'</label></font></td>');
  	$cnt++;
         if ($cnt==3) {
 	    $r->print("</tr>\n<tr>");
@@ -918,16 +918,16 @@ ENDSCRIPT
     }
     $r->print('
 </tr><tr><td>
-<a href="javascript:checkall(true, \'pscat\')">Select All</a><br />
-<a href="javascript:checkstandard()">Select Common Only</a>
+<a href="javascript:checkall(true, \'pscat\')">Select&nbsp;All</a><br />
+<a href="javascript:checkstandard()">Select&nbsp;Common&nbsp;Only</a>
 </td><td>
-<a href="javascript:checkdates()">Add Problem Dates</a>
-<a href="javascript:checkcontdates()">Add Content Dates</a><br />
-<a href="javascript:checkdisset()">Add Discussion Settings</a>
-<a href="javascript:checkvisi()">Add Visibilities</a><br />
-<a href="javascript:checkparts()">Add Part Parameters</a>
+<a href="javascript:checkdates()">Add&nbsp;Problem&nbsp;Dates</a>
+<a href="javascript:checkcontdates()">Add&nbsp;Content&nbsp;Dates</a><br />
+<a href="javascript:checkdisset()">Add&nbsp;Discussion&nbsp;Settings</a>
+<a href="javascript:checkvisi()">Add&nbsp;Visibilities</a><br />
+<a href="javascript:checkparts()">Add&nbsp;Part&nbsp;Parameters</a>
 </td><td>
-<a href="javascript:checkall(false, \'pscat\')">Unselect All</a>
+<a href="javascript:checkall(false, \'pscat\')">Unselect&nbsp;All</a>
 </td>
 ');
     $r->print('</tr></table>');
@@ -941,7 +941,9 @@ sub partmenu {
     $r->print('>'.&mt('All Parts').'</option>');
     my %temphash=();
     foreach (@{$psprt}) { $temphash{$_}=1; }
-    foreach my $tempkey (sort keys %{$allparts}) {
+    foreach my $tempkey (sort {
+	if ($a==$b) { return ($a cmp $b) } else { return ($a <=> $b); }
+    } keys(%{$allparts})) {
 	unless ($tempkey =~ /\./) {
 	    $r->print('<option value="'.$tempkey.'"');
 	    if ($$psprt[0] eq "all" ||  $temphash{$tempkey}) {
@@ -1065,6 +1067,18 @@ sub keysinorder {
     } (keys %{$name});
 }
 
+sub keysinorder_bytype {
+    my ($name,$keyorder)=@_;
+    return sort {
+	my $ta=(split('_',$a))[-1];
+	my $tb=(split('_',$b))[-1];
+	if ($$keyorder{'parameter_0_'.$ta} == $$keyorder{'parameter_0_'.$tb}) {
+	    return ($a cmp $b);
+	}
+	$$keyorder{'parameter_0_'.$ta} <=> $$keyorder{'parameter_0_'.$tb};
+    } (keys %{$name});
+}
+
 sub keysindisplayorder {
     my ($name,$keyorder)=@_;
     return sort {
@@ -1074,16 +1088,17 @@ sub keysindisplayorder {
 
 sub sortmenu {
     my ($r,$sortorder)=@_;
-    $r->print('<br /><input type="radio" name="sortorder" value="realmstudent"');
+    $r->print('<br /><label><input type="radio" name="sortorder" value="realmstudent"');
     if ($sortorder eq 'realmstudent') {
        $r->print(' checked="on"');
     }
     $r->print(' />'.&mt('Sort by realm first, then student (group/section)'));
-    $r->print('<br /><input type="radio" name="sortorder" value="studentrealm"');
+    $r->print('</label><br /><label><input type="radio" name="sortorder" value="studentrealm"');
     if ($sortorder eq 'studentrealm') {
        $r->print(' checked="on"');
     }
-    $r->print(' />'.&mt('Sort by student (group/section) first, then realm'));
+    $r->print(' />'.&mt('Sort by student (group/section) first, then realm').
+	      '</label>');
 }
 
 sub standardkeyorder {
@@ -1315,7 +1330,9 @@ sub assessparms {
     } else {
         my ($map,$id,$resource)=&Apache::lonnet::decode_symb($pssymb);
         $r->print(&mt('Specific Resource').": ".$resource.
-                  '<input type="hidden" value="'.$pssymb.'" name="symb"><br />');
+                  '<input type="hidden" value="'.$pssymb.'" name="symb">'.
+		  '<br /><label><b>'.&mt('Show all parts').': <input type="checkbox" name="psprt" value="all"'.
+		  ($env{'form.psprt'}?' checked="checked"':'').' /></b></label><br />');
     }
     &usermenu($r,$uname,$id,$udom,$csec);    
 
@@ -1460,14 +1477,9 @@ ENDTABLEHEADFOUR
 
                         $r->print('<td bgcolor='.$defbgone.
                                       ' rowspan='.$totalparms.
-                                      '><tt><font size=-1>');
-
-                        $r->print(' / res / ');
-                        $r->print(join(' / ', split(/\//,$mapp{$rid})));
-
-                        $r->print('</font></tt></td>');
+                                      '>'.$maptitles{$mapp{$rid}}.'</td>');
 
-                        foreach (&keysinorder(\%name,\%keyorder)) {
+                        foreach (&keysinorder_bytype(\%name,\%keyorder)) {
                             unless ($firstrow) {
                                 $r->print('<tr>');
                             } else {
@@ -1757,9 +1769,13 @@ sub crsenv {
         #
         # Let the user know we made the changes
         if ($name && defined($value)) {
+            my $failed_cloners;
             if ($name eq 'cloners') {
+                $value =~ s/\s//g;
                 $value =~ s/^,//;
                 $value =~ s/,$//;
+                # check requested clones are valid users.
+                $failed_cloners = &check_cloners(\$value,\@oldcloner);
             }
             my $put_result = &Apache::lonnet::put('environment',
                                                   {$name=>$value},$dom,$crs);
@@ -1776,6 +1792,18 @@ sub crsenv {
                 $setoutput.=&mt('Unable to set').' <b>'.$name.'</b> '.&mt('to').
 		    ' <b>'.$value.'</b> '.&mt('due to').' '.$put_result.'.<br />';
             }
+            if (($name eq 'cloners') && ($failed_cloners)) {
+                $setoutput.= &mt('Unable to include').' - <b>'.$failed_cloners.'</b>, '.
+                 &mt('reason').' - '.&mt('LON-CAPA user(s) do(es) not exist').
+                 '.<br />'.&mt('Please ').
+                 ' <a href="/adm/createuser">'.
+                 &mt('add the user(s)').'</a>, '.
+                 &mt('and then return to the ').
+                 '<a href="/admparmset?action=crsenv">'.
+                 &mt('Course Parameters page').'</a> '.
+                 &mt('to add the new user(s) to the list of possible cloners').
+                 '.<br />';
+            }
         }
     }
 # ------------------------- Re-init course environment entries for this session
@@ -1922,7 +1950,7 @@ sub crsenv {
 			     'disablesigfigs'
                              );
 	foreach my $parameter (sort(keys(%values))) {
-            unless ($parameter =~ m/^internal\./) {
+            unless (($parameter =~ m/^internal\./)||($parameter =~ m/^metadata\./)) {
                 if (! $descriptions{$parameter}) {
                     $descriptions{$parameter}=$parameter;
                     push(@Display_Order,$parameter);
@@ -2161,15 +2189,41 @@ sub listdata {
     my $pointer=0;
     $tableopen=0;
     my $foundkeys=0;
+    my %keyorder=&standardkeyorder();
     foreach my $thiskey (sort {
 	if ($sortorder eq 'realmstudent') {
-	    my ($astudent,$arealm)=($a=~/^$env{'request.course.id'}\.([^\.]+)\.(.+)\.[^\.]+$/);
-	    my ($bstudent,$brealm)=($b=~/^$env{'request.course.id'}\.([^\.]+)\.(.+)\.[^\.]+$/);
-            ($arealm cmp $brealm) || ($astudent cmp $bstudent);
+	    my ($astudent,$arealm)=($a=~/^\Q$env{'request.course.id'}\E\.\[([^\.]+)\]\.(.+)\.[^\.]+$/);
+	    my ($bstudent,$brealm)=($b=~/^\Q$env{'request.course.id'}\E\.\[([^\.]+)\]\.(.+)\.[^\.]+$/);
+	    if (!defined($astudent)) {
+		($arealm)=($a=~/^\Q$env{'request.course.id'}\E\.(.+)$/);
+	    }
+	    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);
+	    }
 	} else {
 	    $a cmp $b;
 	}
     } keys %{$listdata}) {
+	 
 	if ($$listdata{$thiskey.'.type'}) {
             my $thistype=$$listdata{$thiskey.'.type'};
             if ($$resourcedata{$thiskey.'.type'}) {
@@ -2473,25 +2527,76 @@ ENDOVER
 ##################################################
                                                                                             
 =pod
-                                                                                            
-=item change clone
-                                                                                            
+
+=item check_cloners
+
+Checks if new users included in list of allowed cloners
+are valid users.  Replaces supplied list with 
+cleaned list containing only users with valid usernames
+and domains.
+
+Inputs: $clonelist, $oldcloner 
+where $clonelist is ref to array of requested cloners,
+and $oldcloner is ref to array of currently allowed
+cloners.
+
+Returns: string - comma separated list of requested
+cloners (username:domain) who do not exist in system.
+
+=item change_clone
+
 Modifies the list of courses a user can clone (stored
-in the user's environemnt.db file), called when a
+in the user's environment.db file), called when a
 change is made to the list of users allowed to clone
 a course.
-                                                                                            
+
 Inputs: $action,$cloner
 where $action is add or drop, and $cloner is identity of 
 user for whom cloning ability is to be changed in course. 
-                                                                                            
-Returns: 
 
 =cut
                                                                                             
 ##################################################
 ##################################################
 
+sub extract_cloners {
+    my ($clonelist,$allowclone) = @_;
+    if ($clonelist =~ /,/) {
+        @{$allowclone} = split/,/,$clonelist;
+    } else {
+        $$allowclone[0] = $clonelist;
+    }
+}
+
+
+sub check_cloners {
+    my ($clonelist,$oldcloner) = @_;
+    my ($clean_clonelist,$disallowed);
+    my @allowclone = ();
+    &extract_cloners($$clonelist,\@allowclone);
+    foreach my $currclone (@allowclone) {
+        if (!grep/^$currclone$/,@$oldcloner) {
+            my ($uname,$udom) = split/:/,$currclone;
+            if ($uname && $udom) {
+                if (&Apache::lonnet::homeserver($uname,$udom) eq 'no_host') {
+                    $disallowed .= $currclone.',';   
+                } else {
+                    $clean_clonelist .= $currclone.',';
+                }
+            }
+        } else {
+            $clean_clonelist .= $currclone.',';
+        }
+    }
+    if ($disallowed) {
+        $disallowed =~ s/,$//;
+    }
+    if ($clean_clonelist) {
+        $clean_clonelist =~ s/,$//;
+    }
+    $$clonelist = $clean_clonelist;
+    return $disallowed;
+}  
 
 sub change_clone {
     my ($clonelist,$oldcloner) = @_;
@@ -2501,12 +2606,8 @@ sub change_clone {
     my $clone_crs = $cnum.':'.$cdom;
     
     if ($cnum && $cdom) {
-        my @allowclone = ();
-        if ($clonelist =~ /,/) {
-            @allowclone = split/,/,$clonelist;
-        } else {
-            $allowclone[0] = $clonelist;
-        }
+        my @allowclone;
+        &extract_cloners($clonelist,\@allowclone);
         foreach my $currclone (@allowclone) {
             if (!grep/^$currclone$/,@$oldcloner) {
                 ($uname,$udom) = split/:/,$currclone;
@@ -2597,6 +2698,10 @@ ENDMAINFORMHEAD
 	    action => 'crsenv',
             permission => $parm_permission,
             },
+          { text => 'Set Instructor Defined Metadata',
+	    action => 'setinstmeta',
+            permission => $parm_permission,
+            },
           { text => 'Set/Modify Resource Parameters - Helper Mode',
             url => '/adm/helper/parameter.helper',
             permission => $parm_permission,
@@ -2640,8 +2745,80 @@ ENDMAINFORMHEAD
     $r->print($menu_html);
     return;
 }
+### Set instructor defined metadata
+sub setinstmeta {
+    my ($r)=@_;
+    my $next_meta;
+    my $output;
+    my $item_num;
+    my $put_result;
+    $r->print(&Apache::lonxml::xmlbegin());
+    $r->print('<head>
+            <title>LON-CAPA Set Instructor Metadata</title>
+            </head>');
+    $r->print(&Apache::loncommon::bodytag('Set Instructor Metadata'));
+    $r->print(&Apache::lonhtmlcommon::breadcrumbs(undef,
+						    'Set Instructor Metadata'));
+    my $dom = $env{'course.'.$env{'request.course.id'}.'.domain'};
+    my $crs = $env{'course.'.$env{'request.course.id'}.'.num'};
+    my $key_base = $env{'course.'.$env{'request.course.id'}.'.metadata.'};
+    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'});      
+    foreach my $key (sort keys %env) {
+        if ($key=~m/^course\.$env{'request.course.id'}\.metadata\.(.+)$/) {
+            my $meta_data_item = $1;
+            my $meta_hash=$env{$key};
+            $output.='<tr><td>'.$meta_data_item.'</td>';
+            $output.='<td>Select one: <input type="checkbox" name="" value="one" /><br />';
+            $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.='<td>students must pick only one: <input type="checkbox" name="pickonenew" value="one" /><br />';
+    $output.='Allow student to type extra info: <input type="checkbox" name="typeextranew" value="extra" /></td>';
+    $output.='<td><input name="valuesnew" type="text" value="" /></td></tr>';
+    $output.='<input type="hidden" name="serial" value="'.$next_meta.'" />';
+    $output.='<input type="hidden" name="state" value="save" /></tr>';
+    $r->print(<<ENDenv);       
+        <form method="post" action="/adm/parmset?action=setinstmeta" name="form">
+        
+        <p>
+        <table border=2>
+        <tr><th>Title</th><th>Options</th><th>Choices</th></tr>
+        $output
+        </table>
+        <input type="submit" name="instmeta" value="Update Instructor Metadata">
+        </form>
 
-
+ENDenv
+        
+    
+    $r->print('</body>
+                </html>');
+    return 'ok';
+}
 ##################################################
 
 sub defaultsetter {
@@ -2827,7 +3004,7 @@ sub handler {
                                              'pres_marker',
                                              'pres_value',
                                              'pres_type',
-                                             'udom','uname','symb']);
+                                             'udom','uname','symb','serial']);
 
 
     &Apache::lonhtmlcommon::clear_breadcrumbs();
@@ -2874,6 +3051,10 @@ sub handler {
             &Apache::lonhtmlcommon::add_breadcrumb({href=>'/adm/parmset?action=setoverview',
 						    text=>"Overview Mode"});
 	    &overview($r);
+        } elsif ($env{'form.action'} eq 'setinstmeta' && $parm_permission) {
+            &Apache::lonhtmlcommon::add_breadcrumb({href=>'/adm/parmset?action=setinstmeta',
+						    text=>"Instructor Metadata"});
+	    &setinstmeta($r);
         } elsif ($env{'form.action'} eq 'newoverview' && $parm_permission) {
             &Apache::lonhtmlcommon::add_breadcrumb({href=>'/adm/parmset?action=setoverview',
 						    text=>"Overview Mode"});