--- loncom/homework/inputtags.pm 2013/04/30 03:03:34 1.317
+++ loncom/homework/inputtags.pm 2014/11/07 22:00:17 1.327
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# input definitons
#
-# $Id: inputtags.pm,v 1.317 2013/04/30 03:03:34 raeburn Exp $
+# $Id: inputtags.pm,v 1.327 2014/11/07 22:00:17 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -222,7 +222,7 @@ sub start_textfield {
$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').' *';
+ $oldresponse = '* '.&mt('(only shown to submitter)').' *';
} else {
$oldresponse = $Apache::lonhomework::history{"resource.$partid.$resid.submission"};
}
@@ -235,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') {
@@ -424,7 +431,7 @@ sub start_textline {
($Apache::lonhomework::history{"resource.$partid.type"} eq 'anonsurveycred') ||
($Apache::lonhomework::type eq 'anonsurvey') ||
($Apache::lonhomework::type eq 'anonsurveycred')) {
- $oldresponse = '* '.&mt('only shown to submitter').' *';
+ $oldresponse = '* '.&mt('(only shown to submitter)').' *';
} else {
$oldresponse = $Apache::lonhomework::history{"resource.$partid.$id.submission"};
}
@@ -452,18 +459,19 @@ 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
+ . ' autocomplete="off" />';
- $result .= &spellcheck_onblur($name, $spellcheck);
+ $result .= &spellcheck_onblur($itemid, $spellcheck);
}
if ($Apache::lonhomework::type eq 'exam'
&& &needs_exam_box($tagstack)) {
@@ -647,7 +655,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) {
@@ -691,7 +699,8 @@ 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 $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?').' ';
@@ -757,13 +766,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();
@@ -818,6 +838,43 @@ 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',
@@ -943,7 +1000,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;
@@ -1088,7 +1145,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') {
@@ -1519,7 +1576,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;
@@ -1534,13 +1591,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 ";
}
}
}
@@ -1575,7 +1632,7 @@ sub get_grade_messages {
$trial.="/".$Apache::inputtags::params{'maxtries'};
}
}
- $trystr = ''.&mt($tries_text.' [_1]',$trial).' ';
+ $trystr = ''.&mt($tries_text.' [_1]',$trial).' ';
}
}
@@ -1583,7 +1640,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);
@@ -1597,6 +1654,7 @@ sub gradestatus {
my $trystr='';
my $button='';
my $previousmsg='';
+ my $tdclass='';
my $status = $Apache::inputtags::status['-1'];
&Apache::lonxml::debug("gradestatus has :$status:");
@@ -1613,21 +1671,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 ...').'
';
}
}
@@ -1642,7 +1708,7 @@ sub gradestatus {
$output =
''.$button.' '.$output;
if (!$no_previous) {
- $output.=''.&previous_tries($id,$target).' ';
+ $output.=''.&previous_tries($id,$target).' ';
}
$output.= '
';
return $output;
@@ -1658,6 +1724,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";
@@ -1714,10 +1781,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"})) {
@@ -1740,10 +1814,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');