--- loncom/homework/lonhomework.pm	2001/08/06 20:33:23	1.52
+++ loncom/homework/lonhomework.pm	2002/01/17 12:23:31	1.69
@@ -1,45 +1,78 @@
+# The LearningOnline Network with CAPA
 # The LON-CAPA Homework handler
+#
+# $Id: lonhomework.pm,v 1.69 2002/01/17 12:23:31 harris41 Exp $
+#
+# Copyright Michigan State University Board of Trustees
+#
+# This file is part of the LearningOnline Network with CAPA (LON-CAPA).
+#
+# LON-CAPA is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# LON-CAPA is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with LON-CAPA; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+#
+# /home/httpd/html/adm/gpl.txt
+#
+# http://www.lon-capa.org/
+#
 # Guy Albertelli
 # 11/30 Gerd Kortemeyer
-# 6/1 Gerd Kortemeyer
+# 6/1,8/17,8/18 Gerd Kortemeyer
 
 package Apache::lonhomework;
 use strict;
 use Apache::style;
 use Apache::lonxml;
 use Apache::lonnet;
+use Apache::lonplot;
 use Apache::inputtags;
 use Apache::structuretags;
+use Apache::randomlabel;
 use Apache::response;
 use Apache::hint;
 use Apache::outputtags;
 use Apache::Constants qw(:common);
 #use Time::HiRes qw( gettimeofday tv_interval );
 
