--- loncom/interface/lonparmset.pm	2011/01/15 16:21:42	1.509
+++ loncom/interface/lonparmset.pm	2011/05/23 09:29:27	1.513
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Handler to set parameters for assessments
 #
-# $Id: lonparmset.pm,v 1.509 2011/01/15 16:21:42 www Exp $
+# $Id: lonparmset.pm,v 1.513 2011/05/23 09:29:27 foxr Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -137,33 +137,41 @@ javascript function 'pjump'.
 
 =item extractResourceInformation() : 
 
-Given the course data hash, extractResourceInformation extracts lots of information about the course's resources into a variety of hashes.
+ extractResourceInformation extracts lots of information about all of the the course's resources into a variety of hashes.
 
 Input: See list below:
 
-=item * B<ids> : An array that will contain all of the ids in the course.
+=item * B<env{'user.name'}> : Current username
 
-=item * B<typep> : hash, id->type, where "type" contains the extension of the file, thus, I<problem exam quiz assess survey form>.
+=item * B<env{'user.domain'}> : Domain of current user.
 
-=item * B<keyp> : hash, id->key list, will contain a comma separated list of the meta-data keys available for the given id
+=item * b<env{"request.course.fn"} : Course
 
-=item * B<allparms> : hash, name of parameter->display value (what is the display value?)
+Outputs: See list below:
 
-=item * B<allparts> : hash, part identification->text representation of part, where the text representation is "[Part $part]"
+=item * B<ids> (out) : An array that will contain all of the ids in the course.
 
