--- loncom/homework/lonhomework.pm 2005/11/15 18:38:47 1.224 +++ loncom/homework/lonhomework.pm 2007/03/06 19:05:58 1.265 @@ -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.265 2007/03/06 19:05:58 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -86,13 +86,16 @@ sub get_target { } elsif ( defined($env{'form.grade_target'} ) && ($Apache::lonhomework::viewgrades eq 'F' )) { return ($env{'form.grade_target'}); + } elsif ( $env{'form.grade_target'} eq 'webgrade' + && ($Apache::lonhomework::queuegrade eq 'F' )) { + return ($env{'form.grade_target'}); } if ($env{'form.webgrade'} && - $Apache::lonhomework::modifygrades eq 'F') { + ($Apache::lonhomework::modifygrades eq 'F' + || $Apache::lonhomework::queuegrade eq 'F' )) { return ('grade','webgrade'); } if ( defined($env{'form.submitted'}) && - ( !defined($env{'form.resetdata'})) && ( !defined($env{'form.newrandomization'}))) { return ('grade', 'web'); } else { @@ -143,12 +146,6 @@ sub setup_vars { # return ';$external::target='.$target.';'; } -sub send_header { - my ($request)= @_; - $request->print(&Apache::lontexconvert::header()); -# $request->print('
'); -} - sub createmenu { my ($which,$request)=@_; if ($which eq 'grade') { @@ -159,24 +156,32 @@ sub createmenu { } } -sub send_footer { - my ($request)= @_; -# $request->print('
'); - $request->print(&Apache::lontexconvert::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'}); + + return 1 if (!@possible_proctors); + + 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'; + } + # 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 ($who eq $possible + && $Apache::lonhomework::history{$key.'.slot'} eq $slot_name) { return 1; } } + return 0; } @@ -191,6 +196,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 +237,20 @@ 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.0.useslots"); + if ($useslots ne 'resource' && $useslots ne 'map' + && $useslots ne 'map_map') { + 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,15 +258,18 @@ 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"))); + (split(':',&Apache::lonnet::EXT("resource.0.availablestudent")), + split(':',&Apache::lonnet::EXT("resource.0.available"))); # if (!@slots) { # return ($status,$datemsg); @@ -260,6 +277,7 @@ sub check_task_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); @@ -274,18 +292,70 @@ 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"}; + $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)"); + + # no slot is currently open, and has been checked in for this version + # but hasn't got a grade, therefore must be awaiting a grade + if (!defined($slot_name) + && $checkedin + && !$got_grade) { + 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 ) { + + if ($got_grade) { return ('SHOW_ANSWER'); } else { return ('WAITING_FOR_GRADE'); } + + } + + 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); + } + return ($slotstatus,$datemsg,$slot_name,$returned_slot); } @@ -297,7 +367,6 @@ sub check_access { my $status; my $datemsg = ''; my $lastdate = ''; - my $temp; my $type; my $passed; @@ -323,7 +392,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") { @@ -334,9 +403,14 @@ 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"); + 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)/) { @@ -404,18 +478,16 @@ 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); + my $seconds_left = $due_date - time; + if ($seconds_left > $interval || $due_date eq '') { + $seconds_left = $interval; } + $datemsg=&seconds_to_human_length($seconds_left); } } } + #if (($status ne 'CLOSED') && ($Apache::lonhomework::type eq 'exam') && # (!$Apache::lonhomework::history{"resource.0.outtoken"})) { # return ('UNCHECKEDOUT','needs to be checked out'); @@ -431,6 +503,30 @@ 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 ($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; + } else { + $date = $due_date; + } + } else { + $date = $due_date; + } + return $date +} sub seconds_to_human_length { my ($length)=@_; @@ -503,13 +599,15 @@ sub setuppermissions { $viewgrades = &Apache::lonnet::allowed('vgr',$env{'request.course.id'}. '/'.$env{'request.course.sec'}); } - $Apache::lonhomework::viewgrades = $viewgrades; # File global variable...dirt. + $Apache::lonhomework::viewgrades = $viewgrades; + 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"}); } + my $modifygrades = &Apache::lonnet::allowed('mgr',$env{'request.course.id'}); if (! $modifygrades && exists($env{'request.course.sec'}) && @@ -519,9 +617,26 @@ sub setuppermissions { '/'.$env{'request.course.sec'}); } $Apache::lonhomework::modifygrades = $modifygrades; + + my $queuegrade = &Apache::lonnet::allowed('mqg',$env{'request.course.id'}); + if (! $queuegrade && + exists($env{'request.course.sec'}) && + $env{'request.course.sec'} !~ /^\s*$/) { + $queuegrade = + &Apache::lonnet::allowed('qgr',$env{'request.course.id'}. + '/'.$env{'request.course.sec'}); + } + $Apache::lonhomework::queuegrade = $queuegrade; 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'); @@ -541,9 +656,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; } @@ -556,6 +668,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; @@ -581,12 +694,11 @@ sub handle_save_or_undo { sub analyze_header { my ($request) = @_; - my $bodytag=&Apache::loncommon::bodytag(undef,undef,undef, - ($env{'environment.remote'} ne 'off')); - my $html=&Apache::lonxml::xmlbegin(); - my $result.=$html.' - '.&mt("Analyzing a problem").' - '.$bodytag.&Apache::lonxml::message_location().' + my $result = + &Apache::loncommon::start_page('Analyzing a problem',undef); + + $result .= + &Apache::lonxml::message_location().'
'. &Apache::structuretags::remember_problem_state().' @@ -603,8 +715,7 @@ sub analyze_header { sub analyze_footer { my ($request) = @_; - my $result=''; - $request->print($result); + $request->print(&Apache::loncommon::end_page()); $request->rflush(); } @@ -641,13 +752,20 @@ sub analyze { if ($analyze{$part.'.type'} eq 'numericalresponse' || $analyze{$part.'.type'} eq 'stringresponse' || $analyze{$part.'.type'} eq 'formularesponse' ) { - my $concatanswer=join("\0",@{ $analyze{$part.'.answer'} }); - if (($concatanswer eq '') || ($concatanswer=~/^\@/)) { - @{$analyze{$part.'.answer'}}=(''.&mt('Error').''); + foreach my $name (keys(%{ $analyze{$part.'.answer'} })) { + my $i=0; + foreach my $answer_part (@{ $analyze{$part.'.answer'}{$name} }) { + push( @{ $overall{$part.'.answer'}[$i] }, + $answer_part); + my $concatanswer= join("\0",@{ $answer_part }); + if (($concatanswer eq '') || ($concatanswer=~/^\@/)) { + $answer_part = [''.&mt('Error').'']; + } + $seedexample{join("\0",$part,$i,@{$answer_part})}= + $thisseed; + $i++; + } } - push( @{ $overall{$part.'.answer'} }, - [@{ $analyze{$part.'.answer'} }]); - $seedexample{join("\0",@{ $analyze{$part.'.answer'}})}=$thisseed; } } } @@ -656,21 +774,27 @@ sub analyze { $request->print('
'.&mt('List of possible answers').': '); foreach my $part (sort(keys(%allparts))) { if (defined(@{ $overall{$part.'.answer'} })) { - my $num_cols=scalar(@{ $overall{$part.'.answer'}->[0] }); - $request->print(''); - my %frequency; - foreach my $answer (sort {$a->[0] <=> $b->[0]} (@{ $overall{$part.'.answer'} })) { - $frequency{join("\0",@{ $answer })}++; - } - $request->print(''); - foreach my $answer (sort {(split("\0",$a))[0] <=> (split("\0",$b))[0]} (keys(%frequency))) { - $request->print(''); + for (my $i=0;$iprint('
'.&mt('Part').' '.$part.'
'.&mt('Answer').''.&mt('Frequency').'
(' - .&mt('click for example').')
'. - join('',split("\0",$answer)). - ''.$frequency{$answer}. - '
'); + my %frequency; + foreach my $answer (sort {$a->[0] <=> $b->[0]} (@{ $overall{$part.'.answer'}[$i] })) { + $frequency{join("\0",@{ $answer })}++; + } + $request->print(''); + foreach my $answer (sort {(split("\0",$a))[0] <=> (split("\0",$b))[0]} (keys(%frequency))) { + $request->print(''); + } + $request->print('
'.&mt('Part').' '.$part); + if (scalar(@{ $overall{$part.'.answer'} }) > 1) { + $request->print(&mt(' Answer [_1]',$i+1)); + } + $request->print('
'.&mt('Answer').''.&mt('Frequency').'
(' + .&mt('click for example').')
'. + join('',split("\0",$answer)). + ''.$frequency{$answer}. + '
'); } - $request->print(''); } else { $request->print('

'.&mt('Response').' '.$part.' '. &mt('is not analyzable at this time').'

'); @@ -710,32 +834,36 @@ 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; } if ($rows < 20) { $rows = 20; } - my $bodytag=&Apache::loncommon::bodytag(undef,undef,undef, - ($env{'environment.remote'} ne 'off')); - my $html=&Apache::lonxml::xmlbegin(); - $result.=$html.$bodytag. + my $start_page = + &Apache::loncommon::start_page(&mt("EditXML [_1]",$file), + &Apache::edit::js_change_detection(), + {'no_auto_mt_title' => 1,}); + + $result.=$start_page. &renderpage($request,$file,['no_output_web'],1). &Apache::lonxml::message_location().' - '. &Apache::structuretags::remember_problem_state().' - + +
-
' . $xml_help . ' - -
'; +
+ + + '.&Apache::loncommon::end_page(); &Apache::lonxml::add_messages(\$result); $request->print($result); } @@ -768,9 +896,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; @@ -852,7 +987,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); @@ -867,55 +1002,29 @@ sub newproblem { $errormsg='

'.&mt('You did not select a template.').'

'."\n"; } my $instructions; - my $bodytag=&Apache::loncommon::bodytag(undef,undef,undef, - ($env{'environment.remote'} ne 'off')); - 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(<$lt{'create'} $extension $lt{'resource'} + my $start_page = + &Apache::loncommon::start_page("Create New $extension"); + $request->print(" +$start_page +

".&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(""); } $request->print("
"); - $request->print("

"); + $request->print("

".&Apache::loncommon::end_page()); } return ''; } -sub view_or_edit_menu { - my ($request) = @_; - my $url=&HTML::Entities::encode($request->uri,'<>&"'); - my %lt=&Apache::lonlocal::texthash( 'would' => 'Would you like to', - 'view' => 'View', - 'Edit' => 'edit', - 'or' => 'or', - 'the problem' => 'the problem'); - $request->print(< -
-$lt{'would'} -<{'or'} -<{'the problem'}. -
- -EDITMENU -} - sub handler { #my $t0 = [&gettimeofday()]; my $request=$_[0]; @@ -939,30 +1048,25 @@ 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; } - &Apache::lonxml::debug("Permissions:$Apache::lonhomework::browse:$Apache::lonhomework::viewgrades:"); + 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" || $symb eq '') { - if ($env{'form.resetdata'} eq &mt('Reset Submissions') || - $env{'form.resetdata'} eq &mt('New Problem Variation') || - $env{'form.newrandomization'} eq &mt('New Randomization')) { - my ($symb,$courseid,$domain,$name) = &Apache::lonxml::whichuser(); - &Apache::lonnet::tmpreset($symb,'',$domain,$name); - &Apache::lonxml::debug("Attempt reset"); - } - } if ($env{'request.state'} eq "construct") { if ( -e $file ) { &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'}, ['problemmode']); if (!(defined $env{'form.problemmode'})) { #first visit to problem in construction space - #&view_or_edit_menu($request); $env{'form.problemmode'}='View'; &renderpage($request,$file); } elsif ($env{'form.problemmode'} eq &mt('EditXML') || @@ -984,9 +1088,9 @@ sub handler { } #my $td=&tv_interval($t0); #&Apache::lonxml::debug("Spent $td seconds processing"); - # &Apache::lonhomework::send_footer($request); # always turn off debug messages $Apache::lonxml::debug=0; + &unset_permissions(); return OK; }