--- loncom/homework/inputtags.pm 2017/06/21 19:55:00 1.333.2.4.4.1
+++ loncom/homework/inputtags.pm 2019/08/11 17:11:00 1.349
@@ -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.349 2019/08/11 17:11:00 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -460,6 +460,7 @@ sub start_textline {
}
my $name = 'HWVAL_'.$id;
my $itemid = 'HWVAL_'.$partid.'_'.$id;
+ # NOTE: the input id should match the one given by defaut_homework input_id().
my $input_tag_id = $itemid.'_'.$input_id;
if ($Apache::inputtags::status[-1] eq 'CANNOT_ANSWER') {
$name = "none";
@@ -646,7 +647,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)');
@@ -666,10 +667,13 @@ sub file_selector {
if ($constraints) {
$result .= $constraints.'
';
}
- if ($which eq 'uploadonly' || $which eq 'both') {
- $result.=&mt('Submit a file: (only one file per submission)').
- '
';
+ if ($which eq 'uploadonly' || $which eq 'both') {
+ my $free_space = $maxfilesize * 1048576;
+ $result .= &mt('Submit a file: (only one file per submission)').
+ '
'.
+ '
';
}
if ( $which eq 'both') {
$result.='
'.''.&mt('OR:').'
';
@@ -691,7 +695,6 @@ sub file_selector {
&mt('Select Portfolio Files: (one or more files per submission)').'
'.
''.
'
';
-
}
$result.=&Apache::lonhtmlcommon::row_closure(1);
return $result;
@@ -704,6 +707,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 +726,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 +745,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,'<>&"');
@@ -1318,18 +1330,25 @@ 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 + $timelimit)) {
$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') {
@@ -1632,7 +1651,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 | ";
}
@@ -1669,7 +1692,13 @@ sub get_grade_messages {
$trial.="/".$Apache::inputtags::params{'maxtries'};
}
}
- $trystr = ''.&mt($tries_text.' [_1]',$trial).' | ';
+
+ unless (($env{'request.state'} ne "construct") &&
+ ($env{'course.'.$env{'request.course.id'}.'.type'} eq 'Placement') &&
+ (!$env{'request.role.adv'})) {
+ $trystr = ''.&mt($tries_text.' [_1]',$trial).'';
+ }
+ $trystr = ''.$trystr.' | ';
}
}
@@ -1702,7 +1731,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;
@@ -1744,7 +1774,9 @@ sub gradestatus {
} else {
$output =
''.$button.' | '.$output;
- if (!$no_previous) {
+ if ((!$no_previous) &&
+ (($env{'course.'.$env{'request.course.id'}.'.type'} ne 'Placement') ||
+ ($env{'request.role.adv'}))) {
$output.=''.&previous_tries($id,$target).' | ';
}
$output.= '
';
@@ -1872,8 +1904,13 @@ sub previous_tries {
my $tries_text = &get_tries_text('link');
my $prefix = $env{'form.request.prefix'};
$prefix =~ tr{.}{_};
- my $function_name = "LONCAPA_previous_tries_".$prefix.
- $Apache::lonxml::curdepth.'_'.$env{'form.counter'};
+ my $function_name = 'LONCAPA_previous_tries_'.$prefix;
+ if (($env{'request.state'} eq 'construct') || ($id =~ /[._]|[^\w\s\-]/)) {
+ $function_name .= $Apache::lonxml::curdepth;
+ } else {
+ $function_name .= &js_escape($id);
+ }
+ $function_name .= '_'.$Apache::lonxml::counter;
my $result = &Apache::loncommon::modal_adhoc_window($function_name,420,410,$output,&mt($tries_text))."
";
return $result;
}