[BACK]Return to lonparmset.pm CVS log [TXT] [DIR] Up to [LON-CAPA] / loncom / interface

Diff for /loncom/interface/lonparmset.pm between versions 1.350.2.1 and 1.366

version 1.350.2.1, 2006/12/14 20:08:15 version 1.366, 2007/06/06 20:19:38
Line 272  sub resetrulescache { Line 272  sub resetrulescache {
   
 sub rulescache {  sub rulescache {
     my $id=shift;      my $id=shift;
     if ($rulesid ne $env{'request.course.id'}) {      if ($rulesid ne $env{'request.course.id'}
  && !defined($rules{$id})) {   && !defined($rules{$id})) {
  my $dom = $env{'course.'.$env{'request.course.id'}.'.domain'};   my $dom = $env{'course.'.$env{'request.course.id'}.'.domain'};
  my $crs = $env{'course.'.$env{'request.course.id'}.'.num'};   my $crs = $env{'course.'.$env{'request.course.id'}.'.num'};
Line 554  sub valout { Line 554  sub valout {
             }              }
             $result=~s/\s+$//;              $result=~s/\s+$//;
         } elsif (&isdateparm($type)) {          } elsif (&isdateparm($type)) {
             $result = localtime($value).&date_sanity_info($value);              $result = &Apache::lonlocal::locallocaltime($value).
    &date_sanity_info($value);
         } else {          } else {
             $result = $value;              $result = $value;
         }          }
Line 934  sub extractResourceInformation { Line 935  sub extractResourceInformation {
  $$typep{$id}=$1;   $$typep{$id}=$1;
  $$keyp{$id}='';   $$keyp{$id}='';
         $$uris{$id}=$srcf;          $$uris{$id}=$srcf;
  foreach (split(/\,/,&Apache::lonnet::metadata($srcf,'allpossiblekeys'))) {   foreach my $key (split(/\,/,&Apache::lonnet::metadata($srcf,'allpossiblekeys'))) {
     if ($_=~/^parameter\_(.*)/) {      next if ($key!~/^parameter_/);
  my $key=$_;  
 # Hidden parameters  # Hidden parameters
  if (&Apache::lonnet::metadata($srcf,$key.'.hidden') eq 'parm') {      next if (&Apache::lonnet::metadata($srcf,$key.'.hidden') eq 'parm');
     next;  
  }  
  my $display= &Apache::lonnet::metadata($srcf,$key.'.display');  
  my $name=&Apache::lonnet::metadata($srcf,$key.'.name');  
  my $part= &Apache::lonnet::metadata($srcf,$key.'.part');  
 #  #
 # allparms is a hash of parameter names  # allparms is a hash of parameter names
 #  #
       my $name=&Apache::lonnet::metadata($srcf,$key.'.name');
       if (!exists($$allparms{$name})) {
    my $display= &Apache::lonnet::metadata($srcf,$key.'.display');
  my $parmdis = $display;   my $parmdis = $display;
  $parmdis =~ s/\[Part.*$//g;   $parmdis =~ s/\[Part.*$//g;
                 $$allparms{$name}=$parmdis;   $$allparms{$name}=$parmdis;
  $$defkeytype{$name}=&Apache::lonnet::metadata($srcf,$key.'.type');   if (ref($defkeytype)) {
       $$defkeytype{$name}=
    &Apache::lonnet::metadata($srcf,$key.'.type');
    }
       }
   
 #  #
 # allparts is a hash of all parts  # allparts is a hash of all parts
 #  #
  $$allparts{$part} = "Part: $part";      my $part= &Apache::lonnet::metadata($srcf,$key.'.part');
       $$allparts{$part} = "Part: $part";
 #  #
 # Remember all keys going with this resource  # Remember all keys going with this resource
 #  #
  if ($$keyp{$id}) {      if ($$keyp{$id}) {
     $$keyp{$id}.=','.$key;   $$keyp{$id}.=','.$key;
  } else {      } else {
     $$keyp{$id}=$key;   $$keyp{$id}=$key;
  }      }
 #  #
 # Put in order  # Put in order
 #   # 
                 unless ($$keyorder{$key}) {      unless ($$keyorder{$key}) {
                     $$keyorder{$key}=$keyordercnt;   $$keyorder{$key}=$keyordercnt;
                     $keyordercnt++;   $keyordercnt++;
  }  
   
     }      }
  }   }
  $$mapp{$id}=  
     &Apache::lonnet::declutter($resource->enclosing_map_src());  
  $$mapp{$mapid}=$$mapp{$id};   if (!exists($$mapp{$mapid})) {
  $$allmaps{$mapid}=$$mapp{$id};      $$mapp{$id}=
  if ($mapid eq '1') {   &Apache::lonnet::declutter($resource->enclosing_map_src());
     $$maptitles{$mapid}='Main Course Documents';      $$mapp{$mapid}=$$mapp{$id};
       $$allmaps{$mapid}=$$mapp{$id};
       if ($mapid eq '1') {
    $$maptitles{$mapid}='Main Course Documents';
       } else {
    $$maptitles{$mapid}=
       &Apache::lonnet::gettitle($$mapp{$id});    
       }
       $$maptitles{$$mapp{$id}}=$$maptitles{$mapid};
       $$symbp{$mapid}=$$mapp{$id}.'___(all)';
  } else {   } else {
     $$maptitles{$mapid}=&Apache::lonnet::gettitle(&Apache::lonnet::clutter($$mapp{$id}));      $$mapp{$id} = $$mapp{$mapid};
  }   }
  $$maptitles{$$mapp{$id}}=$$maptitles{$mapid};  
  $$symbp{$id}=&Apache::lonnet::encode_symb($$mapp{$id},$resid,$srcf);   $$symbp{$id}=&Apache::lonnet::encode_symb($$mapp{$id},$resid,$srcf);
  $$symbp{$mapid}=$$mapp{$id}.'___(all)';  
     }      }
 }  }
   
Line 2034  sub crsenv { Line 2044  sub crsenv {
         if ($name =~ /^default_enrollment_(start|end)_date$/) {          if ($name =~ /^default_enrollment_(start|end)_date$/) {
             $value=&Apache::lonhtmlcommon::get_date_from_form($name.'_value');              $value=&Apache::lonhtmlcommon::get_date_from_form($name.'_value');
         }          }
    #
           # Deal with the emails
           if ($name =~ /\.email$/) {
       my ($user,$domain) = split(/:/,$value);
       if (!defined($user) || !defined($domain)) {
    $setoutput.= '<br /> <span class="LC_error">'.
       &mt("Invalid email address specified, address must be of the form username:domain").
       '</span>';
    undef($value);
       } elsif (&Apache::lonnet::homeserver($user,$domain) eq 'no_host') {
    $setoutput.= '<br /> <span class="LC_error">'.
       &mt("Invalid email address specified, user [_1] is unknown.",$value).
       '</span>';
    undef($value);
       }
           }
         # Get existing cloners          # Get existing cloners
         my @oldcloner = ();          my @oldcloner = ();
         if ($name eq 'cloners') {          if ($name eq 'cloners') {
Line 2121  sub crsenv { Line 2147  sub crsenv {
              'question.email' => '<b>'.&mt('Feedback Addresses for Resource Content Question').               'question.email' => '<b>'.&mt('Feedback Addresses for Resource Content Question').
                                  '</b><br />(<tt>user:domain,'.                                   '</b><br />(<tt>user:domain,'.
                                  'user:domain(section;section;...;*;...),...</tt>)',                                   'user:domain(section;section;...;*;...),...</tt>)',
                'question.email.text' => '<b>'.&mt('Custom Text for Resource Content Question Option in Feedback').
                                    '</b>',
              'comment.email'  => '<b>'.&mt('Feedback Addresses for Course Content Comments').'</b><br />'.               'comment.email'  => '<b>'.&mt('Feedback Addresses for Course Content Comments').'</b><br />'.
                                  '(<tt>user:domain,user:domain(section;section;...;*;...),...</tt>)',                                   '(<tt>user:domain,user:domain(section;section;...;*;...),...</tt>)',
                'comment.email.text' => '<b>'.&mt('Custom Text for Course Content Option in Feedback').
                                    '</b>',
              'policy.email'   => '<b>'.&mt('Feedback Addresses for Course Policy').'</b>'.               'policy.email'   => '<b>'.&mt('Feedback Addresses for Course Policy').'</b>'.
                                  '<br />(<tt>user:domain,user:domain(section;section;...;*;...),...</tt>)',                                   '<br />(<tt>user:domain,user:domain(section;section;...;*;...),...</tt>)',
                'policy.email.text' => '<b>'.&mt('Custom Text for Course Policy Option in Feedback').
                                    '</b>',
              'hideemptyrows'  => '<b>'.&mt('Hide Empty Rows in Spreadsheets').'</b><br />'.               'hideemptyrows'  => '<b>'.&mt('Hide Empty Rows in Spreadsheets').'</b><br />'.
                                  '('.&mt('"[_1]" for default hiding','<tt>yes</tt>').')',                                   '('.&mt('"[_1]" for default hiding','<tt>yes</tt>').')',
              'pageseparators'  => '<b>'.&mt('Visibly Separate Items on Pages').'</b><br />'.               'pageseparators'  => '<b>'.&mt('Visibly Separate Items on Pages').'</b><br />'.
Line 2207  sub crsenv { Line 2239  sub crsenv {
                  => '<b>'.&mt('Disable display of problem receipts').'</b><br />'.                   => '<b>'.&mt('Disable display of problem receipts').'</b><br />'.
                     ' ('.&mt('"[_1]" to disable, anything else if not','<tt>yes</tt>').')',                      ' ('.&mt('"[_1]" to disable, anything else if not','<tt>yes</tt>').')',
      'task_messages'       'task_messages'
          => '<b>'.&mt('Send message to student when clicking Done on Tasks. [_1] to send a message only to student, [_2] to send message to student and add record to user information page for instructors. Leave blank to disable.','<tt>only_student</tt>','<tt>student_and_user_notes_screen</tt>').'</b>',           => '<b>'.&mt('Send message to student when clicking Done on Tasks').'</b><br /> ('.&mt('[_1] to send a message only to student, [_2] to send message to student and add record to user information page for instructors. Leave blank to disable.','<tt>only_student</tt>','<tt>student_and_user_notes_screen</tt>').')',
      'disablesigfigs'       'disablesigfigs'
          => '<b>'.&mt('Disable checking of Significant Figures').'</b><br />'.           => '<b>'.&mt('Disable checking of Significant Figures').'</b><br />'.
                     ' ('.&mt('"[_1]" to disable, anything else if not','<tt>yes</tt>').')',                      ' ('.&mt('"[_1]" to disable, anything else if not','<tt>yes</tt>').')',
Line 2222  sub crsenv { Line 2254  sub crsenv {
         my @Display_Order = ('url','description','courseid','cloners','grading',          my @Display_Order = ('url','description','courseid','cloners','grading',
                              'externalsyllabus',                               'externalsyllabus',
                              'default_xml_style','pageseparators',                               'default_xml_style','pageseparators',
                              'question.email','comment.email','policy.email',                               'question.email','question.email.text','comment.email','comment.email.text','policy.email','policy.email.text',
                              'student_classlist_view',                               'student_classlist_view',
                              'plc.roles.denied','plc.users.denied',                               'plc.roles.denied','plc.users.denied',
                              'pch.roles.denied','pch.users.denied',                               'pch.roles.denied','pch.users.denied',
Line 2409  sub storedata { Line 2441  sub storedata {
  $tkey.'.type' => $typeof},   $tkey.'.type' => $typeof},
  $tudom,$tuname) eq 'ok') {   $tudom,$tuname) eq 'ok') {
     &log_parmset({$tkey=>$data,$tkey.'.type' => $typeof},0,$tuname,$tudom);      &log_parmset({$tkey=>$data,$tkey.'.type' => $typeof},0,$tuname,$tudom);
     $r->print('<br />'.&mt('Stored modified parameter for').' '.      $r->print('<br />'.&mt('Saved modified parameter for').' '.
       &Apache::loncommon::plainname($tuname,$tudom));        &Apache::loncommon::plainname($tuname,$tudom));
  } else {   } else {
     $r->print('<div class="LC_error">'.      $r->print('<div class="LC_error">'.
       &mt('Error storing parameters').'</div>');        &mt('Error saving parameters').'</div>');
  }   }
  &Apache::lonnet::devalidateuserresdata($tuname,$tudom);   &Apache::lonnet::devalidateuserresdata($tuname,$tudom);
     } else {      } else {
Line 2443  sub storedata { Line 2475  sub storedata {
  $tkey.'.type' => $typeof},   $tkey.'.type' => $typeof},
  $tudom,$tuname) eq 'ok') {   $tudom,$tuname) eq 'ok') {
     &log_parmset({$tkey=>$data,$tkey.'.type' => $typeof},0,$tuname,$tudom);      &log_parmset({$tkey=>$data,$tkey.'.type' => $typeof},0,$tuname,$tudom);
     $r->print('<br />'.&mt('Stored modified date for').' '.&Apache::loncommon::plainname($tuname,$tudom));      $r->print('<br />'.&mt('Saved modified date for').' '.&Apache::loncommon::plainname($tuname,$tudom));
  } else {   } else {
     $r->print('<div class="LC_error">'.      $r->print('<div class="LC_error">'.
       &mt('Error storing parameters').'</div>');        &mt('Error saving parameters').'</div>');
  }   }
  &Apache::lonnet::devalidateuserresdata($tuname,$tudom);   &Apache::lonnet::devalidateuserresdata($tuname,$tudom);
     } else {      } else {
Line 2475  sub storedata { Line 2507  sub storedata {
     if ($putentries) {      if ($putentries) {
  if (&Apache::lonnet::put('resourcedata',\%newdata,$dom,$crs) eq 'ok') {   if (&Apache::lonnet::put('resourcedata',\%newdata,$dom,$crs) eq 'ok') {
     &log_parmset(\%newdata,0);      &log_parmset(\%newdata,0);
     $r->print('<h3>'.&mt('Stored [_1] parameter(s)',$putentries/2).'</h3>');      $r->print('<h3>'.&mt('Saved [_1] parameter(s)',$putentries/2).'</h3>');
  } else {   } else {
     $r->print('<div class="LC_error">'.      $r->print('<div class="LC_error">'.
       &mt('Error storing parameters').'</div>');        &mt('Error saving parameters').'</div>');
  }   }
  &Apache::lonnet::devalidatecourseresdata($crs,$dom);   &Apache::lonnet::devalidatecourseresdata($crs,$dom);
     }      }
Line 2759  ENDOVER Line 2791  ENDOVER
  &listdata($r,$resourcedata,$listdata,$sortorder);   &listdata($r,$resourcedata,$listdata,$sortorder);
     }      }
     $r->print(&tableend().      $r->print(&tableend().
      ((($env{'form.store'}) || ($env{'form.dis'}))?'<p><input type="submit" name="store" value="'.&mt('Store').'" /></p>':'').       ((($env{'form.store'}) || ($env{'form.dis'}))?'<p><input type="submit" name="store" value="'.&mt('Save').'" /></p>':'').
       '</form>'.&Apache::loncommon::end_page());        '</form>'.&Apache::loncommon::end_page());
 }  }
   
Line 2875  ENDOVER Line 2907  ENDOVER
       '<td><input type="checkbox" name="del_'.$thiskey.'" /></td>'      );        '<td><input type="checkbox" name="del_'.$thiskey.'" /></td>'      );
           
     $r->print('<td>');      $r->print('<td>');
       my $display_value = $resourcedata->{$thiskey};
       if (&isdateparm($resourcedata->{$thiskey.'.type'})) {
    $display_value = 
       &Apache::lonlocal::locallocaltime($display_value);
       }
     $r->print(&mt('Parameter: "[_1]" with value: "[_2]"',      $r->print(&mt('Parameter: "[_1]" with value: "[_2]"',
   &standard_parameter_names($data{'parameter_name'}),    &standard_parameter_names($data{'parameter_name'}),
   $resourcedata->{$thiskey}));    $resourcedata->{$thiskey}));
Line 2899  ENDOVER Line 2936  ENDOVER
  $r->print(&mt('Resource: [_1] <br />&nbsp;&nbsp;&nbsp;with ID: [_2] <br />&nbsp;&nbsp;&nbsp;in folder [_3]',   $r->print(&mt('Resource: [_1] <br />&nbsp;&nbsp;&nbsp;with ID: [_2] <br />&nbsp;&nbsp;&nbsp;in folder [_3]',
       $url,$resid,$map));        $url,$resid,$map));
     }      }
     $r->print(&mt('Part: [_1]',$data{'parameter_part'}));      $r->print(' <br />&nbsp;&nbsp;&nbsp;'.&mt('Part: [_1]',$data{'parameter_part'}));
     $r->print('</td></tr>');      $r->print('</td></tr>');
   
  }   }
