--- loncom/homework/lonhomework.pm	2001/01/24 14:26:28	1.35
+++ loncom/homework/lonhomework.pm	2001/04/26 21:28:33	1.41
@@ -30,9 +30,12 @@ sub get_target {
 	return ('web');
       }
     } else {
-      #return ('edit');
-      #edit is currently broken
-      return ('web');
+      return ('grade','web');
+      if ( $ENV{'form.submitted'} eq 'edit' ) {
+	return ('modified','edit');
+      } else {
+	return ('edit');
+      }
     }
   }
   return ();
@@ -51,14 +54,23 @@ sub send_header {
 #  $request->print('<form name='.$ENV{'form.request.prefix'}.'lonhomework method="POST" action="'.$request->uri.'">');
 }
 
+sub createmenu {
+  my ($which,$request)=@_;
+  if ($which eq 'grade') {
+    $request->print('<script language="JavaScript"> 
+          hwkmenu=window.open("/res/adm/pages/homeworkmenu.html","homeworkremote",
+                 "height=350,width=150,menubar=no");
+          </script>');
+  }
+}
+
 sub send_footer {
   my ($request)= @_;
 #  $request->print('</form>');
   $request->print(&Apache::lontexconvert::footer());
 }
 
-#@Apache::lonhomework::date_status=();
-#@Apache::lonhomework::date_msg=();
+$Apache::lonxml::browse='';
 sub check_date {
   my ($id) = @_;
   my $date ='';
@@ -106,6 +118,11 @@ sub check_date {
     if ($tries >= $maxtries) { $status = 'CANNOT_ANSWER'; } 
   }
   &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");
+    $status='CAN_ANSWER';
+    $datemsg='is closed but you are allowed to view it';
+  }
   if ($ENV{'request.state'} eq "construct") {
     &Apache::lonxml::debug("in construction ignoring dates");
     $status='CAN_ANSWER';
@@ -114,13 +131,24 @@ sub check_date {
   return ($status,$datemsg);
 }
 
-sub handler {
-  my $request=$_[0];
+sub showhash {
+  my (%hash) = @_;
+  my $resultkey;
+  foreach $resultkey (sort keys %hash) {
+    &Apache::lonxml::debug("$resultkey ---- $hash{$resultkey}");
+  }
+  &Apache::lonxml::debug("\n<br />restored values^</br>\n");
+  return '';
+}
 
-  if ( $ENV{'user.name'} eq 'albertel' ) {$Apache::lonxml::debug=1;} else {$Apache::lonxml::debug=0;}
-  
-  my (@targets) = &get_target();
+sub setuppermissions {
+  $Apache::lonhomework::browse= &Apache::lonnet::allowed('bre',$ENV{'request.filename'});
+  $Apache::lonhomework::viewgrades=&Apache::lonnet::allowed('vgr',$ENV{'request.course.id'});
+  return ''
+}
 
+sub setupheader {
+  my $request=$_[0];
   if ($ENV{'browser.mathml'}) {
     $request->content_type('text/xml');
   } else {
@@ -128,42 +156,41 @@ sub handler {
   }
   $request->send_http_header;
   return OK if $request->header_only;
+  &Apache::lonhomework::send_header($request);
+  return ''
+}
 
-  #check if we know where we are
-  if ($ENV{'request.course.fn'} && !&Apache::lonnet::symbread()) { 
-    $request->internal_redirect('/adm/ambiguous'); return; 
-  }
+sub renderpage {
+  my ($request,$file) = @_;
 
-  &Apache::lonhomework::send_header($request);
-  
-  #check if allowed to see
-  
+  my (@targets) = &get_target();
   foreach my $target (@targets) {
-    my $file=&Apache::lonnet::filelocation("",$request->uri);
     my $problem=&Apache::lonnet::getfile($file);
     if ($problem == -1) {
       &Apache::lonxml::error("<b> Unable to find <i>$file</i></b>");
       $problem='';
     }
-    
+
     my %mystyle;
     my $result = '';
     &Apache::inputtags::initialize_inputtags;
     %Apache::lonhomework::results=();
-    %Apache::lonhomework::history=&Apache::lonnet::restore;
+    %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' && &Apache::lonnet::symbread() eq '') {
-      $request->print("Vieiwing this problem as not a student, submissions will be ignored.");
-    }
-    if ($target eq 'grade') {
-      my $resultkey;
-      foreach $resultkey (sort keys %Apache::lonhomework::history) {
-	&Apache::lonxml::debug("$resultkey ---- $Apache::lonhomework::history{$resultkey}");
+    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 />");
+	}
       }
-      &Apache::lonxml::debug("\n<br>restored values^</br>\n");
+      if ($Apache::lonhomework::viewgrades eq 'F') {&createmenu('grade',$request); }
     }
+    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) {
       &Apache::lonxml::error("<b>Unable to find <i>default_homework.lcpm</i></b>");
@@ -173,24 +200,75 @@ sub handler {
 			$default.&setup_vars($target),%mystyle);
 
     #$request->print("Result follows:");
-    $request->print($result);
+    if ($target eq 'modified') {
+      my $fileout = &Apache::lonnet::filelocation("",$request->uri);
+      my $filesave=$fileout.".bak";
+
+      my $fs=Apache::File->new(">$filesave");
+      print $fs $problem;
+      $request->print("<b>Making Backup to $filesave</b><br />");
+
+      my $fh=Apache::File->new(">$fileout");
+      print $fh $result;
+      $request->print("<b>Saving Modifications to $fileout</b><br />");
+    } else {
+      $request->print($result);
+    }
     #$request->print(":Result ends");
-    if ($target eq 'grade') {
+    if ($target eq 'grade') { &showhash(%Apache::lonhomework::results); }
 
-      my $resultkey;
-      foreach $resultkey (sort keys %Apache::lonhomework::results) {
-	&Apache::lonxml::debug("$resultkey ---- $Apache::lonhomework::results{$resultkey}");
-      }
-      &Apache::lonxml::debug("\n<br>storing values^</br>\n");
-    }
-    
+    #store new values
     my ($temp) = keys %Apache::lonhomework::results;
     if ( $temp ne '' ) {
-      &Apache::lonxml::debug("Store return message:".&Apache::lonnet::cstore(%Apache::lonhomework::results));
+      &Apache::lonxml::debug("Store return message:".
+			     &Apache::lonnet::cstore(\%Apache::lonhomework::results));
+    }
+  }
+}
+
+sub handler {
+  my $request=$_[0];
+
+  if ( $ENV{'user.name'} eq 'albertel' ) {$Apache::lonxml::debug=1;}
+
+  if (&setupheader($request)) { return OK; }
+
+  #setup permissions
+  $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:");
+
+  my $file=&Apache::lonnet::filelocation("",$request->uri);
+
+  #check if we know where we are
+  if ($ENV{'request.course.fn'} && !&Apache::lonnet::symbread()) { 
+    # if we are browsing we might not be able to know where we are
+    if ($Apache::lonhomework::browse ne 'F') {
+      #should know where we are, so ask
+      $request->internal_redirect('/adm/ambiguous'); return;
+    }
+  }
+
+  if ($ENV{'request.state'} eq "construct") {
+    if ( -e $file ) {
+      if (!(defined $ENV{'form.showproblem'})) {
+	#first visit to problem in construction space
+	&view_or_edit_menu($request);
+      } else {
+	&renderpage($request,$file);
+      }
+    } else {
+      # requested file doesn't exist in contruction space
+      &newproblem($request);
     }
+  } else {
+    # just render the page normally outside of construction space
+    &renderpage($request,$file);
   }
+
   &Apache::lonhomework::send_footer($request);
-  
+  # always turn off debug messages
+  $Apache::lonxml::debug=0;
   return OK;
 
 }