version 1.344.2.10.4.6, 2024/02/21 19:57:06
|
version 1.371, 2018/05/15 04:59:14
|
Line 49 use Apache::matchresponse();
|
Line 49 use Apache::matchresponse();
|
use Apache::chemresponse(); |
use Apache::chemresponse(); |
use Apache::functionplotresponse(); |
use Apache::functionplotresponse(); |
use Apache::drawimage(); |
use Apache::drawimage(); |
use Apache::loncourseuser(); |
use Apache::loncapamath(); |
use Apache::grades(); |
|
use Apache::Constants qw(:common); |
use Apache::Constants qw(:common); |
use Apache::loncommon(); |
use Apache::loncommon(); |
use Apache::lonparmset(); |
use Apache::lonparmset(); |
Line 225 sub check_slot_access {
|
Line 224 sub check_slot_access {
|
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)) { |
|
$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 236 sub check_slot_access {
|
Line 268 sub check_slot_access {
|
} |
} |
|
|
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); |
} elsif (($type eq 'problem') && |
} else { |
($Apache::lonhomework::browse eq 'F') && |
return ('SHOW_ANSWER'); |
($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); |
my $availablestudent = &Apache::lonnet::EXT("resource.0.availablestudent",$symb); |
Line 256 sub check_slot_access {
|
Line 285 sub check_slot_access {
|
# 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 $now = time; |
|
my $num_usable_slots = 0; |
my $num_usable_slots = 0; |
unless ($symb) { |
if (!$symb) { |
($symb) = &Apache::lonnet::whichuser(); |
($symb) = &Apache::lonnet::whichuser(); |
} |
} |
foreach my $slot (@slots) { |
foreach my $slot (@slots) { |
Line 273 sub check_slot_access {
|
Line 302 sub check_slot_access {
|
if ($slot{'starttime'} < $now && |
if ($slot{'starttime'} < $now && |
$slot{'endtime'} > $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)) { |
Line 286 sub check_slot_access {
|
Line 344 sub check_slot_access {
|
$slotstatus=$status; |
$slotstatus=$status; |
} |
} |
|
|
my ($is_correct,$got_grade,$checkin,$checkinslot,$checkedin,$consumed_uniq); |
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'}; |
$checkin = "resource.$version.0.checkedin"; |
|
$got_grade = |
$got_grade = |
($Apache::lonhomework::history{"resource.$version.0.status"} |
($Apache::lonhomework::history{"resource.$version.0.status"} |
=~ /^(?:pass|fail)$/); |
=~ /^(?:pass|fail)$/); |
$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 = |
|
$Apache::lonhomework::history{"resource.$version.0.checkedin"}; |
|
} elsif (($type eq 'problem') || ($type eq 'tool')) { |
} elsif (($type eq 'problem') || ($type eq 'tool')) { |
$checkin = 'resource.0.checkedin'; |
|
$checkedin = $Apache::lonhomework::history{$checkin}; |
|
} |
|
if ($checkedin) { |
|
$checkinslot = $Apache::lonhomework::history{"$checkin.slot"}; |
|
my %slot=&Apache::lonnet::get_slot($checkinslot); |
|
$consumed_uniq = $slot{'uniqueperiod'}; |
|
} |
|
if (($type eq 'problem') || ($type eq 'tool')) { |
|
if ((ref($partlist) eq 'ARRAY') && (@{$partlist} > 0)) { |
if ((ref($partlist) eq 'ARRAY') && (@{$partlist} > 0)) { |
my ($numcorrect,$numgraded) = (0,0); |
my ($numcorrect,$numgraded) = (0,0); |
foreach my $part (@{$partlist}) { |
foreach my $part (@{$partlist}) { |
Line 316 sub check_slot_access {
|
Line 362 sub check_slot_access {
|
my $probstatus = &Apache::structuretags::get_problem_status($part); |
my $probstatus = &Apache::structuretags::get_problem_status($part); |
my $earlyout; |
my $earlyout; |
unless (($probstatus eq 'no') || |
unless (($probstatus eq 'no') || |
($probstatus eq 'no_feedback_ever')) { |
($probstatus eq 'no_feedback_ever')) { |
if ($Apache::lonhomework::history{"resource.$part.solved"} =~/^correct_/) { |
if ($Apache::lonhomework::history{"resource.$part.solved"} =~/^correct_/) { |
$numcorrect ++; |
$numcorrect ++; |
} else { |
} else { |
$earlyout = 1; |
$earlyout = 1; |
} |
} |
} |
} |
if ($currtries == $maxtries) { |
if (($currtries == $maxtries) || ($is_correct)) { |
$earlyout = 1; |
$earlyout = 1; |
} else { |
} else { |
$numgraded ++; |
$numgraded ++; |
} |
} |
last if ($earlyout); |
last if ($earlyout); |
Line 371 sub check_slot_access {
|
Line 417 sub check_slot_access {
|
if (!defined($slot_name) && (($type eq 'problem') || ($type eq 'tool'))) { |
if (!defined($slot_name) && (($type eq 'problem') || ($type eq 'tool'))) { |
if ($slotstatus eq 'NOT_IN_A_SLOT') { |
if ($slotstatus eq 'NOT_IN_A_SLOT') { |
if (!$num_usable_slots) { |
if (!$num_usable_slots) { |
if ($env{'request.course.id'}) { |
($slotstatus,$datemsg) = &check_reservable_slot($slotstatus,$symb,$now,$checkedin, |
my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'}; |
$consumed_uniq); |
my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'}; |
|
$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); |
return ($slotstatus,$datemsg); |
Line 444 sub check_slot_access {
|
Line 428 sub check_slot_access {
|
&& $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') || ($type eq 'tool')) { |
if (($type eq 'problem') || ($type eq 'tool')) { |
return ($status); |
return ($status); |
} |
} |
Line 459 sub check_slot_access {
|
Line 447 sub check_slot_access {
|
} |
} |
|
|
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 |
Line 595 sub check_access {
|
Line 658 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",$symb); |
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],$symb); |
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,$symb); |
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 638 sub due_date {
|
Line 702 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 723 sub setuppermissions {
|
Line 788 sub setuppermissions {
|
$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 743 sub setuppermissions {
|
Line 805 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 764 sub setuppermissions {
|
Line 823 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 865 STATE
|
Line 922 STATE
|
|
|
sub analyze_header { |
sub analyze_header { |
my ($request) = @_; |
my ($request) = @_; |
my $js = &Apache::lonxml::setmode_javascript(); |
my $js = &Apache::structuretags::setmode_javascript(); |
|
|
# Breadcrumbs |
# Breadcrumbs |
my $brcrum = [{'href' => &Apache::loncommon::authorspace($request->uri), |
my $brcrum = [{'href' => &Apache::loncommon::authorspace($request->uri), |
Line 882 sub analyze_header {
|
Line 939 sub analyze_header {
|
.&Apache::loncommon::head_subbox( |
.&Apache::loncommon::head_subbox( |
&Apache::loncommon::CSTR_pageheader()); |
&Apache::loncommon::CSTR_pageheader()); |
$result .= |
$result .= |
'<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'}.'" />'. |
Line 897 sub analyze_header {
|
Line 954 sub analyze_header {
|
'onclick="javascript:setmode(this.form,'."'view'".')" /> |
'onclick="javascript:setmode(this.form,'."'view'".')" /> |
<hr /> |
<hr /> |
</div>' |
</div>' |
.&Apache::lonxml::message_location().' |
.&Apache::lonxml::message_location(). |
</form>'; |
'</form>'; |
&Apache::lonxml::add_messages(\$result); |
&Apache::lonxml::add_messages(\$result); |
$request->print($result); |
$request->print($result); |
$request->rflush(); |
$request->rflush(); |
Line 1097 sub editxmlmode {
|
Line 1154 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::lonxml::setmode_javascript(). |
&Apache::structuretags::setmode_javascript(). |
&Apache::lonhtmlcommon::dragmath_js("EditMathPopup"); |
&Apache::lonhtmlcommon::dragmath_js("EditMathPopup"); |
|
|
# Breadcrumbs |
# Breadcrumbs |
Line 1127 sub editxmlmode {
|
Line 1184 sub editxmlmode {
|
<div class="LC_edit_problem_header"> |
<div class="LC_edit_problem_header"> |
<div class="LC_edit_problem_header_title">'. |
<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'). |
'</div><div class="LC_edit_actionbar" id="actionbar">'; |
'</div><div class="LC_edit_actionbar" id="actionbar">'; |
|
|
$result.='<input type="hidden" name="problemmode" value="saveedit" />'. |
$result.='<input type="hidden" name="problemmode" value="saveedit" />'. |
&Apache::structuretags::problem_edit_buttons('editxml'); |
&Apache::structuretags::problem_edit_buttons('editxml'); |
Line 1137 sub editxmlmode {
|
Line 1194 sub editxmlmode {
|
|
|
unless ($env{'environment.nocodemirror'}) { |
unless ($env{'environment.nocodemirror'}) { |
# dropdown menus |
# dropdown menus |
$result .= Apache::lonmenu::create_submenu("#", "", |
$result .= Apache::lonmenu::create_submenu("#", "", |
&mt("Problem Templates"), template_dropdown_datastructure()); |
&mt("Problem Templates"), template_dropdown_datastructure()); |
|
|
$result .= Apache::lonmenu::create_submenu("#", "", |
$result .= Apache::lonmenu::create_submenu("#", "", |
&mt("Response Types"), responseblock_dropdown_datastructure()); |
&mt("Response Types"), responseblock_dropdown_datastructure()); |
|
|
$result .= Apache::lonmenu::create_submenu("#", "", |
$result .= Apache::lonmenu::create_submenu("#", "", |
&mt("Conditional Blocks"), conditional_scripting_datastructure()); |
&mt("Conditional Blocks"), conditional_scripting_datastructure()); |
|
|
$result .= Apache::lonmenu::create_submenu("#", "", |
$result .= Apache::lonmenu::create_submenu("#", "", |
&mt("Miscellaneous"), misc_datastructure()); |
&mt("Miscellaneous"), misc_datastructure()); |
} |
} |
|
|
$result .= Apache::lonmenu::create_submenu("#", "", |
$result .= Apache::lonmenu::create_submenu("#", "", |
&mt("Help") . ' <img src="/adm/help/help.png" alt="' . &mt("Help") . |
&mt("Help") . ' <img src="/adm/help/help.png" alt="' . &mt("Help") . |
'" style="vertical-align:text-bottom; height: auto; margin:0; "/>', |
'" style="vertical-align:text-bottom; height: auto; margin:0; "/>', |
helpmenu_datastructure(),""); |
helpmenu_datastructure(),""); |
|
|
$result.="</ol></div>"; |
$result.="</ol></div>"; |
|
|
$result .= '</div></div>' . |
$result .= '</div></div>' . |
&Apache::lonxml::message_location() . |
&Apache::lonxml::message_location() . |
&Apache::loncommon::xmleditor_js() . |
&Apache::loncommon::xmleditor_js() . |
'<textarea ' . &Apache::edit::element_change_detection() . |
'<textarea ' . &Apache::edit::element_change_detection() . |
Line 1193 sub editxmlmode {
|
Line 1250 sub editxmlmode {
|
autoCloseBrackets: true, |
autoCloseBrackets: true, |
height: "auto", |
height: "auto", |
styleActiveLine: true, |
styleActiveLine: true, |
|
|
extraKeys: { |
extraKeys: { |
"Tab": "indentMore", |
"Tab": "indentMore", |
"Shift-Tab": "indentLess", |
"Shift-Tab": "indentLess", |
Line 1214 sub editxmlmode {
|
Line 1271 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,$donebuttonmsg,$viewasuser,$symb) = @_; |
my ($request,$file,$targets,$return_string,$donebuttonmsg) = @_; |
|
|
my @targets = @{$targets || [&get_target()]}; |
my @targets = @{$targets || [&get_target()]}; |
&Apache::lonhomework::showhashsubset(\%env,'form.'); |
&Apache::lonhomework::showhashsubset(\%env,'form.'); |
Line 1240 sub renderpage {
|
Line 1297 sub renderpage {
|
$problem=''; |
$problem=''; |
my $filename=(split('/',$file))[-1]; |
my $filename=(split('/',$file))[-1]; |
my $error = |
my $error = |
&mt('Unable to find [_1]', |
'<p class="LC_error">' |
'<span class="LC_filename">'.$filename.'</span>'); |
.&mt('Unable to find [_1]', |
|
'<span class="LC_filename">'.$filename.'</span>') |
|
."</p>"; |
$result.= |
$result.= |
&Apache::loncommon::simple_error_page($request,'Not available', |
&Apache::loncommon::simple_error_page($request,'Not available', |
$error,{'no_auto_mt_msg' => 1}); |
$error,{'no_auto_mt_msg' => 1}); |
Line 1253 sub renderpage {
|
Line 1312 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 1269 sub renderpage {
|
Line 1324 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') { |
} elsif ($target eq 'web') { |
if ($donebuttonmsg) { |
if ($donebuttonmsg) { |
$result =~ s{</body>}{}; |
$result =~ s{</body>}{}; |
$result.= &Apache::loncommon::confirmwrapper(&Apache::lonhtmlcommon::confirm_success($donebuttonmsg,1))."\n</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 1282 sub renderpage {
|
Line 1337 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 1315 sub finished_parsing {
|
Line 1362 sub finished_parsing {
|
# value 1: title |
# value 1: title |
# value 2: category |
# value 2: category |
# value 3: name of help topic ??? |
# value 3: name of help topic ??? |
sub get_template_list { |
sub get_template_list{ |
my ($extension) = @_; |
my ($extension) = @_; |
|
|
my @files = glob($Apache::lonnet::perlvar{'lonIncludes'}. |
my @files = glob($Apache::lonnet::perlvar{'lonIncludes'}. |
'/templates/*.'.$extension); |
'/templates/*.'.$extension); |
@files = map {[$_,&mt(&Apache::lonnet::metadata($_, 'title')), |
@files = map {[$_,&mt(&Apache::lonnet::metadata($_, 'title')), |
(&Apache::lonnet::metadata($_, 'category')?&mt(&Apache::lonnet::metadata($_, 'category')):&mt('Miscellaneous')), |
(&Apache::lonnet::metadata($_, 'category')?&mt(&Apache::lonnet::metadata($_, 'category')):&mt('Miscellaneous')), |
&mt(&Apache::lonnet::metadata($_, 'help'))]} (@files); |
&mt(&Apache::lonnet::metadata($_, 'help'))]} (@files); |
@files = sort {$a->[2].$a->[1] cmp $b->[2].$b->[1]} (@files); |
@files = sort {$a->[2].$a->[1] cmp $b->[2].$b->[1]} (@files); |
return @files; |
return @files; |
} |
} |
Line 1334 sub get_template_html {
|
Line 1381 sub get_template_html {
|
&Apache::lonxml::debug("Looking for :$extension:"); |
&Apache::lonxml::debug("Looking for :$extension:"); |
my $glob_extension = $extension; |
my $glob_extension = $extension; |
if ($extension eq 'survey' || $extension eq 'exam') { |
if ($extension eq 'survey' || $extension eq 'exam') { |
$glob_extension = 'problem'; |
$glob_extension = 'problem'; |
} |
} |
my @files = &get_template_list($extension); |
my @files = &get_template_list($extension); |
my ($midpoint,$seconddiv,$numfiles); |
my ($midpoint,$seconddiv,$numfiles); |
Line 1421 sub newproblem {
|
Line 1468 sub newproblem {
|
} |
} |
} |
} |
if ($file) { |
if ($file) { |
my $dest = &Apache::lonnet::filelocation("",$request->uri); |
my $dest = &Apache::lonnet::filelocation("",$request->uri); |
&File::Copy::copy($file,$dest); |
&File::Copy::copy($file,$dest); |
&renderpage($request,$dest); |
&renderpage($request,$dest); |
return; |
return; |
} else { |
} else { |
$errormsg = '<p class="LC_error">'.&mt('Invalid template file.').'</p>'; |
$errormsg = '<p class="LC_error">'.&mt('Invalid template file.').'</p>'; |
} |
} |
Line 1497 sub update_construct_style {
|
Line 1544 sub update_construct_style {
|
} |
} |
|
|
# |
# |
# Sets interval for current user so time left will be zero, either for the entire folder |
# 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 |
# containing the current resource, or just the resource, depending on value of first item |
# in interval array retrieved from EXT("resource.0.interval"); |
# in interval array retrieved from EXT("resource.0.interval"); |
# |
# |
Line 1521 sub zero_timer {
|
Line 1568 sub zero_timer {
|
$key =~ s/\s+$//; |
$key =~ s/\s+$//; |
if ($env{'form.LC_interval_done_proctorpass'} ne $secret) { |
if ($env{'form.LC_interval_done_proctorpass'} ne $secret) { |
return ('fail', |
return ('fail', |
&mt('Incorrect key entered by proctor')); |
&mt('Incorrect key entered by proctor')); |
} |
} |
} |
} |
if ($first_access+$timelimit > $now) { |
if ($first_access+$timelimit > $now) { |
Line 1544 sub zero_timer {
|
Line 1591 sub zero_timer {
|
return ('ok'); |
return ('ok'); |
} else { |
} else { |
return ('fail',&mt('Error ending timed event: [_1]',$result)); |
return ('fail',&mt('Error ending timed event: [_1]',$result)); |
} |
} |
} else { |
} else { |
return ('fail',&mt('Timed event already ended')); |
return ('fail',&mt('Timed event already ended')); |
} |
} |
Line 1564 sub zero_timer {
|
Line 1611 sub zero_timer {
|
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 1574 sub handler {
|
Line 1622 sub handler {
|
#check if we know where we are |
#check if we know where we are |
if ($env{'request.course.fn'} && !&Apache::lonnet::symbread('','',1,1)) { |
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 1611 sub handler {
|
Line 1659 sub handler {
|
&renderpage($request,$file); |
&renderpage($request,$file); |
} |
} |
} else { |
} else { |
&Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'}, |
&Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'}, |
['mode']); |
['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 |
# Set the event timer to zero if the "done button" was clicked. The button is |
# part of the doneButton form created in lonmenu.pm |
# part of the doneButton form created in lonmenu.pm |
my ($donebuttonresult,$donemsg,$viewasuser); |
my ($donebuttonresult,$donemsg); |
if ($symb && $env{'form.LC_interval_done'} eq 'true') { |
if ($symb && $env{'form.LC_interval_done'} eq 'true') { |
($donebuttonresult,$donemsg) = &zero_timer($symb); |
($donebuttonresult,$donemsg) = &zero_timer($symb); |
undef($env{'form.LC_interval_done'}); |
undef($env{'form.LC_interval_done'}); |
undef($env{'form.LC_interval_done_proctorpass'}); |
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"); |
undef(@Apache::lonhomework::ltipassback); |
undef(@Apache::lonhomework::ltipassback); |
&renderpage($request,$file,undef,undef,$donemsg,$viewasuser,$symb); |
&renderpage($request,$file,undef,undef,$donemsg); |
if (@Apache::lonhomework::ltipassback) { |
if (@Apache::lonhomework::ltipassback) { |
unless ($registered_cleanup) { |
unless ($registered_cleanup) { |
my $handlers = $request->get_handlers('PerlCleanupHandler'); |
my $handlers = $request->get_handlers('PerlCleanupHandler'); |
Line 1677 sub template_dropdown_datastructure {
|
Line 1701 sub template_dropdown_datastructure {
|
my %tmplthash = (); |
my %tmplthash = (); |
# template title => path |
# template title => path |
my %tmpltcontent = (); |
my %tmpltcontent = (); |
|
|
foreach my $template (@templates){ |
foreach my $template (@templates){ |
# put in hash if the template is not empty |
# put in hash if the template is not empty |
unless ($template->[1] eq ''){ |
unless ($template->[1] eq ''){ |
Line 1686 sub template_dropdown_datastructure {
|
Line 1710 sub template_dropdown_datastructure {
|
} |
} |
} |
} |
|
|
my $catList = []; |
my $catList = []; |
foreach my $cat (sort keys %tmplthash) { |
foreach my $cat (sort keys %tmplthash) { |
my $catItems = []; |
my $catItems = []; |
foreach my $title (sort @{$tmplthash{$cat}}) { |
foreach my $title (sort @{$tmplthash{$cat}}) { |
my $path = $tmpltcontent{$title}->[0]; |
my $path = $tmpltcontent{$title}->[0]; |
my $code; |
my $code; |
Line 1698 sub template_dropdown_datastructure {
|
Line 1722 sub template_dropdown_datastructure {
|
} |
} |
close(FH); |
close(FH); |
|
|
if ($code ne '') { |
if ($code ne '') { |
my $href = 'javascript:insertText(\'' . &convert_for_js(&HTML::Entities::encode($code,'<>&"')) . '\')'; |
my $href = 'javascript:insertText(\'' . &convert_for_js(&HTML::Entities::encode($code,'<>&"')) . '\')'; |
my $currItem = [$href, $title, undef]; |
my $currItem = [$href, $title, undef]; |
push @{$catItems}, $currItem; |
push @{$catItems}, $currItem; |
} |
} |
} |
} |
push @{$catList}, [$catItems, $cat, undef]; |
push @{$catList}, [$catItems, $cat, undef]; |
} |
} |
|
|
return $catList; |
return $catList; |
} |
} |
|
|
sub responseblock_dropdown_datastructure { |
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 $mathCat = [ |
my $miscCat = [ |
[ |
[ |
["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_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_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_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_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_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_optionresponse())) . "\')", &mt("Select from Options"), undef], |
["javascript:insertText(\'" . &convert_for_js(&HTML::Entities::encode(&Apache::edit::insert_rankresponse())) . "\')", &mt("Rank Values"), undef] |
["javascript:insertText(\'" . &convert_for_js(&HTML::Entities::encode(&Apache::edit::insert_rankresponse())) . "\')", &mt("Rank Values"), undef] |
], |
], |
&mt("Miscellaneous"), |
&mt("Miscellaneous"), |
undef |
undef |
]; |
]; |
|
|
my $chemCat = [ |
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_reactionresponse())) . "\')", &mt("Chemical Reaction"), undef], |
["javascript:insertText(\'" . &convert_for_js(&HTML::Entities::encode(&Apache::edit::insert_organicresponse())) . "\')", &mt("Organic Chemical Structure"), undef] |
["javascript:insertText(\'" . &convert_for_js(&HTML::Entities::encode(&Apache::edit::insert_organicresponse())) . "\')", &mt("Organic Chemical Structure"), undef] |
], |
], |
&mt("Chemistry"), |
&mt("Chemistry"), |
undef |
undef |
]; |
]; |
|
|
my $textCat = [ |
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_stringresponse())) . "\')", &mt("String Response"), undef], |
["javascript:insertText(\'" . &convert_for_js(&HTML::Entities::encode(&Apache::edit::insert_essayresponse())) . "\')", &mt("Essay"), undef] |
["javascript:insertText(\'" . &convert_for_js(&HTML::Entities::encode(&Apache::edit::insert_essayresponse())) . "\')", &mt("Essay"), undef] |
], |
], |
&mt("Text"), |
&mt("Text"), |
undef |
undef |
]; |
]; |
|
|
return [$mathCat, $miscCat, $chemCat, $textCat]; |
return [$mathCat, $miscCat, $chemCat, $textCat]; |
} |
} |
Line 1768 sub conditional_scripting_datastructure
|
Line 1792 sub conditional_scripting_datastructure
|
#TODO translated is currently temporarily here, another solution should be found where the |
#TODO translated is currently temporarily here, another solution should be found where the |
# needed string can be retrieved |
# needed string can be retrieved |
|
|
my $translatedTag = ' |
my $translatedTag = ' |
<translated> |
<translated> |
<lang which="en"></lang> |
<lang which="en"></lang> |
<lang which="default"></lang> |
<lang which="default"></lang> |
</translated>'; |
</translated>'; |
return [ |
return [ |
["javascript:insertText(\'" . &convert_for_js(&HTML::Entities::encode($translatedTag)) . "\')", &mt("Translated Block"), undef], |
["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("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("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("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("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] |
["javascript:insertText(\'" . &convert_for_js(&HTML::Entities::encode(&default_xml_tag("notsolved"))) . "\')", &mt("Block For When Not Solved"), undef] |
]; |
]; |
} |
} |
|
|
Line 1798 sub misc_datastructure {
|
Line 1822 sub misc_datastructure {
|
|
|
# helper routine for the datastructure building subroutines |
# helper routine for the datastructure building subroutines |
sub default_xml_tag { |
sub default_xml_tag { |
my ($tag) = @_; |
my ($tag) = @_; |
return "\n<$tag></$tag>"; |
return "\n<$tag></$tag>"; |
} |
} |
|
|
|
|
sub helpmenu_datastructure { |
sub helpmenu_datastructure { |
|
|
# filename, title, width, height |
# filename, title, width, height |
my $helpers = [ |
my $helpers = [ |
['Problem_LON-CAPA_Functions.hlp', &mt('Script Functions'), 800, 600], |
['Problem_LON-CAPA_Functions.hlp', &mt('Script Functions'), 800, 600], |
['Greek_Symbols.hlp', &mt('Greek Symbols'), 500, 600], |
['Greek_Symbols.hlp', &mt('Greek Symbols'), 500, 600], |
['Other_Symbols.hlp', &mt('Other Symbols'), 500, 600], |
['Other_Symbols.hlp', &mt('Other Symbols'), 500, 600], |
['Authoring_Output_Tags.hlp', &mt('Output Tags'), 800, 600], |
['Authoring_Output_Tags.hlp', &mt('Output Tags'), 800, 600], |
['Authoring_Multilingual_Problems.hlp', &mt('Languages'), 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 $help_structure = []; |
my $filename = $helpers->[$count]->[0]; |
|
my $title = $helpers->[$count]->[1]; |
foreach my $count (0..(scalar(@{$helpers})-1)) { |
my $width = $helpers->[$count]->[2]; |
my $filename = $helpers->[$count]->[0]; |
my $height = $helpers->[$count]->[3]; |
my $title = $helpers->[$count]->[1]; |
if ($width eq '') { |
my $width = $helpers->[$count]->[2]; |
$width = 500; |
my $height = $helpers->[$count]->[3]; |
} |
if ($width eq '') { |
if ($height eq '') { |
$width = 500; |
$height = 600; |
} |
} |
if ($height eq '') { |
my $href = &HTML::Entities::encode("javascript:openMyModal('/adm/help/$filename',$width,$height,'yes');"); |
$height = 600; |
push @{$help_structure}, [$href, $title, undef]; |
} |
} |
my $href = &HTML::Entities::encode("javascript:openMyModal('/adm/help/$filename',$width,$height,'yes');"); |
|
push @{$help_structure}, [$href, $title, undef]; |
|
} |
|
|
return $help_structure; |
return $help_structure; |
} |
} |
|
|
# we need substitution to not break javascript code |
# we need substitution to not break javascript code |
sub convert_for_js { |
sub convert_for_js { |
my $return = shift; |
my $return = shift; |
$return =~ s|script|ESCAPEDSCRIPT|g; |
$return =~ s|script|ESCAPEDSCRIPT|g; |
$return =~ s|\\|\\\\|g; |
$return =~ s|\\|\\\\|g; |
$return =~ s|\n|\\r\\n|g; |
$return =~ s|\n|\\r\\n|g; |
$return =~ s|'|\\'|g; |
$return =~ s|'|\\'|g; |
$return =~ s|'|\\'|g; |
$return =~ s|'|\\'|g; |
return $return; |
return $return; |
} |
} |
|
|
Line 1850 sub do_ltipassback {
|
Line 1877 sub do_ltipassback {
|
if (ref($item) eq 'HASH') { |
if (ref($item) eq 'HASH') { |
if ((ref($item->{'lti'}) eq 'HASH') && ($item->{'cid'} =~ /^($match_domain)_($match_courseid)$/)) { |
if ((ref($item->{'lti'}) eq 'HASH') && ($item->{'cid'} =~ /^($match_domain)_($match_courseid)$/)) { |
my ($cdom,$cnum) = ($1,$2); |
my ($cdom,$cnum) = ($1,$2); |
my $msgformat = $item->{'lti'}->{'passbackformat'}; |
my $ckey = $item->{'lti'}->{'key'}; |
my $sigmethod = 'HMAC-SHA1'; |
my $secret = $item->{'lti'}->{'secret'}; |
my $ltinum = $item->{'ltinum'}; |
|
my $id = $item->{'pbid'}; |
my $id = $item->{'pbid'}; |
my $url = $item->{'pburl'}; |
my $url = $item->{'pburl'}; |
my $type = $item->{'pbtype'}; |
|
my $scope = $item->{'scope'}; |
my $scope = $item->{'scope'}; |
my $map = $item->{'pbmap'}; |
my $map = $item->{'ltimap'}; |
my $symb = $item->{'pbsymb'}; |
my $symb = $item->{'ltisymb'}; |
my $uname = $item->{'uname'}; |
my $uname = $item->{'uname'}; |
my $udom = $item->{'udom'}; |
my $udom = $item->{'udom'}; |
my $keynum = $item->{'lti'}->{'cipher'}; |
|
my $crsdef = $item->{'crsdef'}; |
|
my $scoretype = $item->{'format'}; |
my $scoretype = $item->{'format'}; |
my ($total,$possible); |
my ($total,$possible); |
if ($scope eq 'resource') { |
if ($scope eq 'resource') { |
$total = $item->{'total'}; |
$total = $item->{'total'}; |
$possible = $item->{'possible'}; |
$possible = $item->{'possible'}; |
} elsif (($scope eq 'map') || ($scope eq 'nonrec')) { |
} elsif ($scope eq 'map') { |
($total,$possible) = &get_lti_score($uname,$udom,$map,$scope); |
($total,$possible) = &get_lti_score($uname,$udom,$map); |
} elsif ($scope eq 'course') { |
} elsif ($scope eq 'course') { |
($total,$possible) = &get_lti_score($uname,$udom); |
($total,$possible) = &get_lti_score($uname,$udom); |
} |
} |
if (($id ne '') && ($url ne '') && ($possible)) { |
if (($ckey ne '') && ($secret ne '') && ($id ne '') && ($url ne '') && ($possible)) { |
&LONCAPA::ltiutils::send_grade($cdom,$cnum,$crsdef,$type,$ltinum,$keynum,$id,$url,$scoretype,$sigmethod,$msgformat,$total,$possible); |
&LONCAPA::ltiutils::send_grade($id,$url,$ckey,$secret,$scoretype,$total,$possible); |
} |
} |
} |
} |
} |
} |
Line 1884 sub do_ltipassback {
|
Line 1907 sub do_ltipassback {
|
} |
} |
|
|
sub get_lti_score { |
sub get_lti_score { |
my ($uname,$udom,$mapurl,$scope) = @_; |
my ($uname,$udom,$mapurl) = @_; |
my $navmap = Apache::lonnavmaps::navmap->new($uname,$udom); |
my $navmap = Apache::lonnavmaps::navmap->new($uname,$udom); |
if (ref($navmap)) { |
if (ref($navmap)) { |
my $iterator; |
my $iterator; |
Line 1892 sub get_lti_score {
|
Line 1915 sub get_lti_score {
|
my $map = $navmap->getResourceByUrl($mapurl); |
my $map = $navmap->getResourceByUrl($mapurl); |
my $firstres = $map->map_start(); |
my $firstres = $map->map_start(); |
my $finishres = $map->map_finish(); |
my $finishres = $map->map_finish(); |
my $recursive = 1; |
$iterator = $navmap->getIterator($firstres,$finishres,undef,1); |
if ($scope eq 'nonrec') { |
|
$recursive = 0; |
|
} |
|
$iterator = $navmap->getIterator($firstres,$finishres,undef,$recursive); |
|
} else { |
} else { |
$iterator = $navmap->getIterator(undef,undef,undef,1); |
$iterator = $navmap->getIterator(undef,undef,undef,1); |
} |
} |