--- loncom/homework/lonhomework.pm 2018/01/31 15:28:28 1.370 +++ loncom/homework/lonhomework.pm 2023/06/04 05:27:28 1.377 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # The LON-CAPA Homework handler # -# $Id: lonhomework.pm,v 1.370 2018/01/31 15:28:28 raeburn Exp $ +# $Id: lonhomework.pm,v 1.377 2023/06/04 05:27:28 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -50,16 +50,22 @@ use Apache::chemresponse(); use Apache::functionplotresponse(); use Apache::drawimage(); use Apache::loncapamath(); +use Apache::loncourseuser(); +use Apache::grades(); use Apache::Constants qw(:common); use Apache::loncommon(); use Apache::lonparmset(); +use Apache::lonnavmaps(); use Apache::lonlocal; +use LONCAPA qw(:DEFAULT :match); +use LONCAPA::ltiutils(); use Time::HiRes qw( gettimeofday tv_interval ); use HTML::Entities(); use File::Copy(); # FIXME - improve commenting +my $registered_cleanup; BEGIN { &Apache::lonxml::register_insert(); @@ -238,7 +244,8 @@ sub check_slot_access { $consumed_uniq = $slot{'uniqueperiod'}; if ($slot{'iptied'}) { $ipused = $Apache::lonhomework::history{"$checkin.ip"}; - unless (($ip ne '') && ($ipused eq $ip)) { + unless (($ip ne '') && + (($ipused eq $ip) || ($ENV{'REMOTE_ADDR'} eq '127.0.0.1'))) { $blockip = $slot{'iptied'}; $slot_name = $checkinslot; $returned_slot = \%slot; @@ -252,7 +259,7 @@ sub check_slot_access { } else { return ($status,$datemsg); } - } + } if ($status eq 'CLOSED' || $status eq 'INVALID_ACCESS' || @@ -262,7 +269,7 @@ sub check_slot_access { if ($env{'request.state'} eq "construct") { return ($status,$datemsg); } - + if ($type eq 'Task') { if ($checkedin && $Apache::lonhomework::history{"resource.$version.0.status"} eq 'pass') { @@ -272,6 +279,12 @@ sub check_slot_access { return ('SHOW_ANSWER'); } } + } elsif (($type eq 'problem') && + ($Apache::lonhomework::browse eq 'F') && + ($ENV{'REMOTE_ADDR'} eq '127.0.0.1') && + ($env{'form.grade_courseid'} eq $env{'request.course.id'}) && + (&Apache::lonnet::allowed('mgr',$env{'request.course.id'}))) { + return ($status,$datemsg); } my $availablestudent = &Apache::lonnet::EXT("resource.0.availablestudent",$symb); @@ -358,16 +371,16 @@ sub check_slot_access { my $probstatus = &Apache::structuretags::get_problem_status($part); my $earlyout; unless (($probstatus eq 'no') || - ($probstatus eq 'no_feedback_ever')) { + ($probstatus eq 'no_feedback_ever')) { if ($Apache::lonhomework::history{"resource.$part.solved"} =~/^correct_/) { $numcorrect ++; } else { $earlyout = 1; } } - if (($currtries == $maxtries) || ($is_correct)) { + if ($currtries == $maxtries) { $earlyout = 1; - } else { + } else { $numgraded ++; } last if ($earlyout); @@ -784,6 +797,9 @@ sub setuppermissions { $env{'request.course.sec'} !~ /^\s*$/) { $viewgrades = &Apache::lonnet::allowed('vgr',$env{'request.course.id'}. '/'.$env{'request.course.sec'}); + if ($viewgrades) { + $Apache::lonhomework::viewgradessec = $env{'request.course.sec'}; + } } $Apache::lonhomework::viewgrades = $viewgrades; @@ -801,6 +817,9 @@ sub setuppermissions { $modifygrades = &Apache::lonnet::allowed('mgr',$env{'request.course.id'}. '/'.$env{'request.course.sec'}); + if ($modifygrades) { + $Apache::lonhomework::modifygradessec = $env{'request.course.sec'}; + } } $Apache::lonhomework::modifygrades = $modifygrades; @@ -819,7 +838,9 @@ sub setuppermissions { sub unset_permissions { undef($Apache::lonhomework::queuegrade); undef($Apache::lonhomework::modifygrades); + undef($Apache::lonhomework::modifygradessec); undef($Apache::lonhomework::viewgrades); + undef($Apache::lonhomework::viewgradessec); undef($Apache::lonhomework::browse); } @@ -1190,27 +1211,27 @@ sub editxmlmode { unless ($env{'environment.nocodemirror'}) { # dropdown menus - $result .= Apache::lonmenu::create_submenu("#", "", + $result .= Apache::lonmenu::create_submenu("#", "", &mt("Problem Templates"), template_dropdown_datastructure()); - $result .= Apache::lonmenu::create_submenu("#", "", + $result .= Apache::lonmenu::create_submenu("#", "", &mt("Response Types"), responseblock_dropdown_datastructure()); - $result .= Apache::lonmenu::create_submenu("#", "", + $result .= Apache::lonmenu::create_submenu("#", "", &mt("Conditional Blocks"), conditional_scripting_datastructure()); - $result .= Apache::lonmenu::create_submenu("#", "", + $result .= Apache::lonmenu::create_submenu("#", "", &mt("Miscellaneous"), misc_datastructure()); } - $result .= Apache::lonmenu::create_submenu("#", "", + $result .= Apache::lonmenu::create_submenu("#", "", &mt("Help") . ' ' . &mt(', + '" style="vertical-align:text-bottom; height: auto; margin:0; "/>', helpmenu_datastructure(),""); $result.=""; - - $result .= '' . + + $result .= '' . &Apache::lonxml::message_location() . &Apache::loncommon::xmleditor_js() . '