version 1.331, 2015/03/10 23:11:22
|
version 1.333.2.2, 2015/04/21 22:52:44
|
Line 640 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('Files currently selected for submission')). |
$result .= &Apache::lonhtmlcommon::row_title(&mt('Currently submitted files')). |
$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 698 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 717 sub current_file_submissions {
|
Line 708 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 ($symb,$crsid,$udom,$uname)=&Apache::lonnet::whichuser(); |
my (undef,$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 736 sub current_file_submissions {
|
Line 727 sub current_file_submissions {
|
push(@bad_file_list,$error); |
push(@bad_file_list,$error); |
} |
} |
} |
} |
if (@unversioned > 0) { |
if ($portfiles =~ /[^\s]/) { |
my $prefix = "/uploaded/$udom/$uname/portfolio"; |
my $prefix = "/uploaded/$udom/$uname/portfolio"; |
foreach my $file (@unversioned) { |
foreach my $file (split(/\s*,\s*/,&unescape($portfiles))) { |
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 906 sub valid_award {
|
Line 897 sub valid_award {
|
|
|
{ |
{ |
my @awards = ('EXTRA_ANSWER', 'MISSING_ANSWER', 'ERROR', 'NO_RESPONSE', |
my @awards = ('EXTRA_ANSWER', 'MISSING_ANSWER', 'ERROR', 'NO_RESPONSE', |
'WRONG_NUMCHECKEDBOXES','TOO_LONG', |
'WRONG_NUMBOXESCHECKED','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 996 sub finalizeawards {
|
Line 987 sub finalizeawards {
|
$j++; |
$j++; |
} |
} |
|
|
|
# if at least one response item is set to include lenient grading |
|
# and that item is partially correct then overall award reflects |
|
# that, unless an award for one of the other response items does |
|
# not fall within the basic awards for correct or incorrect. |
|
if ($Apache::inputtags::leniency) { |
|
if (($$awardref[$which] eq 'INCORRECT') |
|
&& (grep { $_ eq 'EXACT_ANS' || |
|
$_ eq 'APPROX_ANS' || |
|
$_ eq 'ASSIGNED_SCORE' } (@$awardref)) |
|
&& !((grep { $_ ne 'INCORRECT' && |
|
$_ ne 'EXACT_ANS' && |
|
$_ ne 'APPROX_ANS' && |
|
$_ ne 'ASSIGNED_SCORE' } (@$awardref)))) { |
|
return ('ASSIGNED_SCORE'); |
|
} |
|
} |
|
|
if (defined($which)) { |
if (defined($which)) { |
if (ref($nameref)) { |
if (ref($nameref)) { |
return ($$awardref[$which],$$msgref[$which],$$nameref[$which]); |
return ($$awardref[$which],$$msgref[$which],$$nameref[$which]); |
Line 1739 sub previous_tries {
|
Line 1747 sub previous_tries {
|
|
|
my $count; |
my $count; |
my %count_lookup; |
my %count_lookup; |
my $lastrndseed; |
my ($lastrndseed,$lasttype); |
my $numstamps = 0; |
my $numstamps = 0; |
|
|
foreach my $i (1..$Apache::lonhomework::history{'version'}) { |
foreach my $i (1..$Apache::lonhomework::history{'version'}) { |
my $prefix = $i.":resource.$id"; |
my $prefix = $i.":resource.$id"; |
my $is_anon; |
my $is_anon; |
|
my $curr_type = $Apache::lonhomework::history{"$prefix.type"}; |
if (defined($env{'form.grade_symb'})) { |
if (defined($env{'form.grade_symb'})) { |
if (($Apache::lonhomework::history{"$prefix.type"} eq 'anonsurvey') || |
if (($curr_type eq 'anonsurvey') || ($curr_type eq 'anonsurveycred')) { |
($Apache::lonhomework::history{"$prefix.type"} eq 'anonsurveycred')) { |
|
$is_anon = 1; |
$is_anon = 1; |
} |
} |
} |
} |
Line 1786 sub previous_tries {
|
Line 1794 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) && ($i > 1)) { |
if (($curr_rndseed ne '') && ($lastrndseed ne '')) { |
if ($curr_rndseed ne $lastrndseed) { |
if (($curr_rndseed ne $lastrndseed) && |
|
(($curr_type eq 'randomizetry') || ($lasttype eq 'randomizetry'))) { |
$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 1828 sub previous_tries {
|
Line 1837 sub previous_tries {
|
} |
} |
$output.=&Apache::loncommon::end_data_table_row()."\n"; |
$output.=&Apache::loncommon::end_data_table_row()."\n"; |
$lastrndseed = $curr_rndseed; |
$lastrndseed = $curr_rndseed; |
|
$lasttype = $curr_type; |
} |
} |
return if ($output eq ''); |
return if ($output eq ''); |
my $headers = '<tr>'. |
my $headers = '<tr>'. |