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

Diff for /loncom/homework/inputtags.pm between versions 1.292 and 1.315

version 1.292, 2011/07/12 12:55:50 version 1.315, 2013/04/11 14:59:40
Line 125  sub initialize_inputtags { Line 125  sub initialize_inputtags {
     %Apache::inputtags::submission_display=();      %Apache::inputtags::submission_display=();
 }  }
   
   #
   #  provides the onblur binding for spellchecking.  This could be an
   #  empty string if spellchecking was not enabled.
   #  Jquery selector binding is done rather than setting an onblur
   #  attribute because we'll need to set the element's spellcheck language
   #  option dynamically so we need $(this) to be defined.
   #
   # @param id   - The element id to bind.
   # @param lang - Language in which spellchecking is desired.
   #               if undef, nothing is generated.  
   # @return string - onblur specification to do the requested spellchecking.
   #
   sub spellcheck_onblur {
       my ($id, $lang) = @_;
       my $result = '';
       if ($lang) {
   
    $result = <<JAVASCRIPT;
   <script type="text/javascript">
   \$('\#$id').blur(function() {
       doSpellcheck('\#$id', '$lang');
    });
   </script>
   
   JAVASCRIPT
   
   
       }
       return $result;
   }
   
 sub check_for_duplicate_ids {  sub check_for_duplicate_ids {
     my %check;      my %check;
     foreach my $id (@Apache::inputtags::partlist,      foreach my $id (@Apache::inputtags::partlist,
Line 185  sub start_textfield { Line 216  sub start_textfield {
             }              }
         }          }
         unless ($newvariation) {          unless ($newvariation) {
     $oldresponse = &HTML::Entities::encode($Apache::lonhomework::history{"resource.$partid.$resid.submission"},'<>&"');      $oldresponse = $Apache::lonhomework::history{"resource.$partid.$resid.submission"};
         }          }
  if ($Apache::inputtags::status[-1] eq 'CAN_ANSWER') {   if ($Apache::inputtags::status[-1] eq 'CAN_ANSWER') {
     my $cols = &Apache::lonxml::get_param('cols',$parstack,$safeeval);      my $cols = &Apache::lonxml::get_param('cols',$parstack,$safeeval);
Line 194  sub start_textfield { Line 225  sub start_textfield {
     if ( $rows eq '') { $rows = 16; }      if ( $rows eq '') { $rows = 16; }
     my $addchars=&Apache::lonxml::get_param('addchars',$parstack,$safeeval);      my $addchars=&Apache::lonxml::get_param('addchars',$parstack,$safeeval);
     $result='';      $result='';
       my $tagident = 'HWVAL_' . $resid;
     if ($addchars) {      if ($addchars) {
  $result.=&addchars('HWVAL_'.$resid,$addchars);   $result.=&addchars($tagident, $addchars);
     }      }
             my $textareaclass = 'class="LC_richDetectHtml"';              my $textareaclass = 'class="LC_richDetectHtml spellchecked"';
     $result.= '<textarea wrap="hard" name="HWVAL_'.$resid.'" id="HWVAL_'.$resid.'" '.      $result.= '<textarea wrap="hard" name="'.$tagident.'" id="'.$tagident.'" ' .
       'rows="'.$rows.'" cols="'.$cols.'" '.$textareaclass.'>'.        'rows="'.$rows.'" cols="'.$cols.'" '.$textareaclass
                       $oldresponse;        .'>'.
                         &HTML::Entities::encode($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
Line 233  sub start_textfield { Line 266  sub start_textfield {
  my $bodytext=&Apache::lonxml::get_all_text("/textfield",$parser,   my $bodytext=&Apache::lonxml::get_all_text("/textfield",$parser,
    $style);     $style);
  $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);
           my $spell_langs = &spelling_languages();
    $result .= &Apache::edit::select_arg('Spellcheck for:', 'spellcheck',
        $spell_langs, $token);
     } 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,
      $safeeval,'rows','cols',       $safeeval,'rows','cols',
      'addchars');       'addchars', 'spellcheck');
  if ($constructtag) {   if ($constructtag) {
     $result = &Apache::edit::rebuild_tag($token);      $result = &Apache::edit::rebuild_tag($token);
  } else {   } else {
Line 251  sub start_textfield { Line 287  sub start_textfield {
     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 {   } else {
     my $TeXwidth=$width_of_box/80;              if ($env{'form.pdfFormFields'} eq 'yes') {
     $result = '\vskip 1 mm \fbox{\fbox{\parbox{'.$TeXwidth.'\textwidth-5mm}{';                  my $fieldname = $env{'request.symb'}.
     for (my $i=0;$i<int $number_of_lines*2;$i++) {$result.='\strut \\\\ ';}                                  '&part_'. $Apache::inputtags::part.
     $result.='}}}\vskip 2 mm ';                                  '&textresponse'.
                                   '&HWVAL_' . $Apache::inputtags::response['-1'];
                   $result.='\TextField[name='.$fieldname.',multiline=true,height=6\baselineskip,width=270,borderwidth=0,backgroundcolor={.85 .85 .85}]\\';
               } 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 264  sub end_textfield { Line 308  sub end_textfield {
     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 $spellcheck = &Apache::lonxml::get_param('spellcheck', $parstack, $safeeval);
  $Apache::lonxml::evaluate++;   $Apache::lonxml::evaluate++;
  if ($Apache::inputtags::status[-1] eq 'CAN_ANSWER') {   if ($Apache::inputtags::status[-1] eq 'CAN_ANSWER') {
     return "</textarea>";      my $resid = $Apache::inputtags::response[-1];
       my $tagident = 'HWVAL_' . $resid;
       my $result =  "</textarea>";
       $result .= &spellcheck_onblur($tagident, $spellcheck);
       return $result;
  }   }
     } elsif ($target eq 'edit') {      } elsif ($target eq 'edit') {
  $result=&Apache::edit::end_table();   $result=&Apache::edit::end_table();
Line 330  sub start_textline { Line 379  sub start_textline {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;      my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
     my $result = "";      my $result = "";
     my $input_id = &start_input($parstack,$safeeval);      my $input_id = &start_input($parstack,$safeeval);
   
       # The spellcheck attribute 
       # 1. enables spellchecking.
       # 2. Provides the language code in which the spellchecking will be performed.
   
       my $spellcheck = &Apache::lonxml::get_param('spellcheck', $parstack, $safeeval);
     if ($target eq 'web') {      if ($target eq 'web') {
  $Apache::lonxml::evaluate--;   $Apache::lonxml::evaluate--;
  my $partid=$Apache::inputtags::part;   my $partid=$Apache::inputtags::part;
Line 380  sub start_textline { Line 435  sub start_textline {
  if ($Apache::inputtags::status[-1] eq 'CANNOT_ANSWER') {   if ($Apache::inputtags::status[-1] eq 'CANNOT_ANSWER') {
     $name = "none";      $name = "none";
  }   }
  $result.= '<input onkeydown="javascript:setSubmittedPart(\''.$partid.'\');" type="text" '.$readonly.' name="'.$name.'" value="'.   $result.= '<input onkeydown="javascript:setSubmittedPart(\''.$partid.'\');"'
     $oldresponse.'" size="'.$size.'"'.$maxlength.' />';       . ' type="text" '
        . $readonly.' name="'. $name . '"'
        . ' id="' . $name . '"'
        . ' value="'.  $oldresponse.'"'
        . ' class="spellchecked"  size="'.$size.'"'.$maxlength
        . '/>';
   
    $result .= &spellcheck_onblur($name, $spellcheck);
     }      }
     if ($Apache::lonhomework::type eq 'exam'      if ($Apache::lonhomework::type eq 'exam'
  && &needs_exam_box($tagstack)) {   && &needs_exam_box($tagstack)) {
Line 400  sub start_textline { Line 462  sub start_textline {
     'addchars',$token,10);      'addchars',$token,10);
         $result.=&Apache::edit::select_arg('Readonly:','readonly',          $result.=&Apache::edit::select_arg('Readonly:','readonly',
    ['no','yes'],$token);     ['no','yes'],$token);
           my $spell_langs = &spelling_languages();
    $result.=&Apache::edit::select_arg("Spellcheck for: ", 'spellcheck',
      $spell_langs, $token);
  $result.=&Apache::edit::end_row();   $result.=&Apache::edit::end_row();
  $result.=&Apache::edit::end_table();   $result.=&Apache::edit::end_table();
     } 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,
      $safeeval,'size',       $safeeval,'size',
      'addchars','readonly');       'addchars','readonly', 'spellcheck');
  if ($constructtag) { $result = &Apache::edit::rebuild_tag($token); }   if ($constructtag) { $result = &Apache::edit::rebuild_tag($token); }
     } elsif ($target eq 'tex'       } elsif ($target eq 'tex' 
      && $Apache::lonhomework::type ne 'exam') {       && $Apache::lonhomework::type ne 'exam') {
Line 571  sub file_selector { Line 636  sub file_selector {
     if ($which eq 'uploadonly' || $which eq 'both') {       if ($which eq 'uploadonly' || $which eq 'both') { 
  $result.=&mt('Submit a file: (only one file per submission)').   $result.=&mt('Submit a file: (only one file per submission)').
     ' <br /><input type="file" size="50" name="HWFILE'.      ' <br /><input type="file" size="50" name="HWFILE'.
     $jspart.'_'.$id.'" /><br />';      $jspart.'_'.$id.'" id="HWFILE'.$jspart.'_'.$id.'" /><br />';
     }      }
     if ( $which eq 'both') {      if ( $which eq 'both') {
  $result.='<br />'.'<strong>'.&mt('OR:').'</strong><br />';   $result.='<br />'.'<strong>'.&mt('OR:').'</strong><br />';
     }      }
     if ($which eq 'portfolioonly' || $which eq 'both') {       if ($which eq 'portfolioonly' || $which eq 'both') {
  $result.=$extratext.'<a href='."'".'javascript:void(window.open("/adm/portfolio?mode=selectfile&amp;fieldname='.$env{'form.request.prefix'}.'HWPORT'.$jspart.'_'.$id.'","cat","height=600,width=800,scrollbars=1,resizable=1,menubar=2,location=1"))'."'".'>'.          my $symb = $env{'request.symb'};
           (undef,undef,my $res)=&Apache::lonnet::decode_symb($symb);
           my $showsymb;
           # If resource is a .task and URL is unencrypted, include symb in query string
           # for url opened in portfolio file selection window. Can be used to override
           # blocking of portfolio access resulting from an exam event in a different course. 
           if ($res =~ /\.task$/i) {
               my $encsymb = &Apache::lonenc::check_encrypt($symb);
               if ($symb eq $encsymb) {
                   $showsymb = $symb;
               }
           }
    $result.=$extratext.'<a href='."'".'javascript:void(window.open("/adm/portfolio?mode=selectfile&amp;fieldname='.$env{'form.request.prefix'}.'HWPORT'.$jspart.'_'.$id.'&amp;symb='.$showsymb.'","cat","height=600,width=800,scrollbars=1,resizable=1,menubar=2,location=1"))'."'".'>'.
     &mt('Select Portfolio Files: (one or more files per submission)').'</a><br />'.      &mt('Select Portfolio Files: (one or more files per submission)').'</a><br />'.
     '<input type="text" size="50" name="HWPORT'.$jspart.'_'.$id.'" value="" />'.      '<input type="text" size="50" name="HWPORT'.$jspart.'_'.$id.'" value="" />'.
     '<br />';      '<br />';
Line 676  sub current_file_submissions { Line 753  sub current_file_submissions {
         }          }
     }      }
     if ($header_shown) {      if ($header_shown) {
         $result .= &Apache::loncommon::end_data_table().          $result .= &Apache::loncommon::end_data_table();
                    '<br /><span class="LC_warning">'.          if ($Apache::inputtags::status[-1] eq 'CAN_ANSWER') {
                    &mt('Exclude existing file(s) from grading by checking the "Delete?" checkbox(es) and clicking "Submit Answer"').'</span>';              $result .= '<br /><span class="LC_warning">'.
                          &mt('Exclude existing file(s) from grading by checking the "Delete?" checkbox(es) and clicking "Submit Answer"').'</span>';
           }
     }      }
     if (@bad_file_list) {      if (@bad_file_list) {
         my $bad_files = '<span class="LC_filename">'.          my $bad_files = '<span class="LC_filename">'.
Line 911  sub decideoutput { Line 990  sub decideoutput {
  }   }
     }      }
  }   }
         if ($awarded==1) { $button=0; } else { $button=1; }          if ($awarded >= 1) {
               $button=0;
           } elsif (&Apache::lonnet::EXT("resource.$part.retrypartial") !~/^1|on|yes$/i) {
               $button=0;
           } else {
               $button=1;
           }
  $previousmsg='';   $previousmsg='';
     } elsif ($solved =~ /^excused/) {      } elsif ($solved =~ /^excused/) {
  if ($target eq 'tex') {   if ($target eq 'tex') {
Line 993  sub decideoutput { Line 1078  sub decideoutput {
         } else {          } else {
             $message .= '<br />';              $message .= '<br />';
         }          }
         $message .= &mt('Please use a different file name.');          $message .= &mt('Please use a different filename.');
         $css_class=$possible_class{'not_charged_try'};          $css_class=$possible_class{'not_charged_try'};
         $button=1;          $button=1;
     } elsif ($award eq 'INVALID_FILETYPE') {      } elsif ($award eq 'INVALID_FILETYPE') {
Line 1070  sub decideoutput { Line 1155  sub decideoutput {
     } elsif ($award eq 'ANONYMOUS_CREDIT') {      } elsif ($award eq 'ANONYMOUS_CREDIT') {
         $message = &mt("Your anonymous submission has been recorded, and credit awarded.");          $message = &mt("Your anonymous submission has been recorded, and credit awarded.");
         $css_class=$possible_class{'correct'};          $css_class=$possible_class{'correct'};
           $button=1;
     } elsif ($award eq 'DRAFT') {      } elsif ($award eq 'DRAFT') {
  $message = &mt("Copy saved but not submitted.");   $message = &mt("Copy saved but not submitted.");
  $css_class=$possible_class{'not_charged_try'};   $css_class=$possible_class{'not_charged_try'};
Line 1120  sub decideoutput { Line 1206  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)) {
  $message = &mt("Answer Submitted: Your final submission will be graded after the due date.");          $message = &mt("Answer Submitted: Your final submission will be graded after the due date.");
           my @interval= &Apache::lonnet::EXT("resource.$part.interval");
           if ($interval[0] =~ /\d+/) {
               my $first_access=&Apache::lonnet::get_first_access($interval[1]);
               if (defined($first_access)) {
                   my $due_date= &Apache::lonnet::EXT("resource.$part.duedate");
                   unless (($due_date) && ($due_date < $first_access + $interval[0])) { 
                       $message = &mt("Answer Submitted: Your final submission will be graded when the time limit is reached.");
                   }
               }
           }
  $css_class=$possible_class{'no_grade'};   $css_class=$possible_class{'no_grade'};
  $button=1;   $button=1;
     }      }
Line 1459  sub get_grade_messages { Line 1555  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><span class="LC_nobreak">'.&mt($tries_text.' [_1]',$trial).'</span></td>';
  }   }
     }      }
   
Line 1488  sub gradestatus { Line 1584  sub gradestatus {
  && $status ne 'UNAVAILABLE'    && $status ne 'UNAVAILABLE' 
  && $status ne 'INVALID_ACCESS'    && $status ne 'INVALID_ACCESS' 
  && $status ne 'NEEDS_CHECKIN'    && $status ne 'NEEDS_CHECKIN' 
  && $status ne 'NOT_IN_A_SLOT') {     && $status ne 'NOT_IN_A_SLOT'
            && $status ne 'RESERVABLE'
            && $status ne 'RESERVABLE_LATER'
            && $status ne 'NOTRESERVABLE') {
   
    if ($status eq 'SHOW_ANSWER') {
               $showbutton = 0;
           }
   
  ($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);
  if ( $status eq 'SHOW_ANSWER' || $status eq 'CANNOT_ANSWER') {   if ($status eq 'CANNOT_ANSWER') {
     $showbutton = 0;      $showbutton = 0;
  }   }
  if ( $status eq 'SHOW_ANSWER') {   if ( $status eq 'SHOW_ANSWER') {
Line 1580  sub previous_tries { Line 1683  sub previous_tries {
                              {$1 <strong>$txt_correct</strong>. $3}s;                               {$1 <strong>$txt_correct</strong>. $3}s;
     }      }
             my $trystr = "(".&mt('Try [_1]',$Apache::lonhomework::history{"$prefix.tries"}).")";              my $trystr = "(".&mt('Try [_1]',$Apache::lonhomework::history{"$prefix.tries"}).")";
             if ($curr_rndseed || $lastrndseed) {              if (($curr_rndseed || $lastrndseed) && ($i > 1)) {
                 if ($curr_rndseed ne $lastrndseed) {                  if ($curr_rndseed ne $lastrndseed) {
                     $trystr .= '<br /><span style="color: green; white-space: nowrap; font-style: italic; font-weight: bold; font-size: 80%;">'.&mt('New problem variation this try.').'</span>';                      $trystr .= '<br /><span style="color: green; white-space: nowrap; font-style: italic; font-weight: bold; font-size: 80%;">'.&mt('New problem variation this try.').'</span>';
                 }                  }
Line 1622  sub previous_tries { Line 1725  sub previous_tries {
  '</th><th colspan="'.scalar(@Apache::inputtags::response).'">'.   '</th><th colspan="'.scalar(@Apache::inputtags::response).'">'.
  &mt('Submitted Answer').'</th>';   &mt('Submitted Answer').'</th>';
     $output ='<table class="LC_prior_tries">'.$headers.$output.'</table>';      $output ='<table class="LC_prior_tries">'.$headers.$output.'</table>';
     #return $output;  
     $output = &Apache::loncommon::js_ready($output);   
     $output.='<br /><form action=""><center><input type="button" name="close" value="'.&mt('Close Window').'" onClick="window.close()" /></center></form>';  
   
     my $windowopen=&Apache::lonhtmlcommon::javascript_docopen();  
     my $tries_text = &get_tries_text('link');      my $tries_text = &get_tries_text('link');
     my $start_page =  
  &Apache::loncommon::start_page($tries_text, undef,  
        {'only_body'      => 1,  
  'bgcolor'        => '#FFFFFF',  
  'js_ready'       => 1,  
         'inherit_jsmath' => 1, });  
     my $end_page =  
  &Apache::loncommon::end_page({'js_ready' => 1,});  
     my $prefix = $env{'form.request.prefix'};      my $prefix = $env{'form.request.prefix'};
     $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 $result ="<script type=\"text/javascript\">      my $result = &Apache::loncommon::modal_adhoc_window($function_name,420,410,$output,&mt($tries_text))."<br />";
 // <![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()}  
 // ]]>  
 </script><a href=\"javascript:$function_name();void(0);\">".&mt($tries_text)."</a><br />";  
     #use Data::Dumper;  
     #&Apache::lonnet::logthis(&Dumper(\%Apache::inputtags::submission_display));  
     return $result;      return $result;
 }  }
   
Line 1672  sub get_tries_text { Line 1757  sub get_tries_text {
     return $tries_text;      return $tries_text;
 }  }
   
   sub spelling_languages {
       my %langchoices;
       foreach my $id (&Apache::loncommon::languageids()) {
           my $code = &Apache::loncommon::supportedlanguagecode($id);
           if ($code ne '') {
               $langchoices{$code} =  &Apache::loncommon::plainlanguagedescription($id);
           }
       }
       my @spelllangs = ('none');
       foreach my $code ('en','de','he','es','fr','pt','tr') {
           push(@spelllangs,[$code,$langchoices{$code}]);
       }
       return \@spelllangs;
   }
   
 1;  1;
 __END__  __END__
   
Removed from v.1.292  
changed lines
  Added in v.1.315

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