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

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

version 1.181, 2005/02/02 19:23:59 version 1.186, 2005/03/17 21:08:43
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 192  sub parmval { Line 195  sub parmval {
     return ($result,@outpar);      return ($result,@outpar);
 }  }
   
   
   ##################################################
   ##################################################
   #
   # Store a parameter
   #
   # Takes
   # - resource id
   # - name of parameter
   # - level
   # - new value
   # - new type
   sub storeparm {
       my ($sresid,$spnam,$snum,$nval,$ntype)=@_;
       $spnam=~s/\_([^\_]+)$/\.$1/;
   # ---------------------------------------------------------- Construct prefixes
       
       my $symbparm=$symbp{$sresid}.'.'.$spnam;
       my $mapparm=$mapp{$sresid}.'___(all).'.$spnam;
       
       my $seclevel=$ENV{'request.course.id'}.'.['.$csec.'].'.$spnam;
       my $seclevelr=$ENV{'request.course.id'}.'.['.$csec.'].'.$symbparm;
       my $seclevelm=$ENV{'request.course.id'}.'.['.$csec.'].'.$mapparm;
       
       my $courselevel=$ENV{'request.course.id'}.'.'.$spnam;
       my $courselevelr=$ENV{'request.course.id'}.'.'.$symbparm;
       my $courselevelm=$ENV{'request.course.id'}.'.'.$mapparm;
       
       my $storeunder='';
       if (($snum==11) || ($snum==3)) { $storeunder=$courselevel; }
       if (($snum==10) || ($snum==2)) { $storeunder=$courselevelm; }
       if (($snum==7) || ($snum==1)) { $storeunder=$courselevelr; }
       if ($snum==6) { $storeunder=$seclevel; }
       if ($snum==5) { $storeunder=$seclevelm; }
       if ($snum==4) { $storeunder=$seclevelr; }
       
       my $delete;
       if ($nval eq '') { $delete=1;}
       my %storecontent = ($storeunder         => $nval,
    $storeunder.'.type' => $ntype);
       my $reply='';
       if ($snum>3) {
   # ---------------------------------------------------------------- Store Course
   #
   # Expire sheets
    &Apache::lonnet::expirespread('','','studentcalc');
    if (($snum==7) || ($snum==4)) {
       &Apache::lonnet::expirespread('','','assesscalc',$symbp{$sresid});
    } elsif (($snum==8) || ($snum==5)) {
       &Apache::lonnet::expirespread('','','assesscalc',$mapp{$sresid});
    } else {
       &Apache::lonnet::expirespread('','','assesscalc');
    }
   # Store parameter
    if ($delete) {
       $reply=&Apache::lonnet::del
    ('resourcedata',[keys(%storecontent)],
    $ENV{'course.'.$ENV{'request.course.id'}.'.domain'},
    $ENV{'course.'.$ENV{'request.course.id'}.'.num'});
    } else {
       $reply=&Apache::lonnet::cput
    ('resourcedata',\%storecontent,
    $ENV{'course.'.$ENV{'request.course.id'}.'.domain'},
    $ENV{'course.'.$ENV{'request.course.id'}.'.num'});
    }
       } else {
   # ------------------------------------------------------------------ Store User
   #
   # Expire sheets
    &Apache::lonnet::expirespread($uname,$udom,'studentcalc');
    if ($snum==1) {
       &Apache::lonnet::expirespread
    ($uname,$udom,'assesscalc',$symbp{$sresid});
    } elsif ($snum==2) {
       &Apache::lonnet::expirespread
    ($uname,$udom,'assesscalc',$mapp{$sresid});
    } else {
       &Apache::lonnet::expirespread($uname,$udom,'assesscalc');
    }
   # Store parameter
    if ($delete) {
       $reply=&Apache::lonnet::del
    ('resourcedata',[keys(%storecontent)],$udom,$uname);
    } else {
       $reply=&Apache::lonnet::cput
    ('resourcedata',\%storecontent,$udom,$uname);
    }
       }
       
       if ($reply=~/^error\:(.*)/) {
    return "<font color=red>Write Error: $1</font>";
       }
       return '';
   }
   
 ##################################################  ##################################################
 ##################################################  ##################################################
   
