--- loncom/interface/lonevaluate.pm 2006/12/05 02:55:52 1.20
+++ 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.20 2006/12/05 02:55:52 albertel Exp $
+# $Id: lonevaluate.pm,v 1.31 2018/04/14 02:29:44 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -26,6 +26,8 @@
# http://www.lon-capa.org/
#
+
+
package Apache::lonevaluate;
use strict;
@@ -33,6 +35,7 @@ use Apache::lonnet;
use Apache::Constants qw(:common);
use Apache::loncommon();
use Apache::lonenc();
+use Apache::lonlocal;
use LONCAPA();
sub handler {
@@ -45,7 +48,7 @@ sub handler {
&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'}//;
@@ -73,6 +76,11 @@ sub handler {
my $warning='';
+ my $windowname = 'loncapaclient';
+ if ($env{'request.lti.login'}) {
+ $windowname .= 'lti';
+ }
+
if ($env{'form.submiteval'} eq 'true') {
# ------------------------------------------------ User is submitting something
my $complete=1;
@@ -85,34 +93,44 @@ sub handler {
}
if ($complete) {
my $showurl=&Apache::lonenc::check_encrypt(&Apache::lonnet::clutter($feedurl));
- my $js =<<ENDJS;
-<script type="text/javascript">
+ my $js = &Apache::lonhtmlcommon::scripttag(<<ENDJS);
function goback() {
- if ((window.name=='loncapaclient')) {
+ if ((window.name=='$windowname')) {
window.location='$showurl';
} else {
self.close();
}
}
-</script>
ENDJS
- my $start_page =
- &Apache::loncommon::start_page('Evaluate Resource',$js);
- $r->print(<<ENDHEADER);
-$start_page
-<h1>Thank you for your input!</h1>
-ENDHEADER
- $r->print('Storing feedback: '.
- &Apache::lonnet::put('nohist_resevaldata',\%currenteval,$rdomain,$rauth));
+ # 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 type="text/javascript">setTimeout("goback()",2000);</script>'.&Apache::loncommon::end_page());
+ $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!');
}
}
@@ -134,60 +152,115 @@ ENDHEADER
}
}
# ------------------------------------------------------- Print out eval screen
- my $standardoptions=(<<ENDOPTIONS);
+ 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">Strongly Disagree</option>
-<option value="2">Disagree</option>
-<option value="3">Neutral</option>
-<option value="4">Agree</option>
-<option value="5">Strongly Agree</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
-
- my $start_page = &Apache::loncommon::start_page('Evaluate Resource');
+
+ # 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();
- $r->print(<<ENDDOCUMENT);
-$start_page
-<tt>$title</tt><br /><br />
-<h3><font color="red">$warning</font></h3>
-Please rank the following criteria:
-<form method="post" name="evaluation" action="/adm/evaluate">
-<input type="hidden" name="submiteval" value="true" />
-<input type="hidden" name="postdata" value="$showurl" />
-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 type="text/javascript">$dialold</script>
-<br /><input type="submit" value="Submit Evaluation" />
-</form>
-$end_page
-ENDDOCUMENT
+
+ %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