--- loncom/interface/lonparmset.pm	2005/06/18 18:51:50	1.230
+++ loncom/interface/lonparmset.pm	2005/08/27 19:07:58	1.243
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Handler to set parameters for assessments
 #
-# $Id: lonparmset.pm,v 1.230 2005/06/18 18:51:50 www Exp $
+# $Id: lonparmset.pm,v 1.243 2005/08/27 19:07:58 banghart Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -629,7 +629,10 @@ sub print_row {
     } else {    
         $parm=~s|\[.*\]\s||g;
     }
-
+    my $automatic=&rulescache(($which=~/\_([^\_]+)$/)[0].'_triggers');
+    if ($automatic) {
+	$parm.='<font color="red"><br />'.&mt('Automatically sets').' '.join(', ',split(/\:/,$automatic)).'</font>';
+    }
     $r->print('<td bgcolor='.$defbgone.'>'.$parm.'</td>');
    
     my $thismarker=$which;
@@ -901,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>");
@@ -915,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>');
@@ -938,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}) {
@@ -1000,7 +1005,7 @@ sub displaymenu {
 
 sub mapmenu {
     my ($r,$allmaps,$pschp,$maptitles)=@_;
-    $r->print(&mt('Select Enclosing Map or Folder').' ');
+    $r->print('<b>'.&mt('Select Enclosing Map or Folder').'</b> ');
     $r->print('<select name="pschp">');
     $r->print('<option value="all">'.&mt('All Maps or Folders').'</option>');
     foreach (sort {$$allmaps{$a} cmp $$allmaps{$b}} keys %{$allmaps}) {
@@ -1013,8 +1018,8 @@ sub mapmenu {
 
 sub levelmenu {
     my ($r,$alllevs,$parmlev)=@_;
-    $r->print(&mt('Select Parameter Level').
-	      &Apache::loncommon::help_open_topic('Course_Parameter_Levels').' ');
+    $r->print('<b>'.&mt('Select Parameter Level').
+	      &Apache::loncommon::help_open_topic('Course_Parameter_Levels').'</b> ');
     $r->print('<select name="parmlev">');
     foreach (reverse sort keys %{$alllevs}) {
 	$r->print('<option value="'.$$alllevs{$_}.'"');
@@ -1062,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 {
@@ -1071,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 {
@@ -1312,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);    
 
@@ -1457,14 +1477,9 @@ ENDTABLEHEADFOUR
 
                         $r->print('<td bgcolor='.$defbgone.
                                       ' rowspan='.$totalparms.
-                                      '><tt><font size=-1>');
-
-                        $r->print(' / res / ');
-                        $r->print(join(' / ', split(/\//,$mapp{$rid})));
+                                      '>'.$maptitles{$mapp{$rid}}.'</td>');
 
-                        $r->print('</font></tt></td>');
-
-                        foreach (&keysinorder(\%name,\%keyorder)) {
+                        foreach (&keysinorder_bytype(\%name,\%keyorder)) {
                             unless ($firstrow) {
                                 $r->print('<tr>');
                             } else {
@@ -1754,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);
@@ -1773,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
@@ -2162,6 +2193,11 @@ sub listdata {
 	if ($sortorder eq 'realmstudent') {
 	    my ($astudent,$arealm)=($a=~/^$env{'request.course.id'}\.([^\.]+)\.(.+)\.[^\.]+$/);
 	    my ($bstudent,$brealm)=($b=~/^$env{'request.course.id'}\.([^\.]+)\.(.+)\.[^\.]+$/);
+	    if (!defined($astudent) && !defined($bstudent) &&
+		!defined($arealm) && !defined($brealm)) {
+		($arealm)=($a=~/^$env{'request.course.id'}\.(.+)\.[^\.]+$/);
+		($brealm)=($b=~/^$env{'request.course.id'}\.(.+)\.[^\.]+$/);
+	    }
             ($arealm cmp $brealm) || ($astudent cmp $bstudent);
 	} else {
 	    $a cmp $b;
@@ -2241,7 +2277,7 @@ sub listdata {
 		my $jskey='key_'.$pointer;
 		$pointer++;
 		$r->print(
-			  &Apache::lonhtmlcommon::date_setter('overviewform',
+			  &Apache::lonhtmlcommon::date_setter('parmform',
 							      $jskey,
 						      $$resourcedata{$thiskey},
 							      '',1,'','',$hour,$min,$sec).
@@ -2298,7 +2334,7 @@ $html
 </head>
 $bodytag
 $breadcrumbs
-<form method="post" action="/adm/parmset?action=newoverview" name="overviewform">
+<form method="post" action="/adm/parmset?action=newoverview" name="parmform">
 ENDOVER
     my @ids=();
     my %typep=();
@@ -2443,7 +2479,7 @@ $html
 </head>
 $bodytag
 $breadcrumbs
-<form method="post" action="/adm/parmset?action=setoverview" name="overviewform">
+<form method="post" action="/adm/parmset?action=setoverview" name="parmform">
 ENDOVER
 # Store modified
 
@@ -2470,25 +2506,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) = @_;
@@ -2498,12 +2585,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;
@@ -2594,6 +2677,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,
@@ -2637,8 +2724,79 @@ ENDMAINFORMHEAD
     $r->print($menu_html);
     return;
 }
-
-
+### Set instructor defined metadata
+sub setinstmeta {
+    my ($r)=@_;
+    my $next_meta;
+    if ($env{'form.serial'}) {
+        $next_meta = $env{'form.serial'};
+    } else {
+        $next_meta = 1;
+    }
+    $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.'};
+    if ($env{'form.state'}eq 'add') {
+        $r->print('<strong>Compose a new metadata item:</strong><br />');
+        $r->print('<form method="post" action="/adm/parmset">');
+        $r->print ('Title of item: '.&Apache::lonhtmlcommon::textbox("title",undef,undef,undef).'<br />');
+        $r->print ('List if items (comma separated): '.&Apache::lonhtmlcommon::textbox("values",undef,undef,undef).'<br />');
+        $r->print ('Select one: <input type="radio" name="type" value="one"><br />');
+        $r->print ('Select many: <input type="radio" name="type" value="many"><br />');
+        $r->print('<input type="hidden" name="serial" value="'.$next_meta.'" />');
+        $r->print('<input type="hidden" name="action" value="setinstmeta" />');
+        $r->print('<input type="hidden" name="state" value="save" />');
+        $r->print('<input type="submit" value="Save Metadata">');
+        $r->print('</form>');
+    } elsif ($env{'form.state'}eq 'save') {
+        $r->print('Here we save the metadata');
+        $key_base.=$env{'form.serial'}.'.';
+        $r->print('The title: '.$env{'form.title'}.'<br>');
+        $r->print('The values: '.$env{'form.values'}.'<br>');
+        $r->print('The type: '.$env{'form.type'}.'<br>');
+        $r->print('The number: '.$env{'form.serial'}.'<br>');
+        my $name = 'metadata.'.$env{'form.serial'}.'.title';
+        my $value = $env{'form.title'};
+        my $put_result = &Apache::lonnet::put('environment',
+                                                  {$name=>$value},$dom,$crs);
+        $r->print('the put result was: '.$put_result.'<br />');
+        $name = 'metadata.'.$env{'form.serial'}.'.type';
+        $value = $env{'form.type'};
+        $put_result = &Apache::lonnet::put('environment',
+                                                  {$name=>$value},$dom,$crs);
+        $name = 'metadata.'.$env{'form.serial'}.'.values';
+        $value = $env{'form.values'};
+        $put_result = &Apache::lonnet::put('environment',
+                                                  {$name=>$value},$dom,$crs);
+        &Apache::lonnet::coursedescription($env{'request.course.id'});        
+    } else {
+        my $found_one = 0;
+        foreach my $key (sort keys %env) {
+            if ($key=~m/^course\.$env{'request.course.id'}\.metadata\.\d+\.title$/) {
+                unless ($found_one eq 1) {
+                    $found_one = 1;
+                    $r->print('<strong>Existing Metadata</strong><br >');
+                }
+                $r->print($env{$key}.'<br />');
+                $key=~m/^course\.$env{'request.course.id'}\.metadata\.(\d+)\.title/;
+                if ($1 ge $next_meta) {
+                    $next_meta = $1 + 1;
+                }
+            }
+        }
+        $r->print('<a href="/adm/parmset?action=setinstmeta&state=add&serial='.$next_meta.'">Add Metadata Item</a><br />');
+    }
+    $r->print('</body>
+                </html>');
+    return 'ok';
+}
 ##################################################
 
 sub defaultsetter {
@@ -2735,6 +2893,8 @@ ENDDEFHEAD
 	    push @datedisplay,&mt('Automatically set earlier than ').$tempkey;
 	} 
     }
+$r->print(&mt('Manual setting rules apply to all interfaces.').'<br />'.
+	  &mt('Automatic setting rules apply to table mode interfaces only.'));
     $r->print("\n<table border='1'><tr><th>".&mt('Rule for parameter').'</th><th>'.
 	      &mt('Action').'</th><th>'.&mt('Value').'</th></tr>');
     foreach my $tempkey (&keysindisplayorder(\%allparms,\%keyorder)) {
@@ -2822,7 +2982,7 @@ sub handler {
                                              'pres_marker',
                                              'pres_value',
                                              'pres_type',
-                                             'udom','uname','symb']);
+                                             'udom','uname','symb','serial']);
 
 
     &Apache::lonhtmlcommon::clear_breadcrumbs();
@@ -2869,6 +3029,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"});