--- loncom/homework/inputtags.pm	2013/04/11 14:59:40	1.315
+++ loncom/homework/inputtags.pm	2014/11/28 18:23:04	1.328
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # input  definitons
 #
-# $Id: inputtags.pm,v 1.315 2013/04/11 14:59:40 bisitz Exp $
+# $Id: inputtags.pm,v 1.328 2014/11/28 18:23:04 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.= '<textarea wrap="hard" name="'.$tagident.'" id="'.$tagident.'" ' .
+            my $textareaclass;
+            unless (&Apache::londefdef::is_inside_of($tagstack,
+                                                    'externalresponse')) {
+                $textareaclass = 'class="LC_richDetectHtml spellchecked"';
+            }
+	    $result.= '<textarea wrap="hard" name="'.$tagident.'" id="'.$itemid.'" ' .
 		      'rows="'.$rows.'" cols="'.$cols.'" '.$textareaclass
 		      .'>'.
                       &HTML::Entities::encode($oldresponse,'<>&"');
@@ -245,7 +259,8 @@ sub start_textfield {
 		&& &Apache::londefdef::is_inside_of($tagstack,
 						    'essayresponse') ) {
 		$result='<table class="LC_pastsubmission"><tr><td>'.
-		    $oldresponse.'</td></tr></table>';
+		    &HTML::Entities::encode($oldresponse,'"<>&').
+                    '</td></tr></table>';
 	    }
 	    #get rid of any startup text
 	    &Apache::lonxml::get_all_text("/textfield",$parser,$style);
@@ -311,10 +326,11 @@ sub end_textfield {
 	my $spellcheck = &Apache::lonxml::get_param('spellcheck', $parstack, $safeeval);
 	$Apache::lonxml::evaluate++;
 	if ($Apache::inputtags::status[-1] eq 'CAN_ANSWER') {
+            my $partid=$Apache::inputtags::part;
 	    my $resid = $Apache::inputtags::response[-1];
-	    my $tagident = 'HWVAL_' . $resid;
+	    my $itemid = 'HWVAL_' . $partid . '_' . $resid;
 	    my $result =  "</textarea>";
-	    $result .= &spellcheck_onblur($tagident, $spellcheck);
+	    $result .= &spellcheck_onblur($itemid, $spellcheck);
 	    return $result;
 	}
     } elsif ($target eq 'edit') {
@@ -407,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];
@@ -432,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.= '<input onkeydown="javascript:setSubmittedPart(\''.$partid.'\');"'
 		     . ' type="text" '
 		     . $readonly.' name="'. $name . '"'
-		     . ' id="' . $name . '"'
+		     . ' id="' . $itemid . '"'
 		     . ' value="'.  $oldresponse.'"'
-		     . ' class="spellchecked"  size="'.$size.'"'.$maxlength
-		     . '/>';
+		     . ' 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)) {
@@ -463,7 +491,7 @@ sub start_textline {
         $result.=&Apache::edit::select_arg('Readonly:','readonly',
 					   ['no','yes'],$token);
         my $spell_langs = &spelling_languages();
-	$result.=&Apache::edit::select_arg("Spellcheck for: ", 'spellcheck',
+	$result.=&Apache::edit::select_arg('Spellcheck for:', 'spellcheck',
 					   $spell_langs, $token);
 	$result.=&Apache::edit::end_row();
 	$result.=&Apache::edit::end_table();
@@ -627,7 +655,7 @@ sub file_selector {
 	    &mt('Allowed filetypes: [_1]','<b>'.$uploadedfiletypes.'</b>').'<br />';
     }
     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.',
                         '<b>'.$maxfilesize.'</b>').'<br />';
     }
     if ($constraints) {
@@ -671,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 .= '<th>'.&mt('Delete?').'</th>';
@@ -737,13 +766,24 @@ sub current_file_submissions {
                                  ' value="'.$portfile.'" id="HWFILE'.$jspart.'_'.$id.'_'.$num.'_delete" /></td>'."\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 = '<br />'. 
+                                        '<span id="'.$pathidtext.'" class="LC_cusr_subheading">'.
+                                        '<a href="javascript:showPortPath('."'$pathid','$pathidtext'".');" '.
+                                        'class="LC_menubuttons_link">'.
+                                        &mt('(Show path)').'</a></span>'.
+                                        '<div id="'.$pathid.'" class="LC_dccid">'.$rows{$url}{path}.$name.
+'</div>';
                         }
                         $result .= 
                             '<td><a href="'.$link.'"><img src="'.$icon.
-                            '" border="0" alt="" />'.$showname.'</a></td>'."\n".
+                            '" border="0" alt="" />'.$showname.'</a>'.$showpath.'</td>'."\n".
                             '<td align="right" valign="bottom">'.$rows{$url}{size}.'</td>'."\n".
                             '<td align="right" valign="bottom">'.$rows{$url}{lastmodified}.'</td>'."\n".
                             &Apache::loncommon::end_data_table_row();
@@ -798,10 +838,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";
+<script type="text/javascript"> 
+// <![CDATA[
+
+function showPortPath(id,idtext) {
+    document.getElementById(id).style.display='block';
+    document.getElementById(id).style.textAlign='left';
+    document.getElementById(id).style.textFace='normal';
+    if (document.getElementById(idtext)) {
+        document.getElementById(idtext).innerHTML ='<a href="javascript:hidePortPath(\\''+id+'\\',\\''+idtext+'\\'); '+
+                                                   '"class="LC_menubuttons_link">$lt{'hide'}</a>&nbsp;';
+    }
+    return;
+}
+
+function hidePortPath(id,idtext) {
+    if (document.getElementById(id)) {
+        document.getElementById(id).style.display='none';
+    }
+    if (document.getElementById(idtext)) {
+        document.getElementById(idtext).innerHTML ='<a href="javascript:showPortPath(\\''+id+'\\',\\''+idtext+'\\');" '+
+                                                   'class="LC_menubuttons_link">$lt{'show'}</a>';
+    }
+    return;
+}
+
+// ]]>
+</script>
+
+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',
@@ -821,7 +898,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', 
@@ -923,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;
@@ -1048,6 +1125,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'};
@@ -1068,7 +1152,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') {
@@ -1499,7 +1583,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;
@@ -1514,13 +1598,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="<td class=\"$css_class\">$message</td>";
+	    $message="<td class=\"$tdclass $css_class\">$message</td>";
 	    if ($previousmsg) {
-		$previousmsg="<td class=\"LC_answer_previous\">$previousmsg</td>";
+		$previousmsg="<td class=\"$tdclass LC_answer_previous\">$previousmsg</td>";
 	    }
 	}
     }
