';
return $result;
}
-
+#FIXME need to look at the meatdata 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) = @_;
- my $result ='Hi!';
+ my $result ='';
my ($stuname,$domain) = split(/:/,$student);
- my %record=&Apache::lonnet::restore($symb,$courseid,$domain,$stuname,
- &Apache::lonnet::homeserver($stuname,$domain));
+ 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{"GRADE.$stuname.$part.$type"};
- if ($oldscore != $newscore) {
- $result.="$stuname:$part:$type:changed from $oldscore to $newscore: \n";
+ my $newscore=$ENV{"form.GRADE.$student.$part.$type"};
+ if ($type eq 'solved') {
+ my $update=0;
+ if ($newscore eq 'nothing' ) {
+ if ($oldscore ne '') {
+ $update=1;
+ $newscore = '';
+ }
+ } elsif ($oldscore !~ m/^$newscore/) {
+ $update=1;
+ $result.="Updating $stuname to $newscore \n";
+ 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'; }
+ } else {
+ #$result.="$stuname:$part:$type:unchanged $oldscore to $newscore: \n";
+ }
+ if ($update) { $newrecord{"resource.$part.$type"}=$newscore; }
} else {
- $result.="$stuname:$part:$type:changed same $oldscore to $newscore: \n";
+ if ($oldscore ne $newscore) {
+ $newrecord{"resource.$part.$type"}=$newscore;
+ $result.="Updating $student"."'s status for $part.$type to $newscore \n";
+ } else {
+ #$result.="$stuname:$part:$type:unchanged $oldscore to $newscore: \n";
+ }
}
}
+ if ( scalar(keys(%newrecord)) > 0 ) {
+ $newrecord{"resource.regrader"}="$ENV{'user.name'}:$ENV{'user.domain'}";
+ &Apache::lonnet::cstore(\%newrecord,$symb,$courseid,$domain,$stuname);
+
+ $result.="Stored away ".scalar(keys(%newrecord))." elements. \n";
+ }
return $result;
}
@@ -133,14 +208,14 @@ sub submission {
my $url=$ENV{'form.url'};
$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 '') { &listStudents($request); return ''; }
my ($uname,$udom) = &finduser($ENV{'form.student'});
if ($uname eq '') { &moreinfo($request,"Unable to find student"); return ''; }
my $symb=&Apache::lonnet::symbread($url);
if ($symb eq '') { $request->print("Unable to handle ambiguous references:$url:."); return ''; }
- my $home=&Apache::lonnet::homeserver($uname,$udom);
- my $answer=&Apache::loncommon::get_previous_attempt($symb,$uname,$udom,$home,
+ my $answer=&Apache::loncommon::get_previous_attempt($symb,$uname,$udom,
$ENV{'request.course.id'});
- my $result="
Submission Record
$uname:$udom for $url".$answer;
+ my $result="
Submission Record
$uname:$udom for $url ".$answer;
return $result;
}
@@ -160,24 +235,34 @@ sub viewgrades {
my $chome=$ENV{"course.$ENV{'request.course.id'}.home"};
#print "Found $cdom:$cnum:$chome ";
my (%classlist) = &getclasslist($cdom,$cnum,$chome,'0');
-
+ my $headerclr = '"#ccffff"';
+ my $cellclr = '"#ffffcc"';
#get list of parts for this problem
my (@parts) = &getpartlist($url);
+ $request->print ("
Manual Grading
");
+
#start the form
$result = '';
return $result;
}
@@ -189,7 +274,6 @@ sub editgrades {
my $symb=$ENV{'form.symb'};
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"};
@@ -203,7 +287,7 @@ sub editgrades {
''."\n".
''."\n".
''."\n".
- ''."\n";
+ ' '."\n";
foreach my $student ( sort(@{ $classlist{'allids'} }) ) {
$result.=&setstudentgrade($url,$symb,$ENV{'request.course.id'},$student,@parts);
@@ -216,11 +300,11 @@ sub editgrades {
sub send_header {
my ($request)= @_;
$request->print(&Apache::lontexconvert::header());
- $request->print("
-");
+# $request->print("
+#");
$request->print('');
}
@@ -248,11 +332,37 @@ sub handler {
&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('