Diff for /loncom/homework/grades.pm between versions 1.36 and 1.38

version 1.36, 2002/07/07 20:08:45 version 1.38, 2002/07/10 21:08:38
Line 40  use Apache::lonxml; Line 40  use Apache::lonxml;
 use Apache::lonnet;  use Apache::lonnet;
 use Apache::loncommon;  use Apache::loncommon;
 use Apache::lonhomework;  use Apache::lonhomework;
   use Apache::lonmsg qw(:user_normal_msg);
 use Apache::Constants qw(:common);  use Apache::Constants qw(:common);
   use Time::HiRes qw( gettimeofday tv_interval );
   
 sub moreinfo {  sub moreinfo {
   my ($request,$reason) = @_;    my ($request,$reason) = @_;
Line 136  sub listStudents { Line 138  sub listStudents {
 &nbsp;<font size=+1><b>Resource:</b> $ENV{'form.url'}<br /><br />  &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 />  <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   &nbsp;<b>View Problem: </b><input type="radio" name="vProb" value="no" checked> no 
 <input type="radio" name="vProb" value="yes"> yes   <input type="radio" name="vProb" value="yes"> yes <br />
 &nbsp;&nbsp;&nbsp;<b>Submissions: </b><input type="radio" name="lastSub" value="last" checked> last   &nbsp;<b>Submissions: </b>
 <input type="radio" name="lastSub" value="all"> all   <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="section" value="$getsec">
 <input type="hidden" name="submitonly" value="$submitonly">  <input type="hidden" name="submitonly" value="$submitonly">
 <input type="hidden" name="response" value="$ENV{'form.response'}">  <input type="hidden" name="response" value="$ENV{'form.response'}">
Line 157  ENDTABLEST Line 161  ENDTABLEST
   }    }
   $request->print('<input type="hidden" name="command" value="processGroup" />'."\n");    $request->print('<input type="hidden" name="command" value="processGroup" />'."\n");
   
     my $t0=&Time::HiRes::time();
   
   my ($classlist) = &getclasslist($getsec,'0');    my ($classlist) = &getclasslist($getsec,'0');
     my $t1=&Time::HiRes::time();
     print "getclasslist=",$t1-$t0,"<br />";
   
   foreach my $student ( sort(@{ $$classlist{$getsec} }) ) {    foreach my $student ( sort(@{ $$classlist{$getsec} }) ) {
       my ($sname,$sdom) = split(/:/,$student);        my ($sname,$sdom) = split(/:/,$student);
       my ($type,$status) = &student_gradeStatus($ENV{'form.url'},$cdom,$sname);        my ($type,$status) = &student_gradeStatus($ENV{'form.url'},$cdom,$sname);
Line 176  ENDTABLEST Line 185  ENDTABLEST
   $request->print('</tr>');    $request->print('</tr>');
       }        }
   }    }
     my $t2=&Time::HiRes::time();
     print "processclasslist=",$t2-$t1,"<br />";
   $request->print('</table></td></tr></table>');    $request->print('</table></td></tr></table>');
   $request->print('<input type="submit" name="submit" value="View/Grade" /><form />');    $request->print('<input type="submit" name="submit" value="View/Grade" /><form />');
 }  }
Line 289  sub viewstudentgrade { Line 300  sub viewstudentgrade {
       $result.="</select></td>\n";        $result.="</select></td>\n";
     }      }
   }    }
   $result.='<td></td></tr>';    $result.='</td></tr>';
   return $result;    return $result;
 }  }
   
