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

Diff for /loncom/homework/lonhomework.pm between versions 1.126 and 1.129

version 1.126, 2003/05/13 01:56:32 version 1.129, 2003/05/16 19:01:27
Line 214  sub check_access { Line 214  sub check_access {
     my $maxtries = &Apache::lonnet::EXT("resource.$id.maxtries");      my $maxtries = &Apache::lonnet::EXT("resource.$id.maxtries");
     if ( $tries eq '' ) { $tries = '0'; }      if ( $tries eq '' ) { $tries = '0'; }
     if ( $maxtries eq '' ) { $maxtries = '2'; }       if ( $maxtries eq '' ) { $maxtries = '2'; } 
     if ($tries >= $maxtries) { $status = 'CANNOT_ANSWER'; }       if ($tries >= $maxtries) { $status = 'CANNOT_ANSWER'; }
     if($Apache::lonhomework::history{"resource.$id.solved"}=~/^correct/      # if (correct and show prob status) or excused then CANNOT_ANSWER
       && lc($Apache::lonhomework::problemstatus) ne 'no') {      if(($Apache::lonhomework::history{"resource.$id.solved"}=~/^correct/
    &&
    lc($Apache::lonhomework::problemstatus) ne 'no')
          ||
          $Apache::lonhomework::history{"resource.$id.solved"}=~/^excused/) {
  $status = 'CANNOT_ANSWER';   $status = 'CANNOT_ANSWER';
     }      }
   }    }
Line 286  sub showhashsubset { Line 290  sub showhashsubset {
   
 sub setuppermissions {  sub setuppermissions {
   $Apache::lonhomework::browse= &Apache::lonnet::allowed('bre',$ENV{'request.filename'});    $Apache::lonhomework::browse= &Apache::lonnet::allowed('bre',$ENV{'request.filename'});
   $Apache::lonhomework::viewgrades=&Apache::lonnet::allowed('vgr',$ENV{'request.course.id'});    my $viewgrades = &Apache::lonnet::allowed('vgr',$ENV{'request.course.id'});
     if (! $viewgrades && 
         exists($ENV{'request.course.sec'}) && 
         $ENV{'request.course.sec'} !~ /^\s*$/) {
         $viewgrades = &Apache::lonnet::allowed('vgr',$ENV{'request.course.id'}.
                                                  '/'.$ENV{'request.course.sec'});
     }
     $Apache::lonhomework::viewgrades = $viewgrades;
   return ''    return ''
 }  }
   
Line 540  sub get_template_list { Line 551  sub get_template_list {
   }    }
   if (@allnames && !$result) {    if (@allnames && !$result) {
     $result="<option>Select a $extension template</option>\n<option>".      $result="<option>Select a $extension template</option>\n<option>".
       join('</option><option>',sort(@allnames)).'</option>';   join('</option><option>',sort(@allnames)).'</option>';
   }    }
   return $result;    return $result;
 }  }
Line 551  sub newproblem { Line 562  sub newproblem {
     $extension=~s:^.*\.([\w]+)$:$1:;      $extension=~s:^.*\.([\w]+)$:$1:;
     &Apache::lonxml::debug("Looking for :$extension:");      &Apache::lonxml::debug("Looking for :$extension:");
     if ($ENV{'form.template'} &&      if ($ENV{'form.template'} &&
  $ENV{'form.template'} ne "Select a $extension type") {   $ENV{'form.template'} ne "Select a $extension template") {
  use File::Copy;   use File::Copy;
  my $file = &get_template_list($ENV{'form.template'},$extension);   my $file = &get_template_list($ENV{'form.template'},$extension);
  my $dest = &Apache::lonnet::filelocation("",$request->uri);   my $dest = &Apache::lonnet::filelocation("",$request->uri);
  copy($file,$dest);   copy($file,$dest);
  &renderpage($request,$dest);   &renderpage($request,$dest);
     } elsif($ENV{'form.newfile'}) {  
  # I don't like hard-coded filenames but for now, this will work.  
  use File::Copy;  
  my $templatefilename =   
     $request->dir_config('lonIncludes').'/templates/blank.problem';  
  &Apache::lonxml::debug("$templatefilename");  
  my $dest = &Apache::lonnet::filelocation("",$request->uri);  
  copy($templatefilename,$dest);  
  &renderpage($request,$dest);  
     } else {      } else {
  my $templatelist=&get_template_list('',$extension);   my $templatelist=&get_template_list('',$extension);
  my $url=$request->uri;   my $url=$request->uri;
  my $dest = &Apache::lonnet::filelocation("",$request->uri);   my $dest = &Apache::lonnet::filelocation("",$request->uri);
    my $errormsg;
    if ($ENV{'form.newfile'}) {
       $errormsg='<p><font color="red">You did not select a template.</font></p>'."\n";
    }
  my $instructions;   my $instructions;
  if ($templatelist) { $instructions=", select a template from the pull-down menu below.<br />Then";}   if ($templatelist) { $instructions=", select a template from the pull-down menu below.<br />Then";}
  $request->print(<<ENDNEWPROBLEM);   $request->print(<<ENDNEWPROBLEM);
 <body bgcolor="#FFFFFF">  <body bgcolor="#FFFFFF">
 <h1>Creating a new $extension resource</h1>  <h1>Creating a new $extension resource</h1>
   $errormsg
 The requested file <tt>$url</tt> currently does not exist.  The requested file <tt>$url</tt> currently does not exist.
 <p>  <p>
 To create a new $extension$instructions click on the "Create $extension" button.  <b>To create a new $extension$instructions click on the "Create $extension" button.</b>
 </p>  </p>
 <p><form action="$url" method="POST">  <p><form action="$url" method="POST">
 ENDNEWPROBLEM  ENDNEWPROBLEM
Removed from v.1.126  
changed lines
  Added in v.1.129

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