--- loncom/interface/lonhelper.pm	2005/04/11 18:13:39	1.102
+++ loncom/interface/lonhelper.pm	2005/09/28 19:02:02	1.114
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # .helper XML handler to implement the LON-CAPA helper
 #
-# $Id: lonhelper.pm,v 1.102 2005/04/11 18:13:39 albertel Exp $
+# $Id: lonhelper.pm,v 1.114 2005/09/28 19:02:02 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -1188,7 +1188,8 @@ sub render {
 
     if ($self->{'multichoice'}) {
         $result .= <<SCRIPT;
-<script>
+<script type="text/javascript">
+// <!--
     function checkall(value, checkName) {
 	for (i=0; i<document.forms.helpform.elements.length; i++) {
             ele = document.forms.helpform.elements[i];
@@ -1197,6 +1198,7 @@ sub render {
             }
         }
     }
+// -->
 </script>
 SCRIPT
     }
@@ -1265,13 +1267,13 @@ BUTTONS
         my $id = &new_id();
         $result .= "<tr>\n<td width='20'>&nbsp;</td>\n";
         $result .= "<td valign='top'><input type='$type' name='$var.forminput'"
-            . "' value='" . 
+            . " value='" . 
             HTML::Entities::encode($choice->[1],"<>&\"'") 
             . "'";
         if ($checkedChoices{$choice->[1]}) {
-            $result .= " checked ";
+            $result .= " checked='checked' ";
         }
-        $result .= qq{id="$id"};
+        $result .= qq{id="id$id"};
         my $choiceLabel = $choice->[0];
         if ($choice->[4]) {  # if we need to evaluate this choice
             $choiceLabel = "sub { my $helper = shift; my $state = shift;" .
@@ -1279,7 +1281,7 @@ BUTTONS
             $choiceLabel = eval($choiceLabel);
             $choiceLabel = &$choiceLabel($helper, $self);
         }
-        $result .= "/></td><td> ".qq{<label for="$id">}.
+        $result .= "/></td><td> ".qq{<label for="id$id">}.
             $choiceLabel. "</label></td></tr>\n";
     }
     $result .= "</table>\n\n\n";
