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

Diff for /loncom/homework/inputtags.pm between versions 1.38 and 1.44

version 1.38, 2001/07/13 14:02:35 version 1.44, 2001/08/18 07:56:51
Line 17  sub initialize_inputtags { Line 17  sub initialize_inputtags {
   @Apache::inputtags::inputlist=();    @Apache::inputtags::inputlist=();
   # list of all current response ids    # list of all current response ids
   @Apache::inputtags::response=();    @Apache::inputtags::response=();
   #list of all response ids seen in this problem    # list of all response ids seen in this problem
   @Apache::inputtags::responselist=();    @Apache::inputtags::responselist=();
     # list of whether or not a specific response was previously used
     @Apache::inputtags::previous=();
   # id of current part, 0 means that no part is current (inside <problem> only    # id of current part, 0 means that no part is current (inside <problem> only
   $Apache::inputtags::part='';    $Apache::inputtags::part='';
   # list of problem date statuses, the first element is for <problem>     # list of problem date statuses, the first element is for <problem> 
Line 77  sub start_textline { Line 79  sub start_textline {
   if ($target eq 'web') {    if ($target eq 'web') {
     my $size = &Apache::lonxml::get_param('size',$parstack,$safeeval);      my $size = &Apache::lonxml::get_param('size',$parstack,$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 $partid=$Apache::inputtags::part;
     $result= '<input type="text" name="HWVAL'.$Apache::inputtags::response['-1'].'" value="'.$oldresponse.'" size="'.$size.'" />';      my $id=$Apache::inputtags::response['-1'];
   }      my $oldresponse = 
   if ($target eq 'edit') {        $Apache::lonhomework::history{"resource.$partid.$id.submission"};
     $result.=&Apache::edit::tag_start($target,$token,&Apache::lonxml::description($token));      $result= '<input type="text" name="HWVAL'.$id.'" value="'.
         $oldresponse.'" size="'.$size.'" />';
     } elsif ($target eq 'edit') {
       $result=&Apache::edit::tag_start($target,$token,
        &Apache::lonxml::description($token));
     $result.=&Apache::edit::text_arg('Size:','size',$token,'5')."</td></tr>";      $result.=&Apache::edit::text_arg('Size:','size',$token,'5')."</td></tr>";
     $result.=&Apache::edit::end_table;      $result.=&Apache::edit::end_table;
   }    } elsif ($target eq 'modified') {
   if ($target eq 'modified') {  
     my $constructtag=&Apache::edit::get_new_args($token,$parstack,$safeeval,'size');      my $constructtag=&Apache::edit::get_new_args($token,$parstack,$safeeval,'size');
     if ($constructtag) { $result = &Apache::edit::rebuild_tag($token); }      if ($constructtag) { $result = &Apache::edit::rebuild_tag($token); }
   }    }
Line 99  sub end_textline { Line 104  sub end_textline {
 }  }
   
 sub start_datasubmission {  sub start_datasubmission {
   return '';    my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
     my $id = &Apache::response::start_response($parstack,$safeeval);
     my $result;
     if ($target eq 'meta') {
       $result = &Apache::response::meta_stores_write($token->[2]->{'name'},
      $token->[2]->{'type'},
      $token->[2]->{'display'});
       $result .= &Apache::response::meta_package_write('datasubmission');
     }
     return $result;
 }  }
   
 sub end_datasubmission {  sub end_datasubmission {
   my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;    my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
   if ( $target == 'web' ) {    my $result;
     return '<input type="submit" name="submit" value="Submit All Data" />';    if ( $target eq 'web' ) {
     } elsif ($target eq 'grade' ) {
       if ( defined $ENV{'form.submitted'}) {
         &Apache::response::setup_params('datasubmission');
         my $partid = $Apache::inputtags::part;
         my $id = $Apache::inputtags::response['-1'];
         my $response = $ENV{'form.HWVAL'.$id};
         my $name = &Apache::lonxml::get_param('name',$parstack,$safeeval);
         if ( $response =~ /[^\s]/) {
    $Apache::lonhomework::results{"resource.$partid.$id.$name"}=
     $response;
         }
       }
   }    }
   return '';    &Apache::response::end_response;
     return $result;
 }  }
   
 sub finalizeawards {  sub finalizeawards {
Line 156  sub finalizeawards { Line 183  sub finalizeawards {
 }  }
   
 sub decideoutput {  sub decideoutput {
   my ($award,$solved)=@_;    my ($award,$solved,$previous)=@_;
   my $message='';    my $message='';
   my $button=0;    my $button=0;
     my $previousmsg;
   
     if ($previous) { $previousmsg='You have entered that answer before'; }
   
   if      ($solved =~ /^correct/) {    if      ($solved =~ /^correct/) {
     $message = "<b>You are correct.</b> Your receipt is ".      $message = "<b>You are correct.</b> Your receipt is ".
       &Apache::lonnet::receipt;        &Apache::lonnet::receipt;
     $button=0;      $button=0;
       $previousmsg='';
   } elsif ($solved =~ /^excused/) {    } elsif ($solved =~ /^excused/) {
     $message = "<b>You are excused from the problem.</b>";      $message = "<b>You are excused from the problem.</b>";
     $button=0;      $button=0;
       $previousmsg='';
   } elsif ($award eq 'EXACT_ANS' || $award eq 'APPROX_ANS' ) {    } elsif ($award eq 'EXACT_ANS' || $award eq 'APPROX_ANS' ) {
     if ($solved =~ /^incorrect/ || $solved eq '') {      if ($solved =~ /^incorrect/ || $solved eq '') {
       $message = "Incorrect";        $message = "Incorrect";
Line 174  sub decideoutput { Line 207  sub decideoutput {
       $message = "<b>You are correct.</b> Your receipt is ".        $message = "<b>You are correct.</b> Your receipt is ".
  &Apache::lonnet::receipt;   &Apache::lonnet::receipt;
       $button=0;        $button=0;
         $previousmsg='';
     }      }
   } elsif ($award eq 'NO_RESPONSE') {    } elsif ($award eq 'NO_RESPONSE') {
     $message = '';      $message = '';
Line 209  sub decideoutput { Line 243  sub decideoutput {
     $message = "Unknown message: $award";      $message = "Unknown message: $award";
     $button=1;      $button=1;
   }    }
   return ($button,$message);    return ($button,$message,$previousmsg);
 }  }
   
 sub setgradedata {  sub setgradedata {
   my ($award,$id) = @_;    my ($award,$id,$previously_used) = @_;
   if ( $award eq 'APPROX_ANS' || $award eq 'EXACT_ANS' ) {    # if the student already has it correct, don't modify the status
     $Apache::lonhomework::results{"resource.$id.tries"} =    if ( $Apache::lonhomework::history{"resource.$id.solved"} !~
       $Apache::lonhomework::history{"resource.$id.tries"} + 1;         /^correct/ ) {
     $Apache::lonhomework::results{"resource.$id.solved"} =      #handle assignment of tries and solved status
       'correct_by_student';      if ( $award eq 'APPROX_ANS' || $award eq 'EXACT_ANS' ) {
     $Apache::lonhomework::results{"resource.$id.awarded"} = '1';        $Apache::lonhomework::results{"resource.$id.tries"} =
   } elsif ( $award eq 'INCORRECT' ) {   $Apache::lonhomework::history{"resource.$id.tries"} + 1;
     $Apache::lonhomework::results{"resource.$id.tries"} =        $Apache::lonhomework::results{"resource.$id.solved"} =
       $Apache::lonhomework::history{"resource.$id.tries"} + 1;   'correct_by_student';
     $Apache::lonhomework::results{"resource.$id.solved"} =        $Apache::lonhomework::results{"resource.$id.awarded"} = '1';
       'incorrect_attempted';      } elsif ( $award eq 'INCORRECT' ) {
   } elsif ( $award eq 'SUBMITTED' ) {        $Apache::lonhomework::results{"resource.$id.tries"} =
     $Apache::lonhomework::results{"resource.$id.tries"} =   $Apache::lonhomework::history{"resource.$id.tries"} + 1;
       $Apache::lonhomework::history{"resource.$id.tries"} + 1;        $Apache::lonhomework::results{"resource.$id.solved"} =
     $Apache::lonhomework::results{"resource.$id.solved"} =   'incorrect_attempted';
       'ungraded_attempted';      } elsif ( $award eq 'SUBMITTED' ) {
   } else {        $Apache::lonhomework::results{"resource.$id.tries"} =
     $Apache::lonhomework::results{"resource.$id.solved"} =   $Apache::lonhomework::history{"resource.$id.tries"} + 1;
       'incorrect_attempted';        $Apache::lonhomework::results{"resource.$id.solved"} =
    'ungraded_attempted';
       } elsif ( $award eq 'NO_RESPONSE' ) {
         return '';
       } else {
         $Apache::lonhomework::results{"resource.$id.solved"} =
    'incorrect_attempted';
       }
   
       # check if this was a previous submission if it was delete the
       # unneeded data and update the previously_used attribute
       if ( $previously_used eq 'PREVIOUSLY_USED') {
         delete($Apache::lonhomework::results{"resource.$id.tries"});
         $Apache::lonhomework::results{"resource.$id.previous"} = '1';
       } elsif ( $previously_used eq 'PREVIOUSLY_LAST') {
         #delete all data as they student didn't do anything
         foreach my $key (keys(%Apache::lonhomework::results)) {
    if ($key =~ /^resource\.$id\./) {
     &Apache::lonxml::debug("Removing $key");
     delete($Apache::lonhomework::results{$key});
    }
         }
         #and since they didn't do anything we were never here
         return '';
       } else {
         $Apache::lonhomework::results{"resource.$id.previous"} = '0';
       }
   }    }
   $Apache::lonhomework::results{"resource.$id.award"} = $award;    $Apache::lonhomework::results{"resource.$id.award"} = $award;
 }  }
Line 240  sub setgradedata { Line 300  sub setgradedata {
 sub grade {  sub grade {
   my ($target) = @_;    my ($target) = @_;
   my $id = $Apache::inputtags::part;    my $id = $Apache::inputtags::part;
 #  my $result='';  
   my $response='';    my $response='';
   if ( $target == 'web' ) {    if ( defined $ENV{'form.submitted'}) {
     if ( defined $ENV{'form.submitted'}) {      my @awards = ();
       my @awards = ();      foreach $response (@Apache::inputtags::responselist) {
       &Apache::lonxml::debug("$#Apache::inputtags::responselist");        &Apache::lonxml::debug("looking for response.$id.$response.awarddetail");
       foreach $response (@Apache::inputtags::responselist) {        my $value=$Apache::lonhomework::results{"resource.$id.$response.awarddetail"};
  &Apache::lonxml::debug("looking for response.$id.$response.awarddetail");        if ( $value ne '' ) {
  my $value=$Apache::lonhomework::results{"resource.$id.$response.awarddetail"};   &Apache::lonxml::debug("keeping $value from $response for $id");
  if ( $value ne '' ) {   push (@awards,$value);
   &Apache::lonxml::debug("keeping $value from $response for $id");        } else {
   push (@awards,$value);   &Apache::lonxml::debug("skipping $value from $response for $id");
  } else {        }
   &Apache::lonxml::debug("skipping $value from $response for $id");      }
       my $finalaward = &finalizeawards(@awards);
       my $previously_used;
       if ( $#Apache::inputtags::previous eq $#awards ) {
         $previously_used = 'PREVIOUSLY_LAST';
         foreach my $value (@Apache::inputtags::previous) {
    if ($value eq 'PREVIOUSLY_USED' ) {
     $previously_used = $value;
     last;
  }   }
       }        }
       my $finalaward = &finalizeawards(@awards);  
       &Apache::lonxml::debug("final award $finalaward");  
       &setgradedata($finalaward,$id);  
     }      }
       &Apache::lonxml::debug("final award $finalaward, $previously_used");
       &setgradedata($finalaward,$id,$previously_used);
   }    }
   return '';    return '';
 }  }
Line 270  sub gradestatus { Line 336  sub gradestatus {
   my $message = '';    my $message = '';
   my $trystr='';    my $trystr='';
   my $button='';    my $button='';
       my $previousmsg='';
   
   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 ne 'CLOSED' ) {      if ( $status ne 'CLOSED' ) {  
     my $award = $Apache::lonhomework::history{"resource.$id.award"};      my $award = $Apache::lonhomework::history{"resource.$id.award"};
     my $solved = $Apache::lonhomework::history{"resource.$id.solved"};      my $solved = $Apache::lonhomework::history{"resource.$id.solved"};
       my $previous = $Apache::lonhomework::history{"resource.$id.previous"};
     &Apache::lonxml::debug("Found Award |$award|$solved|");      &Apache::lonxml::debug("Found Award |$award|$solved|");
     if ( $award ne '' ) {      if ( $award ne '' ) {
       &Apache::lonxml::debug('Getting message');        &Apache::lonxml::debug('Getting message');
       ($showbutton,$message) = &decideoutput($award,$solved);        ($showbutton,$message,$previousmsg) =
       $message="<br /><table bgcolor=\"#aaffaa\"><tr><td>$message</td></tr></table>";   &decideoutput($award,$solved,$previous);
         $message="<td bgcolor=\"#aaffaa\">$message</td>";
         if ($previousmsg) {
    $previousmsg="<td bgcolor=\"#ffaaaa\">$previousmsg</td>";
         }
     }      }
     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");
Line 289  sub gradestatus { Line 361  sub gradestatus {
     if ( $maxtries eq '' ) { $maxtries = '2'; }       if ( $maxtries eq '' ) { $maxtries = '2'; } 
     if ( $maxtries eq 'con_lost' ) { $maxtries = '0'; }       if ( $maxtries eq 'con_lost' ) { $maxtries = '0'; } 
     if ( $showbutton ) {      if ( $showbutton ) {
       $trystr = "<br />Tries $tries/$maxtries";        $trystr = "<td>Tries $tries/$maxtries</td>";
     }      }
     if ( $status eq 'SHOW_ANSWER' || $status eq 'CANNOT_ANSWER') {$showbutton = 0;}      if ( $status eq 'SHOW_ANSWER' || $status eq 'CANNOT_ANSWER') {$showbutton = 0;}
     if ( $showbutton ) {       if ( $showbutton ) { 
       $button = '<br /><input type="submit" name="submit" value="Submit All Answers" />';        $button = '<br /><input type="submit" name="submit" value="Submit All Answers" />';
     }      }
   }    }
   return $button.$message.$trystr;    my $output= $previousmsg.$message.$trystr;
     if ($output =~ /^\s*$/) {
       return $button;
     } else {
       return $button.'<table><tr>'.$previousmsg.$message.$trystr.'</tr></table>';
     }
 }  }
 1;  1;
 __END__  __END__
Removed from v.1.38  
changed lines
  Added in v.1.44

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