--- loncom/homework/inputtags.pm 2012/12/28 16:12:07 1.313
+++ loncom/homework/inputtags.pm 2015/03/10 23:11:22 1.331
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# input definitons
#
-# $Id: inputtags.pm,v 1.313 2012/12/28 16:12:07 raeburn Exp $
+# $Id: inputtags.pm,v 1.331 2015/03/10 23:11:22 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -216,7 +216,16 @@ sub start_textfield {
}
}
unless ($newvariation) {
- $oldresponse = $Apache::lonhomework::history{"resource.$partid.$resid.submission"};
+ if ((($env{'form.grade_username'} eq '') && ($env{'form.grade_domain'} eq '')) ||
+ (($env{'form.grade_username'} eq $env{'user.name'}) &&
+ ($env{'form.grade_domain'} eq $env{'user.domain'}))) {
+ $oldresponse = $Apache::lonhomework::history{"resource.$partid.$resid.submission"};
+ } elsif (($Apache::lonhomework::history{"resource.$partid.type"} eq 'anonsurvey') ||
+ ($Apache::lonhomework::history{"resource.$partid.type"} eq 'anonsurveycred')) {
+ $oldresponse = '* '.&mt('(only shown to submitter)').' *';
+ } else {
+ $oldresponse = $Apache::lonhomework::history{"resource.$partid.$resid.submission"};
+ }
}
if ($Apache::inputtags::status[-1] eq 'CAN_ANSWER') {
my $cols = &Apache::lonxml::get_param('cols',$parstack,$safeeval);
@@ -226,11 +235,16 @@ sub start_textfield {
my $addchars=&Apache::lonxml::get_param('addchars',$parstack,$safeeval);
$result='';
my $tagident = 'HWVAL_' . $resid;
+ my $itemid = 'HWVAL_'.$partid.'_'.$resid;
if ($addchars) {
$result.=&addchars($tagident, $addchars);
}
- my $textareaclass = 'class="LC_richDetectHtml spellchecked"';
- $result.= '";
- $result .= &spellcheck_onblur($tagident, $spellcheck);
+ $result .= &spellcheck_onblur($itemid, $spellcheck);
return $result;
}
} elsif ($target eq 'edit') {
@@ -406,7 +423,18 @@ sub start_textline {
}
}
unless ($newvariation) {
- $oldresponse = $Apache::lonhomework::history{"resource.$partid.$id.submission"};
+ if ((($env{'form.grade_username'} eq '') && ($env{'form.grade_domain'} eq '')) ||
+ (($env{'form.grade_username'} eq $env{'user.name'}) &&
+ ($env{'form.grade_domain'} eq $env{'user.domain'}))) {
+ $oldresponse = $Apache::lonhomework::history{"resource.$partid.$id.submission"};
+ } elsif (($Apache::lonhomework::history{"resource.$partid.type"} eq 'anonsurvey') ||
+ ($Apache::lonhomework::history{"resource.$partid.type"} eq 'anonsurveycred') ||
+ ($Apache::lonhomework::type eq 'anonsurvey') ||
+ ($Apache::lonhomework::type eq 'anonsurveycred')) {
+ $oldresponse = '* '.&mt('(only shown to submitter)').' *';
+ } else {
+ $oldresponse = $Apache::lonhomework::history{"resource.$partid.$id.submission"};
+ }
&Apache::lonxml::debug("oldresponse $oldresponse is ".ref($oldresponse));
if (ref($oldresponse) eq 'ARRAY') {
$oldresponse = $oldresponse->[$#Apache::inputtags::inputlist];
@@ -431,18 +459,18 @@ sub start_textline {
$readonly='';
}
my $name = 'HWVAL_'.$id;
+ my $itemid = 'HWVAL_'.$partid.'_'.$id;
if ($Apache::inputtags::status[-1] eq 'CANNOT_ANSWER') {
$name = "none";
}
$result.= ' ';
+ . ' class="LC_textline spellchecked" size="'.$size.'"'.$maxlength.' />';
- $result .= &spellcheck_onblur($name, $spellcheck);
+ $result .= &spellcheck_onblur($itemid, $spellcheck);
}
if ($Apache::lonhomework::type eq 'exam'
&& &needs_exam_box($tagstack)) {
@@ -461,8 +489,9 @@ sub start_textline {
'addchars',$token,10);
$result.=&Apache::edit::select_arg('Readonly:','readonly',
['no','yes'],$token);
- $result.=&Apache::edit::select_arg("Spellcheck for: ", 'spellcheck',
- ['none', 'en', 'de', 'fr'], $token);
+ my $spell_langs = &spelling_languages();
+ $result.=&Apache::edit::select_arg('Spellcheck for:', 'spellcheck',
+ $spell_langs, $token);
$result.=&Apache::edit::end_row();
$result.=&Apache::edit::end_table();
} elsif ($target eq 'modified') {
@@ -611,7 +640,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)');
@@ -625,7 +654,7 @@ sub file_selector {
&mt('Allowed filetypes: [_1]',''.$uploadedfiletypes.' ').' ';
}
if ($maxfilesize) {
- $constraints .= &mt('Combined size of all files not to exceed: [_1] MB[_2].',
+ $constraints .= &mt('Combined size of all files not to exceed: [_1] MB.',
''.$maxfilesize.' ').' ';
}
if ($constraints) {
@@ -669,7 +698,17 @@ 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 $header = &Apache::loncommon::start_data_table().
+ 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();
if ($Apache::inputtags::status[-1] eq 'CAN_ANSWER') {
$header .= '
'.&mt('Delete?').' ';
@@ -678,7 +717,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) {
@@ -697,9 +736,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,'<>&"');
@@ -735,13 +774,24 @@ sub current_file_submissions {
' value="'.$portfile.'" id="HWFILE'.$jspart.'_'.$id.'_'.$num.'_delete" />'."\n";
$num ++;
}
- my $showname = $rows{$url}{path}.$name;
+ my $pathid = 'HWFILE'.$jspart.'_'.$id.'_'.$num.'_path';
+ my $pathidtext = $pathid.'text';
+ my ($showname,$showpath);
if ($legacy{$url}) {
$showname = $name.' '.&mt('not in portfolio');
+ } else {
+ $showname = $name;
+ $showpath = ' '.
+ ''.
+ ''.
+ &mt('(Show path)').' '.
+ ''.$rows{$url}{path}.$name.
+'
';
}
$result .=
' '.$showname.' '."\n".
+ '" border="0" alt="" />'.$showname.''.$showpath.''."\n".
''.$rows{$url}{size}.' '."\n".
''.$rows{$url}{lastmodified}.' '."\n".
&Apache::loncommon::end_data_table_row();
@@ -796,10 +846,47 @@ sub current_file_info {
return ($status,\%info,$error);
}
+sub portpath_popup_js {
+ my %lt = &Apache::lonlocal::texthash(
+ show => '(Show path)',
+ hide => '(Hide)',
+ );
+ return <<"END";
+
+
+END
+}
+
sub valid_award {
my ($award) =@_;
foreach my $possibleaward ('EXTRA_ANSWER','MISSING_ANSWER', 'ERROR',
- 'NO_RESPONSE',
+ 'NO_RESPONSE','WRONG_NUMBOXESCHECKED',
'TOO_LONG', 'UNIT_INVALID_INSTRUCTOR',
'UNIT_INVALID_STUDENT', 'UNIT_IRRECONCIBLE',
'UNIT_FAIL', 'NO_UNIT',
@@ -819,7 +906,7 @@ sub valid_award {
{
my @awards = ('EXTRA_ANSWER', 'MISSING_ANSWER', 'ERROR', 'NO_RESPONSE',
- 'TOO_LONG',
+ 'WRONG_NUMCHECKEDBOXES','TOO_LONG',
'UNIT_INVALID_INSTRUCTOR', 'UNIT_INVALID_STUDENT',
'UNIT_IRRECONCIBLE', 'UNIT_FAIL', 'NO_UNIT',
'UNIT_NOTNEEDED', 'WANTED_NUMERIC', 'BAD_FORMULA', 'NOT_FUNCTION',
@@ -921,7 +1008,7 @@ sub finalizeawards {
}
sub decideoutput {
- my ($award,$awarded,$awardmsg,$solved,$previous,$target,$nocorrect)=@_;
+ my ($award,$awarded,$awardmsg,$solved,$previous,$target,$nocorrect,$tdclass)=@_;
my $message='';
my $button=0;
@@ -1046,6 +1133,13 @@ sub decideoutput {
}
$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).');
+ if ($target ne 'tex') {
+ $message .= &Apache::loncommon::help_open_topic('Wrong_Num_Boxes_Checked');
+ }
+ $css_class=$possible_class{'not_charged_try'};
+ $button = 1;
} elsif ($award eq 'ERROR') {
$message = &mt('An error occurred while grading your answer.');
$css_class=$possible_class{'not_charged_try'};
@@ -1066,7 +1160,7 @@ sub decideoutput {
$css_class=$possible_class{'not_charged_try'};
$button=1;
} elsif ($award eq 'EXCESS_FILESIZE') {
- $message = &mt('Submission won\'t be graded. The combined size of submitted files exceeded the amount allowed.');
+ $message = &mt("Submission won't be graded. The combined size of submitted files exceeded the amount allowed.");
$css_class=$possible_class{'not_charged_try'};
$button=1;
} elsif ($award eq 'FILENAME_INUSE') {
@@ -1076,7 +1170,7 @@ sub decideoutput {
} else {
$message .= ' ';
}
- $message .= &mt('Please use a different file name.');
+ $message .= &mt('Please use a different filename.');
$css_class=$possible_class{'not_charged_try'};
$button=1;
} elsif ($award eq 'INVALID_FILETYPE') {
@@ -1417,7 +1511,8 @@ sub setgradedata {
$Apache::lonhomework::results{"resource.$id.type"} = $Apache::lonhomework::type;
$Apache::lonhomework::results{"resource.$id.duedate"} = &Apache::lonnet::EXT("resource.$id.duedate");
$Apache::lonhomework::results{"resource.$id.hinttries"} = &Apache::lonnet::EXT("resource.$id.hinttries");
- $Apache::lonhomework::results{"resourse.$id.version"} = &Apache::lonnet::usedversion();
+ $Apache::lonhomework::results{"resource.$id.version"} = &Apache::lonnet::usedversion();
+ $Apache::lonhomework::results{"resource.$id.maxtries"} = &Apache::lonnet::EXT("resource.$id.maxtries");
}
sub find_which_previous {
@@ -1497,7 +1592,7 @@ sub grade {
}
sub get_grade_messages {
- my ($id,$prefix,$target,$status,$nocorrect) = @_;
+ my ($id,$prefix,$target,$status,$nocorrect,$tdclass) = @_;
# nocorrect suppresses "Computer's answer now shown above"
my ($message,$latemessage,$trystr,$previousmsg);
my $showbutton = 1;
@@ -1512,13 +1607,13 @@ sub get_grade_messages {
&Apache::lonxml::debug('Getting message');
($showbutton,my $css_class,$message,$previousmsg) =
&decideoutput($award,$awarded,$awardmsg,$solved,$previous,
- $target,(($status eq 'CAN_ANSWER') || $nocorrect));
+ $target,(($status eq 'CAN_ANSWER') || $nocorrect),$tdclass);
if ($target eq 'tex') {
$message='\vskip 2 mm '.$message.' ';
} else {
- $message="$message ";
+ $message="$message ";
if ($previousmsg) {
- $previousmsg="$previousmsg ";
+ $previousmsg="$previousmsg ";
}
}
}
@@ -1553,7 +1648,7 @@ sub get_grade_messages {
$trial.="/".$Apache::inputtags::params{'maxtries'};
}
}
- $trystr = ''.&mt($tries_text.' [_1]',$trial).' ';
+ $trystr = ''.&mt($tries_text.' [_1]',$trial).' ';
}
}
@@ -1561,7 +1656,7 @@ sub get_grade_messages {
#last submissions was after due date
$latemessage=&mt(' The last submission was after the Due Date ');;
if ($target eq 'web') {
- $latemessage=''.$latemessage.' ';
+ $latemessage=''.$latemessage.' ';
}
}
return ($previousmsg,$latemessage,$message,$trystr,$showbutton);
@@ -1575,6 +1670,7 @@ sub gradestatus {
my $trystr='';
my $button='';
my $previousmsg='';
+ my $tdclass='';
my $status = $Apache::inputtags::status['-1'];
&Apache::lonxml::debug("gradestatus has :$status:");
@@ -1591,21 +1687,29 @@ sub gradestatus {
$showbutton = 0;
}
+ unless (($status eq 'SHOW_ANSWER') || ($status eq 'CANNOT_ANSWER')) {
+ if ($target ne 'tex') {
+ $tdclass = 'LC_status_submit_'.$id;
+ }
+ }
+
($previousmsg,$latemessage,$message,$trystr) =
&get_grade_messages($id,"resource.$id",$target,$status,
- $showbutton);
+ $showbutton,$tdclass);
if ($status eq 'CANNOT_ANSWER') {
$showbutton = 0;
}
if ( $status eq 'SHOW_ANSWER') {
undef($previousmsg);
}
- if ( $showbutton ) {
+ if ( $showbutton ) {
if ($target ne 'tex') {
$button =
' ';
+ type="submit" name="submit_'.$id.'" id="submit_'.$id.'" class="LC_hwk_submit"
+ value="'.&mt('Submit Answer').'" /> '.
+ ''.
+ &mt('Processing your submission ...').'
';
}
}
@@ -1620,7 +1724,7 @@ sub gradestatus {
$output =
''.$button.' '.$output;
if (!$no_previous) {
- $output.=''.&previous_tries($id,$target).' ';
+ $output.=''.&previous_tries($id,$target).' ';
}
$output.= '
';
return $output;
@@ -1636,6 +1740,7 @@ sub previous_tries {
my $count;
my %count_lookup;
my $lastrndseed;
+ my $numstamps = 0;
foreach my $i (1..$Apache::lonhomework::history{'version'}) {
my $prefix = $i.":resource.$id";
@@ -1692,10 +1797,17 @@ sub previous_tries {
$message =~ s{()}{};
- $output.=' ';
- $output.=''.$count.' ';
- $output.=$message;
-
+ $output .= ' '.
+ ''.$count.' '.$message;
+ if ((!$is_anon) && ($Apache::lonhomework::history{"$prefix.tries"}) &&
+ ($Apache::lonhomework::history{"$prefix.award"} ne 'ASSIGNED_SCORE') &&
+ ($Apache::lonhomework::history{$i.':timestamp'})) {
+ $output .= ''.&Apache::lonlocal::locallocaltime(
+ $Apache::lonhomework::history{$i.':timestamp'}).' ';
+ $numstamps ++;
+ } else {
+ $output .= ' ';
+ }
foreach my $resid (@Apache::inputtags::response) {
my $prefix = $prefix.".$resid";
if (exists($Apache::lonhomework::history{"$prefix.submission"})) {
@@ -1718,10 +1830,20 @@ sub previous_tries {
$lastrndseed = $curr_rndseed;
}
return if ($output eq '');
- my $headers =
- ' '.''.&mt('Submission #').' '.&mt('Try').
- ' '.
- &mt('Submitted Answer').' ';
+ my $headers = ' '.
+ ''.&mt('Submission #').' '.
+ ''.&mt('Try').' ';
+ if ($numstamps) {
+ $headers .= &mt('When');
+ }
+ $headers .= ' ';
+ my $colspan = scalar(@Apache::inputtags::response);
+ if ($colspan > 1) {
+ $headers .= '';
+ } else {
+ $headers .= ' ';
+ }
+ $headers .= &mt('Submitted Answer').' ';
$output ='';
my $tries_text = &get_tries_text('link');
@@ -1755,6 +1877,21 @@ sub get_tries_text {
return $tries_text;
}
+sub spelling_languages {
+ my %langchoices;
+ foreach my $id (&Apache::loncommon::languageids()) {
+ my $code = &Apache::loncommon::supportedlanguagecode($id);
+ if ($code ne '') {
+ $langchoices{$code} = &Apache::loncommon::plainlanguagedescription($id);
+ }
+ }
+ my @spelllangs = ('none');
+ foreach my $code ('en','de','he','es','fr','pt','tr') {
+ push(@spelllangs,[$code,$langchoices{$code}]);
+ }
+ return \@spelllangs;
+}
+
1;
__END__