--- loncom/interface/lonevaluate.pm 2006/03/02 21:11:00 1.18 +++ loncom/interface/lonevaluate.pm 2009/09/04 16:12:09 1.29 @@ -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.29 2009/09/04 16:12:09 bisitz Exp $ # # Copyright Michigan State University Board of Trustees # @@ -26,6 +26,8 @@ # http://www.lon-capa.org/ # + + package Apache::lonevaluate; use strict; @@ -33,16 +35,20 @@ use Apache::lonnet; use Apache::Constants qw(:common); use Apache::loncommon(); use Apache::lonenc(); +use Apache::lonlocal; +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; &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},['postdata']); my $feedurl=$env{'form.postdata'}; - $feedurl=~s/^http\:\/\///; + $feedurl=~s/^https?\:\/\///; $feedurl=~s/^$ENV{'SERVER_NAME'}//; $feedurl=~s/^$ENV{'HTTP_HOST'}//; @@ -51,7 +57,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 +76,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,35 +88,44 @@ sub handler { } if ($complete) { 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: '. - &Apache::lonnet::put('nohist_resevaldata',\%currenteval,$rdomain,$rauth)); +ENDJS + + # Breadcrumbs + my $brcrum = [{'href' => '/adm/evaluate', + 'text' => 'Evaluate Resource'}, + {'href' => '', + 'text' => 'Done'}]; + + my $start_page = &Apache::loncommon::start_page('Evaluate Resource', + $js, + {'bread_crumbs' => $brcrum,}); + + $r->print($start_page + .'

' + .&mt('Saving feedback: [_1]' + ,&Apache::lonnet::put( + 'nohist_resevaldata',\%currenteval,$rdomain,$rauth)) + .'

' + ); unless ($already) { - $r->print('
Logging first evaluation'); + $r->print('

'.&mt('Logging first evaluation').'

'); } - $r->print( - ''); + $r->print('

'.&mt('Thank you for your input!').'

' + .&Apache::lonhtmlcommon::scripttag( + 'setTimeout("goback()",2000);') + .&Apache::loncommon::end_page() + ); return OK; } else { - $warning='Please fill out all fields below'; + $warning=&mt('Please fill out all fields below.'); } } @@ -134,64 +147,104 @@ 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(); - $r->print(< -The LearningOnline Network with CAPA - -$bodytag -$title

-

$warning

-Please rank the following criteria: -
- - -The material appears to be correct -
-
-The material is helpful -
-
-The material is covered with sufficient depth -
-
-The material is presented in a clear way -
-
-The resource is technically correct -(loads fast enough, does not produce errors, links work, etc) -
-
-Any comments? -
- -
-
- - -ENDDOCUMENT + + # Breadcrumbs + my $brcrum = [{'href' => '/adm/evaluate', + 'text' => 'Evaluate Resource'}]; + + my $start_page = &Apache::loncommon::start_page('Evaluate Resource', + undef, + {'bread_crumbs' => $brcrum,}); + 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' => 'Comments', + 'submit' => 'Submit Evaluation', + ); + $r->print( + $start_page + .'

'.$title.'

' + .'

'.$warning.'

' + .'
' + .'' + .'' + ); + $r->print( + &Apache::lonhtmlcommon::start_pick_box() + .&Apache::lonhtmlcommon::row_headline() + .$lt{'pleaserank'} + .&Apache::lonhtmlcommon::row_closure() + ); + + foreach my $key ('correct', 'helpful', 'depth', 'clear', 'technical') { + $r->print( + &Apache::lonhtmlcommon::row_title($lt{$key}) + .'' + .&Apache::lonhtmlcommon::row_closure() + ); + } + + $r->print( + &Apache::lonhtmlcommon::row_title($lt{'comments'}) + .'' + .&Apache::lonhtmlcommon::row_closure(1) + .&Apache::lonhtmlcommon::end_pick_box() + .'

' + .'' + .'

' + ); + + $r->print( + &Apache::lonhtmlcommon::scripttag($dialold) + .'
' + .$end_page + ); + return OK; } 1; __END__ + +=pod + +=head1 NAME + +Apache::lonevaluate.pm + +=head1 SYNOPSIS + +Handles evaluation. + +This is part of the LearningOnline Network with CAPA project +described at http://www.lon-capa.org. + +=head1 OVERVIEW + +None + +=cut