--- loncom/interface/lonnavmaps.pm 2002/01/01 16:02:28 1.21 +++ loncom/interface/lonnavmaps.pm 2002/02/28 19:45:14 1.27 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Navigate Maps Handler # -# $Id: lonnavmaps.pm,v 1.21 2002/01/01 16:02:28 www Exp $ +# $Id: lonnavmaps.pm,v 1.27 2002/02/28 19:45:14 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -103,153 +103,162 @@ sub parmval { my ($mapname,$id,$fn)=split(/\_\_\_/,$symb); # ----------------------------------------------------- Cascading lookup scheme - my $rwhat=$what; - $what=~s/^parameter\_//; - $what=~s/\_/\./; - - my $symbparm=$symb.'.'.$what; - my $mapparm=$mapname.'___(all).'.$what; - my $usercourseprefix=$uname.'_'.$udom.'_'.$cid; - - my $seclevel= - $usercourseprefix.'.['. - $csec.'].'.$what; - my $seclevelr= - $usercourseprefix.'.['. - $csec.'].'.$symbparm; - my $seclevelm= - $usercourseprefix.'.['. - $csec.'].'.$mapparm; - - my $courselevel= - $usercourseprefix.'.'.$what; - my $courselevelr= - $usercourseprefix.'.'.$symbparm; - my $courselevelm= - $usercourseprefix.'.'.$mapparm; - -# ---------------------------------------------------------- fourth, check user - - if ($uname) { - - if ($useropt{$courselevelr}) { return $useropt{$courselevelr}; } - - if ($useropt{$courselevelm}) { return $useropt{$courselevelm}; } - - if ($useropt{$courselevel}) { return $useropt{$courselevel}; } - - } - -# --------------------------------------------------------- third, check course - - if ($csec) { - - if ($courseopt{$seclevelr}) { return $courseopt{$seclevelr}; } - - if ($courseopt{$seclevelm}) { return $courseopt{$seclevelm}; } + my $rwhat=$what; + $what=~s/^parameter\_//; + $what=~s/\_/\./; + + my $symbparm=$symb.'.'.$what; + my $mapparm=$mapname.'___(all).'.$what; + my $usercourseprefix=$uname.'_'.$udom.'_'.$cid; + + my $seclevel= $usercourseprefix.'.['.$csec.'].'.$what; + my $seclevelr=$usercourseprefix.'.['.$csec.'].'.$symbparm; + my $seclevelm=$usercourseprefix.'.['.$csec.'].'.$mapparm; + + my $courselevel= $usercourseprefix.'.'.$what; + my $courselevelr=$usercourseprefix.'.'.$symbparm; + my $courselevelm=$usercourseprefix.'.'.$mapparm; + +# ---------------------------------------------------------- first, check user + if ($uname) { + if ($useropt{$courselevelr}) { return $useropt{$courselevelr}; } + if ($useropt{$courselevelm}) { return $useropt{$courselevelm}; } + if ($useropt{$courselevel}) { return $useropt{$courselevel}; } + } +# ------------------------------------------------------- second, check course + if ($csec) { + if ($courseopt{$seclevelr}) { return $courseopt{$seclevelr}; } + if ($courseopt{$seclevelm}) { return $courseopt{$seclevelm}; } if ($courseopt{$seclevel}) { return $courseopt{$seclevel}; } - - } - - if ($courseopt{$courselevelr}) { return $courseopt{$courselevelr}; } - - if ($courseopt{$courselevelm}) { return $courseopt{$courselevelm}; } - - if ($courseopt{$courselevel}) { return $courseopt{$courselevel}; } - -# ----------------------------------------------------- second, check map parms - - my $thisparm=$parmhash{$symbparm}; - if ($thisparm) { return $thisparm; } - -# -------------------------------------------------------- first, check default + } - return &Apache::lonnet::metadata($fn,$rwhat.'.default'); - + if ($courseopt{$courselevelr}) { return $courseopt{$courselevelr}; } + if ($courseopt{$courselevelm}) { return $courseopt{$courselevelm}; } + if ($courseopt{$courselevel}) { return $courseopt{$courselevel}; } + +# ----------------------------------------------------- third, check map parms + + my $thisparm=$parmhash{$symbparm}; + if ($thisparm) { return $thisparm; } + +# ----------------------------------------------------- fourth , check default + + my $default=&Apache::lonnet::metadata($fn,$rwhat.'.default'); + if ($default) { return $default} + +# --------------------------------------------------- fifth , cascade up parts + + my ($space,@qualifier)=split(/\./,$rwhat); + my $qualifier=join('.',@qualifier); + unless ($space eq '0') { + my ($part,$id)=split(/\_/,$space); + if ($id) { + my $partgeneral=&parmval($part.".$qualifier",$symb); + if ($partgeneral) { return $partgeneral; } + } else { + my $resourcegeneral=&parmval("0.$qualifier",$symb); + if ($resourcegeneral) { return $resourcegeneral; } + } + } + return ''; } # ------------------------------------------------------------- Find out status - +# return codes +# tcode (timecode) +# 1: will open later +# 2: is open and not past due yet +# 3: is past due date +# 4: due in the next 24 hours +# +# code (curent solved status) +# 1: not attempted +# 2: attempted but wrong, or incorrect by instructor +# 3: solved or correct by instructor +# "excused" needs to be supported, but is not yet. Could be code=4. sub astatus { my $rid=shift; my $code=1; my $ctext=''; $rid=~/(\d+)\.(\d+)/; my $symb=&Apache::lonnet::declutter($hash{'map_id_'.$1}).'___'.$2.'___'. - &Apache::lonnet::declutter($hash{'src_'.$rid}); - + &Apache::lonnet::declutter($hash{'src_'.$rid}); my %duedate=(); my %opendate=(); my %answerdate=(); - map { + # need to always check part 0's open/due/answer status + foreach (sort(split(/\,/,&Apache::lonnet::metadata($hash{'src_'.$rid},'keys')))) { if ($_=~/^parameter\_(.*)\_opendate$/) { my $part=$1; $duedate{$part}=&parmval($part.'.duedate',$symb); $opendate{$part}=&parmval($part.'.opendate',$symb); $answerdate{$part}=&parmval($part.'.answerdate',$symb); } - } sort split(/\,/,&Apache::lonnet::metadata($hash{'src_'.$rid},'keys')); - + } my $now=time; my $tcode=0; my %returnhash=&Apache::lonnet::restore($symb); - map { - - my $duedate=$duedate{$_}; - my $opendate=$opendate{$_}; - my $answerdate=$answerdate{$_}; - my $preface=''; - unless ($_ eq '0') { $preface=' Part: '.$_.' '; } - if ($opendate) { - if ($now<$duedate) { - unless ($tcode==4) { $tcode=2; } - $ctext.=$preface.'Due: '.localtime($duedate); - if ($now<$opendate) { - unless ($tcode) { $tcode=1; } - $ctext.=$preface.'Open: '.localtime($opendate); - } - if ($duedate-$now<86400) { - $tcode=4; - $ctext.=$preface.'Due: '.localtime($duedate); - } - } else { - unless (($tcode==4) || ($tcode eq 2)) { $tcode=3; } - if ($now<$answerdate) { - $ctext.='Answer: '.localtime($duedate); - } + foreach (sort(keys(%opendate))) { + my $duedate=$duedate{$_}; + my $opendate=$opendate{$_}; + my $answerdate=$answerdate{$_}; + my $preface=''; + unless ($_ eq '0') { $preface=' Part: '.$_.' '; } + if ($opendate) { + if ($now<$duedate || (!$duedate)) { + unless ($tcode==4) { $tcode=2; } + if ($duedate) { + $ctext.=$preface.'Due: '.localtime($duedate); + } else { + $ctext.=$preface.'No Due Date'; + } + if ($now<$opendate) { + unless ($tcode) { $tcode=1; } + $ctext.=$preface.'Open: '.localtime($opendate); + } + if ($duedate && $duedate-$now<86400) { + $tcode=4; + $ctext.=$preface.'Due: '.localtime($duedate); + } + } else { + unless (($tcode==4) || ($tcode eq 2)) { $tcode=3; } + if ($now<$answerdate) { + $ctext.='Answer: '.localtime($duedate); + } + } + } else { + unless (($tcode==2) || ($tcode==4)) { $tcode=1; } + } + + my $status=$returnhash{'resource.'.$_.'.solved'}; + + if ($status eq 'correct_by_student') { + unless ($code==2) { $code=3; } + $ctext.=' solved'; + } elsif ($status eq 'correct_by_override') { + unless ($code==2) { $code=3; } + $ctext.=' override'; + } elsif ($status eq 'incorrect_attempted') { + $code=2; + $ctext.=' ('. + ($returnhash{'resource.'.$_.'.tries'}? + $returnhash{'resource.'.$_.'.tries'}:'0'); + my $numtries = &parmval($_.'.maxtries',$symb); + if ($numtries) { $ctext.='/'.$numtries.' tries'; } + $ctext.=')'; + } elsif ($status eq 'incorrect_by_override') { + $code=2; + $ctext.=' override'; + } elsif ($status eq 'excused') { + unless ($code==2) { $code=3; } + $ctext.=' excused'; + } } - } else { - unless (($tcode==2) || ($tcode==4)) { $tcode=1; } - } - - my $status=$returnhash{'resource.'.$_.'.solved'}; - - if ($status eq 'correct_by_student') { - unless ($code==2) { $code=3; } - $ctext.=' solved'; - } elsif ($status eq 'correct_by_override') { - unless ($code==2) { $code=3; } - $ctext.=' override'; - } elsif ($status eq 'incorrect_attempted') { - $code=2; - $ctext.=' ('. - ($returnhash{'resource.'.$_.'.tries'}? - $returnhash{'resource.'.$_.'.tries'}:'0').'/'. - &parmval($_.'.maxtries',$symb).' tries)'; - } elsif ($status eq 'incorrect_by_override') { - $code=2; - $ctext.=' override'; - } elsif ($status eq 'excused') { - unless ($code==2) { $code=3; } - $ctext.=' excused'; - } - - } sort keys %opendate; return 'p'.$code.$tcode.'"'.$ctext.'"'; } @@ -321,7 +330,7 @@ sub tracetable { if (defined($hash{'to_'.$rid})) { my $mincond=1; my $next=''; - map { + foreach (split(/\,/,$hash{'to_'.$rid})) { my $thiscond= &Apache::lonnet::directcondval($hash{'condid_'.$hash{'undercond_'.$_}}); if ($thiscond>=$mincond) { @@ -332,14 +341,14 @@ sub tracetable { } if ($thiscond>$mincond) { $mincond=$thiscond; } } - } split(/\,/,$hash{'to_'.$rid}); - map { + } + foreach (split(/\,/,$next)) { my ($linkid,$condval)=split(/\:/,$_); if ($condval>=$mincond) { my $now=&tracetable($sofar,$hash{'goesto_'.$linkid},$beenhere); if ($now>$further) { $further=$now; } } - } split(/\,/,$next); + } } } @@ -363,7 +372,6 @@ sub handler { $r->send_http_header; return OK; } - my $requrl=$r->uri; # ----------------------------------------------------------------- Tie db file if ($ENV{'request.course.fn'}) { @@ -404,11 +412,11 @@ sub handler { $courserdatas{$cid.'.last_cache'}=time; } } - map { + foreach (split(/\&/,$courserdatas{$cid})) { my ($name,$value)=split(/\=/,$_); $courseopt{$userprefix.&Apache::lonnet::unescape($name)}= &Apache::lonnet::unescape($value); - } split(/\&/,$courserdatas{$cid}); + } # --------------------------------------------------- Get userdata (if present) unless ((time-$userrdatas{$uname.'___'.$udom.'.last_cache'})<240) { @@ -419,11 +427,11 @@ sub handler { $userrdatas{$uname.'___'.$udom.'.last_cache'}=time; } } - map { + foreach (split(/\&/,$userrdatas{$uname.'___'.$udom})) { my ($name,$value)=split(/\=/,$_); $useropt{$userprefix.&Apache::lonnet::unescape($name)}= &Apache::lonnet::unescape($value); - } split(/\&/,$userrdatas{$uname.'___'.$udom}); + } } @rows=(); @@ -488,7 +496,36 @@ sub handler { 'discussiontimes', $ENV{'course.'.$ENV{'request.course.id'}.'.domain'}, $ENV{'course.'.$ENV{'request.course.id'}.'.num'}); - + + my %feedback=(); + my %error=(); + foreach my $msgid ( + split(/\&/,&Apache::lonnet::reply('keys:'. + $ENV{'user.domain'}.':'. + $ENV{'user.name'}.':nohist_email', + $ENV{'user.home'}))) { + $msgid=&Apache::lonnet::unescape($msgid); + my $plain=&Apache::lonnet::unescape( + &Apache::lonnet::unescape($msgid)); + if ($plain=~/(Error|Feedback) \[([^\]]+)\]/) { + my ($what,$url)=($1,$2); + my %status= + &Apache::lonnet::get('email_status',[$msgid]); + if ($status{$msgid}=~/^error\:/) { + $status{$msgid}=''; + } + + if (($status{$msgid} eq 'new') || + (!$status{$msgid})) { + if ($what eq 'Error') { + $error{$url}.=','.$msgid; + } else { + $feedback{$url}.=','.$msgid; + } + } + } + } +# ----------------------------------------------------------- Start Page Output $r->print( 'Navigate LON-CAPA Maps'); $r->print('Navigate Course Map'. "

