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

Diff for /loncom/homework/lonhomework.pm between versions 1.82 and 1.93

version 1.82, 2002/07/18 20:52:36 version 1.93, 2002/10/14 16:43:58
Line 42  use Apache::randomlabel(); Line 42  use Apache::randomlabel();
 use Apache::response();  use Apache::response();
 use Apache::hint();  use Apache::hint();
 use Apache::outputtags();  use Apache::outputtags();
   use Apache::caparesponse();
   use Apache::radiobuttonresponse();
   use Apache::optionresponse();
   use Apache::imageresponse();
   use Apache::essayresponse();
   use Apache::externalresponse();
 use Apache::Constants qw(:common);  use Apache::Constants qw(:common);
 use HTML::Entities();  use HTML::Entities();
 use Apache::loncommon;  use Apache::loncommon();
 #use Time::HiRes qw( gettimeofday tv_interval );  #use Time::HiRes qw( gettimeofday tv_interval );
   
 BEGIN {  BEGIN {
Line 53  BEGIN { Line 59  BEGIN {
   
 sub get_target {  sub get_target {
   if ( $ENV{'request.state'} eq "published") {    if ( $ENV{'request.state'} eq "published") {
     if ( defined($ENV{'form.grade_target'})       if ( defined($ENV{'form.grade_target'}  ) 
    && ($ENV{'form.grade_target'} eq 'tex')) {
         return ($ENV{'form.grade_target'});
       } elsif ( defined($ENV{'form.grade_target'}  ) 
  && ($Apache::lonhomework::viewgrades == 'F' )) {   && ($Apache::lonhomework::viewgrades == 'F' )) {
       return ($ENV{'form.grade_target'});        return ($ENV{'form.grade_target'});
     }      }
    
     if ( defined($ENV{'form.submitted'})) {      if ( defined($ENV{'form.submitted'})) {
       return ('grade', 'web');        return ('grade', 'web');
     } else {      } else {
Line 73  sub get_target { Line 83  sub get_target {
  return ('web');   return ('web');
       }        }
     } else {      } else {
       if ( $ENV{'form.problemmode'} eq 'View' ) {        if ( $ENV{'form.problemmode'} eq 'View' ||
      $ENV{'form.problemmode'} eq 'Discard Edits and View') {
  if ( defined($ENV{'form.submitted'}) &&   if ( defined($ENV{'form.submitted'}) &&
      (!defined($ENV{'form.resetdata'})) ) {       (!defined($ENV{'form.resetdata'})) ) {
   return ('grade', 'web','answer');    return ('grade', 'web','answer');
Line 128  sub send_footer { Line 139  sub send_footer {
   
 $Apache::lonxml::browse='';  $Apache::lonxml::browse='';
   
   # JB, 9/24/2002: Any changes in this function may require a change
   # in lonnavmaps::resource::getDateStatus.
 sub check_access {  sub check_access {
   my ($id) = @_;    my ($id) = @_;
   my $date ='';    my $date ='';
Line 142  sub check_access { Line 155  sub check_access {
   foreach $temp ("opendate","duedate","answerdate") {    foreach $temp ("opendate","duedate","answerdate") {
     $lastdate = $date;      $lastdate = $date;
     $date = &Apache::lonnet::EXT("resource.$id.$temp");      $date = &Apache::lonnet::EXT("resource.$id.$temp");
       my $thistype = &Apache::lonnet::EXT("resource.$id.$temp.type");
       if ($thistype eq 'date_interval') {
    if ($temp eq 'opendate') {
              $date=&Apache::lonnet::EXT("resource.$id.duedate")-$date;
           }
           if ($temp eq 'answerdate') {
              $date=&Apache::lonnet::EXT("resource.$id.duedate")+$date;
           }
       }
     &Apache::lonxml::debug("found :$date: for :$temp:");      &Apache::lonxml::debug("found :$date: for :$temp:");
     if ($date eq '') {      if ($date eq '') {
       $date = "an unknown date"; $passed = 0;        $date = "an unknown date"; $passed = 0;
Line 319  sub editxmlmode { Line 341  sub editxmlmode {
     my ($rows,$cols) = &Apache::edit::textarea_sizes(\$problem);      my ($rows,$cols) = &Apache::edit::textarea_sizes(\$problem);
     my $xml_help = Apache::loncommon::help_open_topic("Problem_Editor_XML_Index");      my $xml_help = Apache::loncommon::help_open_topic("Problem_Editor_XML_Index");
     if ($cols > 80) { $cols = 80; }      if ($cols > 80) { $cols = 80; }
       if ($cols < 70) { $cols = 70; }
       if ($rows < 20) { $rows = 20; }
     $result.='<html><body bgcolor="#FFFFFF">      $result.='<html><body bgcolor="#FFFFFF">
             <form name="lonhomework" method="POST" action="'.              <form name="lonhomework" method="POST" action="'.
       $ENV{'request.uri'}.'">        $ENV{'request.uri'}.'">
Line 362  sub renderpage { Line 386  sub renderpage {
       if ($symb eq '') {        if ($symb eq '') {
  if ($ENV{'request.state'} eq "construct") {   if ($ENV{'request.state'} eq "construct") {
  } else {   } else {
   $request->print("Browsing or <a href=\"/adm/ambiguous\">ambiguous</a> reference, submissions ignored<br />");            my $help = Apache::loncommon::help_open_topic("Ambiguous_Reference");
     $request->print("Browsing or <a href=\"/adm/ambiguous\">ambiguous</a> reference, submissions ignored $help<br />");
  }   }
       }        }
       #if ($Apache::lonhomework::viewgrades eq 'F') {&createmenu('grade',$request); }        #if ($Apache::lonhomework::viewgrades eq 'F') {&createmenu('grade',$request); }
     }      }
     #if ($target eq 'grade') { &showhash(%Apache::lonhomework::history); }      if ($target eq 'answer') { &showhash(%Apache::lonhomework::history); }
     #if ($target eq 'web') { &showhash(%ENV); }      if ($target eq 'web') {&Apache::lonhomework::showhashsubset(\%ENV,'^form');}
   
     my $default=&Apache::lonnet::getfile('/home/httpd/html/res/adm/includes/default_homework.lcpm');      my $default=&Apache::lonnet::getfile('/home/httpd/html/res/adm/includes/default_homework.lcpm');
     if ($default == -1) {      if ($default == -1) {
Line 404  sub renderpage { Line 429  sub renderpage {
 sub get_template_list {  sub get_template_list {
   my ($namewanted,$extension) = @_;    my ($namewanted,$extension) = @_;
   my $result;    my $result;
     my @allnames;
   &Apache::lonxml::debug("Looking for :$extension:");    &Apache::lonxml::debug("Looking for :$extension:");
   foreach my $file (</home/httpd/html/res/adm/includes/templates/*.$extension>) {    foreach my $file (</home/httpd/html/res/adm/includes/templates/*.$extension>) {
     my $name=&Apache::lonnet::metadata($file,'title');      my $name=&Apache::lonnet::metadata($file,'title');
Line 411  sub get_template_list { Line 437  sub get_template_list {
       $result=$file;        $result=$file;
       last;        last;
     } else {      } else {
       $result.="<option>$name</option>";        push (@allnames, $name);
     }      }
   }    }
     if (@allnames && !$result) {
       $result="<option>Select a $extension type</option>\n<option>".
         join('</option><option>',sort(@allnames)).'</option>';
     }
   return $result;    return $result;
 }  }
   
Line 422  sub newproblem { Line 452  sub newproblem {
     my $extension=$request->uri;      my $extension=$request->uri;
     $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") {
  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);
Line 437  sub newproblem { Line 468  sub newproblem {
  my $dest = &Apache::lonnet::filelocation("",$request->uri);   my $dest = &Apache::lonnet::filelocation("",$request->uri);
  copy($templatefilename,$dest);   copy($templatefilename,$dest);
  &renderpage($request,$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);
  if (!defined($templatelist)) {   my $instructions;
     # We didn't find a template, so just create a blank problem.   if ($templatelist) { $instructions=", select a template from the pull-down menu below. Then";}
     $request->print(<<ENDNEWPROBLEM);  
 <body bgcolor="#FFFFFF">  
 The requested file $url doesn\'t exist. You can create a new $extension <br />  
 <form action="$url" method="POST">  
 <input type="submit" name="newfile" value="New $extension"><br />  
 </form>  
 </body>  
 ENDNEWPROBLEM  
             return '';  
         }  
  $request->print(<<ENDNEWPROBLEM);   $request->print(<<ENDNEWPROBLEM);
 <body bgcolor="#FFFFFF">  <body bgcolor="#FFFFFF">
 The requested file $url doesn\'t exist. You can create a new $extension <br />  The requested file $url doesn\'t exist. <br />
   To create a new $extension$instructions click on the Create $extension button.
 <form action="$url" method="POST">  <form action="$url" method="POST">
 <input type="submit" value="New $extension"><br />  
 <select name="template">  
 $templatelist  
 </select>  
 </form>  
 </body>  
 ENDNEWPROBLEM  ENDNEWPROBLEM
    if (defined($templatelist)) {
       $request->print("<select name=\"template\">$templatelist</select>");
    }
    $request->print("<br /><input type=\"submit\" name=\"newfile\" value=\"Create $extension\" />");
    $request->print("</form></body>");
     }      }
     return '';      return '';
 }  }
Removed from v.1.82  
changed lines
  Added in v.1.93

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