--- loncom/homework/bridgetask.pm	2006/02/20 21:43:16	1.111
+++ loncom/homework/bridgetask.pm	2006/03/02 22:06:27	1.116
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA 
 # definition of tags that give a structure to a document
 #
-# $Id: bridgetask.pm,v 1.111 2006/02/20 21:43:16 albertel Exp $
+# $Id: bridgetask.pm,v 1.116 2006/03/02 22:06:27 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.'">'.
@@ -236,7 +236,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="'.
@@ -260,7 +260,7 @@ sub preserve_grade_info {
 sub style {
     return (<<STYLE);
 <style type="text/css">
-.fail, .pass, .neutral {
+.LC_fail, .LC_pass, .LC_neutral {
     position: relative;
     margin : 5px;
     margin-bottom :10px;
@@ -273,7 +273,7 @@ sub style {
     background-color : rgb(255,240,225);
 }
 
-.fail h4, .pass h4 {
+.LC_fail h4, .LC_pass h4 {
 	position:absolute;
 	left: -4px;
 	top: -8px;
@@ -283,25 +283,25 @@ sub style {
 	border : thin solid;
 }
 
-.fail {
+.LC_fail {
 	color: red;
 }
 
-.pass {
+.LC_pass {
     color : green;
 }
 
-.neutral {
+.LC_neutral {
 	color : blue;
 }
 
-.question {
+.LC_question {
 	border : thin solid black;
 	padding : 4px;
 	margin-bottom : 1em;
 }
 
-.grade {
+.LC_grade {
 	font-size: x-large;
 	font-family: Arial;
 	position:absolute;
@@ -375,7 +375,7 @@ sub webgrade_standard_info {
     my ($version)=&get_version();
     my (undef,undef,$udom,$uname) = &Apache::lonxml::whichuser();
     my $file_url = '/uploaded/'.$udom.'/'.$uname.'/portfolio/';
-    my $file_list="<ul>\n";
+    my $file_list="<ul class=\"LC_GRADE_handininfo\">\n";
     foreach my $partial_file (split(',',$Apache::lonhomework::history{"resource.$version.0.bridgetask.portfiles"})) {
 	my $file=$file_url.$partial_file;
 	$file=~s|/+|/|g;
@@ -391,13 +391,11 @@ sub webgrade_standard_info {
 				       );
 				       
     my $result=<<INFO;
-<div class="handininfo">
-  <div class="maincontrols">
+  <div class="LC_GRADE_maincontrols">
     <input type="submit" name="next" value="$lt{'done'}" />
     <input type="submit" name="stop" value="$lt{'stop'}" />
   </div>
   $file_list
-</div>
 INFO
     return $result;
 }
@@ -422,13 +420,13 @@ sub start_Task {
     
     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="'.
@@ -437,7 +435,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="'.
@@ -482,7 +480,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>
@@ -609,7 +620,7 @@ DONESCREEN
 	    if ($webgrade eq 'yes') { $result.=&webgrade_standard_info(); }
 	}
 	if ($target eq 'webgrade') {
-	    $result.="\n".'<div id="criterialist">';
+	    $result.="\n".'<div id="LC_GRADE_criterialist">';
 	}
     } elsif ($target eq 'edit') {
 	$result.=$head_tag_start."</head>".$body_tag_start.$form_tag_start.
@@ -804,8 +815,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>
@@ -822,7 +834,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 '.
@@ -1215,7 +1227,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" />
@@ -1523,7 +1535,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" />
@@ -1701,7 +1713,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>';
 		    }
@@ -1751,13 +1763,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>';
 		    }
@@ -1770,30 +1783,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='LC_GRADE_criteria_'.$instance.'_'.$id;
 		my $status=$Apache::lonhomework::history{"resource.$version.0.$dim.$instance.$id.status"};
-		$result.='<div id="'.$link.'">'."\n".
+		$result.='<div class="LC_GRADE_criteria" id="'.$link.'">'."\n".
 		    '<a name="'.$link.'" />'."\n".
 		    '<a name="next_'.$last_link.'" />'."\n".
-		    '<div class="criteriatext">'."\n";
+		    '<div class="LC_GRADE_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_GRADE_grade">'."\n".
+		    '<label class="LC_GRADE_ungraded"><input type="radio" name="HWVAL_'.$link.'" value="ungraded" '.($status eq 'ungraded' || !$status ? 'checked="checked"':'').' />'.&mt('Ungraded').'</label>'."\n".
+		    '<label class="LC_GRADE_fail"><input type="radio" name="HWVAL_'.$link.'" value="fail" '.($status eq 'fail' ? 'checked="checked"':'').' />'.&mt('Fail').'</label>'."\n".
+		    '<label class="LC_GRADE_pass"><input type="radio" name="HWVAL_'.$link.'" value="pass" '.($status eq 'pass' ? 'checked="checked"':'').' />'.&mt('Pass').'</label>'."\n".
+		    '<label class="LC_GRADE_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').'</label>'."\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_GRADE_comment">'.&mt('Additional Comment for Student')."\n".
+		    '<textarea class="LC_GRADE_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_GRADE_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'}) {
@@ -1842,6 +1856,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_pastgrading">'.$result.'</ul>';
+    }
+    return '';
+}
+
 sub start_IntroParagraph {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
     my $result;
@@ -1925,7 +1971,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>