version 1.327, 2014/11/07 22:00:17
|
version 1.331, 2015/03/10 23:11:22
|
Line 464 sub start_textline {
|
Line 464 sub start_textline {
|
$name = "none"; |
$name = "none"; |
} |
} |
$result.= '<input onkeydown="javascript:setSubmittedPart(\''.$partid.'\');"' |
$result.= '<input onkeydown="javascript:setSubmittedPart(\''.$partid.'\');"' |
. ' type="text" ' |
. ' onfocus="javascript:disableAutoComplete(\''.$itemid.'\');"' |
. $readonly.' name="'. $name . '"' |
. ' type="text" '.$readonly.' name="'. $name . '"' |
. ' id="' . $itemid . '"' |
. ' id="' . $itemid . '"' |
. ' value="'. $oldresponse.'"' |
. ' value="'. $oldresponse.'"' |
. ' class="LC_textline spellchecked" size="'.$size.'"'.$maxlength |
. ' class="LC_textline spellchecked" size="'.$size.'"'.$maxlength.' />'; |
. ' autocomplete="off" />'; |
|
|
|
$result .= &spellcheck_onblur($itemid, $spellcheck); |
$result .= &spellcheck_onblur($itemid, $spellcheck); |
} |
} |
Line 641 sub file_selector {
|
Line 640 sub file_selector {
|
my $current_files_display = ¤t_file_submissions($part,$id); |
my $current_files_display = ¤t_file_submissions($part,$id); |
my $addfiles; |
my $addfiles; |
if ($current_files_display) { |
if ($current_files_display) { |
$result .= &Apache::lonhtmlcommon::row_title(&mt('Currently submitted files')). |
$result .= &Apache::lonhtmlcommon::row_title(&mt('Files currently selected for submission')). |
$current_files_display. |
$current_files_display. |
&Apache::lonhtmlcommon::row_closure(); |
&Apache::lonhtmlcommon::row_closure(); |
$addfiles = &mt('Submit other file(s)'); |
$addfiles = &mt('Submit other file(s)'); |
Line 699 sub current_file_submissions {
|
Line 698 sub current_file_submissions {
|
my $uploadedfile=$Apache::lonhomework::history{"resource.$part.$id.uploadedfile"}; |
my $uploadedfile=$Apache::lonhomework::history{"resource.$part.$id.uploadedfile"}; |
my $portfiles=$Apache::lonhomework::history{"resource.$part.$id.portfiles"}; |
my $portfiles=$Apache::lonhomework::history{"resource.$part.$id.portfiles"}; |
return if (($uploadedfile eq '') && ($portfiles !~/[^\s]/)); |
return if (($uploadedfile eq '') && ($portfiles !~/[^\s]/)); |
|
my @unversioned; |
|
foreach my $file (split(/\s*,\s*/,&unescape($portfiles))) { |
|
my ($path,$name) = ($file =~ m{^(.*/)([^/]+)$}); |
|
my ($origname,$version,$ext) = &Apache::lonnet::file_name_version_ext($name); |
|
unless ($version) { |
|
push(@unversioned,$file); |
|
} |
|
} |
|
return if (!@unversioned); |
my $header = &portpath_popup_js(). |
my $header = &portpath_popup_js(). |
&Apache::loncommon::start_data_table(). |
&Apache::loncommon::start_data_table(). |
&Apache::loncommon::start_data_table_header_row(); |
&Apache::loncommon::start_data_table_header_row(); |
Line 709 sub current_file_submissions {
|
Line 717 sub current_file_submissions {
|
'<th>'.&mt('Size (MB)').'</th>'. |
'<th>'.&mt('Size (MB)').'</th>'. |
'<th>'.&mt('Last Modified').'</th>'. |
'<th>'.&mt('Last Modified').'</th>'. |
&Apache::loncommon::end_data_table_header_row(); |
&Apache::loncommon::end_data_table_header_row(); |
my (undef,$crsid,$udom,$uname)=&Apache::lonnet::whichuser(); |
my ($symb,$crsid,$udom,$uname)=&Apache::lonnet::whichuser(); |
my ($cdom,$cnum) = ($crsid =~ /^($LONCAPA::match_domain)_($LONCAPA::match_courseid)$/); |
my ($cdom,$cnum) = ($crsid =~ /^($LONCAPA::match_domain)_($LONCAPA::match_courseid)$/); |
my ($result,$header_shown,%okfiles,%rows,%legacy,@bad_file_list); |
my ($result,$header_shown,%okfiles,%rows,%legacy,@bad_file_list); |
if ($uploadedfile) { |
if ($uploadedfile) { |
Line 728 sub current_file_submissions {
|
Line 736 sub current_file_submissions {
|
push(@bad_file_list,$error); |
push(@bad_file_list,$error); |
} |
} |
} |
} |
if ($portfiles =~ /[^\s]/) { |
if (@unversioned > 0) { |
my $prefix = "/uploaded/$udom/$uname/portfolio"; |
my $prefix = "/uploaded/$udom/$uname/portfolio"; |
foreach my $file (split(/\s*,\s*/,&unescape($portfiles))) { |
foreach my $file (@unversioned) { |
my ($path,$name) = ($file =~ m{^(.*/)([^/]+)$}); |
my ($path,$name) = ($file =~ m{^(.*/)([^/]+)$}); |
my $url = $prefix.$path.$name; |
my $url = $prefix.$path.$name; |
my $uploadedfile = &HTML::Entities::encode($url,'<>&"'); |
my $uploadedfile = &HTML::Entities::encode($url,'<>&"'); |
Line 878 END
|
Line 886 END
|
sub valid_award { |
sub valid_award { |
my ($award) =@_; |
my ($award) =@_; |
foreach my $possibleaward ('EXTRA_ANSWER','MISSING_ANSWER', 'ERROR', |
foreach my $possibleaward ('EXTRA_ANSWER','MISSING_ANSWER', 'ERROR', |
'NO_RESPONSE', |
'NO_RESPONSE','WRONG_NUMBOXESCHECKED', |
'TOO_LONG', 'UNIT_INVALID_INSTRUCTOR', |
'TOO_LONG', 'UNIT_INVALID_INSTRUCTOR', |
'UNIT_INVALID_STUDENT', 'UNIT_IRRECONCIBLE', |
'UNIT_INVALID_STUDENT', 'UNIT_IRRECONCIBLE', |
'UNIT_FAIL', 'NO_UNIT', |
'UNIT_FAIL', 'NO_UNIT', |
Line 898 sub valid_award {
|
Line 906 sub valid_award {
|
|
|
{ |
{ |
my @awards = ('EXTRA_ANSWER', 'MISSING_ANSWER', 'ERROR', 'NO_RESPONSE', |
my @awards = ('EXTRA_ANSWER', 'MISSING_ANSWER', 'ERROR', 'NO_RESPONSE', |
'TOO_LONG', |
'WRONG_NUMCHECKEDBOXES','TOO_LONG', |
'UNIT_INVALID_INSTRUCTOR', 'UNIT_INVALID_STUDENT', |
'UNIT_INVALID_INSTRUCTOR', 'UNIT_INVALID_STUDENT', |
'UNIT_IRRECONCIBLE', 'UNIT_FAIL', 'NO_UNIT', |
'UNIT_IRRECONCIBLE', 'UNIT_FAIL', 'NO_UNIT', |
'UNIT_NOTNEEDED', 'WANTED_NUMERIC', 'BAD_FORMULA', 'NOT_FUNCTION', |
'UNIT_NOTNEEDED', 'WANTED_NUMERIC', 'BAD_FORMULA', 'NOT_FUNCTION', |
Line 1125 sub decideoutput {
|
Line 1133 sub decideoutput {
|
} |
} |
$css_class=$possible_class{'not_charged_try'}; |
$css_class=$possible_class{'not_charged_try'}; |
$button = 1; |
$button = 1; |
|
} elsif ($award eq 'WRONG_NUMBOXESCHECKED') { |
|
$message = &mt('Number of boxes checked outside permissible range (either too few or too many).'); |
|
if ($target ne 'tex') { |
|
$message .= &Apache::loncommon::help_open_topic('Wrong_Num_Boxes_Checked'); |
|
} |
|
$css_class=$possible_class{'not_charged_try'}; |
|
$button = 1; |
} elsif ($award eq 'ERROR') { |
} elsif ($award eq 'ERROR') { |
$message = &mt('An error occurred while grading your answer.'); |
$message = &mt('An error occurred while grading your answer.'); |
$css_class=$possible_class{'not_charged_try'}; |
$css_class=$possible_class{'not_charged_try'}; |
Line 1496 sub setgradedata {
|
Line 1511 sub setgradedata {
|
$Apache::lonhomework::results{"resource.$id.type"} = $Apache::lonhomework::type; |
$Apache::lonhomework::results{"resource.$id.type"} = $Apache::lonhomework::type; |
$Apache::lonhomework::results{"resource.$id.duedate"} = &Apache::lonnet::EXT("resource.$id.duedate"); |
$Apache::lonhomework::results{"resource.$id.duedate"} = &Apache::lonnet::EXT("resource.$id.duedate"); |
$Apache::lonhomework::results{"resource.$id.hinttries"} = &Apache::lonnet::EXT("resource.$id.hinttries"); |
$Apache::lonhomework::results{"resource.$id.hinttries"} = &Apache::lonnet::EXT("resource.$id.hinttries"); |
$Apache::lonhomework::results{"resourse.$id.version"} = &Apache::lonnet::usedversion(); |
$Apache::lonhomework::results{"resource.$id.version"} = &Apache::lonnet::usedversion(); |
|
$Apache::lonhomework::results{"resource.$id.maxtries"} = &Apache::lonnet::EXT("resource.$id.maxtries"); |
} |
} |
|
|
sub find_which_previous { |
sub find_which_previous { |