--- loncom/homework/lonhomework.pm 2006/05/12 01:20:44 1.245
+++ loncom/homework/lonhomework.pm 2006/12/13 22:48:07 1.263
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# The LON-CAPA Homework handler
#
-# $Id: lonhomework.pm,v 1.245 2006/05/12 01:20:44 albertel Exp $
+# $Id: lonhomework.pm,v 1.263 2006/12/13 22:48:07 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -161,6 +161,8 @@ sub proctor_checked_in {
my ($slot_name,$slot,$type)=@_;
my @possible_proctors=split(",",$slot->{'proctor'});
+ return 1 if (!@possible_proctors);
+
my $key;
if ($type eq 'Task') {
my $version=$Apache::lonhomework::history{'resource.0.version'};
@@ -168,9 +170,14 @@ sub proctor_checked_in {
} elsif ($type eq 'problem') {
$key ='resource.0.checkedin';
}
-
+ # backward compatability, used to be username@domain,
+ # now is username:domain
+ my $who = $Apache::lonhomework::history{$key};
+ if ($who !~ /:/) {
+ $who =~ tr/@/:/;
+ }
foreach my $possible (@possible_proctors) {
- if ($Apache::lonhomework::history{$key} eq $possible
+ if ($who eq $possible
&& $Apache::lonhomework::history{$key.'.slot'} eq $slot_name) {
return 1;
}
@@ -237,8 +244,9 @@ sub check_slot_access {
# does it pass normal muster
my ($status,$datemsg)=&check_access($id);
- my $useslots = &Apache::lonnet::EXT("resource.$id.useslots");
- if ($useslots ne 'resource' && $useslots ne 'map') {
+ my $useslots = &Apache::lonnet::EXT("resource.0.useslots");
+ if ($useslots ne 'resource' && $useslots ne 'map'
+ && $useslots ne 'map_map') {
return ($status,$datemsg);
}
@@ -261,8 +269,8 @@ sub check_slot_access {
}
my @slots=
- (split(':',&Apache::lonnet::EXT("resource.$id.availablestudent")),
- split(':',&Apache::lonnet::EXT("resource.$id.available")));
+ (split(':',&Apache::lonnet::EXT("resource.0.availablestudent")),
+ split(':',&Apache::lonnet::EXT("resource.0.available")));
# if (!@slots) {
# return ($status,$datemsg);
@@ -302,8 +310,10 @@ sub check_slot_access {
$checkedin =
$Apache::lonhomework::history{"resource.$version.0.checkedin"};
} elsif ($type eq 'problem') {
- $got_grade = 1;
- $checkedin = $Apache::lonhomework::history{"resource.0.checkedin"};
+ $got_grade = 1;
+ $checkedin = $Apache::lonhomework::history{"resource.0.checkedin"};
+ $is_correct =
+ ($Apache::lonhomework::history{"resource.0.solved"} =~/^correct_/);
}
&Apache::lonxml::debug(" slot is $slotstatus checkedin ($checkedin) got_grade ($got_grade) is_correct ($is_correct)");
@@ -316,6 +326,14 @@ sub check_slot_access {
return ('WAITING_FOR_GRADE');
}
+ # no slot is currently open, and has been checked in for this version
+ # previous slot is therefore CLOSED, so therefore the problem is
+ if (!defined($slot_name)
+ && $checkedin
+ && $type eq 'problem') {
+ return ('CLOSED',$datemsg);
+ }
+
if ($slotstatus eq 'NOT_IN_A_SLOT'
&& $checkedin ) {
@@ -326,9 +344,14 @@ sub check_slot_access {
}
}
+
if ( $is_correct) {
+ if ($type eq 'problem') {
+ return ($status);
+ }
return ('SHOW_ANSWER');
}
+
if ( $status eq 'CANNOT_ANSWER' &&
($slotstatus ne 'NEEDS_CHECKIN' && $slotstatus ne 'NOT_IN_A_SLOT')) {
return ($status,$datemsg);
@@ -370,7 +393,7 @@ sub check_access {
&Apache::lonxml::debug("checking for part :$id:");
&Apache::lonxml::debug("time:".time);
- my ($symb)=&Apache::lonxml::whichuser();
+ my ($symb)=&Apache::lonnet::whichuser();
&Apache::lonxml::debug("symb:".$symb);
#if ($env{'request.state'} ne "construct" && $symb ne '') {
if ($env{'request.state'} ne "construct") {
@@ -383,7 +406,12 @@ sub check_access {
foreach my $temp ("opendate","duedate","answerdate") {
$lastdate = $date;
- $date = &Apache::lonnet::EXT("resource.$id.$temp");
+ if ($temp eq 'duedate') {
+ $date = &due_date($id);
+ } else {
+ $date = &Apache::lonnet::EXT("resource.$id.$temp");
+ }
+
my $thistype = &Apache::lonnet::EXT("resource.$id.$temp.type");
if ($thistype =~ /^(con_lost|no_such_host)/ ||
$date =~ /^(con_lost|no_such_host)/) {
@@ -451,18 +479,16 @@ sub check_access {
&Apache::lonxml::debug("looking for accesstime $first_access");
if (!$first_access) {
$status='NOT_YET_VIEWED';
- $datemsg=&seconds_to_human_length($interval);
- } else {
- my $newdate=localtime($first_access+$interval);
- if (time > ($first_access+$interval)) {
- $status='CLOSED';
- $datemsg = &mt("was due on")." $newdate".&mt(", and answers will be available on")." $date";
- } else {
- $datemsg = &mt("is due at")." $newdate";
+ my $due_date = &due_date($id);
+ my $seconds_left = $due_date - time;
+ if ($seconds_left > $interval || $due_date eq '') {
+ $seconds_left = $interval;
}
+ $datemsg=&seconds_to_human_length($seconds_left);
}
}
}
+
#if (($status ne 'CLOSED') && ($Apache::lonhomework::type eq 'exam') &&
# (!$Apache::lonhomework::history{"resource.0.outtoken"})) {
# return ('UNCHECKEDOUT','needs to be checked out');
@@ -478,6 +504,30 @@ sub check_access {
return ($status,$datemsg);
}
+# this should work exactly like the copy in lonnavmaps.pm
+sub due_date {
+ my ($part_id,$symb,$udom,$uname)=@_;
+ my $date;
+ my $interval= &Apache::lonnet::EXT("resource.$part_id.interval",$symb,
+ $udom,$uname);
+ &Apache::lonxml::debug("looking for interval $part_id $symb $interval");
+ my $due_date= &Apache::lonnet::EXT("resource.$part_id.duedate",$symb,
+ $udom,$uname);
+ &Apache::lonxml::debug("looking for due_date $part_id $symb $due_date");
+ if ($interval =~ /\d+/) {
+ my $first_access=&Apache::lonnet::get_first_access('map',$symb);
+ &Apache::lonxml::debug("looking for first_access $first_access");
+ if (defined($first_access)) {
+ $interval = $first_access+$interval;
+ $date = ($interval < $due_date)? $interval : $due_date;
+ } else {
+ $date = $due_date;
+ }
+ } else {
+ $date = $due_date;
+ }
+ return $date
+}
sub seconds_to_human_length {
my ($length)=@_;
@@ -554,7 +604,7 @@ sub setuppermissions {
if ($Apache::lonhomework::browse eq 'F' &&
$env{'form.devalidatecourseresdata'} eq 'on') {
- my (undef,$courseid) = &Apache::lonxml::whichuser();
+ my (undef,$courseid) = &Apache::lonnet::whichuser();
&Apache::lonnet::devalidatecourseresdata($env{"course.$courseid.num"},
$env{"course.$courseid.domain"});
}
@@ -581,6 +631,13 @@ sub setuppermissions {
return '';
}
+sub unset_permissions {
+ undef($Apache::lonhomework::queuegrade);
+ undef($Apache::lonhomework::modifygrades);
+ undef($Apache::lonhomework::viewgrades);
+ undef($Apache::lonhomework::browse);
+}
+
sub setupheader {
my $request=$_[0];
&Apache::loncommon::content_type($request,'text/html');
@@ -600,9 +657,6 @@ sub handle_save_or_undo {
my $filebak =$file.".bak";
my $filetmp =$file.".tmp";
my $error=0;
-
- &Apache::lonnet::correct_line_ends($result);
-
if ($env{'form.Undo'} eq &mt('undo')) {
my $error=0;
if (!copy($file,$filetmp)) { $error=1; }
@@ -615,6 +669,7 @@ sub handle_save_or_undo {
$error=1;
}
} else {
+ &Apache::lonnet::correct_line_ends($result);
my $fs=Apache::File->new(">$filebak");
if (defined($fs)) {
print $fs $$problem;
@@ -698,13 +753,20 @@ sub analyze {
if ($analyze{$part.'.type'} eq 'numericalresponse' ||
$analyze{$part.'.type'} eq 'stringresponse' ||
$analyze{$part.'.type'} eq 'formularesponse' ) {
- my $concatanswer=join("\0",@{ $analyze{$part.'.answer'} });
- if (($concatanswer eq '') || ($concatanswer=~/^\@/)) {
- @{$analyze{$part.'.answer'}}=(''.&mt('Error').'');
+ foreach my $name (keys(%{ $analyze{$part.'.answer'} })) {
+ my $i=0;
+ foreach my $answer_part (@{ $analyze{$part.'.answer'}{$name} }) {
+ push( @{ $overall{$part.'.answer'}[$i] },
+ $answer_part);
+ my $concatanswer= join("\0",@{ $answer_part });
+ if (($concatanswer eq '') || ($concatanswer=~/^\@/)) {
+ $answer_part = [''.&mt('Error').''];
+ }
+ $seedexample{join("\0",$part,$i,@{$answer_part})}=
+ $thisseed;
+ $i++;
+ }
}
- push( @{ $overall{$part.'.answer'} },
- [@{ $analyze{$part.'.answer'} }]);
- $seedexample{join("\0",@{ $analyze{$part.'.answer'}})}=$thisseed;
}
}
}
@@ -713,21 +775,27 @@ sub analyze {
$request->print('
'.&mt('List of possible answers').': ');
foreach my $part (sort(keys(%allparts))) {
if (defined(@{ $overall{$part.'.answer'} })) {
- my $num_cols=scalar(@{ $overall{$part.'.answer'}->[0] });
- $request->print('| '.&mt('Part').' '.$part.' |
|---|
');
- my %frequency;
- foreach my $answer (sort {$a->[0] <=> $b->[0]} (@{ $overall{$part.'.answer'} })) {
- $frequency{join("\0",@{ $answer })}++;
- }
- $request->print('| '.&mt('Answer').' | '.&mt('Frequency').'
('
- .&mt('click for example').') |
|---|
');
- foreach my $answer (sort {(split("\0",$a))[0] <=> (split("\0",$b))[0]} (keys(%frequency))) {
- $request->print('| '.
- join(' | ',split("\0",$answer)).
- ' | '.$frequency{$answer}.
- ' |
');
+ for (my $i=0;$iprint('| '.&mt('Part').' '.$part);
+ if (scalar(@{ $overall{$part.'.answer'} }) > 1) {
+ $request->print(&mt(' Answer [_1]',$i+1));
+ }
+ $request->print(' |
|---|
');
+ my %frequency;
+ foreach my $answer (sort {$a->[0] <=> $b->[0]} (@{ $overall{$part.'.answer'}[$i] })) {
+ $frequency{join("\0",@{ $answer })}++;
+ }
+ $request->print('| '.&mt('Answer').' | '.&mt('Frequency').'
('
+ .&mt('click for example').') |
|---|
');
+ foreach my $answer (sort {(split("\0",$a))[0] <=> (split("\0",$b))[0]} (keys(%frequency))) {
+ $request->print('| '.
+ join(' | ',split("\0",$answer)).
+ ' | '.$frequency{$answer}.
+ ' |
');
+ }
+ $request->print('
');
}
- $request->print('
');
} else {
$request->print(''.&mt('Response').' '.$part.' '.
&mt('is not analyzable at this time').'
');
@@ -767,7 +835,7 @@ sub editxmlmode {
&Apache::loncommon::helpLatexCheatsheet("Problem_Editor_XML_Index",
"Problem Editing Help").
''.
- &Apache::loncommon::help_open_menu('',undef,undef,undef,5,'Authoring').
+ &Apache::loncommon::help_open_menu(undef,undef,5,'Authoring').
' | ';
if ($cols > 80) { $cols = 80; }
if ($cols < 70) { $cols = 70; }
@@ -828,9 +896,16 @@ sub renderpage {
my $problem=&Apache::lonnet::getfile($file);
my $result;
if ($problem eq -1) {
- my $filename=(split('/',$file))[-1];
- $result.=" ".&mt('Unable to find')." $filename";
$problem='';
+ my $filename=(split('/',$file))[-1];
+ my $error =
+ " ".&mt('Unable to find [_1]',
+ ' '.$filename.'')
+ ."";
+ $result.=
+ &Apache::loncommon::simple_error_page($request,'Not available',
+ $error);
+ return;
}
my %mystyle;
@@ -912,7 +987,7 @@ sub newproblem {
# I don't like hard-coded filenames but for now, this will work.
use File::Copy;
my $templatefilename =
- $request->dir_config('lonIncludes').'/templates/blank.problem';
+ $request->dir_config('lonIncludes').'/templates/blank.'.$extension;
&Apache::lonxml::debug("$templatefilename");
my $dest = &Apache::lonnet::filelocation("",$request->uri);
copy($templatefilename,$dest);
@@ -929,25 +1004,18 @@ sub newproblem {
my $instructions;
my $start_page =
&Apache::loncommon::start_page("Create New $extension");
- if ($templatelist) { $instructions=&mt(", select a template from the pull-down menu below.").'
'.&mt("Then");}
- my %lt=&Apache::lonlocal::texthash( 'create' => 'Creating a new',
- 'resource' => 'resource',
- 'requested' => 'The requested file',
- 'not exist' => 'currently does not exist',
- 'createnew' => 'To create a new',
- 'click' => 'click on the',
- 'Create' => 'Create',
- 'button' => 'button');
- $request->print(<print("
$start_page
-$lt{'create'} $extension $lt{'resource'}
+".&mt("Creating a new $extension resource.")."
$errormsg
-$lt{'requested'} $shownurl $lt{'not exist'}.
+".&mt("The requested file [_1] currently does not exist.",
+ "$shownurl")."
-$lt{'createnew'} $extension$instructions $lt{'click'} "$lt{'Create'} $extension" $lt{'button'}.
-
-