--- loncom/interface/lonparmset.pm	2005/09/02 22:35:48	1.248
+++ loncom/interface/lonparmset.pm	2005/10/17 21:33:52	1.261
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Handler to set parameters for assessments
 #
-# $Id: lonparmset.pm,v 1.248 2005/09/02 22:35:48 albertel Exp $
+# $Id: lonparmset.pm,v 1.261 2005/10/17 21:33:52 banghart Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -1921,6 +1921,9 @@ sub crsenv {
 	     'disablesigfigs'
 	         => '<b>'.&mt('Disable checking of Significant Figures').'</b><br />'.
                     ' ('.&mt('"[_1]" to disable, anything else if not','<tt>yes</tt>').')',
+	     'disableexampointprint'
+	         => '<b>'.&mt('Disable automatically printing point values onto exams.').'</b><br />'.
+                    ' ('.&mt('"[_1]" to disable, anything else if not','<tt>yes</tt>').')',
 	     'tthoptions'
 	         => '<b>'.&mt('Default set of options to pass to tth/m when converting tex').'</b>'
              ); 
@@ -1947,7 +1950,8 @@ sub crsenv {
                              'default_enrollment_start_date',
                              'default_enrollment_end_date',
 			     'tthoptions',
-			     'disablesigfigs'
+			     'disablesigfigs',
+			     'disableexampointprint'
                              );
 	foreach my $parameter (sort(keys(%values))) {
             unless (($parameter =~ m/^internal\./)||($parameter =~ m/^metadata\./)) {
@@ -2191,7 +2195,6 @@ sub listdata {
     my $foundkeys=0;
     my %keyorder=&standardkeyorder();
     foreach my $thiskey (sort {
-	my $return;
 	if ($sortorder eq 'realmstudent') {
 	    my ($astudent,$arealm)=($a=~/^\Q$env{'request.course.id'}\E\.\[([^\.]+)\]\.(.+)\.[^\.]+$/);
 	    my ($bstudent,$brealm)=($b=~/^\Q$env{'request.course.id'}\E\.\[([^\.]+)\]\.(.+)\.[^\.]+$/);
@@ -2699,8 +2702,8 @@ ENDMAINFORMHEAD
 	    action => 'crsenv',
             permission => $parm_permission,
             },
-          { text => 'Set Instructor Defined Metadata',
-	    action => 'setinstmeta',
+          { text => 'Set Portfolio Metadata',
+	    action => 'setrestrictmeta',
             permission => $parm_permission,
             },
           { text => 'Set/Modify Resource Parameters - Helper Mode',
@@ -2746,96 +2749,98 @@ ENDMAINFORMHEAD
     $r->print($menu_html);
     return;
 }
-### Set instructor defined metadata
-sub setinstmeta {
+### Set portfolio metadata
+sub output_row {
+    my ($r, $field_name, $field_text) = @_;
+    my $output;
+    my $options=$env{'course.'.$env{'request.course.id'}.'.'.$field_name.'.options'};
+    my $values=$env{'course.'.$env{'request.course.id'}.'.'.$field_name.'.values'};
+    my $checked;
+    unless (defined($options)) {
+        $options = 'active,stuadd';
+        $values = '';
+    }
+    $output.='<strong>'.$field_text.':</strong>';
+    $output.='<input name="'.$field_name.'_values" type="text" value="'.$values.'" /><br />';
+    if ($options =~ m/active/) {
+        $checked = ' checked="checked" ';
+    } else {
+        $checked = '  ';
+    }
+    $output.='&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<input type="checkbox" name="'.$field_name.'_active" value="yes"'.$checked.' />';
+    $output.='Show to student <br />';
+    if ($options =~ m/onlyone/) {
+        $checked = ' checked="checked" ';
+    } else {
+        $checked = '  ';
+    }
+    $output.='&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<input type="checkbox" name="'.$field_name.'_onlyone" value="yes"'.$checked.' />';
+    $output.='Student may select only one choice <br />';
+    if ($options =~ m/stuadd/) {
+        $checked = ' checked="checked" ';
+    } else {
+        $checked = ' ';
+    }
+    $output.='&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<input type="checkbox" name="'.$field_name.'_stuadd" value="yes"'.$checked.' />';
+    $output.='Student may type choices <br />';
+    return ($output);
+}
+
+sub setrestrictmeta {
     my ($r)=@_;
     my $next_meta;
     my $output;
     my $item_num;
     my $put_result;
-    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>
+            <title>LON-CAPA Restrict Metadata</title>
             </head>');
-    $r->print(&Apache::loncommon::bodytag('Set Instructor Metadata'));
+    $r->print(&Apache::loncommon::bodytag('Restrict Metadata'));
     $r->print(&Apache::lonhtmlcommon::breadcrumbs(undef,
-						    'Set Instructor Metadata'));
+						    'Restrict 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 $item_num = $1;
-            my $name = 'metadata.'.$item_num.'.type';
-            my $value = $env{'form.type'.$item_num};
-            $put_result = &Apache::lonnet::put('environment',
-                                                  {$name=>$value},$dom,$crs);
-            $name = 'metadata.'.$item_num.'.values';
-            $value = $env{'form.values'.$item_num};
-            $put_result = &Apache::lonnet::put('environment',
-                                                  {$name=>$value},$dom,$crs);
-        }
-        if ($field=~m/newfield/) {
-            my $item_num = $env{'form.serial'};
-            my $name = 'metadata.'.$item_num.'.type';
-            my $value = $env{'form.typenew'};
-            $put_result = &Apache::lonnet::put('environment',
-                                                  {$name=>$value},$dom,$crs);
-            $name = 'metadata.'.$item_num.'.values';
-            $value = $env{'form.valuesnew'};
-            $put_result = &Apache::lonnet::put('environment',
-                                                  {$name=>$value},$dom,$crs);
-            $name = 'metadata.'.$item_num.'.title';
-            $value = $env{'form.titlenew'};
-            $put_result = &Apache::lonnet::put('environment',
-                                                  {$name=>$value},$dom,$crs);
-            
+    my $key_base = $env{'course.'.$env{'request.course.id'}.'.'};
+    my $save_field = '';
+    if ($env{'form.restrictmeta'}) {
+        foreach my $field (sort(keys(%env))) {
+            if ($field=~m/^form.(.+)_(.+)$/) {
+                my $options;
+                my $meta_field = $1;
+                my $meta_key = $2;
+                if ($save_field ne $meta_field) {
+                    $save_field = $meta_field;
+            	    if ($env{'form.'.$meta_field.'_stuadd'}) {
+            	        $options.='stuadd,';
+            	    } 
+            	    if ($env{'form.'.$meta_field.'_onlyone'}) {
+            	        $options.='onlyone,';
+            	    } 
+            	    if ($env{'form.'.$meta_field.'_active'}) {
+            	        $options.='active,';
+            	    }
+                    my $name = $save_field;
+                     $put_result = &Apache::lonnet::put('environment',
+                                                  {$meta_field.'.options'=>$options,
+                                                   $meta_field.'.values'=>$env{'form.'.$meta_field.'_values'},
+                                                   },$dom,$crs);
+                }
+            }
         }
-        
-              
-    } 
-    &Apache::lonnet::coursedescription($env{'request.course.id'});      
-    foreach my $key (sort keys %env) {
-        if ($key=~m/^course\.$env{'request.course.id'}\.metadata\.\d+\.title$/) {
-            $key=~m/(^course\.$env{'request.course.id'}\.metadata\.)(\d+)\.title/;
-            $key_base = $1;
-            $item_num = $2;
-            if ($item_num ge $next_meta) {
-                $next_meta = $item_num + 1;
-            }
-            $output.='<tr><td>'.$env{$key}.'</td>';
-            $output.='<td>Select one: <input type="radio" name="type'.$item_num.'" value="one" /><br />';
-            $output.='Select many: <input type="radio" name="type'.$item_num.'" value="many" /></td>';
-            $output.='<td><input name="values'.$item_num.'" type="text" value="'.$env{$key_base.$item_num.'.values'}.'" /></td></tr>';
-        }
-    }
-    $output.='<tr><td><i>Create new instructor metadata item</i><br />';
-    $output.='<input type="text" name="titlenew" /></td>';
-    $output.='<td>Select one: <input type="radio" name="typenew" value="one" /><br />';
-    $output.='Select many: <input type="radio" name="typenew" value="many" /></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>';
+    }
+    &Apache::lonnet::coursedescription($env{'request.course.id'});
+    my %metadata_fields = &Apache::lonmeta::fieldnames('portfolio');
+    foreach my $field (sort(keys(%metadata_fields))) {
+	$output.= &output_row($r, $field, $metadata_fields{$field});
+    }
     $r->print(<<ENDenv);       
-        <form method="post" action="/adm/parmset?action=setinstmeta" name="form">
-        
+        <form method="post" action="/adm/parmset?action=setrestrictmeta" 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">
+        <input type="submit" name="restrictmeta" value="Update Metadata Restrictions">
         </form>
-
 ENDenv
-        
-    
     $r->print('</body>
                 </html>');
     return 'ok';
@@ -3012,6 +3017,7 @@ Main handler.  Calls &assessparms and &c
 ##################################################
 #    use Data::Dumper;
 
+
 sub handler {
     my $r=shift;
 
@@ -3072,10 +3078,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 'setrestrictmeta' && $parm_permission) {
+            &Apache::lonhtmlcommon::add_breadcrumb({href=>'/adm/parmset?action=setrestrictmeta',
+						    text=>"Restrict Metadata"});
+	    &setrestrictmeta($r);
         } elsif ($env{'form.action'} eq 'newoverview' && $parm_permission) {
             &Apache::lonhtmlcommon::add_breadcrumb({href=>'/adm/parmset?action=setoverview',
 						    text=>"Overview Mode"});