--- loncom/homework/lonhomework.pm	2013/04/01 21:40:14	1.337
+++ loncom/homework/lonhomework.pm	2016/08/08 12:07:20	1.344.2.4
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # The LON-CAPA Homework handler
 #
-# $Id: lonhomework.pm,v 1.337 2013/04/01 21:40:14 raeburn Exp $
+# $Id: lonhomework.pm,v 1.344.2.4 2016/08/08 12:07:20 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -163,7 +163,7 @@ sub get_target {
 	    }
         }
 #
-# End of Construction Space
+# End of Authoring Space
 #
     }
 #
@@ -208,12 +208,12 @@ sub proctor_checked_in {
 }
 
 sub check_slot_access {
-    my ($id,$type)=@_;
+    my ($id,$type,$symb,$partlist)=@_;
 
     # does it pass normal muster
-    my ($status,$datemsg)=&check_access($id);
+    my ($status,$datemsg)=&check_access($id,$symb);
     
-    my $useslots = &Apache::lonnet::EXT("resource.0.useslots");
+    my $useslots = &Apache::lonnet::EXT("resource.0.useslots",$symb);
     if ($useslots ne 'resource' && $useslots ne 'map' 
 	&& $useslots ne 'map_map') {
 	return ($status,$datemsg);
@@ -237,8 +237,8 @@ sub check_slot_access {
 	}
     }
 
-    my $availablestudent = &Apache::lonnet::EXT("resource.0.availablestudent");
-    my $available = &Apache::lonnet::EXT("resource.0.available");
+    my $availablestudent = &Apache::lonnet::EXT("resource.0.availablestudent",$symb);
+    my $available = &Apache::lonnet::EXT("resource.0.available",$symb);
     my @slots= (split(':',$availablestudent),split(':',$available));
 
 #    if (!@slots) {
@@ -248,6 +248,9 @@ sub check_slot_access {
     my ($returned_slot,$slot_name);
     my $now = time;
     my $num_usable_slots = 0;
+    unless ($symb) {
+        ($symb) = &Apache::lonnet::whichuser();
+    }
     foreach my $slot (@slots) {
 	$slot =~ s/(^\s*|\s*$)//g;
 	&Apache::lonxml::debug("getting $slot");
@@ -271,9 +274,10 @@ sub check_slot_access {
 	$slotstatus=$status;
     }
 
-    my ($is_correct,$got_grade,$checkedin);
+    my ($is_correct,$got_grade,$checkin,$checkinslot,$checkedin,$consumed_uniq);
     if ($type eq 'Task') {
 	my $version=$Apache::lonhomework::history{'resource.0.version'};
+        $checkin = "resource.$version.0.checkedin";
 	$got_grade = 
 	    ($Apache::lonhomework::history{"resource.$version.0.status"} 
 	     =~ /^(?:pass|fail)$/);
@@ -283,10 +287,57 @@ sub check_slot_access {
 	$checkedin =
 	    $Apache::lonhomework::history{"resource.$version.0.checkedin"};
     } elsif ($type eq 'problem') {
-	$got_grade  = 1;
-	$checkedin  = $Apache::lonhomework::history{"resource.0.checkedin"};
-	$is_correct =
-	    ($Apache::lonhomework::history{"resource.0.solved"} =~/^correct_/);
+        $checkin = 'resource.0.checkedin';
+	$checkedin  = $Apache::lonhomework::history{$checkin};
+    }
+    if ($checkedin) {
+        $checkinslot = $Apache::lonhomework::history{"$checkin.slot"};
+        my %slot=&Apache::lonnet::get_slot($checkinslot);
+        $consumed_uniq = $slot{'uniqueperiod'};
+    }
+    if ($type eq 'problem') {
+        if ((ref($partlist) eq 'ARRAY') && (@{$partlist} > 0)) {
+            my ($numcorrect,$numgraded) = (0,0);
+            foreach my $part (@{$partlist}) {
+                my $currtries = $Apache::lonhomework::history{"resource.$part.tries"};
+                my $maxtries = &Apache::lonnet::EXT("resource.$part.maxtries",$symb);
+                my $probstatus = &Apache::structuretags::get_problem_status($part);
+                my $earlyout;
+                unless (($probstatus eq 'no') ||
+                        ($probstatus eq 'no_feedback_ever')) {
+                    if ($Apache::lonhomework::history{"resource.$part.solved"} =~/^correct_/) {
+                        $numcorrect ++;
+                    } else {
+                        $earlyout = 1;
+                    }
+                }
+                if (($currtries == $maxtries) || ($is_correct)) {
+                    $earlyout = 1;
+                } else {
+                    $numgraded ++;
+                }
+                last if ($earlyout);
+            }
+            my $numparts = scalar(@{$partlist});
+            if ($numparts == $numcorrect) {
+                $is_correct = 1;
+            }
+            if ($numparts == $numgraded) {
+                $got_grade = 1;
+            }
+        } else {
+            my $currtries = $Apache::lonhomework::history{"resource.0.tries"};
+            my $maxtries = &Apache::lonnet::EXT("resource.0.maxtries",$symb);
+            my $probstatus = &Apache::structuretags::get_problem_status('0');
+            unless (($probstatus eq 'no') ||
+                    ($probstatus eq 'no_feedback_ever')) {
+                $is_correct =
+                    ($Apache::lonhomework::history{"resource.0.solved"} =~/^correct_/);
+            }
+            unless (($currtries == $maxtries) || ($is_correct)) {
+                $got_grade = 1;
+            }
+        }
     }
     
     &Apache::lonxml::debug(" slot is $slotstatus checkedin ($checkedin) got_grade ($got_grade) is_correct ($is_correct)");
@@ -310,22 +361,63 @@ sub check_slot_access {
                 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'};
+                            if ((!$checkedin) || (ref($consumed_uniq) ne 'ARRAY')) {
+                                $slotstatus = 'RESERVABLE';
+                                $datemsg = $reservable_now->{$reservable_now_order->[-1]}{'endreserve'};
+                            } else {
+                                my ($uniqstart,$uniqend,$useslot);
+                                if (ref($consumed_uniq) eq 'ARRAY') {
+                                    ($uniqstart,$uniqend)=@{$consumed_uniq};
+                                }
+                                foreach my $slot (reverse(@{$reservable_now_order})) {
+                                    if ($reservable_now->{$slot}{'uniqueperiod'} =~ /^(\d+)\,(\d+)$/) {
+                                        my ($new_uniq_start,$new_uniq_end) = ($1,$2);
+                                        next if (!
+                                            ($uniqstart < $new_uniq_start && $uniqend < $new_uniq_start) ||
+                                            ($uniqstart > $new_uniq_end   &&  $uniqend > $new_uniq_end  ));
+                                    }
+                                    $useslot = $slot;
+                                    last;
+                                }
+                                if ($useslot) {
+                                    $slotstatus = 'RESERVABLE';
+                                    $datemsg = $reservable_now->{$useslot}{'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'};
+                                if ((!$checkedin) || (ref($consumed_uniq) ne 'ARRAY')) {
+                                    $slotstatus = 'RESERVABLE_LATER';
+                                    $datemsg = $reservable_future->{$reservable_future_order->[0]}{'startreserve'};
+                                } else {
+                                    my ($uniqstart,$uniqend,$useslot);
+                                    if (ref($consumed_uniq) eq 'ARRAY') {
+                                        ($uniqstart,$uniqend)=@{$consumed_uniq};
+                                    }
+                                    foreach my $slot (@{$reservable_future_order}) {
+                                        if ($reservable_future->{$slot}{'uniqueperiod'} =~ /^(\d+),(\d+)$/) {
+                                            my ($new_uniq_start,$new_uniq_end) = ($1,$2);
+                                            next if (!
+                                               ($uniqstart < $new_uniq_start && $uniqend < $new_uniq_start) ||
+                                               ($uniqstart > $new_uniq_end   &&  $uniqend > $new_uniq_end  ));
+                                        }
+                                        $useslot = $slot;
+                                        last;
+                                    }
+                                    if ($useslot) {
+                                        $slotstatus = 'RESERVABLE_LATER';
+                                        $datemsg = $reservable_future->{$useslot}{'startreserve'};
+                                    }
+                                }
                             }
                         }
                     }
@@ -364,7 +456,7 @@ sub check_slot_access {
 # JB, 9/24/2002: Any changes in this function may require a change
 # in lonnavmaps::resource::getDateStatus.
 sub check_access {
-    my ($id) = @_;
+    my ($id,$symb) = @_;
     my $date ='';
     my $status;
     my $datemsg = '';
@@ -394,11 +486,13 @@ sub check_access {
     &Apache::lonxml::debug("checking for part :$id:");
     &Apache::lonxml::debug("time:".time);
 
-    my ($symb)=&Apache::lonnet::whichuser();
+    unless ($symb) {
+        ($symb)=&Apache::lonnet::whichuser();
+    }
     &Apache::lonxml::debug("symb:".$symb);
     #if ($env{'request.state'} ne "construct" && $symb ne '') {
     if ($env{'request.state'} ne "construct") {
-        my $idacc = &Apache::lonnet::EXT("resource.$id.acc");
+        my $idacc = &Apache::lonnet::EXT("resource.$id.acc",$symb);
 	my $allowed=&Apache::loncommon::check_ip_acc($idacc);
 	if (!$allowed && ($Apache::lonhomework::browse ne 'F')) {
 	    $status='INVALID_ACCESS';
@@ -414,12 +508,12 @@ sub check_access {
 	foreach my $temp ("opendate","duedate","answerdate") {
 	    $lastdate = $date;
 	    if ($temp eq 'duedate') {
-		$date = &due_date($id);
+		$date = &due_date($id,$symb);
 	    } else {
-		$date = &Apache::lonnet::EXT("resource.$id.$temp");
+		$date = &Apache::lonnet::EXT("resource.$id.$temp",$symb);
 	    }
 	    
-	    my $thistype = &Apache::lonnet::EXT("resource.$id.$temp.type");
+	    my $thistype = &Apache::lonnet::EXT("resource.$id.$temp.type",$symb);
 	    if ($thistype =~ /^(con_lost|no_such_host)/ ||
 		$date     =~ /^(con_lost|no_such_host)/) {
 		$status='UNAVAILABLE';
@@ -428,10 +522,10 @@ sub check_access {
 	    }
 	    if ($thistype eq 'date_interval') {
 		if ($temp eq 'opendate') {
-		    $date=&Apache::lonnet::EXT("resource.$id.duedate")-$date;
+		    $date=&Apache::lonnet::EXT("resource.$id.duedate",$symb)-$date;
 		}
 		if ($temp eq 'answerdate') {
-		    $date=&Apache::lonnet::EXT("resource.$id.duedate")+$date;
+		    $date=&Apache::lonnet::EXT("resource.$id.duedate",$symb)+$date;
 		}
 	    }
 	    &Apache::lonxml::debug("found :$date: for :$temp:");
@@ -451,30 +545,30 @@ sub check_access {
 	    $datemsg=$date;
 	} elsif ($type eq 'opendate') {
 	    $status='CLOSED';
-	    $datemsg = &mt("will open on")." $date";
+	    $datemsg = &mt('will open on [_1]',$date);
 	} elsif ($type eq 'duedate') {
 	    $status='CAN_ANSWER';
-	    $datemsg = &mt("is due at")." $date";
+	    $datemsg = &mt('is due at [_1]',$date);
 	} elsif ($type eq 'answerdate') {
 	    $status='CLOSED';
-	    $datemsg = &mt("was due on")." $lastdate".&mt(", and answers will be available on")." $date";
+	    $datemsg = &mt('was due on [_1], and answers will be available on [_2]',
+                               $lastdate,$date);
 	}
     }
     if ($status eq 'CAN_ANSWER' ||
 	(($Apache::lonhomework::browse eq 'F') && ($status eq 'CLOSED'))) {
 	#check #tries, and if correct.
 	my $tries = $Apache::lonhomework::history{"resource.$id.tries"};
-	my $maxtries = &Apache::lonnet::EXT("resource.$id.maxtries");
+	my $maxtries = &Apache::lonnet::EXT("resource.$id.maxtries",$symb);
 	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()) ) {
             if (($Apache::lonhomework::history{"resource.$id.awarded"} >= 1) ||
-                (&Apache::lonnet::EXT("resource.$id.retrypartial") !~/^1|on|yes$/i)) {
+                (&Apache::lonnet::EXT("resource.$id.retrypartial",$symb) !~/^1|on|yes$/i)) {
 	        $status = 'CANNOT_ANSWER';
             }
         } elsif ($Apache::lonhomework::history{"resource.$id.solved"}=~/^excused/) {
@@ -486,14 +580,14 @@ sub check_access {
 	}
     }
     if ($status eq 'CAN_ANSWER' || $status eq 'CANNOT_ANSWER') {
-	my @interval=&Apache::lonnet::EXT("resource.$id.interval");
+	my @interval=&Apache::lonnet::EXT("resource.$id.interval",$symb);
 	&Apache::lonxml::debug("looking for interval @interval");
 	if ($interval[0]) {
-	    my $first_access=&Apache::lonnet::get_first_access($interval[1]);
+	    my $first_access=&Apache::lonnet::get_first_access($interval[1],$symb);
 	    &Apache::lonxml::debug("looking for accesstime $first_access");
 	    if (!$first_access) {
 		$status='NOT_YET_VIEWED';
-		my $due_date = &due_date($id);
+		my $due_date = &due_date($id,$symb);
 		my $seconds_left = $due_date - time;
 		if ($seconds_left > $interval[0] || $due_date eq '') {
 		    $seconds_left = $interval[0];
@@ -540,7 +634,7 @@ sub due_date {
     } else {
 	$date = $due_date;
     }
-    return $date
+    return $date;
 }
 
 sub seconds_to_human_length {
@@ -589,7 +683,7 @@ sub showarray {
 sub showhashsubset {
     my ($hash,$keyre) = @_;
     my $resultkey;
-    foreach $resultkey (sort keys %$hash) {
+    foreach $resultkey (sort(keys(%$hash))) {
 	if ($resultkey !~ /$keyre/) { next; }
 	if (ref($$hash{$resultkey})  eq 'ARRAY' ) {
 	    &Apache::lonxml::debug("$resultkey ---- ".
@@ -669,7 +763,7 @@ sub setupheader {
 }
 
 sub handle_save_or_undo {
-    my ($request,$problem,$result) = @_;
+    my ($request,$problem,$result,$getobjref) = @_;
 
     my $file    = &Apache::lonnet::filelocation("",$request->uri);
     my $filebak =$file.".bak";
@@ -712,6 +806,30 @@ sub handle_save_or_undo {
 	my $fh=Apache::File->new(">$file");
 	if (defined($fh)) {
 	    print $fh $$result;
+            if (ref($getobjref) eq 'SCALAR') {
+                if ($file =~ m{([^/]+)\.(html?)$}) {
+                    my $fname = $1;
+                    my $ext = $2;
+                    my $path = $file;
+                    $path =~ s/\Q$fname\E\.\Q$ext\E$//; 
+                    my (%allfiles,%codebase);
+                    &Apache::lonnet::extract_embedded_items($file,\%allfiles,
+                                                           \%codebase,$result);
+                    if (keys(%allfiles) > 0) {
+                        my $url = $request->uri;
+                        my $state = <<STATE;
+    <input type="hidden" name="action" value="upload_embedded" />
+    <input type="hidden" name="url" value="$url" />
+STATE
+                        $$getobjref = "<h3>".&mt("Reference Warning")."</h3>".
+                                      "<p>".&mt("Completed upload of the file. This file contained references to other files.")."</p>".
+                                      "<p>".&mt("Please select the locations from which the referenced files are to be uploaded.")."</p>".
+                                      &Apache::loncommon::ask_for_embedded_content($url,$state,\%allfiles,\%codebase,
+                                      {'error_on_invalid_names'   => 1,
+                                       'ignore_remote_references' => 1,});
+                    }
+                }
+            }
 	} else {
 	    &Apache::lonxml::info('<span class="LC_error">'.
 				  &mt("Unable to write to [_1]",
@@ -730,7 +848,7 @@ sub analyze_header {
 
     # Breadcrumbs
     my $brcrum = [{'href' => &Apache::loncommon::authorspace($request->uri),
-                   'text' => 'Construction Space'},
+                   'text' => 'Authoring Space'},
                   {'href' => '',
                    'text' => 'Problem Testing'},
                   {'href' => '',
@@ -964,7 +1082,7 @@ sub editxmlmode {
 
     # Breadcrumbs
     my $brcrum = [{'href' => &Apache::loncommon::authorspace($request->uri),
-                   'text' => 'Construction Space'},
+                   'text' => 'Authoring Space'},
                   {'href' => '',
                    'text' => 'Problem Editing'}];
 
@@ -1041,13 +1159,11 @@ sub renderpage {
 	    $problem='';
 	    my $filename=(split('/',$file))[-1];
 	    my $error =
-		'<p class="LC_error">'
-               .&mt('Unable to find [_1]',
-			   '<span class="LC_filename">'.$filename.'</span>')
-		."</p>";
+                &mt('Unable to find [_1]',
+			   '<span class="LC_filename">'.$filename.'</span>');
 	    $result.=
 		&Apache::loncommon::simple_error_page($request,'Not available',
-						      $error);
+						      $error,{'no_auto_mt_msg' => 1});
 	    return;
 	}
 
@@ -1108,9 +1224,10 @@ sub get_template_list {
 		     '/templates/*.'.$glob_extension);
     @files = map {[$_,&mt(&Apache::lonnet::metadata($_, 'title')),
                       (&Apache::lonnet::metadata($_, 'category')?&mt(&Apache::lonnet::metadata($_, 'category')):&mt('Miscellaneous')),
-                      &mt(&Apache::lonnet::metadata($_, 'help'))]} (@files);
+                      &Apache::lonnet::metadata($_, 'help')]} (@files);
     @files = sort {$a->[2].$a->[1] cmp $b->[2].$b->[1]} (@files);
     my ($midpoint,$seconddiv,$numfiles);
+    my @noexamplelink = ('blank.problem','blank.library','script.library');
     $numfiles = 0;
     foreach my $file (@files) {
         next if ($file->[1] !~ /\S/);
@@ -1149,11 +1266,16 @@ sub get_template_list {
         if ($file->[3]) {
            $result.=&Apache::loncommon::help_open_topic($file->[3]);
         }
+        # Provide example link
         my $filename=$file->[0];
         $filename=~s{^\Q$londocroot\E}{};
-        $result.=' <span class="LC_fontsize_small">'
-                .&Apache::loncommon::modal_link($filename.'?inhibitmenu=yes',&mt('Example'),600,420,'sample')
-                .'</span><br />'."\n";
+        if (!(grep($filename =~ /\Q$_\E$/,@noexamplelink))) {
+            $result .= ' <span class="LC_fontsize_small">'
+                      .&Apache::loncommon::modal_link(
+                           $filename.'?inhibitmenu=yes',&mt('Example'),600,420,'sample')
+                      .'</span>';
+        }
+        $result .= '<br />'."\n";
         $count ++;
     }
     if ($numfiles > 0) {
@@ -1190,7 +1312,7 @@ sub newproblem {
 	my $errormsg;
 	my $instructions;
         my $brcrum = [{'href' => &Apache::loncommon::authorspace($request->uri),
-                       'text' => 'Construction Space'},
+                       'text' => 'Authoring Space'},
                       {'href' => '',
                        'text' => "Create New $extension"}];
 	my $start_page = 
@@ -1249,7 +1371,7 @@ sub handler {
     my $file=&Apache::lonnet::filelocation("",$request->uri);
 
     #check if we know where we are
-    if ($env{'request.course.fn'} && !&Apache::lonnet::symbread()) { 
+    if ($env{'request.course.fn'} && !&Apache::lonnet::symbread('','',1,1)) { 
 	# if we are browsing we might not be able to know where we are
 	if ($Apache::lonhomework::browse ne 'F' && 
 	    $env{'request.state'} ne "construct") {