Line 350  sub setstudentgrade { Line 361  sub setstudentgrade {
 sub submission {  sub submission {
   my ($request,$counter,$total) = @_;    my ($request,$counter,$total) = @_;
   
   if ($counter == 0) {  
       $request->print(<<SUBJAVASCRIPT);  
 <script type="text/javascript" language="javascript">  
   function updateRadio(radioButton,formtextbox,formsel,wgt) {  
      var pts = formtextbox.value;  
      var resetbox =false;  
      if (isNaN(pts) || pts < 0) {  
  alert("A number equal or greater than 0 is expected. Entered value = "+pts);  
  for (var i=0; i<radioButton.length; i++) {  
    if (radioButton[i].checked) {  
       formtextbox.value = i;  
       resetbox = true;  
    }  
  }  
  if (!resetbox) {  
    formtextbox.value = "";  
  }  
  return;  
     }  
   
     for (var i=0; i<radioButton.length; i++) {  
  radioButton[i].checked=false;  
  if (pts == i) {  
    radioButton[i].checked=true;  
  }  
     }  
     updateSelect(formsel,pts,wgt);  
   }  
   
   function writeBox(formrad,formsel,pts,wgt) {  
     formrad.value = pts;  
     updateSelect(formsel,pts,wgt);  
     return;  
   }  
   
   function updateSelect(formsel,pts,wgt) {  
     if (pts == 0) {  
       formsel[1].selected = true;  
     }  
     if (pts > 0 && pts < wgt) {  
       formsel[4].selected = true;  
     }  
     if (pts == wgt) {  
       formsel[0].selected = true;  
     }  
     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;  
     displaySubject(subject);  
     for (var i=1; i<=Nmsg; i++) {  
  var message = eval("document.SCORE.savemsg"+i+".value");  
  displaySavedMsg(i,message);  
     }  
     newmsg = eval("document.SCORE.newmsg"+usrctr+".value");  
     newMsg(newmsg);  
     msgTail();   
     return;  
   }  
   
 function savedMsgHeader(Nmsg,usrctr,fullname) {  
     var height = 30*Nmsg+250;  
     var scrollbar = "no";  
     if (height > 600) {  
  height = 600;  
  scrollbar = "yes";  
     }  
     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 = \\"subject,\\";");  
     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 += i+\\",\\";");  
     pWin.document.write("      }");  
     pWin.document.write("  }");  
     pWin.document.write("  if (document.msgcenter.newmsgchk.checked) {");  
     pWin.document.write("     msgchk += \\"new\\";");  
     pWin.document.write("  }");  
     pWin.document.write("  var includemsg = eval(\\"opener.document.SCORE.includemsg\\"+usrctr);");  
     pWin.document.write("  includemsg.value = 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) {  
     pWin.document.write("<tr bgcolor=\\"#ffffdd\\">");  
     pWin.document.write("<td>Subject</td>");  
     pWin.document.write("<td align=\\"center\\"><input name=\\"subchk\\" type=\\"checkbox\\" checked></td>");  
     pWin.document.write("<td><input name=\\"msgsub\\" type=\\"text\\" value=\\""+msg+" \\"size=\\"60\\" maxlength=\\"80\\"></td></tr>");  
 }  
   
 function displaySavedMsg(ctr,msg) {  
     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\\"></td>");  
     pWin.document.write("<td><input name=\\"msg"+ctr+"\\" type=\\"text\\" value=\\""+msg+" \\" size=\\"60\\" maxlength=\\"80\\"></td></tr>");  
 }  
   
 function newMsg(newmsg) {  
     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\\"></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>  
 SUBJAVASCRIPT  
 }  
   (my $url=$ENV{'form.url'})=~s-^http://($ENV{'SERVER_NAME'}|$ENV{'HTTP_HOST'})--;    (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'});    my ($uname,$udom) = &finduser($ENV{'form.student'});
Line 623  SUBJAVASCRIPT Line 369  SUBJAVASCRIPT
   my $symb=($ENV{'form.symb'} ne '' ? $ENV{'form.symb'} : (&Apache::lonnet::symbread($url)));    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 ''; }    if ($symb eq '') { $request->print("Unable to handle ambiguous references:$url:."); return ''; }
   my $last = ($ENV{'form.lastSub'} eq 'last' ? 'last' : '');    my $last = ($ENV{'form.lastSub'} eq 'last' ? 'last' : '');
 #  
 # header info    # header info
   if ($counter == 0) {    if ($counter == 0) {
         &sub_page_js($request);
       $request->print('<h2>&nbsp;<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>');        '<font size=+1>&nbsp;<b>Resource: </b>'.$url.'</font>');
   }  
   
 #        # option to display problem, only once else it cause problems with the form later 
 # option to display problem, only once else it cause problems with the form later since the problem has a form.        # since the problem has a form.
   if ($ENV{'form.vProb'} eq 'yes' && $counter == 0) {        if ($ENV{'form.vProb'} eq 'yes') {
       my $rendered=&Apache::loncommon::get_student_view($symb,$uname,$udom,    my $rendered=&Apache::loncommon::get_student_view($symb,$uname,$udom,
    $ENV{'request.course.id'});      $ENV{'request.course.id'});
       my $companswer=&Apache::loncommon::get_student_answers($symb,$uname,$udom,    my $companswer=&Apache::loncommon::get_student_answers($symb,$uname,$udom,
  $ENV{'request.course.id'});   $ENV{'request.course.id'});
       my $result.='<table border="0" width="100%"><tr><td bgcolor="#777777">';    my $result.='<table border="0" width="100%"><tr><td bgcolor="#777777">';
       $result.='<table border="0" width="100%"><tr><td bgcolor="#e6ffff">';    $result.='<table border="0" width="100%"><tr><td bgcolor="#e6ffff">';
       $result.='<b>Student\'s view of the problem</b></td></tr><tr><td bgcolor="#ffffff">'.$rendered.'<br />';    $result.='<b>Student\'s view of the problem</b></td></tr><tr><td bgcolor="#ffffff">'.$rendered.'<br />';
       $result.='<b>Correct answer:</b><br />'.$companswer;    $result.='<b>Correct answer:</b><br />'.$companswer;
       $result.='</td></tr></table>';    $result.='</td></tr></table>';
       $result.='</td></tr></table><br />';    $result.='</td></tr></table><br />';
       $request->print($result);    $request->print($result);
   }        }
 #  
 # beginning of form  
   if ($counter == 0) {  
       my %keyhash = &Apache::lonnet::get  
                 ('nohist_handgrade',[$symb.'_keywords'],  
                  $ENV{'course.'.$ENV{'request.course.id'}.'.domain'},  
  $ENV{'course.'.$ENV{'request.course.id'}.'.num'});  
   
         # kwclr is the only variable that is non blank if this has been used once.
         my %keyhash = ();
         if ($ENV{'form.kwclr'} eq '') {
     %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'};
     $ENV{'form.keywords'} = $keyhash{$symb.'_keywords'} ne '' ? $keyhash{$symb.'_keywords'} : '';
     $ENV{'form.kwclr'}    = $keyhash{$loginuser.'_kwclr'} ne '' ? $keyhash{$loginuser.'_kwclr'} : 'red';
     $ENV{'form.kwsize'}   = $keyhash{$loginuser.'_kwsize'} ne '' ? $keyhash{$loginuser.'_kwsize'} : '0';
     $ENV{'form.kwstyle'}  = $keyhash{$loginuser.'_kwstyle'} ne '' ? $keyhash{$loginuser.'_kwstyle'} : '';
     $ENV{'form.msgsub'}   = $keyhash{$symb.'_subject'} ne '' ? 
         $keyhash{$symb.'_subject'} : &Apache::lonnet::metadata($url,'title');
     $ENV{'form.savemsgN'} = $keyhash{$symb.'_savemsgN'} ne '' ? $keyhash{$symb.'_savemsgN'} : '0';
   
         }
       $request->print('<form action="/adm/grades" method="post" name="SCORE">'."\n".        $request->print('<form action="/adm/grades" method="post" name="SCORE">'."\n".
         '<input type="hidden" name="command"    value="handgrade" />'."\n".
       '<input type="hidden" name="symb"       value="'.$symb.'" />'."\n".        '<input type="hidden" name="symb"       value="'.$symb.'" />'."\n".
       '<input type="hidden" name="url"        value="'.$url.'" />'."\n".        '<input type="hidden" name="url"        value="'.$url.'" />'."\n".
       '<input type="hidden" name="vProb"      value="'.$ENV{'form.vProb'}.'" />'."\n".        '<input type="hidden" name="vProb"      value="'.$ENV{'form.vProb'}.'" />'."\n".
       '<input type="hidden" name="lastSub"    value="'.$last.'" />'."\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="section"    value="'.$ENV{'form.section'}.'">'."\n".
       '<input type="hidden" name="submitonly" value="'.$ENV{'form.submitonly'}.'">'."\n".        '<input type="hidden" name="submitonly" value="'.$ENV{'form.submitonly'}.'">'."\n".
       '<input type="hidden" name="response"   value="'.$ENV{'form.response'}.'">'."\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="handgrade"  value="'.$ENV{'form.handgrade'}.'">'."\n".
       '<input type="hidden" name="command"    value="handgrade" />'."\n".        '<input type="hidden" name="keywords"   value="'.$ENV{'form.keywords'}.'" />'."\n".
       '<input type="hidden" name="keywords"   value="'.$keyhash{$symb.'_keywords'}.'" />'."\n".        '<input type="hidden" name="kwclr"      value="'.$ENV{'form.kwclr'}.'" />'."\n".
       '<input type="hidden" name="kwclr"      value="blue" />'."\n".        '<input type="hidden" name="kwsize"     value="'.$ENV{'form.kwsize'}.'" />'."\n".
       '<input type="hidden" name="kwsize"     value="0" />'."\n".        '<input type="hidden" name="kwstyle"    value="'.$ENV{'form.kwstyle'}.'" />'."\n".
       '<input type="hidden" name="kwstyle"    value="" />'."\n".        '<input type="hidden" name="msgsub"     value="'.$ENV{'form.msgsub'}.'" />'."\n".
       '<input type="hidden" name="msgsub"     value="Problem title" />'."\n".        '<input type="hidden" name="savemsgN"   value="'.$ENV{'form.savemsgN'}.'" />'."\n".
       '<input type="hidden" name="savemsgN"   value="4" />'."\n".  
       '<input type="hidden" name="savemsg1"   value="Good Job!" />'."\n".  
       '<input type="hidden" name="savemsg2"   value="Needs a better explanation." />'."\n".  
       '<input type="hidden" name="savemsg3"   value="Read the book before submitting such garbagge!" />'."\n".  
       '<input type="hidden" name="savemsg4"   value="You are nowhere close." />'."\n".  
       '<input type="hidden" name="NCT"'.        '<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 <= $ENV{'form.savemsgN'}) {
     $prnmsg.='<input type="hidden" name="savemsg'.$cts.'" value="'.
         ($keyhash{$symb.'_savemsg'.$cts} eq '' ? $ENV{'form.savemsg'.$cts} : $keyhash{$symb.'_savemsg'.$cts}).
         '" />'."\n";
     $cts++;
         }
         $request->print($prnmsg);
   
       if ($ENV{'form.handgrade'} eq 'yes') {        if ($ENV{'form.handgrade'} eq 'yes') {
   $request->print(<<KEYWORDS);    $request->print(<<KEYWORDS);
 &nbsp;<b>Keyword Options</b>&nbsp;  &nbsp;<b>Keyword Options:</b>&nbsp;
 <a href="javascript:keywords(document.SCORE.keywords)"; TARGET=_self>Keyword List</a>&nbsp; &nbsp;  <a href="javascript:keywords(document.SCORE.keywords)"; TARGET=_self>List</a>&nbsp; &nbsp;
 <a href="#" onMouseDown="javascript:getSel(); return false"  <a href="#" onMouseDown="javascript:getSel(); return false"
  CLASS="page">Paste Selection to Keyword list</a> (requires N4+ and IE5+)&nbsp; &nbsp;   CLASS="page">Paste Selection to List</a>&nbsp; &nbsp;
 <a href="javascript:kwhighlight()"; TARGET=_self>Keyword Highlight Attribute</a><br /><br />  <a href="javascript:kwhighlight()"; TARGET=_self>Highlight Attribute</a><br /><br />
 KEYWORDS  KEYWORDS
       }        }
   }    }
   
 #    # Student info
 # Student info    $request->print(($counter == 0 ? '' : '<br />'));
   $request->print(($counter == 0 ? '' : '<br /><hr><br />'));  
   my $fullname = ($ENV{'form.fullname'} ne '' ? $ENV{'form.fullname'} : &get_fullname($uname,$udom));    my $fullname = ($ENV{'form.fullname'} ne '' ? $ENV{'form.fullname'} : &get_fullname($uname,$udom));
   my $result.='<table border="0"><tr><td><b>Username: </b>'.$uname.    my $result.='<table border="0" width=100%><tr><td bgcolor="#777777">'.
         '<table border="0" width=100%><tr bgcolor="#ffffff"><td>';
     $result.='<table border="0"><tr bgcolor="#ffffff"><td><b>Username: </b>'.$uname.
       '</td><td><b>Fullname: </b>'.$fullname.        '</td><td><b>Fullname: </b>'.$fullname.
 #  ($ENV{'form.fullname'} ne '' ? $ENV{'form.fullname'} : &get_fullname($uname,$udom)).  
       '</td><td><b>Domain: </b>'.$udom.'</td></tr>';        '</td><td><b>Domain: </b>'.$udom.'</td></tr>';
   if ($ENV{'form.handgrade'} eq 'yes') {    if ($ENV{'form.handgrade'} eq 'yes') {
       my $subonly = &get_last_submission($symb,$uname,$udom,$ENV{'request.course.id'});  #      my $subonly = &get_last_submission($symb,$uname,$udom,$ENV{'request.course.id'});
       my ($classlist) = &getclasslist('all','0');        my ($classlist) = &getclasslist('all','0');
       my @collaborators;        my @collaborators;
       foreach ( sort(@{ $$classlist{'all'} }) ) {  #      foreach ( sort(@{ $$classlist{'all'} }) ) {
   my ($sname,$sdom) = split(/:/);  #  my ($sname,$sdom) = split(/:/);
   push @collaborators,$sname if (grep /\b$sname(\b|\.)/i,$subonly);  #  push @collaborators,$sname if (grep /\b$sname(\b|\.)/i,$subonly);
       }  #      }
       push @collaborators,'leede','carlandmm','freyniks'; # as a test to display collaborators.  #      push @collaborators,'leede','carlandmm','freyniks'; # as a test to display collaborators.
       if (scalar(@collaborators) != 0) {        if (scalar(@collaborators) != 0) {
   $result.='<tr><td colspan=3><b>Collaborators: </b>';    $result.='<tr bgcolor="#ffffff"><td colspan=3><b>Collaborators: </b>';
   foreach (@collaborators) {    foreach (@collaborators) {
       $result.=$_.' ('.&get_fullname($_,$udom).') &nbsp; &nbsp;';        $result.=$_.' ('.&get_fullname($_,$udom).') &nbsp; &nbsp;';
   }    }
Line 716  KEYWORDS Line 477  KEYWORDS
   }    }
   $result.='</table>'."\n";    $result.='</table>'."\n";
   $request->print($result);    $request->print($result);
 #  
 # print student answer   # print student answer
   $request->print(&Apache::loncommon::get_previous_attempt($symb,$uname,$udom,    if ($ENV{'form.lastSub'} eq 'lastonly') {
    $ENV{'request.course.id'},$last,        my ($string,$timestamp)=&get_last_submission ($symb,$uname,$udom,$ENV{'request.course.id'});
    '.submission','Apache::grades::keywords_highlight'));        $string=&keywords_highlight(join('::::',@$string));
 #        my $lastsubonly='<table border="0" width=100%><tr><td bgcolor="#777777">';
 #        $lastsubonly.='<table border="0" width=100%><tr bgcolor="#ddffff">';
         $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 $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>');    my $wgtmsg = ($wgt > 0 ? '(problem weight)' : '<font color="red">problem weight assigned by computer</font>');
   $wgt       = ($wgt > 0 ? $wgt : '1');    $wgt       = ($wgt > 0 ? $wgt : '1');
   my %record = &Apache::lonnet::restore($symb,$ENV{'request.course.id'},$udom,$uname);    my %record = &Apache::lonnet::restore($symb,$ENV{'request.course.id'},$udom,$uname);
   my $score  = ($record{'resource.0.awarded'} eq '' ? '' : $record{'resource.0.awarded'}*$wgt);    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.'" />'.    $result='<input type="hidden" name="WGT'.$counter.'" value="'.$wgt.'" />'.
       '<input type="hidden" name="unamedom'.$counter.'" value="'.$uname.':'.$udom.'" />'."\n";        '<input type="hidden" name="unamedom'.$counter.'" value="'.$uname.':'.$udom.'" />'."\n";
   $result.='<input type="hidden" name="newmsg'.$counter.'" value="" />'."\n".    $result.='<input type="hidden" name="newmsg'.$counter.'" value="" />'."\n";
   $result.='<input type="hidden" name="includemsg'.$counter.'" value="" />'."\n".    $result.='<input type="hidden" name="includemsg'.$counter.'" value="" />'."\n";
   $result.='<table border="0"><tr><td><b>Points</b></td><td>';    $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    $result.='<table border="0"><tr>';  # display radio buttons in a nice table with 10 across
   while ($ctr<=$wgt) {    while ($ctr<=$wgt) {
       $result.= '<td><input type="radio" name="RADVAL'.$counter.'" '.        $result.= '<td><input type="radio" name="RADVAL'.$counter.'" '.
Line 758  KEYWORDS Line 530  KEYWORDS
   $result.='<td>/'.$wgt.' '.$wgtmsg.' </td><td>';    $result.='<td>/'.$wgt.' '.$wgtmsg.' </td><td>';
   
   foreach my $part (&getpartlist($url)) {    foreach my $part (&getpartlist($url)) {
         print "parts=$part<br>";
     my ($temp,$part,$type)=split(/_/,$part);      my ($temp,$part,$type)=split(/_/,$part);
     if ($type eq 'solved') {      if ($type eq 'solved') {
       my ($status,$foo)=split(/_/,$record{"resource.$part.$type"},2);        my ($status,$foo)=split(/_/,$record{"resource.$part.$type"},2);
Line 770  KEYWORDS Line 543  KEYWORDS
       $optsel =~ s/<option>$status/<option selected="on">$status/;        $optsel =~ s/<option>$status/<option selected="on">$status/;
       $result.=$optsel;        $result.=$optsel;
       $result.="</select>&nbsp&nbsp\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>';    $result.='<a href="javascript:msgCenter(document.SCORE,'.$counter.
         ',\''.$fullname.'\')"; TARGET=_self>Compose Message</a></td></tr></table>'."\n";
   #  $result.='</table>';
     $result.='</td></tr></table></td></tr></table>';
   $request->print($result);    $request->print($result);
 #  
 # print end of form    # print end of form
   if ($counter == $total) {    if ($counter == $total) {
       my $endform.='<table border="0"><tr><td><input type="submit" name="gradeOpt" value="Save & Next" />';        my $endform.='<table border="0"><tr><td><input type="submit" name="gradeOpt" value="Save & Next" />';
       my $ntstu ='<select name="NTSTU">'.        my $ntstu ='<select name="NTSTU">'.
Line 793  KEYWORDS Line 567  KEYWORDS
       $endform.='</td><tr></table></form>';        $endform.='</td><tr></table></form>';
       $request->print($endform);        $request->print($endform);
   }    }
   
   return '';    return '';
 }  }
   
 sub get_last_submission {  sub get_last_submission {
   my ($symb,$username,$domain,$course)=@_;    my ($symb,$username,$domain,$course)=@_;
   if ($symb) {    if ($symb) {
         my (@string,@timestamp);
      my (%returnhash)=&Apache::lonnet::restore($symb,$course,$domain,$username);       my (%returnhash)=&Apache::lonnet::restore($symb,$course,$domain,$username);
      if ($returnhash{'version'}) {       if ($returnhash{'version'}) {
  my %lasthash=();   my %lasthash=();
  my $version;   my ($version);
  for ($version=1;$version<=$returnhash{'version'};$version++) {   for ($version=1;$version<=$returnhash{'version'};$version++) {
   foreach (sort(split(/\:/,$returnhash{$version.':keys'}))) {    foreach (sort(split(/\:/,$returnhash{$version.':keys'}))) {
       $lasthash{$_}=$returnhash{$version.':'.$_};        $lasthash{$_}=$returnhash{$version.':'.$_};
   }    }
         }          }
  foreach ((keys %lasthash)) {   foreach ((keys %lasthash)) {
     if ($_ =~ /\.submission$/) {return $lasthash{$_}}      print "lasthash key=$_<br>";
       if ($_ =~ /\.submission$/) {push @string, $_,$lasthash{$_}}
       if ($_ =~ /timestamp/) {push @timestamp, scalar(localtime($lasthash{$_}))};
   #    if ($_ =~ /\.submission$/) {$string = $lasthash{$_}}
   #    if ($_ =~ /timestamp/) {$timestamp=scalar(localtime($lasthash{$_}))};
  }   }
  return '';  
     }      }
        @string = $string[0] eq '' ? 'Nothing submitted - no attempts.' : @string;
        return \@string,\@timestamp;
   }    }
 }  }
   
 sub keywords_highlight {  sub keywords_highlight {
   my $string  = shift;    my $string  = shift;
   (my $url=$ENV{'form.url'})=~s-^http://($ENV{'SERVER_NAME'}|$ENV{'HTTP_HOST'})--;    my $size    = $ENV{'form.kwsize'} eq '0' ? '' : 'size='.$ENV{'form.kwsize'};
   my $symb=($ENV{'form.symb'} ne '' ? $ENV{'form.symb'} : (&Apache::lonnet::symbread($url)));    my $styleon = $ENV{'form.kwstyle'} eq ''  ? '' : $ENV{'form.kwstyle'};
   my %keyhash = &Apache::lonnet::get    (my $styleoff = $styleon) =~ s/\</\<\//;
       ('nohist_handgrade',[$symb.'_keywords'],    my @keylist = split(/[,\s+]/,$ENV{'form.keywords'});
        $ENV{'course.'.$ENV{'request.course.id'}.'.domain'},    foreach (@keylist) {
        $ENV{'course.'.$ENV{'request.course.id'}.'.num'});   #     next if ($_ eq '');
   my @keylist = split(/[,\s+]/,$keyhash{$symb.'_keywords'});        $string =~ s/\b$_(\b|\.)/\<font color\=$ENV{'form.kwclr'} $size\>$styleon$_$styleoff\<\/font\>/gi;
   foreach my $word (@keylist) {  
       next if ($word eq '');  
       $string =~ s/\b$word(\b|\.)/\<font color\=red\>$word\<\/font\>/gi;  
   }    }
   return $string;    return $string;
 }  }
Line 839  sub processHandGrade { Line 617  sub processHandGrade {
   my $button = $ENV{'form.gradeOpt'};    my $button = $ENV{'form.gradeOpt'};
   my $ngrade = $ENV{'form.NCT'};    my $ngrade = $ENV{'form.NCT'};
   my $ntstu  = $ENV{'form.NTSTU'};    my $ntstu  = $ENV{'form.NTSTU'};
   my $keywords= $ENV{'form.keywords'};  
   my $newmsg0  = $ENV{'form.newmsg0'};    my $loginuser = $ENV{'user.name'}.':'.$ENV{'user.domain'};
   print "newmsg0=$newmsg0<br>";    my %keyhash = ();
   my $newmsg1  = $ENV{'form.newmsg1'};    $ENV{'form.keywords'} =~ s/,\s{0,}|\s+/ /g;
   print "newmsg1=$newmsg1<br>";    $keyhash{$symb.'_handgrade'} = 'activated';
   my $oldmsg1  = $ENV{'form.savemsg1'};    $keyhash{$symb.'_keywords'} = $ENV{'form.keywords'};
   print "oldmsg1=$oldmsg1<br>";    $keyhash{$symb.'_subject'} = $ENV{'form.msgsub'};
   my $oldmsg2  = $ENV{'form.savemsg2'};    $keyhash{$loginuser.'_kwclr'} = $ENV{'form.kwclr'};
   print "oldmsg1=$oldmsg2<br>";    $keyhash{$loginuser.'_kwsize'} = $ENV{'form.kwsize'};
   my $oldmsg3  = $ENV{'form.savemsg3'};    $keyhash{$loginuser.'_kwstyle'} = $ENV{'form.kwstyle'};
   print "oldmsg1=$oldmsg3<br>";  
   my $oldmsg4  = $ENV{'form.savemsg4'};    my ($ctr,$idx) = (1,1);
   print "oldmsg1=$oldmsg4<br>";    while ($ctr <= $ENV{'form.savemsgN'}) {
   my $messages  = $ENV{'form.includemsg0'};        if ($ENV{'form.savemsg'.$ctr} ne '') {
   print "messages=$messages<br>";    $keyhash{$symb.'_savemsg'.$idx} = $ENV{'form.savemsg'.$ctr};
  if ($keywords ne '') {    $idx++;
       my $crsname = $ENV{'course.'.$ENV{'request.course.id'}.'.num'};        }
       my $crsdom  = $ENV{'course.'.$ENV{'request.course.id'}.'.domain'};        $ctr++;
 #      my $putresult = &Apache::lonnet::put    }
 #                ('nohist_handgrade',{$symb.'_keywords' => $keywords},    $ctr = 0;
 #                 $crsdom,$crsname);    while ($ctr < $ngrade) {
         if ($ENV{'form.newmsg'.$ctr} ne '') {
     $keyhash{$symb.'_savemsg'.$idx} = $ENV{'form.newmsg'.$ctr};
     $ENV{'form.savemsg'.$idx} = $ENV{'form.newmsg'.$ctr};
     $idx++;
         }
         $ctr++;
   }    }
     $ENV{'form.savemsgN'} = --$idx;
     $keyhash{$symb.'_savemsgN'} = $ENV{'form.savemsgN'};
     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));    my (@parts) = sort(&getpartlist($url));
   
   if ($button eq 'Save & Next') {    if ($button eq 'Save & Next') {
       my $ctr = 0;        my $ctr = 0;
       while ($ctr < $ENV{'form.NCT'}) {        while ($ctr < $ngrade) {
   my ($uname,$udom) = split(/:/,$ENV{'form.unamedom'.$ctr});    my ($uname,$udom) = split(/:/,$ENV{'form.unamedom'.$ctr});
   &saveHandGrade($url,$symb,$uname,$udom,$ctr,@parts);    &saveHandGrade($url,$symb,$uname,$udom,$ctr,@parts);
   
     my $includemsg = $ENV{'form.includemsg'.$ctr};
     my ($subject,$message,$msgstatus) = ('','','');
     if ($includemsg =~ /savemsg|new$ctr/) {
         $subject = $ENV{'form.msgsub'} if ($includemsg =~ /^msgsub/);
         my (@msgnum) = split(/,/,$includemsg);
         foreach (@msgnum) {
     $message.=$ENV{'form.'.$_} if ($_ =~ /savemsg|newmsg/ && $_ ne '');
         }
         $message =~ s/\s+/ /g;
         $msgstatus = &Apache::lonmsg::user_normal_msg ($uname,$udom,$ENV{'form.msgsub'},$message);
     }
   if ($ENV{'form.collaborator'.$ctr}) {    if ($ENV{'form.collaborator'.$ctr}) {
       my (@collaborators) = split(/:/,$ENV{'form.collaborator'.$ctr});        my (@collaborators) = split(/:/,$ENV{'form.collaborator'.$ctr});
       foreach (@collaborators) {        foreach (@collaborators) {
   &saveHandGrade($url,$symb,$_,$udom,$ctr,@parts);    &saveHandGrade($url,$symb,$_,$udom,$ctr,@parts);
     if ($message ne '') {
         $msgstatus = &Apache::lonmsg::user_normal_msg ($uname,$udom,$ENV{'form.msgsub'},$message);
     }
       }        }
   }    }
   $ctr++;    $ctr++;
Line 881  sub processHandGrade { Line 687  sub processHandGrade {
   my $laststu  = $ENV{'form.unamedom'.($ngrade-1)};    my $laststu  = $ENV{'form.unamedom'.($ngrade-1)};
   
   my ($classlist) = &getclasslist($ENV{'form.section'},'0');    my ($classlist) = &getclasslist($ENV{'form.section'},'0');
   
   my (@nextlist,@prevlist);    my (@nextlist,@prevlist);
   my ($nextflg,$prevflg,$ctr,$ctprev) = (0,0,0,0);    my ($nextflg,$prevflg,$ctr,$ctprev) = (0,0,0,0);
   foreach my $student ( sort(@{ $$classlist{$ENV{'form.section'}} }) ) {    foreach my $student ( sort(@{ $$classlist{$ENV{'form.section'}} }) ) {
       my ($uname,$udom) = split(/:/,$student);        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$/) {        if ($nextflg == 1 && $button =~ /Next$/) {
   push @nextlist,$uname if ($ctr < $ntstu);    push @nextlist,$uname if ($ctr < $ntstu);
   $ctr++;    $ctr++;
Line 916  sub processHandGrade { Line 724  sub processHandGrade {
       &submission($request,$ctr,$total);        &submission($request,$ctr,$total);
       $ctr++;        $ctr++;
   }    }
     if ($total < 0) {
   return 'The End';        my $the_end = '<h3><font color="red">LON-CAPA User Message</font></h3><br />'."\n";
         $the_end.='<b>Message: </b> No more students for this section or class.<br /><br />'."\n";
         $the_end.='Click on the button below to return to the grading menu.<br /><br />'."\n";
         $the_end.=&show_grading_menu_form ($symb,$url);
         $request->print($the_end);
     }
     return '';
 }  }
   
 sub saveHandGrade {  sub saveHandGrade {
Line 996  sub gradingmenu { Line 810  sub gradingmenu {
   my $allkeys = &Apache::lonnet::metadata($url,'keys');    my $allkeys = &Apache::lonnet::metadata($url,'keys');
   my $handgrade = ($allkeys =~ /parameter_.*?_handgrade/ ? 'yes' : 'no');    my $handgrade = ($allkeys =~ /parameter_.*?_handgrade/ ? 'yes' : 'no');
   my ($responsetype,$foo) = split(/_/,&Apache::lonnet::metadata($url,'packages'));    my ($responsetype,$foo) = split(/_/,&Apache::lonnet::metadata($url,'packages'));
     $allkeys=~s/,/\<br\>/g;
   #  print "allkeys=$allkeys<br><br>";
     $Apache::lonxml::debug=1;
     &Apache::lonxml::debug(join(':',&Apache::lonnet::metadata($url,'packages')));
     $Apache::lonxml::debug=0;
   
   my $result='<h2>&nbsp;<font color="#339933">Select a Grading Method</font></h2>';    my $result='<h2>&nbsp;<font color="#339933">Select a Grading Method</font></h2>';
   $result.='<table border="0">';    $result.='<table border="0">';
Line 1004  sub gradingmenu { Line 823  sub gradingmenu {
   $result.='<tr><td><font size=+1><b>Type: </b></font></td>'.    $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>';        '<td><font size=+1>'.$responsetype.'&nbsp;&nbsp;<b>Handgrade: </b>'.$handgrade.'</font></td></tr>';
   $result.='</table>';    $result.='</table>';
     my $t0=&Time::HiRes::time();
   $result.=&view_edit_entire_class_form($symb,$url).'<br />';    $result.=&view_edit_entire_class_form($symb,$url).'<br />';
     my $t1=&Time::HiRes::time();
     print "elapsed10=",$t1-$t0,"<br />";
   $result.=&upcsvScores_form($symb,$url).'<br />';    $result.=&upcsvScores_form($symb,$url).'<br />';
     my $t2=&Time::HiRes::time();
     print "elapsed21=",$t2-$t1,"<br />";
   $result.=&viewGradeaStu_form($symb,$url,$responsetype,$handgrade).'<br />';    $result.=&viewGradeaStu_form($symb,$url,$responsetype,$handgrade).'<br />';
     my $t3=&Time::HiRes::time();
     print "elapsed32=",$t3-$t2,"<br />";
   $result.=&verifyReceipt_form($symb,$url);    $result.=&verifyReceipt_form($symb,$url);
     my $t4=&Time::HiRes::time();
     print "elapsed43=",$t4-$t3,"<br />";
     print "Total elapsed time=",$t4-$t0,"<br />";
   return $result;    return $result;
 }  }
   
Line 1055  ENDUPFORM Line 883  ENDUPFORM
   
 sub viewGradeaStu_form {  sub viewGradeaStu_form {
   my ($symb,$url,$response,$handgrade) = @_;    my ($symb,$url,$response,$handgrade) = @_;
   
   
     my $t3=&Time::HiRes::time();
   
   my ($classlist,$sections) = &getclasslist('all','0');    my ($classlist,$sections) = &getclasslist('all','0');
   
     my $t4=&Time::HiRes::time();
     print "elapsed_getclasslist=",$t4-$t3,"<br />";
   
   
   my $result.='<table width=100% border=0><tr><td bgcolor=#777777>'."\n";    my $result.='<table width=100% border=0><tr><td bgcolor=#777777>'."\n";
   $result.='<table width=100% border=0><tr bgcolor="#e6ffff"><td>'."\n";    $result.='<table width=100% border=0><tr bgcolor="#e6ffff"><td>'."\n";
   $result.='&nbsp;<b>View/Grade an Individual Student\'s Submission</b></td></tr>'."\n";    $result.='&nbsp;<b>View/Grade an Individual Student\'s Submission</b></td></tr>'."\n";
Line 1122  sub viewgrades { Line 959  sub viewgrades {
   my ($cdom,$cnum) = split(/_/,$ENV{'request.course.id'});    my ($cdom,$cnum) = split(/_/,$ENV{'request.course.id'});
   #print "Found $cdom:$cnum<br />";    #print "Found $cdom:$cnum<br />";
   my ($classlist) = &getclasslist('all','0');    my ($classlist) = &getclasslist('all','0');
   my $headerclr = '"#ccffff"';    my $headerclr = '"#ddffff"';
   my $cellclr = '"#ffffcc"';    my $cellclr = '"#ffffdd"';
   
   #get list of parts for this problem    #get list of parts for this problem
   my (@parts) = sort(&getpartlist($url));    my (@parts) = sort(&getpartlist($url));
Line 1138  sub viewgrades { Line 975  sub viewgrades {
   '<input type="submit" name="submit" value="Submit Changes" />'."\n".    '<input type="submit" name="submit" value="Submit Changes" />'."\n".
     '<table border=0><tr><td bgcolor="#777777">'."\n".      '<table border=0><tr><td bgcolor="#777777">'."\n".
      '<table border=0>'."\n".       '<table border=0>'."\n".
       '<tr bgcolor='.$headerclr.'><td><b>Username</b></td><td><b>Name</b></td><td><b>Domain</b></td>'."\n";        '<tr bgcolor='.$headerclr.'><td><b>Username</b></td><td><b>Fullname</b></td><td><b>Domain</b></td>'."\n";
   foreach my $part (@parts) {    foreach my $part (@parts) {
      my $display=&Apache::lonnet::metadata($url,$part.'.display');       my $display=&Apache::lonnet::metadata($url,$part.'.display');
      if  (!$display) { $display = &Apache::lonnet::metadata($url,$part.'.name'); }       if  (!$display) { $display = &Apache::lonnet::metadata($url,$part.'.name'); }
Line 1147  sub viewgrades { Line 984  sub viewgrades {
   $result.='</tr>';    $result.='</tr>';
   #get info for each student    #get info for each student
   foreach my $student ( sort(@{ $$classlist{'all'} }) ) {    foreach my $student ( sort(@{ $$classlist{'all'} }) ) {
     my $display=&viewstudentgrade($url,$symb,$ENV{'request.course.id'},$student,@parts);  #    my $display=&viewstudentgrade($url,$symb,$ENV{'request.course.id'},$student,@parts);
 #      print "ID=$ENV{'request.course.id'}:STU=$student:DIS=$display:<br>\n";  #      print "ID=$ENV{'request.course.id'}:STU=$student:DIS=$display:<br>\n";
     $result.=&viewstudentgrade($url,$symb,$ENV{'request.course.id'},$student,@parts);      $result.=&viewstudentgrade($url,$symb,$ENV{'request.course.id'},$student,@parts);
   }    }
Line 1186  sub editgrades { Line 1023  sub editgrades {
   return $result;    return $result;
 }  }
   
   sub sub_page_js {
     my $request = shift;
     $request->print(<<SUBJAVASCRIPT);
   <script type="text/javascript" language="javascript">
     function updateRadio(radioButton,formtextbox,formsel,wgt) {
        var pts = formtextbox.value;
        var resetbox =false;
        if (isNaN(pts) || pts < 0) {
    alert("A number equal or greater than 0 is expected. Entered value = "+pts);
    for (var i=0; i<radioButton.length; i++) {
      if (radioButton[i].checked) {
         formtextbox.value = i;
         resetbox = true;
      }
    }
    if (!resetbox) {
      formtextbox.value = "";
    }
    return;
       }
   
       for (var i=0; i<radioButton.length; i++) {
    radioButton[i].checked=false;
    if (pts == i) {
      radioButton[i].checked=true;
    }
       }
       updateSelect(formsel,pts,wgt);
     }
   
     function writeBox(formrad,formsel,pts,wgt) {
       formrad.value = pts;
       updateSelect(formsel,pts,wgt);
       return;
     }
   
     function updateSelect(formsel,pts,wgt) {
       if (pts == 0) {
         formsel[1].selected = true;
       }
       if (pts > 0 && pts < wgt) {
         formsel[4].selected = true;
       }
       if (pts == wgt) {
         formsel[0].selected = true;
       }
       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? Edit if desired.",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+',screenx=70,screeny=75,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,screenx=100,screeny=75');
       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>
   SUBJAVASCRIPT
   }
   
 sub csvupload_javascript_reverse_associate {  sub csvupload_javascript_reverse_associate {
   return(<<ENDPICK);    return(<<ENDPICK);
   function verify(vf) {    function verify(vf) {

Removed from v.1.36  
changed lines
  Added in v.1.38


FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>