--- loncom/homework/inputtags.pm 2023/09/11 12:09:06 1.333.2.12.2.4
+++ loncom/homework/inputtags.pm 2015/10/30 11:21:19 1.339
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# input definitons
#
-# $Id: inputtags.pm,v 1.333.2.12.2.4 2023/09/11 12:09:06 raeburn Exp $
+# $Id: inputtags.pm,v 1.339 2015/10/30 11:21:19 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,10 +457,6 @@ 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;
@@ -474,14 +469,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')) ||
- (($tagstack->[-2] eq 'customresponse') &&
- (&Apache::lonnet::EXT('resource.'.$partid.'_'.$id.'.turnoffeditor') eq 'no')))) {
+ (($tagstack->[-2] eq 'formularesponse') || ($tagstack->[-2] eq 'mathresponse')) &&
+ (&Apache::lonnet::EXT('resource.'.$partid.'_'.$id.'.turnoffeditor') ne 'yes')) {
$result.=&edit_mathresponse_button($input_tag_id);
}
}
@@ -653,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)');
@@ -673,14 +666,13 @@ sub file_selector {
if ($constraints) {
$result .= $constraints.'
';
}
- if ($which eq 'uploadonly' || $which eq 'both') {
+ if ($which eq 'uploadonly' || $which eq 'both') {
my $free_space = $maxfilesize * 1048576;
$result .= &mt('Submit a file: (only one file per submission)').
'
'.
- '
';
- }
+ '" id="HWFILE'.$jspart.'_'.$id.'" class="flUpload" />
'.
+ '
'
+ }
if ( $which eq 'both') {
$result.='
'.''.&mt('OR:').'
';
}
@@ -701,6 +693,7 @@ sub file_selector {
&mt('Select Portfolio Files: (one or more files per submission)').'
'.
''.
'
';
+
}
$result.=&Apache::lonhtmlcommon::row_closure(1);
return $result;
@@ -713,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();
@@ -723,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) {
@@ -742,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,'<>&"');
@@ -1044,7 +1046,6 @@ sub decideoutput {
'not_charged_try' => 'LC_answer_not_charged_try',
'no_grade' => 'LC_answer_no_grade',
'no_message' => 'LC_no_message',
- 'no_charge_warn' => 'LC_answer_warning',
);
my $part = $Apache::inputtags::part;
@@ -1058,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'); }
@@ -1082,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) {
@@ -1128,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
@@ -1159,11 +1156,7 @@ sub decideoutput {
if ($target ne 'tex') {
$message .= &Apache::loncommon::help_open_topic('Some_Items_Were_Not_Submitted');
}
- if (&Apache::lonhomework::show_some_problem_status()) {
- $css_class=$possible_class{'no_charge_warn'};
- } else {
- $css_class=$possible_class{'not_charged_try'};
- }
+ $css_class=$possible_class{'not_charged_try'};
$button = 1;
} elsif ($award eq 'WRONG_NUMBOXESCHECKED') {
$message = &mt('Number of boxes checked outside permissible range (either too few or too many).');
@@ -1212,12 +1205,8 @@ sub decideoutput {
} elsif ($award eq 'SIG_FAIL') {
my ($used,$min,$max)=split(':',$awardmsg);
my $word = ($used < $min) ? 'more' : 'fewer';
- $message = &mt("Submission not graded. Use $word significant figures.");
- if (&Apache::lonhomework::show_some_problem_status()) {
- $css_class=$possible_class{'no_charge_warn'};
- } else {
- $css_class=$possible_class{'not_charged_try'};
- }
+ $message = &mt("Submission not graded. Use $word digits.",$used);
+ $css_class=$possible_class{'not_charged_try'};
$button=1;
} elsif ($award eq 'UNIT_INVALID_INSTRUCTOR') {
$message = &mt('Error in instructor specifed unit. This error has been reported to the instructor.', $awardmsg);
@@ -1227,37 +1216,21 @@ sub decideoutput {
} elsif ($award eq 'UNIT_INVALID_STUDENT') {
$message = &mt('Unable to interpret units. Computer reads units as "[_1]".',&markup_unit($awardmsg,$target));
if ($target ne 'tex') {$message.=&Apache::loncommon::help_open_topic('Physical_Units');}
- if (&Apache::lonhomework::show_some_problem_status()) {
- $css_class=$possible_class{'no_charge_warn'};
- } else {
- $css_class=$possible_class{'not_charged_try'};
- }
+ $css_class=$possible_class{'not_charged_try'};
$button=1;
} elsif ($award eq 'UNIT_FAIL' || $award eq 'UNIT_IRRECONCIBLE') {
$message = &mt('Incompatible units. No conversion found between "[_1]" and the required units.',&markup_unit($awardmsg,$target));
if ($target ne 'tex') {$message.=&Apache::loncommon::help_open_topic('Physical_Units');}
- if (&Apache::lonhomework::show_some_problem_status()) {
- $css_class=$possible_class{'no_charge_warn'};
- } else {
- $css_class=$possible_class{'not_charged_try'};
- }
+ $css_class=$possible_class{'not_charged_try'};
$button=1;
} elsif ($award eq 'UNIT_NOTNEEDED') {
$message = &mt('Only a number required. Computer reads units of "[_1]".',&markup_unit($awardmsg,$target));
- if (&Apache::lonhomework::show_some_problem_status()) {
- $css_class=$possible_class{'no_charge_warn'};
- } else {
- $css_class=$possible_class{'not_charged_try'};
- }
+ $css_class=$possible_class{'not_charged_try'};
$button=1;
} elsif ($award eq 'NO_UNIT') {
$message = &mt("Units required").'.';
if ($target ne 'tex') {$message.=&Apache::loncommon::help_open_topic('Physical_Units')};
- if (&Apache::lonhomework::show_some_problem_status()) {
- $css_class=$possible_class{'no_charge_warn'};
- } else {
- $css_class=$possible_class{'not_charged_try'};
- }
+ $css_class=$possible_class{'not_charged_try'};
$button=1;
} elsif ($award eq 'COMMA_FAIL') {
$message = &mt("Proper comma separation is required").'.';
@@ -1356,8 +1329,7 @@ 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");
- 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.");
}
}
@@ -1367,9 +1339,7 @@ sub decideoutput {
}
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') {
@@ -1736,7 +1706,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;
@@ -1759,17 +1730,12 @@ sub gradestatus {
}
if ( $showbutton ) {
if ($target ne 'tex') {
- if ($env{'form.disable_submit'}) {
- $button = ' '.
- '';
- } else {
- $button =
+ $button =
' '.
''.
&mt('Processing your submission ...').'
';
- }
}
}
@@ -1911,16 +1877,9 @@ 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;
- if (($env{'request.state'} eq 'construct') || ($id =~ /\W/)) {
- $function_name .= $Apache::lonxml::curdepth;
- } else {
- $function_name .= $id;
- }
- $function_name .= '_'.$Apache::lonxml::counter;
- my $possmathjax = 1;
- my $result = &Apache::loncommon::modal_adhoc_window($function_name,420,410,$output,
- &mt($tries_text),$possmathjax)."
";
+ my $function_name = "LONCAPA_previous_tries_".$prefix.
+ $Apache::lonxml::curdepth.'_'.$env{'form.counter'};
+ my $result = &Apache::loncommon::modal_adhoc_window($function_name,420,410,$output,&mt($tries_text))."
";
return $result;
}