--- loncom/interface/courseclassifier.pm	2013/07/15 14:32:45	1.15
+++ loncom/interface/courseclassifier.pm	2014/07/31 15:45:27	1.19
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Utilities for classifying courses based on institutional code
 #
-# $Id: courseclassifier.pm,v 1.15 2013/07/15 14:32:45 bisitz Exp $
+# $Id: courseclassifier.pm,v 1.19 2014/07/31 15:45:27 musolffc Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -37,7 +37,8 @@ use LONCAPA;
 sub retrieve_instcodes {
     my ($coursecodes,$codedom) = @_;
     my $totcodes;
-    my %courses = &Apache::lonnet::courseiddump($codedom,'.',1,'.','.','.',                                                undef,undef,'Course');
+    my %courses = &Apache::lonnet::courseiddump($codedom,'.',1,'.','.','.',
+                                                undef,undef,'Course');
     foreach my $course (keys(%courses)) {
         if (ref($courses{$course}) eq 'HASH') {
             if ($courses{$course}{'inst_code'} ne '') {
@@ -488,12 +489,27 @@ sub instcode_selectors_data {
                 if ($officialjs) {
                     $jscript .= '
 
-function toggleOfficial() {';
+function toggleOfficial() {
+   var choice; 
+   for (var i=0; i<document.'.$formname.'.official.length; i++) {
+       if (document.'.$formname.'.official[i].checked) {
+           choice = document.'.$formname.'.official[i].value;
+       }
+   }
+   if (choice == "off") {
+       if (document.getElementById("instcodes")) {
+           document.getElementById("instcodes").style.display = "none";
+       }';
                     for (my $i=0; $i<@{$codetitles}-1; $i++) {
                         $jscript .= '
-            document.'.$formname.'.'.$codetitles->[$i].'.selectedIndex = 0;';
+       document.'.$formname.'.'.$codetitles->[$i].'.selectedIndex = 0;';
                     }
-    $jscript .=  '
+    $jscript .= '
+   } else {
+       if (document.getElementById("instcodes")) { 
+           document.getElementById("instcodes").style.display = "block";
+       }
+   }
 }
 
 function setOfficial(caller) {
@@ -563,7 +579,11 @@ sub build_instcode_selectors {
     my $output;
     my @standardnames = &Apache::loncommon::get_standard_codeitems();
     if ($numtitles > 0) {
-        $output .= '<table><tr>';
+        my $style;
+        if ($env{'form.official'} eq 'off') {
+            $style = ' style="display: none"';
+        }
+        $output .= '<div id="instcodes"'.$style.'><table><tr>';
         for (my $k=0; $k<$lasttitle-1; $k++) {
             my (@items,@unsorted);
             if (ref($cat_items->{$codetitles->[$k]}) eq 'ARRAY') {
@@ -599,11 +619,38 @@ sub build_instcode_selectors {
                        '<input type="text" name="'.$standardnames[$numtitles-1].
                        '" /><br />'."\n";
         }
-        $output .= '<br />';
+        $output .= '</div>';
     }
     return $output;
 }
 
+sub instcode_selectors {
+    my ($codedom,$formname,$officialjs,$codetitles) = @_;
+    my ($output,%cat_titles,%cat_order,%cat_items);
+    my ($jscript,$totcodes,$numtitles,$lasttitle) =
+        &instcode_selectors_data($codedom,$formname,\%cat_items,$codetitles,
+                                 \%cat_titles,\%cat_order,$officialjs);
+    if ($numtitles > 0) {
+        my $official = ' checked="checked" ';
+        my $unofficial = '';
+        if (($formname eq 'filterpicker') && ($env{'form.official'} eq 'off')) {
+            $unofficial = $official;
+            $official = '';
+        }
+        $output .= '<span class="LC_nobreak">'.&mt('Official course:').'&nbsp;<label>'.
+                   '<input type="radio" name="official" value="on"'.$official.
+                   ' onclick="toggleOfficial();" />'.&mt('Yes').'</label>'.
+                   ('&nbsp;'x3).'<label>'.
+                   '<input type="radio" name="official" value="off"'.$unofficial.
+                   ' onclick="toggleOfficial();" />'.&mt('No').'</label></span><br />'.
+                   &build_instcode_selectors($numtitles,$lasttitle,\%cat_items,$codetitles,
+                                             \%cat_titles,\%cat_order)."\n".
+                   '<input type="hidden" name="numtitles" value="'.$numtitles.'" />'."\n".
+                   '<input type="hidden" name="state" value="listing" />'."\n";
+    }
+    return ($output,$jscript,$numtitles);
+}
+
 sub recurse_options {
     my ($currkey,$currlist,$level,$cat,$cat_options,$data,$by_year,$by_sem,$by_dept) = @_;
     if (ref($currlist) eq 'HASH') {
@@ -692,12 +739,23 @@ sub javascript_select_filler {
     my $nocrs = &mt('No courses');
     my $output = <<END;
 
-function courseSet(caller) {
+function courseSet(caller, onload) {
     var longtitles = new Array ("$longtitles_str");
-    var valyr = document.$formname.Year.options[document.$formname.Year.selectedIndex].value
-    var valsem  = document.$formname.Semester.options[document.$formname.Semester.selectedIndex].value
-    var valdept = document.$formname.Department.options[document.$formname.Department.selectedIndex].value
-    var valclass = document.$formname.Number.options[document.$formname.Number.selectedIndex].value
+    var valyr = '';
+    var valsem = '';
+    var valdept = '';
+    var valclass = '';
+    if (onload) {
+        valyr = "$env{'form.Year'}";
+        valsem = "$env{'form.Semester'}";
+        valdept = "$env{'form.Department'}";
+        valclass = "$env{'form.Number'}";
+    } else {
+        valyr = document.$formname.Year.options[document.$formname.Year.selectedIndex].value;
+        valsem  = document.$formname.Semester.options[document.$formname.Semester.selectedIndex].value;
+        valdept = document.$formname.Department.options[document.$formname.Department.selectedIndex].value;
+        valclass = document.$formname.Number.options[document.$formname.Number.selectedIndex].value;
+    }
     var idyears = new Array("$allidlist");
     var idyr = -1;
     var idsem = -1;
@@ -706,9 +764,36 @@ function courseSet(caller) {
 
     $scripttext
 
-    selYear = document.$formname.Year.selectedIndex-1;
-    selSemester = document.$formname.Semester.selectedIndex-1;
-    selDepartment = document.$formname.Department.selectedIndex-1;
+    if (onload) {
+        if (document.$formname.Year.options.length > 0) {
+            for (var i = 0; i< document.$formname.Year.options.length; i++) {
+                if (document.$formname.Year.options[i].value == "$env{'form.Year'}") {
+                    document.$formname.Year.selectedIndex = i;
+                    break;
+                }
+            }
+        }
+        if (document.$formname.Department.options.length > 0) {
+            for (var i = 0; i< document.$formname.Department.options.length; i++) {
+                if (document.$formname.Department.options[i].value == "$env{'form.Department'}") {
+                    document.$formname.Department.selectedIndex = i;
+                    break;
+                }
+            }
+        }
+        if (document.$formname.Semester.options.length > 0) {
+            for (var i = 0; i< document.$formname.Semester.options.length; i++) {
+                if (document.$formname.Semester.options[i].value == "$env{'form.Semester'}") {
+                    document.$formname.Semester.selectedIndex = i;
+                    break;
+                }
+            }
+        }
+    }
+
+    var selYear = document.$formname.Year.selectedIndex-1;
+    var selSemester = document.$formname.Semester.selectedIndex-1;
+    var selDepartment = document.$formname.Department.selectedIndex-1;
     if (selYear == -1) {
         if (selSemester == -1) {
             if (selDepartment > -1) {
@@ -802,7 +887,7 @@ function courseSet(caller) {
                     }
                 }
                 if (iddept != -1) {
-                    document.$formname.Number.options[0] =  new Option('$all','0',false,false);
+                    document.$formname.Number.options[0] = new Option('$all','0',false,false);
                     for (var i=0; i<idcourses[idyr][idsem][iddept].length; i++) {
                         var display = idcourses[idyr][idsem][iddept][i];
                         if (longtitles[3] == 1) {
@@ -823,7 +908,18 @@ function courseSet(caller) {
         }
         document.$formname.Number.selectedIndex = 0
     }
-    $officialjs
+    if (onload) {
+        if (document.$formname.Number.options.length > 0) {
+            for (var i = 0; i< document.$formname.Number.options.length; i++) {
+                if (document.$formname.Number.options[i].value == "$env{'form.Number'}") {
+                    document.$formname.Number.selectedIndex = i;
+                    break;
+                }
+            }
+        }
+    } else {
+        $officialjs
+    }
 }
 END
     return $output;