--- loncom/homework/lonhomework.pm 2006/05/12 01:18:50 1.244 +++ loncom/homework/lonhomework.pm 2006/06/26 22:33:22 1.254 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # The LON-CAPA Homework handler # -# $Id: lonhomework.pm,v 1.244 2006/05/12 01:18:50 albertel Exp $ +# $Id: lonhomework.pm,v 1.254 2006/06/26 22:33:22 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -161,6 +161,8 @@ sub proctor_checked_in { my ($slot_name,$slot,$type)=@_; my @possible_proctors=split(",",$slot->{'proctor'}); + return 1 if (!@possible_proctors); + my $key; if ($type eq 'Task') { my $version=$Apache::lonhomework::history{'resource.0.version'}; @@ -168,9 +170,14 @@ sub proctor_checked_in { } elsif ($type eq 'problem') { $key ='resource.0.checkedin'; } - + # backward compatability, used to be username@domain, + # now is username:domain + my $who = $Apache::lonhomework::history{$key}; + if ($who !~ /:/) { + $who =~ tr/@/:/; + } foreach my $possible (@possible_proctors) { - if ($Apache::lonhomework::history{$key} eq $possible + if ($who eq $possible && $Apache::lonhomework::history{$key.'.slot'} eq $slot_name) { return 1; } @@ -237,8 +244,9 @@ sub check_slot_access { # does it pass normal muster my ($status,$datemsg)=&check_access($id); - my $useslots = &Apache::lonnet::EXT("resource.$id.useslots"); - if ($useslots ne 'resource' && $useslots ne 'sequence') { + my $useslots = &Apache::lonnet::EXT("resource.0.useslots"); + if ($useslots ne 'resource' && $useslots ne 'map' + && $useslots ne 'map_map') { return ($status,$datemsg); } @@ -261,8 +269,8 @@ sub check_slot_access { } my @slots= - (split(':',&Apache::lonnet::EXT("resource.$id.availablestudent")), - split(':',&Apache::lonnet::EXT("resource.$id.available"))); + (split(':',&Apache::lonnet::EXT("resource.0.availablestudent")), + split(':',&Apache::lonnet::EXT("resource.0.available"))); # if (!@slots) { # return ($status,$datemsg); @@ -302,8 +310,10 @@ sub check_slot_access { $checkedin = $Apache::lonhomework::history{"resource.$version.0.checkedin"}; } elsif ($type eq 'problem') { - $got_grade = 1; - $checkedin = $Apache::lonhomework::history{"resource.0.checkedin"}; + $got_grade = 1; + $checkedin = $Apache::lonhomework::history{"resource.0.checkedin"}; + $is_correct = + ($Apache::lonhomework::history{"resource.0.solved"} =~/^correct_/); } &Apache::lonxml::debug(" slot is $slotstatus checkedin ($checkedin) got_grade ($got_grade) is_correct ($is_correct)"); @@ -316,6 +326,14 @@ sub check_slot_access { return ('WAITING_FOR_GRADE'); } + # no slot is currently open, and has been checked in for this version + # previous slot is therefore CLOSED, so therefore the problem is + if (!defined($slot_name) + && $checkedin + && $type eq 'problem') { + return ('CLOSED',$datemsg); + } + if ($slotstatus eq 'NOT_IN_A_SLOT' && $checkedin ) { @@ -383,7 +401,12 @@ sub check_access { foreach my $temp ("opendate","duedate","answerdate") { $lastdate = $date; - $date = &Apache::lonnet::EXT("resource.$id.$temp"); + if ($temp eq 'duedate') { + $date = &due_date($id); + } else { + $date = &Apache::lonnet::EXT("resource.$id.$temp"); + } + my $thistype = &Apache::lonnet::EXT("resource.$id.$temp.type"); if ($thistype =~ /^(con_lost|no_such_host)/ || $date =~ /^(con_lost|no_such_host)/) { @@ -451,18 +474,12 @@ sub check_access { &Apache::lonxml::debug("looking for accesstime $first_access"); if (!$first_access) { $status='NOT_YET_VIEWED'; - $datemsg=&seconds_to_human_length($interval); - } else { - my $newdate=localtime($first_access+$interval); - if (time > ($first_access+$interval)) { - $status='CLOSED'; - $datemsg = &mt("was due on")." $newdate".&mt(", and answers will be available on")." $date"; - } else { - $datemsg = &mt("is due at")." $newdate"; - } + my $due_date = &due_date($id); + $datemsg=&seconds_to_human_length($due_date-time); } } } + #if (($status ne 'CLOSED') && ($Apache::lonhomework::type eq 'exam') && # (!$Apache::lonhomework::history{"resource.0.outtoken"})) { # return ('UNCHECKEDOUT','needs to be checked out'); @@ -478,6 +495,29 @@ sub check_access { return ($status,$datemsg); } +# this should work exactly like the copy in lonnavmaps.pm +sub due_date { + my ($part_id,$symb,$udom,$uname)=@_; + my $date; + my $interval= &Apache::lonnet::EXT("resource.$part_id.interval",$symb, + $udom,$uname); + &Apache::lonxml::debug("looking for interval $part_id $symb $interval"); + my $due_date= &Apache::lonnet::EXT("resource.$part_id.duedate",$symb, + $udom,$uname); + &Apache::lonxml::debug("looking for due_date $part_id $symb $due_date"); + if (defined($interval)) { + my $first_access=&Apache::lonnet::get_first_access('map',$symb); + if (defined($first_access)) { + $interval = $first_access+$interval; + $date = ($interval < $due_date)? $interval : $due_date; + } else { + $date = $due_date; + } + } else { + $date = $due_date; + } + return $date +} sub seconds_to_human_length { my ($length)=@_; @@ -581,6 +621,13 @@ sub setuppermissions { return ''; } +sub unset_permissions { + undef($Apache::lonhomework::queuegrade); + undef($Apache::lonhomework::modifygrades); + undef($Apache::lonhomework::viewgrades); + undef($Apache::lonhomework::browse); +} + sub setupheader { my $request=$_[0]; &Apache::loncommon::content_type($request,'text/html'); @@ -767,7 +814,7 @@ sub editxmlmode { &Apache::loncommon::helpLatexCheatsheet("Problem_Editor_XML_Index", "Problem Editing Help"). ''. - &Apache::loncommon::help_open_menu('',undef,undef,undef,5,'Authoring'). + &Apache::loncommon::help_open_menu(undef,undef,5,'Authoring'). ''; if ($cols > 80) { $cols = 80; } if ($cols < 70) { $cols = 70; } @@ -980,10 +1027,15 @@ sub handler { if ($Apache::lonhomework::browse ne 'F' && $env{'request.state'} ne "construct") { #should know where we are, so ask - $request->internal_redirect('/adm/ambiguous'); return OK; + &unset_permissions(); + $request->internal_redirect('/adm/ambiguous'); + return OK; } } - if (&setupheader($request)) { return OK; } + if (&setupheader($request)) { + &unset_permissions(); + return OK; + } &Apache::lonxml::debug("Permissions:$Apache::lonhomework::browse:$Apache::lonhomework::viewgrades:$Apache::lonhomework::modifygrades:$Apache::lonhomework::queuegrade"); &Apache::lonxml::debug("Problem Mode ".$env{'form.problemmode'}); my ($symb) = &Apache::lonxml::whichuser(); @@ -1017,6 +1069,7 @@ sub handler { #&Apache::lonxml::debug("Spent $td seconds processing"); # always turn off debug messages $Apache::lonxml::debug=0; + &unset_permissions(); return OK; }