Line 309  sub startpage { Line 407  sub startpage {
     my $overallhelp=      my $overallhelp=
  &Apache::loncommon::help_open_menu('','Setting Parameters','Course_Setting_Parameters','',10,'Instructor Interface');   &Apache::loncommon::help_open_menu('','Setting Parameters','Course_Setting_Parameters','',10,'Instructor Interface');
     my $assessparmhelp=&Apache::loncommon::help_open_topic("Cascading_Parameters","Assessment Parameters");      my $assessparmhelp=&Apache::loncommon::help_open_topic("Cascading_Parameters","Assessment Parameters");
       my $html=&Apache::lonxml::xmlbegin();
     $r->print(<<ENDHEAD);      $r->print(<<ENDHEAD);
 <html>  $html
 <head>  <head>
 <title>LON-CAPA Course Parameters</title>  <title>LON-CAPA Course Parameters</title>
 <script>  <script>
Line 419  sub print_row { Line 518  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 548  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 557  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 575  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 618  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 812  sub assessparms { Line 910  sub assessparms {
   
 # ---------------------------------------------------------- Anything to store?  # ---------------------------------------------------------- Anything to store?
     if ($ENV{'form.pres_marker'}) {      if ($ENV{'form.pres_marker'}) {
  my ($sresid,$spnam,$snum)=split(/\&/,$ENV{'form.pres_marker'});   $message.=&storeparm(split(/\&/,$ENV{'form.pres_marker'}),
  $spnam=~s/\_([^\_]+)$/\.$1/;       $ENV{'form.pres_value'},
 # ---------------------------------------------------------- Construct prefixes       $ENV{'form.pres_type'});
   
  my $symbparm=$symbp{$sresid}.'.'.$spnam;  
  my $mapparm=$mapp{$sresid}.'___(all).'.$spnam;  
   
  my $seclevel=$ENV{'request.course.id'}.'.['.$csec.'].'.$spnam;  
  my $seclevelr=$ENV{'request.course.id'}.'.['.$csec.'].'.$symbparm;  
  my $seclevelm=$ENV{'request.course.id'}.'.['.$csec.'].'.$mapparm;  
   
  my $courselevel=$ENV{'request.course.id'}.'.'.$spnam;  
  my $courselevelr=$ENV{'request.course.id'}.'.'.$symbparm;  
  my $courselevelm=$ENV{'request.course.id'}.'.'.$mapparm;  
   
  my $storeunder='';  
  if (($snum==9) || ($snum==3)) { $storeunder=$courselevel; }  
  if (($snum==8) || ($snum==2)) { $storeunder=$courselevelm; }  
  if (($snum==7) || ($snum==1)) { $storeunder=$courselevelr; }  
  if ($snum==6) { $storeunder=$seclevel; }  
  if ($snum==5) { $storeunder=$seclevelm; }  
  if ($snum==4) { $storeunder=$seclevelr; }  
   
  my $delete;  
  if ($ENV{'form.pres_value'} eq '') { $delete=1;}  
         my %storecontent = ($storeunder         => $ENV{'form.pres_value'},  
                             $storeunder.'.type' => $ENV{'form.pres_type'});  
  my $reply='';  
  if ($snum>3) {  
 # ---------------------------------------------------------------- Store Course  
 #  
 # Expire sheets  
     &Apache::lonnet::expirespread('','','studentcalc');  
     if (($snum==7) || ($snum==4)) {  
  &Apache::lonnet::expirespread('','','assesscalc',$symbp{$sresid});  
     } elsif (($snum==8) || ($snum==5)) {  
  &Apache::lonnet::expirespread('','','assesscalc',$mapp{$sresid});  
     } else {  
  &Apache::lonnet::expirespread('','','assesscalc');  
     }  
 # Store parameter  
     if ($delete) {  
  $reply=&Apache::lonnet::del  
     ('resourcedata',[keys(%storecontent)],  
      $ENV{'course.'.$ENV{'request.course.id'}.'.domain'},  
      $ENV{'course.'.$ENV{'request.course.id'}.'.num'});  
     } else {  
  $reply=&Apache::lonnet::cput  
     ('resourcedata',\%storecontent,  
      $ENV{'course.'.$ENV{'request.course.id'}.'.domain'},  
      $ENV{'course.'.$ENV{'request.course.id'}.'.num'});  
     }  
  } else {  
 # ------------------------------------------------------------------ Store User  
 #  
 # Expire sheets  
     &Apache::lonnet::expirespread($uname,$udom,'studentcalc');  
     if ($snum==1) {  
  &Apache::lonnet::expirespread  
     ($uname,$udom,'assesscalc',$symbp{$sresid});  
     } elsif ($snum==2) {  
  &Apache::lonnet::expirespread  
     ($uname,$udom,'assesscalc',$mapp{$sresid});  
     } else {  
  &Apache::lonnet::expirespread($uname,$udom,'assesscalc');  
     }  
 # Store parameter  
     if ($delete) {  
  $reply=&Apache::lonnet::del  
     ('resourcedata',[keys(%storecontent)],$udom,$uname);  
     } else {  
  $reply=&Apache::lonnet::cput  
     ('resourcedata',\%storecontent,$udom,$uname);  
     }  
  }  
   
  if ($reply=~/^error\:(.*)/) {  
     $message.="<font color=red>Write Error: $1</font>";  
  }  
 # ---------------------------------------------------------------- Done storing  # ---------------------------------------------------------------- Done storing
  $message.='<h3>'.&mt('Changes can take up to 10 minutes before being active for all students.').&Apache::loncommon::help_open_topic('Caching').'</h3>';   $message.='<h3>'.&mt('Changes can take up to 10 minutes before being active for all students.').&Apache::loncommon::help_open_topic('Caching').'</h3>';
     }      }
Line 986  sub assessparms { Line 1008  sub assessparms {
         $r->print('<input type="hidden" value="'.$pssymb.'" name="symb">');          $r->print('<input type="hidden" value="'.$pssymb.'" name="symb">');
     }      }
   
     $r->print('<tr><td colspan="3"><hr /><input type="checkbox"');      $r->print('<tr><td colspan="3"><hr /><label><input type="checkbox"');
     if ($showoptions eq 'show') {$r->print(" checked ");}      if ($showoptions eq 'show') {$r->print(" checked ");}
     $r->print(' name="showoptions" value="show">'.&mt('Show More Options').'<hr /></td></tr>');      $r->print(' name="showoptions" value="show" />'.&mt('Show More Options').'</label><hr /></td></tr>');
 #    $r->print("<tr><td>Show: $showoptions</td></tr>");  #    $r->print("<tr><td>Show: $showoptions</td></tr>");
 #    $r->print("<tr><td>pscat: @pscat</td></tr>");  #    $r->print("<tr><td>pscat: @pscat</td></tr>");
 #    $r->print("<tr><td>psprt: @psprt</td></tr>");  #    $r->print("<tr><td>psprt: @psprt</td></tr>");
Line 1144  sub assessparms { Line 1166  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 1177  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) {
Line 1181  ENDTABLEHEADFOUR Line 1204  ENDTABLEHEADFOUR
     ||      ||
     ($pssymb && $pssymb eq $symbp{$rid})) {      ($pssymb && $pssymb eq $symbp{$rid})) {
 # ------------------------------------------------------ Entry for one resource  # ------------------------------------------------------ Entry for one resource
                     if ($defbgone eq '"E0E099"') {                      if ($defbgone eq '"#E0E099"') {
                         $defbgone='"E0E0DD"';                          $defbgone='"#E0E0DD"';
                     } else {                      } else {
                         $defbgone='"E0E099"';                          $defbgone='"#E0E099"';
                     }                      }
                     if ($defbgtwo eq '"FFFF99"') {                      if ($defbgtwo eq '"#FFFF99"') {
                         $defbgtwo='"FFFFDD"';                          $defbgtwo='"#FFFFDD"';
                     } else {                      } else {
                         $defbgtwo='"FFFF99"';                          $defbgtwo='"#FFFF99"';
                     }                      }
                     my $thistitle='';                      my $thistitle='';
                     my %name=   ();                      my %name=   ();
Line 1754  sub crsenv { Line 1777  sub crsenv {
     my $Value=&mt('Value');      my $Value=&mt('Value');
     my $Set=&mt('Set');      my $Set=&mt('Set');
     my $browse_js=&Apache::loncommon::browser_and_searcher_javascript('parmset');      my $browse_js=&Apache::loncommon::browser_and_searcher_javascript('parmset');
       my $html=&Apache::lonxml::xmlbegin();
     $r->print(<<ENDENV);      $r->print(<<ENDENV);
 <html>  $html
   <head>
 <script type="text/javascript" language="Javascript" >  <script type="text/javascript" language="Javascript" >
 $browse_js  $browse_js
 </script>  </script>
 <head>  
 <title>LON-CAPA Course Environment</title>  <title>LON-CAPA Course Environment</title>
 </head>  </head>
 $bodytag  $bodytag
Line 1805  sub overview { Line 1829  sub overview {
                              'Set/Modify Course Assessment Parameters');                               'Set/Modify Course Assessment Parameters');
     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'};
       my $html=&Apache::lonxml::xmlbegin();
     $r->print(<<ENDOVER);      $r->print(<<ENDOVER);
 <html>  $html
 <head>  <head>
 <title>LON-CAPA Course Environment</title>  <title>LON-CAPA Course Environment</title>
 </head>  </head>
Removed from v.1.181  
changed lines
  Added in v.1.186

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