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

Diff for /loncom/interface/lonparmset.pm between versions 1.213 and 1.214

version 1.213, 2005/06/06 15:46:02 version 1.214, 2005/06/06 17:38:07
Line 972  sub keysindisplayorder { Line 972  sub keysindisplayorder {
     } (keys %{$name});      } (keys %{$name});
 }  }
   
   sub sortmenu {
       my ($r,$sortorder)=@_;
       $r->print('<br /><input type="radio" name="sortorder" value="realmstudent"');
       if ($sortorder eq 'realmstudent') {
          $r->print(' checked="on"');
       }
       $r->print(' />'.&mt('Sort by realm first, then student (group/section)'));
       $r->print('<br /><input type="radio" name="sortorder" value="studentrealm"');
       if ($sortorder eq 'studentrealm') {
          $r->print(' checked="on"');
       }
       $r->print(' />'.&mt('Sort by student (group/section) first, then realm'));
   }
   
 sub standardkeyorder {  sub standardkeyorder {
     return ('parameter_0_opendate' => 1,      return ('parameter_0_opendate' => 1,
     'parameter_0_duedate' => 2,      'parameter_0_duedate' => 2,
Line 2036  sub extractuser { Line 2050  sub extractuser {
 }  }
   
 sub listdata {  sub listdata {
     my ($r,$resourcedata,$listdata)=@_;      my ($r,$resourcedata,$listdata,$sortorder)=@_;
 # Start list output  # Start list output
   
     my $oldsection='';      my $oldsection='';
Line 2045  sub listdata { Line 2059  sub listdata {
     my $pointer=0;      my $pointer=0;
     $tableopen=0;      $tableopen=0;
     my $foundkeys=0;      my $foundkeys=0;
     foreach my $thiskey (sort keys %{$listdata}) {      foreach my $thiskey (sort {
    if ($sortorder eq 'realmstudent') {
       my ($astudent,$arealm)=($a=~/^$env{'request.course.id'}\.([^\.]+)\.(.+)\.[^\.]+$/);
       my ($bstudent,$brealm)=($b=~/^$env{'request.course.id'}\.([^\.]+)\.(.+)\.[^\.]+$/);
               ($arealm cmp $brealm) || ($astudent cmp $bstudent);
    } else {
       $a cmp $b;
    }
       } keys %{$listdata}) {
  if ($$listdata{$thiskey.'.type'}) {   if ($$listdata{$thiskey.'.type'}) {
             my $thistype=$$listdata{$thiskey.'.type'};              my $thistype=$$listdata{$thiskey.'.type'};
             if ($$resourcedata{$thiskey.'.type'}) {              if ($$resourcedata{$thiskey.'.type'}) {
Line 2072  sub listdata { Line 2094  sub listdata {
  my ($map,$id,$url)=&Apache::lonnet::decode_symb($middle);   my ($map,$id,$url)=&Apache::lonnet::decode_symb($middle);
  $realm='<font color="orange">'.&mt('Resource').': '.&Apache::lonnet::gettitle($middle).' <br /><font color="#aaaaaa" size="-2">('.$url.' in '.$map.' id: '.$id.')</font></font>';   $realm='<font color="orange">'.&mt('Resource').': '.&Apache::lonnet::gettitle($middle).' <br /><font color="#aaaaaa" size="-2">('.$url.' in '.$map.' id: '.$id.')</font></font>';
     }      }
     if ($section ne $oldsection) {      if ($sortorder eq 'realmstudent') {
  $r->print(&tableend()."\n<hr /><h1>$section</h1>");   if ($realm ne $oldrealm) {
  $oldsection=$section;      $r->print(&tableend()."\n<hr /><h1>$realm</h1>");
  $oldrealm='';      $oldrealm=$realm;
     }      $oldsection='';
     if ($realm ne $oldrealm) {   }
  $r->print(&tableend()."\n<h2>$realm</h2>");   if ($section ne $oldsection) {
  $oldrealm=$realm;      $r->print(&tableend()."\n<h2>$section</h2>");
  $oldpart='';      $oldsection=$section;
       $oldpart='';
    }
       } else {
    if ($section ne $oldsection) {
       $r->print(&tableend()."\n<hr /><h1>$section</h1>");
       $oldsection=$section;
       $oldrealm='';
    }
    if ($realm ne $oldrealm) {
       $r->print(&tableend()."\n<h2>$realm</h2>");
       $oldrealm=$realm;
       $oldpart='';
    }
     }      }
     if ($part ne $oldpart) {      if ($part ne $oldpart) {
  $r->print(&tableend().   $r->print(&tableend().
   "\n<h3><font color='blue'>".&mt('Part').": $part</font></h3>");    "\n<font color='blue'>".&mt('Part').": $part</font>");
  $oldpart=$part;   $oldpart=$part;
     }      }
 #  #
Line 2196  ENDOVER Line 2231  ENDOVER
     &partmenu($r,\%allparts,\@psprt);      &partmenu($r,\%allparts,\@psprt);
     $r->print('</td><td>');      $r->print('</td><td>');
     &sectionmenu($r,\@selected_sections);      &sectionmenu($r,\@selected_sections);
     $r->print('</td></tr></table>'.  
       '<p><input type="submit" name="dis" value="'.&mt('Display').'" /></p>');      $r->print('</td></tr></table>');
    
       my $sortorder=$env{'form.sortorder'};
       unless ($sortorder) { $sortorder='realmstudent'; }
       &sortmenu($r,$sortorder);
   
       $r->print('<p><input type="submit" name="dis" value="'.&mt('Display').'" /></p>');
   
 # Build the list data hash from the specified parms  # Build the list data hash from the specified parms
   
Line 2248  ENDOVER Line 2289  ENDOVER
   
 # List data  # List data
   
  &listdata($r,$resourcedata,$listdata);   &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('Store').'" /></p>':'').
Line 2280  ENDOVER Line 2321  ENDOVER
   
     my $resourcedata=&readdata($crs,$dom);      my $resourcedata=&readdata($crs,$dom);
   
   
       my $sortorder=$env{'form.sortorder'};
       unless ($sortorder) { $sortorder='realmstudent'; }
       &sortmenu($r,$sortorder);
   
 # List data  # List data
   
     my $foundkeys=&listdata($r,$resourcedata,$resourcedata);      my $foundkeys=&listdata($r,$resourcedata,$resourcedata,$sortorder);
   
     $r->print(&tableend().'<p>'.      $r->print(&tableend().'<p>'.
  ($foundkeys?'<input type="submit" value="'.&mt('Modify Parameters').'" />':&mt('There are no parameters.')).'</p></form></body></html>');   ($foundkeys?'<input type="submit" value="'.&mt('Modify Parameters').'" />':&mt('There are no parameters.')).'</p></form></body></html>');
Removed from v.1.213  
changed lines
  Added in v.1.214

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