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

Diff for /loncom/homework/lonhomework.pm between versions 1.136 and 1.141

version 1.136, 2003/06/20 14:45:19 version 1.141, 2003/09/15 18:43:53
Line 50  use Apache::essayresponse(); Line 50  use Apache::essayresponse();
 use Apache::externalresponse();  use Apache::externalresponse();
 use Apache::rankresponse();  use Apache::rankresponse();
 use Apache::matchresponse();  use Apache::matchresponse();
 #use Apache::chemresponse();  use Apache::chemresponse();
 use Apache::Constants qw(:common);  use Apache::Constants qw(:common);
 use HTML::Entities();  use HTML::Entities();
 use Apache::loncommon();  use Apache::loncommon();
Line 69  sub get_target { Line 69  sub get_target {
     } elsif ( defined($ENV{'form.grade_target'}  )       } elsif ( defined($ENV{'form.grade_target'}  ) 
  && ($Apache::lonhomework::viewgrades eq 'F' )) {   && ($Apache::lonhomework::viewgrades eq 'F' )) {
       return ($ENV{'form.grade_target'});        return ($ENV{'form.grade_target'});
       } elsif (defined($ENV{'form.grade_target'}  ) 
    && ($ENV{'form.grade_target'} eq 'answer')) {
         return ($ENV{'form.grade_target'});
     }      }
     
     if ( defined($ENV{'form.submitted'}) &&      if ( defined($ENV{'form.submitted'}) &&
  ( !defined($ENV{'form.resetdata'}))) {   ( !defined($ENV{'form.resetdata'})) &&
    ( !defined($ENV{'form.newrandomization'}))) {
       return ('grade', 'web');        return ('grade', 'web');
     } else {      } else {
       return ('web');        return ('web');
Line 91  sub get_target { Line 95  sub get_target {
       if ( $ENV{'form.problemmode'} eq 'View' ||        if ( $ENV{'form.problemmode'} eq 'View' ||
    $ENV{'form.problemmode'} eq 'Discard Edits and 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'})) &&
        (!defined($ENV{'form.newrandomization'}))) {
   return ('grade', 'web','answer');    return ('grade', 'web','answer');
  } else {   } else {
   return ('web','answer');    return ('web','answer');
Line 655  sub handler { Line 660  sub handler {
     # if we are browsing we might not be able to know where we are      # if we are browsing we might not be able to know where we are
     if ($Apache::lonhomework::browse ne 'F') {      if ($Apache::lonhomework::browse ne 'F') {
       #should know where we are, so ask        #should know where we are, so ask
       $request->internal_redirect('/adm/ambiguous'); return;  
       &Apache::lonnet::cleanenv();
   
    $request->internal_redirect('/adm/ambiguous'); return;
     }      }
   }    }
   
Line 663  sub handler { Line 671  sub handler {
   &Apache::lonxml::debug('symb is '.$symb);    &Apache::lonxml::debug('symb is '.$symb);
   if ($ENV{'request.state'} eq "construct" || $symb eq '') {    if ($ENV{'request.state'} eq "construct" || $symb eq '') {
       if ($ENV{'form.resetdata'} eq 'Reset Submissions' ||        if ($ENV{'form.resetdata'} eq 'Reset Submissions' ||
   $ENV{'form.resetdata'} eq 'New Problem Variation' ) {    $ENV{'form.resetdata'} eq 'New Problem Variation' ||
             $ENV{'form.newrandomization'} eq 'New Randomization') {
   my ($symb,$courseid,$domain,$name) = &Apache::lonxml::whichuser();    my ($symb,$courseid,$domain,$name) = &Apache::lonxml::whichuser();
   &Apache::lonnet::tmpreset($symb,'',$domain,$name);    &Apache::lonnet::tmpreset($symb,'',$domain,$name);
   &Apache::lonxml::debug("Attempt reset");
       }        }
   }    }
   if ($ENV{'request.state'} eq "construct") {    if ($ENV{'request.state'} eq "construct") {
Removed from v.1.136  
changed lines
  Added in v.1.141

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