--- loncom/interface/lonparmset.pm	2003/09/04 01:09:04	1.122
+++ loncom/interface/lonparmset.pm	2003/10/08 23:07:01	1.129
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Handler to set parameters for assessments
 #
-# $Id: lonparmset.pm,v 1.122 2003/09/04 01:09:04 www Exp $
+# $Id: lonparmset.pm,v 1.129 2003/10/08 23:07:01 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -653,9 +653,9 @@ sub assessparms {
 
     my $r=shift;
 # -------------------------------------------------------- Variable declaration
-    my %allkeys;
-    my %allmaps;
-    my %alllevs;
+    my %allkeys=();
+    my %allmaps=();
+    my %alllevs=();
 
     $alllevs{'Resource Level'}='full';
 #    $alllevs{'Resource Level [BRIEF]'}='brief';
@@ -937,18 +937,19 @@ sub assessparms {
         $r->print("</select></td>\n");
 
         $r->print('</tr>');
-
-        $r->print('<tr><td>Select Enclosing Map or Folder</td>');
-        $r->print('<td colspan="2"><select name="pschp">');
-        $r->print('<option value="all">All Maps or Folders</option>');
-        foreach (sort {$allmaps{$a} cmp $allmaps{$b}} keys %allmaps) {
-            $r->print('<option value="'.$_.'"');
-            if (($pschp eq $_)) { $r->print(' selected'); }
-            $r->print('>'.$maptitles{$_}.($allmaps{$_}!~/^uploaded/?'  ['.$allmaps{$_}.']':'').'</option>');
-        }
-        $r->print("</select></td></tr>\n");
+	if ($parmlev ne 'general') {
+	    $r->print('<tr><td>Select Enclosing Map or Folder</td>');
+	    $r->print('<td colspan="2"><select name="pschp">');
+	    $r->print('<option value="all">All Maps or Folders</option>');
+	    foreach (sort {$allmaps{$a} cmp $allmaps{$b}} keys %allmaps) {
+		$r->print('<option value="'.$_.'"');
+		if (($pschp eq $_)) { $r->print(' selected'); }
+		$r->print('>'.$maptitles{$_}.($allmaps{$_}!~/^uploaded/?'  ['.$allmaps{$_}.']':'').'</option>');
+	    }
+	    $r->print("</select></td></tr>\n");
+	}
     } else {
-        my ($map,$id,$resource)=split(/___/,$pssymb);
+        my ($map,$id,$resource)=&Apache::lonnet::decode_symb($pssymb);
         $r->print("<tr><td>Specific Resource</td><td>$resource</td>");
         $r->print('<td><input type="submit" name="dis" value="'.$submitmessage.'"></td>');
         $r->print('</tr>');
@@ -1152,7 +1153,8 @@ ENDTABLEHEADFOUR
                     my $totalparms=scalar keys %name;
                     if ($totalparms>0) {
                         my $firstrow=1;
-
+			my $title=$bighash{'title_'.$rid};
+			$title=~s/\&colon;/:/g;
                         $r->print('<tr><td bgcolor='.$defbgone.
                              ' rowspan='.$totalparms.
                              '><tt><font size=-1>'.
@@ -1160,7 +1162,7 @@ ENDTABLEHEADFOUR
                              '</font></tt><p><b>'.
                              "<a href=\"javascript:openWindow('/res/".$uri.
                              "', 'metadatafile', '450', '500', 'no', 'yes')\";".
-                             " TARGET=_self>$bighash{'title_'.$rid}");
+                             " TARGET=_self>$title");
 
                         if ($thistitle) {
                             $r->print(' ('.$thistitle.')');
@@ -1666,6 +1668,26 @@ ENDENV
 }
 ##################################################
 
+my $tableopen;
+
+sub tablestart {
+    if ($tableopen) {
+	return '';
+    } else {
+	$tableopen=1;
+	return '<table border="2"><tr><th>Parameter</th><th>Delete</th><th>Set to ...</th></tr>';
+    }
+}
+
+sub tableend {
+    if ($tableopen) {
+	$tableopen=0;
+	return '</table>';
+    } else {
+	return'';
+    }
+}
+
 sub overview {
     my $r=shift;
     my $bodytag=&Apache::loncommon::bodytag(
@@ -1678,48 +1700,97 @@ sub overview {
 <title>LON-CAPA Course Environment</title>
 </head>
 $bodytag
-<form method="post" action="/adm/parmset" name="overview">
+<form method="post" action="/adm/parmset" name="overviewform">
 <input type="hidden" name="overview" value="1" />
 ENDOVER
+# Setting
+    my %olddata=&Apache::lonnet::dump('resourcedata',$dom,$crs);
+    my %newdata=();
+    undef %newdata;
+    my @deldata=();
+    undef @deldata;
+    foreach (keys %ENV) {
+	if ($_=~/^form\.([a-z]+)\_(.+)$/) {
+	    my $cmd=$1;
+	    my $thiskey=$2;
+	    if ($cmd eq 'set') {
+		my $data=$ENV{$_};
+		if ($olddata{$thiskey} ne $data) { $newdata{$thiskey}=$data; }
+	    } elsif ($cmd eq 'del') {
+		push (@deldata,$thiskey);
+	    } elsif ($cmd eq 'datepointer') {
+		my $data=&Apache::lonhtmlcommon::get_date_from_form($ENV{$_});
+		if ($olddata{$thiskey} ne $data) { $newdata{$thiskey}=$data; }
+	    }
+	}
+    }
+# Store
+    &Apache::lonnet::del('resourcedata',\@deldata,$dom,$crs);
+    &Apache::lonnet::put('resourcedata',\%newdata,$dom,$crs);
 # Read and display
     my %resourcedata=&Apache::lonnet::dump('resourcedata',$dom,$crs);
     my $oldsection='';
     my $oldrealm='';
     my $oldpart='';
+    my $pointer=0;
+    $tableopen=0;
     foreach my $thiskey (sort keys %resourcedata) {
-	my ($course,$middle,$part,$name)=
-	    ($thiskey=~/^(\w+)\.(.*)\.*([\w\s]+)\.(\w+)$/);
-	unless ($name eq 'type') {
+	if ($resourcedata{$thiskey.'.type'}) {
+	    my ($course,$middle,$part,$name)=
+		($thiskey=~/^(\w+)\.(?:(.+)\.)*([\w\s]+)\.(\w+)$/);
 	    my $section='All Students';
 	    if ($middle=~/^\[(.*)\]\./) {
 		$section='Group/Section: '.$1;
 		$middle=~s/^\[(.*)\]\.//;
 	    }
-	    my $realm='All Resources';
+	    $middle=~s/\.$//;
+	    my $realm='<font color="red">All Resources</font>';
 	    if ($middle=~/^(.+)\_\_\_\(all\)$/) {
-		$realm='Folder/Map: '.$1;
+		$realm='<font color="green">Folder/Map: '.&Apache::lonnet::gettitle($1).'</font>';
 	    } elsif ($middle) {
-		$realm='Resource: '.$middle;
+		$realm='<font color="orange">Resource: '.&Apache::lonnet::gettitle($middle).'</font>';
 	    }
 	    if ($section ne $oldsection) {
-		$r->print("\n<hr /><h1>$section</h1>");
+		$r->print(&tableend()."\n<hr /><h1>$section</h1>");
 		$oldsection=$section;
 		$oldrealm='';
 	    }
 	    if ($realm ne $oldrealm) {
-		$r->print("\n<h2>$realm</h2>");
+		$r->print(&tableend()."\n<h2>$realm</h2>");
 		$oldrealm=$realm;
 		$oldpart='';
 	    }
 	    if ($part ne $oldpart) {
-		$r->print("\n<h3>Part: $part</h3>");
+		$r->print(&tableend().
+			  "\n<h3><font color='blue'>Part: $part</font></h3>");
 		$oldpart=$part;
 	    }
-
-	    $r->print('<br />'.$name.': '.$thiskey.' = '.$resourcedata{$thiskey});
+#
+# Ready to print
+#
+	    $r->print(&tablestart().'<tr><td><b>'.$name.
+		      ':</b></td><td><input type="checkbox" name="del_'.
+		      $thiskey.'" /></td><td>');
+	    if ($resourcedata{$thiskey.'.type'}=~/^date/) {
+		my $jskey='key_'.$pointer;
+		$pointer++;
+		$r->print(
+			  &Apache::lonhtmlcommon::date_setter('overviewform',
+							      $jskey,
+						      $resourcedata{$thiskey}).
+'<input type="hidden" name="datepointer_'.$thiskey.'" value="'.$jskey.'" />'
+			  );
+	    } else {
+		$r->print(
+			  '<input type="text" name="set_'.$thiskey.'" value="'.
+			  $resourcedata{$thiskey}.'">');
+	    }
+	    $r->print('</td></tr>');
 	}
     }
-    $r->print('</form></body></html>');
+    
+    $r->print(&tableend().
+	      '<p><input type="submit" value="Modify Parameters" /></p></form></body></html>');
 }
 
 ##################################################
@@ -1740,7 +1811,7 @@ sub handler {
     my $r=shift;
 
     if ($r->header_only) {
-	$r->content_type('text/html');
+	&Apache::loncommon::content_type($r,'text/html');
 	$r->send_http_header;
 	return OK;
     }
@@ -1751,7 +1822,7 @@ sub handler {
     if (($ENV{'request.course.id'}) && 
 	(&Apache::lonnet::allowed('opa',$ENV{'request.course.id'}))) {
 
-        $r->content_type('text/html');
+        &Apache::loncommon::content_type($r,'text/html');
         $r->send_http_header;
  
         $coursename=$ENV{'course.'.$ENV{'request.course.id'}.'.description'};