@@ -1555,7 +1639,7 @@ sub get_grade_messages {
 		    $trial.="/".$Apache::inputtags::params{'maxtries'};
 		}
 	    }
-	    $trystr = '<td><span class="LC_nobreak">'.&mt($tries_text.' [_1]',$trial).'</span></td>';
+	    $trystr = '<td class="'.$tdclass.'"><span class="LC_nobreak">'.&mt($tries_text.' [_1]',$trial).'</span></td>';
 	}
     }
 
@@ -1563,7 +1647,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='<td class="LC_answer_late">'.$latemessage.'</td>';
+	    $latemessage='<td class="'.$tdclass.' LC_answer_late">'.$latemessage.'</td>';
 	}
     }
     return ($previousmsg,$latemessage,$message,$trystr,$showbutton);
@@ -1577,6 +1661,7 @@ sub gradestatus {
     my $trystr='';
     my $button='';
     my $previousmsg='';
+    my $tdclass='';
 
     my $status = $Apache::inputtags::status['-1'];
     &Apache::lonxml::debug("gradestatus has :$status:");
@@ -1593,21 +1678,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 = 
             '<input onmouseup="javascript:setSubmittedPart(\''.$id.'\');this.form.action+=\'#'.&escape($id).'\';"
-                    type="submit" name="submit_'.$id.'"
-                    value="'.&mt('Submit Answer').'" />';
+                    type="submit" name="submit_'.$id.'" id="submit_'.$id.'" class="LC_hwk_submit"
+                    value="'.&mt('Submit Answer').'" />&nbsp;'.
+                    '<div id="msg_submit_'.$id.'" style="display:none">'.
+                    &mt('Processing your submission ...').'</div>';
 	    }
 	}
 
@@ -1622,7 +1715,7 @@ sub gradestatus {
 	    $output =
 		'<table><tr><td>'.$button.'</td>'.$output;
 	    if (!$no_previous) {
-		$output.='<td>'.&previous_tries($id,$target).'</td>';
+		$output.='<td class="'.$tdclass.'">'.&previous_tries($id,$target).'</td>';
 	    }
 	    $output.= '</tr></table>';
 	    return $output;
@@ -1638,6 +1731,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";
@@ -1694,10 +1788,17 @@ sub previous_tries {
 	$message =~ s{(<td.*?>)}{<td>};
 	
 
-	$output.='<tr class="'.$class.'">';
-	$output.='<td align="center">'.$count.'</td>';
-	$output.=$message;
-
+	$output .= '<tr class="'.$class.'">'.
+	           '<td align="center">'.$count.'</td>'.$message;
+        if ((!$is_anon) && ($Apache::lonhomework::history{"$prefix.tries"}) &&
+            ($Apache::lonhomework::history{"$prefix.award"} ne 'ASSIGNED_SCORE') &&
+            ($Apache::lonhomework::history{$i.':timestamp'})) {
+            $output .= '<td>'.&Apache::lonlocal::locallocaltime(
+                             $Apache::lonhomework::history{$i.':timestamp'}).'</td>';
+            $numstamps ++;
+        } else {
+            $output .= '<td></td>';
+        }
 	foreach my $resid (@Apache::inputtags::response) {
 	    my $prefix = $prefix.".$resid";
 	    if (exists($Apache::lonhomework::history{"$prefix.submission"})) {
@@ -1720,10 +1821,20 @@ sub previous_tries {
         $lastrndseed = $curr_rndseed;
     }
     return if ($output eq '');
-    my $headers = 
-	'<tr>'.'<th>'.&mt('Submission #').'</th><th>'.&mt('Try').
-	'</th><th colspan="'.scalar(@Apache::inputtags::response).'">'.
-	&mt('Submitted Answer').'</th>';
+    my $headers = '<tr>'.
+                  '<th>'.&mt('Submission #').'</th>'.
+                  '<th>'.&mt('Try').'</th><th>';
+    if ($numstamps) {
+        $headers .= &mt('When');
+    }
+    $headers .= '</th>';
+    my $colspan = scalar(@Apache::inputtags::response);
+    if ($colspan > 1) {
+        $headers .= '<th colspan="'.$colspan.'">';
+    } else {
+        $headers .= '<th>';
+    }
+    $headers .= &mt('Submitted Answer').'</th></tr>';
     $output ='<table class="LC_prior_tries">'.$headers.$output.'</table>';
 
     my $tries_text = &get_tries_text('link');