version 1.260.4.2, 2010/09/13 04:26:26
|
version 1.261, 2010/02/28 23:27:36
|
Line 53 package Apache::inputtags;
|
Line 53 package Apache::inputtags;
|
use HTML::Entities(); |
use HTML::Entities(); |
use strict; |
use strict; |
use Apache::loncommon; |
use Apache::loncommon; |
use Apache::lonhtmlcommon; |
|
use Apache::lonlocal; |
use Apache::lonlocal; |
use Apache::lonnet; |
use Apache::lonnet; |
use LONCAPA; |
use LONCAPA; |
Line 480 sub file_selector {
|
Line 479 sub file_selector {
|
$jspart=~s/\./_/g; |
$jspart=~s/\./_/g; |
|
|
my $result; |
my $result; |
my $current_files_display = ¤t_file_submissions($part,$id); |
|
my $addfiles; |
$result.='<tr><td>'; |
if ($current_files_display) { |
if (($uploadedfiletypes ne '*') || ($maxfilesize)) { |
$result .= &Apache::lonhtmlcommon::row_title(&mt('Currently submitted files')). |
if ($uploadedfiletypes ne '*') { |
$current_files_display. |
$result.= |
&Apache::lonhtmlcommon::row_closure(); |
&mt('Allowed filetypes: [_1]','<b>'.$uploadedfiletypes.'</b>').'<br />'; |
$addfiles = &mt('Submit other file(s)'); |
} |
} else { |
if ($maxfilesize) { |
$addfiles = &mt('Choose file(s) to submit'); |
$result.=&mt('Combined size of files not to exceed: [_1] MB[_2].', |
} |
'<b>'.$maxfilesize.'</b>').'<br />'; |
$result .= &Apache::lonhtmlcommon::row_title($addfiles); |
} |
my $constraints; |
$result .= '<br />'; |
if ($uploadedfiletypes ne '*') { |
|
$constraints = |
|
&mt('Allowed filetypes: [_1]','<b>'.$uploadedfiletypes.'</b>').'<br />'; |
|
} |
|
if ($maxfilesize) { |
|
$constraints .= &mt('Combined size of all files not to exceed: [_1] MB[_2].', |
|
'<b>'.$maxfilesize.'</b>').'<br />'; |
|
} |
|
if ($constraints) { |
|
$result .= $constraints.'<br />'; |
|
} |
} |
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 can be uploaded)'). |
' <br /><input type="file" size="50" name="HWFILE'. |
' <br /><input type="file" size="50" name="HWFILE'. |
$jspart.'_'.$id.'" /><br />'; |
$jspart.'_'.$id.'" /><br />'; |
|
$result .= &show_past_file_submission($part,$id); |
} |
} |
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&fieldname='.$env{'form.request.prefix'}.'HWPORT'.$jspart.'_'.$id.'","cat","height=600,width=800,scrollbars=1,resizable=1,menubar=2,location=1"))'."'".'>'. |
$result.=$extratext.'<a href='."'".'javascript:void(window.open("/adm/portfolio?mode=selectfile&fieldname='.$env{'form.request.prefix'}.'HWPORT'.$jspart.'_'.$id.'","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').'</a><br />'. |
'<input type="text" size="50" name="HWPORT'.$jspart.'_'.$id.'" value="" />'. |
'<input type="text" size="50" name="HWPORT'.$jspart.'_'.$id.'" value="" />'. |
'<br />'; |
'<br />'; |
|
$result .= &show_past_portfile_submission($part,$id); |
} |
} |
$result.=&Apache::lonhtmlcommon::row_closure(1); |
$result.='</td></tr>'; |
return $result; |
return $result; |
} |
} |
|
|
sub current_file_submissions { |
sub show_past_file_submission { |
my ($part,$id) = @_; |
my ($part,$id) = @_; |
my $jspart=$part; |
my $uploadedfile= &HTML::Entities::encode($Apache::lonhomework::history{"resource.$part.$id.uploadedfile"},'<>&"'); |
$jspart=~s/\./_/g; |
|
my $uploadedfile=$Apache::lonhomework::history{"resource.$part.$id.uploadedfile"}; |
return if (!$uploadedfile); |
my $portfiles=$Apache::lonhomework::history{"resource.$part.$id.portfiles"}; |
|
return if (($uploadedfile eq '') && ($portfiles !~/[^\s]/)); |
my $url=$Apache::lonhomework::history{"resource.$part.$id.uploadedurl"}; |
my $header = &Apache::loncommon::start_data_table(). |
&Apache::lonxml::extlink($url); |
&Apache::loncommon::start_data_table_header_row(); |
&Apache::lonnet::allowuploaded('/adm/essayresponse',$url); |
if ($Apache::inputtags::status[-1] eq 'CAN_ANSWER') { |
my $icon=&Apache::loncommon::icon($url); |
$header .= '<th>'.&mt('Delete?').'</th>'; |
my $curfile='<a href="'.$url.'"><img src="'.$icon. |
} |
'" border="0" />'.$uploadedfile.'</a>'; |
$header .= '<th>'.&mt('File').'</th>'. |
return &mt('Currently submitted: [_1]','<tt>'.$curfile.'</tt>'); |
'<th>'.&mt('Size (MB)').'</th>'. |
|
'<th>'.&mt('Last Modified').'</th>'. |
} |
&Apache::loncommon::end_data_table_header_row(); |
|
my (undef,$crsid,$udom,$uname)=&Apache::lonnet::whichuser(); |
sub show_past_portfile_submission { |
my ($cdom,$cnum) = ($crsid =~ /^($LONCAPA::match_domain)_($LONCAPA::match_courseid)$/); |
my ($part,$id) = @_; |
my ($result,$header_shown,%okfiles,%rows,%legacy,@bad_file_list); |
if ($Apache::lonhomework::history{"resource.$part.$id.portfiles"}!~/[^\s]/){ |
if ($uploadedfile) { |
return; |
my $url=$Apache::lonhomework::history{"resource.$part.$id.uploadedurl"}; |
|
my $link = &HTML::Entities::encode($url,'<>&"'); |
|
my ($path,$name) = ($url =~ m{^(/uploaded/\Q$udom\E/\Q$uname\E/essayresponse.*/)([^/]+)$}); |
|
my ($status,$hashref,$error) = |
|
¤t_file_info($url,$link,$name,$path); |
|
if ($status eq 'ok') { |
|
push(@{$okfiles{$name}},$url); |
|
$rows{$url} = $hashref; |
|
$legacy{$url} = 1; |
|
&Apache::lonxml::extlink($url); |
|
&Apache::lonnet::allowuploaded('/adm/essayresponse',$url); |
|
} else { |
|
push(@bad_file_list,$error); |
|
} |
|
} |
|
if ($portfiles =~ /[^\s]/) { |
|
my $prefix = "/uploaded/$udom/$uname/portfolio"; |
|
foreach my $file (split(/\s*,\s*/,&unescape($portfiles))) { |
|
my ($path,$name) = ($file =~ m{^(.*/)([^/]+)$}); |
|
my $url = $prefix.$path.$name; |
|
my $uploadedfile = &HTML::Entities::encode($url,'<>&"'); |
|
my ($status,$hashref,$error) = |
|
¤t_file_info($url,$uploadedfile,$name,$path); |
|
if ($status eq 'ok') { |
|
push(@{$okfiles{$name}},$url); |
|
$rows{$url} = $hashref; |
|
} else { |
|
push(@bad_file_list,$error); |
|
} |
|
} |
|
} |
|
foreach my $name (sort(keys(%okfiles))) { |
|
if (ref($okfiles{$name}) eq 'ARRAY') { |
|
foreach my $url (@{$okfiles{$name}}) { |
|
if (ref($rows{$url}) eq 'HASH') { |
|
my $link = $rows{$url}{link}; |
|
my $portfile = $rows{$url}{path}.$rows{$url}{name}; |
|
$portfile = &HTML::Entities::encode($portfile,'<>&"'); |
|
if ($link) { |
|
my $icon=&Apache::loncommon::icon($url); |
|
unless ($header_shown) { |
|
$result .= $header; |
|
$header_shown = 1; |
|
} |
|
$result.= |
|
&Apache::loncommon::start_data_table_row()."\n"; |
|
if ($Apache::inputtags::status[-1] eq 'CAN_ANSWER') { |
|
$result .= |
|
'<td valign="bottom"><input type="checkbox" name="HWFILE'.$jspart.'_'.$id.'_delete"'. |
|
' value="'.$portfile.'" /></td>'."\n"; |
|
} |
|
my $showname = $rows{$url}{path}.$name; |
|
if ($legacy{$url}) { |
|
$showname = $name.' '.&mt('not in portfolio'); |
|
} |
|
if ($env{'request.uri'} eq '/res/gci/gci/internal/submission.problem') { |
|
$showname = $name; |
|
} |
|
$result .= |
|
'<td><a href="'.$link.'"><img src="'.$icon. |
|
'" border="0" />'.$showname.'</a></td>'."\n". |
|
'<td align="right" valign="bottom">'.$rows{$url}{size}.'</td>'."\n". |
|
'<td align="right" valign="bottom">'.$rows{$url}{lastmodified}.'</td>'."\n". |
|
&Apache::loncommon::end_data_table_row(); |
|
} |
|
} |
|
} |
|
} |
|
} |
|
if ($header_shown) { |
|
$result .= &Apache::loncommon::end_data_table(); |
|
} |
} |
|
my (@file_list,@bad_file_list); |
|
foreach my $file (split(/\s*,\s*/,&unescape($Apache::lonhomework::history{"resource.$part.$id.portfiles"}))) { |
|
my (undef,undef,$domain,$user)=&Apache::lonnet::whichuser(); |
|
my $url="/uploaded/$domain/$user/portfolio$file"; |
|
my $icon=&Apache::loncommon::icon($url); |
|
push(@file_list,'<a href="'.$url.'"><img src="'.$icon. |
|
'" border="0" />'.$file.'</a>'); |
|
if (! &Apache::lonnet::stat_file($url)) { |
|
&Apache::lonnet::logthis("bad file is $url"); |
|
push(@bad_file_list,'<a href="'.$url.'"><img src="'.$icon. |
|
'" border="0" />'.$file.'</a>'); |
|
} |
|
} |
|
my $files = '<span class="LC_filename">'. |
|
join('</span>, <span class="LC_filename">',@file_list). |
|
'</span>'; |
|
my $result = &mt("Portfolio files previously selected: [_1]",$files); |
if (@bad_file_list) { |
if (@bad_file_list) { |
my $bad_files = '<span class="LC_filename">'. |
my $bad_files = '<span class="LC_filename">'. |
join('</span>, <span class="LC_filename">',@bad_file_list). |
join('</span>, <span class="LC_filename">',@bad_file_list). |
'</span>'; |
'</span>'; |
$result.='<p class="LC_error">'. |
$result.='<p><span class="LC_error">' |
&mt("These file(s) don't exist: [_1]",$bad_files). |
.&mt("These file(s) don't exist: [_1]",$bad_files) |
'</p>'; |
.'</span></p>'; |
} |
} |
return $result; |
return $result; |
} |
|
|
|
sub current_file_info { |
|
my ($url,$uploadedfile,$name,$path) = @_; |
|
my ($status,$error,%info); |
|
my @stat = &Apache::lonnet::stat_file($url); |
|
if ((@stat) && ($stat[0] ne 'no_such_dir')) { |
|
my ($lastmod,$size); |
|
if ($stat[9] =~ /^\d+$/) { |
|
$lastmod = &Apache::lonlocal::locallocaltime($stat[9]); |
|
} |
|
$size = $stat[7]/(1024*1024); |
|
$size = sprintf("%.3f",$size); |
|
%info = ( |
|
link => $uploadedfile, |
|
name => $name, |
|
path => $path, |
|
size => $size, |
|
lastmodified => $lastmod, |
|
); |
|
$status = 'ok'; |
|
} else { |
|
&Apache::lonnet::logthis("bad file is $url"); |
|
my $icon=&Apache::loncommon::icon($url); |
|
$error = '<a href="'.$url.'"><img src="'.$icon. |
|
'" border="0" />'.$uploadedfile.'</a>'; |
|
} |
|
return ($status,\%info,$error); |
|
} |
} |
|
|
sub valid_award { |
sub valid_award { |
Line 663 sub valid_award {
|
Line 572 sub valid_award {
|
'UNIT_NOTNEEDED', 'WANTED_NUMERIC', |
'UNIT_NOTNEEDED', 'WANTED_NUMERIC', |
'BAD_FORMULA', 'INTERNAL_ERROR', 'SIG_FAIL', 'INCORRECT', |
'BAD_FORMULA', 'INTERNAL_ERROR', 'SIG_FAIL', 'INCORRECT', |
'MISORDERED_RANK', 'INVALID_FILETYPE', |
'MISORDERED_RANK', 'INVALID_FILETYPE', |
'EXCESS_FILESIZE', 'FILENAME_INUSE', |
'EXCESS_FILESIZE', 'DRAFT', |
'DRAFT', 'SUBMITTED', 'ASSIGNED_SCORE', |
'SUBMITTED', 'SUBMITTED_CREDIT', |
'APPROX_ANS', 'EXACT_ANS','COMMA_FAIL') { |
'ANONYMOUS', 'ANONYMOUS_CREDIT', |
|
'ASSIGNED_SCORE', 'APPROX_ANS', |
|
'EXACT_ANS','COMMA_FAIL') { |
if ($award eq $possibleaward) { return 1; } |
if ($award eq $possibleaward) { return 1; } |
} |
} |
return 0; |
return 0; |
Line 678 sub valid_award {
|
Line 589 sub valid_award {
|
'UNIT_IRRECONCIBLE', 'UNIT_FAIL', 'NO_UNIT', |
'UNIT_IRRECONCIBLE', 'UNIT_FAIL', 'NO_UNIT', |
'UNIT_NOTNEEDED', 'WANTED_NUMERIC', 'BAD_FORMULA', 'INTERNAL_ERROR', |
'UNIT_NOTNEEDED', 'WANTED_NUMERIC', 'BAD_FORMULA', 'INTERNAL_ERROR', |
'COMMA_FAIL', 'SIG_FAIL', 'INCORRECT', 'MISORDERED_RANK', |
'COMMA_FAIL', 'SIG_FAIL', 'INCORRECT', 'MISORDERED_RANK', |
'INVALID_FILETYPE', 'EXCESS_FILESIZE', 'FILENAME_INUSE', |
'INVALID_FILETYPE', 'EXCESS_FILESIZE', 'DRAFT', 'SUBMITTED', |
'DRAFT', 'SUBMITTED', |
'SUBMITTED_CREDIT', 'ANONYMOUS', 'ANONYMOUS_CREDIT', |
'ASSIGNED_SCORE', 'APPROX_ANS', 'EXACT_ANS'); |
'ASSIGNED_SCORE', 'APPROX_ANS', 'EXACT_ANS'); |
my $i=0; |
my $i=0; |
my %fwd_awards = map { ($_,$i++) } @awards; |
my %fwd_awards = map { ($_,$i++) } @awards; |
Line 703 sub hide_award {
|
Line 614 sub hide_award {
|
return 1; |
return 1; |
} |
} |
if ($award =~ |
if ($award =~ |
/^(?:EXACT_ANS|APPROX_ANS|SUBMITTED|ASSIGNED_SCORE|INCORRECT)/) { |
/^(?:EXACT_ANS|APPROX_ANS|SUBMITTED|SUBMITTED_CREDIT|ANONYMOUS|ANONYMOUS_CREDIT|ASSIGNED_SCORE|INCORRECT)/) { |
return 1; |
return 1; |
} |
} |
return 0; |
return 0; |
Line 909 sub decideoutput {
|
Line 820 sub decideoutput {
|
$message = &mt('Submission won\'t be graded. The combined size of submitted files exceeded the amount allowed.'); |
$message = &mt('Submission won\'t be graded. The combined size of submitted files exceeded the amount allowed.'); |
$css_class=$possible_class{'not_charged_try'}; |
$css_class=$possible_class{'not_charged_try'}; |
$button=1; |
$button=1; |
} elsif ($award eq 'FILENAME_INUSE') { |
|
$message = &mt('You have already uploaded a file with that filename.'); |
|
if ($target eq 'tex') { |
|
$message.= "\\\\\n"; |
|
} else { |
|
$message .= '<br />'; |
|
} |
|
$message .= &mt('Please use a different file name.'); |
|
$css_class=$possible_class{'not_charged_try'}; |
|
$button=1; |
|
} elsif ($award eq 'INVALID_FILETYPE') { |
} elsif ($award eq 'INVALID_FILETYPE') { |
$message = &mt("Submission won't be graded. The type of file submitted is not allowed."); |
$message = &mt("Submission won't be graded. The type of file submitted is not allowed."); |
$css_class=$possible_class{'not_charged_try'}; |
$css_class=$possible_class{'not_charged_try'}; |
Line 971 sub decideoutput {
|
Line 872 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.'); |
|
} |
|
} else { |
|
$message = &mt("Your submission has been recorded."); |
|
} |
|
$css_class=$possible_class{'no_grade'}; |
$css_class=$possible_class{'no_grade'}; |
$button=1; |
$button=1; |
|
} elsif ($award eq 'SUBMITTED_CREDIT') { |
|
$message = &mt("Your submission has been recorded, and credit awarded."); |
|
$css_class=$possible_class{'correct'}; |
|
$button=1; |
|
} elsif ($award eq 'ANONYMOUS') { |
|
$message = &mt("Your anonymous submission has been recorded."); |
|
$css_class=$possible_class{'no_grade'}; |
|
$button=1; |
|
} elsif ($award eq 'ANONYMOUS_CREDIT') { |
|
$message = &mt("Your anonymous submission has been recorded, and credit awarded."); |
|
$css_class=$possible_class{'correct'}; |
} 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 1030 sub decideoutput {
|
Line 936 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') { |
|
$message = &mt("Your submission has been recorded.").'<br />'. |
|
&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'}; |
$css_class=$possible_class{'no_grade'}; |
$button=1; |
$button=1; |
} |
} |
Line 1150 sub setgradedata {
|
Line 1049 sub setgradedata {
|
$Apache::lonhomework::results{"resource.$id.solved"} = |
$Apache::lonhomework::results{"resource.$id.solved"} = |
$solvemsg; |
$solvemsg; |
$Apache::lonhomework::results{"resource.$id.awarded"} = '1'; |
$Apache::lonhomework::results{"resource.$id.awarded"} = '1'; |
|
} elsif ( $award eq 'SUBMITTED_CREDIT' ) { |
|
$Apache::lonhomework::results{"resource.$id.tries"} = |
|
$Apache::lonhomework::history{"resource.$id.tries"} + 1; |
|
$Apache::lonhomework::results{"resource.$id.solved"} = |
|
'credit_attempted'; |
|
$Apache::lonhomework::results{"resource.$id.awarded"} = '1'; |
|
} elsif ( $award eq 'ANONYMOUS_CREDIT' ) { |
|
$Apache::lonhomework::results{"resource.$id.tries"} = |
|
$Apache::lonhomework::history{"resource.$id.tries"} + 1; |
|
$Apache::lonhomework::results{"resource.$id.solved"} = |
|
'credit_attempted'; |
|
$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"} = |
$Apache::lonhomework::history{"resource.$id.tries"} + 1; |
$Apache::lonhomework::history{"resource.$id.tries"} + 1; |
Line 1164 sub setgradedata {
|
Line 1075 sub setgradedata {
|
$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"} = |
'ungraded_attempted'; |
'ungraded_attempted'; |
|
} elsif ( $award eq 'ANONYMOUS' ) { |
|
$Apache::lonhomework::results{"resource.$id.tries"} = |
|
$Apache::lonhomework::history{"resource.$id.tries"} + 1; |
|
$Apache::lonhomework::results{"resource.$id.solved"} = |
|
'ungraded_attempted'; |
} 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' ) { |
Line 1223 sub setgradedata {
|
Line 1139 sub setgradedata {
|
if ($award eq 'SUBMITTED') { |
if ($award eq 'SUBMITTED') { |
&Apache::response::add_to_gradingqueue(); |
&Apache::response::add_to_gradingqueue(); |
} |
} |
|
if (($Apache::lonhomework::type eq 'anonsurvey') || |
|
($Apache::lonhomework::type eq 'anonsurveycred')) { |
|
$Apache::lonhomework::results{"resource.$id.type"} = $Apache::lonhomework::type; |
|
} |
} |
} |
|
|
sub find_which_previous { |
sub find_which_previous { |
Line 1337 sub get_grade_messages {
|
Line 1257 sub get_grade_messages {
|
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' || |
if ( $Apache::lonhomework::type eq 'survey' || |
|
$Apache::lonhomework::type eq 'surveycred' || |
|
$Apache::lonhomework::type eq 'anonsurvey' || |
|
$Apache::lonhomework::type eq 'anonsurveycred' || |
$Apache::lonhomework::parsing_a_task) { |
$Apache::lonhomework::parsing_a_task) { |
$tries_text=&mt('Submissions'); |
$tries_text=&mt('Submissions'); |
} |
} |
Line 1352 sub get_grade_messages {
|
Line 1275 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 1407 sub gradestatus {
|
Line 1326 sub gradestatus {
|
} |
} |
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 onmouseup="javascript:setSubmittedPart(\''.$id.'\')" |
'<input onmouseup="javascript:setSubmittedPart(\''.$id.'\')" |
type="submit" name="submit_'.$id.'" |
type="submit" name="submit_'.$id.'" |
value="'.$submit_text.'" />'; |
value="'.&mt('Submit Answer').'" />'; |
} |
} |
} |
} |
|
|
Line 1510 sub previous_tries {
|
Line 1425 sub previous_tries {
|
$output.='<br /><form action=""><center><input type="button" name="close" value="'.&mt('Close Window').'" onClick="window.close()" /></center></form>'; |
$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 $windowopen=&Apache::lonhtmlcommon::javascript_docopen(); |
my $pagetitle = 'Previous Tries'; |
|
if ($env{'request.uri'} eq '/res/gci/gci/internal/submission.problem') { |
|
$pagetitle = 'Submission History'; |
|
} |
|
my $start_page = |
my $start_page = |
&Apache::loncommon::start_page($pagetitle, undef, |
&Apache::loncommon::start_page('Previous Tries', undef, |
{'only_body' => 1, |
{'only_body' => 1, |
'bgcolor' => '#FFFFFF', |
'bgcolor' => '#FFFFFF', |
'js_ready' => 1, |
'js_ready' => 1, |
Line 1526 sub previous_tries {
|
Line 1437 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; |