Diff for /loncom/homework/inputtags.pm between versions 1.21 and 1.28

version 1.21, 2001/01/05 01:14:49 version 1.28, 2001/02/19 21:02:59
Line 1 Line 1
 # The LearningOnline Network with CAPA  # The LearningOnline Network with CAPA
 # input  definitons  # input  definitons
   # 2/19 Guy 
   
 package Apache::inputtags;  package Apache::inputtags;
 use strict;  use strict;
Line 63  sub start_textline { Line 64  sub start_textline {
     my $size = &Apache::run::run("{$args;".'return $size}',$safeeval);      my $size = &Apache::run::run("{$args;".'return $size}',$safeeval);
     if ($size eq '') { $size=20; }      if ($size eq '') { $size=20; }
     my $oldresponse = $Apache::lonhomework::history{"resource.$Apache::inputtags::part.$Apache::inputtags::response['-1'].submission"};      my $oldresponse = $Apache::lonhomework::history{"resource.$Apache::inputtags::part.$Apache::inputtags::response['-1'].submission"};
     $result= '<input type="text" name="HWVAL'.$Apache::inputtags::response['-1'].'" value="'.$oldresponse.'" size="'.$size.'">';      $result= '<input type="text" name="HWVAL'.$Apache::inputtags::response['-1'].'" value="'.$oldresponse.'" size="'.$size.'" />';
   }    }
   return $result;    return $result;
 }  }
Line 94  sub end_textline { Line 95  sub end_textline {
 #  my $id = &Apache::run::run("{$args;".'return $id}',$safeeval);  #  my $id = &Apache::run::run("{$args;".'return $id}',$safeeval);
 #  push (@Apache::inputtags::answergroup,$id);  #  push (@Apache::inputtags::answergroup,$id);
 #  my $result='';  #  my $result='';
 #  my $button='<input type="submit" name="submit" value="Submit All Answers">';  #  my $button='<input type="submit" name="submit" value="Submit All Answers" />';
 #  my $showbutton='1';  #  my $showbutton='1';
 #  my $usedtry='1';  #  my $usedtry='1';
 #  my $response='';  #  my $response='';
 #  if ( $target == 'web' ) {  #  if ( $target == 'web' ) {
 #    if ( defined $ENV{'form.submit'}) {  #    if ( defined $ENV{'form.submitted'}) {
 #    }  #    }
 #    if ($showbutton > 0) { $result.=$button }  #    if ($showbutton > 0) { $result.=$button }
 #  }  #  }
Line 114  sub start_datasubmission { Line 115  sub start_datasubmission {
 sub end_datasubmission {  sub end_datasubmission {
   my ($target,$token,$parstack,$parser,$safeeval)=@_;    my ($target,$token,$parstack,$parser,$safeeval)=@_;
   if ( $target == 'web' ) {    if ( $target == 'web' ) {
     return '<input type="submit" name="submit" value="Submit All Data">';      return '<input type="submit" name="submit" value="Submit All Data" />';
   }    }
   return '';    return '';
 }  }
Line 163  sub decideoutput { Line 164  sub decideoutput {
   my $message='';    my $message='';
   my $button=0;    my $button=0;
   if      ($award eq 'EXACT_ANS' || $award eq 'APPROX_ANS' ) {    if      ($award eq 'EXACT_ANS' || $award eq 'APPROX_ANS' ) {
     $message = "<b>You are correct.</b> You receipt is ".&Apache::lonnet::receipt;      $message = "<b>You are correct.</b> Your receipt is ".&Apache::lonnet::receipt;
     $button=0;      $button=0;
   } elsif ($award eq 'NO_RESPONSE') {    } elsif ($award eq 'NO_RESPONSE') {
     $message = '';      $message = '';
Line 225  sub grade { Line 226  sub grade {
 #  my $result='';  #  my $result='';
   my $response='';    my $response='';
   if ( $target == 'web' ) {    if ( $target == 'web' ) {
     if ( defined $ENV{'form.submit'}) {      if ( defined $ENV{'form.submitted'}) {
       my @awards = ();        my @awards = ();
       &Apache::lonxml::debug("$#Apache::inputtags::responselist");        &Apache::lonxml::debug("$#Apache::inputtags::responselist");
       foreach $response (@Apache::inputtags::responselist) {        foreach $response (@Apache::inputtags::responselist) {
Line 255  sub gradestatus { Line 256  sub gradestatus {
       
   my $status = $Apache::inputtags::status['-1'];    my $status = $Apache::inputtags::status['-1'];
   &Apache::lonxml::debug("gradestatus has :$status:");    &Apache::lonxml::debug("gradestatus has :$status:");
   if ( $status eq 'CAN_ANSWER' || $status eq 'SHOW_ANSWER' ) {      if ( $status ne 'CLOSED' ) {  
     my $award = $Apache::lonhomework::history{"resource.$id.award"};      my $award = $Apache::lonhomework::history{"resource.$id.award"};
     &Apache::lonxml::debug("Found Award |$award|");      &Apache::lonxml::debug("Found Award |$award|");
     if ( $award ne '' ) {      if ( $award ne '' ) {
       &Apache::lonxml::debug('Getting message');        &Apache::lonxml::debug('Getting message');
       ($showbutton,$message) = &decideoutput($award);        ($showbutton,$message) = &decideoutput($award);
         $message="<br /><table bgcolor=\"#aaffaa\"><tr><td>$message</td></tr></table>";
     }      }
     my $tries = $Apache::lonhomework::history{"resource.$id.tries"};      my $tries = $Apache::lonhomework::history{"resource.$id.tries"};
     my $maxtries = &Apache::lonnet::EXT("resource.$id.maxtries");      my $maxtries = &Apache::lonnet::EXT("resource.$id.maxtries");
     &Apache::lonxml::debug("got maxtries of :$maxtries:");      &Apache::lonxml::debug("got maxtries of :$maxtries:");
     if ( $tries eq '' ) { $tries = '0'; }      if ( $tries eq '' ) { $tries = '0'; }
     if ( $maxtries eq '' ) { $maxtries = '2'; }       if ( $maxtries eq '' ) { $maxtries = '2'; } 
       if ( $maxtries eq 'con_lost' ) { $maxtries = '0'; } 
     if ( $showbutton ) {      if ( $showbutton ) {
       $trystr = "<br></br>Tries $tries/$maxtries";        $trystr = "<br />Tries $tries/$maxtries";
     }      }
     if ( $tries >= $maxtries ) { $showbutton = 0; }      if ( $status eq 'SHOW_ANSWER' || $status eq 'CANNOT_ANSWER') {$showbutton = 0;}
     if ( $status eq 'SHOW_ANSWER' ) { $showbutton = 0; }  
     if ( $showbutton ) {       if ( $showbutton ) { 
       $button = '<br></br><input type="submit" name="submit" value="Submit All Answers"><br></br>';        $button = '<br /><input type="submit" name="submit" value="Submit All Answers" />';
     }      }
   }    }
   return $button.$message.$trystr;    return $button.$message.$trystr;

Removed from v.1.21  
changed lines
  Added in v.1.28


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