Line 3111  ENDMAINFORMHEAD Line 3148  ENDMAINFORMHEAD
     my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};      my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
     my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};      my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
     my $vgr  = &Apache::lonnet::allowed('vgr',$env{'request.course.id'});      my $vgr  = &Apache::lonnet::allowed('vgr',$env{'request.course.id'});
       my $mgr  = &Apache::lonnet::allowed('mgr',$env{'request.course.id'});
   
     my @menu =      my @menu =
         ( { divider=>'Settings for Your Course',          ( { divider=>'Settings for Your Course',
Line 3128  ENDMAINFORMHEAD Line 3166  ENDMAINFORMHEAD
     url => '/adm/slotrequest?command=showslots',      url => '/adm/slotrequest?command=showslots',
     permission => $vgr,      permission => $vgr,
             },              },
     { text => 'Reset Student Access Times',
       url => '/adm/helper/resettimes.helper',
       permission => $mgr,
               },
   
           { text => 'Set Parameter Setting Default Actions',            { text => 'Set Parameter Setting Default Actions',
             action => 'setdefaults',              action => 'setdefaults',
             permission => $parm_permission,              permission => $parm_permission,
Line 3189  ENDMAINFORMHEAD Line 3232  ENDMAINFORMHEAD
 ### Set portfolio metadata  ### Set portfolio metadata
 sub output_row {  sub output_row {
     my ($r, $field_name, $field_text, $added_flag) = @_;      my ($r, $field_name, $field_text, $added_flag) = @_;
     my $row_class;  
     my $output;      my $output;
     my $options=$env{'course.'.$env{'request.course.id'}.'.metadata.'.$field_name.'.options'};      my $options=$env{'course.'.$env{'request.course.id'}.'.metadata.'.$field_name.'.options'};
     my $values=$env{'course.'.$env{'request.course.id'}.'.metadata.'.$field_name.'.values'};      my $values=$env{'course.'.$env{'request.course.id'}.'.metadata.'.$field_name.'.values'};
Line 3198  sub output_row { Line 3240  sub output_row {
         $values = '';          $values = '';
     }      }
     if (!($options =~ /deleted/)) {      if (!($options =~ /deleted/)) {
         $output = &Apache::loncommon::start_data_table_row();  
         $output .= '<td><span class="LC_metadata"><strong>'.$field_text.':</strong></span></td>';  
         # $output .= '<td><strong>'.$field_text.':</strong></td>';  
         $output .= '<td><span class="LC_metadata"><input name="'.$field_name.'_values" type="text" value="'.$values.'" size="80" /></span></td>';  
         $output .= &Apache::loncommon::end_data_table_row();  
         my @options= ( ['active', 'Show to student'],          my @options= ( ['active', 'Show to student'],
    ['onlyone','Student may select only one choice'],                      ['stuadd', 'Provide text area for students to type catalog information'],
    ['stuadd', 'Student may type choices']);                      ['choices','Provide choices for students to select from']);
   #   ['onlyone','Student may select only one choice']);
         if ($added_flag) {          if ($added_flag) {
             push @options,['deleted', 'Delete Metadata Field'];              push @options,['deleted', 'Delete Metadata Field'];
         }          }
          $output = &Apache::loncommon::start_data_table_row();
           $output .= '<td><span class="LC_metadata"><strong>'.$field_text.':</strong></span></td>';
           $output .= &Apache::loncommon::end_data_table_row();
         foreach my $opt (@options) {          foreach my $opt (@options) {
     my $checked = ($options =~ m/$opt->[0]/) ? ' checked="checked" ' : '' ;      my $checked = ($options =~ m/$opt->[0]/) ? ' checked="checked" ' : '' ;
     $output .= &Apache::loncommon::continue_data_table_row();      $output .= &Apache::loncommon::continue_data_table_row();
     $output .= '<td colspan="2">'.('&nbsp;' x 5).'<span class="LC_metadata"><label><input type="checkbox" name="'.      $output .= '<td>'.('&nbsp;' x 5).'<span class="LC_metadata"><label>
         $field_name.'_'.$opt->[0].'" value="yes"'.$checked.' />'.                 <input type="checkbox" name="'.
         &mt($opt->[1]).'</label></span> </td>';                 $field_name.'_'.$opt->[0].'" value="yes"'.$checked.' />'.
                  &mt($opt->[1]).'</label></span> </td>';
     $output .= &Apache::loncommon::end_data_table_row();      $output .= &Apache::loncommon::end_data_table_row();
  }   }
           $output .= &Apache::loncommon::continue_data_table_row();
           $output .= '<td>'.('&nbsp;' x 10).'<span class="LC_metadata"><input name="'.$field_name.'_values" type="text" value="'.$values.'" size="80" /></span></td>';
           $output .= &Apache::loncommon::end_data_table_row();
           my $multiple_checked;
           my $single_checked;
           if ($options =~ m/onlyone/) {
               $multiple_checked = "";
               $single_checked = " CHECKED ";
           } else {
               $multiple_checked = " CHECKED ";
               $single_checked = "";
           }
    $output .= &Apache::loncommon::continue_data_table_row();
    $output .= '<td>'.('&nbsp;' x 10).'<span class="LC_metadata">
               <input type="radio" name="'.$field_name.'_onlyone" value="multiple" '.$multiple_checked .'/>
               Student may select multiple choices from list</span></td>';
    $output .= &Apache::loncommon::end_data_table_row();
    $output .= &Apache::loncommon::continue_data_table_row();
    $output .= '<td>'.('&nbsp;' x 10).'<span class="LC_metadata">
               <input type="radio" name="'.$field_name.'_onlyone"  value="single" '.$single_checked.'/>
               Student may select only one choice from list</span></td>';
    $output .= &Apache::loncommon::end_data_table_row();
     }      }
     return ($output);      return ($output);
 }  }
Line 3268  sub order_meta_fields { Line 3331  sub order_meta_fields {
                            {'metadata.addedorder'=>$ordered_fields},$dom,$crs);                             {'metadata.addedorder'=>$ordered_fields},$dom,$crs);
  &Apache::lonnet::appenv('course.'.$env{'request.course.id'}.'.metadata.addedorder' => $ordered_fields);   &Apache::lonnet::appenv('course.'.$env{'request.course.id'}.'.metadata.addedorder' => $ordered_fields);
     }      }
     my $fields = &get_added_meta_fieldnames();      my $fields = &get_added_meta_fieldnames($env{'request.course.id'});
     my $ordered_fields;      my $ordered_fields;
     my @fields_in_order = split /,/,$env{'course.'.$env{'request.course.id'}.'.metadata.addedorder'};      my @fields_in_order = split /,/,$env{'course.'.$env{'request.course.id'}.'.metadata.addedorder'};
     if (!@fields_in_order) {      if (!@fields_in_order) {
Line 3303  sub order_meta_fields { Line 3366  sub order_meta_fields {
     $r->print('</table>');      $r->print('</table>');
     return 'ok';      return 'ok';
 }  }
   sub continue {
       my $output;
       $output .= '<form action="" method="post">';
       $output .= '<input type="hidden" name="action" value="setrestrictmeta" />';
       $output .= '<input type="submit" value="Continue" />';
       return ($output);
   }
 sub addmetafield {  sub addmetafield {
     my ($r)=@_;      my ($r)=@_;
     $r->print(&Apache::loncommon::start_page('Add Metadata Field'));      $r->print(&Apache::loncommon::start_page('Add Metadata Field'));
Line 3310  sub addmetafield { Line 3380  sub addmetafield {
     my $dom = $env{'course.'.$env{'request.course.id'}.'.domain'};      my $dom = $env{'course.'.$env{'request.course.id'}.'.domain'};
     my $crs = $env{'course.'.$env{'request.course.id'}.'.num'};      my $crs = $env{'course.'.$env{'request.course.id'}.'.num'};
     if (exists($env{'form.undelete'})) {      if (exists($env{'form.undelete'})) {
         my @meta_fields = &Apache::loncommon::get_env_multiple('form.undelete');          my @meta_fields = &Apache::loncommon::get_env_multiple('form.undeletefield');
         foreach my $meta_field(@meta_fields) {          foreach my $meta_field(@meta_fields) {
             my $options = $env{'course.'.$env{'request.course.id'}.'.metadata.'.$meta_field.'.options'};              my $options = $env{'course.'.$env{'request.course.id'}.'.metadata.'.$meta_field.'.options'};
             $options =~ s/deleted//;              $options =~ s/deleted//;
Line 3320  sub addmetafield { Line 3390  sub addmetafield {
                                                                                   
             $r->print('Undeleted Metadata Field <strong>'.$env{'course.'.$env{'request.course.id'}.'.metadata.'.$meta_field.'.added'}."</strong> with result ".$put_result.'<br />');              $r->print('Undeleted Metadata Field <strong>'.$env{'course.'.$env{'request.course.id'}.'.metadata.'.$meta_field.'.added'}."</strong> with result ".$put_result.'<br />');
         }          }
         $r->print('<form action="" method="post">');          $r->print(&continue());
         $r->print('<input type="hidden" name="action" value="setrestrictmeta" />');  
         $r->print('<input type="submit" value="Continue" />');  
     } elsif (exists($env{'form.fieldname'})) {      } elsif (exists($env{'form.fieldname'})) {
         my $meta_field = $env{'form.fieldname'};          my $meta_field = $env{'form.fieldname'};
         my $display_field = $env{'form.fieldname'};          my $display_field = $env{'form.fieldname'};
Line 3332  sub addmetafield { Line 3400  sub addmetafield {
                             {'metadata.'.$meta_field.'.values'=>"",                              {'metadata.'.$meta_field.'.values'=>"",
                              'metadata.'.$meta_field.'.added'=>"$display_field",                               'metadata.'.$meta_field.'.added'=>"$display_field",
                              'metadata.'.$meta_field.'.options'=>""},$dom,$crs);                               'metadata.'.$meta_field.'.options'=>""},$dom,$crs);
         $r->print('Added new Metadata Field '.$env{'form.fieldname'}." with result ".$put_result);          $r->print('Added new Metadata Field <strong>'.$env{'form.fieldname'}."</strong> with result ".$put_result.'<br />');
           $r->print(&continue());
     } else {      } else {
         my $fields = &get_deleted_meta_fieldnames();          my $fields = &get_deleted_meta_fieldnames($env{'request.course.id'});
         if ($fields) {          if ($fields) {
             $r->print('You may undelete previously deleted fields.<br />Check those you wish to undelete and click Undelete.<br />');              $r->print('You may undelete previously deleted fields.<br />Check those you wish to undelete and click Undelete.<br />');
             $r->print('<form method="post" action="">');              $r->print('<form method="post" action="">');
             foreach my $key(keys(%$fields)) {              foreach my $key(keys(%$fields)) {
                 $r->print('<input type="checkbox" name="undelete" value="'.$key.'" />'.$$fields{$key}.'<br /');                  $r->print('<input type="checkbox" name="undeletefield" value="'.$key.'" />'.$$fields{$key}.'<br /');
             }              }
             $r->print('<input type="submit" name="undelete" value="Undelete" />');              $r->print('<input type="submit" name="undelete" value="Undelete" />');
             $r->print('</form>');              $r->print('</form>');
Line 3347  sub addmetafield { Line 3416  sub addmetafield {
         $r->print('<hr /><strong>Or</strong> you may enter a new metadata field name.<form method="post" action="/adm/parmset?action=addmetadata"');          $r->print('<hr /><strong>Or</strong> you may enter a new metadata field name.<form method="post" action="/adm/parmset?action=addmetadata"');
         $r->print('<input type="text" name="fieldname" /><br />');          $r->print('<input type="text" name="fieldname" /><br />');
         $r->print('<input type="submit" value="Add Metadata Field" />');          $r->print('<input type="submit" value="Add Metadata Field" />');
         $r->print('</form>');  
     }      }
       $r->print('</form>');
 }  }
 sub setrestrictmeta {  sub setrestrictmeta {
     my ($r)=@_;      my ($r)=@_;
Line 3373  sub setrestrictmeta { Line 3442  sub setrestrictmeta {
                if ($env{'form.'.$meta_field.'_stuadd'}) {                 if ($env{'form.'.$meta_field.'_stuadd'}) {
                    $options.='stuadd,';                     $options.='stuadd,';
                }                  } 
                if ($env{'form.'.$meta_field.'_onlyone'}) {                 if ($env{'form.'.$meta_field.'_choices'}) {
                      $options.='choices,';
                  } 
                  if ($env{'form.'.$meta_field.'_onlyone'} eq 'single') {
                    $options.='onlyone,';                     $options.='onlyone,';
                }                  } 
                if ($env{'form.'.$meta_field.'_active'}) {                 if ($env{'form.'.$meta_field.'_active'}) {
Line 3382  sub setrestrictmeta { Line 3454  sub setrestrictmeta {
                if ($env{'form.'.$meta_field.'_deleted'}) {                 if ($env{'form.'.$meta_field.'_deleted'}) {
                    $options.='deleted,';                     $options.='deleted,';
                }                 }
                  
                     my $name = $save_field;                      my $name = $save_field;
                      $put_result = &Apache::lonnet::put('environment',                       $put_result = &Apache::lonnet::put('environment',
                                                   {'metadata.'.$meta_field.'.options'=>$options,                                                    {'metadata.'.$meta_field.'.options'=>$options,
Line 3397  sub setrestrictmeta { Line 3468  sub setrestrictmeta {
     # Get the default metadata fields      # Get the default metadata fields
     my %metadata_fields = &Apache::lonmeta::fieldnames('portfolio');      my %metadata_fields = &Apache::lonmeta::fieldnames('portfolio');
     # Now get possible added metadata fields      # Now get possible added metadata fields
     my $added_metadata_fields = &get_added_meta_fieldnames(\%metadata_fields);      my $added_metadata_fields = &get_added_meta_fieldnames($env{'request.course.id'});
     my $row_alt = 1;      my $row_alt = 1;
     $output .= &Apache::loncommon::start_data_table();      $output .= &Apache::loncommon::start_data_table();
     foreach my $field (sort(keys(%metadata_fields))) {      foreach my $field (sort(keys(%metadata_fields))) {
Line 3406  sub setrestrictmeta { Line 3477  sub setrestrictmeta {
     $output.= &output_row($r, $field, $metadata_fields{$field});      $output.= &output_row($r, $field, $metadata_fields{$field});
  }   }
     }      }
       my $buttons = (<<ENDButtons);
           <input type="submit" name="restrictmeta" value="Save" />
           </form><br />
           <form method="post" action="/adm/parmset?action=addmetadata" name="form1">
           <input type="submit" name="restrictmeta" value="Add a Metadata Field" />
           </form>
           <br />
           <form method="post" action="/adm/parmset?action=ordermetadata" name="form2">
           <input type="submit" name="restrictmeta" value="Order Metadata Fields" />
   ENDButtons
     my $added_flag = 1;      my $added_flag = 1;
     foreach my $field (sort(keys(%$added_metadata_fields))) {      foreach my $field (sort(keys(%$added_metadata_fields))) {
         $row_alt = $row_alt ? 0 : 1;          $row_alt = $row_alt ? 0 : 1;
Line 3415  sub setrestrictmeta { Line 3496  sub setrestrictmeta {
     $r->print(<<ENDenv);             $r->print(<<ENDenv);       
         <form method="post" action="/adm/parmset?action=setrestrictmeta" name="form">          <form method="post" action="/adm/parmset?action=setrestrictmeta" name="form">
         $output          $output
         <input type="submit" name="restrictmeta" value="Update Metadata Restrictions" />          $buttons
         </form><br />  
         <form method="post" action="/adm/parmset?action=addmetadata" name="form1">  
         <input type="submit" name="restrictmeta" value="Add a Metadata Field" />  
         </form>  
         <br />  
         <form method="post" action="/adm/parmset?action=ordermetadata" name="form2">  
         <input type="submit" name="restrictmeta" value="Order Metadata Fields" />  
         </form>          </form>
 ENDenv  ENDenv
     $r->print(&Apache::loncommon::end_page());      $r->print(&Apache::loncommon::end_page());
Line 3430  ENDenv Line 3504  ENDenv
 }  }
 ##################################################  ##################################################
 sub get_added_meta_fieldnames {  sub get_added_meta_fieldnames {
       my ($cid) = @_;
     my %fields;      my %fields;
     foreach my $key(%env) {      foreach my $key(%env) {
         if ($key =~ m/\.metadata\.(.+)\.added$/) {          if ($key =~ m/\Q$cid\E\.metadata\.(.+)\.added$/) {
             my $field_name = $1;              my $field_name = $1;
             my ($display_field_name) = $env{$key};              my ($display_field_name) = $env{$key};
             $fields{$field_name} = $display_field_name;              $fields{$field_name} = $display_field_name;
Line 3441  sub get_added_meta_fieldnames { Line 3516  sub get_added_meta_fieldnames {
     return \%fields;      return \%fields;
 }  }
 sub get_deleted_meta_fieldnames {  sub get_deleted_meta_fieldnames {
       my ($cid) = @_;
     my %fields;      my %fields;
     my ($default_fields) = @_;  
     foreach my $key(%env) {      foreach my $key(%env) {
         if ($key =~ m/\.metadata\.(.+)\.added$/) {          if ($key =~ m/\Q$cid\E\.metadata\.(.+)\.added$/) {
             my $field_name = $1;              my $field_name = $1;
             if ($env{'course.'.$env{'request.course.id'}.'.metadata.'.$field_name.'.options'} =~ m/deleted/) {              if ($env{'course.'.$env{'request.course.id'}.'.metadata.'.$field_name.'.options'} =~ m/deleted/) {
                 my ($display_field_name) = $env{$key};                  my ($display_field_name) = $env{$key};
Line 3609  ENDYESNO Line 3684  ENDYESNO
     }      }
     $r->print(&Apache::loncommon::end_data_table().      $r->print(&Apache::loncommon::end_data_table().
       "\n<input type='submit' name='storerules' value='".        "\n<input type='submit' name='storerules' value='".
       &mt('Store Rules')."' /></form>\n".        &mt('Save Rules')."' /></form>\n".
       &Apache::loncommon::end_page());        &Apache::loncommon::end_page());
     return;      return;
 }  }
Line 3728  sub parm_change_log { Line 3803  sub parm_change_log {
  }   }
  if ($last) { ($folder) = &Apache::lonnet::decode_symb($last); }   if ($last) { ($folder) = &Apache::lonnet::decode_symb($last); }
     }      }
     foreach my $id (sort { $parmlog{$b}{'exe_time'}<=>$parmlog{$a}{'exe_time'} } (keys(%parmlog))) {      foreach my $id (sort 
       {
    if ($parmlog{$b}{'exe_time'} ne $parmlog{$a}{'exe_time'}) {
       return $parmlog{$b}{'exe_time'} <=>$parmlog{$a}{'exe_time'}
    }
    my $aid = (split('00000',$a))[-1];
    my $bid = (split('00000',$b))[-1];
    return $bid<=>$aid;
       } (keys(%parmlog))) {
         my @changes=keys(%{$parmlog{$id}{'logentry'}});          my @changes=keys(%{$parmlog{$id}{'logentry'}});
  my $count = 0;   my $count = 0;
  my $time =   my $time =
Line 3836  sub parm_change_log { Line 3919  sub parm_change_log {
     $r->print(&Apache::loncommon::end_page());      $r->print(&Apache::loncommon::end_page());
 }  }
   
   sub check_for_course_info {
       my $navmap = Apache::lonnavmaps::navmap->new();
       return 1 if ($navmap);
       return 0;
   }
   
 ##################################################  ##################################################
 ##################################################  ##################################################
   
Line 3879  sub handler { Line 3968  sub handler {
  (&Apache::lonnet::allowed('opa',$env{'request.course.id'}) ||   (&Apache::lonnet::allowed('opa',$env{'request.course.id'}) ||
  &Apache::lonnet::allowed('opa',$env{'request.course.id'}.'/'.   &Apache::lonnet::allowed('opa',$env{'request.course.id'}.'/'.
   $env{'request.course.sec'}));    $env{'request.course.sec'}));
     if ($env{'request.course.id'} &&  $parm_permission) {      my $exists = &check_for_course_info();
   
       if ($env{'request.course.id'} &&  $parm_permission && $exists) {
   
         # Start Page          # Start Page
         &Apache::loncommon::content_type($r,'text/html');          &Apache::loncommon::content_type($r,'text/html');
Line 3949  sub handler { Line 4040  sub handler {
  }          }       
     } else {      } else {
 # ----------------------------- Not in a course, or not allowed to modify parms  # ----------------------------- Not in a course, or not allowed to modify parms
  $env{'user.error.msg'}=   if ($exists) {
     "/adm/parmset:opa:0:0:Cannot modify assessment parameters";      $env{'user.error.msg'}=
    "/adm/parmset:opa:0:0:Cannot modify assessment parameters";
    } else {
       $env{'user.error.msg'}=
    "/adm/parmset::0:1:Course environment gone, reinitialize the course";
    }
  return HTTP_NOT_ACCEPTABLE;   return HTTP_NOT_ACCEPTABLE;
     }      }
     return OK;      return OK;
Removed from v.1.350.2.1  
changed lines
  Added in v.1.366

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>