--- loncom/homework/grades.pm 2001/07/26 15:50:25 1.9
+++ loncom/homework/grades.pm 2002/07/01 21:20:29 1.34
@@ -1,6 +1,37 @@
+# The LearningOnline Network with CAPA
# The LON-CAPA Grading handler
+#
+# $Id: grades.pm,v 1.34 2002/07/01 21:20:29 ng Exp $
+#
+# Copyright Michigan State University Board of Trustees
+#
+# This file is part of the LearningOnline Network with CAPA (LON-CAPA).
+#
+# LON-CAPA is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# LON-CAPA is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with LON-CAPA; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+#
+# /home/httpd/html/adm/gpl.txt
+#
+# http://www.lon-capa.org/
+#
# 2/9,2/13 Guy Albertelli
# 6/8 Gerd Kortemeyer
+# 7/26 H.K. Ng
+# 8/20 Gerd Kortemeyer
+# Year 2002
+# June 2002 H.K. Ng
+#
package Apache::grades;
use strict;
@@ -16,16 +47,152 @@ sub moreinfo {
$request->print("Unable to process request: $reason");
if ( $Apache::grades::viewgrades eq 'F' ) {
$request->print('<form action="/adm/grades" method="post">'."\n");
- $request->print('<input type="hidden" name="url" value="'.$ENV{'form.url'}.'"></input>'."\n");
- $request->print('<input type="hidden" name="command" value="'.$ENV{'form.command'}.'"></input>'."\n");
- $request->print("Student:".'<input type="text" name="student" value="'.$ENV{'form.student'}.'"></input>'."<br />\n");
- $request->print("Domain:".'<input type="text" name="domain" value="'.$ENV{'user.domain'}.'"></input>'."<br />\n");
- $request->print('<input type="submit" name="submit" value="ReSubmit"></input>'."<br />\n");
+ if ($ENV{'form.url'}) {
+ $request->print('<input type="hidden" name="url" value="'.$ENV{'form.url'}.'" />'."\n");
+ }
+ if ($ENV{'form.symb'}) {
+ $request->print('<input type="hidden" name="symb" value="'.$ENV{'form.symb'}.'" />'."\n");
+ }
+ $request->print('<input type="hidden" name="command" value="'.$ENV{'form.command'}.'" />'."\n");
+ $request->print("Student:".'<input type="text" name="student" value="'.$ENV{'form.student'}.'" />'."<br />\n");
+ $request->print("Domain:".'<input type="text" name="domain" value="'.$ENV{'user.domain'}.'" />'."<br />\n");
+ $request->print('<input type="submit" name="submit" value="ReSubmit" />'."<br />\n");
$request->print('</form>');
}
return '';
}
+sub verifyreceipt {
+ my $request=shift;
+ my $courseid=$ENV{'request.course.id'};
+# my $cdom=$ENV{"course.$courseid.domain"};
+# my $cnum=$ENV{"course.$courseid.num"};
+ my $receipt=unpack("%32C*",$Apache::lonnet::perlvar{'lonHostID'}).'-'.
+ $ENV{'form.receipt'};
+ $receipt=~s/[^\-\d]//g;
+ my $symb=$ENV{'form.symb'};
+ unless ($symb) {
+ $symb=&Apache::lonnet::symbread($ENV{'form.url'});
+ }
+ if ((&Apache::lonnet::allowed('mgr',$courseid)) && ($symb)) {
+ $request->print('<h1>Verifying Submission Receipt '.$receipt.'</h1>');
+ my $matches=0;
+ my ($classlist) = &getclasslist('all','0');
+ foreach my $student ( sort(@{ $$classlist{'all'} }) ) {
+ my ($uname,$udom)=split(/\:/,$student);
+ if ($receipt eq
+ &Apache::lonnet::ireceipt($uname,$udom,$courseid,$symb)) {
+ $request->print('Matching '.$student.'<br>');
+ $matches++;
+ }
+ }
+ $request->printf('<p>'.$matches." match%s</p>",$matches <= 1 ? '' : 'es');
+# needs to print who is matched
+ }
+ return '';
+}
+
+sub student_gradeStatus {
+ my ($url,$udom,$uname) = @_;
+ my $symb=($ENV{'form.symb'} ne '' ? $ENV{'form.symb'} : (&Apache::lonnet::symbread($url)));
+ my %record= &Apache::lonnet::restore($symb,$ENV{'request.course.id'},$udom,$uname);
+ foreach my $part (&getpartlist($url)) {
+ my ($temp,$part,$type)=split(/_/,$part);
+ if ($type eq 'solved') {
+ my ($status,$foo)=split(/_/,$record{"resource.$part.$type"},2);
+ $status = 'partial' if ($foo =~ /^partially/);
+ $status = 'nothing' if ($status eq '');
+ return $type,$status;
+ }
+ }
+ return '';
+}
+
+sub get_fullname {
+ my ($sname,$sdom) = @_;
+ my %name=&Apache::lonnet::get('environment', ['lastname','generation',
+ 'firstname','middlename'],
+ $sdom,$sname);
+ my $fullname;
+ my ($tmp) = keys(%name);
+ if ($tmp !~ /^(con_lost|error|no_such_host)/i) {
+ $fullname=$name{'lastname'}.$name{'generation'};
+ if ($fullname =~ /[^\s]+/) { $fullname.=', '; }
+ $fullname.=$name{'firstname'}.' '.$name{'middlename'};
+ }
+ return $fullname;
+}
+
+sub listStudents {
+ my ($request) = shift;
+ my $cdom =$ENV{"course.$ENV{'request.course.id'}.domain"};
+ my $cnum =$ENV{"course.$ENV{'request.course.id'}.num"};
+ my $getsec =$ENV{'form.section'};
+ my $submitonly=$ENV{'form.submitonly'};
+
+ $request->print(<<ENDTABLEST);
+<h2><font color="#339933"> View Submissions for a Student or a Group of Students</font></h2>
+ <font size=+1><b>Resource:</b> $ENV{'form.url'}<br /><br />
+<form action="/adm/grades" method="post"> <b>View Options</b></font><br />
+ <b>View Problem: </b><input type="radio" name="vProb" value="no" checked> no
+<input type="radio" name="vProb" value="yes"> yes
+ <b>Submissions: </b><input type="radio" name="lastSub" value="last" checked> last
+<input type="radio" name="lastSub" value="all"> all
+<input type="hidden" name="section" value="$getsec">
+<input type="hidden" name="submitonly" value="$submitonly">
+<table border="0"><tr><td bgcolor="#777777">
+<table border="0"><tr bgcolor="#e6ffff">
+<td><b> Select </b></td><td><b> Username </b></td>
+<td><b> Fullname </b></td><td><b> Domain </b></td>
+<td><b> Grade Status </b></td></tr>
+ENDTABLEST
+ if ($ENV{'form.url'}) {
+ $request->print('<input type="hidden" name="url" value="'.$ENV{'form.url'}.'" />'."\n");
+ }
+ if ($ENV{'form.symb'}) {
+ $request->print('<input type="hidden" name="symb" value="'.$ENV{'form.symb'}.'" />'."\n");
+ }
+ $request->print('<input type="hidden" name="command" value="processGroup" />'."\n");
+
+ my ($classlist) = &getclasslist($getsec,'0');
+ foreach my $student ( sort(@{ $$classlist{$getsec} }) ) {
+ my ($sname,$sdom) = split(/:/,$student);
+ my ($type,$status) = &student_gradeStatus($ENV{'form.url'},$cdom,$sname);
+ next if ($status eq 'nothing' && $submitonly eq 'yes');
+
+ my $fullname = &get_fullname($sname,$sdom);
+ if ( $Apache::grades::viewgrades eq 'F' ) {
+ $request->print("\n".'<tr bgcolor="#ffffe6">'.
+ '<td align="center"><input type=checkbox name="stuinfo" value="'.
+ $student.':'.$fullname.'"></td>'."\n".
+ '<td> '.$sname.' </td>'."\n".
+ '<td> '.$fullname.' </td>'."\n".
+ '<td align="middle"> '.$sdom.' </td>'."\n");
+ $request->print('<td align="middle"> '.$status.' </td>'."\n");
+
+ $request->print('</tr>');
+ }
+ }
+ $request->print('</table></td></tr></table>');
+ $request->print('<input type="submit" name="submit" value="View/Grade" /><form />');
+}
+
+sub processGroup {
+ my ($request) = shift;
+ my $ctr = 0;
+ my @stuchecked = (ref($ENV{'form.stuinfo'}) ? @{$ENV{'form.stuinfo'}}
+ : ($ENV{'form.stuinfo'}) );
+ my $total = scalar(@stuchecked)-1;
+ foreach my $student (@stuchecked) {
+ my ($sname,$sdom,$fullname) = split(/:/,$student);
+ $ENV{'form.student'} = $sname;
+ $ENV{'form.fullname'} = $fullname;
+ &submission($request,$ctr,$total);
+ $ctr++;
+ }
+
+ return 'The End';
+}
#FIXME - needs to handle multiple matches
sub finduser {
@@ -34,11 +201,10 @@ sub finduser {
if ( $Apache::grades::viewgrades eq 'F' ) {
#get classlist
- my ($cdom,$cnum) = split(/_/,$ENV{'request.course.id'});
- my $chome=$ENV{"course.$ENV{'request.course.id'}.home"};
- #print "Found $cdom:$cnum:$chome<br />";
- my (%classlist) = &getclasslist($cdom,$cnum,$chome,'0');
- foreach my $student ( sort(@{ $classlist{'allids'} }) ) {
+# my ($cdom,$cnum) = split(/_/,$ENV{'request.course.id'});
+ #print "Found $cdom:$cnum<br />";
+ my ($classlist) = &getclasslist('all','0');
+ foreach my $student ( sort(@{ $$classlist{'all'} }) ) {
my ($posname,$posdomain) = split(/:/,$student);
if ($posname =~ $name) { $name=$posname; $domain=$posdomain; last; }
}
@@ -49,21 +215,27 @@ sub finduser {
}
sub getclasslist {
- my ($coursedomain,$coursenum,$coursehome,$hideexpired) = @_;
- my $classlist=&Apache::lonnet::reply("dump:$coursedomain:$coursenum:classlist",$coursehome);
- my %classlist=();
+ my ($getsec,$hideexpired) = @_;
+ my ($coursedomain,$coursenum) = split(/_/,$ENV{'request.course.id'});
+ my %classlist=&Apache::lonnet::dump('classlist',$coursedomain,$coursenum);
my $now = time;
- foreach my $record (split /&/, $classlist) {
- my ($name,$value)=split(/=/,&Apache::lonnet::unescape($record));
- my ($end,$start)=split(/:/,$value);
+ my (@holdsec,@sections);
+ foreach my $student (keys(%classlist)) {
+ my ($end,$start)=split(/:/,$classlist{$student});
# still a student?
if (($hideexpired) && ($end) && ($end < $now)) {
- print "Skipping:$name:$end:$now<br />\n";
next;
}
- push( @{ $classlist{'allids'} }, $name);
+ my ($unam,$udom) = split(/:/,$student,2);
+ my $section = &Apache::lonnet::usection($udom,$unam,$ENV{'request.course.id'});
+ push @holdsec,$section;
+ push (@{ $classlist{$getsec} }, $student) if ($getsec eq 'all' or $getsec == $section);
+ }
+ my %seen = ();
+ foreach my $item (@holdsec) {
+ push (@sections, $item) unless $seen{$item}++;
}
- return (%classlist);
+ return (\%classlist,\@sections);
}
sub getpartlist {
@@ -71,7 +243,7 @@ sub getpartlist {
my @parts =();
my (@metakeys) = split(/,/,&Apache::lonnet::metadata($url,'keys'));
foreach my $key (@metakeys) {
- if ( $key =~ m/stores_([0-9]+)_.*/ ) {
+ if ( $key =~ m/stores_([0-9]+)_.*/) {
push(@parts,$key);
}
}
@@ -81,58 +253,49 @@ sub getpartlist {
sub viewstudentgrade {
my ($url,$symb,$courseid,$student,@parts) = @_;
my $result ='';
+ my $cellclr = '"#ffffdd"';
+ my ($username,$domain) = split(/:/,$student);
- my ($stuname,$domain) = split(/:/,$student);
-
- my %record=&Apache::lonnet::restore($symb,$courseid,$domain,$stuname);
+ my $fullname = &get_fullname($username,$domain);
+ my %record=&Apache::lonnet::restore($symb,$courseid,$domain,$username);
- $result.="<tr><td>$stuname</td><td>$domain</td>\n";
+ $result.="<tr bgcolor=$cellclr><td>$username</td><td>$fullname</td><td align=\"middle\">$domain</td>\n";
foreach my $part (@parts) {
my ($temp,$part,$type)=split(/_/,$part);
- #print "resource.$part.$type = ".$record{"resource.$part.$type"}." <br />\n";
- if ($type eq 'awarded') {
- my $score=$record{"resource.$part.$type"};
- $result.="<td><input type=\"text\" name=\"GRADE.$student.$part.$type\" value=\"$score\" size=\"4\" /></td>\n";
- } elsif ($type eq 'tries') {
- my $score=$record{"resource.$part.$type"};
- $result.="<td><input type=\"text\" name=\"GRADE.$student.$part.$type\" value=\"$score\" size=\"4\" /></td>\n"
+ my $score=$record{"resource.$part.$type"};
+ if ($type eq 'awarded' || $type eq 'tries') {
+ $result.='<td align="middle"><input type="text" name="GRADE.'.$student.'.'.$part.'.'.$type.
+ '" value="'.$score.'" size="4" /></td>'."\n";
} elsif ($type eq 'solved') {
- my $score=$record{"resource.$part.$type"};
- $result.="<td><select name=\"GRADE.$student.$part.$type\">\n";
- if ($score =~ /^correct/) {
- $result.="<option selected=\"on\">correct</option>\n<option>incorrect</option>\n<option>excused</option>\n<option>ungraded</option>\n<option>nothing</option>\n";
- } elsif ($score =~ /^incorrect/) {
- $result.="<option>correct</option>\n<option selected=\"on\">incorrect</option>\n<option>excused</option>\n<option>ungraded</option>\n<option>nothing</option>\n";
- } elsif ($score eq '') {
- $result.="<option>correct</option>\n<option>incorrect</option>\n<option>excused</option>\n<option>ungraded</option>\n<option selected=\"on\">nothing</option>\n";
- } elsif ($score =~ /^excused/) {
- $result.="<option>correct</option>\n<option>incorrect</option>\n<option selected=\"on\">excused</option>\n<option>ungraded</option>\n<option>nothing</option>\n";
- } elsif ($score =~ /^ungraded/) {
- $result.="<option>correct</option>\n<option>incorrect</option>\n<option>excused</option>\n<option selected=\"on\">ungraded</option>\n<option>nothing</option>\n";
- }
+ my ($status,$foo)=split(/_/,$score,2);
+ $result.="<td align=\"middle\"><select name=\"GRADE.$student.$part.$type\">\n";
+ my $optsel = '<option>correct</option><option>incorrect</option><option>excused</option>'.
+ '<option>ungraded</option><option>partial</option><option>nothing</option>'."\n";
+ $status = 'nothing' if ($status eq '');
+ $optsel =~ s/<option>$status/<option selected="on">$status/;
+ $result.=$optsel;
$result.="</select></td>\n";
}
}
- $result.='</tr>';
+ $result.='<td></td></tr>';
return $result;
}
-#FIXME need to look at the meatdata <stores> spec on what type of data to accept and provide an
+
+#FIXME need to look at the metadata <stores> spec on what type of data to accept and provide an
#interface based on that, also do that to above function.
sub setstudentgrade {
my ($url,$symb,$courseid,$student,@parts) = @_;
-
+ print "set student grade parts=@parts<br>";
my $result ='';
-
my ($stuname,$domain) = split(/:/,$student);
-
my %record=&Apache::lonnet::restore($symb,$courseid,$domain,$stuname);
-
my %newrecord;
foreach my $part (@parts) {
my ($temp,$part,$type)=split(/_/,$part);
my $oldscore=$record{"resource.$part.$type"};
my $newscore=$ENV{"form.GRADE.$student.$part.$type"};
+ print "old=$oldscore:new=$newscore:<br>";
if ($type eq 'solved') {
my $update=0;
if ($newscore eq 'nothing' ) {
@@ -143,10 +306,11 @@ sub setstudentgrade {
} elsif ($oldscore !~ m/^$newscore/) {
$update=1;
$result.="Updating $stuname to $newscore<br />\n";
- if ($newscore eq 'correct') { $newscore = 'correct_by_override'; }
+ if ($newscore eq 'correct') { $newscore = 'correct_by_override'; }
if ($newscore eq 'incorrect') { $newscore = 'incorrect_by_override'; }
- if ($newscore eq 'excused') { $newscore = 'excused'; }
- if ($newscore eq 'ungraded') { $newscore = 'ungraded_attempted'; }
+ if ($newscore eq 'excused') { $newscore = 'excused'; }
+ if ($newscore eq 'ungraded') { $newscore = 'ungraded_attempted'; }
+ if ($newscore eq 'partial') { $newscore = 'correct_partially_by_override'; }
} else {
#$result.="$stuname:$part:$type:unchanged $oldscore to $newscore:<br />\n";
}
@@ -161,25 +325,450 @@ sub setstudentgrade {
}
}
if ( scalar(keys(%newrecord)) > 0 ) {
- $newrecord{"resource.regrader"}="$ENV{'user.name'}:$ENV{'user.domain'}";
- &Apache::lonnet::cstore(\%newrecord,$symb,$courseid,$domain,$stuname);
+ $newrecord{'resource.regrader'}="$ENV{'user.name'}:$ENV{'user.domain'}";
+ print "grader=$newrecord{'resource.regrader'}:<br>records<br>";
+ while (my ($k,$v) = each %newrecord) {
+ print "k=$k:v=$v:<br>\n";
+ }
+# &Apache::lonnet::cstore(\%newrecord,$symb,$courseid,$domain,$stuname);
+
$result.="Stored away ".scalar(keys(%newrecord))." elements.<br />\n";
}
return $result;
}
+#
+# --------------------------- show submissions of a student, option to grade --------
sub submission {
- my ($request) = @_;
- my $url=$ENV{'form.url'};
- $url=~s-^http://($ENV{'SERVER_NAME'}|$ENV{'HTTP_HOST'})--;
+ my ($request,$counter,$total) = @_;
+
+ if ($counter == 0) {
+ $request->print(<<JAVASCRIPT);
+<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;
+ }
+
+</script>
+JAVASCRIPT
+}
+ (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 ''; }
my ($uname,$udom) = &finduser($ENV{'form.student'});
if ($uname eq '') { &moreinfo($request,"Unable to find student"); return ''; }
- my $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 ''; }
+ my $last = ($ENV{'form.lastSub'} eq 'last' ? 'last' : '');
+#
+# header info
+ if ($counter == 0) {
+ $request->print('<h2><font color="#339933">Submission Record</font></h2>');
+ }
+
+#
+# option to display problem, only once else it cause problems with the form later since the problem has a form.
+ if ($ENV{'form.vProb'} eq 'yes' && $counter == 0) {
+ my $rendered=&Apache::loncommon::get_student_view($symb,$uname,$udom,
+ $ENV{'request.course.id'});
+ my $companswer=&Apache::loncommon::get_student_answers($symb,$uname,$udom,
+ $ENV{'request.course.id'});
+ my $result.='<table border="0" width="100%"><tr><td bgcolor="#777777">';
+ $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>Correct answer:</b><br />'.$companswer;
+ $result.='</td></tr></table>';
+ $result.='</td></tr></table><br />';
+ $request->print($result);
+ }
+#
+# beginning of form
+ if ($counter == 0) {
+ $request->print('<form action="/adm/grades" method="post" name="SCORE">'."\n".
+ '<input type="hidden" name="symb" value="'.$symb.'" />'."\n".
+ '<input type="hidden" name="url" value="'.$url.'" />'."\n".
+ '<input type="hidden" name="vProb" value="'.$ENV{'form.vProb'}.'" />'."\n".
+ '<input type="hidden" name="lastSub" value="'.$last.'" />'."\n".
+ '<input type="hidden" name="section" value="'.$ENV{'form.section'}.'">'."\n".
+ '<input type="hidden" name="submitonly" value="'.$ENV{'form.submitonly'}.'">'."\n".
+ '<input type="hidden" name="command" value="handgrade" />'."\n".
+ '<input type="hidden" name="NCT"'.
+ ' value="'.($ENV{'form.NTSTU'} ne '' ? $ENV{'form.NTSTU'} : '1').'" />'."\n");
+ }
+#
+# Student info
+ $request->print(($counter == 0 ? '' : '<br /><hr><br />'));
+ 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>Domain: </b>'.$udom.'</td></tr>';
+ $result.='<tr><td colspan=3><b>Resource: </b>'.$url.'</td></tr></table>';
+ $request->print($result);
+#
+# print student answer
my $answer=&Apache::loncommon::get_previous_attempt($symb,$uname,$udom,
- $ENV{'request.course.id'});
- my $result="<h2> Submission Record </h2> $uname:$udom for $url".$answer;
+ $ENV{'request.course.id'},$last);
+ $request->print($answer);
+ $answer =~ m/.*<\/tr><tr.*?<td>.*?<td>(.*?)<td>(.*?)<\/td>/;
+ print "Submitted=$1:<br>$2;";
+#
+ my $wgt = &Apache::lonnet::EXT('resource.partid.weight',$symb,$udom,$uname);
+ my $wgtmsg = ($wgt > 0 ? '(problem weight)' : '<font color="red">problem weight assigned by computer</font>');
+ $wgt = ($wgt > 0 ? $wgt : '1');
+ my %record = &Apache::lonnet::restore($symb,$ENV{'request.course.id'},$udom,$uname);
+ my $score = ($record{'resource.0.awarded'} eq '' ? '' : $record{'resource.0.awarded'}*$wgt);
+
+#
+# display grading options
+ $result='<input type="hidden" name="WGT'.$counter.'" value="'.$wgt.'" />'.
+ '<input type="hidden" name="unamedom'.$counter.'" value="'.$uname.':'.$udom.'" />'."\n";
+ $result.='<table border="0"><tr><td><b>Points</b></td><td>';
+ my $ctr = 0;
+
+ $result.='<table border="0"><tr>'; # display radio buttons in a nice table with 10 across
+ while ($ctr<=$wgt) {
+ $result.= '<td><input type="radio" name="RADVAL'.$counter.'" '.
+ 'onclick="javascript:writeBox(this.form.GRADE_BOX'.$counter.
+ ',this.form.GRADE_SEL'.$counter.','.$ctr.','.$wgt.')" '.
+ ($score eq $ctr ? 'checked':'').' /> '.$ctr."</td>\n";
+ $result.=(($ctr+1)%10 == 0 ? '</tr><tr>' : '');
+ $ctr++;
+ }
+ $result.='</tr></table>';
+
+ $result.='</td><td> <b>or</b> </td>';
+ $result.='<td><input type="text" name="GRADE_BOX'.$counter.'"'.
+ ($score ne ''? ' value = "'.$score.'"':'').' size="4" '.
+ 'onChange="javascript:updateRadio(this.form.RADVAL'.$counter.
+ ',this.form.GRADE_BOX'.$counter.
+ ',this.form.GRADE_SEL'.$counter.',\''.$wgt.'\')" /></td>'."\n";
+ $result.='<td>/'.$wgt.' '.$wgtmsg.' </td><td>';
+
+ foreach my $part (&getpartlist($url)) {
+ my ($temp,$part,$type)=split(/_/,$part);
+ if ($type eq 'solved') {
+ my ($status,$foo)=split(/_/,$record{"resource.$part.$type"},2);
+ $status = 'partial' if ($foo =~ /partially/);
+ $status = 'nothing' if ($status eq '');
+ $result.='<select name="GRADE_SEL'.$counter.'">'."\n";
+ my $optsel = '<option>correct</option><option>incorrect</option>'.
+ '<option>excused</option><option>ungraded</option>'.
+ '<option>partial</option><option>nothing</option>'."\n";
+ $optsel =~ s/<option>$status/<option selected="on">$status/;
+ $result.=$optsel;
+ $result.="</select></td></tr>\n";
+ }
+ }
+ $result.='</table>';
+ $request->print($result);
+#
+# print end of form
+ if ($counter == $total) {
+ my $endform.='<table border="0"><tr><td><input type="submit" name="gradeOpt" value="Save & Next" />';
+ my $ntstu ='<select name="NTSTU">'.
+ '<option>1</option><option>2</option>'.
+ '<option>3</option><option>5</option>'.
+ '<option>7</option><option>10</option></select>'."\n";
+ my $nsel = ($ENV{'form.NTSTU'} ne '' ? $ENV{'form.NTSTU'} : '1');
+ $ntstu =~ s/<option>$nsel/<option selected="on">$nsel/;
+ $endform.=$ntstu.'student(s) ';
+ $endform.='<input type="submit" name="gradeOpt" value="Next" /> ';
+ $endform.='<input type="submit" name="gradeOpt" value="Previous" /> ';
+ $endform.='(Next and Previous do not save the scores.)';
+ $endform.='</td><tr></table></form>';
+ $request->print($endform);
+ }
+ return '';
+}
+
+sub processHandGrade {
+ my ($request) = shift;
+ my $url = $ENV{'form.url'};
+ my $symb = $ENV{'form.symb'};
+ my $button = $ENV{'form.gradeOpt'};
+ my $ngrade = $ENV{'form.NCT'};
+ my $ntstu = $ENV{'form.NTSTU'};
+# my $vProb = $ENV{'form.vProb'};
+# my $lastSub= $ENV{'form.lastSub'};
+
+ my (@parts) = sort(&getpartlist($url));
+
+ if ($button eq 'Save & Next') {
+ my $ctr = 0;
+ while ($ctr < $ENV{'form.NCT'}) {
+# my $pts = ($ENV{'form.GRADE_BOX'.$ctr} ne '' ? $ENV{'form.GRADE_BOX'.$ctr} : $ENV{'form.RADVAL'.$ctr});
+# my $wgt = $ENV{'form.WGT'.$ctr};
+# my $sel = $ENV{'form.GRADE_SEL'.$ctr};
+# my $score = $pts/$wgt if ($wgt != 0);
+ my ($uname,$udom) = split(/:/,$ENV{'form.unamedom'.$ctr});
+ &saveHandGrade($url,$symb,$uname,$udom,$ctr,@parts);
+# &saveHandGrade($url,$symb,$uname,$udom,$score,@parts);
+ $ctr++;
+ }
+ }
+ my $firststu = $ENV{'form.unamedom0'};
+ my $laststu = $ENV{'form.unamedom'.($ngrade-1)};
+
+ #get classlist
+# my ($cdom,$cnum) = split(/_/,$ENV{'request.course.id'});
+ my ($classlist) = &getclasslist('all','0');
+
+ my (@nextlist,@prevlist);
+ my ($nextflg,$prevflg,$ctr,$ctprev) = (0,0,0,0);
+ foreach my $student ( sort(@{ $$classlist{'all'} }) ) {
+ my ($uname,$udom) = split(/:/,$student);
+ if ($nextflg == 1 && $button =~ /Next$/) {
+ push @nextlist,$uname if ($ctr < $ntstu);
+ $ctr++;
+ }
+ $nextflg = 1 if ($student eq $laststu);
+ $prevflg = 1 if ($student eq $firststu);
+ if ($prevflg == 0 && $button eq 'Previous') {
+ push @prevlist,$uname;
+ $ctprev++;
+ }
+ }
+ if ($button eq 'Previous') {
+ if ($ctprev <= $ntstu) {
+ @nextlist = @prevlist;
+ } else {
+ my $idx = 0;
+ my $start = $ctprev - $ntstu;
+ while ($idx < $ntstu) {
+ $nextlist[$idx] = $prevlist[$start+$idx];
+ $idx++;
+ }
+ }
+ }
+ $ctr = 0;
+ my $total = scalar(@nextlist)-1;
+ foreach my $student (@nextlist) {
+ $ENV{'form.student'} = $student;
+ &submission($request,$ctr,$total);
+ $ctr++;
+ }
+
+ return 'The End';
+}
+
+sub saveHandGrade {
+ my ($url,$symb,$stuname,$domain,$newflg,@parts) = @_;
+# my ($stuname,$domain) = split(/:/,$student);
+ my %record=&Apache::lonnet::restore($symb,$ENV{'request.course.id'},$domain,$stuname);
+ my %newrecord;
+
+ foreach my $part (@parts) {
+ my ($temp,$part,$type)=split(/_/,$part);
+ my $oldscore=$record{"resource.$part.$type"};
+ my $newscore;
+ if ($type eq 'awarded' && $newflg >= 0) {
+ my $pts = ($ENV{'form.GRADE_BOX'.$newflg} ne '' ? $ENV{'form.GRADE_BOX'.$newflg} : $ENV{'form.RADVAL'.$newflg});
+ my $wgt = $ENV{'form.WGT'.$newflg};
+# my $sel = $ENV{'form.GRADE_SEL'.$newflg};
+ $newscore = $pts/$wgt if ($wgt != 0);
+ }
+ if ($type eq 'solved') {
+ $newscore = $ENV{'form.GRADE_SEL'.$newflg} if ($newflg >= 0);
+ my $update=0;
+ if ($newscore eq 'nothing' ) {
+ if ($oldscore ne '') {
+ $update=1;
+ $newscore = '';
+ }
+ } elsif ($oldscore !~ m/^$newscore/) {
+ $update=1;
+ if ($newscore eq 'correct') { $newscore = 'correct_by_override'; }
+ if ($newscore eq 'incorrect') { $newscore = 'incorrect_by_override'; }
+ if ($newscore eq 'excused') { $newscore = 'excused'; }
+ if ($newscore eq 'ungraded') { $newscore = 'ungraded_attempted'; }
+ if ($newscore eq 'partial') { $newscore = 'correct_partially_by_override'; }
+ }
+ if ($update) { $newrecord{"resource.$part.$type"}=$newscore; }
+ } else {
+ if ($oldscore ne $newscore) {
+ $newrecord{"resource.$part.$type"}=$newscore;
+ }
+ }
+ }
+ if ( scalar(keys(%newrecord)) > 0 ) {
+ $newrecord{'resource.regrader'}="$ENV{'user.name'}:$ENV{'user.domain'}";
+ while (my ($k,$v) = each %newrecord) {
+ print "k=$k:v=$v:<br>\n";
+ }
+ print "symb=$symb,courseid=$ENV{'request.course.id'},dom=$domain,name=$stuname<br>";
+# &Apache::lonnet::cstore(\%newrecord,$symb,$ENV{'request.course.id'},$domain,$stuname);
+ }
+ return '';
+}
+
+sub get_symb_and_url {
+ my ($request) = @_;
+ (my $url=$ENV{'form.url'}) =~ s-^http://($ENV{'SERVER_NAME'}|$ENV{'HTTP_HOST'})--;
+ my $symb=($ENV{'form.symb'} ne '' ? $ENV{'form.symb'} : (&Apache::lonnet::symbread($url)));
+ if ($symb eq '') { $request->print("Unable to handle ambiguous references:$url:."); return ''; }
+ return ($symb,$url);
+}
+
+sub show_grading_menu_form {
+ my ($symb,$url)=@_;
+ my $result.='<form action="/adm/grades" method="post">'."\n".
+ '<input type="hidden" name="symb" value="'.$symb.'" />'."\n".
+ '<input type="hidden" name="url" value="'.$url.'" />'."\n".
+ '<input type="hidden" name="command" value="gradingmenu" />'."\n".
+ '<input type="submit" name="submit" value="Grading Menu" />'."\n".
+ '</form>'."\n";
+ return $result;
+}
+
+sub gradingmenu {
+ my ($request) = @_;
+ my ($symb,$url)=&get_symb_and_url($request);
+ if (!$symb) {return '';}
+
+ my $result='<h2> <font color="#339933">Select a Grading Method</font></h2>';
+ $result.=' <font size=+1><b>Resource: </b>'.$url.'</font><br /><br />';
+
+ $result.=&view_edit_entire_class_form($symb,$url).'<br />';
+ $result.=&upcsvScores_form($symb,$url).'<br />';
+ $result.=&viewGradeaStu_form($symb,$url).'<br />';
+ $result.=&verifyReceipt_form($symb,$url);
+ return $result;
+}
+
+sub view_edit_entire_class_form {
+ my ($symb,$url)=@_;
+ my $result.='<table width=100% border=0><tr><td bgcolor=#777777>'."\n";
+ $result.='<table width=100% border=0><tr bgcolor="#e6ffff"><td>'."\n";
+ $result.=' <b>View/Grade Entire Class</b></td></tr>'."\n";
+ $result.='<tr bgcolor=#ffffe6><td>'."\n";
+ $result.='<form action="/adm/grades" method="post">'."\n".
+ '<input type="hidden" name="symb" value="'.$symb.'" />'."\n".
+ '<input type="hidden" name="url" value="'.$url.'" />'."\n".
+ '<input type="hidden" name="command" value="viewgrades" />'."\n";
+ $result.=' <b>Display students who has: </b>'.
+ '<input type="radio" name="submitonly" value="yes" checked> submitted'.
+ '<input type="radio" name="submitonly" value="all"> everybody <br /><br />';
+ $result.=' <input type="submit" name="submit" value="View/Grade" /></form>'."\n";
+ $result.='</td></tr></table>'."\n";
+ $result.='</td></tr></table>'."\n";
+ return $result;
+}
+
+sub upcsvScores_form {
+ my ($symb,$url) = @_;
+ if (!$symb) {return '';}
+ my $result.='<table width=100% border=0><tr><td bgcolor=#777777>'."\n";
+ $result.='<table width=100% border=0><tr bgcolor="#e6ffff"><td>'."\n";
+ $result.=' <b>Specify a file containing the class scores for above resource</b></td></tr>'."\n";
+ $result.='<tr bgcolor=#ffffe6><td>'."\n";
+ my $upfile_select=&Apache::loncommon::upfile_select_html();
+ $result.=<<ENDUPFORM;
+<form method="post" enctype="multipart/form-data" action="/adm/grades" name="gradesupload">
+<input type="hidden" name="symb" value="$symb" />
+<input type="hidden" name="url" value="$url" />
+<input type="hidden" name="command" value="csvuploadmap" />
+$upfile_select
+<br /> <input type="submit" name="submit" value="Upload Grades" />
+</form>
+ENDUPFORM
+ $result.='</td></tr></table>'."\n";
+ $result.='</td></tr></table>'."\n";
+ return $result;
+}
+
+sub viewGradeaStu_form {
+ my ($symb,$url) = @_;
+ my ($classlist,$sections) = &getclasslist('all','0');
+ my $result.='<table width=100% border=0><tr><td bgcolor=#777777>'."\n";
+ $result.='<table width=100% border=0><tr bgcolor="#e6ffff"><td>'."\n";
+ $result.=' <b>View/Grade an Individual Student\'s Submission</b></td></tr>'."\n";
+ $result.='<tr bgcolor=#ffffe6><td>'."\n";
+ $result.='<form action="/adm/grades" method="post">'."\n".
+ '<input type="hidden" name="symb" value="'.$symb.'" />'."\n".
+ '<input type="hidden" name="url" value="'.$url.'" />'."\n".
+ '<input type="hidden" name="command" value="submission" />'."\n";
+
+ $result.=' <b>Select section:</b> <select name="section">'."\n";
+ foreach my $section (sort (@$sections)) {
+ $result.= '<option>'.$section.'</option>'."\n";
+ }
+ $result.= '<option selected="on">all</select>'."\n";
+ $result.=' <b>Display students who has: </b>'.
+ '<input type="radio" name="submitonly" value="yes" checked> submitted'.
+ '<input type="radio" name="submitonly" value="all"> everybody <br />';
+ $result.=' (Section -1 implies the students were not assigned a section.)<br />' if (grep /-1/,@$sections);
+
+ $result.='<br /> <input type="submit" name="submit" value="View/Grade" />'."\n".
+ '</form>'."\n";
+ $result.='</td></tr></table>'."\n";
+ $result.='</td></tr></table>'."\n";
+ return $result;
+}
+
+sub verifyReceipt_form {
+ my ($symb,$url) = @_;
+ my $cdom=$ENV{"course.$ENV{'request.course.id'}.domain"};
+ my $cnum=$ENV{"course.$ENV{'request.course.id'}.num"};
+ my $hostver=unpack("%32C*",$Apache::lonnet::perlvar{'lonHostID'});
+
+ my $result.='<table width=100% border=0><tr><td bgcolor=#777777>'."\n";
+ $result.='<table width=100% border=0><tr><td bgcolor=#e6ffff>'."\n";
+ $result.=' <b>Verify a Submission Receipt Issued by this Server</td></tr>'."\n";
+ $result.='<tr bgcolor=#ffffe6><td>'."\n";
+ $result.='<form action="/adm/grades" method="post">'."\n";
+ $result.=' <tt>'.$hostver.'-<input type="text" name="receipt" size="4"></tt><br />'."\n";
+ $result.=' <input type="submit" name="submit" value="Verify Receipt">'."\n";
+ $result.='<input type="hidden" name="command" value="verify">'."\n";
+ if ($ENV{'form.url'}) {
+ $result.='<input type="hidden" name="url" value="'.$ENV{'form.url'}.'" />';
+ }
+ if ($ENV{'form.symb'}) {
+ $result.='<input type="hidden" name="symb" value="'.$ENV{'form.symb'}.'" />';
+ }
+ $result.='</form>';
+ $result.='</td></tr></table>'."\n";
+ $result.='</td></tr></table>'."\n";
return $result;
}
@@ -188,42 +777,44 @@ sub viewgrades {
my $result='';
#get resource reference
- my $url=$ENV{'form.url'};
- $url=~s-^http://($ENV{'SERVER_NAME'}|$ENV{'HTTP_HOST'})--;
- my $symb=$ENV{'form.symb'};
- if (!$symb) { $symb=&Apache::lonnet::symbread($url); }
- if ($symb eq '') { $request->print("Unable to handle ambiguous references:$url:."); return ''; }
-
+ my ($symb,$url)=&get_symb_and_url($request);
+ if (!$symb) {return '';}
#get classlist
my ($cdom,$cnum) = split(/_/,$ENV{'request.course.id'});
- my $chome=$ENV{"course.$ENV{'request.course.id'}.home"};
- #print "Found $cdom:$cnum:$chome<br />";
- my (%classlist) = &getclasslist($cdom,$cnum,$chome,'0');
-
+ #print "Found $cdom:$cnum<br />";
+ my ($classlist) = &getclasslist('all','0');
+ my $headerclr = '"#ccffff"';
+ my $cellclr = '"#ffffcc"';
#get list of parts for this problem
- my (@parts) = &getpartlist($url);
+ my (@parts) = sort(&getpartlist($url));
+
+ $request->print ("<h2><font color=\"#339933\">Manual Grading</font></h2>");
#start the form
$result = '<form action="/adm/grades" method="post">'."\n".
- '<input type="hidden" name="symb" value="'.$symb.'"/>'."\n".
- '<input type="hidden" name="url" value="'.$url.'"/>'."\n".
+ '<input type="hidden" name="symb" value="'.$symb.'" />'."\n".
+ '<input type="hidden" name="url" value="'.$url.'" />'."\n".
'<input type="hidden" name="command" value="editgrades" />'."\n".
'<input type="submit" name="submit" value="Submit Changes" />'."\n".
- '<table>'."\n".
- '<tr><td>UserId</td><td>Domain</td>'."\n";
+ '<table border=0><tr><td bgcolor="#777777">'."\n".
+ '<table border=0>'."\n".
+ '<tr bgcolor='.$headerclr.'><td><b>Username</b></td><td><b>Name</b></td><td><b>Domain</b></td>'."\n";
foreach my $part (@parts) {
my $display=&Apache::lonnet::metadata($url,$part.'.display');
if (!$display) { $display = &Apache::lonnet::metadata($url,$part.'.name'); }
- $result.="<td>$display</td>\n";
- }
- $result.="</tr>";
+ $result.='<td><b>'.$display.'</b></td>'."\n";
+ }
+ $result.='</tr>';
#get info for each student
- foreach my $student ( sort(@{ $classlist{'allids'} }) ) {
+ foreach my $student ( sort(@{ $$classlist{'all'} }) ) {
+ my $display=&viewstudentgrade($url,$symb,$ENV{'request.course.id'},$student,@parts);
+# print "ID=$ENV{'request.course.id'}:STU=$student:DIS=$display:<br>\n";
$result.=&viewstudentgrade($url,$symb,$ENV{'request.course.id'},$student,@parts);
}
- $result.='</table><input type="submit" name="submit" value="Submit Changes" /></form>';
-
+ $result.='</table></td></tr></table>';
+ $result.='<input type="submit" name="submit" value="Submit Changes" /></form>';
+ $result.=&show_grading_menu_form($symb,$url);
return $result;
}
@@ -235,10 +826,9 @@ sub editgrades {
if ($symb eq '') { $request->print("Unable to handle ambiguous references:$symb:$ENV{'form.url'}"); return ''; }
my $url=$ENV{'form.url'};
#get classlist
- my ($cdom,$cnum) = split(/_/,$ENV{'request.course.id'});
- my $chome=$ENV{"course.$ENV{'request.course.id'}.home"};
- #print "Found $cdom:$cnum:$chome<br />";
- my (%classlist) = &getclasslist($cdom,$cnum,$chome,'0');
+# my ($cdom,$cnum) = split(/_/,$ENV{'request.course.id'});
+ #print "Found $cdom:$cnum<br />";
+ my ($classlist) = &getclasslist('all','0');
#get list of parts for this problem
my (@parts) = &getpartlist($url);
@@ -249,7 +839,7 @@ sub editgrades {
'<input type="hidden" name="command" value="viewgrades" />'."\n".
'<input type="submit" name="submit" value="See Grades" /> <br />'."\n";
- foreach my $student ( sort(@{ $classlist{'allids'} }) ) {
+ foreach my $student ( sort(@{ $$classlist{'all '} }) ) {
$result.=&setstudentgrade($url,$symb,$ENV{'request.course.id'},$student,@parts);
}
@@ -257,6 +847,237 @@ sub editgrades {
return $result;
}
+sub csvupload_javascript_reverse_associate {
+ return(<<ENDPICK);
+ function verify(vf) {
+ var foundsomething=0;
+ var founduname=0;
+ var founddomain=0;
+ for (i=0;i<=vf.nfields.value;i++) {
+ tw=eval('vf.f'+i+'.selectedIndex');
+ if (i==0 && tw!=0) { founduname=1; }
+ if (i==1 && tw!=0) { founddomain=1; }
+ if (i!=0 && i!=1 && tw!=0) { foundsomething=1; }
+ }
+ if (founduname==0 || founddomain==0) {
+ alert('You need to specify at both the username and domain');
+ return;
+ }
+ if (foundsomething==0) {
+ alert('You need to specify at least one grading field');
+ return;
+ }
+ vf.submit();
+ }
+ function flip(vf,tf) {
+ var nw=eval('vf.f'+tf+'.selectedIndex');
+ var i;
+ for (i=0;i<=vf.nfields.value;i++) {
+ //can not pick the same destination field for both name and domain
+ if (((i ==0)||(i ==1)) &&
+ ((tf==0)||(tf==1)) &&
+ (i!=tf) &&
+ (eval('vf.f'+i+'.selectedIndex')==nw)) {
+ eval('vf.f'+i+'.selectedIndex=0;')
+ }
+ }
+ }
+ENDPICK
+}
+
+sub csvupload_javascript_forward_associate {
+ return(<<ENDPICK);
+ function verify(vf) {
+ var foundsomething=0;
+ var founduname=0;
+ var founddomain=0;
+ for (i=0;i<=vf.nfields.value;i++) {
+ tw=eval('vf.f'+i+'.selectedIndex');
+ if (tw==1) { founduname=1; }
+ if (tw==2) { founddomain=1; }
+ if (tw>2) { foundsomething=1; }
+ }
+ if (founduname==0 || founddomain==0) {
+ alert('You need to specify at both the username and domain');
+ return;
+ }
+ if (foundsomething==0) {
+ alert('You need to specify at least one grading field');
+ return;
+ }
+ vf.submit();
+ }
+ function flip(vf,tf) {
+ var nw=eval('vf.f'+tf+'.selectedIndex');
+ var i;
+ //can not pick the same destination field twice
+ for (i=0;i<=vf.nfields.value;i++) {
+ if ((i!=tf) && (eval('vf.f'+i+'.selectedIndex')==nw)) {
+ eval('vf.f'+i+'.selectedIndex=0;')
+ }
+ }
+ }
+ENDPICK
+}
+
+sub csvuploadmap_header {
+ my ($request,$symb,$url,$datatoken,$distotal)= @_;
+ my $result;
+ my $javascript;
+ if ($ENV{'form.upfile_associate'} eq 'reverse') {
+ $javascript=&csvupload_javascript_reverse_associate();
+ } else {
+ $javascript=&csvupload_javascript_forward_associate();
+ }
+ $request->print(<<ENDPICK);
+<form method="post" enctype="multipart/form-data" action="/adm/grades" name="gradesupload">
+<h3>Uploading Class Grades for resource $url</h3>
+<hr>
+<h3>Identify fields</h3>
+Total number of records found in file: $distotal <hr />
+Enter as many fields as you can. The system will inform you and bring you back
+to this page if the data selected is insufficient to run your class.<hr />
+<input type="button" value="Reverse Association" onClick="javascript:this.form.associate.value='Reverse Association';submit(this.form);" />
+<input type="hidden" name="associate" value="" />
+<input type="hidden" name="phase" value="three" />
+<input type="hidden" name="datatoken" value="$datatoken" />
+<input type="hidden" name="fileupload" value="$ENV{'form.fileupload'}" />
+<input type="hidden" name="upfiletype" value="$ENV{'form.upfiletype'}" />
+<input type="hidden" name="upfile_associate"
+ value="$ENV{'form.upfile_associate'}" />
+<input type="hidden" name="symb" value="$symb" />
+<input type="hidden" name="url" value="$url" />
+<input type="hidden" name="command" value="csvuploadassign" />
+<hr />
+<script type="text/javascript" language="Javascript">
+$javascript
+</script>
+ENDPICK
+ return '';
+
+}
+
+sub csvupload_fields {
+ my ($url) = @_;
+ my (@parts) = &getpartlist($url);
+ my @fields=(['username','Student Username'],['domain','Student Domain']);
+ foreach my $part (sort(@parts)) {
+ my @datum;
+ my $display=&Apache::lonnet::metadata($url,$part.'.display');
+ my $name=$part;
+ if (!$display) { $display = $name; }
+ @datum=($name,$display);
+ push(@fields,\@datum);
+ }
+ return (@fields);
+}
+
+sub csvuploadmap_footer {
+ my ($request,$i,$keyfields) =@_;
+ $request->print(<<ENDPICK);
+</table>
+<input type="hidden" name="nfields" value="$i" />
+<input type="hidden" name="keyfields" value="$keyfields" />
+<input type="button" onClick="javascript:verify(this.form)" value="Assign Grades" /><br />
+</form>
+ENDPICK
+}
+
+sub csvuploadmap {
+ my ($request)= @_;
+ my ($symb,$url)=&get_symb_and_url($request);
+ if (!$symb) {return '';}
+ my $datatoken;
+ if (!$ENV{'form.datatoken'}) {
+ $datatoken=&Apache::loncommon::upfile_store($request);
+ } else {
+ $datatoken=$ENV{'form.datatoken'};
+ &Apache::loncommon::load_tmp_file($request);
+ }
+ my @records=&Apache::loncommon::upfile_record_sep();
+ &csvuploadmap_header($request,$symb,$url,$datatoken,$#records+1);
+ my $i;
+ my $keyfields;
+ if (@records) {
+ my @fields=&csvupload_fields($url);
+ if ($ENV{'form.upfile_associate'} eq 'reverse') {
+ &Apache::loncommon::csv_print_samples($request,\@records);
+ $i=&Apache::loncommon::csv_print_select_table($request,\@records,
+ \@fields);
+ foreach (@fields) { $keyfields.=$_->[0].','; }
+ chop($keyfields);
+ } else {
+ unshift(@fields,['none','']);
+ $i=&Apache::loncommon::csv_samples_select_table($request,\@records,
+ \@fields);
+ my %sone=&Apache::loncommon::record_sep($records[0]);
+ $keyfields=join(',',sort(keys(%sone)));
+ }
+ }
+ &csvuploadmap_footer($request,$i,$keyfields);
+ return '';
+}
+
+sub csvuploadassign {
+ my ($request)= @_;
+ my ($symb,$url)=&get_symb_and_url($request);
+ if (!$symb) {return '';}
+ &Apache::loncommon::load_tmp_file($request);
+ my @gradedata=&Apache::loncommon::upfile_record_sep();
+ my @keyfields = split(/\,/,$ENV{'form.keyfields'});
+ my %fields=();
+ for (my $i=0; $i<=$ENV{'form.nfields'}; $i++) {
+ if ($ENV{'form.upfile_associate'} eq 'reverse') {
+ if ($ENV{'form.f'.$i} ne 'none') {
+ $fields{$keyfields[$i]}=$ENV{'form.f'.$i};
+ }
+ } else {
+ if ($ENV{'form.f'.$i} ne 'none') {
+ $fields{$ENV{'form.f'.$i}}=$keyfields[$i];
+ }
+ }
+ }
+ $request->print('<h3>Assigning Grades</h3>');
+ my $courseid=$ENV{'request.course.id'};
+# my $cdom=$ENV{"course.$courseid.domain"};
+# my $cnum=$ENV{"course.$courseid.num"};
+ my ($classlist) = &getclasslist('all','1');
+ my @skipped;
+ my $countdone=0;
+ foreach my $grade (@gradedata) {
+ my %entries=&Apache::loncommon::record_sep($grade);
+ my $username=$entries{$fields{'username'}};
+ my $domain=$entries{$fields{'domain'}};
+ if (!exists($$classlist{"$username:$domain"})) {
+ push(@skipped,"$username:$domain");
+ next;
+ }
+ my %grades;
+ foreach my $dest (keys(%fields)) {
+ if ($dest eq 'username' || $dest eq 'domain') { next; }
+ if ($entries{$fields{$dest}} eq '') { next; }
+ my $store_key=$dest;
+ $store_key=~s/^stores/resource/;
+ $store_key=~s/_/\./g;
+ $grades{$store_key}=$entries{$fields{$dest}};
+ }
+ $grades{"resource.regrader"}="$ENV{'user.name'}:$ENV{'user.domain'}";
+ &Apache::lonnet::cstore(\%grades,$symb,$ENV{'request.course.id'},
+ $domain,$username);
+ $request->print('.');
+ $request->rflush();
+ $countdone++;
+ }
+ $request->print("<br />Stored $countdone students\n");
+ if (@skipped) {
+ $request->print('<br /><font size="+1"><b>Skipped Students</b></font><br />');
+ foreach my $student (@skipped) { $request->print("<br />$student"); }
+ }
+ $request->print(&view_edit_entire_class_form($symb,$url));
+ $request->print(&show_grading_menu_form($symb,$url));
+ return '';
+}
+
sub send_header {
my ($request)= @_;
$request->print(&Apache::lontexconvert::header());
@@ -277,8 +1098,6 @@ sub send_footer {
sub handler {
my $request=$_[0];
- if ( $ENV{'user.name'} eq 'albertel' ) {$Apache::lonxml::debug=1;} else {$Apache::lonxml::debug=0;}
-
if ($ENV{'browser.mathml'}) {
$request->content_type('text/xml');
} else {
@@ -286,23 +1105,80 @@ sub handler {
}
$request->send_http_header;
return OK if $request->header_only;
+ &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'});
my $url=$ENV{'form.url'};
my $symb=$ENV{'form.symb'};
my $command=$ENV{'form.command'};
-
+ if (!$url) {
+ my ($temp1,$temp2);
+ ($temp1,$temp2,$ENV{'form.url'})=split(/___/,$symb);
+ $url = $ENV{'form.url'};
+ }
&send_header($request);
if ($url eq '' && $symb eq '') {
- $request->print("Non-Contextual Access Unsupported:$command:$url:");
+ if ($ENV{'user.adv'}) {
+ if (($ENV{'form.codeone'}) && ($ENV{'form.codetwo'}) &&
+ ($ENV{'form.codethree'})) {
+ my $token=$ENV{'form.codeone'}.'*'.$ENV{'form.codetwo'}.'*'.
+ $ENV{'form.codethree'};
+ my ($tsymb,$tuname,$tudom,$tcrsid)=
+ &Apache::lonnet::checkin($token);
+ if ($tsymb) {
+ my ($map,$id,$url)=split(/\_\_\_/,$tsymb);
+ if (&Apache::lonnet::allowed('mgr',$tcrsid)) {
+ $request->print(
+ &Apache::lonnet::ssi('/res/'.$url,
+ ('grade_username' => $tuname,
+ 'grade_domain' => $tudom,
+ 'grade_courseid' => $tcrsid,
+ 'grade_symb' => $tsymb)));
+ } else {
+ $request->print('<h1>Not authorized: '.$token.'</h1>');
+ }
+ } else {
+ $request->print('<h1>Not a valid DocID: '.$token.'</h1>');
+ }
+ } else {
+ $request->print(&Apache::lonxml::tokeninputfield());
+ }
+ }
} else {
+ #&Apache::lonhomework::showhashsubset(\%ENV,'^form');
$Apache::grades::viewgrades=&Apache::lonnet::allowed('vgr',$ENV{'request.course.id'});
if ($command eq 'submission') {
- $request->print(&submission($request));
+ &listStudents($request) if ($ENV{'form.student'} eq '');
+ &submission($request,0,0) if ($ENV{'form.student'} ne '');
+ } elsif ($command eq 'processGroup') {
+ &processGroup($request);
+ } elsif ($command eq 'gradingmenu') {
+ $request->print(&gradingmenu($request));
} elsif ($command eq 'viewgrades') {
$request->print(&viewgrades($request));
+ } elsif ($command eq 'handgrade') {
+ $request->print(&processHandGrade($request));
} elsif ($command eq 'editgrades') {
$request->print(&editgrades($request));
+ } elsif ($command eq 'verify') {
+ $request->print(&verifyreceipt($request));
+ } elsif ($command eq 'csvupload') {
+ $request->print(&csvupload($request));
+ } elsif ($command eq 'csvuploadmap') {
+ $request->print(&csvuploadmap($request));
+# } elsif ($command eq 'receiptInput') {
+# &receiptInput($request);
+ } elsif ($command eq 'csvuploadassign') {
+ if ($ENV{'form.associate'} ne 'Reverse Association') {
+ $request->print(&csvuploadassign($request));
+ } else {
+ if ( $ENV{'form.upfile_associate'} ne 'reverse' ) {
+ $ENV{'form.upfile_associate'} = 'reverse';
+ } else {
+ $ENV{'form.upfile_associate'} = 'forward';
+ }
+ $request->print(&csvuploadmap($request));
+ }
} else {
- $request->print("Unknown action:$command:");
+ $request->print("Unknown action: $command:");
}
}
&send_footer($request);