--- loncom/interface/lonevaluate.pm 2006/03/02 21:11:00 1.18 +++ loncom/interface/lonevaluate.pm 2007/11/22 15:12:31 1.22 @@ -1,7 +1,7 @@ # The LearningOnline Network # Evaluate # -# $Id: lonevaluate.pm,v 1.18 2006/03/02 21:11:00 albertel Exp $ +# $Id: lonevaluate.pm,v 1.22 2007/11/22 15:12:31 bisitz Exp $ # # Copyright Michigan State University Board of Trustees # @@ -33,10 +33,14 @@ use Apache::lonnet; use Apache::Constants qw(:common); use Apache::loncommon(); use Apache::lonenc(); +use Apache::lonlocal; # must not have () +use LONCAPA(); sub handler { my $r = shift; &Apache::loncommon::content_type($r,'text/html'); + &Apache::loncommon::no_cache($r); + $r->send_http_header; return OK if $r->header_only; @@ -51,7 +55,7 @@ sub handler { my $title=&Apache::lonnet::gettitle($feedurl); my $showurl=&Apache::lonenc::check_encrypt($feedurl); - my ($rdomain,$rauth)=($feedurl=~/^(\w+)\/(\w+)\//); + my ($rdomain,$rauth)=($feedurl=~/^($LONCAPA::domain_re)\/($LONCAPA::username_re)\//); my $prefix=$env{'user.name'}.'@'.$env{'user.domain'}.'___'. $feedurl.'___'; @@ -70,8 +74,6 @@ sub handler { my $warning=''; - my $bodytag=&Apache::loncommon::bodytag('Evaluate Resource'); - if ($env{'form.submiteval'} eq 'true') { # ------------------------------------------------ User is submitting something my $complete=1; @@ -84,11 +86,7 @@ sub handler { } if ($complete) { my $showurl=&Apache::lonenc::check_encrypt(&Apache::lonnet::clutter($feedurl)); - my $html=&Apache::lonxml::xmlbegin(); - $r->print(< -Evaluation submitted + my $js =< function goback() { if ((window.name=='loncapaclient')) { @@ -98,18 +96,21 @@ $html } } - - -$bodytag +ENDJS + + my $start_page = + &Apache::loncommon::start_page('Evaluate Resource',$js); + $r->print(<Thank you for your input! ENDHEADER - $r->print('Storing feedback: '. + $r->print('Saving feedback: '. &Apache::lonnet::put('nohist_resevaldata',\%currenteval,$rdomain,$rauth)); unless ($already) { $r->print('
Logging first evaluation'); } $r->print( - ''); + ''.&Apache::loncommon::end_page()); return OK; } else { $warning='Please fill out all fields below'; @@ -134,61 +135,71 @@ ENDHEADER } } # ------------------------------------------------------- Print out eval screen - my $standardoptions=(< 'Strongly Disagree', 'b' => 'Disagree' + , 'c' => 'Neutral', 'd' => 'Agree', 'e' => 'Strongly Agree'); + my $standardoptions=''; + $standardoptions = (<- - - - - - + + + + + ENDOPTIONS - - my $html=&Apache::lonxml::xmlbegin(); + + my $start_page = &Apache::loncommon::start_page('Evaluate Resource'); + my $end_page = &Apache::loncommon::end_page(); + + %lt=&Apache::lonlocal::texthash( + 'pleaserank' => 'Please rank the following criteria:' + , 'correct' => 'The material appears to be correct' + , 'helpful' => 'The material is helpful' + , 'depth' => 'The material is covered with sufficient depth' + , 'clear' => 'The material is presented in a clear way' + , 'technical' => 'The resource is technically correct (loads fast enough, does not produce errors, links work, etc)' + , 'comments' => 'Any comments?' + , 'submit' => 'Submit Evaluation' + ); $r->print(< -The LearningOnline Network with CAPA - -$bodytag -$title

+$start_page +

$title



$warning

-Please rank the following criteria: +$lt{'pleaserank'}
-The material appears to be correct +
+$lt{'correct'}
-The material is helpful +$lt{'helpful'}
-The material is covered with sufficient depth +$lt{'depth'}
-The material is presented in a clear way +$lt{'clear'}
-The resource is technically correct -(loads fast enough, does not produce errors, links work, etc) +$lt{'technical'}
-Any comments? +$lt{'comments'}
-
+
- - +$end_page ENDDOCUMENT return OK; }