--- loncom/homework/inputtags.pm 2017/06/21 19:55:00 1.333.2.4.4.1
+++ loncom/homework/inputtags.pm 2016/04/02 04:30:39 1.340
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# input definitons
#
-# $Id: inputtags.pm,v 1.333.2.4.4.1 2017/06/21 19:55:00 raeburn Exp $
+# $Id: inputtags.pm,v 1.340 2016/04/02 04:30:39 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -646,7 +646,7 @@ sub file_selector {
my $current_files_display = ¤t_file_submissions($part,$id);
my $addfiles;
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.
&Apache::lonhtmlcommon::row_closure();
$addfiles = &mt('Submit other file(s)');
@@ -667,10 +667,12 @@ sub file_selector {
$result .= $constraints.'
';
}
if ($which eq 'uploadonly' || $which eq 'both') {
- $result.=&mt('Submit a file: (only one file per submission)').
- '
';
- }
+ my $free_space = $maxfilesize * 1048576;
+ $result .= &mt('Submit a file: (only one file per submission)').
+ '
'.
+ '
'
+ }
if ( $which eq 'both') {
$result.='
'.''.&mt('OR:').'
';
}
@@ -704,6 +706,15 @@ sub current_file_submissions {
my $uploadedfile=$Apache::lonhomework::history{"resource.$part.$id.uploadedfile"};
my $portfiles=$Apache::lonhomework::history{"resource.$part.$id.portfiles"};
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().
&Apache::loncommon::start_data_table().
&Apache::loncommon::start_data_table_header_row();
@@ -714,7 +725,7 @@ sub current_file_submissions {
'
'.&mt('Size (MB)').' | '.
''.&mt('Last Modified').' | '.
&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 ($result,$header_shown,%okfiles,%rows,%legacy,@bad_file_list);
if ($uploadedfile) {
@@ -733,9 +744,9 @@ sub current_file_submissions {
push(@bad_file_list,$error);
}
}
- if ($portfiles =~ /[^\s]/) {
+ if (@unversioned > 0) {
my $prefix = "/uploaded/$udom/$uname/portfolio";
- foreach my $file (split(/\s*,\s*/,&unescape($portfiles))) {
+ foreach my $file (@unversioned) {
my ($path,$name) = ($file =~ m{^(.*/)([^/]+)$});
my $url = $prefix.$path.$name;
my $uploadedfile = &HTML::Entities::encode($url,'<>&"');
@@ -1048,7 +1059,7 @@ sub decideoutput {
#
my $computer = ($handgrade || $nocorrect)? ''
- : &mt("Computer's answer now shown above.");
+ : " ".&mt("Computer's answer now shown above.");
&Apache::lonxml::debug("handgrade has :$handgrade:");
if ($previous) { $previousmsg=&mt('You have entered that answer before'); }
@@ -1072,9 +1083,7 @@ sub decideoutput {
$message = '\textbf{'.$message.'}';
} else {
$message = "".$message."";
- if ($computer) {
- $message = "$computer $message";
- }
+ $message.= $computer;
}
$added_computer_text=1;
if ($awarded > 0) {
@@ -1118,9 +1127,7 @@ sub decideoutput {
$message = '\textbf{'.&mt('You are correct.').'}';
} else {
$message = "".&mt('You are correct.')."";
- if ($computer) {
- $message = "$computer $message";
- }
+ $message.= $computer;
}
$added_computer_text=1;
if ($awarded > 0
@@ -1318,24 +1325,28 @@ sub decideoutput {
&& &hide_award($award)) {
$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]) {
+ 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");
- my ($timelimit) = ($interval[0] =~ /^(\d+)/);
- unless (($due_date) && ($due_date < $first_access + $timelimit)) {
+ 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'};
$button=1;
+ if ($env{'course.'.$env{'request.course.id'}.'.type'} eq 'Placement') {
+ if ($Apache::inputtags::status[-1] eq 'CANNOT_ANSWER') {
+ $message = 'Answer Submitted';
+ } else {
+ undef($message);
+ }
+ }
}
if ($Apache::inputtags::status[-1] eq 'SHOW_ANSWER' &&
!$added_computer_text && $target ne 'tex') {
- if ($computer) {
- $message = "$computer $message";
- }
+ $message.= $computer;
$added_computer_text=1;
}
if ($Apache::lonhomework::type eq 'practice') {
@@ -1632,7 +1643,11 @@ sub get_grade_messages {
if ($target eq 'tex') {
$message='\vskip 2 mm '.$message.' ';
} else {
- $message="$message | ";
+ if ($message) {
+ $message="$message | ";
+ } else {
+ $message=" | ";
+ }
if ($previousmsg) {
$previousmsg="$previousmsg | ";
}
@@ -1702,7 +1717,8 @@ sub gradestatus {
&& $status ne 'NOT_IN_A_SLOT'
&& $status ne 'RESERVABLE'
&& $status ne 'RESERVABLE_LATER'
- && $status ne 'NOTRESERVABLE') {
+ && $status ne 'NOTRESERVABLE'
+ && $status ne 'NEED_DIFFERENT_IP') {
if ($status eq 'SHOW_ANSWER') {
$showbutton = 0;
@@ -1735,7 +1751,11 @@ sub gradestatus {
}
}
- my $output= $previousmsg.$latemessage.$message.$trystr;
+ my $output= $previousmsg.$latemessage.$message;
+ my $crstype = $env{'course.'.$env{'request.course.id'}.'.type'};
+ unless ($crstype eq 'Placement') {
+ $output .= $trystr;
+ }
if ($output =~ /^\s*$/) {
return $button;
} else {
@@ -1744,7 +1764,7 @@ sub gradestatus {
} else {
$output =
''.$button.' | '.$output;
- if (!$no_previous) {
+ if ((!$no_previous) && ($crstype ne 'Placement')) {
$output.=''.&previous_tries($id,$target).' | ';
}
$output.= '
';