--- loncom/homework/inputtags.pm 2023/09/11 13:44:18 1.333.2.14
+++ loncom/homework/inputtags.pm 2023/04/02 03:16:28 1.358
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# input definitons
#
-# $Id: inputtags.pm,v 1.333.2.14 2023/09/11 13:44:18 raeburn Exp $
+# $Id: inputtags.pm,v 1.358 2023/04/02 03:16:28 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -450,7 +450,6 @@ sub start_textline {
if ($addchars) {
$result.=&addchars('HWVAL_'.$id,$addchars);
}
- my $numrespclass;
my $readonly=&Apache::lonxml::get_param('readonly',$parstack,
$safeeval);
if (lc($readonly) eq 'yes'
@@ -458,13 +457,10 @@ sub start_textline {
$readonly=' readonly="readonly" ';
} else {
$readonly='';
- if (($Apache::inputtags::status['-1'] eq 'CAN_ANSWER') &&
- ($tagstack->[-2] eq 'numericalresponse')) {
- $numrespclass = ' LC_numresponse_text';
- }
}
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";
@@ -474,12 +470,12 @@ sub start_textline {
. ' type="text" '.$readonly.' name="'. $name . '"'
. ' id="' . $input_tag_id . '"'
. ' value="'. $oldresponse.'"'
- . ' class="LC_textline spellchecked'.$numrespclass.'" size="'.$size.'"'.$maxlength.' />';
+ . ' class="LC_textline spellchecked" size="'.$size.'"'.$maxlength.' />';
$result .= &spellcheck_onblur($itemid, $spellcheck);
if (($Apache::inputtags::status['-1'] eq 'CAN_ANSWER') &&
(((($tagstack->[-2] eq 'formularesponse') || ($tagstack->[-2] eq 'mathresponse')) &&
- (&Apache::lonnet::EXT('resource.'.$partid.'_'.$id.'.turnoffeditor') ne 'yes')) ||
+ (&Apache::lonnet::EXT('resource.'.$partid.'_'.$id.'.turnoffeditor') ne 'yes')) ||
(($tagstack->[-2] eq 'customresponse') &&
(&Apache::lonnet::EXT('resource.'.$partid.'_'.$id.'.turnoffeditor') eq 'no')))) {
$result.=&edit_mathresponse_button($input_tag_id);
@@ -653,7 +649,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)');
@@ -663,8 +659,13 @@ sub file_selector {
$result .= &Apache::lonhtmlcommon::row_title($addfiles);
my $constraints;
if ($uploadedfiletypes ne '*') {
+ my $showtypes = $uploadedfiletypes;
+ if ($showtypes =~ /,/) {
+ my $conjunc = &mt('or');
+ $showtypes =~ s/,([^,]+)$/ $conjunc $1/;
+ }
$constraints =
- &mt('Allowed filetypes: [_1]',''.$uploadedfiletypes.'').'
';
+ &mt('Allowed filetypes: [_1]',''.$showtypes.'').'
';
}
if ($maxfilesize) {
$constraints .= &mt('Combined size of all files not to exceed: [_1] MB.',
@@ -713,6 +714,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();
@@ -723,7 +733,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) {
@@ -742,9 +752,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,'<>&"');
@@ -1356,13 +1366,21 @@ sub decideoutput {
my $first_access=&Apache::lonnet::get_first_access($interval[1]);
if (defined($first_access)) {
my $due_date= &Apache::lonnet::EXT("resource.$part.duedate");
- unless (($due_date) && ($due_date < $first_access + $interval[0])) {
+ my ($timelimit) = ($interval[0] =~ /^(\d+)/);
+ 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') {
@@ -1665,7 +1683,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 +1724,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.' | ';
}
}
@@ -1735,7 +1763,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;
@@ -1758,12 +1787,17 @@ sub gradestatus {
}
if ( $showbutton ) {
if ($target ne 'tex') {
- $button =
+ if ($env{'form.disable_submit'}) {
+ $button = ' '.
+ '';
+ } else {
+ $button =
' '.
''.
&mt('Processing your submission ...').'
';
+ }
}
}
@@ -1777,7 +1811,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.= '
';