--- loncom/homework/lonhomework.pm 2005/11/15 18:38:47 1.224
+++ loncom/homework/lonhomework.pm 2006/02/26 20:01:17 1.236
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# The LON-CAPA Homework handler
#
-# $Id: lonhomework.pm,v 1.224 2005/11/15 18:38:47 albertel Exp $
+# $Id: lonhomework.pm,v 1.236 2006/02/26 20:01:17 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -166,17 +166,24 @@ sub send_footer {
}
sub proctor_checked_in {
- my ($slot_name,$slot)=@_;
- my @allowed=split(",",$slot->{'proctor'});
- my $version=$Apache::lonhomework::history{'resource.version'};
- foreach my $possible (@allowed) {
- if ($Apache::lonhomework::history{"resource.$version.checkedin"} eq
- $possible &&
- $Apache::lonhomework::history{"resource.$version.checkedin.slot"}
- eq $slot_name) {
+ my ($slot_name,$slot,$type)=@_;
+ my @possible_proctors=split(",",$slot->{'proctor'});
+
+ my $key;
+ if ($type eq 'Task') {
+ my $version=$Apache::lonhomework::history{'resource.0.version'};
+ $key ="resource.$version.0.checkedin";
+ } elsif ($type eq 'problem') {
+ $key ='resource.0.checkedin';
+ }
+
+ foreach my $possible (@possible_proctors) {
+ if ($Apache::lonhomework::history{$key} eq $possible
+ && $Apache::lonhomework::history{$key.'.slot'} eq $slot_name) {
return 1;
}
}
+
return 0;
}
@@ -191,6 +198,8 @@ sub check_ip_acc {
my $ip=$ENV{'REMOTE_ADDR'};
my $name;
foreach my $pattern (split(',',$acc)) {
+ $pattern =~ s/^\s*//;
+ $pattern =~ s/\s*$//;
if ($pattern =~ /\*$/) {
#35.8.*
$pattern=~s/\*//;
@@ -230,13 +239,19 @@ sub check_ip_acc {
return $allowed;
}
-sub check_task_access {
+sub check_slot_access {
+ my ($id,$type)=@_;
+
# does it pass normal muster
- # yes we really do want the default args passing
- my ($status,$datemsg)=&check_access;
+ my ($status,$datemsg)=&check_access($id);
+
+ my $useslots = &Apache::lonnet::EXT("resource.$id.useslots");
+ if ($useslots ne 'resource') {
+ return ($status,$datemsg);
+ }
+
if ($status eq 'SHOW_ANSWER' ||
$status eq 'CLOSED' ||
- $status eq 'CANNOT_ANSWER' ||
$status eq 'INVALID_ACCESS' ||
$status eq 'UNAVAILABLE') {
return ($status,$datemsg);
@@ -244,12 +259,15 @@ sub check_task_access {
if ($env{'request.state'} eq "construct") {
return ($status,$datemsg);
}
- my $version=$Apache::lonhomework::history{'resource.version'};
- if ($Apache::lonhomework::history{"resource.$version.checkedin"} &&
- $Apache::lonhomework::history{"resource.$version.status"} eq 'pass') {
- return ('SHOW_ANSWER');
+
+ if ($type eq 'Task') {
+ my $version=$Apache::lonhomework::history{'resource.version'};
+ if ($Apache::lonhomework::history{"resource.$version.0.checkedin"} &&
+ $Apache::lonhomework::history{"resource.$version.0.status"} eq 'pass') {
+ return ('SHOW_ANSWER');
+ }
}
- my ($id)=@_;
+
my @slots=
(split(':',&Apache::lonnet::EXT("resource.$id.availablestudent")),
split(':',&Apache::lonnet::EXT("resource.$id.available")));
@@ -274,18 +292,54 @@ sub check_task_access {
}
}
if ($slotstatus eq 'NEEDS_CHECKIN' &&
- &proctor_checked_in($slot_name,$returned_slot)) {
+ &proctor_checked_in($slot_name,$returned_slot,$type)) {
&Apache::lonxml::debug("protoctor checked in");
$slotstatus='CAN_ANSWER';
}
- if ( $slotstatus eq 'NOT_IN_A_SLOT' &&
- $Apache::lonhomework::history{"resource.$version.checkedin"}) {
- if ($Apache::lonhomework::history{"resource.$version.status"} eq 'fail') {
+
+ my ($is_correct,$got_grade,$checkedin);
+ if ($type eq 'Task') {
+ my $version=$Apache::lonhomework::history{'resource.0.version'};
+ $got_grade =
+ ($Apache::lonhomework::history{"resource.$version.0.status"}
+ =~ /^(?:pass|fail)$/);
+ $is_correct =
+ ($Apache::lonhomework::history{"resource.$version.0.status"} eq 'pass'
+ || $Apache::lonhomework::history{"resource.0.solved"} =~ /^correct_/ );
+ $checkedin =
+ $Apache::lonhomework::history{"resource.$version.0.checkedin"};
+ } elsif ($type eq 'problem') {
+ $got_grade = 1;
+ $checkedin = $Apache::lonhomework::history{"resource.0.checkedin"};
+ }
+
+ &Apache::lonxml::debug(" slot is $slotstatus checkedin ($checkedin) got_grade ($got_grade) is_correct ($is_correct)");
+
+ # has a current checked in recrd, but hasn't got a grade, must be awaiting
+ # a grade
+ if ($checkedin
+ && !$got_grade) {
+ return ('WAITING_FOR_GRADE');
+ }
+
+ if ($slotstatus eq 'NOT_IN_A_SLOT'
+ && $checkedin ) {
+
+ if ($got_grade) {
return ('SHOW_ANSWER');
} else {
return ('WAITING_FOR_GRADE');
}
+
}
+ if ( $is_correct) {
+ return ('SHOW_ANSWER');
+ }
+ if ( $status eq 'CANNOT_ANSWER' &&
+ ($slotstatus ne 'NEEDS_CHECKIN' && $slotstatus ne 'NOT_IN_A_SLOT')) {
+ return ($status,$datemsg);
+ }
+
return ($slotstatus,$datemsg,$slot_name,$returned_slot);
}
@@ -297,7 +351,6 @@ sub check_access {
my $status;
my $datemsg = '';
my $lastdate = '';
- my $temp;
my $type;
my $passed;
@@ -334,7 +387,7 @@ sub check_access {
return($status,$date);
}
- foreach $temp ("opendate","duedate","answerdate") {
+ foreach my $temp ("opendate","duedate","answerdate") {
$lastdate = $date;
$date = &Apache::lonnet::EXT("resource.$id.$temp");
my $thistype = &Apache::lonnet::EXT("resource.$id.$temp.type");
@@ -718,23 +771,28 @@ sub editxmlmode {
my $bodytag=&Apache::loncommon::bodytag(undef,undef,undef,
($env{'environment.remote'} ne 'off'));
my $html=&Apache::lonxml::xmlbegin();
- $result.=$html.$bodytag.
+ my $head="EditXML $file".
+ &Apache::edit::js_change_detection()."";
+
+ $result.=$html.$head.$bodytag.
&renderpage($request,$file,['no_output_web'],1).
&Apache::lonxml::message_location().'
-