--- loncom/interface/lonevaluate.pm 2001/12/12 23:46:22 1.3 +++ loncom/interface/lonevaluate.pm 2003/07/05 10:07:11 1.12 @@ -1,7 +1,7 @@ # The LearningOnline Network # Evaluate # -# $Id: lonevaluate.pm,v 1.3 2001/12/12 23:46:22 www Exp $ +# $Id: lonevaluate.pm,v 1.12 2003/07/05 10:07:11 www Exp $ # # Copyright Michigan State University Board of Trustees # @@ -33,13 +33,14 @@ # # 3/1/1 Gerd Kortemeyer) # -# 3/1,12/6,12/12 Gerd Kortemeyer +# 3/1,12/6,12/12,12/21,12/22 Gerd Kortemeyer # package Apache::lonevaluate; use strict; use Apache::lonnet; use Apache::Constants qw(:common); +use Apache::loncommon; sub handler { my $r = shift; @@ -47,6 +48,7 @@ sub handler { $r->send_http_header; return OK if $r->header_only; + &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},['postdata']); my $feedurl=$ENV{'form.postdata'}; $feedurl=~s/^http\:\/\///; $feedurl=~s/^$ENV{'SERVER_NAME'}//; @@ -57,16 +59,85 @@ sub handler { my ($rdomain,$rauth)=($feedurl=~/^(\w+)\/(\w+)\//); - my $prefix=$ENV{'user.name.'}.'@'.$ENV{'user.domain'}.'___'. + my $prefix=$ENV{'user.name'}.'@'.$ENV{'user.domain'}.'___'. $feedurl.'___'; - my @items=('correct','helpful','depth','clear','technical','comments'); + my @items=('correct','helpful','depth','clear','technical','comments', + 'timestamp'); my @retrieve=map{ $prefix.$_ } @items; + my %currenteval= + &Apache::lonnet::get('nohist_resevaldata',\@retrieve,$rdomain,$rauth); + + my $already=($currenteval{$prefix.'timestamp'} ne ''); + + $ENV{'form.timestamp'}=time; + + my $warning=''; + + my $bodytag=&Apache::loncommon::bodytag('Evaluate Resource'); + if ($ENV{'form.submiteval'} eq 'true') { # ------------------------------------------------ User is submitting something + my $complete=1; + foreach my $item (@items) { + if ($ENV{'form.'.$item}) { + $currenteval{$prefix.$item}=$ENV{'form.'.$item}; + } elsif ($item ne 'comments') { + $complete=0; + } + } + if ($complete) { + $r->print(< + +Evaluation submitted + + + +$bodytag +

Thank you for your input!

+ENDHEADER + $r->print('Storing feedback: '. + &Apache::lonnet::put('nohist_resevaldata',\%currenteval,$rdomain,$rauth)); + unless ($already) { + $r->print('
Logging first evaluation'); + } + $r->print( + ''); + return OK; + } else { + $warning='Please fill out all fields below'; + } + } + +# ---------------------------------------------------------- Dial in old values + my $dialold=''; + my $oldcomments=''; + + foreach my $item (@items) { + unless ($item eq 'comments') { + unless (($item eq 'timestamp') || + (!defined($currenteval{$prefix.$item}))) { + $dialold.= + 'document.evaluation.'.$item.'.selectedIndex='. + $currenteval{$prefix.$item}.";\n"; + } + } else { + $oldcomments=$currenteval{$prefix.$item}; + } + } + # ------------------------------------------------------- Print out eval screen my $standardoptions=(<- @@ -77,19 +148,16 @@ sub handler { ENDOPTIONS - my $dialold=''; - my $oldcomments=''; - $r->print(< The LearningOnline Network with CAPA - -

Evaluate Resource

+$bodytag $feedurl

+

$warning

Please rank the following criteria: -
+ The material appears to be correct @@ -120,7 +188,8 @@ $standardoptions
Any comments?
-$dialold + +