--- loncom/homework/lonhomework.pm 2006/06/20 03:33:55 1.251 +++ loncom/homework/lonhomework.pm 2006/11/30 01:14:17 1.262 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # The LON-CAPA Homework handler # -# $Id: lonhomework.pm,v 1.251 2006/06/20 03:33:55 albertel Exp $ +# $Id: lonhomework.pm,v 1.262 2006/11/30 01:14:17 banghart Exp $ # # Copyright Michigan State University Board of Trustees # @@ -244,7 +244,7 @@ sub check_slot_access { # does it pass normal muster my ($status,$datemsg)=&check_access($id); - my $useslots = &Apache::lonnet::EXT("resource.$id.useslots"); + my $useslots = &Apache::lonnet::EXT("resource.0.useslots"); if ($useslots ne 'resource' && $useslots ne 'map' && $useslots ne 'map_map') { return ($status,$datemsg); @@ -269,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); @@ -310,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)"); @@ -324,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 ) { @@ -334,9 +344,14 @@ sub check_slot_access { } } + if ( $is_correct) { + if ($type eq 'problem') { + return ($status); + } return ('SHOW_ANSWER'); } + if ( $status eq 'CANNOT_ANSWER' && ($slotstatus ne 'NEEDS_CHECKIN' && $slotstatus ne 'NOT_IN_A_SLOT')) { return ($status,$datemsg); @@ -378,7 +393,7 @@ sub check_access { &Apache::lonxml::debug("checking for part :$id:"); &Apache::lonxml::debug("time:".time); - my ($symb)=&Apache::lonxml::whichuser(); + my ($symb)=&Apache::lonnet::whichuser(); &Apache::lonxml::debug("symb:".$symb); #if ($env{'request.state'} ne "construct" && $symb ne '') { if ($env{'request.state'} ne "construct") { @@ -465,7 +480,11 @@ sub check_access { if (!$first_access) { $status='NOT_YET_VIEWED'; my $due_date = &due_date($id); - $datemsg=&seconds_to_human_length($due_date-time); + my $seconds_left = $due_date - time; + if ($seconds_left > $interval || $due_date eq '') { + $seconds_left = $interval; + } + $datemsg=&seconds_to_human_length($seconds_left); } } } @@ -495,8 +514,9 @@ sub due_date { 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)) { + if ($interval =~ /\d+/) { my $first_access=&Apache::lonnet::get_first_access('map',$symb); + &Apache::lonxml::debug("looking for first_access $first_access"); if (defined($first_access)) { $interval = $first_access+$interval; $date = ($interval < $due_date)? $interval : $due_date; @@ -584,7 +604,7 @@ sub setuppermissions { if ($Apache::lonhomework::browse eq 'F' && $env{'form.devalidatecourseresdata'} eq 'on') { - my (undef,$courseid) = &Apache::lonxml::whichuser(); + my (undef,$courseid) = &Apache::lonnet::whichuser(); &Apache::lonnet::devalidatecourseresdata($env{"course.$courseid.num"}, $env{"course.$courseid.domain"}); } @@ -611,6 +631,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'); @@ -630,9 +657,6 @@ sub handle_save_or_undo { my $filebak =$file.".bak"; my $filetmp =$file.".tmp"; my $error=0; - - &Apache::lonnet::correct_line_ends($result); - if ($env{'form.Undo'} eq &mt('undo')) { my $error=0; if (!copy($file,$filetmp)) { $error=1; } @@ -645,6 +669,7 @@ sub handle_save_or_undo { $error=1; } } else { + &Apache::lonnet::correct_line_ends($result); my $fs=Apache::File->new(">$filebak"); if (defined($fs)) { print $fs $$problem; @@ -797,7 +822,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; } @@ -858,9 +883,16 @@ sub renderpage { my $problem=&Apache::lonnet::getfile($file); my $result; if ($problem eq -1) { - my $filename=(split('/',$file))[-1]; - $result.=" ".&mt('Unable to find')." $filename"; $problem=''; + my $filename=(split('/',$file))[-1]; + my $error = + " ".&mt('Unable to find [_1]', + ' '.$filename.'') + .""; + $result.= + &Apache::loncommon::simple_error_page($request,'Not available', + $error); + return; } my %mystyle; @@ -942,7 +974,7 @@ sub newproblem { # I don't like hard-coded filenames but for now, this will work. use File::Copy; my $templatefilename = - $request->dir_config('lonIncludes').'/templates/blank.problem'; + $request->dir_config('lonIncludes').'/templates/blank.'.$extension; &Apache::lonxml::debug("$templatefilename"); my $dest = &Apache::lonnet::filelocation("",$request->uri); copy($templatefilename,$dest); @@ -959,25 +991,18 @@ sub newproblem { my $instructions; my $start_page = &Apache::loncommon::start_page("Create New $extension"); - if ($templatelist) { $instructions=&mt(", select a template from the pull-down menu below.").'
'.&mt("Then");} - my %lt=&Apache::lonlocal::texthash( 'create' => 'Creating a new', - 'resource' => 'resource', - 'requested' => 'The requested file', - 'not exist' => 'currently does not exist', - 'createnew' => 'To create a new', - 'click' => 'click on the', - 'Create' => 'Create', - 'button' => 'button'); - $request->print(<print(" $start_page -

$lt{'create'} $extension $lt{'resource'}

+

".&mt("Creating a new $extension resource.")."

$errormsg -$lt{'requested'} $shownurl $lt{'not exist'}. +".&mt("The requested file [_1] currently does not exist.", + "$shownurl")."

-$lt{'createnew'} $extension$instructions $lt{'click'} "$lt{'Create'} $extension" $lt{'button'}. -

-

-ENDNEWPROBLEM + +".&mt("To create a new $extension, select a template from the". + "pull-down menu below. Then click on the \"Create $extension\" button.")." +

"); + if (defined($templatelist)) { $request->print(""); } @@ -1010,13 +1035,18 @@ 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(); + my ($symb) = &Apache::lonnet::whichuser(); &Apache::lonxml::debug('symb is '.$symb); if ($env{'request.state'} eq "construct") { if ( -e $file ) { @@ -1047,6 +1077,7 @@ sub handler { #&Apache::lonxml::debug("Spent $td seconds processing"); # always turn off debug messages $Apache::lonxml::debug=0; + &unset_permissions(); return OK; }