--- loncom/homework/lonhomework.pm	2003/02/25 23:18:22	1.110
+++ loncom/homework/lonhomework.pm	2003/05/19 21:05:23	1.130
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # The LON-CAPA Homework handler
 #
-# $Id: lonhomework.pm,v 1.110 2003/02/25 23:18:22 albertel Exp $
+# $Id: lonhomework.pm,v 1.130 2003/05/19 21:05:23 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -50,6 +50,7 @@ use Apache::essayresponse();
 use Apache::externalresponse();
 use Apache::rankresponse();
 use Apache::matchresponse();
+#use Apache::chemresponse();
 use Apache::Constants qw(:common);
 use HTML::Entities();
 use Apache::loncommon();
@@ -60,16 +61,18 @@ BEGIN {
 }
 
 sub get_target {
-  if ( $ENV{'request.state'} eq "published") {
+  if (($ENV{'request.state'} eq "published") ||
+      ($ENV{'request.state'} eq "uploaded")) {
     if ( defined($ENV{'form.grade_target'}  ) 
 	 && ($ENV{'form.grade_target'} eq 'tex')) {
       return ($ENV{'form.grade_target'});
     } elsif ( defined($ENV{'form.grade_target'}  ) 
-	 && ($Apache::lonhomework::viewgrades == 'F' )) {
+	 && ($Apache::lonhomework::viewgrades eq 'F' )) {
       return ($ENV{'form.grade_target'});
     }
  
-    if ( defined($ENV{'form.submitted'})) {
+    if ( defined($ENV{'form.submitted'}) &&
+	 ( !defined($ENV{'form.resetdata'}))) {
       return ('grade', 'web');
     } else {
       return ('web');
@@ -206,12 +209,20 @@ sub check_access {
     $datemsg = "was due on $lastdate, and answers will be available on $date";
   }
   if ($status eq 'CAN_ANSWER') {
-    #check #tries
+    #check #tries, and if correct.
     my $tries = $Apache::lonhomework::history{"resource.$id.tries"};
     my $maxtries = &Apache::lonnet::EXT("resource.$id.maxtries");
     if ( $tries eq '' ) { $tries = '0'; }
     if ( $maxtries eq '' ) { $maxtries = '2'; } 
-    if ($tries >= $maxtries) { $status = 'CANNOT_ANSWER'; } 
+    if ($tries >= $maxtries) { $status = 'CANNOT_ANSWER'; }
+    # if (correct and show prob status) or excused then CANNOT_ANSWER
+    if(($Apache::lonhomework::history{"resource.$id.solved"}=~/^correct/
+	&&
+	lc($Apache::lonhomework::problemstatus) ne 'no')
+       ||
+       $Apache::lonhomework::history{"resource.$id.solved"}=~/^excused/) {
+	$status = 'CANNOT_ANSWER';
+    }
   }
 
   if (($status ne 'CLOSED') && ($Apache::lonhomework::type eq 'exam') &&
@@ -279,23 +290,31 @@ sub showhashsubset {
 
 sub setuppermissions {
   $Apache::lonhomework::browse= &Apache::lonnet::allowed('bre',$ENV{'request.filename'});
-  $Apache::lonhomework::viewgrades=&Apache::lonnet::allowed('vgr',$ENV{'request.course.id'});
+  my $viewgrades = &Apache::lonnet::allowed('vgr',$ENV{'request.course.id'});
+  if (! $viewgrades && 
+      exists($ENV{'request.course.sec'}) && 
+      $ENV{'request.course.sec'} !~ /^\s*$/) {
+      $viewgrades = &Apache::lonnet::allowed('vgr',$ENV{'request.course.id'}.
+                                               '/'.$ENV{'request.course.sec'});
+  }
+  $Apache::lonhomework::viewgrades = $viewgrades;
   return ''
 }
 
 sub setupheader {
-  my $request=$_[0];
-  if ($ENV{'browser.mathml'}) {
-    $request->content_type('text/xml');
-  } else {
-    $request->content_type('text/html');
-  }
-  if (!$Apache::lonxml::debug && ($ENV{'REQUEST_METHOD'} eq 'GET')) {
-    &Apache::loncommon::no_cache($request);
-  }
-  $request->send_http_header;
-  return OK if $request->header_only;
-  return ''
+    my $request=$_[0];
+    if ($ENV{'browser.mathml'}) {
+	$request->content_type('text/xml');
+    } else {
+	$request->content_type('text/html');
+    }
+    $request->content_encoding('UTF-8');
+    if (!$Apache::lonxml::debug && ($ENV{'REQUEST_METHOD'} eq 'GET')) {
+	&Apache::loncommon::no_cache($request);
+    }
+    $request->send_http_header;
+    return OK if $request->header_only;
+    return ''
 }
 
 sub handle_save_or_undo {
@@ -370,17 +389,23 @@ sub analyze {
     my %allparts;
     my $rndseed=$ENV{'form.rndseed'};
     &analyze_header($request);
+    my %prog_state=
+	&Apache::lonhtmlcommon::Create_PrgWin($request,'Analyze Progress',
+					      'Getting Problem Variants',
+					      $ENV{'form.numtoanalyze'});
     for(my $i=1;$i<$ENV{'form.numtoanalyze'}+1;$i++) {
+	&Apache::lonhtmlcommon::Increment_PrgWin($request,\%prog_state,
+						 'last problem');
 	my $subresult=&Apache::lonnet::ssi($request->uri,
 					   ('grade_target' => 'analyze'),
-					   ('rndseed' => $i));
+					   ('rndseed' => $i+$rndseed));
 	&Apache::lonxml::debug(":$subresult:");
 	(my $garbage,$subresult)=split(/_HASH_REF__/,$subresult,2);
 	my %analyze=&Apache::lonnet::str2hash($subresult);
-	$Apache::lonxml::debug=1;
-	&Apache::lonhomework::showhash(%analyze);
-	$Apache::lonxml::debug=0;
-	my @parts = @{ $analyze{'parts'} };
+	my @parts;
+	if (defined(@{ $analyze{'parts'} })) {
+	    @parts=@{ $analyze{'parts'} };
+	}
 	foreach my $part (@parts) {
 	    if (!exists($allparts{$part})) {$allparts{$part}=1;};
 	    if ($analyze{$part.'.type'} eq 'numericalresponse'	||
@@ -391,19 +416,33 @@ sub analyze {
 	    }
 	}
     }
+    &Apache::lonhtmlcommon::Update_PrgWin($request,\%prog_state,
+					  'Analyzing Results');
     foreach my $part (keys(%allparts)) {
 	if (defined(@{ $overall{$part.'.answer'} })) {
 	    $request->print('<table><tr><td>Part '.$part.'</td></tr>');
+	    my %frequency;
 	    foreach my $answer (sort {$a->[0] <=> $b->[0]} (@{ $overall{$part.'.answer'} })) {
-		$request->print('<tr><td>'.join('</td><td>',@{ $answer }).
-				'</td></tr>');
+		$frequency{join('\0',@{ $answer })}++;
+	    }
+	    foreach my $answer (sort {(split('\0',$a))[0] <=> (split('\0',$b))[0]} (keys(%frequency))) {
+		$request->print('<tr><td>'.
+				join('</td><td>',split('\0',$answer)).
+				'</td><td>('.$frequency{$answer}.
+				')</td></tr>');
 	    }
 	    $request->print('</table>');
 	} else {
 	    $request->print('<p>Part '.$part.
-			    ' is not analyzabale at this time</p>');
+			    ' is not analyzable at this time</p>');
 	}
     }
+    if (scalar(keys(%allparts)) == 0 ) {
+	$request->print('<p>Found no analyzable parts in this problem,
+                         currently only Numerical, Formula and String response
+                         styles are supported.</p>');
+    }
+    &Apache::lonhtmlcommon::Close_PrgWin($request,\%prog_state);
     &analyze_footer($request);
     &Apache::lonhomework::showhash(%overall);
     return $result;
@@ -413,7 +452,7 @@ sub editxmlmode {
   my ($request,$file) = @_;
   my $result;
   my $problem=&Apache::lonnet::getfile($file);
-  if ($problem == -1) {
+  if ($problem eq -1) {
     &Apache::lonxml::error("<b> Unable to find <i>$file</i></b>");
     $problem='';
   }
@@ -429,7 +468,15 @@ sub editxmlmode {
     &renderpage($request,$file);
   } else {
     my ($rows,$cols) = &Apache::edit::textarea_sizes(\$problem);
-    my $xml_help = Apache::loncommon::help_open_topic("Problem_Editor_XML_Index",'Problem Editing Help');
+    my $xml_help = '<table><tr><td>'.
+	&Apache::loncommon::help_open_topic("Problem_Editor_XML_Index",'Problem Editing Help')
+	    .'</td><td>'.
+	&Apache::loncommon::help_open_topic("Greek_Symbols",'Greek Symbols',
+					    undef,undef,600)
+	    .'</td><td>'.
+        &Apache::loncommon::help_open_topic("Other_Symbols",'Other Symbols',
+					    undef,undef,600)
+	    .'</td></tr></table>';
     if ($cols > 80) { $cols = 80; }
     if ($cols < 70) { $cols = 70; }
     if ($rows < 20) { $rows = 20; }
@@ -461,7 +508,7 @@ sub renderpage {
   foreach my $target (@targets) {
     #my $t0 = [&gettimeofday()];
     my $problem=&Apache::lonnet::getfile($file);
-    if ($problem == -1) {
+    if ($problem eq -1) {
       &Apache::lonxml::error("<b> Unable to find <i>$file</i></b>");
       $problem='';
     }
@@ -475,7 +522,7 @@ sub renderpage {
     &Apache::lonxml::debug("Should be parsing now");
     $result = &Apache::lonxml::xmlparse($request, $target, $problem,
 			&setup_vars($target),%mystyle);
-
+    undef($Apache::lonhomework::parsing_a_problem);
     #$request->print("Result follows:");
     if ($target eq 'modified') {
       &handle_save_or_undo($request,\$problem,\$result);
@@ -490,6 +537,7 @@ sub renderpage {
 	#$result.="<br />Spent $td seconds processing target $target\n</body>";
       #}
       $request->print($result);
+      $request->rflush();
     }
     #$request->print(":Result ends");
     #my $td=&tv_interval($t0);
@@ -513,8 +561,8 @@ sub get_template_list {
     }
   }
   if (@allnames && !$result) {
-    $result="<option>Select a $extension type</option>\n<option>".
-      join('</option><option>',sort(@allnames)).'</option>';
+    $result="<option>Select a $extension template</option>\n<option>".
+	join('</option><option>',sort(@allnames)).'</option>';
   }
   return $result;
 }
@@ -525,33 +573,29 @@ sub newproblem {
     $extension=~s:^.*\.([\w]+)$:$1:;
     &Apache::lonxml::debug("Looking for :$extension:");
     if ($ENV{'form.template'} &&
-	$ENV{'form.template'} ne "Select a $extension type") {
+	$ENV{'form.template'} ne "Select a $extension template") {
 	use File::Copy;
 	my $file = &get_template_list($ENV{'form.template'},$extension);
 	my $dest = &Apache::lonnet::filelocation("",$request->uri);
 	copy($file,$dest);
 	&renderpage($request,$dest);
-    } elsif($ENV{'form.newfile'}) {
-	# I don't like hard-coded filenames but for now, this will work.
-	use File::Copy;
-	my $templatefilename = 
-	    $request->dir_config('lonIncludes').'/templates/blank.problem';
-	&Apache::lonxml::debug("$templatefilename");
-	my $dest = &Apache::lonnet::filelocation("",$request->uri);
-	copy($templatefilename,$dest);
-	&renderpage($request,$dest);
     } else {
 	my $templatelist=&get_template_list('',$extension);
 	my $url=$request->uri;
 	my $dest = &Apache::lonnet::filelocation("",$request->uri);
+	my $errormsg;
+	if ($ENV{'form.newfile'}) {
+	    $errormsg='<p><font color="red">You did not select a template.</font></p>'."\n";
+	}
 	my $instructions;
 	if ($templatelist) { $instructions=", select a template from the pull-down menu below.<br />Then";}
 	$request->print(<<ENDNEWPROBLEM);
 <body bgcolor="#FFFFFF">
 <h1>Creating a new $extension resource</h1>
+$errormsg
 The requested file <tt>$url</tt> currently does not exist.
 <p>
-To create a new $extension$instructions click on the "Create $extension" button.
+<b>To create a new $extension$instructions click on the "Create $extension" button.</b>
 </p>
 <p><form action="$url" method="POST">
 ENDNEWPROBLEM
@@ -581,7 +625,6 @@ sub handler {
   #my $t0 = [&gettimeofday()];
   my $request=$_[0];
 
-#  if ( $ENV{'user.name'} eq 'albertel' ) {$Apache::lonxml::debug=1;}
   $Apache::lonxml::debug=$ENV{'user.debug'};
 
   if (&setupheader($request)) { return OK; }
@@ -613,11 +656,16 @@ sub handler {
     }
   }
 
+  my ($symb) = &Apache::lonxml::whichuser();
+  &Apache::lonxml::debug('symb is '.$symb);
+  if ($ENV{'request.state'} eq "construct" || $symb eq '') {
+      if ($ENV{'form.resetdata'} eq 'Reset Submissions' ||
+	  $ENV{'form.resetdata'} eq 'New Problem Variation' ) {
+	  my ($symb,$courseid,$domain,$name) = &Apache::lonxml::whichuser();
+	  &Apache::lonnet::tmpreset($symb,'',$domain,$name);
+      }
+  }
   if ($ENV{'request.state'} eq "construct") {
-    if ($ENV{'form.resetdata'} eq 'Reset Submissions') {
-      my ($symb,$courseid,$domain,$name) = &Apache::lonxml::whichuser();
-      &Apache::lonnet::tmpreset($symb,'',$domain,$name);
-    }
     if ( -e $file ) {
       if (!(defined $ENV{'form.problemmode'})) {
 	#first visit to problem in construction space
@@ -626,7 +674,7 @@ sub handler {
 	&renderpage($request,$file);
       } elsif ($ENV{'form.problemmode'} eq 'EditXML') {
 	&editxmlmode($request,$file);
-      } elsif ($ENV{'form.problemmode'} eq 'Answer Distribution') {
+      } elsif ($ENV{'form.problemmode'} eq 'Calculate answers') {
 	&analyze($request,$file);
       } else {
 	&renderpage($request,$file);