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

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

version 1.79, 2002/05/24 18:55:23 version 1.82, 2002/07/18 20:52:36
Line 28 Line 28
 # Guy Albertelli  # Guy Albertelli
 # 11/30 Gerd Kortemeyer  # 11/30 Gerd Kortemeyer
 # 6/1,8/17,8/18 Gerd Kortemeyer  # 6/1,8/17,8/18 Gerd Kortemeyer
   # 7/18 Jeremy Bowers
   
 package Apache::lonhomework;  package Apache::lonhomework;
 use strict;  use strict;
Line 43  use Apache::hint(); Line 44  use Apache::hint();
 use Apache::outputtags();  use Apache::outputtags();
 use Apache::Constants qw(:common);  use Apache::Constants qw(:common);
 use HTML::Entities();  use HTML::Entities();
   use Apache::loncommon;
 #use Time::HiRes qw( gettimeofday tv_interval );  #use Time::HiRes qw( gettimeofday tv_interval );
   
 BEGIN {  BEGIN {
Line 80  sub get_target { Line 82  sub get_target {
  }   }
       } elsif ( $ENV{'form.problemmode'} eq 'Edit' ) {        } elsif ( $ENV{'form.problemmode'} eq 'Edit' ) {
  if ( $ENV{'form.submitted'} eq 'edit' ) {   if ( $ENV{'form.submitted'} eq 'edit' ) {
   return ('modified','edit');    if ( $ENV{'form.submit'} eq 'Submit Changes and View' ) {
       return ('modified','web','answer');
     } else {
       return ('modified','edit');
     }
  } else {   } else {
   return ('edit');    return ('edit');
  }   }
Line 304  sub editxmlmode { Line 310  sub editxmlmode {
    \$ENV{'form.editxmltext'});     \$ENV{'form.editxmltext'});
     if (!$error) { $problem=&Apache::lonnet::getfile($file); }      if (!$error) { $problem=&Apache::lonnet::getfile($file); }
   }    }
   my ($rows,$cols) = &Apache::edit::textarea_sizes(\$problem);    &Apache::lonhomework::showhashsubset(\%ENV,'^form');
   if ($cols > 80) { $cols = 80; }    if ( $ENV{'form.submit'} eq 'Submit Changes and View' ) {
   $result.='<html><body bgcolor="#FFFFFF">      &Apache::lonhomework::showhashsubset(\%ENV,'^form');
       $ENV{'form.problemmode'}='View';
       &renderpage($request,$file);
     } else {
       my ($rows,$cols) = &Apache::edit::textarea_sizes(\$problem);
       my $xml_help = Apache::loncommon::help_open_topic("Problem_Editor_XML_Index");
       if ($cols > 80) { $cols = 80; }
       $result.='<html><body bgcolor="#FFFFFF">
             <form name="lonhomework" method="POST" action="'.              <form name="lonhomework" method="POST" action="'.
       $ENV{'request.uri'}.'">        $ENV{'request.uri'}.'">
             <input type="hidden" name="problemmode" value="EditXML" />              <input type="hidden" name="problemmode" value="EditXML" />
             <input type="submit" name="problemmode" value="View" />              <input type="submit" name="problemmode" value="Discard Edits and View" />
             <input type="submit" name="problemmode" value="Edit" />              <input type="submit" name="problemmode" value="Edit" />
             <hr />              <hr />
             <input type="submit" name="submit" value="Submit Changes" />              <input type="submit" name="submit" value="Submit Changes" />
               <input type="submit" name="submit" value="Submit Changes and View" />
             <input type="submit" name="Undo" value="undo" />              <input type="submit" name="Undo" value="undo" />
             <hr />              <hr />
               ' . $xml_help . ' Problem Help<br>
             <textarea rows="'.$rows.'" cols="'.$cols.'" name="editxmltext">'.              <textarea rows="'.$rows.'" cols="'.$cols.'" name="editxmltext">'.
       &HTML::Entities::encode($problem).'</textarea>        &HTML::Entities::encode($problem).'</textarea>
             </form></body></html>';              </form></body></html>';
   $request->print($result);      $request->print($result);
     }
   return '';    return '';
 }  }
   
Line 480  sub handler { Line 496  sub handler {
   &Apache::lonxml::debug("Permissions:$Apache::lonhomework::browse:$Apache::lonhomework::viewgrades:");    &Apache::lonxml::debug("Permissions:$Apache::lonhomework::browse:$Apache::lonhomework::viewgrades:");
   # some times multiple problemmodes are submitted, need to select    # some times multiple problemmodes are submitted, need to select
   # the last one    # the last one
     &Apache::lonxml::debug("Problem Mode ".$ENV{'form.problemmode'});
   if ( defined($ENV{'form.problemmode'}) &&    if ( defined($ENV{'form.problemmode'}) &&
        ref($ENV{'form.problemmode'}) ) {         ref($ENV{'form.problemmode'}) ) {
       &Apache::lonxml::debug("Problem Mode ".join(",",@$ENV{'form.problemmode'}));
     my $mode=$ENV{'form.problemmode'}->[-1];      my $mode=$ENV{'form.problemmode'}->[-1];
     undef $ENV{'form.problemmode'};      undef $ENV{'form.problemmode'};
     $ENV{'form.problemmode'}=$mode;      $ENV{'form.problemmode'}=$mode;
Removed from v.1.79  
changed lines
  Added in v.1.82

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