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

Diff for /loncom/homework/inputtags.pm between versions 1.54 and 1.104

version 1.54, 2002/03/08 19:55:00 version 1.104, 2003/06/07 03:57:28
Line 28 Line 28
 # 2/19 Guy   # 2/19 Guy 
   
 package Apache::inputtags;  package Apache::inputtags;
   use HTML::Entities();
 use strict;  use strict;
   use Apache::loncommon;
   
 BEGIN {  BEGIN {
   &Apache::lonxml::register('Apache::inputtags',('textfield','textline','datasubmission'));    &Apache::lonxml::register('Apache::inputtags',('hiddenline','textfield','textline'));
 }  }
   
   
Line 46  sub initialize_inputtags { Line 48  sub initialize_inputtags {
   @Apache::inputtags::responselist=();    @Apache::inputtags::responselist=();
   # list of whether or not a specific response was previously used    # list of whether or not a specific response was previously used
   @Apache::inputtags::previous=();    @Apache::inputtags::previous=();
     # submission it was used in
     @Apache::inputtags::previous_version=();
   # 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 all part ids seen
     @Apache::inputtags::partlist=();
   # list of problem date statuses, the first element is for <problem>    # list of problem date statuses, the first element is for <problem>
   # if there is a second element it is for the current <part>    # if there is a second element it is for the current <part>
   @Apache::inputtags::status=();    @Apache::inputtags::status=();
Line 55  sub initialize_inputtags { Line 61  sub initialize_inputtags {
   %Apache::inputtags::params=();    %Apache::inputtags::params=();
   # list of all ids, for <import>, these get join()ed and prepended    # list of all ids, for <import>, these get join()ed and prepended
   @Apache::inputtags::import=();    @Apache::inputtags::import=();
     # list of all import ids seen
     @Apache::inputtags::importlist=();
   }
   
   sub check_for_duplicate_ids {
       my %check;
       foreach my $id (@Apache::inputtags::partlist,
       @Apache::inputtags::responselist,
       @Apache::inputtags::importlist) {
    $check{$id}++;
       }
       my @duplicates;
       foreach my $id (sort(keys(%check))) {
    if ($check{$id} > 1) {
       push(@duplicates,$id);
    }
       }
       if (@duplicates) {
    &Apache::lonxml::error("Duplicated ids found, problem will operate incorrectly. Duplicated ids seen: ",join(', ',@duplicates));
       }
 }  }
   
 sub start_input {  sub start_input {
Line 75  sub start_textfield { Line 101  sub start_textfield {
   my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;    my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
   my $result = "";    my $result = "";
   my $id = &start_input($parstack,$safeeval);    my $id = &start_input($parstack,$safeeval);
     my $resid=$Apache::inputtags::response[-1];
   if ($target eq 'web') {    if ($target eq 'web') {
     my $oldresponse = $Apache::lonhomework::history{"resource.$Apache::inputtags::part.$Apache::inputtags::response['-1'].submission"};      $Apache::lonxml::evaluate--;
     my $cols = &Apache::lonxml::get_param('cols',$parstack,$safeeval);  
     if ( $cols eq '') { $cols = 80; }  
     my $rows = &Apache::lonxml::get_param('rows',$parstack,$safeeval);  
     if ( $rows eq '') { $rows = 10; }  
     if ($Apache::inputtags::status[-1] eq 'CAN_ANSWER') {      if ($Apache::inputtags::status[-1] eq 'CAN_ANSWER') {
       $result= '<textarea name="HWVAL'.$Apache::inputtags::response['-1'].'" '.   my $partid=$Apache::inputtags::part;
  "rows=\"$rows\" cols=\"$cols\">".$oldresponse;   my $oldresponse = &HTML::Entities::encode($Apache::lonhomework::history{"resource.$partid.$resid.submission"});
    my $cols = &Apache::lonxml::get_param('cols',$parstack,$safeeval);
    if ( $cols eq '') { $cols = 80; }
    my $rows = &Apache::lonxml::get_param('rows',$parstack,$safeeval);
    if ( $rows eq '') { $rows = 10; }
    $result= '<textarea name="HWVAL_'.$resid.'" '.
       "rows=\"$rows\" cols=\"$cols\">".$oldresponse;
    if ($oldresponse ne '') {
       #get rid of any startup text if the user has already responded
       &Apache::lonxml::get_all_text("/textfield",$parser);
    }
     } else {      } else {
       $result='<table border="1"><tr><td><i>'.$oldresponse.'</i></td></tr></table>';   #right or wrong don't show it
     }   #$result='<table border="1"><tr><td><i>'.$oldresponse.'</i></td></tr></table>';
     if ($oldresponse ne '') {   $result='';
       #get rid of any startup text if the user has already responded   #get rid of any startup text
       &Apache::lonxml::get_all_text("/textfield",$$parser[-1]);   &Apache::lonxml::get_all_text("/textfield",$parser);
     }      }
   }    } elsif ($target eq 'grade') {
   if ($target eq 'grade') {      my $seedtext=&Apache::lonxml::get_all_text("/textfield",$parser);
     my $seedtext=&Apache::lonxml::get_all_text("/textfield",$$parser[-1]);      if ($seedtext eq $ENV{'form.HWVAL_'.$resid}) {
     if ($seedtext eq $ENV{'form.HWVAL'.$Apache::inputtags::response[-1]}) {  
       # if the seed text is still there it wasn't a real submission        # if the seed text is still there it wasn't a real submission
       $ENV{'form.HWVAL'.$Apache::inputtags::response['-1']}='';        $ENV{'form.HWVAL_'.$resid}='';
       }
     } elsif ($target eq 'edit') {
       $result.=&Apache::edit::tag_start($target,$token);
       $result.=&Apache::edit::text_arg('Rows:','rows',$token,4);
       $result.=&Apache::edit::text_arg('Columns:','cols',$token,4);
       my $bodytext=&Apache::lonxml::get_all_text("/textfield",$parser);
       $result.=&Apache::edit::editfield($token->[1],$bodytext,'Text you want to appear by default:',80,2);
     } elsif ($target eq 'modified') {
       my $constructtag=&Apache::edit::get_new_args($token,$parstack,
    $safeeval,'rows','cols');
       if ($constructtag) {
         $result = &Apache::edit::rebuild_tag($token);
       } else {
         $result=$token->[4];
     }      }
       $result.=&Apache::edit::modifiedfield();
     } elsif ($target eq 'tex') {
         my $number_of_lines = &Apache::lonxml::get_param('rows',$parstack,$safeeval);
         my $width_of_box = &Apache::lonxml::get_param('cols',$parstack,$safeeval);
         if ($$tagstack[-2] eq 'essayresponse' and $Apache::lonhomework::type eq 'exam') {
     $result = '\fbox{\fbox{\parbox{\textwidth-5mm}{';
     for (my $i=0;$i<int $number_of_lines*2;$i++) {$result.='\strut \\\\ ';}
     $result.='\strut \\\\\strut \\\\\strut \\\\\strut \\\\}}}';
         } else {
     my $TeXwidth=$width_of_box/80;
     $result = '\vskip 1 mm \fbox{\fbox{\parbox{'.$TeXwidth.'\textwidth-5mm}{';
     for (my $i=0;$i<int $number_of_lines*2;$i++) {$result.='\strut \\\\ ';}
     $result.='}}}\vskip 2 mm ';
         }
   }    }
   return $result;    return $result;
 }  }
   
 sub end_textfield {  sub end_textfield {
   my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;    my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
     my $result;
   if ($target eq 'web') {    if ($target eq 'web') {
       $Apache::lonxml::evaluate++;
     if ($Apache::inputtags::status[-1] eq 'CAN_ANSWER') {      if ($Apache::inputtags::status[-1] eq 'CAN_ANSWER') {
       return "</textarea>";        return "</textarea>";
     }      }
     } elsif ($target eq 'edit') {
       $result=&Apache::edit::end_table();
   }    }
   &end_input;    &end_input;
   return '';    return $result;
 }  }
   
 sub start_textline {  sub start_textline {
   my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;    my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
   my $result = "";    my $result = "";
   if ($target eq 'web') {    if ($target eq 'web') {
     my $size = &Apache::lonxml::get_param('size',$parstack,$safeeval);      $Apache::lonxml::evaluate--;
     if ($size eq '') { $size=20; }  
     my $partid=$Apache::inputtags::part;      my $partid=$Apache::inputtags::part;
     my $id=$Apache::inputtags::response['-1'];      my $id=$Apache::inputtags::response[-1];
     my $oldresponse =   
       $Apache::lonhomework::history{"resource.$partid.$id.submission"};  
     if ($Apache::inputtags::status[-1] eq 'CAN_ANSWER') {      if ($Apache::inputtags::status[-1] eq 'CAN_ANSWER') {
       $result= '<input type="text" name="HWVAL'.$id.'" value="'.        my $size = &Apache::lonxml::get_param('size',$parstack,$safeeval);
  $oldresponse.'" size="'.$size.'" />';        my $maxlength;
         if ($size eq '') { $size=20; } else {
    if ($size < 20) { $maxlength=$size; }
         }
         my $oldresponse = &HTML::Entities::encode($Apache::lonhomework::history{"resource.$partid.$id.submission"});
         if ($Apache::lonhomework::type ne 'exam') {
           $result= '<input type="text" name="HWVAL_'.$id.'" value="'.
       $oldresponse.'" size="'.$size.'" maxlength="'.$maxlength.'" />';
         }
     } else {      } else {
       $result='<i>'.$oldresponse.'</i>';        #right or wrong don't show what was last typed in.
         #$result='<i>'.$oldresponse.'</i>';
         $result='';
     }      }
   } elsif ($target eq 'edit') {    } elsif ($target eq 'edit') {
     $result=&Apache::edit::tag_start($target,$token);      $result=&Apache::edit::tag_start($target,$token);
Line 136  sub start_textline { Line 207  sub start_textline {
   } elsif ($target eq 'modified') {    } elsif ($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); }
     } elsif ($target eq 'tex' and $Apache::lonhomework::type ne 'exam') {
         my $size = &Apache::lonxml::get_param('size',$parstack,$safeeval);
         if ($size != 0) {$size=$size*2; $size.=' mm';} else {$size='40 mm';}
         $result='\framebox['.$size.'][s]{\tiny\strut}';
   }    }
   return $result;    return $result;
 }  }
   
 sub end_textline {  sub end_textline {
   my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;    my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
   if ($target eq 'edit') { return ('','no'); }    if    ($target eq 'web') { $Apache::lonxml::evaluate++; }
     elsif ($target eq 'edit') { return ('','no'); }
   return "";    return "";
 }  }
   
 sub start_datasubmission {  sub start_hiddenline {
   my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;      my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
   my $id = &Apache::response::start_response($parstack,$safeeval);      my $result = "";
   my $result;      if ($target eq 'web') {
   if ($target eq 'meta') {   $Apache::lonxml::evaluate--;
     $result = &Apache::response::meta_stores_write($token->[2]->{'name'},   if ($Apache::inputtags::status[-1] eq 'CAN_ANSWER') {
    $token->[2]->{'type'},      my $partid=$Apache::inputtags::part;
    $token->[2]->{'display'});      my $id=$Apache::inputtags::response[-1];
     $result .= &Apache::response::meta_package_write('datasubmission');      my $oldresponse = &HTML::Entities::encode($Apache::lonhomework::history{"resource.$partid.$id.submission"});
   }      if ($Apache::lonhomework::type ne 'exam') {
   return $result;   $result= '<input type="hidden" name="HWVAL_'.$id.'" value="'.
       $oldresponse.'" />';
       }
    }
       } elsif ($target eq 'edit') {
    $result=&Apache::edit::tag_start($target,$token);
    $result.=&Apache::edit::end_table;
       }
       return $result;
 }  }
   
 sub end_datasubmission {  sub end_hiddenline {
   my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;    my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
   my $result;    if    ($target eq 'web') { $Apache::lonxml::evaluate++; }
   if ( $target eq 'web' ) {    elsif ($target eq 'edit') { return ('','no'); }
   } elsif ($target eq 'grade' ) {    return "";
     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;  
       }  
     }  
   }  
   &Apache::response::end_response;  
   return $result;  
 }  }
   
 sub finalizeawards {  sub finalizeawards {
Line 195  sub finalizeawards { Line 265  sub finalizeawards {
     if ($blankcount == ($#_ + 1)) { $result = 'NO_RESPONSE'; }      if ($blankcount == ($#_ + 1)) { $result = 'NO_RESPONSE'; }
   }    }
   if ($result eq '' ) {    if ($result eq '' ) {
       foreach $award (@_) { if ($award eq 'MISSING_ANSWER') {$result='MISSING_ANSWER'; last;}}
     }
     if ($result eq '' ) {
     foreach $award (@_) { if ($award eq 'ERROR') {$result='ERROR'; last;}}      foreach $award (@_) { if ($award eq 'ERROR') {$result='ERROR'; last;}}
   }    }
   if ($result eq '' ) {    if ($result eq '' ) {
     foreach $award (@_) { if ($award eq 'NO_RESPONSE') {$result='NO_RESPONSE'; last;} }      foreach $award (@_) { if ($award eq 'NO_RESPONSE') {$result='NO_RESPONSE'; last;} }
   }    }
     if ($result eq '' ) {
       foreach $award (@_) { if ($award eq 'TOO_LONG') {$result='TOO_LONG'; last;}}
     }
   if ($result eq '' ) {    if ($result eq '' ) {
     foreach $award (@_) {       foreach $award (@_) { 
       if ($award eq 'UNIT_FAIL' ||        if ($award eq 'UNIT_FAIL' ||
Line 223  sub finalizeawards { Line 298  sub finalizeawards {
     foreach $award (@_) { if ($award eq 'INCORRECT') {$result=$award; last;} }      foreach $award (@_) { if ($award eq 'INCORRECT') {$result=$award; last;} }
   }    }
   if ($result eq '' ) {    if ($result eq '' ) {
         foreach $award (@_) { if ($award eq 'MISORDERED_RANK') {$result=$award; last;} }
     }
     if ($result eq '' ) {
         foreach $award (@_) { if ($award eq 'INVALID_FILETYPE') {$result=$award; last;} }
     }
     if ($result eq '' ) {
       foreach $award (@_) { if ($award eq 'DRAFT') {$result=$award; last;} }
     }
     if ($result eq '' ) {
     foreach $award (@_) { if ($award eq 'SUBMITTED') {$result=$award; last;} }      foreach $award (@_) { if ($award eq 'SUBMITTED') {$result=$award; last;} }
   }    }
   if ($result eq '' ) {    if ($result eq '' ) {
       foreach $award (@_) { if ($award eq 'ASSIGNED_SCORE') {$result=$award; last;} }
     }
     if ($result eq '' ) {
     foreach $award (@_) { if ($award eq 'APPROX_ANS') {$result=$award; last;} }      foreach $award (@_) { if ($award eq 'APPROX_ANS') {$result=$award; last;} }
   }    }
   if ($result eq '' ) { $result='EXACT_ANS'; }    if ($result eq '' ) { $result='EXACT_ANS'; }
Line 233  sub finalizeawards { Line 320  sub finalizeawards {
 }  }
   
 sub decideoutput {  sub decideoutput {
   my ($award,$solved,$previous)=@_;    my ($award,$solved,$previous,$target)=@_;
   my $message='';    my $message='';
   my $button=0;    my $button=0;
   my $previousmsg;    my $previousmsg;
Line 241  sub decideoutput { Line 328  sub decideoutput {
   if ($previous) { $previousmsg='You have entered that answer before'; }    if ($previous) { $previousmsg='You have entered that answer before'; }
   
   if      ($solved =~ /^correct/) {    if      ($solved =~ /^correct/) {
     $message = "<b>You are correct.</b> Your receipt is ".        if ($award eq 'ASSIGNED_SCORE') {
       &Apache::lonnet::receipt;    $message = "A score has been assigned.";
     $button=0;        } else {
     $previousmsg='';    if ($target eq 'tex') {
         $message = '\textbf{You are correct}.';
     } else {
         $message = "<b>You are correct.</b>";
     }
     $message.=' Your receipt is '.&Apache::lonnet::receipt;
         }
         $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;  
     $previousmsg='';  
   } elsif ($award eq 'EXACT_ANS' || $award eq 'APPROX_ANS' ) {  
     if ($solved =~ /^incorrect/ || $solved eq '') {  
       $message = "Incorrect";  
       $button=1;  
     } else {  
       $message = "<b>You are correct.</b> Your receipt is ".  
  &Apache::lonnet::receipt;  
       $button=0;        $button=0;
       $previousmsg='';        $previousmsg='';
     }    } elsif ($award eq 'EXACT_ANS' || $award eq 'APPROX_ANS' ) {
         if ($solved =~ /^incorrect/ || $solved eq '') {
     $message = "Incorrect";
     $button=1;
         } else {
     $message = "<b>You are correct.</b> Your receipt is ".
      &Apache::lonnet::receipt;
     $button=0;
     $previousmsg='';
         }
   } elsif ($award eq 'NO_RESPONSE') {    } elsif ($award eq 'NO_RESPONSE') {
     $message = '';        $message = '';
     $button=1;        $button=1;
   } elsif ($award eq 'MISSING_ANSWER') {    } elsif ($award eq 'MISSING_ANSWER') {
     $message = 'Some parts were not submitted';        $message = 'Some parts were not submitted';
     $button = 1;        $button = 1;
     } elsif ($award eq 'ERROR') {
         $message = 'An error occured while trying to grade answer.';
         $button = 1;
     } elsif ($award eq 'TOO_LONG') {
         $message = "The submitted answer was too long.";
         $button=1;
   } elsif ($award eq 'WANTED_NUMERIC') {    } elsif ($award eq 'WANTED_NUMERIC') {
     $message = "This question expects a numeric answer";        $message = "This question expects a numeric answer";
     $button=1;        $button=1;
     } elsif ($award eq 'MISORDERED_RANK') {
         $message = 'You have provided an invalid ranking, please refer to '.
          &Apache::loncommon::help_open_topic('Ranking_Problems','help on ranking problems').'.';
         $button=1;
     } elsif ($award eq 'INVALID_FILETYPE') {
         $message = 'The filetype extension of the file you uploaded is not allowed.';
         $button=1;
   } elsif ($award eq 'SIG_FAIL') {    } elsif ($award eq 'SIG_FAIL') {
     $message = "Please adjust significant figures.";# you provided %s significant figures";        $message = "Please adjust significant figures.";# you provided %s significant figures";
     $button=1;        $button=1;
   } elsif ($award eq 'UNIT_FAIL') {    } elsif ($award eq 'UNIT_FAIL') {
     $message = "Units incorrect."; #Computer reads units as %s";        $message = "Units incorrect. ".
     $button=1;         &Apache::loncommon::help_open_topic('Physical_Units'); #Computer reads units as %s";
         $button=1;
   } elsif ($award eq 'UNIT_NOTNEEDED') {    } elsif ($award eq 'UNIT_NOTNEEDED') {
     $message = "Only a number required.";# Computer reads units of %s";        $message = "Only a number required.";# Computer reads units of %s";
     $button=1;        $button=1;
   } elsif ($award eq 'NO_UNIT') {    } elsif ($award eq 'NO_UNIT') {
     $message = "Units required";        $message = "Units required".
     $button=1;         &Apache::loncommon::help_open_topic('Physical_Units');
         $button=1;
   } elsif ($award eq 'BAD_FORMULA') {    } elsif ($award eq 'BAD_FORMULA') {
     $message = "Unable to understand formula";        $message = "Unable to understand formula";
     $button=1;        $button=1;
   } elsif ($award eq 'INCORRECT') {    } elsif ($award eq 'INCORRECT') {
     $message = "Incorrect";        $message = "Incorrect";
     $button=1;        $button=1;
   } elsif ($award eq 'SUBMITTED') {    } elsif ($award eq 'SUBMITTED') {
     $message = "Your submission has been recorded.";        $message = "Your submission has been recorded.";
     $button=1;        $button=1;
     } elsif ($award eq 'DRAFT') {
         $message = "A draft copy has been saved.";
         $button=1;
     } elsif ($award eq 'ASSIGNED_SCORE') {
         $message = "A score has been assigned.";
         $button=0;
   } else {    } else {
     $message = "Unknown message: $award";        $message = "Unknown message: $award";
     $button=1;        $button=1;
     }
     if (lc($Apache::lonhomework::problemstatus) eq 'no') {
         $message = "Answer Submitted";
         $button=1;
   }    }
   return ($button,$message,$previousmsg);    return ($button,$message,$previousmsg);
 }  }
   
   sub removealldata {
       my ($id)=@_;
       foreach my $key (keys(%Apache::lonhomework::results)) {
    if (($key =~ /^resource\.\Q$id\E\./) && ($key !~ /\.collaborators$/)) {
       &Apache::lonxml::debug("Removing $key");
       delete($Apache::lonhomework::results{$key});
    }
       }
   }
   
 sub setgradedata {  sub setgradedata {
   my ($award,$id,$previously_used) = @_;    my ($award,$id,$previously_used) = @_;
   # if the student already has it correct, don't modify the status    # if the student already has it correct, don't modify the status
   if ($Apache::inputtags::status['-1'] ne 'CAN_ANSWER') {    if ($Apache::inputtags::status['-1'] ne 'CAN_ANSWER' &&
         $Apache::inputtags::status['-1'] ne 'CANNOT_ANSWER') {
     $Apache::lonhomework::results{"resource.$id.afterduedate"}=$award;      $Apache::lonhomework::results{"resource.$id.afterduedate"}=$award;
     return '';      return '';
   } elsif ( $Apache::lonhomework::history{"resource.$id.solved"} !~    } elsif ( $Apache::lonhomework::history{"resource.$id.solved"} !~
        /^correct/ ) {         /^correct/ || $Apache::lonhomework::scantronmode ||
       lc($Apache::lonhomework::problemstatus) eq 'no') {
     #handle assignment of tries and solved status      #handle assignment of tries and solved status
       my $solvemsg;
       if ($Apache::lonhomework::scantronmode) {
    $solvemsg='correct_by_scantron';
       } else {
    $solvemsg='correct_by_student';
       }
     if ($Apache::lonhomework::history{"resource.$id.afterduedate"}) {      if ($Apache::lonhomework::history{"resource.$id.afterduedate"}) {
       $Apache::lonhomework::results{"resource.$id.afterduedate"}='';        $Apache::lonhomework::results{"resource.$id.afterduedate"}='';
     }      }
     if ( $award eq 'APPROX_ANS' || $award eq 'EXACT_ANS' ) {      if ( $award eq 'ASSIGNED_SCORE') {
    $Apache::lonhomework::results{"resource.$id.tries"} =
       $Apache::lonhomework::history{"resource.$id.tries"} + 1;
    $Apache::lonhomework::results{"resource.$id.solved"} =
       $solvemsg;
    my $numawards=scalar(@Apache::inputtags::response);
    $Apache::lonhomework::results{"resource.$id.awarded"} = 0;
    foreach my $res (@Apache::inputtags::response) {
       $Apache::lonhomework::results{"resource.$id.awarded"}+=
          $Apache::lonhomework::results{"resource.$id.$res.awarded"};
    }
    if ($numawards > 0) {
       $Apache::lonhomework::results{"resource.$id.awarded"}/=
    $numawards;
    }
       } elsif ( $award eq 'APPROX_ANS' || $award eq 'EXACT_ANS' ) {
       $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"} =
  'correct_by_student';   $solvemsg;
       $Apache::lonhomework::results{"resource.$id.awarded"} = '1';        $Apache::lonhomework::results{"resource.$id.awarded"} = '1';
     } elsif ( $award eq 'INCORRECT' ) {      } elsif ( $award eq 'INCORRECT' ) {
       $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';   'incorrect_attempted'
     } elsif ( $award eq 'SUBMITTED' ) {      } 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"} =
  'ungraded_attempted';   'ungraded_attempted';
       } elsif ( $award eq 'DRAFT' ) {
         $Apache::lonhomework::results{"resource.$id.solved"} = '';
     } elsif ( $award eq 'NO_RESPONSE' ) {      } elsif ( $award eq 'NO_RESPONSE' ) {
       return '';   #no real response so delete any data that got stored
    &removealldata($id);
    return '';
     } else {      } else {
       $Apache::lonhomework::results{"resource.$id.solved"} =        $Apache::lonhomework::results{"resource.$id.solved"} =
  'incorrect_attempted';   'incorrect_attempted';
         if (lc($Apache::lonhomework::problemstatus) eq 'no') {
     $Apache::lonhomework::results{"resource.$id.tries"} =
         $Apache::lonhomework::history{"resource.$id.tries"} + 1;
         }
     }      }
   
     # check if this was a previous submission if it was delete the      # check if this was a previous submission if it was delete the
     # unneeded data and update the previously_used attribute      # unneeded data and update the previously_used attribute
     if ( $previously_used eq 'PREVIOUSLY_USED') {      if ( $previously_used eq 'PREVIOUSLY_USED') {
       delete($Apache::lonhomework::results{"resource.$id.tries"});   if (lc($Apache::lonhomework::problemstatus) ne 'no') {
       $Apache::lonhomework::results{"resource.$id.previous"} = '1';      delete($Apache::lonhomework::results{"resource.$id.tries"});
     } elsif ( $previously_used eq 'PREVIOUSLY_LAST') {      $Apache::lonhomework::results{"resource.$id.previous"} = '1';
       #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});  
  }   }
       }      } elsif ( $previously_used eq 'PREVIOUSLY_LAST') {
         #delete all data as they student didn't do anything, but save
         #the list of collaborators.
         &removealldata($id);
       #and since they didn't do anything we were never here        #and since they didn't do anything we were never here
       return '';        return '';
     } else {      } else {
       $Apache::lonhomework::results{"resource.$id.previous"} = '0';        $Apache::lonhomework::results{"resource.$id.previous"} = '0';
     }      }
     } elsif ( $Apache::lonhomework::history{"resource.$id.solved"} =~
       /^correct/ ) {
         #delete all data as they student already has it correct
         &removealldata($id);
         #and since they didn't do anything we were never here
         return '';
   }    }
   $Apache::lonhomework::results{"resource.$id.award"} = $award;    $Apache::lonhomework::results{"resource.$id.award"} = $award;
 }  }
Line 359  sub grade { Line 524  sub grade {
   my $response='';    my $response='';
   if ( defined $ENV{'form.submitted'}) {    if ( defined $ENV{'form.submitted'}) {
     my @awards = ();      my @awards = ();
     foreach $response (@Apache::inputtags::responselist) {      foreach $response (@Apache::inputtags::response) {
       &Apache::lonxml::debug("looking for response.$id.$response.awarddetail");        &Apache::lonxml::debug("looking for response.$id.$response.awarddetail");
       my $value=$Apache::lonhomework::results{"resource.$id.$response.awarddetail"};        my $value=$Apache::lonhomework::results{"resource.$id.$response.awarddetail"};
       &Apache::lonxml::debug("keeping $value from $response for $id");        &Apache::lonxml::debug("keeping $value from $response for $id");
Line 368  sub grade { Line 533  sub grade {
     my $finalaward = &finalizeawards(@awards);      my $finalaward = &finalizeawards(@awards);
     my $previously_used;      my $previously_used;
     if ( $#Apache::inputtags::previous eq $#awards ) {      if ( $#Apache::inputtags::previous eq $#awards ) {
       $previously_used = 'PREVIOUSLY_LAST';   my $match=0;
       foreach my $value (@Apache::inputtags::previous) {   my @matches;
  if ($value eq 'PREVIOUSLY_USED' ) {   foreach my $versionar (@Apache::inputtags::previous_version) {
   $previously_used = $value;      foreach my $version (@$versionar) {
   last;   $matches[$version]++;
       }
    }
    foreach my $elem (@matches) {if ($elem eq ($#awards+1)) {$match=1;}}
    if ($match) {
       $previously_used = 'PREVIOUSLY_LAST';
       foreach my $value (@Apache::inputtags::previous) {
    if ($value eq 'PREVIOUSLY_USED' ) {
       $previously_used = $value;
       last;
    }
       }
  }   }
       }  
     }      }
     &Apache::lonxml::debug("final award $finalaward, $previously_used");      &Apache::lonxml::debug("final award $finalaward, $previously_used");
     &setgradedata($finalaward,$id,$previously_used);      &setgradedata($finalaward,$id,$previously_used);
Line 383  sub grade { Line 558  sub grade {
 }  }
   
 sub gradestatus {  sub gradestatus {
   my ($id) = @_;    my ($id,$target) = @_;
   my $showbutton = 1;    my $showbutton = 1;
   my $message = '';    my $message = '';
   my $latemessage = '';    my $latemessage = '';
Line 393  sub gradestatus { Line 568  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 ne 'CLOSED' ) {      if ( $status ne 'CLOSED' && $status ne 'UNAVAILABLE') {  
     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"};      my $previous = $Apache::lonhomework::history{"resource.$id.previous"};
Line 401  sub gradestatus { Line 576  sub gradestatus {
     if ( $award ne '' ) {      if ( $award ne '' ) {
       &Apache::lonxml::debug('Getting message');        &Apache::lonxml::debug('Getting message');
       ($showbutton,$message,$previousmsg) =        ($showbutton,$message,$previousmsg) =
  &decideoutput($award,$solved,$previous);   &decideoutput($award,$solved,$previous,$target);
       $message="<td bgcolor=\"#aaffaa\">$message</td>";        if ($target eq 'tex') {
       if ($previousmsg) {   $message=' '.$message.' ';
  $previousmsg="<td bgcolor=\"#ffaaaa\">$previousmsg</td>";        } else {
    $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"};
Line 414  sub gradestatus { Line 593  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 = "<td>Tries $tries/$maxtries</td>";        if ($target eq 'tex') {
     if ($ENV{'request.state'} ne "construct" && $Apache::lonhomework::type ne 'exam') {
         $trystr = ' {\vskip 1 mm \small \textit{Tries} '.$tries.'/'.$maxtries.'} \vskip 2 mm ';
     } else {
         $trystr = '\vskip 0 mm ';
     }
         } else {
            $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 Answer" />';        if ($target ne 'tex') {
           $button = '<br /><input type="submit" name="submit" value="Submit Answer" />';
         }
     }      }
     if ($Apache::lonhomework::history{"resource.$id.afterduedate"}) {      if ($Apache::lonhomework::history{"resource.$id.afterduedate"}) {
       #last submissions was after due date        #last submissions was after due date
       $latemessage="<td bgcolor=\"#ffaaaa\">The last submission was after the Due Date</td>";        if ($target eq 'tex') {
     $latemessage=' The last submission was after the Due Date ';
         } else {
           $latemessage="<td bgcolor=\"#ffaaaa\">The last submission was after the Due Date</td>";
         }
     }      }
   }    }
   my $output= $previousmsg.$latemessage.$message.$trystr;    my $output= $previousmsg.$latemessage.$message.$trystr;
   if ($output =~ /^\s*$/) {    if ($output =~ /^\s*$/) {
     return $button;      return $button;
   } else {    } else {
     return $button.'<table><tr>'.$output.'</tr></table>';      if ($target eq 'tex') {
         return $button.' \vskip 0 mm '.$output.' ';
       } else {
         return $button.'<table><tr>'.$output.'</tr></table>';
       }
   }    }
 }  }
 1;  1;
Removed from v.1.54  
changed lines
  Added in v.1.104

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