version 1.313, 2009/06/30 10:18:47
|
version 1.382, 2024/01/13 12:07:13
|
Line 47 use Apache::externalresponse();
|
Line 47 use Apache::externalresponse();
|
use Apache::rankresponse(); |
use Apache::rankresponse(); |
use Apache::matchresponse(); |
use Apache::matchresponse(); |
use Apache::chemresponse(); |
use Apache::chemresponse(); |
|
use Apache::functionplotresponse(); |
use Apache::drawimage(); |
use Apache::drawimage(); |
|
use Apache::loncapamath(); |
|
use Apache::loncourseuser(); |
|
use Apache::grades(); |
use Apache::Constants qw(:common); |
use Apache::Constants qw(:common); |
use Apache::loncommon(); |
use Apache::loncommon(); |
|
use Apache::lonparmset(); |
|
use Apache::lonnavmaps(); |
use Apache::lonlocal; |
use Apache::lonlocal; |
|
use LONCAPA qw(:DEFAULT :match); |
|
use LONCAPA::ltiutils(); |
use Time::HiRes qw( gettimeofday tv_interval ); |
use Time::HiRes qw( gettimeofday tv_interval ); |
use HTML::Entities(); |
use HTML::Entities(); |
use File::Copy(); |
use File::Copy(); |
|
|
# FIXME - improve commenting |
# FIXME - improve commenting |
|
|
|
my $registered_cleanup; |
|
|
BEGIN { |
BEGIN { |
&Apache::lonxml::register_insert(); |
&Apache::lonxml::register_insert(); |
Line 111 sub get_target {
|
Line 120 sub get_target {
|
} elsif ( $env{'form.grade_target'} eq 'webgrade' |
} elsif ( $env{'form.grade_target'} eq 'webgrade' |
&& ($Apache::lonhomework::queuegrade eq 'F' )) { |
&& ($Apache::lonhomework::queuegrade eq 'F' )) { |
return ($env{'form.grade_target'}); |
return ($env{'form.grade_target'}); |
} |
} elsif ($env{'form.grade_target'} eq 'answer') { |
|
if ($env{'form.answer_output_mode'} eq 'tex') { |
|
return ($env{'form.grade_target'}); |
|
} |
|
} |
if ($env{'form.webgrade'} && |
if ($env{'form.webgrade'} && |
($Apache::lonhomework::modifygrades eq 'F' |
($Apache::lonhomework::modifygrades eq 'F' |
|| $Apache::lonhomework::queuegrade eq 'F' )) { |
|| $Apache::lonhomework::queuegrade eq 'F' )) { |
Line 124 sub get_target {
|
Line 137 sub get_target {
|
return ('web'); |
return ('web'); |
} |
} |
} elsif ($env{'request.state'} eq "construct") { |
} elsif ($env{'request.state'} eq "construct") { |
|
# |
|
# We are in construction space, editing and testing problems |
|
# |
if ( defined($env{'form.grade_target'}) ) { |
if ( defined($env{'form.grade_target'}) ) { |
return ($env{'form.grade_target'}); |
return ($env{'form.grade_target'}); |
} |
} |
if ( defined($env{'form.preview'})) { |
if ( defined($env{'form.preview'})) { |
if ( defined($env{'form.submitted'})) { |
if ( defined($env{'form.submitted'})) { |
|
# |
|
# We are doing a problem preview |
|
# |
return ('grade', 'web'); |
return ('grade', 'web'); |
} else { |
} else { |
return ('web'); |
return ('web'); |
} |
} |
} else { |
} else { |
if ($env{'form.problemstate'} eq 'WEB_GRADE') { |
if ($env{'form.problemstate'} eq 'WEB_GRADE') { |
#$env{'form.webgrade'} = 'yes'; |
|
return ('grade','webgrade','answer'); |
return ('grade','webgrade','answer'); |
} elsif (($env{'form.problemmode'} eq 'view') || |
} elsif ($env{'form.problemmode'} eq 'view') { |
($env{'form.problemmode'} eq 'discard')) { |
return ('grade','web','answer'); |
if ( defined($env{'form.submitted'}) && |
} elsif ($env{'form.problemmode'} eq 'saveview') { |
(!defined($env{'form.resetdata'})) && |
return ('modified','web','answer'); |
(!defined($env{'form.newrandomization'}))) { |
} elsif ($env{'form.problemmode'} eq 'discard') { |
return ('grade', 'web','answer'); |
return ('web','answer'); |
} else { |
} elsif (($env{'form.problemmode'} eq 'saveedit') || |
return ('web','answer'); |
($env{'form.problemmode'} eq 'undo')) { |
} |
my %editors = &Apache::loncommon::permitted_editors(); |
} elsif ($env{'form.problemmode'} eq 'edit') { |
if ($editors{'edit'}) { |
if ( $env{'form.submitted'} eq 'edit' ) { |
return ('modified','no_output_web','edit'); |
if ( $env{'form.submitbutton'} eq &mt('Save and View') ) { |
} else { |
return ('modified','web','answer'); |
return ('web'); |
} else { |
} |
return ('modified','no_output_web','edit'); |
} elsif ($env{'form.problemmode'} eq 'edit') { |
} |
my %editors = &Apache::loncommon::permitted_editors(); |
} else { |
if ($editors{'edit'}) { |
return ('no_output_web','edit'); |
return ('no_output_web','edit'); |
} |
} else { |
|
return ('web'); |
|
} |
} else { |
} else { |
return ('web'); |
return ('web'); |
} |
} |
} |
} |
|
# |
|
# End of Authoring Space |
|
# |
} |
} |
|
# |
|
# Huh? We are nowhere, so do nothing. |
|
# |
return (); |
return (); |
} |
} |
|
|
Line 170 sub setup_vars {
|
Line 196 sub setup_vars {
|
# return ';$external::target='.$target.';'; |
# return ';$external::target='.$target.';'; |
} |
} |
|
|
sub createmenu { |
|
my ($which,$request)=@_; |
|
if ($which eq 'grade') { |
|
$request->print('<script type="text/javascript" language="JavaScript"> |
|
hwkmenu=window.open("/res/adm/pages/homeworkmenu.html","homeworkremote", |
|
"height=350,width=150,menubar=no"); |
|
</script>'); |
|
} |
|
} |
|
|
|
sub proctor_checked_in { |
sub proctor_checked_in { |
my ($slot_name,$slot,$type)=@_; |
my ($slot_name,$slot,$type)=@_; |
my @possible_proctors=split(",",$slot->{'proctor'}); |
my @possible_proctors=split(",",$slot->{'proctor'}); |
Line 190 sub proctor_checked_in {
|
Line 206 sub proctor_checked_in {
|
if ($type eq 'Task') { |
if ($type eq 'Task') { |
my $version=$Apache::lonhomework::history{'resource.0.version'}; |
my $version=$Apache::lonhomework::history{'resource.0.version'}; |
$key ="resource.$version.0.checkedin"; |
$key ="resource.$version.0.checkedin"; |
} elsif ($type eq 'problem') { |
} elsif (($type eq 'problem') || ($type eq 'tool')) { |
$key ='resource.0.checkedin'; |
$key ='resource.0.checkedin'; |
} |
} |
# backward compatability, used to be username@domain, |
# backward compatability, used to be username@domain, |
Line 205 sub proctor_checked_in {
|
Line 221 sub proctor_checked_in {
|
return 1; |
return 1; |
} |
} |
} |
} |
|
|
return 0; |
return 0; |
} |
} |
|
|
sub check_slot_access { |
sub check_slot_access { |
my ($id,$type)=@_; |
my ($id,$type,$symb,$partlist)=@_; |
|
|
# does it pass normal muster |
# does it pass normal muster |
my ($status,$datemsg)=&check_access($id); |
my ($status,$datemsg)=&check_access($id,$symb); |
|
|
my $useslots = &Apache::lonnet::EXT("resource.0.useslots"); |
my $useslots = &Apache::lonnet::EXT("resource.0.useslots",$symb); |
if ($useslots ne 'resource' && $useslots ne 'map' |
if ($useslots ne 'resource' && $useslots ne 'map' |
&& $useslots ne 'map_map') { |
&& $useslots ne 'map_map') { |
return ($status,$datemsg); |
return ($status,$datemsg); |
} |
} |
|
|
if ($status eq 'SHOW_ANSWER' || |
my $checkin = 'resource.0.checkedin'; |
$status eq 'CLOSED' || |
my $version; |
|
if ($type eq 'Task') { |
|
$version=$Apache::lonhomework::history{'resource.version'}; |
|
$checkin = "resource.$version.0.checkedin"; |
|
} |
|
my $checkedin = $Apache::lonhomework::history{$checkin}; |
|
my ($returned_slot,$slot_name,$checkinslot,$ipused,$blockip,$now,$ip, |
|
$consumed_uniq); |
|
$now = time; |
|
$ip=$ENV{'REMOTE_ADDR'} || $env{'request.host'}; |
|
|
|
if ($checkedin) { |
|
$checkinslot = $Apache::lonhomework::history{"$checkin.slot"}; |
|
my %slot=&Apache::lonnet::get_slot($checkinslot); |
|
$consumed_uniq = $slot{'uniqueperiod'}; |
|
if ($slot{'iptied'}) { |
|
$ipused = $Apache::lonhomework::history{"$checkin.ip"}; |
|
unless (($ip ne '') && |
|
(($ipused eq $ip) || ($ENV{'REMOTE_ADDR'} eq '127.0.0.1'))) { |
|
$blockip = $slot{'iptied'}; |
|
$slot_name = $checkinslot; |
|
$returned_slot = \%slot; |
|
} |
|
} |
|
} |
|
|
|
if ($status eq 'SHOW_ANSWER') { |
|
if ($blockip eq 'answer') { |
|
return ('NEED_DIFFERENT_IP','',$slot_name,$returned_slot,$ipused); |
|
} else { |
|
return ($status,$datemsg); |
|
} |
|
} |
|
|
|
if ($status eq 'CLOSED' || |
$status eq 'INVALID_ACCESS' || |
$status eq 'INVALID_ACCESS' || |
$status eq 'UNAVAILABLE') { |
$status eq 'UNAVAILABLE') { |
return ($status,$datemsg); |
return ($status,$datemsg); |
Line 230 sub check_slot_access {
|
Line 279 sub check_slot_access {
|
if ($env{'request.state'} eq "construct") { |
if ($env{'request.state'} eq "construct") { |
return ($status,$datemsg); |
return ($status,$datemsg); |
} |
} |
|
|
if ($type eq 'Task') { |
if ($type eq 'Task') { |
my $version=$Apache::lonhomework::history{'resource.version'}; |
if ($checkedin && |
if ($Apache::lonhomework::history{"resource.$version.0.checkedin"} && |
|
$Apache::lonhomework::history{"resource.$version.0.status"} eq 'pass') { |
$Apache::lonhomework::history{"resource.$version.0.status"} eq 'pass') { |
return ('SHOW_ANSWER'); |
if ($blockip eq 'answer') { |
} |
return ('NEED_DIFFERENT_IP','',$slot_name,$returned_slot,$ipused); |
|
} else { |
|
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"); |
my $availablestudent = &Apache::lonnet::EXT("resource.0.availablestudent",$symb); |
my $available = &Apache::lonnet::EXT("resource.0.available"); |
my $available = &Apache::lonnet::EXT("resource.0.available",$symb); |
my @slots= (split(':',$availablestudent),split(':',$available)); |
my @slots= (split(':',$availablestudent),split(':',$available)); |
|
|
# if (!@slots) { |
# if (!@slots) { |
# return ($status,$datemsg); |
# return ($status,$datemsg); |
# } |
# } |
|
undef($returned_slot); |
|
undef($slot_name); |
my $slotstatus='NOT_IN_A_SLOT'; |
my $slotstatus='NOT_IN_A_SLOT'; |
my ($returned_slot,$slot_name); |
my $num_usable_slots = 0; |
|
if (!$symb) { |
|
($symb) = &Apache::lonnet::whichuser(); |
|
} |
foreach my $slot (@slots) { |
foreach my $slot (@slots) { |
$slot =~ s/(^\s*|\s*$)//g; |
$slot =~ s/(^\s*|\s*$)//g; |
&Apache::lonxml::debug("getting $slot"); |
&Apache::lonxml::debug("getting $slot"); |
my %slot=&Apache::lonnet::get_slot($slot); |
my %slot=&Apache::lonnet::get_slot($slot); |
&Apache::lonhomework::showhash(%slot); |
&Apache::lonhomework::showhash(%slot); |
if ($slot{'starttime'} < time && |
next if ($slot{'endtime'} < $now); |
$slot{'endtime'} > time && |
$num_usable_slots ++; |
|
if ($slot{'starttime'} < $now && |
|
$slot{'endtime'} > $now && |
&Apache::loncommon::check_ip_acc($slot{'ip'})) { |
&Apache::loncommon::check_ip_acc($slot{'ip'})) { |
&Apache::lonxml::debug("$slot is good"); |
if ($slot{'iptied'}) { |
$slotstatus='NEEDS_CHECKIN'; |
if ($env{'request.course.id'}) { |
$returned_slot=\%slot; |
my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'}; |
$slot_name=$slot; |
my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'}; |
last; |
if ($slot eq $checkinslot) { |
} |
if ($ip eq $ipused) { |
|
&Apache::lonxml::debug("$slot is good"); |
|
$slotstatus ='NEEDS_CHECKIN'; |
|
} else { |
|
$slotstatus = 'NEED_DIFFERENT_IP'; |
|
$slot_name = $slot; |
|
$returned_slot = \%slot; |
|
last; |
|
} |
|
} elsif ($ip) { |
|
my $uniqkey = "$slot\0$symb\0$ip"; |
|
my %used_ip = &Apache::lonnet::get('slot_uniqueips',[$uniqkey],$cdom,$cnum); |
|
if ($used_ip{$uniqkey}) { |
|
$slotstatus = 'NEED_DIFFERENT_IP'; |
|
} else { |
|
&Apache::lonxml::debug("$slot is good"); |
|
$slotstatus ='NEEDS_CHECKIN'; |
|
} |
|
} |
|
} |
|
} else { |
|
&Apache::lonxml::debug("$slot is good"); |
|
$slotstatus='NEEDS_CHECKIN'; |
|
} |
|
if ($slotstatus eq 'NEEDS_CHECKIN') { |
|
$returned_slot=\%slot; |
|
$slot_name=$slot; |
|
last; |
|
} |
|
} |
} |
} |
if ($slotstatus eq 'NEEDS_CHECKIN' && |
if ($slotstatus eq 'NEEDS_CHECKIN' && |
&proctor_checked_in($slot_name,$returned_slot,$type)) { |
&proctor_checked_in($slot_name,$returned_slot,$type)) { |
&Apache::lonxml::debug("protoctor checked in"); |
&Apache::lonxml::debug("proctor checked in"); |
$slotstatus='CAN_ANSWER'; |
$slotstatus=$status; |
} |
} |
|
|
my ($is_correct,$got_grade,$checkedin); |
my ($is_correct,$got_grade); |
if ($type eq 'Task') { |
if ($type eq 'Task') { |
my $version=$Apache::lonhomework::history{'resource.0.version'}; |
my $version=$Apache::lonhomework::history{'resource.0.version'}; |
$got_grade = |
$got_grade = |
Line 278 sub check_slot_access {
|
Line 372 sub check_slot_access {
|
$is_correct = |
$is_correct = |
($Apache::lonhomework::history{"resource.$version.0.status"} eq 'pass' |
($Apache::lonhomework::history{"resource.$version.0.status"} eq 'pass' |
|| $Apache::lonhomework::history{"resource.0.solved"} =~ /^correct_/ ); |
|| $Apache::lonhomework::history{"resource.0.solved"} =~ /^correct_/ ); |
$checkedin = |
} elsif (($type eq 'problem') || ($type eq 'tool')) { |
$Apache::lonhomework::history{"resource.$version.0.checkedin"}; |
if ((ref($partlist) eq 'ARRAY') && (@{$partlist} > 0)) { |
} elsif ($type eq 'problem') { |
my ($numcorrect,$numgraded) = (0,0); |
$got_grade = 1; |
foreach my $part (@{$partlist}) { |
$checkedin = $Apache::lonhomework::history{"resource.0.checkedin"}; |
my $currtries = $Apache::lonhomework::history{"resource.$part.tries"}; |
$is_correct = |
my $maxtries = &Apache::lonnet::EXT("resource.$part.maxtries",$symb); |
($Apache::lonhomework::history{"resource.0.solved"} =~/^correct_/); |
my $probstatus = &Apache::structuretags::get_problem_status($part); |
|
my $earlyout; |
|
unless (($probstatus eq 'no') || |
|
($probstatus eq 'no_feedback_ever')) { |
|
if ($Apache::lonhomework::history{"resource.$part.solved"} =~/^correct_/) { |
|
$numcorrect ++; |
|
} else { |
|
$earlyout = 1; |
|
} |
|
} |
|
if ($currtries == $maxtries) { |
|
$earlyout = 1; |
|
} else { |
|
$numgraded ++; |
|
} |
|
last if ($earlyout); |
|
} |
|
my $numparts = scalar(@{$partlist}); |
|
if ($numparts == $numcorrect) { |
|
$is_correct = 1; |
|
} |
|
if ($numparts == $numgraded) { |
|
$got_grade = 1; |
|
} |
|
} else { |
|
my $currtries = $Apache::lonhomework::history{"resource.0.tries"}; |
|
my $maxtries = &Apache::lonnet::EXT("resource.0.maxtries",$symb); |
|
my $probstatus = &Apache::structuretags::get_problem_status('0'); |
|
unless (($probstatus eq 'no') || |
|
($probstatus eq 'no_feedback_ever')) { |
|
$is_correct = |
|
($Apache::lonhomework::history{"resource.0.solved"} =~/^correct_/); |
|
} |
|
unless (($currtries == $maxtries) || ($is_correct)) { |
|
$got_grade = 1; |
|
} |
|
} |
} |
} |
|
|
&Apache::lonxml::debug(" slot is $slotstatus checkedin ($checkedin) got_grade ($got_grade) is_correct ($is_correct)"); |
&Apache::lonxml::debug(" slot is $slotstatus checkedin ($checkedin) got_grade ($got_grade) is_correct ($is_correct)"); |
Line 301 sub check_slot_access {
|
Line 431 sub check_slot_access {
|
# However, the problem is not closed, and potentially, another slot might be |
# However, the problem is not closed, and potentially, another slot might be |
# used to gain access to it to work on it, until the due date is reached, and the |
# used to gain access to it to work on it, until the due date is reached, and the |
# problem then becomes CLOSED. Therefore return the slotstatus - |
# problem then becomes CLOSED. Therefore return the slotstatus - |
# (which will be NOT_IN_SLOT). |
# (which will be one of: NOT_IN_A_SLOT, RESERVABLE, RESERVABLE_LATER, or NOTRESERVABLE). |
if (!defined($slot_name) |
|
&& $checkedin |
if (!defined($slot_name) && (($type eq 'problem') || ($type eq 'tool'))) { |
&& $type eq 'problem') { |
if ($slotstatus eq 'NOT_IN_A_SLOT') { |
return ($slotstatus); |
if (!$num_usable_slots) { |
|
($slotstatus,$datemsg) = &check_reservable_slot($slotstatus,$symb,$now,$checkedin, |
|
$consumed_uniq); |
|
} |
|
} |
|
return ($slotstatus,$datemsg); |
} |
} |
|
|
if ($slotstatus eq 'NOT_IN_A_SLOT' |
if ($slotstatus eq 'NOT_IN_A_SLOT' |
&& $checkedin ) { |
&& $checkedin ) { |
|
|
if ($got_grade) { |
if ($got_grade) { |
return ('SHOW_ANSWER'); |
if ($blockip eq 'answer') { |
|
return ('NEED_DIFFERENT_IP','',$slot_name,$returned_slot,$ipused); |
|
} else { |
|
return ('SHOW_ANSWER'); |
|
} |
} else { |
} else { |
return ('WAITING_FOR_GRADE'); |
return ('WAITING_FOR_GRADE'); |
} |
} |
|
|
} |
} |
|
|
if ( $is_correct) { |
if (($is_correct) && ($blockip ne 'answer')) { |
if ($type eq 'problem') { |
if (($type eq 'problem') || ($type eq 'tool')) { |
return ($status); |
return ($status); |
} |
} |
return ('SHOW_ANSWER'); |
return ('SHOW_ANSWER'); |
} |
} |
|
|
if ( $status eq 'CANNOT_ANSWER' && |
if ( $status eq 'CANNOT_ANSWER' && |
($slotstatus ne 'NEEDS_CHECKIN' && $slotstatus ne 'NOT_IN_A_SLOT')) { |
($slotstatus ne 'NEEDS_CHECKIN' && $slotstatus ne 'NOT_IN_A_SLOT' && |
|
$slotstatus ne 'NEED_DIFFERENT_IP') ) { |
return ($status,$datemsg); |
return ($status,$datemsg); |
} |
} |
|
return ($slotstatus,$datemsg,$slot_name,$returned_slot,$ipused); |
|
} |
|
|
return ($slotstatus,$datemsg,$slot_name,$returned_slot); |
sub check_reservable_slot { |
|
my ($slotstatus,$symb,$now,$checkedin,$consumed_uniq) = @_; |
|
my $datemsg; |
|
if ($slotstatus eq 'NOT_IN_A_SLOT') { |
|
if ($env{'request.course.id'}) { |
|
my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'}; |
|
my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'}; |
|
unless ($symb) { |
|
($symb)=&Apache::lonnet::whichuser(); |
|
} |
|
$slotstatus = 'NOTRESERVABLE'; |
|
my ($reservable_now_order,$reservable_now,$reservable_future_order, |
|
$reservable_future) = |
|
&Apache::loncommon::get_future_slots($cnum,$cdom,$now,$symb); |
|
if ((ref($reservable_now_order) eq 'ARRAY') && (ref($reservable_now) eq 'HASH')) { |
|
if (@{$reservable_now_order} > 0) { |
|
if ((!$checkedin) || (ref($consumed_uniq) ne 'ARRAY')) { |
|
$slotstatus = 'RESERVABLE'; |
|
$datemsg = $reservable_now->{$reservable_now_order->[-1]}{'endreserve'}; |
|
} else { |
|
my ($uniqstart,$uniqend,$useslot); |
|
if (ref($consumed_uniq) eq 'ARRAY') { |
|
($uniqstart,$uniqend)=@{$consumed_uniq}; |
|
} |
|
foreach my $slot (reverse(@{$reservable_now_order})) { |
|
if ($reservable_now->{$slot}{'uniqueperiod'} =~ /^(\d+)\,(\d+)$/) { |
|
my ($new_uniq_start,$new_uniq_end) = ($1,$2); |
|
next if (! |
|
($uniqstart < $new_uniq_start && $uniqend < $new_uniq_start) || |
|
($uniqstart > $new_uniq_end && $uniqend > $new_uniq_end )); |
|
} |
|
$useslot = $slot; |
|
last; |
|
} |
|
if ($useslot) { |
|
$slotstatus = 'RESERVABLE'; |
|
$datemsg = $reservable_now->{$useslot}{'endreserve'}; |
|
} |
|
} |
|
} |
|
} |
|
unless ($slotstatus eq 'RESERVABLE') { |
|
if ((ref($reservable_future_order) eq 'ARRAY') && (ref($reservable_future) eq 'HASH')) { |
|
if (@{$reservable_future_order} > 0) { |
|
if ((!$checkedin) || (ref($consumed_uniq) ne 'ARRAY')) { |
|
$slotstatus = 'RESERVABLE_LATER'; |
|
$datemsg = $reservable_future->{$reservable_future_order->[0]}{'startreserve'}; |
|
} else { |
|
my ($uniqstart,$uniqend,$useslot); |
|
if (ref($consumed_uniq) eq 'ARRAY') { |
|
($uniqstart,$uniqend)=@{$consumed_uniq}; |
|
} |
|
foreach my $slot (@{$reservable_future_order}) { |
|
if ($reservable_future->{$slot}{'uniqueperiod'} =~ /^(\d+),(\d+)$/) { |
|
my ($new_uniq_start,$new_uniq_end) = ($1,$2); |
|
next if (! |
|
($uniqstart < $new_uniq_start && $uniqend < $new_uniq_start) || |
|
($uniqstart > $new_uniq_end && $uniqend > $new_uniq_end )); |
|
} |
|
$useslot = $slot; |
|
last; |
|
} |
|
if ($useslot) { |
|
$slotstatus = 'RESERVABLE_LATER'; |
|
$datemsg = $reservable_future->{$useslot}{'startreserve'}; |
|
} |
|
} |
|
} |
|
} |
|
} |
|
} |
|
} |
|
return ($slotstatus,$datemsg); |
} |
} |
|
|
# JB, 9/24/2002: Any changes in this function may require a change |
# JB, 9/24/2002: Any changes in this function may require a change |
# in lonnavmaps::resource::getDateStatus. |
# in lonnavmaps::resource::getDateStatus. |
sub check_access { |
sub check_access { |
my ($id) = @_; |
my ($id,$symb) = @_; |
my $date =''; |
my $date =''; |
my $status; |
my $status; |
my $datemsg = ''; |
my $datemsg = ''; |
Line 367 sub check_access {
|
Line 581 sub check_access {
|
&Apache::lonxml::debug("checking for part :$id:"); |
&Apache::lonxml::debug("checking for part :$id:"); |
&Apache::lonxml::debug("time:".time); |
&Apache::lonxml::debug("time:".time); |
|
|
my ($symb)=&Apache::lonnet::whichuser(); |
unless ($symb) { |
|
($symb)=&Apache::lonnet::whichuser(); |
|
} |
&Apache::lonxml::debug("symb:".$symb); |
&Apache::lonxml::debug("symb:".$symb); |
#if ($env{'request.state'} ne "construct" && $symb ne '') { |
#if ($env{'request.state'} ne "construct" && $symb ne '') { |
if ($env{'request.state'} ne "construct") { |
if ($env{'request.state'} ne "construct") { |
my $idacc = &Apache::lonnet::EXT("resource.$id.acc"); |
my $idacc = &Apache::lonnet::EXT("resource.$id.acc",$symb); |
my $allowed=&Apache::loncommon::check_ip_acc($idacc); |
my $allowed=&Apache::loncommon::check_ip_acc($idacc); |
if (!$allowed && ($Apache::lonhomework::browse ne 'F')) { |
if (!$allowed && ($Apache::lonhomework::browse ne 'F')) { |
$status='INVALID_ACCESS'; |
$status='INVALID_ACCESS'; |
$date=&mt("can not be accessed from your location."); |
$date=&mt("can not be accessed from your location."); |
return($status,$date); |
return($status,$date); |
} |
} |
|
if ($env{'form.grade_imsexport'}) { |
|
if (($env{'request.course.id'}) && |
|
(&Apache::lonnet::allowed('mdc',$env{'request.course.id'}))) { |
|
return ('SHOW_ANSWER'); |
|
} |
|
} |
foreach my $temp ("opendate","duedate","answerdate") { |
foreach my $temp ("opendate","duedate","answerdate") { |
$lastdate = $date; |
$lastdate = $date; |
if ($temp eq 'duedate') { |
if ($temp eq 'duedate') { |
$date = &due_date($id); |
$date = &due_date($id,$symb); |
} else { |
} else { |
$date = &Apache::lonnet::EXT("resource.$id.$temp"); |
$date = &Apache::lonnet::EXT("resource.$id.$temp",$symb); |
} |
} |
|
|
my $thistype = &Apache::lonnet::EXT("resource.$id.$temp.type"); |
my $thistype = &Apache::lonnet::EXT("resource.$id.$temp.type",$symb); |
if ($thistype =~ /^(con_lost|no_such_host)/ || |
if ($thistype =~ /^(con_lost|no_such_host)/ || |
$date =~ /^(con_lost|no_such_host)/) { |
$date =~ /^(con_lost|no_such_host)/) { |
$status='UNAVAILABLE'; |
$status='UNAVAILABLE'; |
Line 396 sub check_access {
|
Line 617 sub check_access {
|
} |
} |
if ($thistype eq 'date_interval') { |
if ($thistype eq 'date_interval') { |
if ($temp eq 'opendate') { |
if ($temp eq 'opendate') { |
$date=&Apache::lonnet::EXT("resource.$id.duedate")-$date; |
$date=&Apache::lonnet::EXT("resource.$id.duedate",$symb)-$date; |
} |
} |
if ($temp eq 'answerdate') { |
if ($temp eq 'answerdate') { |
$date=&Apache::lonnet::EXT("resource.$id.duedate")+$date; |
$date=&Apache::lonnet::EXT("resource.$id.duedate",$symb)+$date; |
} |
} |
} |
} |
&Apache::lonxml::debug("found :$date: for :$temp:"); |
&Apache::lonxml::debug("found :$date: for :$temp:"); |
Line 419 sub check_access {
|
Line 640 sub check_access {
|
$datemsg=$date; |
$datemsg=$date; |
} elsif ($type eq 'opendate') { |
} elsif ($type eq 'opendate') { |
$status='CLOSED'; |
$status='CLOSED'; |
$datemsg = &mt("will open on")." $date"; |
$datemsg = &mt('will open on [_1]',$date); |
} elsif ($type eq 'duedate') { |
} elsif ($type eq 'duedate') { |
$status='CAN_ANSWER'; |
$status='CAN_ANSWER'; |
$datemsg = &mt("is due at")." $date"; |
$datemsg = &mt('is due at [_1]',$date); |
} elsif ($type eq 'answerdate') { |
} elsif ($type eq 'answerdate') { |
$status='CLOSED'; |
$status='CLOSED'; |
$datemsg = &mt("was due on")." $lastdate".&mt(", and answers will be available on")." $date"; |
$datemsg = &mt('was due on [_1], and answers will be available on [_2]', |
|
$lastdate,$date); |
} |
} |
} |
} |
if ($status eq 'CAN_ANSWER' || |
if ($status eq 'CAN_ANSWER' || |
(($Apache::lonhomework::browse eq 'F') && ($status eq 'CLOSED'))) { |
(($Apache::lonhomework::browse eq 'F') && ($status eq 'CLOSED'))) { |
#check #tries, and if correct. |
#check #tries, and if correct. |
my $tries = $Apache::lonhomework::history{"resource.$id.tries"}; |
my $tries = $Apache::lonhomework::history{"resource.$id.tries"}; |
my $maxtries = &Apache::lonnet::EXT("resource.$id.maxtries"); |
my $maxtries = &Apache::lonnet::EXT("resource.$id.maxtries",$symb); |
if ( $tries eq '' ) { $tries = '0'; } |
if ( $tries eq '' ) { $tries = '0'; } |
if ( $maxtries eq '' && |
if ( $maxtries eq '' && |
$env{'request.state'} ne 'construct') { $maxtries = '2'; } |
$env{'request.state'} ne 'construct') { $maxtries = '2'; } |
if ($maxtries && $tries >= $maxtries) { $status = 'CANNOT_ANSWER'; } |
if ($maxtries && $tries >= $maxtries) { $status = 'CANNOT_ANSWER'; } |
# if (correct and show prob status) or excused then CANNOT_ANSWER |
# if (correct and show prob status) or excused then CANNOT_ANSWER |
if(($Apache::lonhomework::history{"resource.$id.solved"}=~/^correct/ |
if ( ($Apache::lonhomework::history{"resource.$id.solved"}=~/^correct/) |
&& |
&& (&show_problem_status()) ) { |
&show_problem_status()) |
if (($Apache::lonhomework::history{"resource.$id.awarded"} >= 1) || |
|| |
(&Apache::lonnet::EXT("resource.$id.retrypartial",$symb) !~/^1|on|yes$/i)) { |
$Apache::lonhomework::history{"resource.$id.solved"}=~/^excused/) { |
$status = 'CANNOT_ANSWER'; |
|
} |
|
} elsif ($Apache::lonhomework::history{"resource.$id.solved"}=~/^excused/) { |
$status = 'CANNOT_ANSWER'; |
$status = 'CANNOT_ANSWER'; |
} |
} |
if ($status eq 'CANNOT_ANSWER' |
if ($status eq 'CANNOT_ANSWER' |
Line 451 sub check_access {
|
Line 675 sub check_access {
|
} |
} |
} |
} |
if ($status eq 'CAN_ANSWER' || $status eq 'CANNOT_ANSWER') { |
if ($status eq 'CAN_ANSWER' || $status eq 'CANNOT_ANSWER') { |
my @interval=&Apache::lonnet::EXT("resource.$id.interval"); |
my @interval=&Apache::lonnet::EXT("resource.$id.interval",$symb); |
&Apache::lonxml::debug("looking for interval @interval"); |
&Apache::lonxml::debug("looking for interval @interval"); |
if ($interval[0]) { |
if ($interval[0]=~ /^\d+/) { |
my $first_access=&Apache::lonnet::get_first_access($interval[1]); |
my $first_access=&Apache::lonnet::get_first_access($interval[1],$symb); |
&Apache::lonxml::debug("looking for accesstime $first_access"); |
&Apache::lonxml::debug("looking for accesstime $first_access"); |
if (!$first_access) { |
if (!$first_access) { |
$status='NOT_YET_VIEWED'; |
$status='NOT_YET_VIEWED'; |
my $due_date = &due_date($id); |
my $due_date = &due_date($id,$symb); |
my $seconds_left = $due_date - time; |
my $seconds_left = $due_date - time; |
if ($seconds_left > $interval[0] || $due_date eq '') { |
my ($timelimit) = ($interval[0] =~ /^(\d+)/); |
$seconds_left = $interval[0]; |
if ($seconds_left > $timelimit || $due_date eq '') { |
|
$seconds_left = $timelimit; |
} |
} |
$datemsg=&seconds_to_human_length($seconds_left); |
$datemsg=&seconds_to_human_length($seconds_left); |
} |
} |
Line 473 sub check_access {
|
Line 698 sub check_access {
|
# return ('UNCHECKEDOUT','needs to be checked out'); |
# return ('UNCHECKEDOUT','needs to be checked out'); |
#} |
#} |
|
|
|
|
&Apache::lonxml::debug("sending back :$status:$datemsg:"); |
&Apache::lonxml::debug("sending back :$status:$datemsg:"); |
if (($Apache::lonhomework::browse eq 'F') && ($status eq 'CLOSED')) { |
if (($Apache::lonhomework::browse eq 'F') && ($status eq 'CLOSED')) { |
&Apache::lonxml::debug("should be allowed to browse a resource when closed"); |
&Apache::lonxml::debug("should be allowed to browse a resource when closed"); |
Line 497 sub due_date {
|
Line 721 sub due_date {
|
my $first_access=&Apache::lonnet::get_first_access($interval[1],$symb); |
my $first_access=&Apache::lonnet::get_first_access($interval[1],$symb); |
&Apache::lonxml::debug("looking for first_access $first_access ($interval[1])"); |
&Apache::lonxml::debug("looking for first_access $first_access ($interval[1])"); |
if (defined($first_access)) { |
if (defined($first_access)) { |
my $interval = $first_access+$interval[0]; |
my ($timelimit) = ($interval[0] =~ /^(\d+)/); |
|
my $interval = $first_access+$timelimit; |
$date = (!$due_date || $interval < $due_date) ? $interval |
$date = (!$due_date || $interval < $due_date) ? $interval |
: $due_date; |
: $due_date; |
} else { |
} else { |
Line 506 sub due_date {
|
Line 731 sub due_date {
|
} else { |
} else { |
$date = $due_date; |
$date = $due_date; |
} |
} |
return $date |
return $date; |
} |
} |
|
|
sub seconds_to_human_length { |
sub seconds_to_human_length { |
Line 555 sub showarray {
|
Line 780 sub showarray {
|
sub showhashsubset { |
sub showhashsubset { |
my ($hash,$keyre) = @_; |
my ($hash,$keyre) = @_; |
my $resultkey; |
my $resultkey; |
foreach $resultkey (sort keys %$hash) { |
foreach $resultkey (sort(keys(%$hash))) { |
if ($resultkey !~ /$keyre/) { next; } |
if ($resultkey !~ /$keyre/) { next; } |
if (ref($$hash{$resultkey}) eq 'ARRAY' ) { |
if (ref($$hash{$resultkey}) eq 'ARRAY' ) { |
&Apache::lonxml::debug("$resultkey ---- ". |
&Apache::lonxml::debug("$resultkey ---- ". |
Line 573 sub showhashsubset {
|
Line 798 sub showhashsubset {
|
|
|
sub setuppermissions { |
sub setuppermissions { |
$Apache::lonhomework::browse= &Apache::lonnet::allowed('bre',$env{'request.filename'}); |
$Apache::lonhomework::browse= &Apache::lonnet::allowed('bre',$env{'request.filename'}); |
|
unless ($Apache::lonhomework::browse eq 'F') { |
|
$Apache::lonhomework::browse=&Apache::lonnet::allowed('bro',$env{'request.filename'}); |
|
} |
my $viewgrades = &Apache::lonnet::allowed('vgr',$env{'request.course.id'}); |
my $viewgrades = &Apache::lonnet::allowed('vgr',$env{'request.course.id'}); |
if (! $viewgrades && |
if (! $viewgrades && |
exists($env{'request.course.sec'}) && |
exists($env{'request.course.sec'}) && |
$env{'request.course.sec'} !~ /^\s*$/) { |
$env{'request.course.sec'} !~ /^\s*$/) { |
$viewgrades = &Apache::lonnet::allowed('vgr',$env{'request.course.id'}. |
$viewgrades = &Apache::lonnet::allowed('vgr',$env{'request.course.id'}. |
'/'.$env{'request.course.sec'}); |
'/'.$env{'request.course.sec'}); |
|
if ($viewgrades) { |
|
$Apache::lonhomework::viewgradessec = $env{'request.course.sec'}; |
|
} |
} |
} |
$Apache::lonhomework::viewgrades = $viewgrades; |
$Apache::lonhomework::viewgrades = $viewgrades; |
|
|
Line 596 sub setuppermissions {
|
Line 827 sub setuppermissions {
|
$modifygrades = |
$modifygrades = |
&Apache::lonnet::allowed('mgr',$env{'request.course.id'}. |
&Apache::lonnet::allowed('mgr',$env{'request.course.id'}. |
'/'.$env{'request.course.sec'}); |
'/'.$env{'request.course.sec'}); |
|
if ($modifygrades) { |
|
$Apache::lonhomework::modifygradessec = $env{'request.course.sec'}; |
|
} |
} |
} |
$Apache::lonhomework::modifygrades = $modifygrades; |
$Apache::lonhomework::modifygrades = $modifygrades; |
|
|
Line 614 sub setuppermissions {
|
Line 848 sub setuppermissions {
|
sub unset_permissions { |
sub unset_permissions { |
undef($Apache::lonhomework::queuegrade); |
undef($Apache::lonhomework::queuegrade); |
undef($Apache::lonhomework::modifygrades); |
undef($Apache::lonhomework::modifygrades); |
|
undef($Apache::lonhomework::modifygradessec); |
undef($Apache::lonhomework::viewgrades); |
undef($Apache::lonhomework::viewgrades); |
|
undef($Apache::lonhomework::viewgradessec); |
undef($Apache::lonhomework::browse); |
undef($Apache::lonhomework::browse); |
} |
} |
|
|
Line 632 sub setupheader {
|
Line 868 sub setupheader {
|
} |
} |
|
|
sub handle_save_or_undo { |
sub handle_save_or_undo { |
my ($request,$problem,$result) = @_; |
my ($request,$problem,$result,$getobjref) = @_; |
|
|
my $file = &Apache::lonnet::filelocation("",$request->uri); |
my $file = &Apache::lonnet::filelocation("",$request->uri); |
my $filebak =$file.".bak"; |
my $filebak =$file.".bak"; |
my $filetmp =$file.".tmp"; |
my $filetmp =$file.".tmp"; |
my $error=0; |
my $error=0; |
if ($env{'form.Undo'} eq &mt('undo')) { |
if (($env{'form.problemmode'} eq 'undo') || ($env{'form.problemmode'} eq 'undoxml')) { |
my $error=0; |
my $error=0; |
if (!&File::Copy::copy($file,$filetmp)) { $error=1; } |
if (!&File::Copy::copy($file,$filetmp)) { $error=1; } |
if ((!$error) && (!&File::Copy::copy($filebak,$file))) { $error=1; } |
if ((!$error) && (!&File::Copy::copy($filebak,$file))) { $error=1; } |
Line 660 sub handle_save_or_undo {
|
Line 897 sub handle_save_or_undo {
|
} |
} |
} else { |
} else { |
&Apache::lonnet::correct_line_ends($result); |
&Apache::lonnet::correct_line_ends($result); |
|
|
my $fs=Apache::File->new(">$filebak"); |
my $fs=Apache::File->new(">$filebak"); |
if (defined($fs)) { |
if (defined($fs)) { |
print $fs $$problem; |
print $fs $$problem; |
Line 673 sub handle_save_or_undo {
|
Line 911 sub handle_save_or_undo {
|
my $fh=Apache::File->new(">$file"); |
my $fh=Apache::File->new(">$file"); |
if (defined($fh)) { |
if (defined($fh)) { |
print $fh $$result; |
print $fh $$result; |
|
if (ref($getobjref) eq 'SCALAR') { |
|
if ($file =~ m{([^/]+)\.(html?)$}) { |
|
my $fname = $1; |
|
my $ext = $2; |
|
my $path = $file; |
|
$path =~ s/\Q$fname\E\.\Q$ext\E$//; |
|
my (%allfiles,%codebase); |
|
&Apache::lonnet::extract_embedded_items($file,\%allfiles, |
|
\%codebase,$result); |
|
if (keys(%allfiles) > 0) { |
|
my $url = $request->uri; |
|
my $state = <<STATE; |
|
<input type="hidden" name="action" value="upload_embedded" /> |
|
<input type="hidden" name="url" value="$url" /> |
|
STATE |
|
$$getobjref = "<h3>".&mt("Reference Warning")."</h3>". |
|
"<p>".&mt("Completed upload of the file. This file contained references to other files.")."</p>". |
|
"<p>".&mt("Please select the locations from which the referenced files are to be uploaded.")."</p>". |
|
&Apache::loncommon::ask_for_embedded_content($url,$state,\%allfiles,\%codebase, |
|
{'error_on_invalid_names' => 1, |
|
'ignore_remote_references' => 1,}); |
|
} |
|
} |
|
} |
} else { |
} else { |
&Apache::lonxml::info('<span class="LC_error">'. |
&Apache::lonxml::info('<span class="LC_error">'. |
&mt("Unable to write to [_1]", |
&mt("Unable to write to [_1]", |
Line 687 sub handle_save_or_undo {
|
Line 949 sub handle_save_or_undo {
|
|
|
sub analyze_header { |
sub analyze_header { |
my ($request) = @_; |
my ($request) = @_; |
my $js = &Apache::structuretags::setmode_javascript(); |
my $js = &Apache::lonxml::setmode_javascript(); |
|
|
# Breadcrumbs |
# Breadcrumbs |
my $brcrum = [{'href' => &Apache::loncommon::authorspace(), |
my $text = 'Authoring Space'; |
'text' => 'Construction Space'}, |
my $href = &Apache::loncommon::authorspace($request->uri); |
|
if ($env{'request.course.id'}) { |
|
my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'}; |
|
my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'}; |
|
if ($href eq "/priv/$cdom/$cnum/") { |
|
$text = 'Course Authoring Space'; |
|
} |
|
} |
|
my $brcrum = [{'href' => $href, |
|
'text' => $text}, |
{'href' => '', |
{'href' => '', |
'text' => 'Problem Testing'}, |
'text' => 'Problem Testing'}, |
{'href' => '', |
{'href' => '', |
Line 703 sub analyze_header {
|
Line 974 sub analyze_header {
|
{'bread_crumbs' => $brcrum,}) |
{'bread_crumbs' => $brcrum,}) |
.&Apache::loncommon::head_subbox( |
.&Apache::loncommon::head_subbox( |
&Apache::loncommon::CSTR_pageheader()); |
&Apache::loncommon::CSTR_pageheader()); |
|
my %lt = &Apache::lonlocal::texthash( |
|
edit => 'Edit', |
|
editxml => 'EditXML', |
|
); |
$result .= |
$result .= |
&Apache::lonxml::message_location().' |
'<form name="lonhomework" method="post" action="'. |
<form name="lonhomework" method="post" action="'. |
|
&HTML::Entities::encode($env{'request.uri'},'<>&"').'">'. |
&HTML::Entities::encode($env{'request.uri'},'<>&"').'">'. |
'<input type="hidden" name="problemmode" value="'. |
'<input type="hidden" name="problemmode" value="'. |
$env{'form.problemmode'}.'" />'. |
$env{'form.problemmode'}.'" />'. |
&Apache::structuretags::remember_problem_state().' |
&Apache::structuretags::remember_problem_state().' |
<div class="LC_edit_problem_analyze_header"> |
<div class="LC_edit_problem_analyze_header">'; |
<input type="button" name="submitmode" value="'.&mt("EditXML").'" '. |
my %editors = &Apache::loncommon::permitted_editors(); |
'onclick="javascript:setmode(this.form,'."'editxml'".')" /> |
foreach my $item ('editxml','edit') { |
<input type="button" name="submitmode" value="'.&mt('Edit').'" '. |
next unless ($editors{$item}); |
'onclick="javascript:setmode(this.form,'."'edit'".')" /> |
$result .= '<input type="button" name="submitmode" value="'.$lt{$item}.'" '. |
<hr /> |
'onclick="javascript:setmode(this.form,'."'$item'".')" />'. |
|
"\n"; |
|
} |
|
$result .= |
|
'<hr /> |
<input type="button" name="submitmode" value="'.&mt("View").'" '. |
<input type="button" name="submitmode" value="'.&mt("View").'" '. |
'onclick="javascript:setmode(this.form,'."'view'".')" /> |
'onclick="javascript:setmode(this.form,'."'view'".')" /> |
<hr /> |
<hr /> |
</div> |
</div>' |
</form>'; |
.&Apache::lonxml::message_location(). |
|
'</form>'; |
&Apache::lonxml::add_messages(\$result); |
&Apache::lonxml::add_messages(\$result); |
$request->print($result); |
$request->print($result); |
$request->rflush(); |
$request->rflush(); |
Line 742 sub analyze {
|
Line 1021 sub analyze {
|
my $rndseed=$env{'form.rndseed'}; |
my $rndseed=$env{'form.rndseed'}; |
&analyze_header($request); |
&analyze_header($request); |
my %prog_state= |
my %prog_state= |
&Apache::lonhtmlcommon::Create_PrgWin($request,&mt('Analyze Progress'), |
&Apache::lonhtmlcommon::Create_PrgWin($request,$env{'form.numtoanalyze'}); |
&mt('Getting Problem Variants'), |
|
$env{'form.numtoanalyze'}, |
|
'inline',undef); |
|
for(my $i=1;$i<$env{'form.numtoanalyze'}+1;$i++) { |
for(my $i=1;$i<$env{'form.numtoanalyze'}+1;$i++) { |
&Apache::lonhtmlcommon::Increment_PrgWin($request,\%prog_state, |
&Apache::lonhtmlcommon::Increment_PrgWin($request,\%prog_state,'last problem'); |
&mt('last problem')); |
|
if (&Apache::loncommon::connection_aborted($request)) { return; } |
if (&Apache::loncommon::connection_aborted($request)) { return; } |
my $thisseed=$i+$rndseed; |
my $thisseed=$i+$rndseed; |
my $subresult=&Apache::lonnet::ssi($request->uri, |
my $subresult=&Apache::lonnet::ssi($request->uri, |
Line 757 sub analyze {
|
Line 1032 sub analyze {
|
(my $garbage,$subresult)=split(/_HASH_REF__/,$subresult,2); |
(my $garbage,$subresult)=split(/_HASH_REF__/,$subresult,2); |
my %analyze=&Apache::lonnet::str2hash($subresult); |
my %analyze=&Apache::lonnet::str2hash($subresult); |
my @parts; |
my @parts; |
if (defined(@{ $analyze{'parts'} })) { |
if (ref($analyze{'parts'}) eq 'ARRAY') { |
@parts=@{ $analyze{'parts'} }; |
@parts=@{ $analyze{'parts'} }; |
} |
} |
foreach my $part (@parts) { |
foreach my $part (@parts) { |
Line 790 sub analyze {
|
Line 1065 sub analyze {
|
} |
} |
} |
} |
} |
} |
&Apache::lonhtmlcommon::Update_PrgWin($request,\%prog_state, |
&Apache::lonhtmlcommon::Update_PrgWin($request,\%prog_state,&mt('Analyzing Results')); |
&mt('Analyzing Results')); |
|
$request->print('<hr />' |
$request->print('<hr />' |
.'<h3>' |
.'<h3>' |
.&mt('List of possible answers') |
.&mt('List of possible answers') |
.'</h3>' |
.'</h3>' |
); |
); |
foreach my $part (sort(keys(%allparts))) { |
foreach my $part (sort(keys(%allparts))) { |
if (defined(@{ $overall{$part.'.answer'} })) { |
if ((ref($overall{$part.'.answer'}) eq 'ARRAY') && |
|
(@{$overall{$part.'.answer'}} > 0)) { |
for (my $i=0;$i<scalar(@{ $overall{$part.'.answer'} });$i++) { |
for (my $i=0;$i<scalar(@{ $overall{$part.'.answer'} });$i++) { |
my $num_cols=scalar(@{ $overall{$part.'.answer'}[$i][0] }); |
my $num_cols=scalar(@{ $overall{$part.'.answer'}[$i][0] }); |
$request->print(&Apache::loncommon::start_data_table() |
$request->print(&Apache::loncommon::start_data_table() |
Line 896 sub editxmlmode {
|
Line 1171 sub editxmlmode {
|
my $problem=&Apache::lonnet::getfile($file); |
my $problem=&Apache::lonnet::getfile($file); |
if ($problem eq -1) { |
if ($problem eq -1) { |
&Apache::lonxml::error( |
&Apache::lonxml::error( |
'<b> ' |
'<p class="LC_error">' |
.&mt('Unable to find [_1]', |
.&mt('Unable to find [_1]', |
'<span class="LC_filename">'.$file.'</span>') |
'<span class="LC_filename">'.$file.'</span>') |
.'</b>'); |
.'</p>'); |
|
|
$problem=''; |
$problem=''; |
} |
} |
if (defined($env{'form.editxmltext'}) || defined($env{'form.Undo'})) { |
if (($env{'form.problemmode'} eq 'saveeditxml') || |
|
($env{'form.problemmode'} eq 'saveviewxml') || |
|
($env{'form.problemmode'} eq 'undoxml')) { |
my $error=&handle_save_or_undo($request,\$problem, |
my $error=&handle_save_or_undo($request,\$problem, |
\$env{'form.editxmltext'}); |
\$env{'form.editxmltext'}); |
if (!$error) { $problem=&Apache::lonnet::getfile($file); } |
if (!$error) { $problem=&Apache::lonnet::getfile($file); } |
} |
} |
&Apache::lonhomework::showhashsubset(\%env,'^form'); |
&Apache::lonhomework::showhashsubset(\%env,'^form'); |
if ( $env{'form.submitbutton'} eq &mt('Save and View') ) { |
if ($env{'form.problemmode'} eq 'saveviewxml') { |
&Apache::lonhomework::showhashsubset(\%env,'^form'); |
&Apache::lonhomework::showhashsubset(\%env,'^form'); |
$env{'form.problemmode'}='view'; |
$env{'form.problemmode'}='view'; |
&renderpage($request,$file); |
&renderpage($request,$file); |
Line 921 sub editxmlmode {
|
Line 1198 sub editxmlmode {
|
my $js = |
my $js = |
&Apache::edit::js_change_detection(). |
&Apache::edit::js_change_detection(). |
&Apache::loncommon::resize_textarea_js(). |
&Apache::loncommon::resize_textarea_js(). |
&Apache::structuretags::setmode_javascript(). |
&Apache::lonxml::setmode_javascript(). |
&Apache::lonhtmlcommon::dragmath_js("EditMathPopup"); |
&Apache::lonhtmlcommon::dragmath_js("EditMathPopup"); |
my $only_body = ($env{'environment.remote'} eq 'off')? 0 : 1; |
|
my $dragmath_button = |
|
&Apache::lonhtmlcommon::dragmath_button("LC_editxmltext",1); |
|
|
|
# Breadcrumbs |
# Breadcrumbs |
my $brcrum = [{'href' => &Apache::loncommon::authorspace(), |
my $text = 'Authoring Space'; |
'text' => 'Construction Space'}, |
my $href = &Apache::loncommon::authorspace($request->uri); |
|
if ($env{'request.course.id'}) { |
|
my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'}; |
|
my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'}; |
|
if ($href eq "/priv/$cdom/$cnum/") { |
|
$text = 'Course Authoring Space'; |
|
} |
|
} |
|
my $brcrum = [{'href' => $href, |
|
'text' => $text}, |
{'href' => '', |
{'href' => '', |
'text' => 'Problem Editing'}]; |
'text' => 'Problem Editing'}]; |
|
|
my $start_page = |
my $start_page = |
&Apache::loncommon::start_page(&mt("EditXML [_1]",$file),$js, |
&Apache::loncommon::start_page(&mt("EditXML [_1]",$file),$js, |
{'no_auto_mt_title' => 1, |
{'no_auto_mt_title' => 1, |
'only_body' => $only_body, |
'only_body' => 0, |
'add_entries' => { |
'add_entries' => { |
'onresize' => q[resize_textarea('LC_editxmltext','LC_aftertextarea')], |
'onresize' => q[resize_textarea('LC_editxmltext','LC_aftertextarea')], |
'onload' => q[resize_textarea('LC_editxmltext','LC_aftertextarea')], |
'onload' => q[resize_textarea('LC_editxmltext','LC_aftertextarea')], |
}, |
}, |
'bread_crumbs' => $brcrum, |
'bread_crumbs' => $brcrum, |
}); |
}); |
|
|
$result=$start_page |
$result=$start_page |
.&Apache::loncommon::head_subbox( |
.&Apache::loncommon::head_subbox( |
Line 951 sub editxmlmode {
|
Line 1234 sub editxmlmode {
|
'<form '.&Apache::edit::form_change_detection().' name="lonhomework" method="post" action="'. |
'<form '.&Apache::edit::form_change_detection().' name="lonhomework" method="post" action="'. |
&HTML::Entities::encode($env{'request.uri'},'<>&"').'">'. |
&HTML::Entities::encode($env{'request.uri'},'<>&"').'">'. |
&Apache::structuretags::remember_problem_state().' |
&Apache::structuretags::remember_problem_state().' |
<div class="LC_edit_problem_editxml_header"> |
<div class="LC_edit_problem_header"> |
<table class="LC_edit_problem_header_title"><tr><td> |
<div class="LC_edit_problem_header_title">'. |
'.&mt('Problem Editing').&Apache::loncommon::help_open_topic('Problem_Editor_XML_Index').' |
&mt('Problem Editing').' '.&Apache::loncommon::help_open_topic('Problem_Editor_XML_Index'). |
</td><td align="right"> |
'</div><div class="LC_edit_actionbar" id="actionbar">'; |
'.&Apache::loncommon::helpLatexCheatsheet('Problem_LON-CAPA_Functions','Script Functions').' |
|
</td></tr> |
$result.='<input type="hidden" name="problemmode" value="saveedit" />'. |
</table> |
&Apache::structuretags::problem_edit_buttons('editxml'); |
<div class="LC_edit_problem_discards"> |
$result.='<div>'; |
<input type="hidden" name="problemmode" value="editxml" /> |
|
|
$result .= '<ol class="LC_primary_menu" style="display:inline-block;font-size:90%;vertical-align:middle;">'; |
<input type="button" name="submitmode" accesskey="d" value="'.&mt('Discard Edits and View').'" '. |
|
'onclick="javascript:setmode(this.form,'."'discard'".')" /> |
my $nocodemirror = &Apache::loncommon::nocodemirror(); |
<input type="button" '.&Apache::edit::submit_ask_anyway('setmode(this.form,'."'edit'".')').'name="submitmode" accesskey="e" value="'.&mt('Edit').'" /> |
unless ($nocodemirror) { |
<input type="submit" name="Undo" accesskey="u" value="'.&mt('undo').'" /> |
# dropdown menus |
'.$dragmath_button.' |
$result .= Apache::lonmenu::create_submenu("#", "", |
</div> |
&mt("Problem Templates"), template_dropdown_datastructure()); |
<div class="LC_edit_problem_saves"> |
|
<input type="submit" name="submitbutton" accesskey="s" value="'.&mt('Save').'" /> |
$result .= Apache::lonmenu::create_submenu("#", "", |
<input type="submit" name="submitbutton" accesskey="v" value="'.&mt('Save and View').'" /> |
&mt("Response Types"), responseblock_dropdown_datastructure()); |
</div> |
|
<hr /> |
$result .= Apache::lonmenu::create_submenu("#", "", |
'.&Apache::lonxml::message_location().' |
&mt("Conditional Blocks"), conditional_scripting_datastructure()); |
</div> |
|
' . ' |
$result .= Apache::lonmenu::create_submenu("#", "", |
<textarea '.&Apache::edit::element_change_detection(). |
&mt("Miscellaneous"), misc_datastructure()); |
' rows="'.$rows.'" cols="'.$cols.'" style="width:100%" '. |
} |
' name="editxmltext" id="LC_editxmltext">'. |
|
&HTML::Entities::encode($problem,'<>&"').'</textarea> |
$result .= Apache::lonmenu::create_submenu("#", "", |
<div id="LC_aftertextarea"> |
&mt("Help") . ' <img src="/adm/help/help.png" alt="' . &mt("Help") . |
</div> |
'" style="vertical-align:text-bottom; height: auto; margin:0; "/>', |
</form>'.&Apache::loncommon::end_page(); |
helpmenu_datastructure(),""); |
&Apache::lonxml::add_messages(\$result); |
|
$request->print($result); |
$result.="</ol></div>"; |
|
|
|
$result .= '</div></div>' . |
|
&Apache::lonxml::message_location() . |
|
&Apache::loncommon::xmleditor_js() . |
|
'<textarea ' . &Apache::edit::element_change_detection() . |
|
' rows="'.$rows.'" cols="'.$cols.'" style="width:100%" ' . |
|
' name="editxmltext" id="LC_editxmltext">' . |
|
&HTML::Entities::encode($problem,'<>&"') . |
|
'</textarea> <div id="LC_aftertextarea"> </div> </form>'; |
|
|
|
my $resource = $env{'request.ambiguous'}; |
|
unless ($nocodemirror) { |
|
$result .= '<link rel="stylesheet" href="/adm/codemirror/codemirror-combined-xml.css"> |
|
<script src="/adm/codemirror/codemirror-compressed-xml.js"></script> |
|
<script> |
|
CodeMirror.defineMode("mixedmode", function(config) { |
|
return CodeMirror.multiplexingMode( |
|
CodeMirror.getMode(config, "xml"), |
|
{ |
|
open: "\<script type=\"loncapa/perl\"\>", close: "\</script\>", |
|
mode: CodeMirror.getMode(config, "perl"), |
|
delimStyle: "tag", |
|
} |
|
); |
|
}); |
|
var cm = CodeMirror.fromTextArea(document.getElementById("LC_editxmltext"), |
|
{ |
|
mode: "mixedmode", |
|
lineWrapping: true, |
|
lineNumbers: true, |
|
tabSize: 4, |
|
indentUnit: 4, |
|
|
|
autoCloseTags: true, |
|
autoCloseBrackets: true, |
|
height: "auto", |
|
styleActiveLine: true, |
|
|
|
extraKeys: { |
|
"Tab": "indentMore", |
|
"Shift-Tab": "indentLess", |
|
} |
|
}); |
|
restoreScrollPosition("'.$resource.'"); |
|
</script>'; |
|
} |
|
|
|
$result .= &Apache::loncommon::end_page(); |
|
&Apache::lonxml::add_messages(\$result); |
|
$request->print($result); |
} |
} |
return ''; |
return ''; |
} |
} |
Line 992 sub editxmlmode {
|
Line 1325 sub editxmlmode {
|
# Render the page in whatever target desired. |
# Render the page in whatever target desired. |
# |
# |
sub renderpage { |
sub renderpage { |
my ($request,$file,$targets,$return_string) = @_; |
my ($request,$file,$targets,$return_string,$donebuttonmsg,$viewasuser,$symb) = @_; |
|
|
my @targets = @{$targets || [&get_target()]}; |
my @targets = @{$targets || [&get_target()]}; |
&Apache::lonhomework::showhashsubset(\%env,'form.'); |
&Apache::lonhomework::showhashsubset(\%env,'form.'); |
Line 1018 sub renderpage {
|
Line 1351 sub renderpage {
|
$problem=''; |
$problem=''; |
my $filename=(split('/',$file))[-1]; |
my $filename=(split('/',$file))[-1]; |
my $error = |
my $error = |
"<b> ".&mt('Unable to find [_1]', |
'<p class="LC_error">' |
|
.&mt('Unable to find [_1]', |
'<span class="LC_filename">'.$filename.'</span>') |
'<span class="LC_filename">'.$filename.'</span>') |
."</b>"; |
."</p>"; |
$result.= |
$result.= |
&Apache::loncommon::simple_error_page($request,'Not available', |
&Apache::loncommon::simple_error_page($request,'Not available', |
$error); |
$error,{'no_auto_mt_msg' => 1}); |
return; |
return; |
} |
} |
|
|
Line 1032 sub renderpage {
|
Line 1366 sub renderpage {
|
if ($target eq 'answer') { &showhash(%Apache::lonhomework::history); } |
if ($target eq 'answer') { &showhash(%Apache::lonhomework::history); } |
if ($target eq 'web') {&Apache::lonhomework::showhashsubset(\%env,'^form');} |
if ($target eq 'web') {&Apache::lonhomework::showhashsubset(\%env,'^form');} |
|
|
|
if (($target eq 'web') && ($viewasuser ne '') && ($symb ne '')) { |
|
$env{'request.user_in_effect'} = $viewasuser; |
|
} |
|
|
&Apache::lonxml::debug("Should be parsing now"); |
&Apache::lonxml::debug("Should be parsing now"); |
$result .= &Apache::lonxml::xmlparse($request, $target, $problem, |
$result .= &Apache::lonxml::xmlparse($request, $target, $problem, |
&setup_vars($target),%mystyle); |
&setup_vars($target),%mystyle); |
Line 1044 sub renderpage {
|
Line 1382 sub renderpage {
|
if ($target eq 'analyze') { |
if ($target eq 'analyze') { |
$result=&Apache::lonnet::hashref2str(\%Apache::lonhomework::analyze); |
$result=&Apache::lonnet::hashref2str(\%Apache::lonhomework::analyze); |
undef(%Apache::lonhomework::analyze); |
undef(%Apache::lonhomework::analyze); |
} |
} elsif ($target eq 'web') { |
|
if ($donebuttonmsg) { |
|
$result =~ s{</body>}{}; |
|
$result.= &Apache::loncommon::confirmwrapper(&Apache::lonhtmlcommon::confirm_success($donebuttonmsg,1))."\n</body>"; |
|
} |
|
} |
#my $td=&tv_interval($t0); |
#my $td=&tv_interval($t0); |
#if ( $Apache::lonxml::debug) { |
#if ( $Apache::lonxml::debug) { |
#$result =~ s:</body>::; |
#$result =~ s:</body>::; |
Line 1052 sub renderpage {
|
Line 1395 sub renderpage {
|
#} |
#} |
# $request->print($result); |
# $request->print($result); |
$overall_result.=$result; |
$overall_result.=$result; |
|
if (($target eq 'web') && ($viewasuser ne '') && ($symb ne '')) { |
|
my ($vuname,$vudom) = split(/:/,$viewasuser); |
|
$overall_result .= &Apache::grades::view_as_user($symb,$vuname,$vudom). |
|
'</body></html>'; |
|
} |
# $request->rflush(); |
# $request->rflush(); |
} |
} |
|
if (($target eq 'web') && ($viewasuser ne '') && ($symb ne '')) { |
|
undef($env{'request.user_in_effect'}); |
|
} |
#$request->print(":Result ends"); |
#$request->print(":Result ends"); |
#my $td=&tv_interval($t0); |
#my $td=&tv_interval($t0); |
} |
} |
if (!$return_string) { |
if (!$return_string) { |
&Apache::lonxml::add_messages(\$overall_result); |
&Apache::lonxml::add_messages(\$overall_result); |
$request->print($overall_result); |
$request->print($overall_result); |
$request->rflush(); |
$request->rflush(); |
} else { |
} else { |
return $overall_result; |
return $overall_result; |
} |
} |
Line 1071 sub finished_parsing {
|
Line 1422 sub finished_parsing {
|
undef($Apache::lonhomework::parsing_a_task); |
undef($Apache::lonhomework::parsing_a_task); |
} |
} |
|
|
sub get_template_list { |
# function extracted from get_template_html |
|
# returns "key" -> list |
|
# key: path of template |
|
# value 1: title |
|
# value 2: category |
|
# value 3: name of help topic ??? |
|
sub get_template_list{ |
|
my ($extension) = @_; |
|
|
|
my @files = glob($Apache::lonnet::perlvar{'lonIncludes'}. |
|
'/templates/*.'.$extension); |
|
@files = map {[$_,&mt(&Apache::lonnet::metadata($_, 'title')), |
|
(&Apache::lonnet::metadata($_, 'category')?&mt(&Apache::lonnet::metadata($_, 'category')):&mt('Miscellaneous')), |
|
&mt(&Apache::lonnet::metadata($_, 'help'))]} (@files); |
|
@files = sort {$a->[2].$a->[1] cmp $b->[2].$b->[1]} (@files); |
|
return @files; |
|
} |
|
|
|
sub get_template_html { |
my ($extension) = @_; |
my ($extension) = @_; |
my $result; |
my $result; |
my @allnames; |
my @allnames; |
Line 1080 sub get_template_list {
|
Line 1449 sub get_template_list {
|
if ($extension eq 'survey' || $extension eq 'exam') { |
if ($extension eq 'survey' || $extension eq 'exam') { |
$glob_extension = 'problem'; |
$glob_extension = 'problem'; |
} |
} |
my @files = glob($Apache::lonnet::perlvar{'lonIncludes'}. |
my @files = &get_template_list($extension); |
'/templates/*.'.$glob_extension); |
|
@files = map {[$_,&mt(&Apache::lonnet::metadata($_, 'title')), |
|
(&Apache::lonnet::metadata($_, 'category')?&mt(&Apache::lonnet::metadata($_, 'category')):&mt('Miscellaneous')), |
|
&mt(&Apache::lonnet::metadata($_, 'help'))]} (@files); |
|
@files = sort {$a->[2].$a->[1] cmp $b->[2].$b->[1]} (@files); |
|
my ($midpoint,$seconddiv,$numfiles); |
my ($midpoint,$seconddiv,$numfiles); |
|
my @noexamplelink = ('blank.problem','blank.library','script.library'); |
$numfiles = 0; |
$numfiles = 0; |
foreach my $file (@files) { |
foreach my $file (@files) { |
next if ($file->[1] !~ /\S/); |
next if ($file->[1] !~ /\S/); |
Line 1101 sub get_template_list {
|
Line 1466 sub get_template_list {
|
} |
} |
my $count = 0; |
my $count = 0; |
my $currentcategory=''; |
my $currentcategory=''; |
|
my $first = 1; |
|
my $londocroot = $Apache::lonnet::perlvar{'lonDocRoot'}; |
foreach my $file (@files) { |
foreach my $file (@files) { |
next if ($file->[1] !~ /\S/); |
next if ($file->[1] !~ /\S/); |
if ($file->[2] ne $currentcategory) { |
if ($file->[2] ne $currentcategory) { |
$currentcategory=$file->[2]; |
$currentcategory=$file->[2]; |
if ((!$seconddiv) && ($count >= $midpoint)) { |
if ((!$seconddiv) && ($count >= $midpoint)) { |
$result .= '</div>'."\n".'<div class="LC_left_float">'."\n"; |
$result .= '</div></div>'."\n".'<div class="LC_left_float">'."\n"; |
$seconddiv = 1; |
$seconddiv = 1; |
|
} elsif (!$first) { |
|
$result.='</div>'."\n"; |
|
} else { |
|
$first = 0; |
} |
} |
$result.='<h3>'.$currentcategory.'</h3>'; |
$result.= '<div class="LC_Box">'."\n" |
|
.'<h3 class="LC_hcell">'.$currentcategory.'</h3>'."\n"; |
$count++; |
$count++; |
} |
} |
$result .= |
$result .= |
Line 1118 sub get_template_list {
|
Line 1490 sub get_template_list {
|
if ($file->[3]) { |
if ($file->[3]) { |
$result.=&Apache::loncommon::help_open_topic($file->[3]); |
$result.=&Apache::loncommon::help_open_topic($file->[3]); |
} |
} |
|
# Provide example link |
my $filename=$file->[0]; |
my $filename=$file->[0]; |
$filename=~s/^\/home\/httpd\/html//; |
$filename=~s{^\Q$londocroot\E}{}; |
$result.=' <font size="-2"><a href="'.$filename.'" target="sample">'.&mt('Example').'</font></a><br />'."\n"; |
if (!(grep($filename =~ /\Q$_\E$/,@noexamplelink))) { |
|
$result .= ' <span class="LC_fontsize_small">' |
|
.&Apache::loncommon::modal_link( |
|
$filename.'?inhibitmenu=yes',&mt('Example'),600,420,'sample') |
|
.'</span>'; |
|
} |
|
$result .= '<br />'."\n"; |
$count ++; |
$count ++; |
} |
} |
if ($numfiles > 0) { |
if ($numfiles > 0) { |
$result .= '</div>'."\n".'<div class="LC_clear_float_footer"></div>'."\n"; |
$result .= '</div></div>'."\n".'<div class="LC_clear_float_footer"></div>'."\n"; |
} |
} |
return $result; |
return $result; |
} |
} |
Line 1132 sub get_template_list {
|
Line 1511 sub get_template_list {
|
sub newproblem { |
sub newproblem { |
my ($request) = @_; |
my ($request) = @_; |
|
|
|
if ($env{'form.mode'} eq 'blank'){ |
|
my $dest = &Apache::lonnet::filelocation("",$request->uri); |
|
my $templatefilename = |
|
$request->dir_config('lonIncludes').'/templates/blank.problem'; |
|
&File::Copy::copy($templatefilename,$dest); |
|
&renderpage($request,$dest); |
|
return; |
|
} |
|
my $errormsg; |
if ($env{'form.template'}) { |
if ($env{'form.template'}) { |
my $file = $env{'form.template'}; |
my $file; |
my $dest = &Apache::lonnet::filelocation("",$request->uri); |
my ($extension) = ($env{'form.template'} =~ /\.(\w+)$/); |
&File::Copy::copy($file,$dest); |
if ($extension) { |
&renderpage($request,$dest); |
my @files = &get_template_list($extension); |
return; |
foreach my $poss (@files) { |
|
if (ref($poss) eq 'ARRAY') { |
|
if ($env{'form.template'} eq $poss->[0]) { |
|
$file = $env{'form.template'}; |
|
last; |
|
} |
|
} |
|
} |
|
if ($file) { |
|
my $dest = &Apache::lonnet::filelocation("",$request->uri); |
|
&File::Copy::copy($file,$dest); |
|
&renderpage($request,$dest); |
|
return; |
|
} else { |
|
$errormsg = '<p class="LC_error">'.&mt('Invalid template file.').'</p>'; |
|
} |
|
} else { |
|
$errormsg = '<p class="LC_error">'.&mt('Invalid template file; template needs to be a .problem, .library, or .task file.').'</p>'; |
|
} |
} |
} |
|
|
my ($extension) = ($request->uri =~ m/\.(\w+)$/); |
my ($extension) = ($request->uri =~ m/\.(\w+)$/); |
&Apache::lonxml::debug("Looking for :$extension:"); |
&Apache::lonxml::debug("Looking for :$extension:"); |
my $templatelist=&get_template_list($extension); |
my $templatelist=&get_template_html($extension); |
if ($env{'form.newfile'} && !$templatelist) { |
if ($env{'form.newfile'} && !$templatelist) { |
# no templates found |
# no templates found |
my $templatefilename = |
my $templatefilename = |
Line 1153 sub newproblem {
|
Line 1559 sub newproblem {
|
&renderpage($request,$dest); |
&renderpage($request,$dest); |
} else { |
} else { |
my $url=&HTML::Entities::encode($request->uri,'<>&"'); |
my $url=&HTML::Entities::encode($request->uri,'<>&"'); |
my $shownurl=$url; |
|
$shownurl=~s-^/~-/priv/-; |
|
my $dest = &Apache::lonnet::filelocation("",$request->uri); |
my $dest = &Apache::lonnet::filelocation("",$request->uri); |
my $errormsg; |
|
my $instructions; |
my $instructions; |
my $brcrum = [{'href' => &Apache::loncommon::authorspace(), |
my $text = 'Authoring Space'; |
'text' => 'Construction Space'}, |
my $href = &Apache::loncommon::authorspace($request->uri); |
|
if ($env{'request.course.id'}) { |
|
my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'}; |
|
my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'}; |
|
if ($href eq "/priv/$cdom/$cnum/") { |
|
$text = 'Course Authoring Space'; |
|
} |
|
} |
|
my $brcrum = [{'href' => $href, |
|
'text' => $text}, |
{'href' => '', |
{'href' => '', |
'text' => "Create New $extension"}]; |
'text' => "Create New $extension"}]; |
my $start_page = |
my $start_page = |
Line 1173 sub newproblem {
|
Line 1585 sub newproblem {
|
.'<h1>'.&mt("Creating a new $extension resource.")."</h1> |
.'<h1>'.&mt("Creating a new $extension resource.")."</h1> |
$errormsg |
$errormsg |
".&mt("The requested file [_1] currently does not exist.", |
".&mt("The requested file [_1] currently does not exist.", |
'<span class="LC_filename">'.$shownurl.'</span>')." |
'<span class="LC_filename">'.$url.'</span>').' |
<p> |
<p class="LC_info"> |
<b> |
'.&mt("To create a new $extension, select a template from the". |
".&mt("To create a new $extension, select a template from the". |
" list below. Then click on the \"Create $extension\" button.").' |
" list below. Then click on the \"Create $extension\" button.").'</b> |
</p><div><form action="'.$url.'" method="post">'); |
</p><form action="'.$url.'" method="post">'); |
|
|
|
if (defined($templatelist)) { |
if (defined($templatelist)) { |
$request->print($templatelist); |
$request->print($templatelist); |
} |
} |
$request->print('<br /><input type="submit" name="newfile" value="'. |
$request->print('<br /><input type="submit" name="newfile" value="'. |
&mt("Create $extension").'" />'); |
&mt("Create $extension").'" />'); |
$request->print("</form></p>".&Apache::loncommon::end_page()); |
$request->print('</form></div>'.&Apache::loncommon::end_page()); |
} |
} |
return; |
return; |
} |
} |
Line 1207 sub update_construct_style {
|
Line 1618 sub update_construct_style {
|
} |
} |
} |
} |
|
|
|
# |
|
# Sets interval for current user so time left will be zero, either for the entire folder |
|
# containing the current resource, or just the resource, depending on value of first item |
|
# in interval array retrieved from EXT("resource.0.interval"); |
|
# |
|
sub zero_timer { |
|
my ($symb) = @_; |
|
my ($hastimeleft,$first_access,$now); |
|
my @interval=&Apache::lonnet::EXT("resource.0.interval",$symb); |
|
if (@interval > 1) { |
|
if ($interval[1] eq 'course') { |
|
return ('fail',&mt('Ending of timed events not supported for intervals set course-wide')); |
|
} else { |
|
my $now = time; |
|
my $first_access=&Apache::lonnet::get_first_access($interval[1],$symb); |
|
if ($first_access > 0) { |
|
my ($timelimit,$donesuffix) = split(/_/,$interval[0],2); |
|
if ($donesuffix =~ /^done(?:|\:[^\:]+\:)(.*)$/) { |
|
my ($dummy,$proctor,$secret) = split(/_/,$1); |
|
if (($proctor) && ($secret ne '')) { |
|
my $key = $env{'form.LC_interval_done_proctorpass'}; |
|
$key =~ s/^\s+//; |
|
$key =~ s/\s+$//; |
|
if ($env{'form.LC_interval_done_proctorpass'} ne $secret) { |
|
return ('fail', |
|
&mt('Incorrect key entered by proctor')); |
|
} |
|
} |
|
if ($first_access+$timelimit > $now) { |
|
my $done_time = $now - $first_access; |
|
my $snum = 1; |
|
if ($interval[1] eq 'map') { |
|
$snum = 2; |
|
} |
|
my $result = |
|
&Apache::lonparmset::storeparm_by_symb_inner($symb,'0_interval', |
|
$snum,$done_time, |
|
'date_interval', |
|
$env{'user.name'}, |
|
$env{'user.domain'}); |
|
if ($result eq '') { |
|
# Record action in "User Notes" |
|
&Apache::lonmsg::store_instructor_comment( |
|
'Pressed Done button for symb:<br />'.$symb, |
|
$env{'user.name'}, $env{'user.domain'}); |
|
return ('ok'); |
|
} else { |
|
return ('fail',&mt('Error ending timed event: [_1]',$result)); |
|
} |
|
} else { |
|
return ('fail',&mt('Timed event already ended')); |
|
} |
|
} else { |
|
return ('fail',&mt('Timed event can not be ended before the time limit')); |
|
} |
|
} else { |
|
return ('fail',&mt('Timer not yet started for this timed event')); |
|
} |
|
} |
|
} else { |
|
return ('fail',&mt('No timer in use')); |
|
} |
|
return(); |
|
} |
|
|
sub handler { |
sub handler { |
#my $t0 = [&gettimeofday()]; |
#my $t0 = [&gettimeofday()]; |
my $request=$_[0]; |
my $request=$_[0]; |
|
|
$Apache::lonxml::request=$request; |
$Apache::lonxml::request=$request; |
$Apache::lonxml::debug=$env{'user.debug'}; |
$Apache::lonxml::debug=$env{'user.debug'}; |
$env{'request.uri'}=$request->uri; |
$env{'request.uri'}=$request->uri; |
Line 1219 sub handler {
|
Line 1695 sub handler {
|
my $file=&Apache::lonnet::filelocation("",$request->uri); |
my $file=&Apache::lonnet::filelocation("",$request->uri); |
|
|
#check if we know where we are |
#check if we know where we are |
if ($env{'request.course.fn'} && !&Apache::lonnet::symbread()) { |
if ($env{'request.course.fn'} && !&Apache::lonnet::symbread('','',1,1)) { |
# if we are browsing we might not be able to know where we are |
# if we are browsing we might not be able to know where we are |
if ($Apache::lonhomework::browse ne 'F' && |
if ($Apache::lonhomework::browse ne 'F' && |
$env{'request.state'} ne "construct") { |
$env{'request.state'} ne "construct") { |
#should know where we are, so ask |
#should know where we are, so ask |
&unset_permissions(); |
&unset_permissions(); |
Line 1233 sub handler {
|
Line 1709 sub handler {
|
&unset_permissions(); |
&unset_permissions(); |
return OK; |
return OK; |
} |
} |
|
|
&Apache::lonxml::debug("Permissions:$Apache::lonhomework::browse:$Apache::lonhomework::viewgrades:$Apache::lonhomework::modifygrades:$Apache::lonhomework::queuegrade"); |
&Apache::lonxml::debug("Permissions:$Apache::lonhomework::browse:$Apache::lonhomework::viewgrades:$Apache::lonhomework::modifygrades:$Apache::lonhomework::queuegrade"); |
&Apache::lonxml::debug("Problem Mode ".$env{'form.problemmode'}); |
&Apache::lonxml::debug("Problem Mode ".$env{'form.problemmode'}); |
my ($symb) = &Apache::lonnet::whichuser(); |
my ($symb) = &Apache::lonnet::whichuser(); |
Line 1245 sub handler {
|
Line 1722 sub handler {
|
#first visit to problem in construction space |
#first visit to problem in construction space |
$env{'form.problemmode'}= 'view'; |
$env{'form.problemmode'}= 'view'; |
&renderpage($request,$file); |
&renderpage($request,$file); |
} elsif ($env{'form.problemmode'} eq 'editxml') { |
} elsif (($env{'form.problemmode'} eq 'editxml') || |
&editxmlmode($request,$file); |
($env{'form.problemmode'} eq 'saveeditxml') || |
|
($env{'form.problemmode'} eq 'saveviewxml') || |
|
($env{'form.problemmode'} eq 'undoxml')) { |
|
my %editors = &Apache::loncommon::permitted_editors(); |
|
if (($editors{'xml'}) || ($env{'form.problemmode'} eq 'saveviewxml') || ($env{'form.problemmode'} eq 'undoxml')) { |
|
&editxmlmode($request,$file); |
|
} else { |
|
&update_construct_style(); |
|
&renderpage($request,$file); |
|
} |
} elsif ($env{'form.problemmode'} eq 'calcanswers') { |
} elsif ($env{'form.problemmode'} eq 'calcanswers') { |
&analyze($request,$file); |
&analyze($request,$file); |
} else { |
} else { |
Line 1254 sub handler {
|
Line 1740 sub handler {
|
&renderpage($request,$file); |
&renderpage($request,$file); |
} |
} |
} else { |
} else { |
|
&Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'}, |
|
['mode']); |
# requested file doesn't exist in contruction space |
# requested file doesn't exist in contruction space |
&newproblem($request); |
&newproblem($request); |
} |
} |
} else { |
} else { |
|
# Set the event timer to zero if the "done button" was clicked. The button is |
|
# part of the doneButton form created in lonmenu.pm |
|
my ($donebuttonresult,$donemsg,$viewasuser); |
|
if ($symb && $env{'form.LC_interval_done'} eq 'true') { |
|
($donebuttonresult,$donemsg) = &zero_timer($symb); |
|
undef($env{'form.LC_interval_done'}); |
|
undef($env{'form.LC_interval_done_proctorpass'}); |
|
} |
|
if (($env{'form.LC_viewas'} ne '') && $symb && $env{'request.course.id'} && |
|
($Apache::lonhomework::viewgrades || $Apache::lonhomework::modifygrades)) { |
|
if ($env{'form.LC_viewas'} =~ /^($match_username):($match_domain)$/) { |
|
my ($possuname,$possudom) = ($1,$2); |
|
my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'}; |
|
my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'}; |
|
my ($canview,$posssec); |
|
if ($env{'request.course.sec'} ne '') { |
|
if ($Apache::lonhomework::modifygradessec eq $env{'request.course.sec'}) { |
|
$canview = 'section'; |
|
$posssec = $env{'request.course.sec'}; |
|
} elsif ($Apache::lonhomework::viewgradessec eq $env{'request.course.sec'}) { |
|
$canview = 'section'; |
|
$posssec = $env{'request.course.sec'}; |
|
} |
|
} |
|
my $crstype = &Apache::loncommon::course_type(); |
|
if (&Apache::loncourseuser::is_course_user($possudom,$possuname,$cdom,$cnum, |
|
$canview,$crstype,$posssec)) { |
|
$viewasuser = $possuname.':'.$possudom; |
|
} |
|
} |
|
undef($env{'form.LC_viewas'}); |
|
} |
# just render the page normally outside of construction space |
# just render the page normally outside of construction space |
&Apache::lonxml::debug("not construct"); |
&Apache::lonxml::debug("not construct"); |
&renderpage($request,$file); |
undef(@Apache::lonhomework::ltipassback); |
|
&renderpage($request,$file,undef,undef,$donemsg,$viewasuser,$symb); |
|
if (@Apache::lonhomework::ltipassback) { |
|
unless ($registered_cleanup) { |
|
my $handlers = $request->get_handlers('PerlCleanupHandler'); |
|
$request->set_handlers('PerlCleanupHandler' => |
|
[\&do_ltipassback,@{$handlers}]); |
|
} |
|
} |
} |
} |
#my $td=&tv_interval($t0); |
#my $td=&tv_interval($t0); |
#&Apache::lonxml::debug("Spent $td seconds processing"); |
#&Apache::lonxml::debug("Spent $td seconds processing"); |
Line 1271 sub handler {
|
Line 1799 sub handler {
|
|
|
} |
} |
|
|
|
sub template_dropdown_datastructure { |
|
# gathering the all templates and their path, title, category and help topic |
|
my @templates = get_template_list('problem'); |
|
# template category => title |
|
my %tmplthash = (); |
|
# template title => path |
|
my %tmpltcontent = (); |
|
|
|
foreach my $template (@templates){ |
|
# put in hash if the template is not empty |
|
unless ($template->[1] eq ''){ |
|
push(@{$tmplthash{$template->[2]}}, $template->[1]); |
|
push(@{$tmpltcontent{$template->[1]}},$template->[0]); |
|
} |
|
} |
|
|
|
my $catList = []; |
|
foreach my $cat (sort keys %tmplthash) { |
|
my $catItems = []; |
|
foreach my $title (sort @{$tmplthash{$cat}}) { |
|
my $path = $tmpltcontent{$title}->[0]; |
|
my $code; |
|
open(FH, "<$path"); |
|
while(<FH>){ |
|
$code.= $_ unless $_ =~ /(<problem>)|(<\/problem>)/; |
|
} |
|
close(FH); |
|
|
|
if ($code ne '') { |
|
my $href = 'javascript:insertText(\'' . &convert_for_js(&HTML::Entities::encode($code,'<>&"')) . '\')'; |
|
my $currItem = [$href, $title, undef]; |
|
push @{$catItems}, $currItem; |
|
} |
|
} |
|
push @{$catList}, [$catItems, $cat, undef]; |
|
} |
|
|
|
return $catList; |
|
} |
|
|
|
sub responseblock_dropdown_datastructure { |
|
|
|
my $mathCat = [ |
|
[ |
|
["javascript:insertText(\'" . &convert_for_js(&HTML::Entities::encode(&Apache::edit::insert_formularesponse())) . "\')", &mt("Formula Response"), undef], |
|
["javascript:insertText(\'" . &convert_for_js(&HTML::Entities::encode(&Apache::edit::insert_functionplotresponse())) . "\')", &mt("Function Plot Response"), undef], |
|
["javascript:insertText(\'" . &convert_for_js(&HTML::Entities::encode(&Apache::edit::insert_mathresponse())) . "\')", &mt("Math Response"), undef], |
|
["javascript:insertText(\'" . &convert_for_js(&HTML::Entities::encode(&Apache::edit::insert_numericalresponse())) . "\')", &mt("Numerical Response"), undef] |
|
], |
|
&mt("Math"), |
|
undef |
|
]; |
|
|
|
my $miscCat = [ |
|
[ |
|
["javascript:insertText(\'" . &convert_for_js(&HTML::Entities::encode(&Apache::edit::insert_imageresponse())) . "\')", &mt("Click on Image"), undef], |
|
["javascript:insertText(\'" . &convert_for_js(&HTML::Entities::encode(&Apache::edit::insert_customresponse())) . "\')", &mt("Custom Response"), undef], |
|
["javascript:insertText(\'" . &convert_for_js(&HTML::Entities::encode(&Apache::edit::insert_externalresponse())) . "\')", &mt("External Response"), undef], |
|
["javascript:insertText(\'" . &convert_for_js(&HTML::Entities::encode(&Apache::edit::insert_matchresponse())) . "\')", &mt("Match Two Lists"), undef], |
|
["javascript:insertText(\'" . &convert_for_js(&HTML::Entities::encode(&Apache::edit::insert_radiobuttonresponse())) . "\')", &mt("One out of N statements"), undef], |
|
["javascript:insertText(\'" . &convert_for_js(&HTML::Entities::encode(&Apache::edit::insert_optionresponse())) . "\')", &mt("Select from Options"), undef], |
|
["javascript:insertText(\'" . &convert_for_js(&HTML::Entities::encode(&Apache::edit::insert_rankresponse())) . "\')", &mt("Rank Values"), undef] |
|
], |
|
&mt("Miscellaneous"), |
|
undef |
|
]; |
|
|
|
my $chemCat = [ |
|
[ |
|
["javascript:insertText(\'" . &convert_for_js(&HTML::Entities::encode(&Apache::edit::insert_reactionresponse())) . "\')", &mt("Chemical Reaction"), undef], |
|
["javascript:insertText(\'" . &convert_for_js(&HTML::Entities::encode(&Apache::edit::insert_organicresponse())) . "\')", &mt("Organic Chemical Structure"), undef] |
|
], |
|
&mt("Chemistry"), |
|
undef |
|
]; |
|
|
|
my $textCat = [ |
|
[ |
|
["javascript:insertText(\'" . &convert_for_js(&HTML::Entities::encode(&Apache::edit::insert_stringresponse())) . "\')", &mt("String Response"), undef], |
|
["javascript:insertText(\'" . &convert_for_js(&HTML::Entities::encode(&Apache::edit::insert_essayresponse())) . "\')", &mt("Essay"), undef] |
|
], |
|
&mt("Text"), |
|
undef |
|
]; |
|
|
|
return [$mathCat, $miscCat, $chemCat, $textCat]; |
|
} |
|
|
|
|
|
sub conditional_scripting_datastructure { |
|
# TODO: corresponding routines should be used for the javascript:insertText parts |
|
# instead of the placeholder routine default_xml_tag with the tags |
|
# e.g. &default_xml_tag("postanswerdate") should be replaced with a routine which |
|
# returns the corresponding content for this case |
|
|
|
#TODO translated is currently temporarily here, another solution should be found where the |
|
# needed string can be retrieved |
|
|
|
my $translatedTag = ' |
|
<translated> |
|
<lang which="en"></lang> |
|
<lang which="default"></lang> |
|
</translated>'; |
|
return [ |
|
["javascript:insertText(\'" . &convert_for_js(&HTML::Entities::encode($translatedTag)) . "\')", &mt("Translated Block"), undef], |
|
["javascript:insertText(\'" . &convert_for_js(&HTML::Entities::encode(&default_xml_tag("block"))) . "\')", &mt("Conditional Block"), undef], |
|
["javascript:insertText(\'" . &convert_for_js(&HTML::Entities::encode(&default_xml_tag("postanswerdate"))) . "\')", &mt("After Answer Date Block"), undef], |
|
["javascript:insertText(\'" . &convert_for_js(&HTML::Entities::encode(&default_xml_tag("preduedate"))) . "\')", &mt("Before Due Date Block"), undef], |
|
["javascript:insertText(\'" . &convert_for_js(&HTML::Entities::encode(&default_xml_tag("solved"))) . "\')", &mt("Block For After Solved"), undef], |
|
["javascript:insertText(\'" . &convert_for_js(&HTML::Entities::encode(&default_xml_tag("notsolved"))) . "\')", &mt("Block For When Not Solved"), undef] |
|
]; |
|
} |
|
|
|
sub misc_datastructure { |
|
return [ |
|
["javascript:insertText(\'" . &convert_for_js(&HTML::Entities::encode(&Apache::edit::insert_img())) . "\')", &mt("Image"), undef], |
|
["javascript:insertText(\'" . &convert_for_js(&HTML::Entities::encode(&Apache::lonplot::insert_gnuplot())) . "\')", &mt("GNU Plot"), undef], |
|
["javascript:insertText(\'" . &convert_for_js(&HTML::Entities::encode(&Apache::edit::insert_organicstructure())) . "\')", &mt("Organic Structure"), undef], |
|
["javascript:insertText(\'" . &convert_for_js(&HTML::Entities::encode(&Apache::edit::insert_script())) . "\')", &mt("Script Block"), undef], |
|
["javascript:insertText(\'" . &convert_for_js(&HTML::Entities::encode(&default_xml_tag("allow"))) . "\')", &mt("File Dependencies"), undef], |
|
["javascript:insertText(\'" . &convert_for_js(&HTML::Entities::encode(&default_xml_tag("import"))) . "\')", &mt("Import a File"), undef], |
|
["javascript:insertText(\'" . &convert_for_js(&HTML::Entities::encode(&Apache::londefdef::insert_meta())) . "\')", &mt("Custom Metadata"), undef], |
|
["javascript:insertText(\'" . &convert_for_js(&HTML::Entities::encode(&default_xml_tag("part"))) . "\')", &mt("Problem Part"), undef] |
|
]; |
|
} |
|
|
|
# helper routine for the datastructure building subroutines |
|
sub default_xml_tag { |
|
my ($tag) = @_; |
|
return "\n<$tag></$tag>"; |
|
} |
|
|
|
|
|
sub helpmenu_datastructure { |
|
|
|
# filename, title, width, height |
|
my $helpers = [ |
|
['Problem_LON-CAPA_Functions.hlp', &mt('Script Functions'), 800, 600], |
|
['Greek_Symbols.hlp', &mt('Greek Symbols'), 500, 600], |
|
['Other_Symbols.hlp', &mt('Other Symbols'), 500, 600], |
|
['Authoring_Output_Tags.hlp', &mt('Output Tags'), 800, 600], |
|
['Authoring_Multilingual_Problems.hlp', |
|
&mt('How to create problems in different languages'), 800, 600], |
|
['loncapa.html', &mt('Language reference'), 800, 600], |
|
]; |
|
|
|
my $help_structure = []; |
|
|
|
foreach my $count (0..(scalar(@{$helpers})-1)) { |
|
my $filename = $helpers->[$count]->[0]; |
|
my $title = $helpers->[$count]->[1]; |
|
my $width = $helpers->[$count]->[2]; |
|
my $height = $helpers->[$count]->[3]; |
|
if ($width eq '') { |
|
$width = 500; |
|
} |
|
if ($height eq '') { |
|
$height = 600; |
|
} |
|
my $href = &HTML::Entities::encode("javascript:openMyModal('/adm/help/$filename',$width,$height,'yes');"); |
|
push @{$help_structure}, [$href, $title, undef]; |
|
} |
|
|
|
return $help_structure; |
|
} |
|
|
|
# we need substitution to not break javascript code |
|
sub convert_for_js { |
|
my $return = shift; |
|
$return =~ s|script|ESCAPEDSCRIPT|g; |
|
$return =~ s|\\|\\\\|g; |
|
$return =~ s|\n|\\r\\n|g; |
|
$return =~ s|'|\\'|g; |
|
$return =~ s|'|\\'|g; |
|
return $return; |
|
} |
|
|
|
sub do_ltipassback { |
|
if (@Apache::lonhomework::ltipassback) { |
|
foreach my $item (@Apache::lonhomework::ltipassback) { |
|
if (ref($item) eq 'HASH') { |
|
if ((ref($item->{'lti'}) eq 'HASH') && ($item->{'cid'} =~ /^($match_domain)_($match_courseid)$/)) { |
|
my ($cdom,$cnum) = ($1,$2); |
|
my $msgformat = $item->{'lti'}->{'passbackformat'}; |
|
my $sigmethod = 'HMAC-SHA1'; |
|
my $ltinum = $item->{'ltinum'}; |
|
my $id = $item->{'pbid'}; |
|
my $url = $item->{'pburl'}; |
|
my $type = $item->{'pbtype'}; |
|
my $scope = $item->{'scope'}; |
|
my $map = $item->{'ltimap'}; |
|
my $symb = $item->{'ltisymb'}; |
|
my $uname = $item->{'uname'}; |
|
my $udom = $item->{'udom'}; |
|
my $keynum = $item->{'lti'}->{'cipher'}; |
|
my $crsdef = $item->{'crsdef'}; |
|
my $scoretype = $item->{'format'}; |
|
my ($total,$possible); |
|
if ($scope eq 'resource') { |
|
$total = $item->{'total'}; |
|
$possible = $item->{'possible'}; |
|
} elsif (($scope eq 'map') || ($scope eq 'nonrec')) { |
|
($total,$possible) = &get_lti_score($uname,$udom,$map,$scope); |
|
} elsif ($scope eq 'course') { |
|
($total,$possible) = &get_lti_score($uname,$udom); |
|
} |
|
if (($id ne '') && ($url ne '') && ($possible)) { |
|
&LONCAPA::ltiutils::send_grade($cdom,$cnum,$crsdef,$type,$ltinum,$keynum,$id,$url,$scoretype,$sigmethod,$msgformat,$total,$possible); |
|
} |
|
} |
|
} |
|
} |
|
undef(@Apache::lonhomework::ltipassback); |
|
} |
|
} |
|
|
|
sub get_lti_score { |
|
my ($uname,$udom,$mapurl,$scope) = @_; |
|
my $navmap = Apache::lonnavmaps::navmap->new($uname,$udom); |
|
if (ref($navmap)) { |
|
my $iterator; |
|
if ($mapurl ne '') { |
|
my $map = $navmap->getResourceByUrl($mapurl); |
|
my $firstres = $map->map_start(); |
|
my $finishres = $map->map_finish(); |
|
my $recursive = 1; |
|
if ($scope eq 'nonrec') { |
|
$recursive = 0; |
|
} |
|
$iterator = $navmap->getIterator($firstres,$finishres,undef,$recursive); |
|
} else { |
|
$iterator = $navmap->getIterator(undef,undef,undef,1); |
|
} |
|
if (ref($iterator)) { |
|
my $depth = 1; |
|
my $total = 0; |
|
my $possible = 0; |
|
$iterator->next(); # ignore first BEGIN_MAP |
|
my $curRes = $iterator->next(); |
|
while ( $depth > 0 ) { |
|
if ($curRes == $iterator->BEGIN_MAP()) {$depth++;} |
|
if ($curRes == $iterator->END_MAP()) { $depth--; } |
|
if (ref($curRes) && $curRes->is_gradable() && !$curRes->randomout) { |
|
my $parts = $curRes->parts(); |
|
foreach my $part (@{$parts}) { |
|
next if ($curRes->solved($part) eq 'excused'); |
|
$total += $curRes->weight($part) * $curRes->awarded($part); |
|
$possible += $curRes->weight($part); |
|
} |
|
} |
|
$curRes = $iterator->next(); |
|
} |
|
if ($total > $possible) { |
|
$total = $possible; |
|
} |
|
return ($total,$possible); |
|
} |
|
} |
|
return; |
|
} |
|
|
1; |
1; |
__END__ |
__END__ |