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

Diff for /loncom/homework/inputtags.pm between versions 1.259.2.1 and 1.260

version 1.259.2.1, 2009/09/23 03:15:18 version 1.260, 2009/07/17 15:27:17
Line 869  sub decideoutput { Line 869  sub decideoutput {
  $css_class=$possible_class{'charged_try'};   $css_class=$possible_class{'charged_try'};
  $button=1;   $button=1;
     } elsif ($award eq 'SUBMITTED') {      } elsif ($award eq 'SUBMITTED') {
         if ($env{'request.uri'} eq '/res/gci/gci/internal/submission.problem') {   $message = &mt("Your submission has been recorded.");
             if ($target eq 'web') {  
                 $message .= '<br />'.&mt('Thank you for making a submission to the Geosciences Concept Inventory via the GCI Web Center.');  
             }  
         }  
  $css_class=$possible_class{'no_grade'};   $css_class=$possible_class{'no_grade'};
  $button=1;   $button=1;
     } elsif ($award eq 'DRAFT') {      } elsif ($award eq 'DRAFT') {
Line 926  sub decideoutput { Line 922  sub decideoutput {
     if (&Apache::lonhomework::hide_problem_status()      if (&Apache::lonhomework::hide_problem_status()
  && $Apache::inputtags::status[-1] ne 'SHOW_ANSWER'   && $Apache::inputtags::status[-1] ne 'SHOW_ANSWER'
  && &hide_award($award)) {   && &hide_award($award)) {
         if ($env{'request.uri'} eq '/res/gci/gci/internal/submission.problem') {   $message = &mt("Answer Submitted: Your final submission will be graded after the due date.");
             if ($target eq 'web') {   $css_class=$possible_class{'no_grade'};
                 $message = &mt("Your submission has been recorded.").'<br />'.   $button=1;
                            &mt('Thank you for making a submission to the Geosciences Concept Inventory via the GCI Web Center.');  
             }  
         } else {  
             $message = &mt("Answer Submitted: Your final submission will be graded after the due date.");  
         }  
         $css_class=$possible_class{'no_grade'};  
         $button=1;  
     }      }
     if ($Apache::inputtags::status[-1] eq 'SHOW_ANSWER' &&       if ($Apache::inputtags::status[-1] eq 'SHOW_ANSWER' && 
  !$added_computer_text && $target ne 'tex') {   !$added_computer_text && $target ne 'tex') {
Line 1248  sub get_grade_messages { Line 1237  sub get_grade_messages {
  $trystr = '\vskip 0 mm ';   $trystr = '\vskip 0 mm ';
     }      }
  } else {   } else {
             $trystr = '<td><span class="LC_nobreak">';      $trystr = '<td><span class="LC_nobreak">'.$tries_text." $tries";
             my %parmhash=&Apache::lonnet::coursedescription($env{'request.course.id'});      if ($Apache::lonhomework::parsing_a_task) {
             if ($parmhash{'suppress_tries'} ne 'yes') {      } elsif($env{'request.state'} ne 'construct') {
                 $trystr .= "$tries_text $tries";   $trystr.="/$maxtries";
                 if ($Apache::lonhomework::parsing_a_task) {      } else {
                 } elsif($env{'request.state'} ne 'construct') {   if (defined($Apache::inputtags::params{'maxtries'})) {
                     $trystr.="/$maxtries";      $trystr.="/".$Apache::inputtags::params{'maxtries'};
                 } else {   }
                     if (defined($Apache::inputtags::params{'maxtries'})) {      }
                         $trystr.="/".$Apache::inputtags::params{'maxtries'};      $trystr.="</span></td>";
                     }  
                 }  
             }  
             $trystr.="</span></td>";  
  }   }
     }      }
   
Line 1302  sub gradestatus { Line 1287  sub gradestatus {
     undef($previousmsg);      undef($previousmsg);
  }   }
  if ( $showbutton ) {    if ( $showbutton ) { 
             if ($target ne 'tex') {      if ($target ne 'tex') {
                 my $submit_text = &mt('Submit Answer');  
                 if ($env{'request.uri'} eq '/res/gci/gci/internal/submission.problem') {  
                     $submit_text = &mt('Submit Questions');  
                 }  
  $button =    $button = 
     '<input               '<input onmouseup="javascript:setSubmittedPart(\''.$id.'\')"
                           onmouseup="javascript:setSubmittedPart(\''.$id.'\')"                      type="submit" name="submit_'.$id.'"
                            onsubmit="javascript:setSubmittedPart(\''.$id.'\')"                      value="'.&mt('Submit Answer').'" />';
                         type="submit" name="submit_'.$id.'"  
                          value="'.$submit_text.'" />';  
     }      }
  }   }
   
Line 1420  sub previous_tries { Line 1399  sub previous_tries {
     $prefix =~ tr{.}{_};      $prefix =~ tr{.}{_};
     my $function_name = "LONCAPA_previous_tries_".$prefix.      my $function_name = "LONCAPA_previous_tries_".$prefix.
  $Apache::lonxml::curdepth.'_'.$env{'form.counter'};   $Apache::lonxml::curdepth.'_'.$env{'form.counter'};
     my $triestext = &mt('Previous Tries');  
     if ($env{'request.uri'} eq '/res/gci/gci/internal/submission.problem') {  
         $triestext = &mt('Submission History');  
     }  
     my $result ="<script type=\"text/javascript\">      my $result ="<script type=\"text/javascript\">
 // <![CDATA[  // <![CDATA[
     function $function_name() {newWindow=open('','new_W','width=500,height=500,scrollbars=1,resizable=yes');newWindow.$windowopen;newWindow.document.writeln('$start_page $output $end_page');newWindow.document.close();newWindow.focus()}      function $function_name() {newWindow=open('','new_W','width=500,height=500,scrollbars=1,resizable=yes');newWindow.$windowopen;newWindow.document.writeln('$start_page $output $end_page');newWindow.document.close();newWindow.focus()}
 // ]]>  // ]]>
 </script><a href=\"javascript:$function_name();void(0);\">".$triestext."</a><br />";  </script><a href=\"javascript:$function_name();void(0);\">".&mt("Previous Tries")."</a><br />";
     #use Data::Dumper;      #use Data::Dumper;
     #&Apache::lonnet::logthis(&Dumper(\%Apache::inputtags::submission_display));      #&Apache::lonnet::logthis(&Dumper(\%Apache::inputtags::submission_display));
     return $result;      return $result;
Removed from v.1.259.2.1  
changed lines
  Added in v.1.260

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