--- loncom/interface/lonevaluate.pm 2002/08/26 12:47:28 1.10
+++ loncom/interface/lonevaluate.pm 2018/04/14 02:29:44 1.31
@@ -1,7 +1,7 @@
# The LearningOnline Network
# Evaluate
#
-# $Id: lonevaluate.pm,v 1.10 2002/08/26 12:47:28 www Exp $
+# $Id: lonevaluate.pm,v 1.31 2018/04/14 02:29:44 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -25,41 +25,41 @@
#
# http://www.lon-capa.org/
#
-# (Internal Server Error Handler
-#
-# (Login Screen
-# 5/21/99,5/22,5/25,5/26,5/31,6/2,6/10,7/12,7/14,
-# 1/14/00,5/29,5/30,6/1,6/29,7/1,11/9 Gerd Kortemeyer)
-#
-# 3/1/1 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;
+use Apache::loncommon();
+use Apache::lonenc();
+use Apache::lonlocal;
+use LONCAPA();
sub handler {
my $r = shift;
- $r->content_type('text/html');
+ &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/^$ENV{'SERVER_NAME'}//;
- $feedurl=~s/^$ENV{'HTTP_HOST'}//;
+ my $feedurl=$env{'form.postdata'};
+ $feedurl=~s/^https?\:\/\///;
+ $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 ($rdomain,$rauth)=($feedurl=~/^(\w+)\/(\w+)\//);
+ my $title=&Apache::lonnet::gettitle($feedurl);
+ my $showurl=&Apache::lonenc::check_encrypt($feedurl);
- my $prefix=$ENV{'user.name'}.'@'.$ENV{'user.domain'}.'___'.
+ my ($rdomain,$rauth)=($feedurl=~/^($LONCAPA::domain_re)\/($LONCAPA::username_re)\//);
+
+ my $prefix=$env{'user.name'}.'@'.$env{'user.domain'}.'___'.
$feedurl.'___';
my @items=('correct','helpful','depth','clear','technical','comments',
@@ -72,49 +72,65 @@ sub handler {
my $already=($currenteval{$prefix.'timestamp'} ne '');
- $ENV{'form.timestamp'}=time;
+ $env{'form.timestamp'}=time;
my $warning='';
- my $bodytag=&Apache::loncommon::bodytag('Evaluate Resource');
+ my $windowname = 'loncapaclient';
+ if ($env{'request.lti.login'}) {
+ $windowname .= 'lti';
+ }
- if ($ENV{'form.submiteval'} eq 'true') {
+ 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};
+ if ($env{'form.'.$item}) {
+ $currenteval{$prefix.$item}=$env{'form.'.$item};
} elsif ($item ne 'comments') {
$complete=0;
}
}
if ($complete) {
- $r->print(<<ENDHEADER);
-<html>
-<head>
-<title>Evaluation submitted</title>
-<script>
- function go() {
- if (window.name!='LONcatInfo') {
- window.location='/res/$feedurl';
+ my $showurl=&Apache::lonenc::check_encrypt(&Apache::lonnet::clutter($feedurl));
+ my $js = &Apache::lonhtmlcommon::scripttag(<<ENDJS);
+ function goback() {
+ if ((window.name=='$windowname')) {
+ window.location='$showurl';
+ } else {
+ self.close();
}
}
-</script>
-<meta http-equiv="pragma" content="no-cache"></meta>
-</head>
-$bodytag
-<h1>Thank you for your input!</h1>
-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
+ .'<p class="LC_success">'
+ .&mt('Saving feedback: [_1]'
+ ,&Apache::lonnet::put(
+ 'nohist_resevaldata',\%currenteval,$rdomain,$rauth))
+ .'</p>'
+ );
unless ($already) {
- $r->print('<br>Logging first evaluation');
+ $r->print('<p>'.&mt('Logging first evaluation').'</p>');
}
- $r->print(
- '<script>setTimeout("go()",2000);</script></body></html>');
+ $r->print('<p><b>'.&mt('Thank you for your input!').'</b></p>'
+ .&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 required fields below!');
}
}
@@ -125,7 +141,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";
@@ -134,65 +151,116 @@ ENDHEADER
$oldcomments=$currenteval{$prefix.$item};
}
}
-
# ------------------------------------------------------- Print out eval screen
- my $standardoptions=(<<ENDOPTIONS);
-<option value=0>-</option>
-<option value=1>Strongly Disagree</option>
-<option value=2>Disagree</option>
-<option value=3>Neutral</option>
-<option value=4>Agree</option>
-<option value=5>Strongly Agree</option>
+ my %lt=&Apache::lonlocal::texthash('a' => 'Strongly Disagree',
+ 'b' => 'Disagree',
+ 'c' => 'Neutral',
+ 'd' => 'Agree',
+ 'e' => 'Strongly Agree',);
+ my $standardoptions='';
+ $standardoptions = (<<ENDOPTIONS);
+<option value="0">-</option>
+<option value="1">$lt{'a'}</option>
+<option value="2">$lt{'b'}</option>
+<option value="3">$lt{'c'}</option>
+<option value="4">$lt{'d'}</option>
+<option value="5">$lt{'e'}</option>
ENDOPTIONS
- $r->print(<<ENDDOCUMENT);
-<html>
-<head>
-<title>The LearningOnline Network with CAPA</title>
-</head>
-$bodytag
-<tt>$feedurl</tt><p>
-<h3><font color="red">$warning</font></h3>
-Please rank the following criteria:
-<form method=post name=evaluation>
-<input type=hidden name=submiteval value=true>
-<input type=hidden name=postdata value="$feedurl">
-The material appears to be correct
-<br><select name=correct>
-$standardoptions
-</select>
-<hr>
-The material is helpful
-<br><select name=helpful>
-$standardoptions
-</select>
-<hr>
-The material is covered with sufficient depth
-<br><select name=depth>
-$standardoptions
-</select>
-<hr>
-The material is presented in a clear way
-<br><select name=clear>
-$standardoptions
-</select>
-<hr>
-The resource is technically correct
-(loads fast enough, does not produce errors, links work, etc)
-<br><select name=technical>
-$standardoptions
-</select>
-<hr>
-Any comments?
-<br><textarea name=comments cols=40 rows=5>$oldcomments</textarea>
-<script>$dialold</script>
-<br><input type=submit value="Submit Evaluation">
-</form>
-</body>
-</html>
-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:',
+ 'required' => '(All fields marked with * are required.)',
+ '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
+ .'<h2>'.$title.'</h2>');
+
+ if ($warning) {
+ $r->print(
+ &Apache::loncommon::confirmwrapper(
+ &Apache::lonhtmlcommon::confirm_success(
+ $warning,1)));
+ }
+ $r->print(
+ '<form method="post" name="evaluation" action="/adm/evaluate">'
+ .'<input type="hidden" name="submiteval" value="true" />'
+ .'<input type="hidden" name="postdata" value="'.$showurl.'" />'
+ );
+ $r->print(
+ &Apache::lonhtmlcommon::start_pick_box()
+ .&Apache::lonhtmlcommon::row_headline()
+ .$lt{'pleaserank'}.'<br />'
+ .'<span class="LC_info">'.$lt{'required'}.'</span>'
+ .&Apache::lonhtmlcommon::row_closure()
+ );
+
+ foreach my $key ('correct', 'helpful', 'depth', 'clear', 'technical') {
+ $r->print(
+ &Apache::lonhtmlcommon::row_title(
+ '<span title="'.&mt('required').'">'.$lt{$key}
+ .' <span class="LC_info">*</span></span>')
+ .'<select name="'.$key.'">'
+ .$standardoptions
+ .'</select>'
+ .&Apache::lonhtmlcommon::row_closure()
+ );
+ }
+
+ $r->print(
+ &Apache::lonhtmlcommon::row_title($lt{'comments'})
+ .'<textarea name="comments" cols="40" rows="5">'
+ .$oldcomments
+ .'</textarea>'
+ .&Apache::lonhtmlcommon::row_closure(1)
+ .&Apache::lonhtmlcommon::end_pick_box()
+ .'<p>'
+ .'<input type="submit" value="'.$lt{'submit'}.'" />'
+ .'</p>'
+ );
+
+ $r->print(
+ &Apache::lonhtmlcommon::scripttag($dialold)
+ .'</form>'
+ .$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