-sub BEGIN {
+BEGIN {
   &Apache::lonxml::register_insert();
 }
 
 sub get_target {
   if ( $ENV{'request.state'} eq "published") {
-    if ( defined $ENV{'form.submitted'}) {
+    if ( defined($ENV{'form.grade_target'}) 
+	 && ($Apache::lonhomework::viewgrades == 'F' )) {
+      return ($ENV{'form.grade_target'});
+    }
+    if ( defined($ENV{'form.submitted'})) {
       return ('grade', 'web');
     } else {
       return ('web');
     }
   } elsif ($ENV{'request.state'} eq "construct") {
-    if ( defined $ENV{'form.preview'}) {
-      if ( defined $ENV{'form.submitted'}) {
+    if ( defined($ENV{'form.preview'})) {
+      if ( defined($ENV{'form.submitted'})) {
 	return ('grade', 'web');
       } else {
 	return ('web');
       }
     } else {
       if ( $ENV{'form.problemmode'} eq 'View' ) {
-	if ( defined $ENV{'form.submitted'}) {
-	  return ('grade', 'web');
+	if ( defined($ENV{'form.submitted'}) &&
+	     (!defined($ENV{'form.resetdata'})) ) {
+	  return ('grade', 'web','answer');
 	} else {
-	  return ('web');
+	  return ('web','answer');
 	}
       } elsif ( $ENV{'form.problemmode'} eq 'Edit' ) {
 	if ( $ENV{'form.submitted'} eq 'edit' ) {
@@ -84,7 +117,8 @@ sub send_footer {
 }
 
 $Apache::lonxml::browse='';
-sub check_date {
+
+sub check_access {
   my ($id) = @_;
   my $date ='';
   my $status = '';
@@ -130,6 +164,13 @@ sub check_date {
     if ( $maxtries eq '' ) { $maxtries = '2'; } 
     if ($tries >= $maxtries) { $status = 'CANNOT_ANSWER'; } 
   }
+
+  if (($status ne 'CLOSED') && ($Apache::lonhomework::type eq 'exam') &&
+      (!$Apache::lonhomework::history{"resource.0.outtoken"})) {
+      return ('UNCHECKEDOUT','needs to be checked out');
+  }
+
+
   &Apache::lonxml::debug("sending back :$status:$datemsg:");
   if (($Apache::lonhomework::browse eq 'F') && ($status eq 'CLOSED')) {
     &Apache::lonxml::debug("should be allowed to browse a resource when closed");
@@ -167,6 +208,9 @@ sub setupheader {
   } 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 ''
@@ -176,12 +220,14 @@ sub handle_save_or_undo {
   my ($request,$problem,$result) = @_;
   my $fileout = &Apache::lonnet::filelocation("",$request->uri);
   my $filesave=$fileout.".bak";
+  my $error=0;
 
   if ($ENV{'form.Undo'} eq 'undo') {
     if (copy($filesave,$fileout)) {
       $request->print("<b>Undid changes, Copied $filesave to $fileout<br /></b>");
     } else {
       $request->print("<font color=\"red\" size=\"+1\"><b>Unable to undo, unable to copy $filesave to $fileout<br /></b></font>");
+      $error=1;
     }
   } else {
     my $fs=Apache::File->new(">$filesave");
@@ -190,6 +236,7 @@ sub handle_save_or_undo {
       $request->print("<b>Making Backup to $filesave</b><br />");
     } else {
       $request->print("<font color=\"red\" size=\"+1\"><b>Unable to make backup $filesave</b></font>");
+      $error=2;
     }
     my $fh=Apache::File->new(">$fileout");
     if (defined($fh)) {
@@ -197,8 +244,42 @@ sub handle_save_or_undo {
       $request->print("<b>Saving Modifications to $fileout</b><br />");
     } else {
       $request->print("<font color=\"red\" size=\"+1\"><b>Unable to write to $fileout</b></font>");
+      $error|=4;
     }
   }
+  return $error;
+}
+
+sub editxmlmode {
+  my ($request,$file) = @_;
+  my $result;
+  my $problem=&Apache::lonnet::getfile($file);
+  if ($problem == -1) {
+    &Apache::lonxml::error("<b> Unable to find <i>$file</i></b>");
+    $problem='';
+  }
+  if (defined($ENV{'form.editxmltext'}) || defined($ENV{'form.Undo'})) {
+    my $error=&handle_save_or_undo($request,\$problem,
+				   \$ENV{'form.editxmltext'});
+    if (!$error) { $problem=&Apache::lonnet::getfile($file); }
+  }
+  my ($rows,$cols) = &Apache::edit::textarea_sizes(\$problem);
+  if ($cols > 80) { $cols = 80; }
+  $result.='<html><body bgcolor="#FFFFFF">
+            <form name="lonhomework" method="POST" action="'.
+	      $ENV{'request.uri'}.'">
+            <input type="hidden" name="problemmode" value="EditXML" />
+            <input type="submit" name="problemmode" value="View" />
+            <input type="submit" name="problemmode" value="Edit" />
+            <hr />
+            <input type="submit" name="submit" value="Submit Changes" />
+            <input type="submit" name="Undo" value="undo" />
+            <hr />
+            <textarea rows="'.$rows.'" cols="'.$cols.'" name="editxmltext">'.
+	      $problem.'</textarea>
+            </form></body></html>';
+  $request->print($result);
+  return '';
 }
 
 sub renderpage {
@@ -217,22 +298,16 @@ sub renderpage {
     my $result = '';
     &Apache::inputtags::initialize_inputtags;
     &Apache::edit::initialize_edit;
-    %Apache::lonhomework::results=();
-    %Apache::lonhomework::history=&Apache::lonnet::restore();
-    #ignore error conditions
-    my ($temp)=keys %Apache::lonhomework::history ;
-    if ($temp =~ m/^error:.*/) { %Apache::lonhomework::history=(); } 
     if ($target eq 'web') {
       if (&Apache::lonnet::symbread() eq '') {
 	if ($ENV{'request.state'} eq "construct") {
-	  $request->print("In construction space, submissions ignored<br />");
 	} else {
 	  $request->print("Browsing or <a href=\"/adm/ambiguous\">ambiguous</a> reference, submissions ignored<br />");
 	}
       }
       #if ($Apache::lonhomework::viewgrades eq 'F') {&createmenu('grade',$request); }
     }
-    if ($target eq 'grade') { &showhash(%Apache::lonhomework::history); }
+    #if ($target eq 'grade') { &showhash(%Apache::lonhomework::history); }
 
     my $default=&Apache::lonnet::getfile('/home/httpd/html/res/adm/includes/default_homework.lcpm');
     if ($default == -1) {
@@ -254,14 +329,6 @@ sub renderpage {
       $request->print($result);
     }
     #$request->print(":Result ends");
-    if ($target eq 'grade') { &showhash(%Apache::lonhomework::results); }
-
-    #store new values
-    my ($temp) = keys %Apache::lonhomework::results;
-    if ( $temp ne '' ) {
-      &Apache::lonxml::debug("Store return message:".
-			     &Apache::lonnet::cstore(\%Apache::lonhomework::results));
-    }
     #my $td=&tv_interval($t0);
   }
 }
@@ -285,24 +352,44 @@ sub get_template_list {
 }
 
 sub newproblem {
-  my ($request) = @_;
-
-  my $extension=$request->uri;
-  $extension=~s:^.*\.([\w]+)$:$1:;
-  &Apache::lonxml::debug("Looking for :$extension:");
-  if ($ENV{'form.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,$file);
-  } else {
-    my $templatelist=&get_template_list('',$extension);
-    my $url=$request->uri;
-    my $dest = &Apache::lonnet::filelocation("",$request->uri);
-    $request->print(<<ENDNEWPROBLEM);
+    my ($request) = @_;
+    my $extension=$request->uri;
+    $extension=~s:^.*\.([\w]+)$:$1:;
+    &Apache::lonxml::debug("Looking for :$extension:");
+    if ($ENV{'form.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);
+	if (!defined($templatelist)) {
+	    # We didn't find a template, so just create a blank problem.
+	    $request->print(<<ENDNEWPROBLEM);
+<body bgcolor="#FFFFFF">
+The requested file $url doesn\'t exist. You can create a new $extension <br />
+<form action="$url" method="POST">
+<input type="submit" name="newfile" value="New $extension"><br />
+</form>
+</body>
+ENDNEWPROBLEM
+            return '';
+        }
+	$request->print(<<ENDNEWPROBLEM);
 <body bgcolor="#FFFFFF">
-The request file $url doesn\'t exist. You can create a new $extension <br />
+The requested file $url doesn\'t exist. You can create a new $extension <br />
 <form action="$url" method="POST">
 <input type="submit" value="New $extension"><br />
 <select name="template">
@@ -311,9 +398,8 @@ $templatelist
 </form>
 </body>
 ENDNEWPROBLEM
-  }
-
-  return '';
+    }
+    return '';
 }
 
 sub view_or_edit_menu {
@@ -342,7 +428,7 @@ sub handler {
   $Apache::lonhomework::browse= &Apache::lonnet::allowed('bre',$ENV{'request.filename'});
   $Apache::lonhomework::viewgrades=&Apache::lonnet::allowed('vgr',$ENV{'request.course.id'});
   &Apache::lonxml::debug("Permissions:$Apache::lonhomework::browse:$Apache::lonhomework::viewgrades:");
-
+  &Apache::lonxml::debug("Problem Mode ".$ENV{'form.problemmode'});
   my $file=&Apache::lonnet::filelocation("",$request->uri);
 
   #check if we know where we are
@@ -355,11 +441,18 @@ sub handler {
   }
 
   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
-	&view_or_edit_menu($request);
-	#&renderpage($request,$file);
+	#&view_or_edit_menu($request);
+	$ENV{'form.problemmode'}='View';
+	&renderpage($request,$file);
+      } elsif ($ENV{'form.problemmode'} eq 'EditXML') {
+	&editxmlmode($request,$file);
       } else {
 	&renderpage($request,$file);
       }