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

Diff for /loncom/homework/inputtags.pm between versions 1.78 and 1.105

version 1.78, 2003/01/13 21:22:43 version 1.105, 2003/06/19 21:41:02
Line 30 Line 30
 package Apache::inputtags;  package Apache::inputtags;
 use HTML::Entities();  use HTML::Entities();
 use strict;  use strict;
   use Apache::loncommon;
   
 BEGIN {  BEGIN {
   &Apache::lonxml::register('Apache::inputtags',('textfield','textline'));    &Apache::lonxml::register('Apache::inputtags',('hiddenline','textfield','textline'));
 }  }
   
   
Line 51  sub initialize_inputtags { Line 52  sub initialize_inputtags {
   @Apache::inputtags::previous_version=();    @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 58  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 88  sub start_textfield { Line 111  sub start_textfield {
  if ( $cols eq '') { $cols = 80; }   if ( $cols eq '') { $cols = 80; }
  my $rows = &Apache::lonxml::get_param('rows',$parstack,$safeeval);   my $rows = &Apache::lonxml::get_param('rows',$parstack,$safeeval);
  if ( $rows eq '') { $rows = 10; }   if ( $rows eq '') { $rows = 10; }
  $result= '<textarea name="HWVAL'.$resid.'" '.   $result= '<textarea name="HWVAL_'.$resid.'" '.
     "rows=\"$rows\" cols=\"$cols\">".$oldresponse;      "rows=\"$rows\" cols=\"$cols\">".$oldresponse;
  if ($oldresponse ne '') {   if ($oldresponse ne '') {
     #get rid of any startup text if the user has already responded      #get rid of any startup text if the user has already responded
     &Apache::lonxml::get_all_text("/textfield",$$parser[-1]);      &Apache::lonxml::get_all_text("/textfield",$parser);
  }   }
     } else {      } else {
  #right or wrong don't show it   #right or wrong don't show it
  #$result='<table border="1"><tr><td><i>'.$oldresponse.'</i></td></tr></table>';   #$result='<table border="1"><tr><td><i>'.$oldresponse.'</i></td></tr></table>';
  $result='';   $result='';
  #get rid of any startup text   #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') {    } elsif ($target eq 'grade') {
     my $seedtext=&Apache::lonxml::get_all_text("/textfield",$$parser[-1]);      my $seedtext=&Apache::lonxml::get_all_text("/textfield",$parser);
     if ($seedtext eq $ENV{'form.HWVAL'.$resid}) {      if ($seedtext eq $ENV{'form.HWVAL_'.$resid}) {
       # 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'.$resid}='';        $ENV{'form.HWVAL_'.$resid}='';
     }      }
   } elsif ($target eq 'edit') {    } elsif ($target eq 'edit') {
     $result.=&Apache::edit::tag_start($target,$token);      $result.=&Apache::edit::tag_start($target,$token);
     $result.=&Apache::edit::text_arg('Rows:','rows',$token,4);      $result.=&Apache::edit::text_arg('Rows:','rows',$token,4);
     $result.=&Apache::edit::text_arg('Columns:','cols',$token,4);      $result.=&Apache::edit::text_arg('Columns:','cols',$token,4);
     my $bodytext=&Apache::lonxml::get_all_text("/textfield",$$parser[-1]);      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);      $result.=&Apache::edit::editfield($token->[1],$bodytext,'Text you want to appear by default:',80,2);
   } elsif ($target eq 'modified') {    } elsif ($target eq 'modified') {
     my $constructtag=&Apache::edit::get_new_args($token,$parstack,      my $constructtag=&Apache::edit::get_new_args($token,$parstack,
Line 123  sub start_textfield { Line 146  sub start_textfield {
     }      }
     $result.=&Apache::edit::modifiedfield();      $result.=&Apache::edit::modifiedfield();
   } elsif ($target eq 'tex') {    } 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') {        if ($$tagstack[-2] eq 'essayresponse' and $Apache::lonhomework::type eq 'exam') {
   my $number_of_lines= &Apache::lonxml::get_param('rows',$parstack,$safeeval);  
   $result = '\fbox{\fbox{\parbox{\textwidth-5mm}{';    $result = '\fbox{\fbox{\parbox{\textwidth-5mm}{';
  for (my $i=0;$i<int $number_of_lines*2;$i++) {$result.='\strut \\\\ ';}    for (my $i=0;$i<int $number_of_lines*2;$i++) {$result.='\strut \\\\ ';}
  $result.='\strut \\\\\strut \\\\\strut \\\\\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;
Line 153  sub start_textline { Line 182  sub start_textline {
   my $result = "";    my $result = "";
   if ($target eq 'web') {    if ($target eq 'web') {
     $Apache::lonxml::evaluate--;      $Apache::lonxml::evaluate--;
       my $partid=$Apache::inputtags::part;
       my $id=$Apache::inputtags::response[-1];
     if ($Apache::inputtags::status[-1] eq 'CAN_ANSWER') {      if ($Apache::inputtags::status[-1] eq 'CAN_ANSWER') {
       my $size = &Apache::lonxml::get_param('size',$parstack,$safeeval);        my $size = &Apache::lonxml::get_param('size',$parstack,$safeeval);
       my $maxlength;        my $maxlength;
       if ($size eq '') { $size=20; } else {        if ($size eq '') { $size=20; } else {
  if ($size < 20) { $maxlength=$size; }   if ($size < 20) { $maxlength=$size; }
       }        }
       my $partid=$Apache::inputtags::part;  
       my $id=$Apache::inputtags::response[-1];  
       my $oldresponse = &HTML::Entities::encode($Apache::lonhomework::history{"resource.$partid.$id.submission"});        my $oldresponse = &HTML::Entities::encode($Apache::lonhomework::history{"resource.$partid.$id.submission"});
       if ($Apache::lonhomework::type ne 'exam') {        if ($Apache::lonhomework::type ne 'exam') {
         $result= '<input type="text" name="HWVAL'.$id.'" value="'.          $result= '<input type="text" name="HWVAL_'.$id.'" value="'.
     $oldresponse.'" size="'.$size.'" maxlength="'.$maxlength.'" />';      $oldresponse.'" size="'.$size.'" maxlength="'.$maxlength.'" />';
       }        }
     } else {      } else {
Line 193  sub end_textline { Line 222  sub end_textline {
   return "";    return "";
 }  }
   
   sub start_hiddenline {
       my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
       my $result = "";
       if ($target eq 'web') {
    $Apache::lonxml::evaluate--;
    if ($Apache::inputtags::status[-1] eq 'CAN_ANSWER') {
       my $partid=$Apache::inputtags::part;
       my $id=$Apache::inputtags::response[-1];
       my $oldresponse = &HTML::Entities::encode($Apache::lonhomework::history{"resource.$partid.$id.submission"});
       if ($Apache::lonhomework::type ne 'exam') {
    $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_hiddenline {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
     if    ($target eq 'web') { $Apache::lonxml::evaluate++; }
     elsif ($target eq 'edit') { return ('','no'); }
     return "";
   }
   
 sub finalizeawards {  sub finalizeawards {
   my $result='';    my $result='';
   my $award;    my $award;
Line 216  sub finalizeawards { Line 273  sub finalizeawards {
   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 239  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;} }      foreach $award (@_) { if ($award eq 'DRAFT') {$result=$award; last;} }
   }    }
   if ($result eq '' ) {    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 256  sub decideoutput { Line 324  sub decideoutput {
   my $message='';    my $message='';
   my $button=0;    my $button=0;
   my $previousmsg;    my $previousmsg;
     my $bgcolor='orange';
     my %possiblecolors =
         ( 'correct' => '#aaffaa',
    'charged_try' => '#ffaaaa',
    'not_charged_try' => '#ffffaa',
    'no_message' => '#fffff',
         );
   if ($previous) { $previousmsg='You have entered that answer before'; }    if ($previous) { $previousmsg='You have entered that answer before'; }
   
   if      ($solved =~ /^correct/) {    if      ($solved =~ /^correct/) {
     if ($target eq 'tex') {        if ($award eq 'ASSIGNED_SCORE') {
       $message = '\textbf{You are correct}. Your receipt is '.    $message = "A score has been assigned.";
       &Apache::lonnet::receipt;        } else {
     } else {    if ($target eq 'tex') {
       $message = "<b>You are correct.</b> Your receipt is ".        $message = '\textbf{You are correct}.';
       &Apache::lonnet::receipt;    } else {
     }        $message = "<b>You are correct.</b>";
     $button=0;    }
     $previousmsg='';    $message.=' Your receipt is '.&Apache::lonnet::receipt;
         }
         $bgcolor=$possiblecolors{'correct'};
         $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;        $bgcolor=$possiblecolors{'charged_try'};
     $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";
     $bgcolor=$possiblecolors{'charged_try'};
     $button=1;
         } else {
     $message = "<b>You are correct.</b> Your receipt is ".
      &Apache::lonnet::receipt;
     $bgcolor=$possiblecolors{'correct'};
     $button=0;
     $previousmsg='';
         }
   } elsif ($award eq 'NO_RESPONSE') {    } elsif ($award eq 'NO_RESPONSE') {
     $message = '';        $message = '';
     $button=1;        $bgcolor=$possiblecolors{'no_feedback'};
         $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;        $bgcolor=$possiblecolors{'not_charged_try'};
         $button = 1;
     } elsif ($award eq 'ERROR') {
         $message = 'An error occured while trying to grade answer.';
         $bgcolor=$possiblecolors{'not_charged_try'};
         $button = 1;
     } elsif ($award eq 'TOO_LONG') {
         $message = "The submitted answer was too long.";
         $bgcolor=$possiblecolors{'not_charged_try'};
         $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;        $bgcolor=$possiblecolors{'not_charged_try'};
         $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').'.';
         $bgcolor=$possiblecolors{'not_charged_try'};
         $button=1;
     } elsif ($award eq 'INVALID_FILETYPE') {
         $message = 'The filetype extension of the file you uploaded is not allowed.';
         $bgcolor=$possiblecolors{'not_charged_try'};
         $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;        $bgcolor=$possiblecolors{'not_charged_try'};
         $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";
         $bgcolor=$possiblecolors{'not_charged_try'};
         $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;        $bgcolor=$possiblecolors{'not_charged_try'};
         $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');
         $bgcolor=$possiblecolors{'not_charged_try'};
         $button=1;
   } elsif ($award eq 'BAD_FORMULA') {    } elsif ($award eq 'BAD_FORMULA') {
     $message = "Unable to understand formula";        $message = "Unable to understand formula";
     $button=1;        $bgcolor=$possiblecolors{'not_charged_try'};
         $button=1;
   } elsif ($award eq 'INCORRECT') {    } elsif ($award eq 'INCORRECT') {
     $message = "Incorrect";        $message = "Incorrect";
     $button=1;        $bgcolor=$possiblecolors{'charged_try'};
         $button=1;
   } elsif ($award eq 'SUBMITTED') {    } elsif ($award eq 'SUBMITTED') {
     $message = "Your submission has been recorded.";        $message = "Your submission has been recorded.";
     $button=1;        $bgcolor=$possiblecolors{'correct'};
         $button=1;
   } elsif ($award eq 'DRAFT') {    } elsif ($award eq 'DRAFT') {
     $message = "A draft copy has been saved.";        $message = "A draft copy has been saved.";
     $button=1;        $bgcolor=$possiblecolors{'not_charged_try'};
         $button=1;
     } elsif ($award eq 'ASSIGNED_SCORE') {
         $message = "A score has been assigned.";
         $bgcolor=$possiblecolors{'correct'};
         $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";
         $bgcolor=$possiblecolors{'correct'};
         $button=1;
   }    }
   return ($button,$message,$previousmsg);    return ($button,$bgcolor,$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 {
Line 331  sub setgradedata { Line 461  sub setgradedata {
     $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"} =
Line 355  sub setgradedata { Line 507  sub setgradedata {
     } elsif ( $award eq 'DRAFT' ) {      } elsif ( $award eq 'DRAFT' ) {
       $Apache::lonhomework::results{"resource.$id.solved"} = '';        $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"});
       $Apache::lonhomework::results{"resource.$id.previous"} = '1';
    }
     } elsif ( $previously_used eq 'PREVIOUSLY_LAST') {      } elsif ( $previously_used eq 'PREVIOUSLY_LAST') {
       #delete all data as they student didn't do anything, but save        #delete all data as they student didn't do anything, but save
       #the list of collaborators.        #the list of collaborators.
       foreach my $key (keys(%Apache::lonhomework::results)) {        &removealldata($id);
  if (($key =~ /^resource\.$id\./) && ($key !~ /\.collaborators$/)) {  
   &Apache::lonxml::debug("Removing $key");  
   delete($Apache::lonhomework::results{$key});  
  }  
       }  
       #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 390  sub grade { Line 551  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 426  sub grade { Line 587  sub grade {
 sub gradestatus {  sub gradestatus {
   my ($id,$target) = @_;    my ($id,$target) = @_;
   my $showbutton = 1;    my $showbutton = 1;
     my $bgcolor = '';
   my $message = '';    my $message = '';
   my $latemessage = '';    my $latemessage = '';
   my $trystr='';    my $trystr='';
Line 441  sub gradestatus { Line 603  sub gradestatus {
     &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,$previousmsg) =        ($showbutton,$bgcolor,$message,$previousmsg) =
  &decideoutput($award,$solved,$previous,$target);   &decideoutput($award,$solved,$previous,$target);
       if ($target eq 'tex') {        if ($target eq 'tex') {
  $message=' '.$message.' ';   $message=' '.$message.' ';
       } else {        } else {
  $message="<td bgcolor=\"#aaffaa\">$message</td>";   $message="<td bgcolor=\"$bgcolor\">$message</td>";
  if ($previousmsg) {   if ($previousmsg) {
   $previousmsg="<td bgcolor=\"#ffaaaa\">$previousmsg</td>";    $previousmsg="<td bgcolor=\"#aaaaff\">$previousmsg</td>";
  }   }
       }        }
     }      }
Line 460  sub gradestatus { Line 622  sub gradestatus {
     if ( $maxtries eq 'con_lost' ) { $maxtries = '0'; }       if ( $maxtries eq 'con_lost' ) { $maxtries = '0'; } 
     if ( $showbutton ) {      if ( $showbutton ) {
       if ($target eq 'tex') {        if ($target eq 'tex') {
   if ($ENV{'request.state'} ne "construct") {    if ($ENV{'request.state'} ne "construct" && $Apache::lonhomework::type ne 'exam') {
       $trystr = ' {\small \textit{Tries} '.$tries.'/'.$maxtries.'} \vskip 0 mm ';        $trystr = ' {\vskip 1 mm \small \textit{Tries} '.$tries.'/'.$maxtries.'} \vskip 2 mm ';
     } else {
         $trystr = '\vskip 0 mm ';
   }    }
       } else {        } else {
          $trystr = "<td>Tries $tries/$maxtries</td>";           $trystr = "<td>Tries $tries/$maxtries</td>";
Removed from v.1.78  
changed lines
  Added in v.1.105

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