-=item * B<allkeys> : hash, full key to part->display value (what's display value?)
+=item * B<typep>(out) : hash, id->type, where "type" contains the extension of the file, thus, I<problem exam quiz assess survey form>.
 
-=item * B<allmaps> : hash, ???
+=item * B<keyp> (out) : hash, id->key list, will contain a comma separated list of the meta-data keys available for the given id
 
-=item * B<fcat> : ???
+=item * B<allparms> (out) : hash, name of parameter->display value (what is the display value?)
 
-=item * B<defp> : hash, ???
+=item * B<allparts> (out) : hash, part identification->text representation of part, where the text representation is "[Part $part]"
+
+=item * B<allmaps> (out) : hash, ???
 
 =item * B<mapp> : ??
 
 =item * B<symbp> : hash, id->full sym?
 
+=item * B<maptitles>
+
+=item * B<uris>
 
+=item * B<keyorder>
+
+=item * B<defkeytype>
 
 =item isdateparm()
 
@@ -196,8 +204,8 @@ Input: See list below:
 Show assessment data and parameters.  This is a large routine that should
 be simplified and shortened... someday.
 
-Inputs: $r
-
+Inputs: $r - the Apache request object.
+  
 Returns: nothing
 
 Variables used (guessed by Jeremy):
@@ -1165,6 +1173,7 @@ sub extractResourceInformation {
         $$typep{$id}=$1;
         $$keyp{$id}='';
         $$uris{$id}=$srcf;
+
         foreach my $key (split(/\,/,&Apache::lonnet::metadata($srcf,'allpossiblekeys'))) {
             next if ($key!~/^parameter_/);
 
@@ -1264,14 +1273,12 @@ sub parmmenu {
             ele = document.forms.parmform.elements[i];
             if (ele.name == checkName) {
                 document.forms.parmform.elements[i].checked=value;
-                document.getElementById(document.forms.parmform.elements[i].value.concat(li)).style.display = displayOverview;
             }
         }
     }
 
     function checkthis(thisvalue, checkName) {
 
-        document.getElementById(thisvalue.concat("_li")).style.display = "";        
 
     for (i=0; i<document.forms.parmform.elements.length; i++) {
             ele = document.forms.parmform.elements[i];
@@ -1322,57 +1329,13 @@ sub parmmenu {
     checkthis('problemstatus','pscat');
     }
 
-    function hideParms() {
-        document.getElementById('LC_parm_overview_parm_menu').style.display = "none";
-    }
-
-    function showParms() {
-        document.getElementById('LC_parm_overview_parm_menu').style.display = "";
-    }
-
-    function checkboxChecked(id) {
-        var li = "_li";
-        var id_li = id.concat(li);
-        if (document.getElementById(id_li).style.display == "none") {
-            document.getElementById(id_li).style.display = "";
-        }
-        else {
-            document.getElementById(id_li).style.display = "none";
-        }
-    }
 // ]]>
 </script>
 ENDSCRIPT
-    $r->print(&Apache::lonhtmlcommon::row_title(&mt('Select Parameters to View')));
-
-    #part to print selected parms overview
-    $r->print(&mt('Selected Parameters:').'<br />');
-
-    #print out all possible parms and hide them by default
-    $r->print('<ul class="LC_parm_parmlist">');
-    foreach $tempkey (&keysindisplayorder($allparms,$keyorder)) {
-        $r->print('<li id="'.$tempkey.'_li" value="'.$tempkey.'_li" name="pscat_li"');
-        if (!($$pscat[0] eq "all" || grep $_ eq $tempkey, @{$pscat})) {
-            $r->print(' style="display:none"');
-        }
-        $r->print('>'
-                 .($$allparms{$tempkey}=~/\S/ ? $$allparms{$tempkey} : $tempkey)
-                 .'</li>'
-        );
-    }
-    $r->print('</ul>');
 
     $r->print('<hr />');
     &shortCuts($r,$allparms,$pscat,$keyorder);
     $r->print('<hr />');
-
-    $r->print(
-        '<p><a href="javascript:showParms()">'
-       .&mt('Show detailed Parameter Selection')
-       .'</a></p>'
-    );
-
-    $r->print(&Apache::lonhtmlcommon::row_closure(1));
 }
 # return a hash
 sub categories {
@@ -1399,6 +1362,8 @@ sub lookUpTableParameter {
         'contentopen' => 'time_settings',
         'contentclose' => 'time_settings',
         'discussend' => 'time_settings',
+	'printopendate' => 'time_settings',
+	'printclosedate' => 'time_settings',
         'weight' => 'grading',
         'handgrade' => 'grading',
         'maxtries' => 'tries',
@@ -1498,24 +1463,12 @@ sub parmboxes {
         'file_submission' => [],
         'misc' => [],
     );
-    my $hidelink =
-        '<p>'
-       .'<a href="javascript:hideParms()">'
-       .&mt('Hide detailed Parameter Selection')
-       .'</a>'
-       .'</p>'
-       ."\n";
-;
+
     foreach $tempparameter (keys %$allparms) {
         &whatIsMyCategory($tempparameter, \%categoryList);
     }
     #part to print the parm-list
-    $r->print(
-        '<div id="LC_parm_overview_parm_menu" class="LC_Box" style="display:none">'."\n"
-       .'<h3>'.&mt('Parameter').'</h3>'."\n"
-       .$hidelink
-       .'<div class="LC_columnSection">'."\n"
-    );
+    $r->print('<div class="LC_columnSection">'."\n");
 
     #Print parameters
     for my $key (sort { $category_order{$a} <=> $category_order{$b} } keys %categoryList) {
@@ -1530,7 +1483,6 @@ sub parmboxes {
                     $r->print('<span class="LC_nobreak">'
                              .'<label><input type="checkbox" name="pscat" ');
                 $r->print('value="'.$tempkey.'" ');
-                $r->print('onclick="checkboxChecked(\''.$tempkey.'\')"');
                 if ($$pscat[0] eq "all" || grep $_ eq $tempkey, @{$pscat}) {
                     $r->print(' checked="checked"');
                 }
@@ -1542,12 +1494,7 @@ sub parmboxes {
         }
     }
 
-    #&shortCuts($r,$allparms,$pscat,$keyorder);
-    $r->print(
-        "</div>\n"
-       .$hidelink
-       ."</div>\n"
-    );
+    $r->print("</div>\n");
 }
 #
 # This function offers some links on the parameter section to get with one click a group a parameters
@@ -1708,11 +1655,19 @@ function group_or_section(caller) {
 # This function shows on table Mode the available Parameters for the selected Resources
 #
 sub displaymenu {
-    my ($r,$allparms,$allparts,$pscat,$psprt,$keyorder)=@_;
+    my ($r,$allparms,$pscat,$psprt,$keyorder)=@_;
+
     $r->print(&Apache::lonhtmlcommon::start_pick_box());
+    $r->print(&Apache::lonhtmlcommon::row_title(&mt('Select Parameters to View')));
+
     &parmmenu($r,$allparms,$pscat,$keyorder);
-    $r->print(&Apache::lonhtmlcommon::end_pick_box());
+    $r->print(&Apache::loncommon::start_scrollbox());
     &parmboxes($r,$allparms,$pscat,$keyorder);
+    $r->print(&Apache::loncommon::end_scrollbox());
+
+    $r->print(&Apache::lonhtmlcommon::row_closure(1));
+    $r->print(&Apache::lonhtmlcommon::end_pick_box());
+ 
 }
 
 sub mapmenu {
@@ -1988,7 +1943,9 @@ sub standardkeyorder {
         'parameter_0_sig' => 17,
         'parameter_0_turnoffunit' => 18,
             'parameter_0_discussend' => 19,
-            'parameter_0_discusshide' => 20);
+            'parameter_0_discusshide' => 20,
+	'parameter_0_printopendate'  =>  21,
+	'parameter_0_printclosedate' =>  22);
 }
 
 
@@ -1996,6 +1953,9 @@ sub assessparms {
 
     my $r=shift;
 
+
+
+# -------------------------------------------------------- Variable declaration
     my @ids=();
     my %symbp=();
     my %mapp=();
@@ -2003,9 +1963,6 @@ sub assessparms {
     my %keyp=();
     my %uris=();
     my %maptitles=();
-
-# -------------------------------------------------------- Variable declaration
-
     my %allmaps=();
     my %alllevs=();
 
@@ -2024,14 +1981,16 @@ sub assessparms {
 
     my %allparms;
     my %allparts;
+# ------------------------------------------------------------------------------
+
 #
 # Order in which these parameters will be displayed
 #
     my %keyorder=&standardkeyorder();
 
-    @ids=();
-    %symbp=();
-    %typep=();
+#    @ids=();
+#    %symbp=();       # These seem defined above already.
+#    %typep=();
 
     my $message='';
 
@@ -2153,6 +2112,8 @@ sub assessparms {
         my $chome = $env{'course.'.$env{'request.course.id'}.'.home'};
         my ($got_chostname,$chostname,$cmajor,$cminor);
         my $totalstored = 0;
+
+
         for (my $i=0;$i<=$#markers;$i++) {
             my ($needsrelease,$needsnewer);
             if ($markers[$i] =~ /^[\d.]+\&0_availablestudent\&(1|2|3)$/) {
@@ -2288,7 +2249,7 @@ COURSECONTENTSCRIPT
 
         # Step 2
         $r->print(&Apache::lonhtmlcommon::topic_bar(2,&mt('Parameter Specification')));
-        &displaymenu($r,\%allparms,\%allparts,\@pscat,\@psprt,\%keyorder);
+        &displaymenu($r,\%allparms,\@pscat,\@psprt,\%keyorder);
 
         # Step 3
         $r->print(&Apache::lonhtmlcommon::topic_bar(3,&mt('User Specification (optional)')));
@@ -2300,7 +2261,7 @@ COURSECONTENTSCRIPT
         # Update Display Button
         $r->print('<p>'
              .'<input type="submit" name="dis"'
-             .' value="'.&mt('Update Parameter Display').'" />'
+             .' value="'.&mt('Update Display').'" />'
              .'<input type="hidden" name="hideparmsel" value="hidden" />'
              .'</p>');
         $r->print('</div>');
@@ -2336,7 +2297,7 @@ COURSECONTENTSCRIPT
         $r->print(&Apache::lonhtmlcommon::end_pick_box());
         $r->print('<p>'
              .'<input type="submit" name="dis"'
-             .' value="'.&mt('Update Parameter Display').'" />'
+             .' value="'.&mt('Update Display').'" />'
              .'<input type="hidden" name="hideparmsel" value="hidden" />'
              .'</p>');
     }
@@ -2481,7 +2442,6 @@ ENDTABLEHEADFOUR
                     my $uri=&Apache::lonnet::declutter($uris{$rid});
 
                     my $filter=$env{'form.filter'};
-
                     foreach (&keysplit($keyp{$rid})) {
                         my $tempkeyp = $_;
                         if (grep $_ eq $tempkeyp, @catmarker) {
@@ -2536,8 +2496,8 @@ ENDTABLEHEADFOUR
                         $r->print('<td style="background-color:'.$defbgone.';"'.
                                       ' rowspan='.$totalparms.
                                       '>'.$maptitles{$mapp{$rid}}.'</td>');
-
                         foreach (&keysinorder_bytype(\%name,\%keyorder)) {
+
                             unless ($firstrow) {
                                 $r->print('<tr>');
                             } else {
@@ -3378,10 +3338,7 @@ ENDOVER
 
     $r->print('<div class="LC_Box">');
     $r->print('<div>');
-    $r->print(&Apache::lonhtmlcommon::start_pick_box());
-    &parmmenu($r,\%allparms,\@pscat,\%keyorder);
-    $r->print(&Apache::lonhtmlcommon::end_pick_box());
-    &parmboxes($r,\%allparms,\@pscat,\%keyorder);
+    &displaymenu($r,\%allparms,\@pscat,\%keyorder);
     $r->print(&Apache::lonhtmlcommon::start_pick_box());
     $r->print(&Apache::lonhtmlcommon::row_title(&mt('Select Parts to View')));
     $r->print('<table>'.
@@ -3608,7 +3565,8 @@ sub date_shift_one {
               '<table><tr><td>'.&mt('Currently set date:').'</td><td>'.
               &Apache::lonlocal::locallocaltime($env{'form.timebase'}).'</td></tr>'.
               '<tr><td>'.&mt('Shifted date:').'</td><td>'.
-                    &Apache::lonhtmlcommon::date_setter('shiftform',
+                    &Apache::lonhtmlcommon::dshowerfuck.net
+ate_setter('shiftform',
                                                         'timeshifted',
                                                         $env{'form.timebase'},,
                                                         '').