--- loncom/homework/lonhomework.pm 2016/05/13 22:48:09 1.361
+++ loncom/homework/lonhomework.pm 2025/01/17 15:05:47 1.394
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# The LON-CAPA Homework handler
#
-# $Id: lonhomework.pm,v 1.361 2016/05/13 22:48:09 raeburn Exp $
+# $Id: lonhomework.pm,v 1.394 2025/01/17 15:05:47 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -50,16 +50,22 @@ use Apache::chemresponse();
use Apache::functionplotresponse();
use Apache::drawimage();
use Apache::loncapamath();
+use Apache::loncourseuser();
+use Apache::grades();
use Apache::Constants qw(:common);
use Apache::loncommon();
use Apache::lonparmset();
+use Apache::lonnavmaps();
use Apache::lonlocal;
+use LONCAPA qw(:DEFAULT :match);
+use LONCAPA::ltiutils();
use Time::HiRes qw( gettimeofday tv_interval );
use HTML::Entities();
use File::Copy();
# FIXME - improve commenting
+my $registered_cleanup;
BEGIN {
&Apache::lonxml::register_insert();
@@ -157,9 +163,19 @@ sub get_target {
return ('web','answer');
} elsif (($env{'form.problemmode'} eq 'saveedit') ||
($env{'form.problemmode'} eq 'undo')) {
- return ('modified','no_output_web','edit');
+ my %editors = &Apache::loncommon::permitted_editors();
+ if ($editors{'edit'}) {
+ return ('modified','no_output_web','edit');
+ } else {
+ return ('web');
+ }
} elsif ($env{'form.problemmode'} eq 'edit') {
- return ('no_output_web','edit');
+ my %editors = &Apache::loncommon::permitted_editors();
+ if ($editors{'edit'}) {
+ return ('no_output_web','edit');
+ } else {
+ return ('web');
+ }
} else {
return ('web');
}
@@ -190,7 +206,7 @@ sub proctor_checked_in {
if ($type eq 'Task') {
my $version=$Apache::lonhomework::history{'resource.0.version'};
$key ="resource.$version.0.checkedin";
- } elsif ($type eq 'problem') {
+ } elsif (($type eq 'problem') || ($type eq 'tool')) {
$key ='resource.0.checkedin';
}
# backward compatability, used to be username@domain,
@@ -205,16 +221,15 @@ sub proctor_checked_in {
return 1;
}
}
-
return 0;
}
sub check_slot_access {
- my ($id,$type,$symb)=@_;
+ my ($id,$type,$symb,$partlist)=@_;
# does it pass normal muster
my ($status,$datemsg)=&check_access($id,$symb);
-
+
my $useslots = &Apache::lonnet::EXT("resource.0.useslots",$symb);
if ($useslots ne 'resource' && $useslots ne 'map'
&& $useslots ne 'map_map') {
@@ -228,16 +243,19 @@ sub check_slot_access {
$checkin = "resource.$version.0.checkedin";
}
my $checkedin = $Apache::lonhomework::history{$checkin};
- my ($returned_slot,$slot_name,$checkinslot,$ipused,$blockip,$now,$ip);
+ my ($returned_slot,$slot_name,$checkinslot,$ipused,$blockip,$now,$ip,
+ $consumed_uniq);
$now = time;
- $ip=$env{'request.host'} || $ENV{'REMOTE_ADDR'};
+ $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)) {
+ unless (($ip ne '') &&
+ (($ipused eq $ip) || ($ENV{'REMOTE_ADDR'} eq '127.0.0.1'))) {
$blockip = $slot{'iptied'};
$slot_name = $checkinslot;
$returned_slot = \%slot;
@@ -251,7 +269,7 @@ sub check_slot_access {
} else {
return ($status,$datemsg);
}
- }
+ }
if ($status eq 'CLOSED' ||
$status eq 'INVALID_ACCESS' ||
@@ -261,7 +279,7 @@ sub check_slot_access {
if ($env{'request.state'} eq "construct") {
return ($status,$datemsg);
}
-
+
if ($type eq 'Task') {
if ($checkedin &&
$Apache::lonhomework::history{"resource.$version.0.status"} eq 'pass') {
@@ -271,6 +289,12 @@ sub check_slot_access {
return ('SHOW_ANSWER');
}
}
+ } elsif (($type eq 'problem') &&
+ ($Apache::lonhomework::browse eq 'F') &&
+ ($ENV{'REMOTE_ADDR'} eq '127.0.0.1') &&
+ ($env{'form.grade_courseid'} eq $env{'request.course.id'}) &&
+ (&Apache::lonnet::allowed('mgr',$env{'request.course.id'}))) {
+ return ($status,$datemsg);
}
my $availablestudent = &Apache::lonnet::EXT("resource.0.availablestudent",$symb);
@@ -348,10 +372,49 @@ sub check_slot_access {
$is_correct =
($Apache::lonhomework::history{"resource.$version.0.status"} eq 'pass'
|| $Apache::lonhomework::history{"resource.0.solved"} =~ /^correct_/ );
- } elsif ($type eq 'problem') {
- $got_grade = 1;
- $is_correct =
- ($Apache::lonhomework::history{"resource.0.solved"} =~/^correct_/);
+ } elsif (($type eq 'problem') || ($type eq 'tool')) {
+ if ((ref($partlist) eq 'ARRAY') && (@{$partlist} > 0)) {
+ my ($numcorrect,$numgraded) = (0,0);
+ foreach my $part (@{$partlist}) {
+ my $currtries = $Apache::lonhomework::history{"resource.$part.tries"};
+ my $maxtries = &Apache::lonnet::EXT("resource.$part.maxtries",$symb);
+ 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)");
@@ -369,34 +432,12 @@ sub check_slot_access {
# 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 -
# (which will be one of: NOT_IN_A_SLOT, RESERVABLE, RESERVABLE_LATER, or NOTRESERVABLE).
- if (!defined($slot_name) && $type eq 'problem') {
+
+ if (!defined($slot_name) && (($type eq 'problem') || ($type eq 'tool'))) {
if ($slotstatus eq 'NOT_IN_A_SLOT') {
if (!$num_usable_slots) {
- 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) {
- $slotstatus = 'RESERVABLE';
- $datemsg = $reservable_now->{$reservable_now_order->[-1]}{'endreserve'};
- }
- }
- unless ($slotstatus eq 'RESERVABLE') {
- if ((ref($reservable_future_order) eq 'ARRAY') && (ref($reservable_future) eq 'HASH')) {
- if (@{$reservable_future_order} > 0) {
- $slotstatus = 'RESERVABLE_LATER';
- $datemsg = $reservable_future->{$reservable_future_order->[0]}{'startreserve'};
- }
- }
- }
- }
+ ($slotstatus,$datemsg) = &check_reservable_slot($slotstatus,$symb,$now,$checkedin,
+ $consumed_uniq);
}
}
return ($slotstatus,$datemsg);
@@ -418,7 +459,7 @@ sub check_slot_access {
}
if (($is_correct) && ($blockip ne 'answer')) {
- if ($type eq 'problem') {
+ if (($type eq 'problem') || ($type eq 'tool')) {
return ($status);
}
return ('SHOW_ANSWER');
@@ -432,6 +473,81 @@ sub check_slot_access {
return ($slotstatus,$datemsg,$slot_name,$returned_slot,$ipused);
}
+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
# in lonnavmaps::resource::getDateStatus.
sub check_access {
@@ -561,15 +677,16 @@ sub check_access {
if ($status eq 'CAN_ANSWER' || $status eq 'CANNOT_ANSWER') {
my @interval=&Apache::lonnet::EXT("resource.$id.interval",$symb);
&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);
&Apache::lonxml::debug("looking for accesstime $first_access");
if (!$first_access) {
$status='NOT_YET_VIEWED';
my $due_date = &due_date($id,$symb);
my $seconds_left = $due_date - time;
- if ($seconds_left > $interval[0] || $due_date eq '') {
- $seconds_left = $interval[0];
+ my ($timelimit) = ($interval[0] =~ /^(\d+)/);
+ if ($seconds_left > $timelimit || $due_date eq '') {
+ $seconds_left = $timelimit;
}
$datemsg=&seconds_to_human_length($seconds_left);
}
@@ -604,7 +721,8 @@ sub due_date {
my $first_access=&Apache::lonnet::get_first_access($interval[1],$symb);
&Apache::lonxml::debug("looking for first_access $first_access ($interval[1])");
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
: $due_date;
} else {
@@ -689,6 +807,9 @@ sub setuppermissions {
$env{'request.course.sec'} !~ /^\s*$/) {
$viewgrades = &Apache::lonnet::allowed('vgr',$env{'request.course.id'}.
'/'.$env{'request.course.sec'});
+ if ($viewgrades) {
+ $Apache::lonhomework::viewgradessec = $env{'request.course.sec'};
+ }
}
$Apache::lonhomework::viewgrades = $viewgrades;
@@ -706,6 +827,9 @@ sub setuppermissions {
$modifygrades =
&Apache::lonnet::allowed('mgr',$env{'request.course.id'}.
'/'.$env{'request.course.sec'});
+ if ($modifygrades) {
+ $Apache::lonhomework::modifygradessec = $env{'request.course.sec'};
+ }
}
$Apache::lonhomework::modifygrades = $modifygrades;
@@ -724,7 +848,9 @@ sub setuppermissions {
sub unset_permissions {
undef($Apache::lonhomework::queuegrade);
undef($Apache::lonhomework::modifygrades);
+ undef($Apache::lonhomework::modifygradessec);
undef($Apache::lonhomework::viewgrades);
+ undef($Apache::lonhomework::viewgradessec);
undef($Apache::lonhomework::browse);
}
@@ -823,11 +949,20 @@ STATE
sub analyze_header {
my ($request) = @_;
- my $js = &Apache::structuretags::setmode_javascript();
+ my $js = &Apache::lonxml::setmode_javascript();
# Breadcrumbs
- my $brcrum = [{'href' => &Apache::loncommon::authorspace($request->uri),
- 'text' => 'Authoring Space'},
+ my $text = 'Authoring 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' => '',
'text' => 'Problem Testing'},
{'href' => '',
@@ -839,18 +974,26 @@ sub analyze_header {
{'bread_crumbs' => $brcrum,})
.&Apache::loncommon::head_subbox(
&Apache::loncommon::CSTR_pageheader());
+ my %lt = &Apache::lonlocal::texthash(
+ edit => 'Edit',
+ editxml => 'EditXML',
+ );
$result .=
'<form name="lonhomework" method="post" action="'.
&HTML::Entities::encode($env{'request.uri'},'<>&"').'">'.
'<input type="hidden" name="problemmode" value="'.
$env{'form.problemmode'}.'" />'.
&Apache::structuretags::remember_problem_state().'
- <div class="LC_edit_problem_analyze_header">
- <input type="button" name="submitmode" value="'.&mt("EditXML").'" '.
- 'onclick="javascript:setmode(this.form,'."'editxml'".')" />
- <input type="button" name="submitmode" value="'.&mt('Edit').'" '.
- 'onclick="javascript:setmode(this.form,'."'edit'".')" />
- <hr />
+ <div class="LC_edit_problem_analyze_header">';
+ my %editors = &Apache::loncommon::permitted_editors();
+ foreach my $item ('editxml','edit') {
+ next unless ($editors{$item});
+ $result .= '<input type="button" name="submitmode" value="'.$lt{$item}.'" '.
+ 'onclick="javascript:setmode(this.form,'."'$item'".')" />'.
+ "\n";
+ }
+ $result .=
+ '<hr />
<input type="button" name="submitmode" value="'.&mt("View").'" '.
'onclick="javascript:setmode(this.form,'."'view'".')" />
<hr />
@@ -1055,12 +1198,21 @@ sub editxmlmode {
my $js =
&Apache::edit::js_change_detection().
&Apache::loncommon::resize_textarea_js().
- &Apache::structuretags::setmode_javascript().
+ &Apache::lonxml::setmode_javascript().
&Apache::lonhtmlcommon::dragmath_js("EditMathPopup");
# Breadcrumbs
- my $brcrum = [{'href' => &Apache::loncommon::authorspace($request->uri),
- 'text' => 'Authoring Space'},
+ my $text = 'Authoring 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' => '',
'text' => 'Problem Editing'}];
@@ -1093,29 +1245,30 @@ sub editxmlmode {
$result .= '<ol class="LC_primary_menu" style="display:inline-block;font-size:90%;vertical-align:middle;">';
- unless ($env{'environment.nocodemirror'}) {
+ my $nocodemirror = &Apache::loncommon::nocodemirror();
+ unless ($nocodemirror) {
# dropdown menus
- $result .= Apache::lonmenu::create_submenu("#", "",
+ $result .= Apache::lonmenu::create_submenu("#", "",
&mt("Problem Templates"), template_dropdown_datastructure());
- $result .= Apache::lonmenu::create_submenu("#", "",
+ $result .= Apache::lonmenu::create_submenu("#", "",
&mt("Response Types"), responseblock_dropdown_datastructure());
- $result .= Apache::lonmenu::create_submenu("#", "",
+ $result .= Apache::lonmenu::create_submenu("#", "",
&mt("Conditional Blocks"), conditional_scripting_datastructure());
- $result .= Apache::lonmenu::create_submenu("#", "",
+ $result .= Apache::lonmenu::create_submenu("#", "",
&mt("Miscellaneous"), misc_datastructure());
}
- $result .= Apache::lonmenu::create_submenu("#", "",
+ $result .= Apache::lonmenu::create_submenu("#", "",
&mt("Help") . ' <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(),"");
$result.="</ol></div>";
-
- $result .= '</div></div>' .
+
+ $result .= '</div></div>' .
&Apache::lonxml::message_location() .
&Apache::loncommon::xmleditor_js() .
'<textarea ' . &Apache::edit::element_change_detection() .
@@ -1125,7 +1278,7 @@ sub editxmlmode {
'</textarea> <div id="LC_aftertextarea"> </div> </form>';
my $resource = $env{'request.ambiguous'};
- unless($env{'environment.nocodemirror'}){
+ unless ($nocodemirror) {
$result .= '<link rel="stylesheet" href="/adm/codemirror/codemirror-combined-xml.css">
<script src="/adm/codemirror/codemirror-compressed-xml.js"></script>
<script>
@@ -1151,7 +1304,7 @@ sub editxmlmode {
autoCloseBrackets: true,
height: "auto",
styleActiveLine: true,
-
+
extraKeys: {
"Tab": "indentMore",
"Shift-Tab": "indentLess",
@@ -1172,7 +1325,7 @@ sub editxmlmode {
# Render the page in whatever target desired.
#
sub renderpage {
- my ($request,$file,$targets,$return_string,$donebuttonmsg) = @_;
+ my ($request,$file,$targets,$return_string,$donebuttonmsg,$viewasuser,$symb) = @_;
my @targets = @{$targets || [&get_target()]};
&Apache::lonhomework::showhashsubset(\%env,'form.');
@@ -1213,6 +1366,10 @@ sub renderpage {
if ($target eq 'answer') { &showhash(%Apache::lonhomework::history); }
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");
$result .= &Apache::lonxml::xmlparse($request, $target, $problem,
&setup_vars($target),%mystyle);
@@ -1238,15 +1395,23 @@ sub renderpage {
#}
# $request->print($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();
}
+ if (($target eq 'web') && ($viewasuser ne '') && ($symb ne '')) {
+ undef($env{'request.user_in_effect'});
+ }
#$request->print(":Result ends");
#my $td=&tv_interval($t0);
}
if (!$return_string) {
&Apache::lonxml::add_messages(\$overall_result);
$request->print($overall_result);
- $request->rflush();
+ $request->rflush();
} else {
return $overall_result;
}
@@ -1265,7 +1430,7 @@ sub finished_parsing {
# 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')),
@@ -1346,18 +1511,39 @@ sub get_template_html {
sub newproblem {
my ($request) = @_;
- if ($env{'form.mode'} eq 'blank'){
+ if ($env{'form.mode'} eq 'blank'){
my $dest = &Apache::lonnet::filelocation("",$request->uri);
- &File::Copy::copy('/home/httpd/html/res/adm/includes/templates/blank.problem',$dest);
+ my $templatefilename =
+ $request->dir_config('lonIncludes').'/templates/blank.problem';
+ &File::Copy::copy($templatefilename,$dest);
&renderpage($request,$dest);
return;
}
+ my $errormsg;
if ($env{'form.template'}) {
- my $file = $env{'form.template'};
- my $dest = &Apache::lonnet::filelocation("",$request->uri);
- &File::Copy::copy($file,$dest);
- &renderpage($request,$dest);
- return;
+ my $file;
+ my ($extension) = ($env{'form.template'} =~ /\.(\w+)$/);
+ if ($extension) {
+ my @files = &get_template_list($extension);
+ 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+)$/);
@@ -1374,10 +1560,18 @@ sub newproblem {
} else {
my $url=&HTML::Entities::encode($request->uri,'<>&"');
my $dest = &Apache::lonnet::filelocation("",$request->uri);
- my $errormsg;
my $instructions;
- my $brcrum = [{'href' => &Apache::loncommon::authorspace($request->uri),
- 'text' => 'Authoring Space'},
+ my $text = 'Authoring 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' => '',
'text' => "Create New $extension"}];
my $start_page =
@@ -1425,7 +1619,7 @@ 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
# in interval array retrieved from EXT("resource.0.interval");
#
@@ -1449,7 +1643,7 @@ sub zero_timer {
$key =~ s/\s+$//;
if ($env{'form.LC_interval_done_proctorpass'} ne $secret) {
return ('fail',
- &mt('Incorrect key entered by proctor'));
+ &mt('Incorrect key entered by proctor'));
}
}
if ($first_access+$timelimit > $now) {
@@ -1472,7 +1666,7 @@ sub zero_timer {
return ('ok');
} else {
return ('fail',&mt('Error ending timed event: [_1]',$result));
- }
+ }
} else {
return ('fail',&mt('Timed event already ended'));
}
@@ -1498,12 +1692,16 @@ sub handler {
$env{'request.uri'}=$request->uri;
&setuppermissions();
+# -------------------------------------- Flag and buffer for registered cleanup
+ $registered_cleanup=0;
+ undef(@Apache::lonhomework::ltipassback);
+
my $file=&Apache::lonnet::filelocation("",$request->uri);
#check if we know where we are
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 ($Apache::lonhomework::browse ne 'F' &&
+ if ($Apache::lonhomework::browse ne 'F' &&
$env{'request.state'} ne "construct") {
#should know where we are, so ask
&unset_permissions();
@@ -1532,7 +1730,13 @@ sub handler {
($env{'form.problemmode'} eq 'saveeditxml') ||
($env{'form.problemmode'} eq 'saveviewxml') ||
($env{'form.problemmode'} eq 'undoxml')) {
- &editxmlmode($request,$file);
+ 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') {
&analyze($request,$file);
} else {
@@ -1548,15 +1752,47 @@ sub handler {
} 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);
+ 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
&Apache::lonxml::debug("not construct");
- &renderpage($request,$file,undef,undef,$donemsg);
+ &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}]);
+ $registered_cleanup=1;
+ }
+ }
}
#my $td=&tv_interval($t0);
#&Apache::lonxml::debug("Spent $td seconds processing");
@@ -1702,16 +1938,15 @@ sub default_xml_tag {
sub helpmenu_datastructure {
- my $width = 500;
- my $height = 600;
-
+ # filename, title, width, height
my $helpers = [
- ['Problem_LON-CAPA_Functions', &mt('Script Functions')],
- ['Greek_Symbols', &mt('Greek Symbols')],
- ['Other_Symbols', &mt('Other Symbols')],
- ['Authoring_Output_Tags', &mt('Output Tags')],
- ['Authoring_Multilingual_Problems',
- &mt('How to create problems in different languages')]
+ ['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 = [];
@@ -1719,7 +1954,15 @@ sub helpmenu_datastructure {
foreach my $count (0..(scalar(@{$helpers})-1)) {
my $filename = $helpers->[$count]->[0];
my $title = $helpers->[$count]->[1];
- my $href = &HTML::Entities::encode("javascript:openMyModal('/adm/help/$filename.hlp',$width,$height,'yes');");
+ 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];
}
@@ -1737,5 +1980,212 @@ sub convert_for_js {
return $return;
}
+sub do_ltipassback {
+ if (@Apache::lonhomework::ltipassback) {
+ my $lonhost = $Apache::lonnet::perlvar{'lonHostID'};
+ my $ip = &Apache::lonnet::get_host_ip($lonhost);
+ foreach my $item (@Apache::lonhomework::ltipassback) {
+ &Apache::lonhomework::run_passback($item,$lonhost,$ip);
+ }
+ undef(@Apache::lonhomework::ltipassback);
+ }
+ return OK;
+}
+
+sub run_passback {
+ my ($item,$lonhost,$ip) = @_;
+ 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 $pbscope = $item->{'pbscope'};
+ my $map = $item->{'pbmap'};
+ my $symb = $item->{'pbsymb'};
+ my $uname = $item->{'uname'};
+ my $udom = $item->{'udom'};
+ my $uhome = $item->{'uhome'};
+ my $usec = $item->{'usec'};
+ my $keynum = $item->{'lti'}->{'cipher'};
+ my $crsdef = $item->{'crsdef'};
+ my $scoretype = $item->{'format'};
+ my $scope = $item->{'scope'};
+ my $clientip = $item->{'clientip'};
+ my ($total,$possible,%total_by_symb,%possible_by_symb);
+ if ((exists($item->{'total_s'})) && (ref($item->{'total_s'}) eq 'HASH')) {
+ %total_by_symb = %{$item->{'total_s'}};
+ if ($pbscope eq 'resource') {
+ if (exists($total_by_symb{$symb})) {
+ $total = $total_by_symb{$symb};
+ } else {
+ $total = $item->{'total'};
+ }
+ }
+ } elsif ($pbscope eq 'resource') {
+ $total = $item->{'total'};
+ }
+ if ((exists($item->{'possible_s'})) && (ref($item->{'possible_s'}) eq 'HASH')) {
+ %possible_by_symb = %{$item->{'possible_s'}};
+ if ($pbscope eq 'resource') {
+ if (exists($possible_by_symb{$symb})) {
+ $possible = $possible_by_symb{$symb};
+ } else {
+ $possible = $item->{'possible'};
+ }
+ }
+ } elsif ($pbscope eq 'resource') {
+ $possible = $item->{'possible'};
+ }
+ if (($pbscope eq 'map') || ($pbscope eq 'nonrec')) {
+ if ((keys(%total_by_symb)) && (keys(%possible_by_symb))) {
+ ($total,$possible) =
+ &get_lti_score($uname,$udom,$usec,$map,$pbscope,\%total_by_symb,\%possible_by_symb);
+ } else {
+ ($total,$possible) = &get_lti_score($uname,$udom,$usec,$map,$pbscope);
+ }
+ } elsif ($pbscope eq 'course') {
+ ($total,$possible) = &get_lti_score($uname,$udom,$usec);
+ }
+ $item->{'total'} = $total;
+ $item->{'possible'} = $possible;
+ if (($id ne '') && ($url ne '') && ($possible)) {
+ my ($sent,$score,$code,$result) =
+ &LONCAPA::ltiutils::send_grade($cdom,$cnum,$crsdef,$type,$ltinum,$keynum,$id,
+ $url,$scoretype,$sigmethod,$msgformat,$total,$possible);
+ $item->{'score'} = $score;
+ my ($linkprotector,$linkuri,$no_passback,$appname);
+ if ($item->{'linkprot'}) {
+ ($linkprotector,$linkuri) = split(/:/,$item->{'linkprot'});
+ }
+ if ($sent) {
+ if ($code == 200) {
+ if ($item->{'linkprot'}) {
+ my $skey = join("\0",($linkuri,$linkprotector,$scope));
+ my $namespace = $cdom.'_'.$cnum.'_lp_passback';
+ my $store = {
+ 'score' => $score,
+ 'ip' => $ip,
+ 'host' => $Apache::lonnet::perlvar{'lonHostID'},
+ 'protector' => $linkprotector,
+ 'deeplink' => $linkuri,
+ 'scope' => $scope,
+ 'url' => $url,
+ 'id' => $id,
+ 'clientip' => $clientip,
+ 'whodoneit' => $env{'user.name'}.':'.$env{'user.domain'},
+ };
+ my $value='';
+ foreach my $key (keys(%{$store})) {
+ $value.=&escape($key).'='.&Apache::lonnet::freeze_escape($store->{$key}).'&';
+ }
+ $value=~s/\&$//;
+ &Apache::lonnet::courselog(&escape($linkuri).':'.$uname.':'.$udom.':EXPORT:'.$value);
+ &Apache::lonnet::store_userdata({'score' => $score},$skey,$namespace,$udom,$uname,$ip);
+ }
+ } else {
+ if ($item->{'linkprot'}) {
+ $no_passback = "Passback response was $code ($result).";
+ }
+ }
+ } else {
+ if ($item->{'linkprot'}) {
+ $no_passback = 'No passback of scores.';
+ }
+ }
+ if ($no_passback) {
+ if ($item->{'linkprot'}) {
+ my ($ltinum,$ltitype) = ($linkprotector =~ /^(\d+)(c|d)$/);
+ if ($ltitype eq 'c') {
+ my %lti = &Apache::lonnet::get_course_lti($cnum,$cdom,'provider');
+ if (ref($lti{$ltinum}) eq 'HASH') {
+ $appname = $lti{$ltinum}{'name'};
+ }
+ } elsif ($ltitype eq 'd') {
+ my %lti = &Apache::lonnet::get_domain_lti($cdom,'linkprot');
+ if (ref($lti{$ltinum}) eq 'HASH') {
+ $appname = $lti{$ltinum}{'name'};
+ }
+ }
+ $no_passback .= " LTI launcher $linkprotector ($appname) for $linkuri (${cdom}_${cnum})";
+ &Apache::lonnet::logthis($no_passback." for $uname:$udom");
+ &Apache::lonnet::log($udom,$uname,$uhome,"$no_passback score=$score total=$total poss=$possible");
+ if ($item->{'linkprot'}) {
+ my $pendingkey = &Time::HiRes::time().':'.$uname.':'.$udom.':'.
+ "$linkuri\0$linkprotector\0$scope";
+ &Apache::lonnet::put('linkprot_passback_pending',{$pendingkey => $item},$cdom,$cnum);
+ }
+ }
+ }
+ }
+ }
+ }
+ return;
+}
+
+sub get_lti_score {
+ my ($uname,$udom,$usec,$mapurl,$pbscope,$totals,$possibles) = @_;
+ my $navmap = Apache::lonnavmaps::navmap->new($uname,$udom,$usec);
+ if (ref($navmap)) {
+ my $iterator;
+ if ($mapurl ne '') {
+ my $map = $navmap->getResourceByUrl($mapurl);
+ if (ref($map)) {
+ my $firstres = $map->map_start();
+ my $finishres = $map->map_finish();
+ my $recursive = 1;
+ if ($pbscope 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;
+ my (%totals_by_symb,%possibles_by_symb);
+ if (ref($totals) eq 'HASH') {
+ %totals_by_symb = %{$totals};
+ }
+ if (ref($possibles) eq 'HASH') {
+ %possibles_by_symb = %{$possibles};
+ }
+ $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 $currsymb = $curRes->symb();
+ if (($currsymb) && (exists($totals_by_symb{$currsymb})) &&
+ (exists($possibles_by_symb{$currsymb}))) {
+ $total += $totals_by_symb{$currsymb};
+ $possible += $possibles_by_symb{$currsymb};
+ } else {
+ 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;
__END__