--- loncom/interface/lonparmset.pm	2003/11/17 20:56:30	1.135
+++ loncom/interface/lonparmset.pm	2003/12/12 19:41:11	1.139.2.2
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Handler to set parameters for assessments
 #
-# $Id: lonparmset.pm,v 1.135 2003/11/17 20:56:30 albertel Exp $
+# $Id: lonparmset.pm,v 1.139.2.2 2003/12/12 19:41:11 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -131,12 +131,12 @@ sub parmval {
 
 # -------------------------------------------------------- first, check default
 
-    if ($def) { $outpar[11]=$def; $result=11; }
+    if (defined($def)) { $outpar[11]=$def; $result=11; }
 
 # ----------------------------------------------------- second, check map parms
 
     my $thisparm=$parmhash{$symbparm};
-    if ($thisparm) { $outpar[10]=$thisparm; $result=10; }
+    if (defined($thisparm)) { $outpar[10]=$thisparm; $result=10; }
 
 # --------------------------------------------------------- third, check course
 
@@ -285,7 +285,7 @@ sub plink {
 
 
 sub startpage {
-    my ($r,$id,$udom,$csec,$uname,$have_assesments)=@_;
+    my ($r,$id,$udom,$csec,$uname,$have_assesments,$trimheader)=@_;
 
     my $bodytag=&Apache::loncommon::bodytag('Set/Modify Course Parameters','',
                                             'onUnload="pclose()"');
@@ -354,7 +354,9 @@ sub startpage {
 $selscript
 </head>
 $bodytag
+ENDHEAD
 
+    unless ($trimheader) {$r->print(<<ENDHEAD2);
 <form method="post" action="/adm/parmset" name="envform">
 <h4>$lt{'cep'}</h4>
 <input type="submit" name="crsenv" value="$lt{'scep'}" />
@@ -370,9 +372,12 @@ $bodytag
 <input type="submit" name="overview" value="$lt{'mcap'}" />
 </form>
 <hr />
+ENDHEAD2
+}
+    $r->print(<<ENDHEAD3);
 <form method="post" action="/adm/parmset" name="parmform">
 <h4>$lt{'captm'}</h4>
-ENDHEAD
+ENDHEAD3
 
     if (!$have_assesments) {
 	$r->print('<font color="red">'.&mt('There are no assesment parameters in this course to set.').'</font><br />');	
@@ -485,21 +490,23 @@ sub print_row {
         } # end of $brief if/else
     } # end of $parmlev if/else
 
-    if ($parmlev eq 'full' || $parmlev eq 'brief') {
-        $r->print('<td bgcolor=#CCCCFF align="center">'.
+    $r->print('<td bgcolor=#CCCCFF align="center">'.
                   &valout($outpar[$result],$typeoutpar[$result]).'</td>');
-    }
-    my $sessionval=&Apache::lonnet::EXT('resource.'.$$part{$which}.
+
+    if ($parmlev eq 'full' || $parmlev eq 'brief') {
+        my $sessionval=&Apache::lonnet::EXT('resource.'.$$part{$which}.
                                         '.'.$$name{$which},$symbp{$rid});
+
 # this doesn't seem to work, and I don't think is correct
 #    my $sessionvaltype=&Apache::lonnet::EXT('resource.'.$$part{$which}.
 #                                      '.'.$$name{$which}.'.type',$symbp{$rid});
 # this seems to work
-    my $sessionvaltype=$typeoutpar[$result];
-    if (!defined($sessionvaltype)) { $sessionvaltype=$$defaulttype{$which}; }
-    $r->print('<td bgcolor=#999999 align="center"><font color=#FFFFFF>'.
+        my $sessionvaltype=$typeoutpar[$result];
+        if (!defined($sessionvaltype)) { $sessionvaltype=$$defaulttype{$which}; }
+        $r->print('<td bgcolor=#999999 align="center"><font color=#FFFFFF>'.
                   &valout($sessionval,$sessionvaltype).'&nbsp;'.
                   '</font></td>');
+    }
     $r->print('</tr>');
     $r->print("\n");
 }
@@ -687,6 +694,7 @@ sub assessparms {
 
     my $pssymb='';
     my $parmlev='';
+    my $trimheader='';
     my $prevvisit=$ENV{'form.prevvisit'};
 
 #    unless ($parmlev==$ENV{'form.parmlev'}) {
@@ -709,11 +717,13 @@ sub assessparms {
 	if (!@pscat) { @pscat=('all'); }
 	$pschp='';
         $parmlev = 'full';
+        $trimheader='yes';
     } elsif ($ENV{'form.symb'}) {
 	$pssymb=$ENV{'form.symb'};
 	if (!@pscat) { @pscat=('all'); }
 	$pschp='';
         $parmlev = 'full';
+        $trimheader='yes';
     } else {
 	$ENV{'form.url'}='';
     }
@@ -903,7 +913,7 @@ sub assessparms {
     my $have_assesments=1;
     if (scalar(keys(%allkeys)) eq 0) { $have_assesments=0; }
 
-    &startpage($r,$id,$udom,$csec,$uname,$have_assesments);
+    &startpage($r,$id,$udom,$csec,$uname,$have_assesments,$trimheader);
 
     if (!$have_assesments) {
 	untie(%bighash);
@@ -1510,8 +1520,8 @@ sub crsenv {
              'courseid'       => '<b>Course ID or number</b><br />'.
                                  '(internal, optional)',
              'grading'        => '<b>Grading</b>'.
-                                 '"standard" or any other value.  '.
-                                 'Default for new courses is "standard".',
+                                 '"standard", "external", or any other value.'.
+                                 '  Default for new courses is "standard".',
 
              'default_xml_style' => '<b>Default XML Style File</b> '.
                     '<a href="javascript:openbrowser'.
@@ -1604,10 +1614,12 @@ sub crsenv {
                              'default_enrollment_end_date',
                              );
 	foreach my $parameter (sort(keys(%values))) {
-	    if (! $descriptions{$parameter}) {
-                $descriptions{$parameter}=$parameter;
-                push(@Display_Order,$parameter);
-	    }
+            unless ($parameter =~ m/^internal\./) {
+                if (! $descriptions{$parameter}) {
+                    $descriptions{$parameter}=$parameter;
+                    push(@Display_Order,$parameter);
+                }
+            }
 	}
         foreach my $parameter (@Display_Order) {
             my $description = $descriptions{$parameter};
@@ -1747,8 +1759,25 @@ ENDOVER
 	}
     }
 # Store
-    &Apache::lonnet::del('resourcedata',\@deldata,$dom,$crs);
-    &Apache::lonnet::put('resourcedata',\%newdata,$dom,$crs);
+    my $delentries=$#deldata+1;
+    my @newdatakeys=keys %newdata;
+    my $putentries=$#newdatakeys+1;
+    if ($delentries) {
+	if (&Apache::lonnet::del('resourcedata',\@deldata,$dom,$crs) eq 'ok') {
+	    $r->print('<h2>'.&mt('Deleted [_1] parameter(s)</h2>',$delentries));
+	} else {
+	    $r->print('<h2><font color="red">'.
+		      &mt('Error deleting parameters').'</font></h2>');
+	}
+    }
+    if ($putentries) {
+	if (&Apache::lonnet::put('resourcedata',\%newdata,$dom,$crs) eq 'ok') {
+	    $r->print('<h2>'.&mt('Stored [_1] parameter(s)</h2>',$putentries));
+	} else {
+	    $r->print('<h2><font color="red">'.
+		      &mt('Error storing parameters').'</font></h2>');
+	}
+    }
 # Read and display
     my %resourcedata=&Apache::lonnet::dump('resourcedata',$dom,$crs);
     my $oldsection='';
@@ -1756,6 +1785,7 @@ ENDOVER
     my $oldpart='';
     my $pointer=0;
     $tableopen=0;
+    my $foundkeys=0;
     foreach my $thiskey (sort keys %resourcedata) {
 	if ($resourcedata{$thiskey.'.type'}) {
 	    my ($course,$middle,$part,$name)=
@@ -1793,6 +1823,7 @@ ENDOVER
 	    $r->print(&tablestart().'<tr><td><b>'.$name.
 		      ':</b></td><td><input type="checkbox" name="del_'.
 		      $thiskey.'" /></td><td>');
+	    $foundkeys++;
 	    if ($resourcedata{$thiskey.'.type'}=~/^date/) {
 		my $jskey='key_'.$pointer;
 		$pointer++;
@@ -1811,8 +1842,8 @@ ENDOVER
 	}
     }
     
-    $r->print(&tableend().
-	      '<p><input type="submit" value="'.&mt('Modify Parameters').'" /></p></form></body></html>');
+    $r->print(&tableend().'<p>'.
+	($foundkeys?'<input type="submit" value="'.&mt('Modify Parameters').'" />':&mt('There are no course or section parameters.')).'</p></form></body></html>');
 }
 
 ##################################################