--- loncom/homework/grades.pm	2002/07/01 21:20:29	1.34
+++ loncom/homework/grades.pm	2002/07/08 21:18:54	1.37
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # The LON-CAPA Grading handler
 #
-# $Id: grades.pm,v 1.34 2002/07/01 21:20:29 ng Exp $
+# $Id: grades.pm,v 1.37 2002/07/08 21:18:54 ng Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -30,7 +30,7 @@
 # 7/26 H.K. Ng
 # 8/20 Gerd Kortemeyer
 # Year 2002
-# June 2002 H.K. Ng
+# June, July 2002 H.K. Ng
 #
 
 package Apache::grades;
@@ -53,6 +53,7 @@ sub moreinfo {
     if ($ENV{'form.symb'}) {
       $request->print('<input type="hidden" name="symb" value="'.$ENV{'form.symb'}.'" />'."\n");
     }
+#    $request->print('<input type="hidden" name="command" value="submission" />'."\n");
     $request->print('<input type="hidden" name="command" value="'.$ENV{'form.command'}.'" />'."\n");
     $request->print("Student:".'<input type="text" name="student" value="'.$ENV{'form.student'}.'" />'."<br />\n");
     $request->print("Domain:".'<input type="text" name="domain" value="'.$ENV{'user.domain'}.'" />'."<br />\n");
@@ -135,11 +136,15 @@ sub listStudents {
 &nbsp;<font size=+1><b>Resource:</b> $ENV{'form.url'}<br /><br />
 <form action="/adm/grades" method="post">&nbsp;<b>View Options</b></font><br />
 &nbsp;<b>View Problem: </b><input type="radio" name="vProb" value="no" checked> no 
-<input type="radio" name="vProb" value="yes"> yes 
-&nbsp;&nbsp;&nbsp;<b>Submissions: </b><input type="radio" name="lastSub" value="last" checked> last 
-<input type="radio" name="lastSub" value="all"> all 
+<input type="radio" name="vProb" value="yes"> yes <br />
+&nbsp;<b>Submissions: </b>
+<input type="radio" name="lastSub" value="lastonly" checked> last sub only
+<input type="radio" name="lastSub" value="last"> last sub & parts info
+<input type="radio" name="lastSub" value="all"> all details
 <input type="hidden" name="section" value="$getsec">
 <input type="hidden" name="submitonly" value="$submitonly">
+<input type="hidden" name="response" value="$ENV{'form.response'}">
+<input type="hidden" name="handgrade" value="$ENV{'form.handgrade'}">
 <table border="0"><tr><td bgcolor="#777777">
 <table border="0"><tr bgcolor="#e6ffff">
 <td><b>&nbsp;Select&nbsp;</b></td><td><b>&nbsp;Username&nbsp;</b></td>
@@ -181,31 +186,39 @@ sub processGroup {
   my ($request)  = shift;
   my $ctr        = 0;
   my @stuchecked = (ref($ENV{'form.stuinfo'}) ? @{$ENV{'form.stuinfo'}}
-                           :  ($ENV{'form.stuinfo'}) );
+                           : ($ENV{'form.stuinfo'}));
   my $total      = scalar(@stuchecked)-1;
-  foreach my $student (@stuchecked) {
-      my ($sname,$sdom,$fullname) = split(/:/,$student);
+  if ($stuchecked[0] eq '') {
+      &userError($request,'No student was selected for viewing/grading.');
+      return;
+  }
+  foreach (@stuchecked) {
+      my ($sname,$sdom,$fullname) = split(/:/);
       $ENV{'form.student'} = $sname;
       $ENV{'form.fullname'} = $fullname;
       &submission($request,$ctr,$total);
       $ctr++;
   }
-
   return 'The End';
 }
 
+sub userError {
+    my ($request, $reason, $step) = @_;
+    $request->print('<h3><font color="red">LON-CAPA User Error</font></h3><br />'."\n");
+    $request->print('<b>Reason: </b>'.$reason.'<br /><br />'."\n");
+    $request->print('<b>Step: </b>'.($step ne '' ? $step : 'Use your browser back button to correct')
+		    .'<br /><br />'."\n");
+    return '';
+}
+
 #FIXME - needs to handle multiple matches
 sub finduser {
   my ($name) = @_;
   my $domain = '';
-
   if ( $Apache::grades::viewgrades eq 'F' ) {
-    #get classlist
-#    my ($cdom,$cnum) = split(/_/,$ENV{'request.course.id'});
-    #print "Found $cdom:$cnum<br />";
     my ($classlist) = &getclasslist('all','0');
-    foreach my $student ( sort(@{ $$classlist{'all'} }) ) {
-      my ($posname,$posdomain) = split(/:/,$student);
+    foreach ( sort(@{ $$classlist{'all'} }) ) {
+      my ($posname,$posdomain) = split(/:/);
       if ($posname =~ $name) { $name=$posname; $domain=$posdomain; last; }
     }
     return ($name,$domain);
@@ -228,8 +241,9 @@ sub getclasslist {
     }
     my ($unam,$udom) = split(/:/,$student,2);
     my $section = &Apache::lonnet::usection($udom,$unam,$ENV{'request.course.id'});
+    $section = ($section ne '-1' ? $section : 'no');
     push @holdsec,$section;
-    push (@{ $classlist{$getsec} }, $student) if ($getsec eq 'all' or $getsec == $section);
+    push (@{ $classlist{$getsec} }, $student) if ($getsec eq 'all' || $getsec eq $section);
   }
   my %seen = ();
   foreach my $item (@holdsec) {
@@ -326,10 +340,6 @@ sub setstudentgrade {
   }
   if ( scalar(keys(%newrecord)) > 0 ) {
     $newrecord{'resource.regrader'}="$ENV{'user.name'}:$ENV{'user.domain'}";
-    print "grader=$newrecord{'resource.regrader'}:<br>records<br>";
-    while (my ($k,$v) = each %newrecord) {
-	print "k=$k:v=$v:<br>\n";
-    }
 #    &Apache::lonnet::cstore(\%newrecord,$symb,$courseid,$domain,$stuname);
 
     $result.="Stored away ".scalar(keys(%newrecord))." elements.<br />\n";
@@ -343,7 +353,7 @@ sub submission {
   my ($request,$counter,$total) = @_;
 
   if ($counter == 0) {
-      $request->print(<<JAVASCRIPT);
+      $request->print(<<SUBJAVASCRIPT);
 <script type="text/javascript" language="javascript">
   function updateRadio(radioButton,formtextbox,formsel,wgt) {
      var pts = formtextbox.value;
@@ -390,25 +400,255 @@ sub submission {
     return;
   }
 
+  function keywords(keyform) {
+    var keywds = keyform.value;
+    var nret = prompt("Keywords list, separated by a space. Add/delete to list if desired.",keywds);
+    if (nret==null) return;
+    keyform.value = nret;
+    return;
+  }
+
+//===================== Script to add keyword(s) ==================
+  function getSel() {
+    if (document.getSelection) txt = document.getSelection();
+    else if (document.selection) txt = document.selection.createRange().text;
+    else return;
+    var cleantxt = txt.replace(new RegExp('([\\f\\n\\r\\t\\v ])+', 'g')," ");
+    if (cleantxt=="") {
+	alert("Select a word or group of words from document and then click this link.");
+	return;
+    }
+    var nret = prompt("Add selection to keyword list?",cleantxt);
+    if (nret==null) return;
+    var curlist = document.SCORE.keywords.value;
+    document.SCORE.keywords.value = curlist+" "+nret;
+    return;
+  }
+
+//====================== Script for composing message ==============
+  function msgCenter(msgform,usrctr,fullname) {
+    var Nmsg  = msgform.savemsgN.value;
+    savedMsgHeader(Nmsg,usrctr,fullname);
+    var subject = msgform.msgsub.value;
+    var rtrchk  = eval("document.SCORE.includemsg"+usrctr);
+    var msgchk = rtrchk.value;
+//    alert("checked=>"+msgchk);
+    re = /msgsub/;
+    var shwsel = "";
+    if (re.test(msgchk)) { shwsel = "checked" }
+    displaySubject(subject,shwsel);
+    for (var i=1; i<=Nmsg; i++) {
+	var testpt = "savemsg"+i+",";
+	re = /testpt/;
+	shwsel = "";
+	if (re.test(msgchk)) { shwsel = "checked" }
+	var message = eval("document.SCORE.savemsg"+i+".value");
+	displaySavedMsg(i,message,shwsel);
+    }
+    newmsg = eval("document.SCORE.newmsg"+usrctr+".value");
+    shwsel = "";
+    re = /newmsg/;
+    if (re.test(msgchk)) { shwsel = "checked" }
+    newMsg(newmsg,shwsel);
+    msgTail(); 
+    return;
+  }
+
+function savedMsgHeader(Nmsg,usrctr,fullname) {
+    var height = 30*Nmsg+250;
+    var scrollbar = "no";
+    if (height > 600) {
+	height = 600;
+	scrollbar = "yes";
+    }
+/*    if (window.pWin)
+	window.pWin.close(); */
+    pWin = window.open('', 'MessageCenter', 'toolbar=no,location=no,scrollbars='+scrollbar+',width=600,height='+height);
+    pWin.document.write("<html><head>");
+    pWin.document.write("<title>Message Central</title>");
+
+    pWin.document.write("<script language=javascript>");
+    pWin.document.write("function checkInput() {");
+    pWin.document.write("  opener.document.SCORE.msgsub.value = document.msgcenter.msgsub.value;");
+    pWin.document.write("  var nmsg   = opener.document.SCORE.savemsgN.value;");
+    pWin.document.write("  var usrctr = document.msgcenter.usrctr.value;");
+    pWin.document.write("  var newval = eval(\\"opener.document.SCORE.newmsg\\"+usrctr);");
+    pWin.document.write("  newval.value = document.msgcenter.newmsg.value;");
+
+    pWin.document.write("  var msgchk = \\"\\";");
+    pWin.document.write("  if (document.msgcenter.subchk.checked) {");
+    pWin.document.write("     msgchk = \\"msgsub,\\";");
+    pWin.document.write("  }");
+    pWin.document.write(   "for (var i=1; i<=nmsg; i++) {");
+    pWin.document.write("      var opnmsg = eval(\\"opener.document.SCORE.savemsg\\"+i);");
+    pWin.document.write("      var frmmsg = eval(\\"document.msgcenter.msg\\"+i);");
+    pWin.document.write("      opnmsg.value = frmmsg.value;");
+    pWin.document.write("      var chkbox = eval(\\"document.msgcenter.msgn\\"+i);");
+    pWin.document.write("      if (chkbox.checked) {");
+    pWin.document.write("         msgchk += \\"savemsg\\"+i+\\",\\";");
+    pWin.document.write("      }");
+    pWin.document.write("  }");
+    pWin.document.write("  if (document.msgcenter.newmsgchk.checked) {");
+    pWin.document.write("     msgchk += \\"newmsg\\"+usrctr;");
+    pWin.document.write("  }");
+    pWin.document.write("  var includemsg = eval(\\"opener.document.SCORE.includemsg\\"+usrctr);");
+    pWin.document.write("  includemsg.value = msgchk;");
+
+//    pWin.document.write("  alert(\\"slected=\\"+msgchk)");
+    pWin.document.write("  self.close()");
+
+    pWin.document.write("}");
+
+    pWin.document.write("<");
+    pWin.document.write("/script>");
+
+    pWin.document.write("</head><body bgcolor=white>");
+
+    pWin.document.write("<form action=\\"inactive\\" name=\\"msgcenter\\">");
+    pWin.document.write("<input value=\\""+usrctr+"\\" name=\\"usrctr\\" type=\\"hidden\\">");
+    pWin.document.write("<font color=\\"green\\" size=+1>&nbsp;Compose Message for \"+fullname+\"</font><br><br>");
+
+    pWin.document.write("<table border=0 width=100%><tr><td bgcolor=\\"#777777\\">");
+    pWin.document.write("<table border=0 width=100%><tr bgcolor=\\"#ddffff\\">");
+    pWin.document.write("<td><b>Type</b></td><td><b>Include</b></td><td><b>Message</td></tr>");
+}
+    function displaySubject(msg,shwsel) {
+    pWin.document.write("<tr bgcolor=\\"#ffffdd\\">");
+    pWin.document.write("<td>Subject</td>");
+    pWin.document.write("<td align=\\"center\\"><input name=\\"subchk\\" type=\\"checkbox\\"" +shwsel+"></td>");
+    pWin.document.write("<td><input name=\\"msgsub\\" type=\\"text\\" value=\\""+msg+" \\"size=\\"60\\" maxlength=\\"80\\"></td></tr>");
+}
+
+function displaySavedMsg(ctr,msg,shwsel) {
+    pWin.document.write("<tr bgcolor=\\"#ffffdd\\">");
+    pWin.document.write("<td align=\\"center\\">"+ctr+"</td>");
+    pWin.document.write("<td align=\\"center\\"><input name=\\"msgn"+ctr+"\\" type=\\"checkbox\\"" +shwsel+"></td>");
+    pWin.document.write("<td><input name=\\"msg"+ctr+"\\" type=\\"text\\" value=\\""+msg+" \\" size=\\"60\\" maxlength=\\"80\\"></td></tr>");
+}
+
+function newMsg(newmsg,shwsel) {
+    pWin.document.write("<tr bgcolor=\\"#ffffdd\\">");
+    pWin.document.write("<td align=\\"center\\">New</td>");
+    pWin.document.write("<td align=\\"center\\"><input name=\\"newmsgchk\\" type=\\"checkbox\\"" +shwsel+"></td>");
+    pWin.document.write("<td><input name=\\"newmsg\\" type=\\"text\\" value=\\""+newmsg+" \\" size=\\"60\\" maxlength=\\"80\\"></td></tr>");
+}
+
+function msgTail() {
+    pWin.document.write("</table>");
+    pWin.document.write("</td></tr></table>&nbsp;");
+    pWin.document.write("<input type=\\"button\\" value=\\"Save\\" onClick=\\"javascript:checkInput()\\">&nbsp;&nbsp;");
+    pWin.document.write("<input type=\\"button\\" value=\\"Cancel\\" onClick=\\"self.close()\\"><br><br>");
+    pWin.document.write("</form>");
+    pWin.document.write("</body></html>");
+}
+
+//====================== Script for keyword highlight options ==============
+  function kwhighlight() {
+    var kwclr    = document.SCORE.kwclr.value;
+    var kwsize   = document.SCORE.kwsize.value;
+    var kwstyle  = document.SCORE.kwstyle.value;
+    var redsel = "";
+    var grnsel = "";
+    var blusel = "";
+    if (kwclr=="red")   {var redsel="checked"};
+    if (kwclr=="green") {var grnsel="checked"};
+    if (kwclr=="blue")  {var blusel="checked"};
+    var sznsel = "";
+    var sz1sel = "";
+    var sz2sel = "";
+    if (kwsize=="0")  {var sznsel="checked"};
+    if (kwsize=="+1") {var sz1sel="checked"};
+    if (kwsize=="+2") {var sz2sel="checked"};
+    var synsel = "";
+    var syisel = "";
+    var sybsel = "";
+    if (kwstyle=="")    {var synsel="checked"};
+    if (kwstyle=="<i>") {var syisel="checked"};
+    if (kwstyle=="<b>") {var sybsel="checked"};
+    highlightCentral();
+    highlightbody('red','red',redsel,'0','normal',sznsel,'','normal',synsel);
+    highlightbody('green','green',grnsel,'+1','+1',sz1sel,'<i>','italic',syisel);
+    highlightbody('blue','blue',blusel,'+2','+2',sz2sel,'<b>','bold',sybsel);
+    highlightend();
+    return;
+  }
+
+
+function highlightCentral() {
+    hwdWin = window.open('', 'KeywordHighlightCentral', 'toolbar=no,location=no,scrollbars=no,width=400,height=300');
+    hwdWin.document.write("<html><head>");
+    hwdWin.document.write("<title>Highlight Central</title>");
+
+    hwdWin.document.write("<script language=javascript>");
+    hwdWin.document.write("function updateChoice() {");
+    hwdWin.document.write("  opener.document.SCORE.kwclr.value = radioSelection(document.hlCenter.kwdclr);");
+    hwdWin.document.write("  opener.document.SCORE.kwsize.value = radioSelection(document.hlCenter.kwdsize);");
+    hwdWin.document.write("  opener.document.SCORE.kwstyle.value = radioSelection(document.hlCenter.kwdstyle);");
+    hwdWin.document.write("  self.close()");
+    hwdWin.document.write("}");
+
+    hwdWin.document.write("function radioSelection(radioButton) {");
+    hwdWin.document.write("    var selection=null;");
+    hwdWin.document.write("    for (var i=0; i<radioButton.length; i++) {");
+    hwdWin.document.write("        if (radioButton[i].checked) {");
+    hwdWin.document.write("            selection=radioButton[i].value;");
+    hwdWin.document.write("            return selection;");
+    hwdWin.document.write("        }");
+    hwdWin.document.write("    }");
+    hwdWin.document.write("}");
+
+    hwdWin.document.write("<");
+    hwdWin.document.write("/script>");
+
+    hwdWin.document.write("</head><body bgcolor=white>");
+
+    hwdWin.document.write("<form action=\\"inactive\\" name=\\"hlCenter\\">");
+    hwdWin.document.write("<font color=\\"green\\" size=+1>&nbsp;Keyword Highlight Options</font><br><br>");
+
+    hwdWin.document.write("<table border=0 width=100%><tr><td bgcolor=\\"#777777\\">");
+    hwdWin.document.write("<table border=0 width=100%><tr bgcolor=\\"#ddffff\\">");
+    hwdWin.document.write("<td><b>Text Color</b></td><td><b>Font Size</b></td><td><b>Font Style</td></tr>");
+}
+
+function highlightbody(clrval,clrtxt,clrsel,szval,sztxt,szsel,syval,sytxt,sysel) { 
+    hwdWin.document.write("<tr bgcolor=\\"#ffffdd\\">");
+    hwdWin.document.write("<td align=\\"left\\">");
+    hwdWin.document.write("<input name=\\"kwdclr\\" type=\\"radio\\" value=\\""+clrval+"\\" "+clrsel+">&nbsp;"+clrtxt+"</td>");
+    hwdWin.document.write("<td align=\\"left\\">");
+    hwdWin.document.write("<input name=\\"kwdsize\\" type=\\"radio\\" value=\\""+szval+"\\" "+szsel+">&nbsp;"+sztxt+"</td>");
+    hwdWin.document.write("<td align=\\"left\\">");
+    hwdWin.document.write("<input name=\\"kwdstyle\\" type=\\"radio\\" value=\\""+syval+"\\" "+sysel+">&nbsp;"+sytxt+"</td>");
+    hwdWin.document.write("</tr>");
+ }
+
+function highlightend() { 
+    hwdWin.document.write("</table>");
+    hwdWin.document.write("</td></tr></table>&nbsp;");
+    hwdWin.document.write("<input type=\\"button\\" value=\\"Set Options\\" onClick=\\"javascript:updateChoice()\\">&nbsp;&nbsp;");
+    hwdWin.document.write("<input type=\\"button\\" value=\\"Cancel\\" onClick=\\"self.close()\\"><br><br>");
+    hwdWin.document.write("</form>");
+    hwdWin.document.write("</body></html>");
+}
+
 </script>
-JAVASCRIPT
+SUBJAVASCRIPT
 }
   (my $url=$ENV{'form.url'})=~s-^http://($ENV{'SERVER_NAME'}|$ENV{'HTTP_HOST'})--;
-  if ($ENV{'form.student'} eq '') { &moreinfo($request,"Need student login id"); return ''; }
+  if ($ENV{'form.student'} eq '') { &moreinfo($request,'Need student login id'); return ''; }
   my ($uname,$udom) = &finduser($ENV{'form.student'});
-  if ($uname eq '') { &moreinfo($request,"Unable to find student"); return ''; }
+  if ($uname eq '') { &moreinfo($request,'Unable to find student'); return ''; }
 
   my $symb=($ENV{'form.symb'} ne '' ? $ENV{'form.symb'} : (&Apache::lonnet::symbread($url)));
   if ($symb eq '') { $request->print("Unable to handle ambiguous references:$url:."); return ''; }
   my $last = ($ENV{'form.lastSub'} eq 'last' ? 'last' : '');
-#
-# header info
+
+  # header info
   if ($counter == 0) {
-      $request->print('<h2><font color="#339933">Submission Record</font></h2>');
+      $request->print('<h2>&nbsp;<font color="#339933">Submission Record</font></h2>'.
+		      '<font size=+1>&nbsp;<b>Resource: </b>'.$url.'</font>');
   }
 
-#
-# option to display problem, only once else it cause problems with the form later since the problem has a form.
+  # option to display problem, only once else it cause problems with the form later since the problem has a form.
   if ($ENV{'form.vProb'} eq 'yes' && $counter == 0) {
       my $rendered=&Apache::loncommon::get_student_view($symb,$uname,$udom,
 						   $ENV{'request.course.id'});
@@ -422,50 +662,120 @@ JAVASCRIPT
       $result.='</td></tr></table><br />';
       $request->print($result);
   }
-#
-# beginning of form
+
+  # beginning of form
   if ($counter == 0) {
+      my %keyhash = &Apache::lonnet::dump('nohist_handgrade',
+                 $ENV{'course.'.$ENV{'request.course.id'}.'.domain'},
+		 $ENV{'course.'.$ENV{'request.course.id'}.'.num'});
+
+      my $loginuser = $ENV{'user.name'}.':'.$ENV{'user.domain'};
+      # if the handgrade db has never being initialized then set some default values
+      if ($keyhash{$symb.'_handgrade'} eq '') {
+	  $keyhash{$symb.'_keywords'}     = '';
+	  $keyhash{$symb.'_subject'}      = &Apache::lonnet::metadata($url,'title');
+	  $keyhash{$loginuser.'_kwclr'}   = $keyhash{$loginuser.'_kwclr'}   eq '' ? 'red' : $keyhash{$loginuser.'_kwclr'};
+	  $keyhash{$loginuser.'_kwsize'}  = $keyhash{$loginuser.'_kwsize'}  eq '' ? '0' : $keyhash{$loginuser.'_kwsize'};
+	  $keyhash{$loginuser.'_kwstyle'} = $keyhash{$loginuser.'_kwstyle'} eq '' ? ''  : $keyhash{$loginuser.'_kwstyle'};
+ 	  $keyhash{$symb.'_savemsgN'}     = '0';
+      }
       $request->print('<form action="/adm/grades" method="post" name="SCORE">'."\n".
-		      '<input type="hidden" name="symb" value="'.$symb.'" />'."\n".
-		      '<input type="hidden" name="url" value="'.$url.'" />'."\n".
-		      '<input type="hidden" name="vProb" value="'.$ENV{'form.vProb'}.'" />'."\n".
-		      '<input type="hidden" name="lastSub" value="'.$last.'" />'."\n".
-		      '<input type="hidden" name="section" value="'.$ENV{'form.section'}.'">'."\n".
+		      '<input type="hidden" name="symb"       value="'.$symb.'" />'."\n".
+		      '<input type="hidden" name="url"        value="'.$url.'" />'."\n".
+		      '<input type="hidden" name="vProb"      value="'.$ENV{'form.vProb'}.'" />'."\n".
+		      '<input type="hidden" name="lastSub"    value="'.$ENV{'form.lastSub'}.'" />'."\n".
+		      '<input type="hidden" name="section"    value="'.$ENV{'form.section'}.'">'."\n".
 		      '<input type="hidden" name="submitonly" value="'.$ENV{'form.submitonly'}.'">'."\n".
-		      '<input type="hidden" name="command" value="handgrade" />'."\n".
+		      '<input type="hidden" name="response"   value="'.$ENV{'form.response'}.'">'."\n".
+		      '<input type="hidden" name="handgrade"  value="'.$ENV{'form.handgrade'}.'">'."\n".
+		      '<input type="hidden" name="command"    value="handgrade" />'."\n".
+		      '<input type="hidden" name="keywords"   value="'.$keyhash{$symb.'_keywords'}.'" />'."\n".
+		      '<input type="hidden" name="kwclr"      value="'.$keyhash{$loginuser.'_kwclr'}.'" />'."\n".
+		      '<input type="hidden" name="kwsize"     value="'.$keyhash{$loginuser.'_kwsize'}.'" />'."\n".
+		      '<input type="hidden" name="kwstyle"    value="'.$keyhash{$loginuser.'_kwstyle'}.'" />'."\n".
+		      '<input type="hidden" name="msgsub"     value="'.$keyhash{$symb.'_subject'}.'" />'."\n".
+		      '<input type="hidden" name="savemsgN"   value="'.$keyhash{$symb.'_savemsgN'}.'" />'."\n".
 		      '<input type="hidden" name="NCT"'.
-		      ' value="'.($ENV{'form.NTSTU'} ne '' ? $ENV{'form.NTSTU'} : '1').'" />'."\n");
+		      ' value="'.($ENV{'form.NTSTU'} ne '' ? $ENV{'form.NTSTU'} : $total+1).'" />'."\n");
+
+      my ($cts,$prnmsg) = (1,'');
+      while ($cts <= $keyhash{$symb.'_savemsgN'}) {
+	  $prnmsg.='<input type="hidden" name="savemsg'.$cts.'" value="'.$keyhash{$symb.'_savemsg'.$cts}.'" />'."\n";
+	  $cts++;
+      }
+      $request->print($prnmsg);
+
+      if ($ENV{'form.handgrade'} eq 'yes') {
+	  $request->print(<<KEYWORDS);
+&nbsp;<b>Keyword Options</b>&nbsp;
+<a href="javascript:keywords(document.SCORE.keywords)"; TARGET=_self>Keyword List</a>&nbsp; &nbsp;
+<a href="#" onMouseDown="javascript:getSel(); return false"
+ CLASS="page">Paste Selection to Keyword list</a>&nbsp; &nbsp;
+<a href="javascript:kwhighlight()"; TARGET=_self>Keyword Highlight Attribute</a><br /><br />
+KEYWORDS
+      }
   }
-#
-# Student info
+
+  # Student info
   $request->print(($counter == 0 ? '' : '<br /><hr><br />'));
+  my $fullname = ($ENV{'form.fullname'} ne '' ? $ENV{'form.fullname'} : &get_fullname($uname,$udom));
   my $result.='<table border="0"><tr><td><b>Username: </b>'.$uname.
-      '</td><td><b>Fullname: </b>'.
-	  ($ENV{'form.fullname'} ne '' ? $ENV{'form.fullname'} : &get_fullname($uname,$udom)).
+      '</td><td><b>Fullname: </b>'.$fullname.
 	      '</td><td><b>Domain: </b>'.$udom.'</td></tr>';
-  $result.='<tr><td colspan=3><b>Resource: </b>'.$url.'</td></tr></table>';
+  if ($ENV{'form.handgrade'} eq 'yes') {
+#      my $subonly = &get_last_submission($symb,$uname,$udom,$ENV{'request.course.id'});
+      my ($classlist) = &getclasslist('all','0');
+      my @collaborators;
+#      foreach ( sort(@{ $$classlist{'all'} }) ) {
+#	  my ($sname,$sdom) = split(/:/);
+#	  push @collaborators,$sname if (grep /\b$sname(\b|\.)/i,$subonly);
+#      }
+#      push @collaborators,'leede','carlandmm','freyniks'; # as a test to display collaborators.
+      if (scalar(@collaborators) != 0) {
+	  $result.='<tr><td colspan=3><b>Collaborators: </b>';
+	  foreach (@collaborators) {
+	      $result.=$_.' ('.&get_fullname($_,$udom).') &nbsp; &nbsp;';
+	  }
+	  $result.='</td></tr>'."\n";
+	  $result.='<input type="hidden" name="collaborator'.$counter.
+	      '" value="'.(join ':',@collaborators).'" />'."\n";
+      }
+  }
+  $result.='</table>'."\n";
   $request->print($result);
-#
-# print student answer
-  my $answer=&Apache::loncommon::get_previous_attempt($symb,$uname,$udom,
-							   $ENV{'request.course.id'},$last);
-  $request->print($answer);
-  $answer =~ m/.*<\/tr><tr.*?<td>.*?<td>(.*?)<td>(.*?)<\/td>/;
-  print "Submitted=$1:<br>$2;";
-#
+
+  # print student answer
+  if ($ENV{'form.lastSub'} eq 'lastonly') {
+      my ($string,$timestamp)=&get_last_submission ($symb,$uname,$udom,$ENV{'request.course.id'});
+      $string=&keywords_highlight($string);
+      my $lastsubonly='<table border="0" width=100%><tr><td bgcolor="#777777">';
+      $lastsubonly.='<table border="0" width=100%><tr bgcolor="#e6ffff">';
+      $lastsubonly.='<td><b>Last Submission Only</b>'.
+	  ($timestamp eq '' ? '' : '&nbsp; &nbsp; <b>Date Submitted:</b> '.$timestamp).'</td></tr>';
+      $lastsubonly.='<tr><td bgcolor="#ffffe6">';
+      $lastsubonly.=$string;
+      $lastsubonly.='</td></tr></table></td></tr></table>'."\n";
+      $request->print($lastsubonly);
+  } else {
+      $request->print(&Apache::loncommon::get_previous_attempt($symb,$uname,$udom,
+							       $ENV{'request.course.id'},$last,
+							       '.submission','Apache::grades::keywords_highlight'));
+  }
+
   my $wgt    = &Apache::lonnet::EXT('resource.partid.weight',$symb,$udom,$uname);
   my $wgtmsg = ($wgt > 0 ? '(problem weight)' : '<font color="red">problem weight assigned by computer</font>');
   $wgt       = ($wgt > 0 ? $wgt : '1');
   my %record = &Apache::lonnet::restore($symb,$ENV{'request.course.id'},$udom,$uname);
   my $score  = ($record{'resource.0.awarded'} eq '' ? '' : $record{'resource.0.awarded'}*$wgt);
 
-#
-# display grading options
+  # display grading options
   $result='<input type="hidden" name="WGT'.$counter.'" value="'.$wgt.'" />'.
       '<input type="hidden" name="unamedom'.$counter.'" value="'.$uname.':'.$udom.'" />'."\n";
+  $result.='<input type="hidden" name="newmsg'.$counter.'" value="" />'."\n";
+  $result.='<input type="hidden" name="includemsg'.$counter.'" value="" />'."\n";
   $result.='<table border="0"><tr><td><b>Points</b></td><td>';
-  my $ctr = 0;
 
+  my $ctr = 0;
   $result.='<table border="0"><tr>';  # display radio buttons in a nice table with 10 across
   while ($ctr<=$wgt) {
       $result.= '<td><input type="radio" name="RADVAL'.$counter.'" '.
@@ -497,13 +807,15 @@ JAVASCRIPT
 	      '<option>partial</option><option>nothing</option>'."\n";
       $optsel =~ s/<option>$status/<option selected="on">$status/;
       $result.=$optsel;
-      $result.="</select></td></tr>\n";
+      $result.="</select>&nbsp&nbsp\n";
+      $result.='<a href="javascript:msgCenter(document.SCORE,'.$counter.
+	  ',\''.$fullname.'\')"; TARGET=_self>Compose Message</a></td></tr>'."\n";
     }
   }
   $result.='</table>';
   $request->print($result);
-#
-# print end of form
+
+  # print end of form
   if ($counter == $total) {
       my $endform.='<table border="0"><tr><td><input type="submit" name="gradeOpt" value="Save & Next" />';
       my $ntstu ='<select name="NTSTU">'.
@@ -522,6 +834,56 @@ JAVASCRIPT
   return '';
 }
 
+sub get_last_submission {
+  my ($symb,$username,$domain,$course)=@_;
+  if ($symb) {
+      my ($string,$timestamp);
+     my (%returnhash)=&Apache::lonnet::restore($symb,$course,$domain,$username);
+     if ($returnhash{'version'}) {
+	my %lasthash=();
+	my ($version);
+	for ($version=1;$version<=$returnhash{'version'};$version++) {
+	  foreach (sort(split(/\:/,$returnhash{$version.':keys'}))) {
+	      $lasthash{$_}=$returnhash{$version.':'.$_};
+	  }
+        }
+	foreach ((keys %lasthash)) {
+	    if ($_ =~ /\.submission$/) {$string = $lasthash{$_}}
+	    if ($_ =~ /timestamp/) {$timestamp=scalar(localtime($lasthash{$_}))};
+	}
+    }
+     $string = $string eq '' ? 'Nothing submitted - no attempts.' : $string;
+     return $string,$timestamp;
+  }
+}
+
+sub keywords_highlight {
+  my $string  = shift;
+  (my $url=$ENV{'form.url'})=~s-^http://($ENV{'SERVER_NAME'}|$ENV{'HTTP_HOST'})--;
+  my $symb=($ENV{'form.symb'} ne '' ? $ENV{'form.symb'} : (&Apache::lonnet::symbread($url)));
+  my $loginuser = $ENV{'user.name'}.':'.$ENV{'user.domain'};
+
+  my @kwkeys = ($symb.'_keywords',
+		$loginuser.'_kwclr',
+		$loginuser.'_kwsize',
+		$loginuser.'_kwstyle'
+		);
+
+  my %keyhash = &Apache::lonnet::get
+      ('nohist_handgrade',\@kwkeys,
+       $ENV{'course.'.$ENV{'request.course.id'}.'.domain'},
+       $ENV{'course.'.$ENV{'request.course.id'}.'.num'});
+  my @keylist = split(/[,\s+]/,$keyhash{$symb.'_keywords'});
+  my $size    = $keyhash{$kwkeys[2]} eq '0' ? '' : 'size='.$keyhash{$kwkeys[2]};
+  my $styleon = $keyhash{$kwkeys[3]} eq ''  ? '' : $keyhash{$kwkeys[3]};
+  (my $styleoff = $styleon) =~ s/\</\<\//;
+  foreach my $word (@keylist) {
+      next if ($word eq '');
+      $string =~ s/\b$word(\b|\.)/\<font color\=$keyhash{$kwkeys[1]} $size\>$styleon$word$styleoff\<\/font\>/gi;
+  }
+  return $string;
+}
+
 sub processHandGrade {
   my ($request) = shift;
   my $url    = $ENV{'form.url'};
@@ -529,35 +891,67 @@ sub processHandGrade {
   my $button = $ENV{'form.gradeOpt'};
   my $ngrade = $ENV{'form.NCT'};
   my $ntstu  = $ENV{'form.NTSTU'};
-#  my $vProb  = $ENV{'form.vProb'};
-#  my $lastSub= $ENV{'form.lastSub'};
+
+  my $loginuser = $ENV{'user.name'}.':'.$ENV{'user.domain'};
+  my %keyhash = ();
+  $keyhash{$symb.'_handgrade'} = 'activated';
+  $keyhash{$symb.'_keywords'} = $ENV{'form.keywords'};
+  $keyhash{$symb.'_subject'} = $ENV{'form.msgsub'};
+  $keyhash{$loginuser.'_kwclr'} = $ENV{'form.kwclr'};
+  $keyhash{$loginuser.'_kwsize'} = $ENV{'form.kwsize'};
+  $keyhash{$loginuser.'_kwstyle'} = $ENV{'form.kwstyle'};
+
+  my ($ctr,$idx) = (1,1);
+  while ($ctr <= $ENV{'form.savemsgN'}) {
+      if ($ENV{'form.savemsg'.$ctr} ne '') {
+	  $keyhash{$symb.'_savemsg'.$idx} = $ENV{'form.savemsg'.$ctr};
+	  $idx++;
+      }
+      $ctr++;
+  }
+  $ctr = 0;
+  while ($ctr < $ngrade) {
+      if ($ENV{'form.newmsg'.$ctr} ne '') {
+	  $keyhash{$symb.'_savemsg'.$idx} = $ENV{'form.newmsg'.$ctr};
+	  $idx++;
+      }
+      $ctr++;
+  }
+
+  $keyhash{$symb.'_savemsgN'} = --$idx;
+  my $putresult = &Apache::lonnet::put
+      ('nohist_handgrade',\%keyhash,
+       $ENV{'course.'.$ENV{'request.course.id'}.'.domain'},
+       $ENV{'course.'.$ENV{'request.course.id'}.'.num'});
 
   my (@parts) = sort(&getpartlist($url));
 
   if ($button eq 'Save & Next') {
       my $ctr = 0;
-      while ($ctr < $ENV{'form.NCT'}) {
-#	  my $pts    = ($ENV{'form.GRADE_BOX'.$ctr} ne '' ? $ENV{'form.GRADE_BOX'.$ctr} : $ENV{'form.RADVAL'.$ctr});
-#	  my $wgt    = $ENV{'form.WGT'.$ctr};
-#	  my $sel    = $ENV{'form.GRADE_SEL'.$ctr};
-#	  my $score  = $pts/$wgt if ($wgt != 0);
+      while ($ctr < $ngrade) {
 	  my ($uname,$udom) = split(/:/,$ENV{'form.unamedom'.$ctr});
 	  &saveHandGrade($url,$symb,$uname,$udom,$ctr,@parts);
-#	  &saveHandGrade($url,$symb,$uname,$udom,$score,@parts);
+	  if ($ENV{'form.collaborator'.$ctr}) {
+	      my (@collaborators) = split(/:/,$ENV{'form.collaborator'.$ctr});
+	      foreach (@collaborators) {
+		  &saveHandGrade($url,$symb,$_,$udom,$ctr,@parts);
+	      }
+	  }
 	  $ctr++;
       }
   }
   my $firststu = $ENV{'form.unamedom0'};
   my $laststu  = $ENV{'form.unamedom'.($ngrade-1)};
 
-  #get classlist
-#  my ($cdom,$cnum) = split(/_/,$ENV{'request.course.id'});
-  my ($classlist) = &getclasslist('all','0');
-
+  my ($classlist) = &getclasslist($ENV{'form.section'},'0');
+#  print "first=$firststu,last=$laststu<br>";
   my (@nextlist,@prevlist);
   my ($nextflg,$prevflg,$ctr,$ctprev) = (0,0,0,0);
-  foreach my $student ( sort(@{ $$classlist{'all'} }) ) {
+  foreach my $student ( sort(@{ $$classlist{$ENV{'form.section'}} }) ) {
       my ($uname,$udom) = split(/:/,$student);
+      my ($type,$status) = &student_gradeStatus($ENV{'form.url'},$udom,$uname);
+      next if ($status eq 'nothing' && $ENV{'form.submitonly'} eq 'yes');
+
       if ($nextflg == 1 && $button =~ /Next$/) {
 	  push @nextlist,$uname if ($ctr < $ntstu);
 	  $ctr++;
@@ -569,6 +963,7 @@ sub processHandGrade {
 	  $ctprev++;
       }
   }
+#  print "next student=@nextlist<br>";
   if ($button eq 'Previous') {
       if ($ctprev <= $ntstu) {
 	  @nextlist = @prevlist;
@@ -594,7 +989,6 @@ sub processHandGrade {
 
 sub saveHandGrade {
   my ($url,$symb,$stuname,$domain,$newflg,@parts) = @_;
-#  my ($stuname,$domain) = split(/:/,$student);
   my %record=&Apache::lonnet::restore($symb,$ENV{'request.course.id'},$domain,$stuname);
   my %newrecord;
 
@@ -603,7 +997,8 @@ sub saveHandGrade {
     my $oldscore=$record{"resource.$part.$type"};
     my $newscore;
     if ($type eq 'awarded' && $newflg >= 0) {
-	my $pts    = ($ENV{'form.GRADE_BOX'.$newflg} ne '' ? $ENV{'form.GRADE_BOX'.$newflg} : $ENV{'form.RADVAL'.$newflg});
+	my $pts    = ($ENV{'form.GRADE_BOX'.$newflg} ne '' ? 
+		      $ENV{'form.GRADE_BOX'.$newflg} : $ENV{'form.RADVAL'.$newflg});
 	my $wgt    = $ENV{'form.WGT'.$newflg};
 #	my $sel    = $ENV{'form.GRADE_SEL'.$newflg};
 	$newscore  = $pts/$wgt if ($wgt != 0);
@@ -633,10 +1028,10 @@ sub saveHandGrade {
   }
   if ( scalar(keys(%newrecord)) > 0 ) {
       $newrecord{'resource.regrader'}="$ENV{'user.name'}:$ENV{'user.domain'}";
-      while (my ($k,$v) = each %newrecord) {
-	 print "k=$k:v=$v:<br>\n";
-      }
-      print "symb=$symb,courseid=$ENV{'request.course.id'},dom=$domain,name=$stuname<br>";
+#      while (my ($k,$v) = each %newrecord) {
+#	 print "k=$k:v=$v:<br>\n";
+#      }
+#      print "symb=$symb,courseid=$ENV{'request.course.id'},dom=$domain,name=$stuname<br>";
 #     &Apache::lonnet::cstore(\%newrecord,$symb,$ENV{'request.course.id'},$domain,$stuname);
   }
   return '';
@@ -665,13 +1060,21 @@ sub gradingmenu {
   my ($request) = @_;
   my ($symb,$url)=&get_symb_and_url($request);
   if (!$symb) {return '';}
+  my $allkeys = &Apache::lonnet::metadata($url,'keys');
+  my $handgrade = ($allkeys =~ /parameter_.*?_handgrade/ ? 'yes' : 'no');
+  my ($responsetype,$foo) = split(/_/,&Apache::lonnet::metadata($url,'packages'));
 
   my $result='<h2>&nbsp;<font color="#339933">Select a Grading Method</font></h2>';
-  $result.='&nbsp;<font size=+1><b>Resource: </b>'.$url.'</font><br /><br />';
+  $result.='<table border="0">';
+  $result.='<tr><td><font size=+1><b>Resource: </b></font></td>'.
+      '<td><font size=+1>'.$url.'</font></td></tr>';
+  $result.='<tr><td><font size=+1><b>Type: </b></font></td>'.
+      '<td><font size=+1>'.$responsetype.'&nbsp;&nbsp;<b>Handgrade: </b>'.$handgrade.'</font></td></tr>';
+  $result.='</table>';
 
   $result.=&view_edit_entire_class_form($symb,$url).'<br />';
   $result.=&upcsvScores_form($symb,$url).'<br />';
-  $result.=&viewGradeaStu_form($symb,$url).'<br />';
+  $result.=&viewGradeaStu_form($symb,$url,$responsetype,$handgrade).'<br />';
   $result.=&verifyReceipt_form($symb,$url);
   return $result;
 }
@@ -718,7 +1121,7 @@ ENDUPFORM
 }
 
 sub viewGradeaStu_form {
-  my ($symb,$url) = @_;
+  my ($symb,$url,$response,$handgrade) = @_;
   my ($classlist,$sections) = &getclasslist('all','0');
   my $result.='<table width=100% border=0><tr><td bgcolor=#777777>'."\n";
   $result.='<table width=100% border=0><tr bgcolor="#e6ffff"><td>'."\n";
@@ -727,7 +1130,9 @@ sub viewGradeaStu_form {
   $result.='<form action="/adm/grades" method="post">'."\n".
      '<input type="hidden" name="symb" value="'.$symb.'" />'."\n".
       '<input type="hidden" name="url" value="'.$url.'" />'."\n".
-	  '<input type="hidden" name="command" value="submission" />'."\n";
+       '<input type="hidden" name="response" value="'.$response.'" />'."\n".
+        '<input type="hidden" name="handgrade" value="'.$handgrade.'" />'."\n".
+	 '<input type="hidden" name="command" value="submission" />'."\n";
 
   $result.='&nbsp;<b>Select section:</b> <select name="section">'."\n";
   foreach my $section (sort (@$sections)) {
@@ -737,7 +1142,8 @@ sub viewGradeaStu_form {
   $result.='&nbsp;&nbsp;<b>Display students who has: </b>'.
       '<input type="radio" name="submitonly" value="yes" checked> submitted'.
 	  '<input type="radio" name="submitonly" value="all"> everybody <br />';
-  $result.='&nbsp;(Section -1 implies the students were not assigned a section.)<br />' if (grep /-1/,@$sections);
+  $result.='&nbsp;(Section "no" implies the students were not assigned a section.)<br />' 
+      if (grep /no/,@$sections);
 
   $result.='<br />&nbsp;<input type="submit" name="submit" value="View/Grade" />'."\n".
       '</form>'."\n";
@@ -839,7 +1245,7 @@ sub editgrades {
 	'<input type="hidden" name="command" value="viewgrades" />'."\n".
 	  '<input type="submit" name="submit" value="See Grades" /> <br />'."\n";
 
-  foreach my $student ( sort(@{ $$classlist{'all   '} }) ) {
+  foreach my $student ( sort(@{ $$classlist{'all'} }) ) {
     $result.=&setstudentgrade($url,$symb,$ENV{'request.course.id'},$student,@parts);
   }