Diff for /loncom/interface/lonparmset.pm between versions 1.181 and 1.182

version 1.181, 2005/02/02 19:23:59 version 1.182, 2005/02/05 06:21:57
Line 96  Inputs:  $what - a parameter spec (inclu Line 96  Inputs:  $what - a parameter spec (inclu
   
 Returns:  A list, the first item is the index into the remaining list of items of parm valuse that is the active one, the list consists of parm values at the 11 possible levels  Returns:  A list, the first item is the index into the remaining list of items of parm valuse that is the active one, the list consists of parm values at the 11 possible levels
   
 11- resource default  11 - General Course
 10- map default  10 - Map or Folder level in course
 9 - General Course  9- resource default
 8 - Map or Folder level in course  8- map default
 7 - resource level in course  7 - resource level in course
 6 - General for section  6 - General for section
 5 - Map or Folder level for section  5 - Map or Folder level for section
Line 129  sub parmval { Line 129  sub parmval {
     my $courselevelr=$ENV{'request.course.id'}.'.'.$symbparm;      my $courselevelr=$ENV{'request.course.id'}.'.'.$symbparm;
     my $courselevelm=$ENV{'request.course.id'}.'.'.$mapparm;      my $courselevelm=$ENV{'request.course.id'}.'.'.$mapparm;
   
 # -------------------------------------------------------- first, check default  
   
     if (defined($def)) { $outpar[11]=$def; $result=11; }  
   
 # ----------------------------------------------------- second, check map parms  # --------------------------------------------------------- first, check course
   
     my $thisparm=$parmhash{$symbparm};  
     if (defined($thisparm)) { $outpar[10]=$thisparm; $result=10; }  
   
 # --------------------------------------------------------- third, check course  
   
     if (defined($courseopt{$courselevel})) {      if (defined($courseopt{$courselevel})) {
  $outpar[9]=$courseopt{$courselevel};   $outpar[11]=$courseopt{$courselevel};
  $result=9;   $result=11;
     }      }
   
     if (defined($courseopt{$courselevelm})) {      if (defined($courseopt{$courselevelm})) {
  $outpar[8]=$courseopt{$courselevelm};   $outpar[10]=$courseopt{$courselevelm};
  $result=8;   $result=10;
     }      }
   
   # ------------------------------------------------------- second, check default
   
       if (defined($def)) { $outpar[9]=$def; $result=9; }
   
   # ------------------------------------------------------ third, check map parms
   
       my $thisparm=$parmhash{$symbparm};
       if (defined($thisparm)) { $outpar[8]=$thisparm; $result=8; }
   
     if (defined($courseopt{$courselevelr})) {      if (defined($courseopt{$courselevelr})) {
  $outpar[7]=$courseopt{$courselevelr};   $outpar[7]=$courseopt{$courselevelr};
  $result=7;   $result=7;
     }      }
   
   # ------------------------------------------------------ fourth, back to course
     if (defined($csec)) {      if (defined($csec)) {
         if (defined($courseopt{$seclevel})) {          if (defined($courseopt{$seclevel})) {
     $outpar[6]=$courseopt{$seclevel};      $outpar[6]=$courseopt{$seclevel};
Line 171  sub parmval { Line 174  sub parmval {
  }   }
     }      }
   
 # ---------------------------------------------------------- fourth, check user  # ---------------------------------------------------------- fifth, check user
   
     if (defined($uname)) {      if (defined($uname)) {
  if (defined($useropt{$courselevel})) {   if (defined($useropt{$courselevel})) {
Line 419  sub print_row { Line 422  sub print_row {
                                           $$name{$which}.'.type',                                            $$name{$which}.'.type',
   $rid,$$defaulttype{$which});    $rid,$$defaulttype{$which});
 # cascade down manually  # cascade down manually
     my $cascadetype=$defaulttype;      my $cascadetype=$$defaulttype{$which};
     for (my $i=$#typeoutpar;$i>0;$i--) {      for (my $i=11;$i>0;$i--) {
  if ($typeoutpar[$i]) {    if ($typeoutpar[$i]) { 
             $cascadetype=$typeoutpar[$i];              $cascadetype=$typeoutpar[$i];
  } else {   } else {
             $typeoutpar[$i]=$cascadetype;              $typeoutpar[$i]=$cascadetype;
         }          }
     }      }
    
     my $parm=$$display{$which};      my $parm=$$display{$which};
   
     if ($parmlev eq 'full' || $parmlev eq 'brief') {      if ($parmlev eq 'full' || $parmlev eq 'brief') {
Line 450  sub print_row { Line 452  sub print_row {
         } elsif ($csec) {          } elsif ($csec) {
             &print_td($r,6,$defbgtwo,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display);               &print_td($r,6,$defbgtwo,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display); 
         } else {          } else {
             &print_td($r,9,$defbgone,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display);               &print_td($r,11,$defbgone,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display); 
         }          }
     } elsif ($parmlev eq 'map') {      } elsif ($parmlev eq 'map') {
   
Line 459  sub print_row { Line 461  sub print_row {
         } elsif ($csec) {          } elsif ($csec) {
             &print_td($r,5,$defbgtwo,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display);              &print_td($r,5,$defbgtwo,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display);
         } else {          } else {
             &print_td($r,8,$defbgone,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display);              &print_td($r,10,$defbgone,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display);
         }          }
     } else {      } else {
   
         &print_td($r,11,'#FFDDDD',$result,\@outpar,$mprefix,$_,\@typeoutpar,$display);          &print_td($r,11,$defbgone,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display);
   
         if ($parmlev eq 'brief') {          if ($parmlev eq 'brief') {
   
Line 477  sub print_row { Line 479  sub print_row {
            }             }
         } else {          } else {
   
            &print_td($r,10,'#FFDDDD',$result,\@outpar,$mprefix,$_,\@typeoutpar,$display);             &print_td($r,10,$defbgone,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display);
            &print_td($r,9,$defbgone,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display);             &print_td($r,9,'#FFDDDD',$result,\@outpar,$mprefix,$_,\@typeoutpar,$display);
            &print_td($r,8,$defbgone,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display);             &print_td($r,8,'#FFDDDD',$result,\@outpar,$mprefix,$_,\@typeoutpar,$display);
            &print_td($r,7,$defbgone,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display);             &print_td($r,7,$defbgone,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display);
   
            if ($csec) {             if ($csec) {
Line 520  sub print_td { Line 522  sub print_td {
     my ($r,$which,$defbg,$result,$outpar,$mprefix,$value,$typeoutpar,$display)=@_;      my ($r,$which,$defbg,$result,$outpar,$mprefix,$value,$typeoutpar,$display)=@_;
     $r->print('<td bgcolor='.(($result==$which)?'"#AAFFAA"':$defbg).      $r->print('<td bgcolor='.(($result==$which)?'"#AAFFAA"':$defbg).
               ' align="center">');                ' align="center">');
     if ($which<10) {      if ($which<8 || $which > 9) {
  $r->print(&plink($$typeoutpar[$which],   $r->print(&plink($$typeoutpar[$which],
  $$display{$value},$$outpar[$which],   $$display{$value},$$outpar[$which],
  $mprefix."$which",'parmform.pres','psub'));   $mprefix."$which",'parmform.pres','psub'));
Line 828  sub assessparms { Line 830  sub assessparms {
  my $courselevelm=$ENV{'request.course.id'}.'.'.$mapparm;   my $courselevelm=$ENV{'request.course.id'}.'.'.$mapparm;
   
  my $storeunder='';   my $storeunder='';
  if (($snum==9) || ($snum==3)) { $storeunder=$courselevel; }   if (($snum==11) || ($snum==3)) { $storeunder=$courselevel; }
  if (($snum==8) || ($snum==2)) { $storeunder=$courselevelm; }   if (($snum==10) || ($snum==2)) { $storeunder=$courselevelm; }
  if (($snum==7) || ($snum==1)) { $storeunder=$courselevelr; }   if (($snum==7) || ($snum==1)) { $storeunder=$courselevelr; }
  if ($snum==6) { $storeunder=$seclevel; }   if ($snum==6) { $storeunder=$seclevel; }
  if ($snum==5) { $storeunder=$seclevelm; }   if ($snum==5) { $storeunder=$seclevelm; }
Line 1144  sub assessparms { Line 1146  sub assessparms {
            $r->print(<<ENDTABLETWO);             $r->print(<<ENDTABLETWO);
 <th rowspan=3>$lt{'pie'}</th>  <th rowspan=3>$lt{'pie'}</th>
 <th rowspan=3>$lt{'csv'}<br>($csuname $lt{'at'} $csudom)</th>  <th rowspan=3>$lt{'csv'}<br>($csuname $lt{'at'} $csudom)</th>
 </tr><tr><td colspan=5></td><th colspan=2>$lt{'rl'}</th>  </tr><tr><td colspan=5></td><th colspan=2>$lt{'ic'}</th><th colspan=2>$lt{'rl'}</th>
 <th colspan=3>$lt{'ic'}</th>  <th colspan=1>$lt{'ic'}</th>
   
 ENDTABLETWO  ENDTABLETWO
            if ($csec) {             if ($csec) {
                 $r->print("<th colspan=3>".                  $r->print("<th colspan=3>".
Line 1154  ENDTABLETWO Line 1157  ENDTABLETWO
            $r->print(<<ENDTABLEHEADFOUR);             $r->print(<<ENDTABLEHEADFOUR);
 </tr><tr><th>$lt{'aut'}</th><th>$lt{'type'}</th>  </tr><tr><th>$lt{'aut'}</th><th>$lt{'type'}</th>
 <th>$lt{'emof'}</th><th>$lt{'part'}</th><th>$lt{'pn'}</th>  <th>$lt{'emof'}</th><th>$lt{'part'}</th><th>$lt{'pn'}</th>
 <th>$lt{'def'}</th><th>$lt{'femof'}</th>  <th>$lt{'gen'}</th><th>$lt{'femof'}</th>
 <th>$lt{'gen'}</th><th>$lt{'foremf'}</th><th>$lt{'fr'}</th>  <th>$lt{'def'}</th><th>$lt{'foremf'}</th><th>$lt{'fr'}</th>
 ENDTABLEHEADFOUR  ENDTABLEHEADFOUR
   
            if ($csec) {             if ($csec) {

Removed from v.1.181  
changed lines
  Added in v.1.182


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