--- loncom/interface/lonmenu.pm	2016/02/26 21:44:39	1.439
+++ loncom/interface/lonmenu.pm	2016/03/15 14:25:26	1.440
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Routines to control the menu
 #
-# $Id: lonmenu.pm,v 1.439 2016/02/26 21:44:39 raeburn Exp $
+# $Id: lonmenu.pm,v 1.440 2016/03/15 14:25:26 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -1568,28 +1568,113 @@ END
 }
 
 # This creates a "done button" for timed events.  The confirmation box is a jQuery
-# dialog widget.  Clicking OK will set (LC_interval_done = 'true') which is checked in 
-# lonhomework.pm.
+# dialog widget. If the interval parameter requires a proctor key for the timed 
+# event to be marked done, there will also be a textbox where that can be entered. 
+# Clicking OK will set the value of LC_interval_done to 'true', and, if needed will 
+# set the value of LC_interval_done_proctorpass to the text entered in that box, 
+# and submit the corresponding form.
+# 
+# The &zero_time() routine in lonhomework.pm is called when a page is rendered if
+# LC_interval_done is true.
+#
 sub done_button_js {
-    my ($type,$height) = @_;
-    if ($height !~ /^\d+$/) {
-        $height = 320;
-    }
+    my ($type,$width,$height,$proctor) = @_;
     my %lt = &Apache::lonlocal::texthash(
                  title    => 'WARNING!',
                  button   => 'Done',
                  preamble => 'You are trying to end this timed event early.',
                  map      => 'Confirming that you are done will cause the time to expire and prevent you from changing any answers in the current folder.',
                  resource => 'Confirming that you are done will cause the time to expire for this question, and prevent you from changing your answer(s).', 
-                 ok       => 'Click "OK" if you are completely finished.',
+                 okdone   => 'Click "OK" if you are completely finished.',
                  cancel   => 'Click "Cancel" to continue working.',
+                 proctor  => 'Ask a proctor to enter the key, then click "OK" if you are completely finished.',
+                 ok       => 'OK',
+                 exit     => 'Cancel',
+                 key      => 'Key:',
+                 nokey    => 'A proctor key is required', 
     );
     my $confirm;
     if (($type eq 'map') || ($type eq 'resource')) {
-        $confirm = $lt{'preamble'}.' '.$lt{$type}.' '.$lt{'ok'}.' '.$lt{'cancel'};
-    }
-    if ($confirm) {
-        return <<END;
+        if ($proctor) {
+            $confirm = $lt{'preamble'}.' '.$lt{$type};
+            if ($height !~ /^\d+$/) {
+                $height = 400;
+            }
+            if ($width !~ /^\d+$/) {
+                $width = 400;
+            }
+            return <<END;
+<form method="post" name="LCdoneButton" action="">
+    <input type="hidden" name="LC_interval_done" value="" />
+    <input type="hidden" name="LC_interval_done_proctorpass" value="" />
+    <button id="LC_done-confirm-opener" type="button">$lt{'button'}</button>
+</form>
+
+<div id="LC_done-confirm" title="$lt{'title'}">
+  <p>$lt{'preamble'} $lt{$type}</p>
+  <p>$lt{'proctor'}</p>
+  <form>
+    <label>$lt{'key'}<input type="password" name="LC_interval_done_proctorkey" value="" /></label>
+    <input type="submit" tabindex="-1" style="position:absolute; top:-1000px" />
+  </form>
+  <p>$lt{'cancel'}</p>
+</div>
+
+<script type="text/javascript">
+// <![CDATA[
+    \$( "#LC_done-confirm" ).dialog({ autoOpen: false });
+    \$( "#LC_done-confirm-opener" ).on("click", function() {
+        \$( "#LC_done-confirm" ).dialog("open");
+        \$( "#LC_done-confirm" ).dialog({
+            height: $height,
+            width: $width,
+            modal: true,
+            resizable: false,
+            buttons: [
+                {
+                    text: "$lt{'ok'}",
+                    click: function() {
+                        var proctorkey = \$( '[name="LC_interval_done_proctorkey"]' )[0].value;
+                        if ((proctorkey == '') || (proctorkey == null)) {
+                            alert("$lt{'nokey'}"); 
+                        } else { 
+                            \$( '[name="LC_interval_done"]' )[0].value = 'true';
+                            \$( '[name="LC_interval_done_proctorpass"]' )[0].value = proctorkey;
+                            \$( '[name="LCdoneButton"]' )[0].submit();
+                        }
+                    },
+                },
+                {
+                    text: "$lt{'exit'}",
+                    click: function() {
+                        \$("#LC_done-confirm").dialog( "close" );
+                    }
+                }
+            ],
+            close: function() {
+                \$( '[name="LC_interval_done_proctorkey"]' )[0].value = '';
+            }
+        });
+        \$( "#LC_done-confirm" ).find( "form" ).on( "submit", function( event ) {
+            event.preventDefault();
+            \$( '[name="LC_interval_done"]' )[0].value = 'true';
+            \$( '[name="LC_interval_done_proctorpass"]' )[0].value = \$( '[name="LC_interval_done_proctorkey"]' )[0].value;
+            \$( '[name="LCdoneButton"]' )[0].submit();
+        });
+});
+
+// ]]>
+</script>
+
+END
+        } else {
+            if ($height !~ /^\d+$/) {
+                $height = 320;
+            }
+            if ($width !~ /^\d+$/) {
+                $width = 320;
+            }
+            return <<END;
 
 <form method="post" name="LCdoneButton" action="">
     <input type="hidden" name="LC_interval_done" value="" />
@@ -1597,7 +1682,7 @@ sub done_button_js {
 </form>
 
 <div id="LC_done-confirm" title="$lt{'title'}">
-    <p>$confirm</p>
+    <p>$lt{'preamble'} $lt{$type} $lt{'okdone'} $lt{'cancel'}</p>
 </div>
 
 <script type="text/javascript">
@@ -1608,23 +1693,31 @@ sub done_button_js {
     \$( "#LC_done-confirm" ).dialog({
       resizable: false,
       height: $height,
+      width: $width,
       modal: true,
-      buttons: {
-        "OK": function() {
-            \$( this ).dialog( "close" );
-            \$( '[name="LC_interval_done"]' )[0].value = 'true';
-            \$( '[name="LCdoneButton"]' )[0].submit();
-        },
-        Cancel: function() {
-          \$( this ).dialog( "close" );
-        }
-      }    
-    })
+      buttons: [
+                 {
+                    text: "$lt{'ok'}",
+                    click: function() {
+                        \$( this ).dialog( "close" );
+                        \$( '[name="LC_interval_done"]' )[0].value = 'true';
+                        \$( '[name="LCdoneButton"]' )[0].submit();
+                    },
+                 },
+                 {
+                     text: "$lt{'exit'}",
+                     click: function() {
+                         \$( this ).dialog( "close" );
+                     },
+                  },
+               ],
+       });
 });
 // ]]>
 </script>
 
 END
+        }
     } else {
         return;
     }
@@ -2293,9 +2386,9 @@ sub countdown_timer {
         }
         my $duedate = &Apache::lonnet::EXT("resource.0.duedate");
         my @interval=&Apache::lonnet::EXT("resource.0.interval");
-        my ($timelimit,$usesdone);
+        my ($timelimit,$usesdone,$proctor,$secret);
         if (@interval > 1) {
-            ($timelimit,$usesdone) = split(/_/,$interval[0]); 
+            ($timelimit,$usesdone,$proctor,$secret) = split(/_/,$interval[0]); 
             my $first_access=&Apache::lonnet::get_first_access($interval[1]);
             if ($first_access > 0) {
                 if ($first_access+$timelimit > time) {
@@ -2313,7 +2406,7 @@ sub countdown_timer {
                 $collapse = '&#9658;&nbsp;';
                 if ((@interval > 1) && ($hastimeleft)) {
                     if ($usesdone eq 'done') {
-                        $donebutton = &done_button_js($interval[1]);
+                        $donebutton = &done_button_js($interval[1],'','',$proctor);
                     }
                 }
             } else {