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

Diff for /loncom/homework/inputtags.pm between versions 1.150 and 1.171

version 1.150, 2004/09/09 09:52:58 version 1.171, 2005/07/11 19:41:53
Line 30  use HTML::Entities(); Line 30  use HTML::Entities();
 use strict;  use strict;
 use Apache::loncommon;  use Apache::loncommon;
 use Apache::lonlocal;  use Apache::lonlocal;
   use Apache::lonnet;
   
 BEGIN {  BEGIN {
     &Apache::lonxml::register('Apache::inputtags',('hiddenline','textfield','textline'));      &Apache::lonxml::register('Apache::inputtags',('hiddenline','textfield','textline'));
Line 148  sub start_textfield { Line 149  sub start_textfield {
  }   }
     } elsif ($target eq 'grade') {      } elsif ($target eq 'grade') {
  my $seedtext=&Apache::lonxml::get_all_text("/textfield",$parser);   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);
Line 222  sub start_textline { Line 223  sub start_textline {
  if ($addchars) {   if ($addchars) {
     $result.=&addchars('HWVAL_'.$id,$addchars);      $result.=&addchars('HWVAL_'.$id,$addchars);
  }   }
  $result.= '<input type="text" name="HWVAL_'.$id.'" value="'.   my $readonly=&Apache::lonxml::get_param('readonly',$parstack,
    $safeeval);
    if (lc($readonly) eq 'yes') {
       $readonly=' readonly="readonly" ';
    } else {
       $readonly='';
    }
    $result.= '<input type="text" '.$readonly.' name="HWVAL_'.$id.'" value="'.
     $oldresponse.'" size="'.$size.'" maxlength="'.$maxlength.'" />';      $oldresponse.'" size="'.$size.'" maxlength="'.$maxlength.'" />';
     }      }
  } else {   } else {
     #right or wrong don't show what was last typed in.      #right or wrong don't show what was last typed in.
     $result='<i>'.$Apache::inputtags::answertxt{$id}.'</i>';      $result='<b>'.$Apache::inputtags::answertxt{$id}.'</b>';
     #$result='';      #$result='';
  }   }
     } 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('Size:','size',$token,'5').   $result.=&Apache::edit::text_arg('Size:','size',$token,'5').
     &Apache::edit::text_arg      &Apache::edit::text_arg('Click-On Texts (comma sep):',
     ('Click-On Texts (comma sep):','addchars',$token,10)."</td></tr>";      'addchars',$token,10);
  $result.=&Apache::edit::end_table;          $result.=&Apache::edit::select_arg('Readonly:','readonly',
      ['no','yes'],$token);
    $result.=&Apache::edit::end_row();
    $result.=&Apache::edit::end_table();
     } elsif ($target eq 'modified') {      } elsif ($target eq 'modified') {
  my $constructtag=&Apache::edit::get_new_args($token,$parstack,$safeeval,'size','addchars');   my $constructtag=&Apache::edit::get_new_args($token,$parstack,
        $safeeval,'size',
        'addchars','readonly');
  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') {      } elsif ($target eq 'tex' and $Apache::lonhomework::type ne 'exam') {
  my $size = &Apache::lonxml::get_param('size',$parstack,$safeeval);   my $size = &Apache::lonxml::get_param('size',$parstack,$safeeval);
Line 282  sub end_hiddenline { Line 295  sub end_hiddenline {
     return "";      return "";
 }  }
   
   # $part -> partid
   # $id -> responseid
   # $uploadefiletypes -> comma seperated list of extensions allowed or * for any
   # $which -> 'uploadedonly'  -> only newly uploaded files
   #           'portfolioonly' -> only allow files from portfolio
   #           'both' -> allow files from either location
   # returns a table row <tr> 
   sub file_selector {
       my ($part,$id,$uploadedfiletypes,$which)=@_;
       if (!$uploadedfiletypes) { return ''; }
   
       my $jspart=$part;
       $jspart=~s/\./_/g;
   
       my $result;
       
       $result.='<tr><td>';
       if ($uploadedfiletypes ne '*') {
    $result.=
       &mt('Allowed filetypes: <b>[_1]</b>',$uploadedfiletypes).'<br />';
       }
       if ($which eq 'uploadonly' || $which eq 'both') { 
    $result.=&mt('Submit a file: (only one file can be uploaded)').
       ' <br /><input type="file" size="50" name="HWFILE'.
       $jspart.'_'.$id.'" /><br />';
    my $uploadedfile= &HTML::Entities::encode($Apache::lonhomework::history{"resource.$part.$id.uploadedfile"},'<>&"');
   
    if ($uploadedfile) {
       my $url=$Apache::lonhomework::history{"resource.$part.$id.uploadedurl"};
       push (@Apache::lonxml::extlinks,$url);
       &Apache::lonnet::allowuploaded('/adm/essayresponse',$url);
       my $icon=&Apache::loncommon::icon($url);
       my $curfile='<a href="'.$url.'"><img src="'.$icon.
    '" border="0" />'.$uploadedfile.'</a>';
       $result.=&mt('Currently submitted: <tt>[_1]</tt>',$curfile);
    } else {
       #$result.=&mt('(Hand in a file you have prepared on your computer)');
    }
       }
       if ( $which eq 'both') { 
    $result.='<br />'.'<strong>'.&mt('OR:').'</strong><br />';
       }
       if ($which eq 'portfolioonly' || $which eq 'both') { 
    $result.='<a href='."'".'javascript:void(window.open("/adm/portfolio?mode=selectfile&amp;fieldname=HWPORT'.$jspart.'_'.$id.'","cat","height=600,width=800,scrollbars=1,resizable=1,menubar=2,location=1"))'."'".'>'.
       &mt('Select Portfolio Files').'</a><br />'.
       '<input type="text" size="50" name="HWPORT'.$jspart.'_'.$id.'" value="" />'.
       '<br />';
    if ($Apache::lonhomework::history{"resource.$part.$id.portfiles"}=~/[^\s]/){
       my @filelist;
       foreach my $file (split(',',&Apache::lonnet::unescape($Apache::lonhomework::history{"resource.$part.$id.portfiles"}))) {
    my (undef,undef,$domain,$user)=&Apache::lonxml::whichuser();
    my $url="/uploaded/$domain/$user/portfolio$file";
    my $icon=&Apache::loncommon::icon($url);
    push(@filelist,'<a href="'.$url.'"><img src="'.$icon.
        '" border="0" />'.$file.'</a>');
       }
       $result.=&mt("Portfolio files previously selected: <strong>[_1]</strong>",join(', ',@filelist));
    }
       }
       $result.='</td></tr>'; 
       return $result;
   }
   
 sub checkstatus {  sub checkstatus {
     my ($value,$awardref,$msgref)=@_;      my ($value,$awardref,$msgref)=@_;
     for (my $i=0;$i<=$#$awardref;$i++) {      for (my $i=0;$i<=$#$awardref;$i++) {
Line 317  sub finalizeawards { Line 393  sub finalizeawards {
        'BAD_FORMULA', 'SIG_FAIL', 'INCORRECT',          'BAD_FORMULA', 'SIG_FAIL', 'INCORRECT', 
        'MISORDERED_RANK', 'INVALID_FILETYPE',         'MISORDERED_RANK', 'INVALID_FILETYPE',
        'DRAFT', 'SUBMITTED', 'ASSIGNED_SCORE',         'DRAFT', 'SUBMITTED', 'ASSIGNED_SCORE',
        'APPROX_ANS', 'EXACT_ANS') {         'APPROX_ANS', 'EXACT_ANS','COMMA_FAIL') {
  ($result,$msg)=&checkstatus($possibleaward,$awardref,$msgref);   ($result,$msg)=&checkstatus($possibleaward,$awardref,$msgref);
  if (defined($result)) { return ($result,$msg); }   if (defined($result)) { return ($result,$msg); }
     }      }
Line 325  sub finalizeawards { Line 401  sub finalizeawards {
 }  }
   
 sub decideoutput {  sub decideoutput {
     my ($award,$awardmsg,$solved,$previous,$target)=@_;      my ($award,$awarded,$awardmsg,$solved,$previous,$target)=@_;
     my $message='';      my $message='';
     my $button=0;      my $button=0;
     my $previousmsg;      my $previousmsg;
Line 337  sub decideoutput { Line 413  sub decideoutput {
   'not_charged_try' => '#ffffaa',    'not_charged_try' => '#ffffaa',
   'no_message' => '#fffff',    'no_message' => '#fffff',
   );    );
   
     if ($previous) { $previousmsg=&mt('You have entered that answer before'); }      if ($previous) { $previousmsg=&mt('You have entered that answer before'); }
           
     if      ($solved =~ /^correct/) {      if      ($solved =~ /^correct/) {
  if ($award eq 'ASSIGNED_SCORE') {   $bgcolor=$possiblecolors{'correct'};
     $message = &mt("A score has been assigned.");   $message=&mt('You are correct.');
    if ($awarded < 1 && $awarded > 0) {
       $message=&mt('You are partially correct.');
       $bgcolor=$possiblecolors{'not_charged_try'};
    } elsif ($awarded < 1) {
       $message=&mt('Incorrect.');
       $bgcolor=$possiblecolors{'charged_try'};
    }
   
    if ($target eq 'tex') {
       $message = '\textbf{'.$message.'}';
  } else {   } else {
     if ($target eq 'tex') {      $message = "<b>".$message."</b>";
  $message = '\textbf{'.&mt('You are correct.').'}';   }
     } else {   $added_computer_text=1;
  $message = "<b>".&mt('You are correct.')."</b>";  
    if ($env{'request.filename'} !~ 
       m|/res/lib/templates/examupload.problem$|) {
       if ($target ne 'tex') {
  $message.=" ".&mt("Computer's answer now shown above.");   $message.=" ".&mt("Computer's answer now shown above.");
     }      }
     $added_computer_text=1;      unless ($env{'course.'.
     unless ($ENV{'course.'.       $env{'request.course.id'}.
      $ENV{'request.course.id'}.  
      '.disable_receipt_display'} eq 'yes') {        '.disable_receipt_display'} eq 'yes') { 
  $message.=(($target eq 'web')?'<br />':' ').   $message.=(($target eq 'web')?'<br />':' ').
     &mt('Your receipt is').' '.&Apache::lonnet::receipt($Apache::inputtags::part).      &mt('Your receipt is').' '.&Apache::lonnet::receipt($Apache::inputtags::part).
     (($target eq 'web')?&Apache::loncommon::help_open_topic('Receipt'):'');      (($target eq 'web')?&Apache::loncommon::help_open_topic('Receipt'):'');
     }      }
  }   }
  $bgcolor=$possiblecolors{'correct'};  
  $button=0;   $button=0;
  $previousmsg='';   $previousmsg='';
     } elsif ($solved =~ /^excused/) {      } elsif ($solved =~ /^excused/) {
Line 383  sub decideoutput { Line 471  sub decideoutput {
  $message.=" ".&mt("Computer's answer now shown above.");   $message.=" ".&mt("Computer's answer now shown above.");
     }      }
     $added_computer_text=1;      $added_computer_text=1;
     unless ($ENV{'course.'.      unless ($env{'course.'.
      $ENV{'request.course.id'}.       $env{'request.course.id'}.
      '.disable_receipt_display'} eq 'yes') {        '.disable_receipt_display'} eq 'yes') { 
  $message.=(($target eq 'web')?'<br />':' ').   $message.=(($target eq 'web')?'<br />':' ').
     'Your receipt is '.&Apache::lonnet::receipt($Apache::inputtags::part).      'Your receipt is '.&Apache::lonnet::receipt($Apache::inputtags::part).
Line 417  sub decideoutput { Line 505  sub decideoutput {
     } elsif ($award eq 'MISORDERED_RANK') {      } elsif ($award eq 'MISORDERED_RANK') {
  $message = &mt('You have provided an invalid ranking');   $message = &mt('You have provided an invalid ranking');
  if ($target ne 'tex') {   if ($target ne 'tex') {
     $message.=', '.&mt('please refer to').' '.&Apache::loncommon::help_open_topic('Ranking_Problems','help on ranking problems').'.';      $message.=', '.&mt('please refer to').' '.&Apache::loncommon::help_open_topic('Ranking_Problems','help on ranking problems');
  }   }
  $bgcolor=$possiblecolors{'not_charged_try'};   $bgcolor=$possiblecolors{'not_charged_try'};
  $button=1;   $button=1;
     } elsif ($award eq 'INVALID_FILETYPE') {      } elsif ($award eq 'INVALID_FILETYPE') {
  $message = &mt('The filetype extension of the file you uploaded is not allowed.');   $message = &mt('Submission won\'t be graded. The type of file submitted is not allowed.');
  $bgcolor=$possiblecolors{'not_charged_try'};   $bgcolor=$possiblecolors{'not_charged_try'};
  $button=1;   $button=1;
     } elsif ($award eq 'SIG_FAIL') {      } elsif ($award eq 'SIG_FAIL') {
Line 439  sub decideoutput { Line 527  sub decideoutput {
  $bgcolor=$possiblecolors{'not_charged_try'};   $bgcolor=$possiblecolors{'not_charged_try'};
  $button=1;   $button=1;
     } elsif ($award eq 'UNIT_INVALID_STUDENT') {      } elsif ($award eq 'UNIT_INVALID_STUDENT') {
  $message = &mt('Unable to interpret units. Computer reads units as "[_1]"','<tt>'.$awardmsg.'</tt>.');   $message = &mt('Unable to interpret units. Computer reads units as "[_1]".',&markup_unit($awardmsg,$target));
  if ($target ne 'tex') {$message.=&Apache::loncommon::help_open_topic('Physical_Units');}    if ($target ne 'tex') {$message.=&Apache::loncommon::help_open_topic('Physical_Units');} 
  $bgcolor=$possiblecolors{'not_charged_try'};   $bgcolor=$possiblecolors{'not_charged_try'};
  $button=1;   $button=1;
     } elsif ($award eq 'UNIT_FAIL' || $award eq 'UNIT_IRRECONCIBLE') {      } elsif ($award eq 'UNIT_FAIL' || $award eq 'UNIT_IRRECONCIBLE') {
  $message = &mt('Incompatible units. No conversion found between "[_1]" and the required units ','<tt>'.$awardmsg.'</tt>.');   $message = &mt('Incompatible units. No conversion found between "[_1]" and the required units.',&markup_unit($awardmsg,$target));
  if ($target ne 'tex') {$message.=&Apache::loncommon::help_open_topic('Physical_Units');}    if ($target ne 'tex') {$message.=&Apache::loncommon::help_open_topic('Physical_Units');} 
  $bgcolor=$possiblecolors{'not_charged_try'};   $bgcolor=$possiblecolors{'not_charged_try'};
  $button=1;   $button=1;
     } elsif ($award eq 'UNIT_NOTNEEDED') {      } elsif ($award eq 'UNIT_NOTNEEDED') {
  $message = &mt('Only a number required. Computer reads units of "[_1]"','<tt>'.$awardmsg.'</tt>.');   $message = &mt('Only a number required. Computer reads units of "[_1]".',&markup_unit($awardmsg,$target));
  $bgcolor=$possiblecolors{'not_charged_try'};   $bgcolor=$possiblecolors{'not_charged_try'};
  $button=1;   $button=1;
     } elsif ($award eq 'NO_UNIT') {      } elsif ($award eq 'NO_UNIT') {
Line 457  sub decideoutput { Line 545  sub decideoutput {
  if ($target ne 'tex') {$message.=&Apache::loncommon::help_open_topic('Physical_Units')};   if ($target ne 'tex') {$message.=&Apache::loncommon::help_open_topic('Physical_Units')};
  $bgcolor=$possiblecolors{'not_charged_try'};   $bgcolor=$possiblecolors{'not_charged_try'};
  $button=1;   $button=1;
       } elsif ($award eq 'COMMA_FAIL') {
    $message = &mt("Proper comma separation is required").'.';
    $bgcolor=$possiblecolors{'not_charged_try'};
    $button=1;
     } elsif ($award eq 'BAD_FORMULA') {      } elsif ($award eq 'BAD_FORMULA') {
  $message = &mt("Unable to understand formula");   $message = &mt("Unable to understand formula");
  $bgcolor=$possiblecolors{'not_charged_try'};   $bgcolor=$possiblecolors{'not_charged_try'};
Line 498  sub decideoutput { Line 590  sub decideoutput {
     return ($button,$bgcolor,$message,$previousmsg);      return ($button,$bgcolor,$message,$previousmsg);
 }  }
   
   sub markup_unit {
       my ($unit,$target)=@_;
       if ($target eq 'tex') {
    return '\texttt{'.&Apache::lonxml::latex_special_symbols($unit).'}'; 
       } else {
    return "<tt>".$unit."</tt>";
       }
   }
   
 sub removealldata {  sub removealldata {
     my ($id)=@_;      my ($id)=@_;
     foreach my $key (keys(%Apache::lonhomework::results)) {      foreach my $key (keys(%Apache::lonhomework::results)) {
Line 524  sub hidealldata { Line 625  sub hidealldata {
   
 sub setgradedata {  sub setgradedata {
     my ($award,$msg,$id,$previously_used) = @_;      my ($award,$msg,$id,$previously_used) = @_;
     # if the student already has it correct, don't modify the status      if ($Apache::lonhomework::scantronmode && 
     if ($Apache::lonhomework::scantronmode && defined($ENV{'form.CODE'})) {   &Apache::lonnet::validCODE($env{'form.CODE'})) {
  $Apache::lonhomework::results{"resource.CODE"}=$ENV{'form.CODE'};   $Apache::lonhomework::results{"resource.CODE"}=$env{'form.CODE'};
       } elsif ($Apache::lonhomework::scantronmode && 
        $env{'form.CODE'} eq '' &&
        $Apache::lonhomework::history{"resource.CODE"} ne '') {
    $Apache::lonhomework::results{"resource.CODE"}='';
     }      }
   
     if (!$Apache::lonhomework::scantronmode &&      if (!$Apache::lonhomework::scantronmode &&
  $Apache::inputtags::status['-1'] ne 'CAN_ANSWER' &&   $Apache::inputtags::status['-1'] ne 'CAN_ANSWER' &&
  $Apache::inputtags::status['-1'] ne 'CANNOT_ANSWER') {   $Apache::inputtags::status['-1'] ne 'CANNOT_ANSWER') {
Line 536  sub setgradedata { Line 642  sub setgradedata {
     } elsif ( $Apache::lonhomework::history{"resource.$id.solved"} !~      } elsif ( $Apache::lonhomework::history{"resource.$id.solved"} !~
       /^correct/ || $Apache::lonhomework::scantronmode ||        /^correct/ || $Apache::lonhomework::scantronmode ||
       lc($Apache::lonhomework::problemstatus) eq 'no') {        lc($Apache::lonhomework::problemstatus) eq 'no') {
  #handle assignment of tries and solved status          # the student doesn't already have it correct,
    # or we are in a mode (scantron orno problem status) where a correct 
           # can become incorrect
    # handle assignment of tries and solved status
  my $solvemsg;   my $solvemsg;
  if ($Apache::lonhomework::scantronmode) {   if ($Apache::lonhomework::scantronmode) {
     $solvemsg='correct_by_scantron';      $solvemsg='correct_by_scantron';
Line 570  sub setgradedata { Line 679  sub setgradedata {
  } 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;
     if (lc($Apache::lonhomework::problemstatus) eq 'no') {      if (lc($Apache::lonhomework::problemstatus) eq 'no' ||
    $Apache::lonhomework::scantronmode) {
  $Apache::lonhomework::results{"resource.$id.awarded"} = 0;   $Apache::lonhomework::results{"resource.$id.awarded"} = 0;
     }      }
     $Apache::lonhomework::results{"resource.$id.solved"} =      $Apache::lonhomework::results{"resource.$id.solved"} =
Line 589  sub setgradedata { Line 699  sub setgradedata {
  } 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') {      if (lc($Apache::lonhomework::problemstatus) eq 'no' ||
    $Apache::lonhomework::scantronmode) {
  $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.awarded"} = 0;   $Apache::lonhomework::results{"resource.$id.awarded"} = 0;
Line 635  sub grade { Line 746  sub grade {
     my ($target) = @_;      my ($target) = @_;
     my $id = $Apache::inputtags::part;      my $id = $Apache::inputtags::part;
     my $response='';      my $response='';
     if ( defined $ENV{'form.submitted'}) {      if ( defined $env{'form.submitted'}) {
  my (@awards,@msgs);   my (@awards,@msgs);
  foreach $response (@Apache::inputtags::response) {   foreach $response (@Apache::inputtags::response) {
     &Apache::lonxml::debug("looking for response.$id.$response.awarddetail");      &Apache::lonxml::debug("looking for response.$id.$response.awarddetail");
Line 688  sub gradestatus { Line 799  sub gradestatus {
     if ( $status ne 'CLOSED' && $status ne 'UNAVAILABLE' &&      if ( $status ne 'CLOSED' && $status ne 'UNAVAILABLE' &&
  $status ne 'INVALID_ACCESS') {     $status ne 'INVALID_ACCESS') {  
  my $award = $Apache::lonhomework::history{"resource.$id.award"};   my $award = $Apache::lonhomework::history{"resource.$id.award"};
    my $awarded = $Apache::lonhomework::history{"resource.$id.awarded"};
  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"};
  my $awardmsg = $Apache::lonhomework::history{"resource.$id.awardmsg"};   my $awardmsg = $Apache::lonhomework::history{"resource.$id.awardmsg"};
Line 695  sub gradestatus { Line 807  sub gradestatus {
  if ( $award ne '' || $solved ne '' || $status eq 'SHOW_ANSWER') {   if ( $award ne '' || $solved ne '' || $status eq 'SHOW_ANSWER') {
     &Apache::lonxml::debug('Getting message');      &Apache::lonxml::debug('Getting message');
     ($showbutton,$bgcolor,$message,$previousmsg) =      ($showbutton,$bgcolor,$message,$previousmsg) =
  &decideoutput($award,$awardmsg,$solved,$previous,$target);   &decideoutput($award,$awarded,$awardmsg,$solved,$previous,
         $target);
     if ($target eq 'tex') {      if ($target eq 'tex') {
  $message='\vskip 2 mm '.$message.' ';   $message='\vskip 2 mm '.$message.' ';
     } else {      } else {
Line 714  sub gradestatus { Line 827  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'; } 
  my $tries_text=&mt('Tries');   my $tries_text=&mt('Tries');
  if ( $Apache::lonhomework::type eq 'survey') { $tries_text=&mt('Submissions'); }   if ( $Apache::lonhomework::type eq 'survey' ||
        $Apache::lonhomework::parsing_a_task) {
       $tries_text=&mt('Submissions');
    }
  if ( $showbutton ) {   if ( $showbutton ) {
     if ($target eq 'tex') {      if ($target eq 'tex') {
  if ($ENV{'request.state'} ne "construct" && $Apache::lonhomework::type ne 'exam' && $ENV{'form.suppress_tries'} ne 'yes') {   if ($env{'request.state'} ne "construct" && $Apache::lonhomework::type ne 'exam' && $env{'form.suppress_tries'} ne 'yes') {
     $trystr = ' {\vskip 1 mm \small \textit{'.$tries_text.'} '.$tries.'/'.$maxtries.'} \vskip 2 mm ';      $trystr = ' {\vskip 1 mm \small \textit{'.$tries_text.'} '.$tries.'/'.$maxtries.'} \vskip 2 mm ';
  } else {   } else {
     $trystr = '\vskip 0 mm ';      $trystr = '\vskip 0 mm ';
  }   }
     } else {      } else {
  $trystr = "<td><nobr>".$tries_text." $tries";   $trystr = "<td><nobr>".$tries_text." $tries";
  if($ENV{'request.state'} ne 'construct') {   if ($Apache::lonhomework::parsing_a_task) {
    } elsif($env{'request.state'} ne 'construct') {
     $trystr.="/$maxtries";      $trystr.="/$maxtries";
  } else {   } else {
     if (defined($Apache::inputtags::params{'maxtries'})) {      if (defined($Apache::inputtags::params{'maxtries'})) {
Line 737  sub gradestatus { Line 854  sub gradestatus {
  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 ) { 
     if ($target ne 'tex') {      if ($target ne 'tex') {
  $button = '<input type="submit" name="submit" value="'.&mt('Submit Answer').'" />';   $button = '<input type="submit" name="submit_'.$id.'" value="'.&mt('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
     if ($target eq 'tex') {      $latemessage=&mt(' The last submission was after the Due Date ');;
  $latemessage=' The last submission was after the Due Date ';      if ($target eq 'web') {
     } else {   $latemessage='<td bgcolor="#ffaaaa">'.$latemessage.'</td>';
  $latemessage="<td bgcolor=\"#ffaaaa\">The last submission was after the Due Date</td>";  
     }      }
  }   }
     }      }
Removed from v.1.150  
changed lines
  Added in v.1.171

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