--- loncom/homework/lonhomework.pm 2005/11/21 21:51:29 1.226
+++ loncom/homework/lonhomework.pm 2006/04/21 15:27:30 1.233.2.2
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# The LON-CAPA Homework handler
#
-# $Id: lonhomework.pm,v 1.226 2005/11/21 21:51:29 albertel Exp $
+# $Id: lonhomework.pm,v 1.233.2.2 2006/04/21 15:27:30 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -171,8 +171,8 @@ sub proctor_checked_in {
my $key;
if ($type eq 'Task') {
- my $version=$Apache::lonhomework::history{'resource.version'};
- $key ="resource.$version.checkedin";
+ my $version=$Apache::lonhomework::history{'resource.0.version'};
+ $key ="resource.$version.0.checkedin";
} elsif ($type eq 'problem') {
$key ='resource.0.checkedin';
}
@@ -198,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/\*//;
@@ -260,8 +262,8 @@ sub check_slot_access {
if ($type eq 'Task') {
my $version=$Apache::lonhomework::history{'resource.version'};
- if ($Apache::lonhomework::history{"resource.$version.checkedin"} &&
- $Apache::lonhomework::history{"resource.$version.status"} eq 'pass') {
+ if ($Apache::lonhomework::history{"resource.$version.0.checkedin"} &&
+ $Apache::lonhomework::history{"resource.$version.0.status"} eq 'pass') {
return ('SHOW_ANSWER');
}
}
@@ -276,6 +278,7 @@ sub check_slot_access {
my $slotstatus='NOT_IN_A_SLOT';
my ($returned_slot,$slot_name);
foreach my $slot (@slots) {
+ $slot =~ s/(^\s*|\s*$)//g;
&Apache::lonxml::debug("getting $slot");
my %slot=&Apache::lonnet::get_slot($slot);
&Apache::lonhomework::showhash(%slot);
@@ -295,28 +298,37 @@ sub check_slot_access {
$slotstatus='CAN_ANSWER';
}
- my ($pass_status,$checkedin);
+ my ($is_correct,$got_grade,$checkedin);
if ($type eq 'Task') {
- my $version=$Apache::lonhomework::history{'resource.version'};
- $pass_status =
- $Apache::lonhomework::history{"resource.$version.status"} eq 'fail';
+ 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.checkedin"};
+ $Apache::lonhomework::history{"resource.$version.0.checkedin"};
} elsif ($type eq 'problem') {
- $pass_status = 1;
+ $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)");
+
if ($slotstatus eq 'NOT_IN_A_SLOT'
&& $checkedin ) {
- if ($pass_status) {
+ 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);
@@ -753,23 +765,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().'
-