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

Diff for /loncom/homework/inputtags.pm between versions 1.324 and 1.325

version 1.324, 2014/06/19 19:37:35 version 1.325, 2014/09/14 15:21:43
Line 997  sub finalizeawards { Line 997  sub finalizeawards {
 }  }
   
 sub decideoutput {  sub decideoutput {
     my ($award,$awarded,$awardmsg,$solved,$previous,$target,$nocorrect)=@_;      my ($award,$awarded,$awardmsg,$solved,$previous,$target,$nocorrect,$tdclass)=@_;
   
     my $message='';      my $message='';
     my $button=0;      my $button=0;
Line 1573  sub grade { Line 1573  sub grade {
 }  }
   
 sub get_grade_messages {  sub get_grade_messages {
     my ($id,$prefix,$target,$status,$nocorrect) = @_;      my ($id,$prefix,$target,$status,$nocorrect,$tdclass) = @_;
 # nocorrect suppresses "Computer's answer now shown above"  # nocorrect suppresses "Computer's answer now shown above"
     my ($message,$latemessage,$trystr,$previousmsg);      my ($message,$latemessage,$trystr,$previousmsg);
     my $showbutton = 1;      my $showbutton = 1;
Line 1588  sub get_grade_messages { Line 1588  sub get_grade_messages {
  &Apache::lonxml::debug('Getting message');   &Apache::lonxml::debug('Getting message');
  ($showbutton,my $css_class,$message,$previousmsg) =   ($showbutton,my $css_class,$message,$previousmsg) =
     &decideoutput($award,$awarded,$awardmsg,$solved,$previous,      &decideoutput($award,$awarded,$awardmsg,$solved,$previous,
   $target,(($status eq 'CAN_ANSWER') || $nocorrect));    $target,(($status eq 'CAN_ANSWER') || $nocorrect),$tdclass);
  if ($target eq 'tex') {   if ($target eq 'tex') {
     $message='\vskip 2 mm '.$message.' ';      $message='\vskip 2 mm '.$message.' ';
  } else {   } else {
     $message="<td class=\"$css_class\">$message</td>";      $message="<td class=\"$tdclass $css_class\">$message</td>";
     if ($previousmsg) {      if ($previousmsg) {
  $previousmsg="<td class=\"LC_answer_previous\">$previousmsg</td>";   $previousmsg="<td class=\"$tdclass LC_answer_previous\">$previousmsg</td>";
     }      }
  }   }
     }      }
Line 1629  sub get_grade_messages { Line 1629  sub get_grade_messages {
     $trial.="/".$Apache::inputtags::params{'maxtries'};      $trial.="/".$Apache::inputtags::params{'maxtries'};
  }   }
     }      }
     $trystr = '<td><span class="LC_nobreak">'.&mt($tries_text.' [_1]',$trial).'</span></td>';      $trystr = '<td class="'.$tdclass.'"><span class="LC_nobreak">'.&mt($tries_text.' [_1]',$trial).'</span></td>';
  }   }
     }      }
   
Line 1637  sub get_grade_messages { Line 1637  sub get_grade_messages {
  #last submissions was after due date   #last submissions was after due date
  $latemessage=&mt(' The last submission was after the Due Date ');;   $latemessage=&mt(' The last submission was after the Due Date ');;
  if ($target eq 'web') {   if ($target eq 'web') {
     $latemessage='<td class="LC_answer_late">'.$latemessage.'</td>';      $latemessage='<td class="'.$tdclass.' LC_answer_late">'.$latemessage.'</td>';
  }   }
     }      }
     return ($previousmsg,$latemessage,$message,$trystr,$showbutton);      return ($previousmsg,$latemessage,$message,$trystr,$showbutton);
Line 1651  sub gradestatus { Line 1651  sub gradestatus {
     my $trystr='';      my $trystr='';
     my $button='';      my $button='';
     my $previousmsg='';      my $previousmsg='';
       my $tdclass='';
   
     my $status = $Apache::inputtags::status['-1'];      my $status = $Apache::inputtags::status['-1'];
     &Apache::lonxml::debug("gradestatus has :$status:");      &Apache::lonxml::debug("gradestatus has :$status:");
Line 1667  sub gradestatus { Line 1668  sub gradestatus {
             $showbutton = 0;              $showbutton = 0;
         }          }
   
           unless (($status eq 'SHOW_ANSWER') || ($status eq 'CANNOT_ANSWER')) {
               if ($target ne 'tex') {
                   $tdclass = 'LC_status_submit_'.$id;
               }
           }
   
  ($previousmsg,$latemessage,$message,$trystr) =   ($previousmsg,$latemessage,$message,$trystr) =
     &get_grade_messages($id,"resource.$id",$target,$status,      &get_grade_messages($id,"resource.$id",$target,$status,
  $showbutton);   $showbutton,$tdclass);
  if ($status eq 'CANNOT_ANSWER') {   if ($status eq 'CANNOT_ANSWER') {
     $showbutton = 0;      $showbutton = 0;
  }   }
  if ( $status eq 'SHOW_ANSWER') {   if ( $status eq 'SHOW_ANSWER') {
     undef($previousmsg);      undef($previousmsg);
  }   }
  if ( $showbutton ) {    if ( $showbutton ) {
     if ($target ne 'tex') {      if ($target ne 'tex') {
  $button =    $button = 
             '<input onmouseup="javascript:setSubmittedPart(\''.$id.'\');this.form.action+=\'#'.&escape($id).'\';"              '<input onmouseup="javascript:setSubmittedPart(\''.$id.'\');this.form.action+=\'#'.&escape($id).'\';"
                     type="submit" name="submit_'.$id.'"                      type="submit" name="submit_'.$id.'" id="submit_'.$id.'" class="LC_hwk_submit"
                     value="'.&mt('Submit Answer').'" />';                      value="'.&mt('Submit Answer').'" />&nbsp;'.
                       '<div id="msg_submit_'.$id.'" style="display:none">'.
                       &mt('Processing your submission ...').'</div>';
     }      }
  }   }
   
Line 1696  sub gradestatus { Line 1705  sub gradestatus {
     $output =      $output =
  '<table><tr><td>'.$button.'</td>'.$output;   '<table><tr><td>'.$button.'</td>'.$output;
     if (!$no_previous) {      if (!$no_previous) {
  $output.='<td>'.&previous_tries($id,$target).'</td>';   $output.='<td class="'.$tdclass.'">'.&previous_tries($id,$target).'</td>';
     }      }
     $output.= '</tr></table>';      $output.= '</tr></table>';
     return $output;      return $output;
Removed from v.1.324  
changed lines
  Added in v.1.325

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