--- loncom/interface/lonparmset.pm	2005/06/04 15:26:13	1.207
+++ loncom/interface/lonparmset.pm	2005/06/04 17:35:19	1.208
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Handler to set parameters for assessments
 #
-# $Id: lonparmset.pm,v 1.207 2005/06/04 15:26:13 www Exp $
+# $Id: lonparmset.pm,v 1.208 2005/06/04 17:35:19 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -766,6 +766,87 @@ sub extractResourceInformation {
     }
 }
 
+
+##################################################
+##################################################
+
+sub parmmenu {
+    my ($r,$allparms,$pscat)=@_;
+    my $tempkey;
+    $r->print(<<ENDSCRIPT);
+<script type="text/javascript">
+    function checkall(value, checkName) {
+	for (i=0; i<document.forms.parmform.elements.length; i++) {
+            ele = document.forms.parmform.elements[i];
+            if (ele.name == checkName) {
+                document.forms.parmform.elements[i].checked=value;
+            }
+        }
+    }
+</script>
+ENDSCRIPT
+    $r->print(&mt('Select Parameters to View'));
+    $r->print("\n<table><tr>");
+    my $cnt=0;
+    foreach $tempkey (sort { $$allparms{$a} cmp $$allparms{$b} }
+                      keys %{$allparms} ) {
+	++$cnt;
+	$r->print("</tr>\n<tr>") if ($cnt%2);
+	$r->print("\n<td><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}.'</td>');
+    }
+    $r->print('
+</tr><tr><td>
+<input type="button" onclick="checkall(true, \'pscat\')" value="Select All" />
+</td><td>
+<input type="button" onclick="checkall(false, \'pscat\')" value="Unselect All" />
+</td>
+');
+    $r->print('</tr></table>');
+}
+
+sub menu {
+    my ($r,$allparms,$allparts,$allkeys,$pscat,$psprt,$fcat)=@_;
+    my $tempkey;
+    
+    &parmmenu($r,$allkeys,$pscat);
+
+    $r->print('<table><tr>');    
+    $r->print('<td><select multiple name="psprt" size="5">');
+    $r->print('<option value="all"');
+    $r->print(' selected') unless (@{$psprt});
+    $r->print('>'.&mt('All Parts').'</option>');
+    my %temphash=();
+    foreach (@{$psprt}) { $temphash{$_}=1; }
+    foreach $tempkey (sort keys %{$allparts}) {
+	unless ($tempkey =~ /\./) {
+	    $r->print('<option value="'.$tempkey.'"');
+	    if ($$psprt[0] eq "all" ||  $temphash{$tempkey}) {
+		$r->print(' selected');
+	    }
+	    $r->print('>'.$$allparts{$tempkey}.'</option>');
+	}
+    }
+    $r->print('</select></td></tr><tr><td colspan="3"><hr /></td></tr>');
+    
+    $r->print('<tr><td>'.&mt('Sort list by').'</td><td>');
+    $r->print('<select name="fcat">');
+    $r->print('<option value="">'.&mt('Enclosing Map or Folder').'</option>');
+    foreach (sort keys %{$allkeys}) {
+	$r->print('<option value="'.$_.'"');
+	if ($fcat eq $_) { $r->print(' selected'); }
+	$r->print('>'.$$allkeys{$_}.'</option>');
+    }
+    $r->print('</select></td>');
+    
+    $r->print('</tr><tr><td colspan="3"><hr /></td></tr></table>');
+    
+}
+
 ##################################################
 ##################################################
 
@@ -848,7 +929,6 @@ sub assessparms {
     my $pschp=$env{'form.pschp'};
     my @psprt=&Apache::loncommon::get_env_multiple('form.psprt');
     if (!@psprt) { $psprt[0]='0'; }
-    my $showoptions=$env{'form.showoptions'};
 
     my $pssymb='';
     my $parmlev='';
@@ -1006,112 +1086,16 @@ sub assessparms {
     } else {
         my ($map,$id,$resource)=&Apache::lonnet::decode_symb($pssymb);
         $r->print("<tr><td>".&mt('Specific Resource')."</td><td>$resource</td>");
-        $r->print('<td><input type="submit" name="dis" value="'.$submitmessage.'"></td>');
+        $r->print('<td><input type="hidden" value="'.
+		  $pssymb.'" name="symb"><input type="submit" name="dis" value="'.
+		  $submitmessage.'"></td>');
         $r->print('</tr>');
-        $r->print('<input type="hidden" value="'.$pssymb.'" name="symb">');
-    }
-
-    $r->print('<tr><td colspan="3"><hr /><label><input type="checkbox"');
-    if ($showoptions eq 'show') {$r->print(" checked ");}
-    $r->print(' name="showoptions" value="show" />'.&mt('Show More Options').'</label><hr /></td></tr>');
-#    $r->print("<tr><td>Show: $showoptions</td></tr>");
-#    $r->print("<tr><td>pscat: @pscat</td></tr>");
-#    $r->print("<tr><td>psprt: @psprt</td></tr>");
-#    $r->print("<tr><td>fcat:  $fcat</td></tr>");
-
-    if ($showoptions eq 'show') {
-        my $tempkey;
-
-        $r->print('<tr><td colspan="3" align="center">'.&mt('Select Parameters to View').'</td></tr>');
-
-        $r->print('<tr><td colspan="2"><table><tr>');
-        my $cnt=0;
-        foreach $tempkey (sort { $allparms{$a} cmp $allparms{$b} }
-                      keys %allparms ) {
-            ++$cnt;
-            $r->print('</tr><tr>') if ($cnt%2);
-            $r->print('<td><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}.'</td>');
-	}
-	$r->print('
-</tr><tr><td>
-<script type="text/javascript">
-    function checkall(value, checkName) {
-	for (i=0; i<document.forms.parmform.elements.length; i++) {
-            ele = document.forms.parmform.elements[i];
-            if (ele.name == checkName) {
-                document.forms.parmform.elements[i].checked=value;
-            }
-        }
     }
-</script>
-<input type="button" onclick="checkall(true, \'pscat\')" value="Select All" />
-</td><td>
-<input type="button" onclick="checkall(false, \'pscat\')" value="Unselect All" />
-</td>
-');
-        $r->print('</tr></table>');
-
-#        $r->print('<tr><td>Select Parts</td><td>');
-        $r->print('<td><select multiple name="psprt" size="5">');
-        $r->print('<option value="all"');
-        $r->print(' selected') unless (@psprt);
-        $r->print('>'.&mt('All Parts').'</option>');
-        my %temphash=();
-        foreach (@psprt) { $temphash{$_}=1; }
-        foreach $tempkey (sort keys %allparts) {
-            unless ($tempkey =~ /\./) {
-                $r->print('<option value="'.$tempkey.'"');
-                if ($psprt[0] eq "all" ||  $temphash{$tempkey}) {
-                    $r->print(' selected');
-                }
-                $r->print('>'.$allparts{$tempkey}.'</option>');
-            }
-        }
-        $r->print('</select></td></tr><tr><td colspan="3"><hr /></td></tr>');
-
-        $r->print('<tr><td>'.&mt('Sort list by').'</td><td>');
-        $r->print('<select name="fcat">');
-        $r->print('<option value="">'.&mt('Enclosing Map or Folder').'</option>');
-        foreach (sort keys %allkeys) {
-            $r->print('<option value="'.$_.'"');
-            if ($fcat eq $_) { $r->print(' selected'); }
-            $r->print('>'.$allkeys{$_}.'</option>');
-        }
-        $r->print('</select></td>');
-
-        $r->print('</tr><tr><td colspan="3"><hr /></td></tr>');
-
-    } else { # hide options - include any necessary extras here
-
-        $r->print('<input type="hidden" name="fcat" value="'.$fcat.'">'."\n");
+    $r->print('</table><br />');
 
-        unless (@pscat) {
-          foreach (keys %allparms ) {
-            $r->print('<input type="hidden" name="pscat" value="'.$_.'">'."\n");
-          }
-        } else {
-          foreach (@pscat) {
-            $r->print('<input type="hidden" name="pscat" value="'.$_.'">'."\n");
-          }
-        }
 
-        unless (@psprt) {
-          foreach (keys %allparts ) {
-            $r->print('<input type="hidden" name="psprt" value="'.$_.'">'."\n");
-          }
-        } else {
-          foreach (@psprt) {
-            $r->print('<input type="hidden" name="psprt" value="'.$_.'">'."\n");
-          }
-        }
+    &menu($r,\%allparms,\%allparts,\%allkeys,\@pscat,\@psprt,$fcat);
 
-    }
-    $r->print('</table><br />');
     if (($prevvisit) || ($pschp) || ($pssymb)) {
         $submitmessage = &mt("Update Course Assessment Parameter Display");
     } else {
@@ -1119,13 +1103,6 @@ sub assessparms {
     }
     $r->print('<input type="submit" name="dis" value="'.$submitmessage.'">');
 
-#    my @temp_psprt;
-#    foreach my $t (@psprt) {
-#	push(@temp_psprt, grep {eval (/^$t\./ || ($_ == $t))} (keys %allparts));
-#    }
-
-#    @psprt = @temp_psprt;
-
     my @temp_pscat;
     map {
         my $cat = $_;
@@ -1852,30 +1829,11 @@ sub readdata {
     return $resourcedata;
 }
 
-sub extractuser {
-    my $key=shift;
-    return ($key=~/^$env{'request.course.id'}.\[useropt\:(\w+)\:(\w+)\]\./);
-}
 
-sub overview {
-    my $r=shift;
-    my $bodytag=&Apache::loncommon::bodytag(
-                             'Set/Modify Course Assessment Parameters');
-    my $dom = $env{'course.'.$env{'request.course.id'}.'.domain'};
-    my $crs = $env{'course.'.$env{'request.course.id'}.'.num'};
-    my $breadcrumbs = &Apache::lonhtmlcommon::breadcrumbs(undef,'Overview');
-    my $html=&Apache::lonxml::xmlbegin();
-    $r->print(<<ENDOVER);
-$html
-<head>
-<title>LON-CAPA Course Environment</title>
-</head>
-$bodytag
-$breadcrumbs
-<form method="post" action="/adm/parmset?action=setoverview" name="overviewform">
-<input type="hidden" name="overview" value="1" />
-ENDOVER
 # Setting
+
+sub storedata {
+    my ($r,$crs,$dom)=@_;
 # Set userlevel immediately
 # Do an intermediate store of course level
     my $olddata=&readdata($crs,$dom);
@@ -1960,10 +1918,15 @@ ENDOVER
 	}
 	&Apache::lonnet::devalidatecourseresdata($crs,$dom);
     }
-# Read modified data
+}
 
-    my $resourcedata=&readdata($crs,$dom);
+sub extractuser {
+    my $key=shift;
+    return ($key=~/^$env{'request.course.id'}.\[useropt\:(\w+)\:(\w+)\]\./);
+}
 
+sub listdata {
+    my ($r,$resourcedata,$listdata)=@_;
 # Start list output
 
     my $oldsection='';
@@ -1972,7 +1935,7 @@ ENDOVER
     my $pointer=0;
     $tableopen=0;
     my $foundkeys=0;
-    foreach my $thiskey (sort keys %{$resourcedata}) {
+    foreach my $thiskey (sort keys %{$listdata}) {
 	if ($$resourcedata{$thiskey.'.type'}) {
 	    my ($middle,$part,$name)=
 		($thiskey=~/^$env{'request.course.id'}\.(?:(.+)\.)*([\w\s]+)\.(\w+)$/);
@@ -2034,9 +1997,61 @@ ENDOVER
 	    $r->print('</td></tr>');
 	}
     }
-    
+    return $foundkeys;
+}
+
+sub newoverview {
+    my $r=shift;
+    my $bodytag=&Apache::loncommon::bodytag(
+                             'Set Course Assessment Parameters');
+    my $dom = $env{'course.'.$env{'request.course.id'}.'.domain'};
+    my $crs = $env{'course.'.$env{'request.course.id'}.'.num'};
+    my $breadcrumbs = &Apache::lonhtmlcommon::breadcrumbs(undef,'Overview');
+    my $html=&Apache::lonxml::xmlbegin();
+    $r->print(<<ENDOVER);
+$html
+<head>
+<title>LON-CAPA Parameters</title>
+</head>
+$bodytag
+$breadcrumbs
+<form method="post" action="/adm/parmset?action=newoverview" name="overviewform">
+ENDOVER
+   $r->print(&tableend().
+	     '<p><input type="submit" value="'.&mt('Submit').'" /></p></form></body></html>');
+}
+
+sub overview {
+    my $r=shift;
+    my $bodytag=&Apache::loncommon::bodytag(
+                             'Modify Course Assessment Parameters');
+    my $dom = $env{'course.'.$env{'request.course.id'}.'.domain'};
+    my $crs = $env{'course.'.$env{'request.course.id'}.'.num'};
+    my $breadcrumbs = &Apache::lonhtmlcommon::breadcrumbs(undef,'Overview');
+    my $html=&Apache::lonxml::xmlbegin();
+    $r->print(<<ENDOVER);
+$html
+<head>
+<title>LON-CAPA Parameters</title>
+</head>
+$bodytag
+$breadcrumbs
+<form method="post" action="/adm/parmset?action=setoverview" name="overviewform">
+ENDOVER
+# Store modified
+
+    &storedata($r,$crs,$dom);
+
+# Read modified data
+
+    my $resourcedata=&readdata($crs,$dom);
+
+# List data
+
+    my $foundkeys=&listdata($r,$resourcedata,$resourcedata);
+
     $r->print(&tableend().'<p>'.
-	($foundkeys?'<input type="submit" value="'.&mt('Modify Parameters').'" />':&mt('There are no course or section parameters.')).'</p></form></body></html>');
+	($foundkeys?'<input type="submit" value="'.&mt('Modify Parameters').'" />':&mt('There are no parameters.')).'</p></form></body></html>');
 }
 
 ##################################################
@@ -2174,6 +2189,10 @@ ENDMAINFORMHEAD
           { text => 'Modify Course Assessment Parameters - Overview Mode',
             action => 'setoverview',
             permission => $parm_permission,
+            },          
+	  { text => 'Set Course Assessment Parameters - Overview Mode',
+            action => 'newoverview',
+            permission => $parm_permission,
             },
           { text => 'Set/Modify Course Assessment Parameters - Table Mode',
             action => 'settable',
@@ -2286,6 +2305,10 @@ sub handler {
             &Apache::lonhtmlcommon::add_breadcrumb({href=>'/adm/parmset?action=setoverview',
 						    text=>"Overview Mode"});
 	    &overview($r);
+        } elsif ($env{'form.action'} eq 'newoverview' && $parm_permission) {
+            &Apache::lonhtmlcommon::add_breadcrumb({href=>'/adm/parmset?action=setoverview',
+						    text=>"Overview Mode"});
+	    &newoverview($r);
         } elsif ($env{'form.action'} eq 'settable' && $parm_permission) {
             &Apache::lonhtmlcommon::add_breadcrumb({href=>'/adm/parmset?action=settable',
 						    text=>"Table Mode",