--- loncom/interface/lonpickcourse.pm	2010/11/13 14:43:08	1.93.2.3
+++ loncom/interface/lonpickcourse.pm	2014/03/11 21:42:18	1.110
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Pick a course
 #
-# $Id: lonpickcourse.pm,v 1.93.2.3 2010/11/13 14:43:08 raeburn Exp $
+# $Id: lonpickcourse.pm,v 1.110 2014/03/11 21:42:18 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -31,6 +31,7 @@ package Apache::lonpickcourse;
 use strict;
 use Apache::Constants qw(:common);
 use Apache::loncommon;
+use Apache::lonhtmlcommon;
 use Apache::loncoursedata;
 use Apache::lonnet;
 use Apache::lonlocal;
@@ -105,7 +106,7 @@ sub handler {
 
     if ((($env{'form.form'} eq 'cu') || ($env{'form.form'} eq 'studentform')) && 
         ($env{'form.pickedcourse'})) {
-        $loaditem{'onload'} .= 'setRoles();setSections();';
+        $loaditem{'onload'} .= 'setDefaultCredits();setRoles();setSections();';
     }
     my $js = &js_changer();
     $r->print(&Apache::loncommon::start_page($title,$js,
@@ -133,16 +134,16 @@ sub handler {
         $onlyown) {
         $r->print(&gochoose_javascript($type,$multiple,$autosubmit,$lastaction));
     }
-    $r->print('<script type="text/javascript" language="Javascript">'.$jscript.
-              '</script>');
+    $r->print(&Apache::lonhtmlcommon::scripttag($jscript));
     $r->print($submitopener);
 
 # ------------------------------------------ Display of filters to limit search
     my $filter = {};
     my $action = '/adm/pickcourse';
-    my ($numtitles,$showroles,$nohost);
+    my ($numtitles,$showroles,$nohost,@codetitles);
     if (!$onlyown) {
         my $filterlist = ['domainfilter'];
+        # created filter for DCs only
         if ($env{'user.adv'} && $env{'form.domainfilter'} &&
             exists($env{'user.role.dc./'.$env{'form.domainfilter'}.'/'})
             && $env{'form.form'} ne 'portform') {
@@ -152,7 +153,6 @@ sub handler {
             }
         }
         push(@{$filterlist},('descriptfilter','instcodefilter'));
-
         if ($env{'form.form'} eq 'rules') {
             push(@{$filterlist},'personfilter');
             if (($env{'form.personfilter'} ne '') && ($env{'form.persondomfilter'} ne '')) {
@@ -177,7 +177,7 @@ sub handler {
 
         $r->print(&build_filters($filterlist,$type,$roleelement,$multelement,
                                  $filter,$action,\$numtitles,undef,$cloneruname,
-                                 $clonerudom,$typeelement));
+                                 $clonerudom,$typeelement,\@codetitles));
     }
 
 # ---------------------------------------------------------------- Get the data
@@ -191,7 +191,7 @@ sub handler {
             }
         }
         my %courses = &search_courses($r,$type,$onlyown,$filter,$numtitles,
-                                      $cloneruname,$clonerudom,$domcloner);
+                                      $cloneruname,$clonerudom,$domcloner,\@codetitles);
         if ($nohost) {
             $r->print ('<span class="LC_warning">'.
                        &mt('User does not exist - username: [_1], domain: [_2].',
@@ -207,20 +207,19 @@ sub handler {
 }
 
 sub js_changer {
-    return <<"ENDJS";
+    return <<ENDJS;
 <script type="text/javascript">
-
+// <![CDATA[
 function updateFilters(caller) {
     if (typeof(caller) != "undefined") {
         document.filterpicker.updater.value = caller.name;
     }
     document.filterpicker.submit();
 }
-
+// ]]>
 </script>
 
 ENDJS
-
 }
 
 sub processpick {
@@ -282,6 +281,13 @@ sub create_user_javascript {
         my $cdom = $coursedescription{'domain'};
         my $cnum = $coursedescription{'num'};
         my $crstype = $coursedescription{'type'};
+        my %domdefs = &Apache::lonnet::get_domain_defaults($cdom);
+        my ($showcredits,$credits);
+        if (($crstype ne 'Community') &&
+            (($domdefs{'officialcredits'} || $domdefs{'unofficialcredits'} || $domdefs{'textbookcredits'}))) {
+            $showcredits = 1; 
+            $credits = $coursedescription{'internal.defaultcredits'};
+        }
         my $sec_element = 'currsec';
         my $grplist_element = 'groups';
         my ($sections,$groups) =
@@ -292,6 +298,7 @@ sub create_user_javascript {
         my $groupslist = join(',',@{$groups});
         $output = qq|
 <script type="text/javascript">
+// <![CDATA[
 function setSections() {
     opener.document.$env{"form.form"}.$grplist_element.value='$groupslist';
     window.opener.setSect('$seclist');
@@ -300,9 +307,18 @@ function setSections() {
 function setRoles() {
     window.opener.setRole('$crstype');
 }
+|;
+        if ($showcredits) {
+            $output .= qq|
+function setDefaultCredits() {
+    window.opener.setCredits('$credits');
+}
+|;
+        }
+        $output .= qq|
+// ]]>
 </script>
 |;
-;
     }
     return $output;
 }
@@ -325,9 +341,10 @@ sub display_matched_courses {
             my $ccrolechk = ' ';
             my $menuchk = ' checked="checked" ';
             $r->print(
-                '<fieldset>'
-               .'<legend>'.&mt('Action').'</legend>'
-               .'<div class="LC_nobreak"><label>'
+                '<div class="LC_left_float">'
+               .'<fieldset>'
+               .'<legend>'.&mt('Pick action').'</legend>'
+               .'<span class="LC_nobreak"><label>'
                .'<input type="radio" name="phase" value="ccrole"'.$ccrolechk.'/>'
                .'&nbsp;');
             if ($type eq 'Community') {
@@ -335,17 +352,17 @@ sub display_matched_courses {
             } else {
                 $r->print(&mt('Enter the course with the role of [_1].',$cctitle));
             }
-            $r->print('</label></div>'
-               .'<div class="LC_nobreak"><label>'
+            $r->print('</label></span><br />'
+               .'<span class="LC_nobreak"><label>'
                .'<input type="radio" name="phase" value="menu"'.$menuchk.'/>&nbsp;');
             if ($type eq 'Community') {
                 $r->print(&mt('View or modify community settings which only a [_1] may modify.',$dctitle));
             } else {
                 $r->print(&mt('View or modify course settings which only a [_1] may modify.',$dctitle));
             }
-            $r->print('</label></div>'
-               .'</fieldset>'
-               .'<br />'
+            $r->print('</label></span>'
+               .'</fieldset></div>'
+               .'<br clear="all" />'
             );
         }
     }
@@ -364,9 +381,9 @@ sub display_matched_courses {
     }
  
     if ($numcourses > 1 && $multiple) {
-        $r->print('<input type="button" value="check all"
+        $r->print('<input type="button" value="'.&mt('check all').'"
                   onclick="javascript:checkAll(document.courselist.course_id)" />
-                  &nbsp;&nbsp;<input type="button" value="uncheck all"
+                  &nbsp;&nbsp;<input type="button" value="'.&mt('uncheck all').'"
                   onclick="javascript:uncheckAll(document.courselist.course_id)" />
                   <br /><br />');
     }
@@ -418,7 +435,7 @@ sub display_matched_courses {
                             $canclone = 1;
                         }
                     }
-                    unless ($canclone) {
+                    unless ($canclone) { 
                         if ($cc_cloneable{$cnum.':'.$cdom}) {
                             $canclone = 1;
                         }
@@ -439,10 +456,10 @@ sub display_matched_courses {
                         }
                     }
                 }
-                push(@owners,&unescape($courses{$course}{'owner'}));
-                if (ref($courses{$course}{'co-owners'}) eq 'ARRAY') {
-                    foreach my $item (@{$courses{$course}{'co-owners'}}) {
-                        push(@owners,&unescape($item));
+                push(@owners,$courses{$course}{'owner'});
+                if ($courses{$course}{'co-owners'} ne '') {
+                    foreach my $item (split(/,/,$courses{$course}{'co-owners'})) {
+                        push(@owners,$item);
                     }
                 }
             } else {
@@ -494,9 +511,9 @@ sub display_matched_courses {
     }
 
     if (!%courses) {
-        $r->print(&mt('None found'));
+        $r->print('<p class="LC_info">'.&mt('None found').'</p>');
     } elsif ($multiple) {
-        $r->print('<input type="button" value="Submit" onClick="gochoose('."'','','')".'" />');
+        $r->print('<input type="button" value="'.&mt('Submit').'" onclick="gochoose('."'','','')".'" />');
     }
     $r->print('<input type="hidden" name="form" value="'.$env{'form.form'}.'" />'.
               "\n".'<input type="hidden" name="pickedcourse" value="" />'."\n".
@@ -543,7 +560,7 @@ sub multiples_tag {
 
 sub build_filters {
     my ($filterlist,$type,$roleelement,$multelement,$filter,$action,
-        $numtitlesref,$caller,$cloneruname,$clonerudom,$typeelement) = @_;
+        $numtitlesref,$caller,$cloneruname,$clonerudom,$typeelement,$codetitlesref) = @_;
     my ($list,$formname,$fixeddom,$codedom,$jscript);
     $codedom = $env{'request.role.domain'};
     if (defined($env{'form.form'})) {
@@ -551,10 +568,7 @@ sub build_filters {
     } else {
         $formname = $caller;
     }
-    my $onchange;
-    unless ($env{'form.interface'} eq 'textual') {
-        $onchange = 'javascript:updateFilters(this)';
-    }
+    my $onchange = 'javascript:updateFilters(this)';
     my ($domainselectform,$sincefilterform,$createdfilterform,
         $ownerdomselectform,$persondomselectform,$instcodeform,
         $typeselectform,$instcodetitle);
@@ -619,7 +633,6 @@ sub build_filters {
         }
     }
 
-
     # last course activity filter and selection
     $sincefilterform = &timebased_select_form('sincefilter',$filter);
 
@@ -630,7 +643,7 @@ sub build_filters {
 
     my %lt = &Apache::lonlocal::texthash(
                 'cac' => "$type Activity",
-                'ccr' => "$type Created",
+                'ccr' => "$type Created", 
                 'cde' => "$type Title",
                 'cdo' => "$type Domain",
                 'ins' => 'Institutional Code',
@@ -649,7 +662,7 @@ sub build_filters {
     } else {
         $typeselectform =  '<select name="type" size="1"';
         if ($onchange) {
-            $typeselectform .= 'onchange="'.$onchange.'"';
+            $typeselectform .= ' onchange="'.$onchange.'"';
         }
         $typeselectform .= '>'."\n";
         foreach my $posstype ('Course','Community') {
@@ -681,7 +694,8 @@ sub build_filters {
                 || ($formname eq 'modifycourse')) {
                 $officialjs = 1;
                 ($instcodeform,$jscript,$$numtitlesref) = 
-                    &instcode_selectors($codedom,'filterpicker',$officialjs);
+                    &Apache::courseclassifier::instcode_selectors($codedom,'filterpicker',
+                                                                  $officialjs,$codetitlesref);
                 if ($jscript) {
                     $jscript = '<script type="text/javascript" language="Javascript">'.
                                $jscript.'</script>'."\n";
@@ -804,7 +818,7 @@ $typeelement
             $output .= '<input type="hidden" name="cc_clone" value="'.$coord_cloneable.'" />';
         }
     }
-    $output .= '<input type="hidden" name="updater" value="">'."\n".
+    $output .= '<input type="hidden" name="updater" value="" />'."\n".
                '<input type="submit" name="gosearch" value="'. 
                &mt('Search').'" /></p>'."\n".'</form>'."\n".'<hr />'."\n";
     return $jscript.$warning.$output;
@@ -816,10 +830,10 @@ sub timebased_select_form {
         $filter->{$item} = $env{'form.'.$item};
         $filter->{$item} =~ s/[^\d-]//g;
         if (!$filter->{$item}) { $filter->{$item}=-1; }
-        return &Apache::loncommon::select_form(
+        return &Apache::loncommon::select_form( 
                             $filter->{$item},
                             $item,
-                            (      '-1' => '',
+                            {      '-1' => '',
                                 '86400' => &mt('today'),
                                '604800' => &mt('last week'),
                               '2592000' => &mt('last month'),
@@ -828,7 +842,7 @@ sub timebased_select_form {
                              '31104000' => &mt('last year'),
                     'select_form_order' =>
                            ['-1','86400','604800','2592000','7776000',
-                            '15552000','31104000']));
+                            '15552000','31104000']});
     }
 }
 
@@ -836,7 +850,7 @@ sub get_coordinator_cloneable {
     my ($cloneruname,$clonerudom,$type) = @_;
     if (($cloneruname!~/\w/) || ($clonerudom!~/\w/)) {
         my $warning = '<div class="LC_warning">'.&mt('Intended course owner not specified').
-                      '</div>';
+                   '</div>';
         return ('',$warning);
     } elsif (&Apache::lonnet::homeserver($cloneruname,$clonerudom) eq 'no_host') {
         my $warning = '<div class="LC_error">'.&mt('Intended course owner does not exist').
@@ -860,35 +874,8 @@ sub get_coordinator_cloneable {
     }
 }
 
-sub instcode_selectors {
-    my ($codedom,$formname,$officialjs) = @_;
-    my ($output,@codetitles,%cat_titles,%cat_order,%cat_items);
-    my ($jscript,$totcodes,$numtitles,$lasttitle) =
-        &Apache::courseclassifier::instcode_selectors_data($codedom,$formname,
-                           \%cat_items,\@codetitles,\%cat_titles,\%cat_order,$officialjs);
-    if ($numtitles > 0) {
-        my $official = ' checked="checked" ';
-        my $unofficial = '';
-        if ($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.' />'.
-                   &mt('Yes').'</label>'.('&nbsp;'x3).'<label>'.
-                   '<input type="radio" name="official" value="off"'.$unofficial.
-                   ' onclick="toggleOfficial();" />'.&mt('No').'</label></span><br />'.
-                   &Apache::courseclassifier::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 search_courses {
-    my ($r,$type,$onlyown,$filter,$numtitles,$cloneruname,$clonerudom,$domcloner) = @_;
+    my ($r,$type,$onlyown,$filter,$numtitles,$cloneruname,$clonerudom,$domcloner,$codetitles) = @_;
     my (%courses,%showcourses,$cloner,$ccrole);
     if ($type eq 'Community') {
         $ccrole = 'co';
@@ -896,7 +883,7 @@ sub search_courses {
         $ccrole = 'cc';
     }
     if (!$onlyown) {
-        $r->print(&mt('Searching ...').'<br />&nbsp;<br />');
+        $r->print('<div id="searching">'.&mt('Searching ...').'</div>');
         $r->rflush();
         if (($filter->{'ownerfilter'} ne '') ||
             ($filter->{'ownerdomfilter'} ne '')) {
@@ -909,7 +896,7 @@ sub search_courses {
             }
         }
         my $now = time;
-        my $timefilter =
+        my $timefilter = 
            ($filter->{'sincefilter'}==-1?1:$now-$filter->{'sincefilter'});
         my ($createdbefore,$createdafter);
         if (($filter->{'createdfilter'} ne '') && ($filter->{'createdfilter'} !=-1)) {
@@ -920,10 +907,10 @@ sub search_courses {
         if ($numtitles) {
             if ($env{'form.official'} eq 'on') {
                 $instcodefilter = 
-                    &Apache::courseclassifier::instcode_search_str($filter->{'domainfilter'},$numtitles);
+                    &Apache::courseclassifier::instcode_search_str($filter->{'domainfilter'},$numtitles,$codetitles);
                 $regexpok = 1;
             } elsif ($env{'form.official'} eq 'off') {
-                $instcodefilter = &Apache::courseclassifier::instcode_search_str($filter->{'domainfilter'},$numtitles);
+                $instcodefilter = &Apache::courseclassifier::instcode_search_str($filter->{'domainfilter'},$numtitles,$codetitles);
                 unless ($instcodefilter eq '') {
                     $regexpok = -1;
                 }
@@ -995,7 +982,7 @@ sub course_chooser {
             $output = &mt('No rights to clone')."\n";
         }
     } else {
-        $output = '<input type="button" value="'.&mt('Select').'" onClick="gochoose('.
+        $output = '<input type="button" value="'.&mt('Select').'" onclick="gochoose('.
                   "'".$cnum."','".$cdom."','".$cleandesc."')".'" />'."\n";
     }
     return $output;
@@ -1015,8 +1002,7 @@ sub gochoose_javascript {
                                  list  => 'courselist',
                               },
                     );
-    my $output .= qq|
-<script type="text/javascript">
+    my $output = qq|
 function gochoose(cname,cdom,cdesc) {
     var openerForm = "$env{'form.form'}";
     courseCount = 0;
@@ -1065,8 +1051,13 @@ ENDSCRIPT
     } else {
         my ($name_code,$type_code);
         if ($env{'form.cnameelement'} ne '') {
-            $name_code = 'opener.document.'.$env{'form.form'}.'.'.
-                          $env{'form.cnameelement'}.'.value=cdesc;';
+            $name_code = <<ENDNAMECODE;  
+var showcdesc = cdesc;
+if (cdesc.length > 25) {
+    showcdesc = cdesc.substr(0,25)+' ...'; 
+}
+opener.document.$env{'form.form'}.$env{'form.cnameelement'}.value=showcdesc;
+ENDNAMECODE
         }
         if ($env{'form.typeelement'} ne '') {
             $type_code = 'opener.document.'.$env{'form.form'}.'.'.
@@ -1097,9 +1088,8 @@ ENDSCRIPT
     $autosubmit
     $lastaction
 }
-</script>
 |;
-    return $output;
+    return &Apache::lonhtmlcommon::scripttag($output);
 }
 
 1;
@@ -1217,10 +1207,10 @@ Side Effects: None
 
 =item *
 X<build_filters()>
-B<build_filters($filterlist,$type,$roleelement,$multelement,$filter,$action,$numfiltersref,$caller,$cloneruname,$clonerudom,$typeelem)>:
+B<build_filters($filterlist,$type,$roleelement,$multelement,$filter,$action,$numfiltersref,$caller,$cloneruname,$clonerudom,$typeelem,$codetitlesref>:
 
 
-Input: 11 - anonymous array of search criteria; course type; $roleelement ; $multelement ; anonymous hash of criteria and their values; form action; ref to scalar (count of number of elements in institutional codes -- e.g., 4 for year, semester, department, and number); caller context (e.g., set to 'modifycourse' when routine is called from lonmodifycourse.pm), username and domain of new course owner who wants to clone, $tyepelem 
+Input: 12 - anonymous array of search criteria; course type; $roleelement ; $multelement ; anonymous hash of criteria and their values; form action; ref to scalar (count of number of elements in institutional codes -- e.g., 4 for year, semester, department, and number); caller context (e.g., set to 'modifycourse' when routine is called from lonmodifycourse.pm); username and domain of new course owner who wants to clone, $typeelem; reference to array of titles of components in institutional codes (official courses). 
 
 Output: 1 - $output - HTML for display of search criteria, and hidden form elements. 
 
@@ -1229,10 +1219,11 @@ Side Effects: None
 =item *
 X<search_courses()>
 B<search_courses($r,$type,$onlyown,$filter,$numtitles,$cloneruname,$clonerudom,
-                 $domcloner)>:
+                 $domcloner,$codetitles)>:
 
 
-Input: 8 -  request object, course type, search scope: only courses in which user has active role (1), or any course (0); anonymous hash of criteria and their values; for institutional codes - number of categories; optional username of new course owner, optional domain of new course owner). Seventh and eighth needed when search is for courses to clone from course request form, or course creation form (DC). Optional "domcloner" flag (has value=1 if user has ccc priv in domain being filtered by (used when DC is using course creation form).
+Input: 9 -  request object, course type, search scope: only courses in which user has active role (1), or any course (0); anonymous hash of criteria and their values; for institutional codes - number of categories; optional username of new course owner, optional domain of new course owner). Seventh and eighth needed when search is for courses to clone from course request form, or course creation form (DC). Optional "domcloner" flag (has value=1 if user has ccc priv in  
+domain being filtered by (used when DC is using course creation form). Ninth is reference to array of titles of components in institutional codes (official courses).
 
 Output: 1 - %courses - hash of courses satisfying search criteria, keys = course IDs, values are corresponding colon-separated escaped description, institutional code, owner and type.
 
@@ -1292,7 +1283,7 @@ javascript functions used when user sele
 
 =item
 
-(g) Scantron Operator uploading a scantron file to a course - course number is written to visible form element in opener window. Child window closes.
+(g) Bubblesheet Scanning Operator uploading a bubblesheet file to a course - course number is written to visible form element in opener window. Child window closes.
 
 =item