--- loncom/homework/lonhomework.pm	2011/10/06 12:32:52	1.317.4.4
+++ loncom/homework/lonhomework.pm	2011/12/20 22:46:06	1.334
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # The LON-CAPA Homework handler
 #
-# $Id: lonhomework.pm,v 1.317.4.4 2011/10/06 12:32:52 raeburn Exp $
+# $Id: lonhomework.pm,v 1.334 2011/12/20 22:46:06 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -112,7 +112,7 @@ sub get_target {
 	} elsif ( $env{'form.grade_target'} eq 'webgrade'
 		  && ($Apache::lonhomework::queuegrade eq 'F' )) {
 	    return ($env{'form.grade_target'});
-        } elsif ($env{'form.grade_target'} eq 'answer') {
+	} elsif ($env{'form.grade_target'} eq 'answer') {
             if ($env{'form.answer_output_mode'} eq 'tex') {
                 return ($env{'form.grade_target'});
             }
@@ -146,10 +146,10 @@ sub get_target {
 	    }
 	} else {
 	    if ($env{'form.problemstate'} eq 'WEB_GRADE') {
-                return ('grade','webgrade','answer');
+		return ('grade','webgrade','answer');
             } elsif ($env{'form.problemmode'} eq 'view') {
                 return ('grade','web','answer');
-            } elsif ($env{'form.problemmode'} eq 'saveview') {
+	    } elsif ($env{'form.problemmode'} eq 'saveview') {
                 return ('modified','web','answer');
             } elsif ($env{'form.problemmode'} eq 'discard') {
                 return ('web','answer');
@@ -157,11 +157,11 @@ sub get_target {
                      ($env{'form.problemmode'} eq 'undo')) {
                 return ('modified','no_output_web','edit');
             } elsif ($env{'form.problemmode'} eq 'edit') {
-                return ('no_output_web','edit');
-            } else {
-                return ('web');
-            }
-	}
+		return ('no_output_web','edit');
+	    } else {
+		return ('web');
+	    }
+        }
 #
 # End of Construction Space
 #
@@ -178,16 +178,6 @@ sub setup_vars {
 #  return ';$external::target='.$target.';';
 }
 