$date

"); $r->rflush(); + $r->print( + ' New discussion since '. + localtime($lastcheck). + '
New message (click to open)

'); if (($currenturl=~/^\/res/) && ($currenturl!~/^\/res\/adm/)) { $r->print('Current Location

'); @@ -541,6 +582,7 @@ sub handler { $adde=''; } if ($rid=~/^p(\d)(\d)\"([\w\: \(\)\/\,]*)\"(.+)/) { + # sub astatus describes what code/tcode mean my $code=$1; my $tcode=$2; my $ctext=$3; @@ -556,8 +598,8 @@ sub handler { $add=''; } if ($tcode eq '4') { - $add=''; - $adde=''; + $add=''; + $adde=''; } } $hwk=''; @@ -580,14 +622,38 @@ sub handler { $adde= ' <'.$adde; } + my $src= + &Apache::lonnet::declutter($hash{'src_'.$rid}); $rid=~/^(\d+)\.(\d+)$/; - my $symb=&Apache::lonnet::declutter($hash{'map_id_'.$1}).'___'.$2.'___'. - &Apache::lonnet::declutter($hash{'src_'.$rid}); + my $symb= + &Apache::lonnet::declutter($hash{'map_id_'.$1}).'___'.$2.'___'.$src; if ($discussiontimes{$symb}>$lastcheck) { $adde= ''. $adde; } + if ($error{$src}) { + foreach (split(/\,/,$error{$src})) { + if ($_) { + $adde= + ' ' + .$adde; + } + } + } + if ($feedback{$src}) { + foreach (split(/\,/,$feedback{$src})) { + if ($_) { + $adde= + ' ' + .$adde; + } + } + } $r->print($add.''.$hwk. $hash{'title_'.$rid}.$hwke.''.$adde);