@@ -1427,7 +1429,7 @@ sub render {
             HTML::Entities::encode($choice->[1],"<>&\"'") 
             . "'";
         if ($checkedChoices{$choice->[1]}) {
-            $result .= " selected";
+            $result .= " selected='selected' ";
         }
         my $choiceLabel = $choice->[0];
         if ($choice->[4]) {  # if we need to evaluate this choice
@@ -1436,7 +1438,7 @@ sub render {
             $choiceLabel = eval($choiceLabel);
             $choiceLabel = &$choiceLabel($helper, $self);
         }
-        $result .= ">" . &mtn($choiceLabel) . "\n";
+        $result .= ">" . &mtn($choiceLabel) . "</option>\n";
     }
     $result .= "</select>\n";
 
@@ -1566,7 +1568,7 @@ sub render {
     $result .= "<select name='${var}month'>\n";
     for ($i = 0; $i < 12; $i++) {
         if ($i == $date->mon) {
-            $result .= "<option value='$i' selected>";
+            $result .= "<option value='$i' selected='selected'>";
         } else {
             $result .= "<option value='$i'>";
         }
@@ -1578,7 +1580,7 @@ sub render {
     $result .= "<select name='${var}day'>\n";
     for ($i = 1; $i < 32; $i++) {
         if ($i == $date->mday) {
-            $result .= '<option selected>';
+            $result .= '<option selected="selected">';
         } else {
             $result .= '<option>';
         }
@@ -1590,7 +1592,7 @@ sub render {
     $result .= "<select name='${var}year'>\n";
     for ($i = 2000; $i < 2030; $i++) { # update this after 64-bit dates
         if ($date->year + 1900 == $i) {
-            $result .= "<option selected>";
+            $result .= "<option selected='selected'>";
         } else {
             $result .= "<option>";
         }
@@ -1605,21 +1607,21 @@ sub render {
 	my $pm = &mt('p.m.');
         # Build hour
         $result .= "<select name='${var}hour'>\n";
-        $result .= "<option " . ($date->hour == 0 ? 'selected ':'') .
+        $result .= "<option " . ($date->hour == 0 ? 'selected="selected" ':'') .
             " value='0'>" . &mt('midnight') . "</option>\n";
         for ($i = 1; $i < 12; $i++) {
             if ($date->hour == $i) {
-                $result .= "<option selected value='$i'>$i $am</option>\n";
+                $result .= "<option selected='selected' value='$i'>$i $am</option>\n";
             } else {
                 $result .= "<option value='$i'>$i $am</option>\n";
             }
         }
-        $result .= "<option " . ($date->hour == 12 ? 'selected ':'') .
+        $result .= "<option " . ($date->hour == 12 ? 'selected="selected" ':'') .
             " value='12'>" . &mt('noon') . "</option>\n";
         for ($i = 13; $i < 24; $i++) {
             my $printedHour = $i - 12;
             if ($date->hour == $i) {
-                $result .= "<option selected value='$i'>$printedHour $pm</option>\n";
+                $result .= "<option selected='selected' value='$i'>$printedHour $pm</option>\n";
             } else {
                 $result .= "<option value='$i'>$printedHour $pm</option>\n";
             }
@@ -1634,7 +1636,7 @@ sub render {
                 $printedMinute = "0" . $printedMinute;
             }
             if ($date->min == $i) {
-                $result .= "<option selected>";
+                $result .= "<option selected='selected'>";
             } else {
                 $result .= "<option>";
             }
@@ -1930,7 +1932,8 @@ sub render {
 
     if ($self->{'multichoice'}) {
         $result = <<SCRIPT;
-<script>
+<script type="text/javascript">
+// <!--
     function checkall(value, checkName) {
 	for (i=0; i<document.forms.helpform.elements.length; i++) {
             ele = document.forms.helpform.elements[i];
@@ -1939,6 +1942,7 @@ sub render {
             }
         }
     }
+// -->
 </script>
 SCRIPT
         my %lt=&Apache::lonlocal::texthash(
@@ -2016,7 +2020,7 @@ BUTTONS
 			"\|\|\|";
 		    my $checked ="";
 		    if($var_value =~ /\Q|||$raw_name|||\E/) {
-			$checked = "checked";
+			$checked = "checked='checked'";
 		    }
 		    $col .= 
                         "<td align='center'><input type='checkbox' name ='$option_var".
@@ -2027,11 +2031,11 @@ BUTTONS
 
             $col .= "<td align='center'><input type='$inputType' name='${var}.forminput' ";
             if (!$checked && !$multichoice) {
-                $col .= "checked ";
+                $col .= "checked='checked' ";
                 $checked = 1;
             }
 	    if ($multichoice) { # all resources start checked; see bug 1174
-		$col .= "checked ";
+		$col .= "checked='checked' ";
 		$checked = 1;
 	    }
             $col .= "value='" . $resource_name  . "' /></td>";
@@ -2057,6 +2061,7 @@ BUTTONS
     };
     $result.=(<<RADIO);
 <script type="text/javascript">
+// <!--
     function updateRadio(form,name,value) {
 	var radiobutton=form[name];
 	for (var i=0; i<radiobutton.length; i++) {
@@ -2072,6 +2077,7 @@ BUTTONS
 	var which=select.selectedIndex;
 	hidden.value=select.options[which].value;
     }
+// -->
 </script>
 <input type="hidden" name="${var}_part.forminput" />
 
@@ -2203,7 +2209,8 @@ sub render {
 
     if ($self->{'multichoice'}) {
         $result = <<SCRIPT;
-<script>
+<script type="text/javascript">
+// <!--
     function checkall(value, checkName) {
 	for (i=0; i<document.forms.helpform.elements.length; i++) {
             ele = document.forms.helpform.elements[i];
@@ -2236,6 +2243,40 @@ sub render {
             } 
         }
     }
+    function getDesiredState() {     // Return desired person state radio value.
+        numRadio = document.forms.helpform.personstate.length;
+        for (i =0; i < numRadio; i++) {
+	    if (document.forms.helpform.personstate[i].checked) {
+                return document.forms.helpform.personstate[i].value;
+            }
+        }
+        return "";
+    }
+
+    function checksections(value) {    // Check selected sections.
+        numSections  = document.forms.helpform.chosensections.length;
+	desiredState = getDesiredState();
+
+	for (option = 0; option , numSections; option++) {
+	    if(document.forms.helpform.chosensections.options[option].selected) {
+		section = document.forms.helpform.chosensections.options[option].text;
+		if (section == "Staff") {   // Staff are indicated by an empty section.
+		    section ="";
+		}
+		for (i = 0; i < document.forms.helpform.elements.length; i++ ) {
+		    if (document.forms.helpform.elements[i].value.indexOf(':') != -1) {
+			info = document.forms.helpform.elements[i].value.split(':');
+			hisSection = info[2];
+			hisState   = info[4];
+                        if((hisSection == section)  && ((desiredState ==hisState) ||  (section =="") || (desiredState == "All"))) {
+			    document.forms.helpform.elements[i].checked = value;
+			}
+		    }
+		}
+            }
+	}
+				   }
+// -->
 </script>
 SCRIPT
 
@@ -2250,23 +2291,12 @@ SCRIPT
         $buttons = <<BUTTONS;
 <br />
 <table>
-  <tr>
   
-    <td><input type="button" onclick="checkactive()" value="$lt{'ocs'}" /></td>
-    <td><input type="button" onclick="uncheckexpired()" value="$lt{'ues'}" /><br /></td>
-  </tr>
   <tr>
      <td><input type="button" onclick="checkall(true, '$var')" value="$lt{'sas'}" /></td>
      <td> <input type="button" onclick="checkall(false, '$var')" value="$lt{'uas'}" /><br /></td>
   </tr>
-  <tr>
-      <td><input type="button" onclick="checksec(true)" value="$lt{'sfsg'}"></td>
-      <td><input type="text" size="5" name="chksec">&nbsp;</td>
-  </tr>
-  <tr>
-      <td><input type="button" onclick="checksec(false)" value="$lt{'ufsg'}"></td>
-      <td></td>
-  </tr>
+  
 </table>
 <br />
 BUTTONS
@@ -2342,7 +2372,7 @@ BUTTONS
             $self->{'variable'} . '.forminput' . "'";
             
         if (!$self->{'multichoice'} && !$checked) {
-            $result .= " checked ";
+            $result .= " checked='checked' ";
             $checked = 1;
         }
         $result .=
@@ -2364,8 +2394,44 @@ BUTTONS
     }
 
     $result .= "</table>\n\n";
-    $result .= $buttons;    
-    
+    $result .= $buttons;   
+    #
+    #  now add the fancy section choice... first enumerate the sections:
+
+    my %sections;
+    for my $key (@keys) {
+	my $section_name = $classlist->{$key}->[$section];
+	if ($section_name ne "") {
+	    $sections{$section_name} = 1;
+	}
+    }
+    #  The variable $choice_widget will have the html to make the choice 
+    #  selector.
+
+    my $choice_widget = '<select multiple name="chosensections" size="5">'."\n";
+    foreach my $sec (sort (keys %sections)) {
+	$choice_widget .= "<option name=\"$sec\">$sec</option>\n";
+    }
+    $choice_widget .= "<option>Staff</option></select>\n";
+
+    # Build a table without any borders to contain the section based
+    # selection:
+
+    my $section_selectors = '<table border="0">'."\n";
+    $section_selectors   .= "<tr valign=\"top\">\n<td>For Sections:</td><td>$choice_widget</td>\n";
+    $section_selectors   .= '    <td><input type="radio" name="personstate" value="Active" checked />';
+    $section_selectors   .= "         Current Students</td>\n";
+    $section_selectors   .= '    <td><input type="radio" name="personstate" value="All" />';
+    $section_selectors   .= "         All students</td>\n";
+    $section_selectors   .= '    <td><input type="radio" name="personstate" value="Expired" />';
+    $section_selectors   .= "          Expired Students</td>\n";
+    $section_selectors   .= "</tr>\n";
+    $section_selectors   .= "<tr>\n";
+    $section_selectors   .= '    <td><input type="button" value="Select" onclick="checksections(true);" /></td>'."\n";
+    $section_selectors   .= '    <td><input type="button" value="Unselect" onclick="checksections(false);" /></td></tr>'."\n</table>\n";
+    $section_selectors   .= "<br />";
+
+    $result .= $section_selectors;
     return $result;
 }
 
@@ -2547,7 +2613,8 @@ sub render {
 
     if ($self->{'multichoice'}) {
         $result = <<SCRIPT;
-<script>
+<script type="text/javascript">
+// <!--
     function checkall(value, checkName) {
 	for (i=0; i<document.forms.helpform.elements.length; i++) {
             ele = document.forms.helpform.elements[i];
@@ -2565,6 +2632,7 @@ sub render {
             }
         }
     }
+// -->
 </script>
 SCRIPT
        my %lt=&Apache::lonlocal::texthash(
@@ -2594,14 +2662,16 @@ BUTTONS
     # If the subdirectory is in local CSTR space
     my $metadir;
     if ($subdir =~ m|/home/([^/]+)/public_html/(.*)|) {
-        my $user = $1;
-        my $domain = $Apache::lonnet::perlvar{'lonDefDomain'};
+	my ($user,$domain)= 
+	    &Apache::loncacc::constructaccess($subdir,
+				     $Apache::lonnet::perlvar{'lonDefDomain'});
 	$metadir='/res/'.$domain.'/'.$user.'/'.$2;
         @fileList = &Apache::lonnet::dirlist($subdir, $domain, $user, '');
     } elsif ($subdir =~ m|^~([^/]+)/(.*)$|) {
 	$subdir='/home/'.$1.'/public_html/'.$2;
-        my $user = $1;
-        my $domain = $Apache::lonnet::perlvar{'lonDefDomain'};
+	my ($user,$domain)= 
+	    &Apache::loncacc::constructaccess($subdir,
+				     $Apache::lonnet::perlvar{'lonDefDomain'});
 	$metadir='/res/'.$domain.'/'.$user.'/'.$2;
         @fileList = &Apache::lonnet::dirlist($subdir, $domain, $user, '');
     } else {
@@ -2668,7 +2738,7 @@ BUTTONS
             . ".forminput' ".qq{id="$id"}." value='" . HTML::Entities::encode($fileName,"<>&\"'").
                 "'";
             if (!$self->{'multichoice'} && $choices == 0) {
-                $result .= ' checked';
+                $result .= ' checked="checked"';
             }
             $result .= "/></td><td bgcolor='$color'>".
                 qq{<label for="$id">}. $file . "</label></td>" .
@@ -3183,7 +3253,7 @@ sub render {
     my $targetURL = '';
     my $finish=&mt('Finish');
     if ($self->{'restartCourse'}) {
-	my $actionURL = '/adm/roles';
+	$actionURL = '/adm/roles';
 	$targetURL = '/adm/menu';
 	if ($env{'course.'.$env{'request.course.id'}.'.url'}=~/^uploaded/) {
 	    $targetURL = '/adm/coursedocs';
@@ -3268,6 +3338,11 @@ sub render {
                         'answer_date' => "0_answerdate",
 			'tries' => '0_maxtries',
 			'weight' => '0_weight' );
+    my %realParmName = ('open_date' => "opendate",
+                        'due_date' => "duedate",
+                        'answer_date' => "answerdate",
+			'tries' => 'maxtries',
+			'weight' => 'weight' );
     
     my $affectedResourceId = "";
     my $parm_name = $parmTypeHash{$vars->{ACTION_TYPE}};
@@ -3279,7 +3354,13 @@ sub render {
     # Print the granularity, depending on the action
     if ($vars->{GRANULARITY} eq 'whole_course') {
         $resourceString .= '<li>'.&mt('for <b>all resources in the course</b>').'</li>';
-        $level = 9; # general course, see lonparmset.pm perldoc
+	if ($vars->{TARGETS} eq 'course') {
+	    $level = 11; # general course, see lonparmset.pm perldoc
+	} elsif ($vars->{TARGETS} eq 'section') {
+	    $level = 6;
+	} else {
+	    $level = 3;
+	}
         $affectedResourceId = "0.0";
         $symb = 'a';
         $paramlevel = 'general';
@@ -3289,7 +3370,13 @@ sub render {
         my $title = $res->compTitle();
         $symb = $res->symb();
         $resourceString .= '<li>'.&mt('for the map named [_1]',"<b>$title</b>").'</li>';
-        $level = 8;
+	if ($vars->{TARGETS} eq 'course') {
+	    $level = 10; # general course, see lonparmset.pm perldoc
+	} elsif ($vars->{TARGETS} eq 'section') {
+	    $level = 5;
+	} else {
+	    $level = 2;
+	}
         $affectedResourceId = $vars->{RESOURCE_ID};
         $paramlevel = 'map';
     } else {
@@ -3300,22 +3387,34 @@ sub render {
         $symb = $res->symb();
         my $title = $res->compTitle();
         $resourceString .= '<li>'.&mt('for the resource named [_1] part [_2]',"<b>$title</b>","<b>$part</b>").'</li>';
-        $level = 7;
+	if ($vars->{TARGETS} eq 'course') {
+	    $level = 7; # general course, see lonparmset.pm perldoc
+	} elsif ($vars->{TARGETS} eq 'section') {
+	    $level = 4;
+	} else {
+	    $level = 1;
+	}
         $affectedResourceId = $vars->{RESOURCE_ID};
         $paramlevel = 'full';
     }
 
-    my $result = "<form name='helpform' method='get' action='/adm/parmset#$affectedResourceId&$parm_name&$level'>\n";
+    my $result = "<form name='helpform' method='POST' action='/adm/parmset#$affectedResourceId&$parm_name&$level'>\n";
+    $result .= "<input type='hidden' name='action' value='settable' />\n";
+    $result .= "<input type='hidden' name='dis' value='helper' />\n";
+    $result .= "<input type='hidden' name='pscat' value='".
+	$realParmName{$vars->{ACTION_TYPE}}."' />\n";
     if ($vars->{GRANULARITY} eq 'resource') {
 	$result .= "<input type='hidden' name='symb' value='".
 	    HTML::Entities::encode($symb,"'<>&\"") . "' />\n";
-	$result .= "<input type='hidden' name='pscat' value='".
-	    HTML::Entities::encode($vars->{ACTION_TYPE},"'<>&\"") . "' />\n";
-	my $part = $vars->{RESOURCE_ID_part};
-	if ($part eq 'All Parts' || !$part) { $part=0; }
-	$result .= "<input type='hidden' name='psprt' value='".
-	    HTML::Entities::encode($part,"'<>&\"") . "' />\n";
+    } elsif ($vars->{GRANULARITY} eq 'map') {
+	$result .= "<input type='hidden' name='pschp' value='".
+	    $affectedResourceId."' />\n";
     }
+    my $part = $vars->{RESOURCE_ID_part};
+    if ($part eq 'All Parts' || !$part) { $part=0; }
+    $result .= "<input type='hidden' name='psprt' value='".
+	HTML::Entities::encode($part,"'<>&\"") . "' />\n";
+
     $result .= '<p>'.&mt('Confirm that this information is correct, then click &quot;Finish Helper&quot; to complete setting the parameter.').'<ul>';
     
     # Print the type of manipulation:
@@ -3353,6 +3452,8 @@ sub render {
     } elsif ($vars->{ACTION_TYPE} eq 'tries') {
 	$result .= "<input type='hidden' name='pres_value' " .
 	    "value='" . $vars->{TRIES} . "' />\n";
+        $result .= "<input type='hidden' name='pres_type' " .
+            "value='int_pos' />\n";
     } elsif ($vars->{ACTION_TYPE} eq 'weight') {
 	$result .= "<input type='hidden' name='pres_value' " .
 	    "value='" . $vars->{WEIGHT} . "' />\n";
@@ -3366,19 +3467,14 @@ sub render {
     } elsif ($vars->{TARGETS} eq 'section') {
         my $section = $vars->{SECTION_NAME};
         $result .= '<li>'.&mt('for section [_1]',"<b>$section</b>").'</li>';
-        $level -= 3;
-        $result .= "<input type='hidden' name='csec' value='" .
+	$result .= "<input type='hidden' name='csec' value='" .
             HTML::Entities::encode($section,"'<>&\"") . "' />\n";
     } else {
         # FIXME: This is probably wasteful! Store the name!
         my $classlist = Apache::loncoursedata::get_classlist();
-        my $username = $vars->{USER_NAME};
-        # Chop off everything after the last colon (section)
-        $username = substr($username, 0, rindex($username, ':'));
-        my $name = $classlist->{$username}->[6];
+	my ($uname,$udom)=split(':',$vars->{USER_NAME});
+        my $name = $classlist->{$uname.':'.$udom}->[6];
         $result .= '<li>'.&mt('for [_1]',"<b>$name</b>").'</li>';
-        $level -= 6;
-        my ($uname, $udom) = split /:/, $vars->{USER_NAME};
         $result .= "<input type='hidden' name='uname' value='".
             HTML::Entities::encode($uname,"'<>&\"") . "' />\n";
         $result .= "<input type='hidden' name='udom' value='".
@@ -3396,7 +3492,6 @@ sub render {
     
     # Make the table appear
     $result .= "\n<input type='hidden' value='true' name='prevvisit' />";
-    $result .= "\n<input type='hidden' value='all' name='pschp' />";
     $result .= "\n<input type='hidden' value='$symb' name='pssymb' />";
     $result .= "\n<input type='hidden' value='$paramlevel' name='parmlev' />";