-sub createmenu {
-    my ($which,$request)=@_;
-    if ($which eq 'grade') {
-	$request->print('<script type="text/javascript" language="JavaScript"> 
-          hwkmenu=window.open("/res/adm/pages/homeworkmenu.html","homeworkremote",
-                 "height=350,width=150,menubar=no");
-          </script>');
-    }
-}
-
 sub proctor_checked_in {
     my ($slot_name,$slot,$type)=@_;
     my @possible_proctors=split(",",$slot->{'proctor'});
@@ -256,20 +246,24 @@ sub check_slot_access {
 #    }
     my $slotstatus='NOT_IN_A_SLOT';
     my ($returned_slot,$slot_name);
+    my $now = time;
+    my $num_usable_slots = 0;
     foreach my $slot (@slots) {
 	$slot =~ s/(^\s*|\s*$)//g;
 	&Apache::lonxml::debug("getting $slot");
 	my %slot=&Apache::lonnet::get_slot($slot);
 	&Apache::lonhomework::showhash(%slot);
-	if ($slot{'starttime'} < time &&
-	    $slot{'endtime'} > time &&
+        next if ($slot{'endtime'} < $now);
+        $num_usable_slots ++;
+	if ($slot{'starttime'} < $now &&
+	    $slot{'endtime'} > $now &&
 	    &Apache::loncommon::check_ip_acc($slot{'ip'})) {
 	    &Apache::lonxml::debug("$slot is good");
 	    $slotstatus='NEEDS_CHECKIN';
 	    $returned_slot=\%slot;
 	    $slot_name=$slot;
 	    last;
-	}
+        } 
     }
     if ($slotstatus eq 'NEEDS_CHECKIN' &&
 	&proctor_checked_in($slot_name,$returned_slot,$type)) {
@@ -309,11 +303,36 @@ sub check_slot_access {
     # However, the problem is not closed, and potentially, another slot might be
     # used to gain access to it to work on it, until the due date is reached, and the
     # problem then becomes CLOSED.  Therefore return the slotstatus - 
-    # (which will be NOT_IN_SLOT).
-    if (!defined($slot_name)
-	&& $checkedin 
-	&& $type eq 'problem') {
-        return ($slotstatus);
+    # (which will be one of: NOT_IN_A_SLOT, RESERVABLE, RESERVABLE_LATER, or NOTRESERVABLE.
+    if (!defined($slot_name) && $type eq 'problem') {
+        if ($slotstatus eq 'NOT_IN_A_SLOT') {
+            if (!$num_usable_slots) {
+                if ($env{'request.course.id'}) {
+                    my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
+                    my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
+                    my ($symb)=&Apache::lonnet::whichuser();
+                    $slotstatus = 'NOTRESERVABLE';
+                    my ($reservable_now_order,$reservable_now,$reservable_future_order,
+                        $reservable_future) = 
+                        &Apache::loncommon::get_future_slots($cnum,$cdom,$now,$symb);
+                    if ((ref($reservable_now_order) eq 'ARRAY') && (ref($reservable_now) eq 'HASH')) {
+                        if (@{$reservable_now_order} > 0) {
+                            $slotstatus = 'RESERVABLE';
+                            $datemsg = $reservable_now->{$reservable_now_order->[-1]}{'endreserve'};
+                        }
+                    }
+                    unless ($slotstatus eq 'RESERVABLE') {
+                        if ((ref($reservable_future_order) eq 'ARRAY') && (ref($reservable_future) eq 'HASH')) {
+                            if (@{$reservable_future_order} > 0) {
+                                $slotstatus = 'RESERVABLE_LATER';
+                                $datemsg = $reservable_future->{$reservable_future_order->[0]}{'startreserve'};
+                            }
+                        }
+                    }
+                }
+            }
+        }
+        return ($slotstatus,$datemsg);
     }
 
     if ($slotstatus eq 'NOT_IN_A_SLOT' 
@@ -386,7 +405,12 @@ sub check_access {
 	    $date=&mt("can not be accessed from your location.");
 	    return($status,$date);
 	}
-
+	if ($env{'form.grade_imsexport'}) {
+            if (($env{'request.course.id'}) && 
+                (&Apache::lonnet::allowed('mdc',$env{'request.course.id'}))) {
+                return ('SHOW_ANSWER');
+            }
+        }
 	foreach my $temp ("opendate","duedate","answerdate") {
 	    $lastdate = $date;
 	    if ($temp eq 'duedate') {
@@ -444,13 +468,16 @@ sub check_access {
 	if ( $tries eq '' ) { $tries = '0'; }
 	if ( $maxtries eq '' && 
 	     $env{'request.state'} ne 'construct') { $maxtries = '2'; } 
+	$Apache::lonhomework::results{'resource.'.$id.'.maxtries'}=$maxtries;
 	if ($maxtries && $tries >= $maxtries) { $status = 'CANNOT_ANSWER'; }
 	# if (correct and show prob status) or excused then CANNOT_ANSWER
-	if(($Apache::lonhomework::history{"resource.$id.solved"}=~/^correct/
-	    &&
-	    &show_problem_status())
-	   ||
-	   $Apache::lonhomework::history{"resource.$id.solved"}=~/^excused/) {
+	if ( ($Apache::lonhomework::history{"resource.$id.solved"}=~/^correct/)
+	      && (&show_problem_status()) ) {
+            if (($Apache::lonhomework::history{"resource.$id.awarded"} >= 1) ||
+                (&Apache::lonnet::EXT("resource.$id.retrypartial") !~/^1|on|yes$/i)) {
+	        $status = 'CANNOT_ANSWER';
+            }
+        } elsif ($Apache::lonhomework::history{"resource.$id.solved"}=~/^excused/) {
 	    $status = 'CANNOT_ANSWER';
 	}
 	if ($status eq 'CANNOT_ANSWER'
@@ -700,7 +727,7 @@ sub analyze_header {
     my $js = &Apache::structuretags::setmode_javascript();
 
     # Breadcrumbs
-    my $brcrum = [{'href' => &Apache::loncommon::authorspace(),
+    my $brcrum = [{'href' => &Apache::loncommon::authorspace($request->uri),
                    'text' => 'Construction Space'},
                   {'href' => '',
                    'text' => 'Problem Testing'},
@@ -913,8 +940,9 @@ sub editxmlmode {
 
 	$problem='';
     }
+
     if (($env{'form.problemmode'} eq 'saveeditxml') ||
-        ($env{'form.problemmode'} eq 'saveviewxml') ||
+        ($env{'form.problemmode'} eq 'saveviewxml') || 
         ($env{'form.problemmode'} eq 'undoxml')) {
 	my $error=&handle_save_or_undo($request,\$problem,
 				       \$env{'form.editxmltext'});
@@ -935,10 +963,9 @@ sub editxmlmode {
 	    &Apache::loncommon::resize_textarea_js().
             &Apache::structuretags::setmode_javascript().
             &Apache::lonhtmlcommon::dragmath_js("EditMathPopup");
-	my $only_body =  ($env{'environment.remote'} eq 'off')? 0 : 1;
 
     # Breadcrumbs
-    my $brcrum = [{'href' => &Apache::loncommon::authorspace(),
+    my $brcrum = [{'href' => &Apache::loncommon::authorspace($request->uri),
                    'text' => 'Construction Space'},
                   {'href' => '',
                    'text' => 'Problem Editing'}];
@@ -946,13 +973,13 @@ sub editxmlmode {
 	my $start_page = 
 	    &Apache::loncommon::start_page(&mt("EditXML [_1]",$file),$js,
 					   {'no_auto_mt_title' => 1,
-					    'only_body'        => $only_body,
+					    'only_body'        => 0,
 					    'add_entries'      => {
 						'onresize' => q[resize_textarea('LC_editxmltext','LC_aftertextarea')],
 						'onload'   => q[resize_textarea('LC_editxmltext','LC_aftertextarea')],
-                                    },
+                                                                  },
                                                 'bread_crumbs' => $brcrum,
-                                           });
+                                             });
 
     $result=$start_page
            .&Apache::loncommon::head_subbox(
@@ -971,8 +998,8 @@ sub editxmlmode {
 
          $result.='<input type="hidden" name="problemmode" value="saveedit" />'.
                   &Apache::structuretags::problem_edit_buttons('editxml');
-
-         $result.='<hr style="clear:both;" />'.&Apache::lonxml::message_location().'</div>'.
+         
+         $result.='<hr style="clear:both;" />'.&Apache::lonxml::message_location().'</div>'.  
                   '<textarea '.&Apache::edit::element_change_detection().
 	              ' rows="'.$rows.'" cols="'.$cols.'" style="width:100%" '.
 		      ' name="editxmltext" id="LC_editxmltext">'.
@@ -1016,8 +1043,8 @@ sub renderpage {
 	    $problem='';
 	    my $filename=(split('/',$file))[-1];
 	    my $error =
-                '<p class="LC_error">'
-                .&mt('Unable to find [_1]',
+		'<p class="LC_error">'
+               .&mt('Unable to find [_1]',
 			   '<span class="LC_filename">'.$filename.'</span>')
 		."</p>";
 	    $result.=
@@ -1101,6 +1128,7 @@ sub get_template_list {
     my $count = 0;
     my $currentcategory='';
     my $first = 1;
+    my $londocroot = $Apache::lonnet::perlvar{'lonDocRoot'};
     foreach my $file (@files) {
 	next if ($file->[1] !~ /\S/);
         if ($file->[2] ne $currentcategory) {
@@ -1124,9 +1152,9 @@ sub get_template_list {
            $result.=&Apache::loncommon::help_open_topic($file->[3]);
         }
         my $filename=$file->[0];
-        $filename=~s/^\/home\/httpd\/html//;
+        $filename=~s{^\Q$londocroot\E}{};
         $result.=' <span class="LC_fontsize_small">'
-                .'<a href="'.$filename.'?inhibitmenu=yes" target="sample">'.&mt('Example').'</a>'
+                .&Apache::loncommon::modal_link($filename.'?inhibitmenu=yes',&mt('Example'),600,420,'sample')
                 .'</span><br />'."\n";
         $count ++;
     }
@@ -1160,12 +1188,10 @@ sub newproblem {
 	&renderpage($request,$dest);
     } else {
 	my $url=&HTML::Entities::encode($request->uri,'<>&"');
-	my $shownurl=$url;	
-	$shownurl=~s-^/~-/priv/-;
 	my $dest = &Apache::lonnet::filelocation("",$request->uri);
 	my $errormsg;
 	my $instructions;
-        my $brcrum = [{'href' => &Apache::loncommon::authorspace(),
+        my $brcrum = [{'href' => &Apache::loncommon::authorspace($request->uri),
                        'text' => 'Construction Space'},
                       {'href' => '',
                        'text' => "Create New $extension"}];
@@ -1180,7 +1206,7 @@ sub newproblem {
        .'<h1>'.&mt("Creating a new $extension resource.")."</h1>
 $errormsg
 ".&mt("The requested file [_1] currently does not exist.",
-      '<span class="LC_filename">'.$shownurl.'</span>').'
+      '<span class="LC_filename">'.$url.'</span>').'
 <p class="LC_info">
 '.&mt("To create a new $extension, select a template from the".
       " list below. Then click on the \"Create $extension\" button.").'
@@ -1251,11 +1277,11 @@ sub handler {
 		#first visit to problem in construction space
 		$env{'form.problemmode'}= 'view';
 		&renderpage($request,$file);
-            } elsif (($env{'form.problemmode'} eq 'editxml') ||
+	    } elsif (($env{'form.problemmode'} eq 'editxml') || 
                      ($env{'form.problemmode'} eq 'saveeditxml') ||
                      ($env{'form.problemmode'} eq 'saveviewxml') ||
                      ($env{'form.problemmode'} eq 'undoxml')) {
-                &editxmlmode($request,$file);
+		&editxmlmode($request,$file);
 	    } elsif ($env{'form.problemmode'} eq 'calcanswers') {
 		&analyze($request,$file);
 	    } else {