--- loncom/interface/lonevaluate.pm 2002/08/09 19:49:30 1.9 +++ loncom/interface/lonevaluate.pm 2005/02/17 08:50:20 1.16 @@ -1,7 +1,7 @@ # The LearningOnline Network # Evaluate # -# $Id: lonevaluate.pm,v 1.9 2002/08/09 19:49:30 albertel Exp $ +# $Id: lonevaluate.pm,v 1.16 2005/02/17 08:50:20 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -38,23 +38,27 @@ package Apache::lonevaluate; use strict; -use Apache::lonnet; +use Apache::lonnet(); use Apache::Constants qw(:common); +use Apache::loncommon(); +use Apache::lonenc(); sub handler { my $r = shift; - $r->content_type('text/html'); + &Apache::loncommon::content_type($r,'text/html'); $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'}//; - $feedurl=~s/^$ENV{'HTTP_HOST'}//; + my $feedurl=$ENV{'form.postdata'}; + $feedurl=~s/^http\:\/\///; + $feedurl=~s/^$ENV{'SERVER_NAME'}//; + $feedurl=~s/^$ENV{'HTTP_HOST'}//; - $feedurl=&Apache::lonnet::declutter($feedurl); - my $symb=&Apache::lonnet::symbread($feedurl); + $feedurl=&Apache::lonnet::declutter($feedurl); + + my $title=&Apache::lonnet::gettitle($feedurl); + my $showurl=&Apache::lonenc::check_encrypt($feedurl); my ($rdomain,$rauth)=($feedurl=~/^(\w+)\/(\w+)\//); @@ -75,6 +79,8 @@ sub handler { my $warning=''; + my $bodytag=&Apache::loncommon::bodytag('Evaluate Resource'); + if ($ENV{'form.submiteval'} eq 'true') { # ------------------------------------------------ User is submitting something my $complete=1; @@ -86,20 +92,24 @@ sub handler { } } if ($complete) { - $r->print(< + my $showurl=&Apache::lonenc::check_encrypt(&Apache::lonnet::clutter($feedurl)); + my $html=&Apache::lonxml::xmlbegin(); + $r->print(< Evaluation submitted - +$bodytag

Thank you for your input!

ENDHEADER $r->print('Storing feedback: '. @@ -108,7 +118,7 @@ ENDHEADER $r->print('
Logging first evaluation'); } $r->print( - ''); + ''); return OK; } else { $warning='Please fill out all fields below'; @@ -122,7 +132,8 @@ ENDHEADER foreach my $item (@items) { unless ($item eq 'comments') { - unless ($item eq 'timestamp') { + unless (($item eq 'timestamp') || + (!defined($currenteval{$prefix.$item}))) { $dialold.= 'document.evaluation.'.$item.'.selectedIndex='. $currenteval{$prefix.$item}.";\n"; @@ -131,7 +142,6 @@ ENDHEADER $oldcomments=$currenteval{$prefix.$item}; } } - # ------------------------------------------------------- Print out eval screen my $standardoptions=(<- @@ -141,20 +151,20 @@ ENDHEADER ENDOPTIONS - + + my $html=&Apache::lonxml::xmlbegin(); $r->print(< +$html The LearningOnline Network with CAPA - -

Evaluate Resource

-$feedurl

+$bodytag +$title

$warning

Please rank the following criteria:
- + The material appears to be correct