[LON-CAPA-cvs] cvs: loncom /homework grades.pm
ng
lon-capa-cvs@mail.lon-capa.org
Sun, 07 Jul 2002 20:08:45 -0000
This is a MIME encoded message
--ng1026072525
Content-Type: text/plain
ng Sun Jul 7 16:08:45 2002 EDT
Modified files:
/loncom/homework grades.pm
Log:
add javascript to do the following:
1- select and paste keywords
2- change keyword highlight attributes
3- compose a message
These functions have yet to be implemented in the main body.
--ng1026072525
Content-Type: text/plain
Content-Disposition: attachment; filename="ng-20020707160845.txt"
Index: loncom/homework/grades.pm
diff -u loncom/homework/grades.pm:1.35 loncom/homework/grades.pm:1.36
--- loncom/homework/grades.pm:1.35 Wed Jul 3 17:05:33 2002
+++ loncom/homework/grades.pm Sun Jul 7 16:08:45 2002
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# The LON-CAPA Grading handler
#
-# $Id: grades.pm,v 1.35 2002/07/03 21:05:33 ng Exp $
+# $Id: grades.pm,v 1.36 2002/07/07 20:08:45 ng Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -351,7 +351,7 @@
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;
@@ -400,30 +400,220 @@
function keywords(keyform) {
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;
keyform.value = nret;
return;
}
- function addmsg(msgform) {
- var msg = msgform.value;
- var nret = prompt("Enter the message you wish to send to the student.",msg);
+//===================== 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;
- msgform.value = nret;
+ var curlist = document.SCORE.keywords.value;
+ document.SCORE.keywords.value = curlist+" "+nret;
return;
}
- function savedmsg(msgform) {
- var Nmsg = msgform.value;
- var nret = prompt("Number of saved messages = ",Nmsg);
- if (nret==null) return;
- msgform.value = nret;
+//====================== 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> 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> ");
+ pWin.document.write("<input type=\\"button\\" value=\\"Save\\" onClick=\\"javascript:checkInput()\\"> ");
+ 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> 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+"> "+clrtxt+"</td>");
+ hwdWin.document.write("<td align=\\"left\\">");
+ hwdWin.document.write("<input name=\\"kwdsize\\" type=\\"radio\\" value=\\""+szval+"\\" "+szsel+"> "+sztxt+"</td>");
+ hwdWin.document.write("<td align=\\"left\\">");
+ hwdWin.document.write("<input name=\\"kwdstyle\\" type=\\"radio\\" value=\\""+syval+"\\" "+sysel+"> "+sytxt+"</td>");
+ hwdWin.document.write("</tr>");
+ }
+
+function highlightend() {
+ hwdWin.document.write("</table>");
+ hwdWin.document.write("</td></tr></table> ");
+ hwdWin.document.write("<input type=\\"button\\" value=\\"Set Options\\" onClick=\\"javascript:updateChoice()\\"> ");
+ 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 ''; }
@@ -436,7 +626,8 @@
#
# header info
if ($counter == 0) {
- $request->print('<h2><font color="#339933">Submission Record</font></h2>');
+ $request->print('<h2> <font color="#339933">Submission Record</font></h2>'.
+ '<font size=+1> <b>Resource: </b>'.$url.'</font>');
}
#
@@ -473,20 +664,25 @@
'<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="addmsg" value="" />'."\n".
- '<input type="hidden" name="savemsgN" value="3" />'."\n".
- '<input type="hidden" name="savemsg0" value="Good Job!" />'."\n".
- '<input type="hidden" name="savemsg1" value="Needs a better explanation." />'."\n".
- '<input type="hidden" name="savemsg2" value="Read the book before submitting such garbagge!" />'."\n".
+ '<input type="hidden" name="kwclr" value="blue" />'."\n".
+ '<input type="hidden" name="kwsize" value="0" />'."\n".
+ '<input type="hidden" name="kwstyle" value="" />'."\n".
+ '<input type="hidden" name="msgsub" value="Problem title" />'."\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"'.
' value="'.($ENV{'form.NTSTU'} ne '' ? $ENV{'form.NTSTU'} : '1').'" />'."\n");
if ($ENV{'form.handgrade'} eq 'yes') {
$request->print(<<KEYWORDS);
- <b>Grading Options</b>
-<a href="javascript:keywords(document.SCORE.keywords)"; TARGET=_self>Keywords list</a>
-<a href="javascript:addmsg(document.SCORE.addmsg)"; TARGET=_self>Add a message</a>
-<a href="javascript:savedmsg(document.SCORE.savemsgN)"; TARGET=_self>Saved messages</a><br /><br />
+ <b>Keyword Options</b>
+<a href="javascript:keywords(document.SCORE.keywords)"; TARGET=_self>Keyword List</a>
+<a href="#" onMouseDown="javascript:getSel(); return false"
+ CLASS="page">Paste Selection to Keyword list</a> (requires N4+ and IE5+)
+<a href="javascript:kwhighlight()"; TARGET=_self>Keyword Highlight Attribute</a><br /><br />
KEYWORDS
}
}
@@ -494,9 +690,10 @@
#
# 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.
+# ($ENV{'form.fullname'} ne '' ? $ENV{'form.fullname'} : &get_fullname($uname,$udom)).
'</td><td><b>Domain: </b>'.$udom.'</td></tr>';
if ($ENV{'form.handgrade'} eq 'yes') {
my $subonly = &get_last_submission($symb,$uname,$udom,$ENV{'request.course.id'});
@@ -517,7 +714,7 @@
'" value="'.(join ':',@collaborators).'" />'."\n";
}
}
- $result.='<tr><td colspan=3><b>Resource: </b>'.$url.'</td></tr></table>'."\n";
+ $result.='</table>'."\n";
$request->print($result);
#
# print student answer
@@ -536,6 +733,8 @@
# 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;
@@ -570,7 +769,9 @@
'<option>partial</option><option>nothing</option>'."\n";
$optsel =~ s/<option>$status/<option selected="on">$status/;
$result.=$optsel;
- $result.="</select></td></tr>\n";
+ $result.="</select>  \n";
+ $result.='<a href="javascript:msgCenter(document.SCORE,'.$counter.
+ ',\''.$fullname.'\')"; TARGET=_self>Compose Message</a></td></tr>'."\n";
}
}
$result.='</table>';
@@ -639,14 +840,26 @@
my $ngrade = $ENV{'form.NCT'};
my $ntstu = $ENV{'form.NTSTU'};
my $keywords= $ENV{'form.keywords'};
- my $addmsg = $ENV{'form.addmsg'};
- print "addmsg=$addmsg<br>";
- if ($keywords ne '') {
+ my $newmsg0 = $ENV{'form.newmsg0'};
+ print "newmsg0=$newmsg0<br>";
+ 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 $crsdom = $ENV{'course.'.$ENV{'request.course.id'}.'.domain'};
- my $putresult = &Apache::lonnet::put
- ('nohist_handgrade',{$symb.'_keywords' => $keywords},
- $crsdom,$crsname);
+# my $putresult = &Apache::lonnet::put
+# ('nohist_handgrade',{$symb.'_keywords' => $keywords},
+# $crsdom,$crsname);
}
my (@parts) = sort(&getpartlist($url));
--ng1026072525--