[BACK]Return to grades.pm CVS log [TXT] [DIR] Up to [LON-CAPA] / loncom / homework

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

version 1.35, 2002/07/03 21:05:33 version 1.36, 2002/07/07 20:08:45
Line 351  sub submission { Line 351  sub submission {
   my ($request,$counter,$total) = @_;    my ($request,$counter,$total) = @_;
   
   if ($counter == 0) {    if ($counter == 0) {
       $request->print(<<JAVASCRIPT);        $request->print(<<SUBJAVASCRIPT);
 <script type="text/javascript" language="javascript">  <script type="text/javascript" language="javascript">
   function updateRadio(radioButton,formtextbox,formsel,wgt) {    function updateRadio(radioButton,formtextbox,formsel,wgt) {
      var pts = formtextbox.value;       var pts = formtextbox.value;
Line 400  sub submission { Line 400  sub submission {
   
   function keywords(keyform) {    function keywords(keyform) {
     var keywds = keyform.value;      var keywds = keyform.value;
     var nret = prompt("Keywords list, separate by a space or comma. Add/delete to list if desired.",keywds);      var nret = prompt("Keywords list, separated by a space. Add/delete to list if desired.",keywds);
     if (nret==null) return;      if (nret==null) return;
     keyform.value = nret;      keyform.value = nret;
     return;      return;
   }    }
   
   function addmsg(msgform) {  //===================== Script to add keyword(s) ==================
     var msg  = msgform.value;    function getSel() {
     var nret = prompt("Enter the message you wish to send to the student.",msg);      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;      if (nret==null) return;
     msgform.value = nret;      var curlist = document.SCORE.keywords.value;
       document.SCORE.keywords.value = curlist+" "+nret;
     return;      return;
   }    }
   
   function savedmsg(msgform) {  //====================== Script for composing message ==============
     var Nmsg  = msgform.value;    function msgCenter(msgform,usrctr,fullname) {
     var nret = prompt("Number of saved messages = ",Nmsg);      var Nmsg  = msgform.savemsgN.value;
     if (nret==null) return;      savedMsgHeader(Nmsg,usrctr,fullname);
     msgform.value = nret;      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;      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>  </script>
 JAVASCRIPT  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 ''; }
Line 436  JAVASCRIPT Line 626  JAVASCRIPT
 #  #
 # header info  # header info
   if ($counter == 0) {    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>');
   }    }
   
 #  #
Line 473  JAVASCRIPT Line 664  JAVASCRIPT
       '<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="command"    value="handgrade" />'."\n".
       '<input type="hidden" name="keywords"   value="'.$keyhash{$symb.'_keywords'}.'" />'."\n".        '<input type="hidden" name="keywords"   value="'.$keyhash{$symb.'_keywords'}.'" />'."\n".
       '<input type="hidden" name="addmsg"     value="" />'."\n".        '<input type="hidden" name="kwclr"      value="blue" />'."\n".
       '<input type="hidden" name="savemsgN"   value="3" />'."\n".        '<input type="hidden" name="kwsize"     value="0" />'."\n".
       '<input type="hidden" name="savemsg0"   value="Good Job!" />'."\n".        '<input type="hidden" name="kwstyle"    value="" />'."\n".
       '<input type="hidden" name="savemsg1"   value="Needs a better explanation." />'."\n".        '<input type="hidden" name="msgsub"     value="Problem title" />'."\n".
       '<input type="hidden" name="savemsg2"   value="Read the book before submitting such garbagge!" />'."\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'} : '1').'" />'."\n");
   
       if ($ENV{'form.handgrade'} eq 'yes') {        if ($ENV{'form.handgrade'} eq 'yes') {
   $request->print(<<KEYWORDS);    $request->print(<<KEYWORDS);
 &nbsp;<b>Grading Options</b>   &nbsp;<b>Keyword Options</b>&nbsp;
 <a href="javascript:keywords(document.SCORE.keywords)"; TARGET=_self>Keywords list</a>&nbsp; &nbsp;  <a href="javascript:keywords(document.SCORE.keywords)"; TARGET=_self>Keyword List</a>&nbsp; &nbsp;
 <a href="javascript:addmsg(document.SCORE.addmsg)"; TARGET=_self>Add a message</a>&nbsp; &nbsp;  <a href="#" onMouseDown="javascript:getSel(); return false"
 <a href="javascript:savedmsg(document.SCORE.savemsgN)"; TARGET=_self>Saved messages</a><br /><br />   CLASS="page">Paste Selection to Keyword list</a> (requires N4+ and IE5+)&nbsp; &nbsp;
   <a href="javascript:kwhighlight()"; TARGET=_self>Keyword Highlight Attribute</a><br /><br />
 KEYWORDS  KEYWORDS
       }        }
   }    }
Line 494  KEYWORDS Line 690  KEYWORDS
 #  #
 # Student info  # Student info
   $request->print(($counter == 0 ? '' : '<br /><hr><br />'));    $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.    my $result.='<table border="0"><tr><td><b>Username: </b>'.$uname.
       '</td><td><b>Fullname: </b>'.        '</td><td><b>Fullname: </b>'.$fullname.
   ($ENV{'form.fullname'} ne '' ? $ENV{'form.fullname'} : &get_fullname($uname,$udom)).  #  ($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'});
Line 517  KEYWORDS Line 714  KEYWORDS
       '" value="'.(join ':',@collaborators).'" />'."\n";        '" value="'.(join ':',@collaborators).'" />'."\n";
       }        }
   }    }
   $result.='<tr><td colspan=3><b>Resource: </b>'.$url.'</td></tr></table>'."\n";    $result.='</table>'."\n";
   $request->print($result);    $request->print($result);
 #  #
 # print student answer  # print student answer
Line 536  KEYWORDS Line 733  KEYWORDS
 # 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="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;
   
Line 570  KEYWORDS Line 769  KEYWORDS
       '<option>partial</option><option>nothing</option>'."\n";        '<option>partial</option><option>nothing</option>'."\n";
       $optsel =~ s/<option>$status/<option selected="on">$status/;        $optsel =~ s/<option>$status/<option selected="on">$status/;
       $result.=$optsel;        $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>';    $result.='</table>';
Line 639  sub processHandGrade { Line 840  sub processHandGrade {
   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 $keywords= $ENV{'form.keywords'};
   my $addmsg  = $ENV{'form.addmsg'};    my $newmsg0  = $ENV{'form.newmsg0'};
   print "addmsg=$addmsg<br>";    print "newmsg0=$newmsg0<br>";
   if ($keywords ne '') {    my $newmsg1  = $ENV{'form.newmsg1'};
     print "newmsg1=$newmsg1<br>";
     my $oldmsg1  = $ENV{'form.savemsg1'};
     print "oldmsg1=$oldmsg1<br>";
     my $oldmsg2  = $ENV{'form.savemsg2'};
     print "oldmsg1=$oldmsg2<br>";
     my $oldmsg3  = $ENV{'form.savemsg3'};
     print "oldmsg1=$oldmsg3<br>";
     my $oldmsg4  = $ENV{'form.savemsg4'};
     print "oldmsg1=$oldmsg4<br>";
     my $messages  = $ENV{'form.includemsg0'};
     print "messages=$messages<br>";
    if ($keywords ne '') {
       my $crsname = $ENV{'course.'.$ENV{'request.course.id'}.'.num'};        my $crsname = $ENV{'course.'.$ENV{'request.course.id'}.'.num'};
       my $crsdom  = $ENV{'course.'.$ENV{'request.course.id'}.'.domain'};        my $crsdom  = $ENV{'course.'.$ENV{'request.course.id'}.'.domain'};
       my $putresult = &Apache::lonnet::put  #      my $putresult = &Apache::lonnet::put
                 ('nohist_handgrade',{$symb.'_keywords' => $keywords},  #                ('nohist_handgrade',{$symb.'_keywords' => $keywords},
                  $crsdom,$crsname);  #                 $crsdom,$crsname);
   }    }
   my (@parts) = sort(&getpartlist($url));    my (@parts) = sort(&getpartlist($url));
   
Removed from v.1.35  
changed lines
  Added in v.1.36

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