--- loncom/homework/bridgetask.pm 2006/02/20 22:57:41 1.112
+++ loncom/homework/bridgetask.pm 2006/03/29 04:53:42 1.127
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# definition of tags that give a structure to a document
#
-# $Id: bridgetask.pm,v 1.112 2006/02/20 22:57:41 albertel Exp $
+# $Id: bridgetask.pm,v 1.127 2006/03/29 04:53:42 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -155,7 +155,7 @@ sub add_previous_version_button {
join("</option>\n<option>",@to_show).
"</option>\n";
$list.='<option value="current">'.&mt('Current').'</option>';
- $result.='<form name="getprevious" method="POST" action="';
+ $result.='<form name="getprevious" method="post" action="';
my $uri=$env{'request.uri'};
if ($env{'request.enc'}) { $uri=&Apache::lonenc::encrypted($uri); }
$result.=$uri.'">'.
@@ -176,10 +176,10 @@ sub add_grading_button {
if (scalar(keys(%sections)) < 3) {
$size=scalar(keys(%sections))+2;
}
- my $sec_select = '<select multiple name="chosensections" size="'.$size.'">'."\n";
+ my $sec_select = '<select multiple="multiple" name="chosensections" size="'.$size.'">'."\n";
$sec_select .= "<option value='all' selected='selected'>all</option>\n";
foreach my $sec (sort {lc($a) cmp lc($b)} (keys(%sections))) {
- $sec_select .= "<option name=\"$sec\">$sec</option>\n";
+ $sec_select .= "<option value=\"$sec\">$sec</option>\n";
}
$sec_select .= "<option value='none'>none</option></select>\n";
@@ -213,6 +213,7 @@ sub add_grading_button {
'gradinguser',
'gradingdomain');
$result.=&Apache::loncommon::studentbrowser_javascript();
+ $result.= '</p>';
}
return $result;
}
@@ -236,7 +237,7 @@ STUFF
if ($env{'request.enc'}) { $symb=&Apache::lonenc::encrypted($symb); }
$symb=&Apache::lonnet::escape($symb);
- $result.='<form method="POST" action="/adm/slotrequest">'.
+ $result.='<form method="post" action="/adm/slotrequest">'.
'<input type="hidden" name="symb" value="'.$symb.'" />'.
'<input type="hidden" name="command" value="'.$action.'" />'.
'<input type="submit" name="requestattempt" value="'.
@@ -258,64 +259,14 @@ sub preserve_grade_info {
}
sub style {
- return (<<STYLE);
-<style type="text/css">
-.fail, .pass, .neutral {
- position: relative;
- margin : 5px;
- margin-bottom :10px;
- padding : 4px;
- padding-left : 75px;
- border : thin solid;
- font-weight : bolder;
- font-size: smaller;
- font-family: Arial;
- background-color : rgb(255,240,225);
-}
-
-.fail h4, .pass h4 {
- position:absolute;
- left: -4px;
- top: -8px;
- padding:2px;
- margin:0;
- background-color : rgb(255,240,225);
- border : thin solid;
-}
-
-.fail {
- color: red;
-}
-
-.pass {
- color : green;
-}
-
-.neutral {
- color : blue;
-}
-
-.question {
- border : thin solid black;
- padding : 4px;
- margin-bottom : 1em;
-}
-
-.grade {
- font-size: x-large;
- font-family: Arial;
- position:absolute;
- left: 5px;
- top: -5px;
- width: 70px;
-}
-
-div#feedback h1 {
- color : inherit;
-}
-</style>
+ my ($target) = @_;
+ if ($target eq 'web'
+ || $target eq 'webgrade') {
+ return (<<STYLE);
+<link rel="stylesheet" type="text/css" href="/res/adm/includes/task.css" />
STYLE
-
+ }
+ return;
}
sub show_task {
@@ -371,12 +322,15 @@ sub submission_time_stamp {
return $result;
}
-sub webgrade_standard_info {
- my ($version)=&get_version();
- my (undef,undef,$udom,$uname) = &Apache::lonxml::whichuser();
+sub file_list {
+ my ($files,$uname,$udom) = @_;
+ if (!defined($uname) || !defined($udom)) {
+ (undef,undef,$udom,$uname) = &Apache::lonxml::whichuser();
+ }
my $file_url = '/uploaded/'.$udom.'/'.$uname.'/portfolio/';
- my $file_list="<ul class=\"handininfo\">\n";
- foreach my $partial_file (split(',',$Apache::lonhomework::history{"resource.$version.0.bridgetask.portfiles"})) {
+
+ my $file_list="<ul class=\"LC_GRADING_handininfo\">\n";
+ foreach my $partial_file (split(',',$files)) {
my $file=$file_url.$partial_file;
$file=~s|/+|/|g;
&Apache::lonnet::allowuploaded('/adm/bridgetask',$file);
@@ -385,13 +339,20 @@ sub webgrade_standard_info {
'</a></nobr></li>'."\n";
}
$file_list.="</ul>\n";
+ return $file_list;
+}
+
+sub webgrade_standard_info {
+ my ($version)=&get_version();
+
+ my $file_list = &file_list($Apache::lonhomework::history{"resource.$version.0.bridgetask.portfiles"});
- my %lt=&Apache::lonlocal::texthash('done' => 'Done',
- 'stop' => 'Stop',
+ my %lt=&Apache::lonlocal::texthash('done' => 'Next Item',
+ 'stop' => 'Quit Grading',
);
my $result=<<INFO;
- <div class="maincontrols">
+ <div class="LC_GRADING_maincontrols">
<input type="submit" name="next" value="$lt{'done'}" />
<input type="submit" name="stop" value="$lt{'stop'}" />
</div>
@@ -418,15 +379,24 @@ sub start_Task {
my ($result,$head_tag_start,$body_tag_start,$form_tag_start)=
&Apache::structuretags::page_start($target,$token,$tagstack,$parstack,$parser,$safeeval);
+ $head_tag_start .= &style($target);
+ $body_tag_start .= '<div class="LC_task">'."\n";
+
+ if ($target eq 'web' || $target eq 'webgrade') {
+ $head_tag_start.='<title>'.
+ &Apache::structuretags::get_resource_name($parstack,$safeeval).
+ '</title>';
+ }
+
if ($target eq 'web' && $env{'request.state'} ne 'construct') {
if ($Apache::lonhomework::modifygrades) {
- $body_tag_start.='<form name="gradesubmission" method="POST" action="';
+ $body_tag_start.='<form name="gradesubmission" method="post" action="';
my $uri=$env{'request.uri'};
if ($env{'request.enc'}) { $uri=&Apache::lonenc::encrypted($uri); }
$body_tag_start.=$uri.'">'.&add_grading_button()."</form>";
my $symb=&Apache::lonnet::symbread();
if (&Apache::lonnet::allowed('mgq',$env{'request.course.id'})) {
- $body_tag_start.='<form method="POST" name="slotrequest" action="/adm/slotrequest">'.
+ $body_tag_start.='<form method="post" name="slotrequest" action="/adm/slotrequest">'.
'<input type="hidden" name="symb" value="'.$symb.'" />'.
'<input type="hidden" name="command" value="showslots" />'.
'<input type="submit" name="requestattempt" value="'.
@@ -435,7 +405,7 @@ sub start_Task {
my $target_id =
&Apache::lonstathelpers::make_target_id({symb => $symb,
part => '0'});
- $body_tag_start.='<form method="POST" name="gradingstatus" action="/adm/statistics">'.
+ $body_tag_start.='<form method="post" name="gradingstatus" action="/adm/statistics">'.
'<input type="hidden" name="problemchoice" value="'.$target_id.'" />'.
'<input type="hidden" name="reportSelected" value="grading_analysis" />'.
'<input type="submit" name="grading" value="'.
@@ -480,7 +450,20 @@ sub start_Task {
} elsif ($env{'form.donescreen'}) {
my $title=&Apache::lonnet::gettitle();
my @files=split(',',$Apache::lonhomework::history{'resource.'.$version.'.0.bridgetask.portfiles'});
- my $files='<ul><li>'.join('</li><li>',@files).'</li></ul>';
+ my (undef,undef,$domain,$user)=
+ &Apache::lonxml::whichuser();
+ my $files = '<ul>';
+ foreach my $file (@files) {
+ my $url="/uploaded/$domain/$user/portfolio$file";
+ if (! &Apache::lonnet::stat_file($url)) {
+ $file = &mt('<font color="red"> Nonexistant file:</font> <tt>[_1]</tt>',$file);
+ } else {
+ $file = '<tt>'.$file.'</tt>';
+ }
+ $files .= '<li>'.$file.'</li>';
+ }
+ $files.='</ul>';
+
$result.=<<DONESCREEN;
<h2>$title</h2>
<p> Files submitted: $files </p>
@@ -514,9 +497,8 @@ DONESCREEN
}
}
} elsif ($target eq 'web') {
- my $name= &Apache::structuretags::get_resource_name($parstack,$safeeval);
- $result.="$head_tag_start<title>$name</title></head>
- $body_tag_start \n".&style();
+ $result.="$head_tag_start</head>
+ $body_tag_start \n";
$result.=&preserve_grade_info();
$result.=&internal_location();
@@ -528,7 +510,11 @@ DONESCREEN
$target eq 'webgrade') {
my $webgrade='yes';
if ($target eq 'webgrade') {
- $result.=$head_tag_start.'</head>'.$body_tag_start;
+ $result.=$head_tag_start.
+ '</head>'.$body_tag_start.
+ "\n".'<div class="LC_GRADING_task">'."\n".
+ '<script type="text/javascript"
+ src="/res/adm/includes/task_grading.js"></script>';
#$result.='<br />Review'.&show_queue('reviewqueue');
#$result.='<br />Grade'.&show_queue('gradingqueue');
}
@@ -607,7 +593,7 @@ DONESCREEN
if ($webgrade eq 'yes') { $result.=&webgrade_standard_info(); }
}
if ($target eq 'webgrade') {
- $result.="\n".'<div id="criterialist">';
+ $result.="\n".'<div id="LC_GRADING_criterialist">';
}
} elsif ($target eq 'edit') {
$result.=$head_tag_start."</head>".$body_tag_start.$form_tag_start.
@@ -802,8 +788,9 @@ sub end_Task {
&show_task($status,$previous)) {
$result.=&Apache::inputtags::gradestatus('0');
$result.='</form>';
+ my $action = &Apache::lonenc::check_encrypt($env{'request.uri'});
$result.=<<DONEBUTTON;
-<form method="POST">
+<form name="done" method="post" action="$action">
<input type="hidden" name="donescreen" value="1" />
<input type="submit" value="Done" />
</form>
@@ -820,7 +807,7 @@ DONEBUTTON
my $start_time=
&Apache::lonlocal::locallocaltime($slot{'starttime'});
- my $status = "\n<div class='$bt_status'>\n";
+ my $status = "\n<div class='LC_$bt_status LC_criteria'>\n";
if ($bt_status eq 'pass') {
$status.='<h2>You passed the '.$title.' given on '.
@@ -856,8 +843,8 @@ DONEBUTTON
$result=~s/\Q$internal_location\E/$status/;
}
}
- if ($target eq 'web' || $target eq 'webgrade') {
- $result.=&Apache::lonxml::xmlend().'</html>';
+ if ($target eq 'web') {
+ $result.="\n</div>\n".&Apache::lonxml::xmlend().'</html>';
}
}
if ($target eq 'grade' && !$env{'form.webgrade'} && !$previous) {
@@ -996,7 +983,8 @@ DONEBUTTON
# &mt('Throw Away & Stop Grading').'" /> ';
#$result.='<input type="submit" name="save" value="'.
# &mt('Save Partial Grade and Continue Grading').'" /> ';
- $result.='</form>'.&Apache::loncommon::endbodytag().'</html>';
+ $result.='</form>'."\n</div>\n</div>\n".
+ &Apache::loncommon::endbodytag().'</html>';
} elsif ($target eq 'meta') {
$result.=&Apache::response::meta_package_write('Task');
$result.=&Apache::response::meta_stores_write('solved','string',
@@ -1213,7 +1201,7 @@ sub show_queue {
$result.=(<<FORM);
<td>$status</td>
<td>
-<form style="display: inline" method="POST">
+<form style="display: inline" method="post">
<input type="hidden" name="gradingkey" value="$ekey" />
<input type="hidden" name="queue" value="$queue" />
<input type="hidden" name="gradingaction" value="$action" />
@@ -1521,7 +1509,7 @@ sub select_user {
$result.=<<RESULT;
<tr>
<td>
- <form style="display: inline" method="POST">
+ <form style="display: inline" method="post">
<input type="hidden" name="gradingkey" value="$todo" />
<input type="hidden" name="queue" value="$queue" />
<input type="hidden" name="webgrade" value="no" />
@@ -1675,6 +1663,10 @@ sub get_instance {
{
my $last_link;
+ sub link {
+ my ($instance,$id) = @_;
+ return 'LC_GRADING_criteria_'.$instance.'_'.$id;
+ }
sub end_Dimension {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
my $result=&Apache::lonxml::endredirection();
@@ -1699,7 +1691,7 @@ sub get_instance {
if ($Apache::bridgetask::dimensionmandatory{$dim} eq 'N') {
$mandatory='Optional';
}
- my $dim_info="<div class='$dim_status'>\n";
+ my $dim_info="<div class='LC_$dim_status LC_question_grade'>\n";
if ($dim_status eq 'pass') {
$dim_info.='<h3>Question : you passed this '.$mandatory.' question</h3>';
}
@@ -1749,13 +1741,14 @@ sub get_instance {
my $status_display=$status;
$status_display=~s/^([a-z])/uc($1)/e;
@Apache::scripttag::parser_env = @_;
- $result.='<div class="'.$status.'"><h4>'.$mandatory.
- ' Criteria</h4><p>';
+ $result.=
+ '<div class="LC_'.$status.' LC_criteria"><h4>'
+ .$mandatory.' Criteria</h4><p>';
@Apache::scripttag::parser_env = @_;
$result.=&Apache::scripttag::xmlparse($dimension{$instance.'.criteria.'.$id});
- $result.='</p><p class="grade">'.$status_display.'</p>';
+ $result.='</p><p class="LC_grade">'.$status_display.'</p>';
if ($Apache::lonhomework::history{"resource.$version.0.$dim.$instance.$id.comment"}) {
- $result.='<p class="comment">'.&mt('Comment: [_1]',$Apache::lonhomework::history{"resource.$version.0.$dim.$instance.$id.comment"}).'</p>';
+ $result.='<p class="LC_comment">'.&mt('Comment: [_1]',$Apache::lonhomework::history{"resource.$version.0.$dim.$instance.$id.comment"}).'</p>';
}
$result.='</div>';
}
@@ -1768,30 +1761,31 @@ sub get_instance {
@Apache::scripttag::parser_env = @_;
&Apache::scripttag::xmlparse($dimension{$instance.'.text'});
foreach my $id (@{$dimension{$instance.'.criterias'}}) {
- my $link='criteria_'.$instance.'_'.$id;
+ my $link=&link($instance,$id);
my $status=$Apache::lonhomework::history{"resource.$version.0.$dim.$instance.$id.status"};
- $result.='<div class="criteria" id="'.$link.'">'."\n".
+ $result.='<div class="LC_GRADING_criteria" id="'.$link.'">'."\n".
'<a name="'.$link.'" />'."\n".
'<a name="next_'.$last_link.'" />'."\n".
- '<div class="criteriatext">'."\n";
+ '<div class="LC_GRADING_criteriatext">'."\n";
@Apache::scripttag::parser_env = @_;
$result.=&Apache::scripttag::xmlparse($dimension{$instance.'.criteria.'.$id});
$result.='</div>'."\n".
#$dimension{$instance.'.criteria.'.$id}.
- '<div class="grade">'."\n".
- '<label class="ungraded"><input type="radio" name="HWVAL_'.$link.'" value="ungraded" '.($status eq 'ungraded' || !$status ? 'checked="checked"':'').' />'.&mt('Ungraded').'</label>'."\n".
- '<label class="fail"><input type="radio" name="HWVAL_'.$link.'" value="fail" '.($status eq 'fail' ? 'checked="checked"':'').' />'.&mt('Fail').'</label>'."\n".
- '<label class="pass"><input type="radio" name="HWVAL_'.$link.'" value="pass" '.($status eq 'pass' ? 'checked="checked"':'').' />'.&mt('Pass').'</label>'."\n".
- '<label class="review"><input type="radio" name="HWVAL_'.$link.'" value="review" '.($status eq 'review' ? 'checked="checked"':'').' />'.&mt('Review').'</label>'."\n".
+ '<div class="LC_GRADING_grade">'."\n".
+ '<label class="LC_GRADING_ungraded"><input type="radio" name="HWVAL_'.$link.'" value="ungraded" '.($status eq 'ungraded' || !$status ? 'checked="checked"':'').' />'.&mt('Ungraded').'</label>'."\n".
+ '<label class="LC_GRADING_fail"><input type="radio" name="HWVAL_'.$link.'" value="fail" '.($status eq 'fail' ? 'checked="checked"':'').' />'.&mt('Fail').'</label>'."\n".
+ '<label class="LC_GRADING_pass"><input type="radio" name="HWVAL_'.$link.'" value="pass" '.($status eq 'pass' ? 'checked="checked"':'').' />'.&mt('Pass').'</label>'."\n".
+ '<label class="LC_GRADING_review"><input type="radio" name="HWVAL_'.$link.'" value="review" '.($status eq 'review' ? 'checked="checked"':'').' />'.&mt('Review').'</label>'."\n".
'</div>'."\n".
- '<label class="comment">'.&mt('Additional Comment for Student')."\n".
- '<textarea class="comment_area" name="HWVAL_comment_'.$link.'">'.&HTML::Entities::encode($Apache::lonhomework::history{"resource.$version.0.$dim.$instance.$id.comment"}).'</textarea>'."\n".
+ '<label class="LC_GRADING_comment">'.&mt('Additional Comment for Student')."\n".
+ '<textarea class="LC_GRADING_comment_area" name="HWVAL_comment_'.$link.'">'.&HTML::Entities::encode($Apache::lonhomework::history{"resource.$version.0.$dim.$instance.$id.comment"}).'</textarea>'."\n".
'</label>'."\n".
- '<ul class="navbuttons">'."\n".
+ '<ul class="LC_GRADING_navbuttons">'."\n".
'<li><a href="#'.$last_link.'">Prev</a></li>'."\n".
'<li><a href="#next_'.$link.'">Next</a></li>'."\n".
'</ul>'."\n".
'</div>'."\n";
+ $result.=&grading_history($version,$dim,$instance,$id);
$last_link=$link;
}
} elsif ($target eq 'grade' && $env{'form.webgrade'}) {
@@ -1800,8 +1794,9 @@ sub get_instance {
my $ungraded=0;
my $review=0;
foreach my $id (@{$dimension{$instance.'.criterias'}}) {
- my $status=$Apache::lonhomework::results{"resource.$version.0.$dim.$instance.$id.status"}=$env{'form.HWVAL_criteria_'.$instance.'_'.$id};
- $Apache::lonhomework::results{"resource.$version.0.$dim.$instance.$id.comment"}=$env{'form.HWVAL_comment_criteria_'.$instance.'_'.$id};
+ my $link=&link($instance,$id);
+ my $status=$Apache::lonhomework::results{"resource.$version.0.$dim.$instance.$id.status"}=$env{'form.HWVAL_'.$link};
+ $Apache::lonhomework::results{"resource.$version.0.$dim.$instance.$id.comment"}=$env{'form.HWVAL_comment_'.$link};
my $mandatory=($dimension{$instance.'.criteria.'.$id.'.mandatory'} ne 'N');
if ($status eq 'pass') {
if (!$mandatory) { $optional_passed++; }
@@ -1840,6 +1835,38 @@ sub get_instance {
}
}
+sub grading_history {
+ my ($version,$dim,$instance,$criteria) = @_;
+ if (!&Apache::lonnet::allowed('mgq',$env{'request.course.id'})) {
+ return '';
+ }
+ my ($result,$grader);
+ my $scope="resource.$version.0.$dim.$instance.$criteria";
+ foreach my $t (1..$Apache::lonhomework::history{'version'}) {
+ if (exists($Apache::lonhomework::history{$t.':resource.0.regrader'})) {
+ my ($gname,$gdom) =
+ split('@',$Apache::lonhomework::history{$t.':resource.0.regrader'});
+ my $fullname = &Apache::loncommon::plainname($gname,$gdom);
+ $grader = &Apache::loncommon::aboutmewrapper($fullname,
+ $gname,$gdom);
+ }
+ my $entry;
+ if (exists($Apache::lonhomework::history{"$t:$scope.status"})) {
+ $entry.="<tt>".$Apache::lonhomework::history{"$t:$scope.status"}.'</tt>';
+ }
+ if (exists($Apache::lonhomework::history{"$t:$scope.comment"})) {
+ $entry.=' comment: "'.$Apache::lonhomework::history{"$t:$scope.comment"}.'"';
+ }
+ if ($entry) {
+ $result.= "<li>$grader : $entry </li>";
+ }
+ }
+ if ($result) {
+ return '<ul class="LC_GRADING_pastgrading">'.$result.'</ul>';
+ }
+ return '';
+}
+
sub start_IntroParagraph {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
my $result;
@@ -1848,7 +1875,7 @@ sub start_IntroParagraph {
$dimension{'intro'}=&Apache::lonxml::get_all_text('/introparagraph',$parser,$style);
} elsif ($target eq 'webgrade') {
- &Apache::lonxml::get_all_text('/introparagraph',$parser,$style);
+ &Apache::lonxml::startredirection();
}
}
@@ -1856,6 +1883,10 @@ sub start_IntroParagraph {
}
sub end_IntroParagraph {
+ my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
+ if ($target eq 'webgrade') {
+ my $result = &Apache::lonxml::endredirection();
+ }
}
sub start_Instance {
@@ -1923,7 +1954,7 @@ sub proctor_validation_screen {
<h2>Proctor Validation</h2>
<p>Your room's proctor needs to validate your access to this resource.</p>
$msg
-<form name="checkout" method="POST" action="$env{'request.uri'}">
+<form name="checkout" method="post" action="$env{'request.uri'}">
<input type="hidden" name="validate" value="yes" />
<input type="hidden" name="submitted" value="yes" />
<table>