[BACK]Return to lonprintout.pm CVS log [TXT] [DIR] Up to [LON-CAPA] / loncom / interface

Diff for /loncom/interface/lonprintout.pm between versions 1.560.2.5 and 1.560.2.6

version 1.560.2.5, 2009/10/12 10:59:48 version 1.560.2.6, 2009/10/13 11:01:16
Line 171  CHOOSE_RESOURCES Line 171  CHOOSE_RESOURCES
   
     return $result;      return $result;
 }  }
   #
   #   Generate the helper XML for a code choice helper dialog:
   #
   # Paramters:
   #   $helper       - Reference to the helper.
   #   $state        - Name of the state for the chooser.
   #   $next_state   - Name fo the state to follow the chooser.
   #   $bubble_types - Populates the bubble sheet type dropt down.
   #   $code_selections - Provides set of code choices that have been used
   #   $saved_codes  - Provides the list of saved codes.
   #
   # Returns;
   #   The Xml of the code chooser.
   #
   sub generate_code_selector {
       my ($helper,
    $state,
    $next_state,
    $bubble_types,
    $code_selections,
    $saved_codes) = @_; # Unpack the parameters.
   
       my $result = <<CHOOSE_ANON1;
     <state name="$state" title="Specify CODEd Assignments">
       <nextstate>$next_state</nextstate>
       <message><h4>Fill out one of the forms below</h4></message>
       <message><br /><hr /> <br /></message>
       <message><h3>Generate new CODEd Assignments</h3></message>
       <message><table><tr><td><b>Number of CODEd assignments to print:</b></td><td></message>
       <string variable="NUMBER_TO_PRINT_TOTAL" maxlength="5" size="5">
          <validator>
    if (((\$helper->{'VARS'}{'NUMBER_TO_PRINT_TOTAL'}+0) < 1) &&
       !\$helper->{'VARS'}{'REUSE_OLD_CODES'}                &&
               !\$helper->{'VARS'}{'SINGLE_CODE'}                    &&
       !\$helper->{'VARS'}{'CODE_SELECTED_FROM_LIST'}) {
       return "You need to specify the number of assignments to print";
    }
    return undef;
          </validator>
       </string>
       <message></td></tr><tr><td></message>
       <message><b>Names to save the CODEs under for later:</b></message>
       <message></td><td></message>
       <string variable="ANON_CODE_STORAGE_NAME" maxlength="50" size="20" />
       <message></td></tr><tr><td></message>
       <message><b>Bubble sheet type:</b></message>
       <message></td><td></message>
       <dropdown variable="CODE_OPTION" multichoice="0" allowempty="0">
       $bubble_types
       </dropdown>
       <message></td></tr><tr><td colspan="2"></td></tr><tr><td></message>
       <message></td></tr><tr><td></table></message>
       <message><br /><hr /><h3>Print a Specific CODE </h3><br /><table></message>
       <message><tr><td><b>Enter a CODE to print:</b></td><td></message>
       <string variable="SINGLE_CODE" size="10">
           <validator>
      if(!\$helper->{'VARS'}{'NUMBER_TO_PRINT_TOTAL'}           &&
         !\$helper->{'VARS'}{'REUSE_OLD_CODES'}                 &&
         !\$helper->{'VARS'}{'CODE_SELECTED_FROM_LIST'}) {
         return &Apache::lonprintout::is_code_valid(\$helper->{'VARS'}{'SINGLE_CODE'},
         \$helper->{'VARS'}{'CODE_OPTION'});
      } else {
          return undef; # Other forces control us.
      }
           </validator>
       </string>
       <message></td></tr><tr><td></message>
           $code_selections
       <message></td></tr></table></message>
       <message><hr /><h3>Reprint a Set of Saved CODEs</h3><table><tr><td></message>
       <message><b>Select saved CODEs:</b></message>
       <message></td><td></message>
       <dropdown variable="REUSE_OLD_CODES">
           $saved_codes
       </dropdown>
       <message></td></tr></table></message>
     </state>
   CHOOSE_ANON1
   
      return $result;
   }
   
 #-----------------------------------------------------------------------  #-----------------------------------------------------------------------
   
Line 2373  ENDPART Line 2453  ENDPART
  &Apache::lonhtmlcommon::Close_PrgWin($r,\%prog_state);   &Apache::lonhtmlcommon::Close_PrgWin($r,\%prog_state);
  $result .= $print_array[0].'  \end{document}';   $result .= $print_array[0].'  \end{document}';
      } elsif (($helper->{'VARS'}->{'PRINT_TYPE'} eq 'problems_for_anon')     ||       } elsif (($helper->{'VARS'}->{'PRINT_TYPE'} eq 'problems_for_anon')     ||
         ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'problems_for_anon_page') ||
       ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'resources_for_anon')  ) {         ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'resources_for_anon')  ) { 
  my $cdom =$env{'course.'.$env{'request.course.id'}.'.domain'};   my $cdom =$env{'course.'.$env{'request.course.id'}.'.domain'};
  my $cnum =$env{'course.'.$env{'request.course.id'}.'.num'};   my $cnum =$env{'course.'.$env{'request.course.id'}.'.num'};
Line 3279  ALL_PROBLEMS Line 3360  ALL_PROBLEMS
  'problems_for_students_from_page', 'CHOOSE_TGT_STUDENTS_PAGE'];   'problems_for_students_from_page', 'CHOOSE_TGT_STUDENTS_PAGE'];
  push @{$printChoices}, [&mt('Selected [_1]Problems[_2] from page [_3] for [_4]CODEd assignments[_5]',   push @{$printChoices}, [&mt('Selected [_1]Problems[_2] from page [_3] for [_4]CODEd assignments[_5]',
     '<b>', '</b>', '<b><i>'.$page_title.'</i></b>', '<b>', '</b>'),      '<b>', '</b>', '<b><i>'.$page_title.'</i></b>', '<b>', '</b>'),
  'problems_for_anon', 'CHOOSE_ANON1_PAGE'];   'problems_for_anon_page', 'CHOOSE_ANON1_PAGE'];
     }      }
     push @{$printChoices}, [&mt('Selected [_1]Problems[_2] from folder [_3] for [_4]selected people[_5]',      push @{$printChoices}, [&mt('Selected [_1]Problems[_2] from folder [_3] for [_4]selected people[_5]',
  '<b>','</b>','<b><i>'.$sequenceTitle.'</i></b>','<b>','</b>'),    '<b>','</b>','<b><i>'.$sequenceTitle.'</i></b>','<b>','</b>'), 
Line 3411  RESOURCE_SELECTOR Line 3492  RESOURCE_SELECTOR
  if ($codechoice eq '') {   if ($codechoice eq '') {
     $codechoice='<choice computer="default">Default</choice>';      $codechoice='<choice computer="default">Default</choice>';
  }   }
         &Apache::lonxml::xmlparse($r, 'helper', <<CHOOSE_ANON1);   my $anon1 = &generate_code_selector($helper, 
   <state name="CHOOSE_ANON1" title="Specify CODEd Assignments">      'CHOOSE_ANON1',
     <nextstate>SELECT_PROBLEMS</nextstate>      'SELECT_PROBLEMS',
     <message><h4>Fill out one of the forms below</h4></message>      $codechoice,
     <message><br /><hr /> <br /></message>      $code_selection,
     <message><h3>Generate new CODEd Assignments</h3></message>      $namechoice) . $resource_selector;
     <message><table><tr><td><b>Number of CODEd assignments to print:</b></td><td></message>      
     <string variable="NUMBER_TO_PRINT_TOTAL" maxlength="5" size="5">      
        <validator>          &Apache::lonxml::xmlparse($r, 'helper',$anon1);
  if (((\$helper->{'VARS'}{'NUMBER_TO_PRINT_TOTAL'}+0) < 1) &&  
     !\$helper->{'VARS'}{'REUSE_OLD_CODES'}                &&   my $anon_page = &generate_code_selector($helper,
             !\$helper->{'VARS'}{'SINGLE_CODE'}                    &&   'CHOOSE_ANON1_PAGE',
     !\$helper->{'VARS'}{'CODE_SELECTED_FROM_LIST'}) {   'SELECT_PROBLEMS_PAGE',
     return "You need to specify the number of assignments to print";   $codechoice,
  }   $code_selection,
  return undef;   $namechoice) .
        </validator>   &generate_resource_chooser('SELECT_PROBLEMS_PAGE',
     </string>     'Select Problem(s) to print',
     <message></td></tr><tr><td></message>     "multichoice='1' addstatus='1' closeallpages ='1'",
     <message><b>Names to save the CODEs under for later:</b></message>     'RESOURCES',
     <message></td><td></message>     'PRINT_FORMATTING',
     <string variable="ANON_CODE_STORAGE_NAME" maxlength="50" size="20" />     $url,
     <message></td></tr><tr><td></message>     $isProblem, '',  $symbFilter,
     <message><b>Bubble sheet type:</b></message>     $start_new_option);
     <message></td><td></message>   &Apache::lonnet::logthis('XML for anonpage: '.$anon_page);
     <dropdown variable="CODE_OPTION" multichoice="0" allowempty="0">   &Apache::lonxml::xmlparse($r, 'helper', $anon_page);
     $codechoice  
     </dropdown>  
     <message></td></tr><tr><td colspan="2"></td></tr><tr><td></message>  
     <message></td></tr><tr><td></table></message>  
     <message><br /><hr /><h3>Print a Specific CODE </h3><br /><table></message>  
     <message><tr><td><b>Enter a CODE to print:</b></td><td></message>  
     <string variable="SINGLE_CODE" size="10">  
         <validator>  
    if(!\$helper->{'VARS'}{'NUMBER_TO_PRINT_TOTAL'}           &&  
       !\$helper->{'VARS'}{'REUSE_OLD_CODES'}                 &&  
       !\$helper->{'VARS'}{'CODE_SELECTED_FROM_LIST'}) {  
       return &Apache::lonprintout::is_code_valid(\$helper->{'VARS'}{'SINGLE_CODE'},  
       \$helper->{'VARS'}{'CODE_OPTION'});  
    } else {  
        return undef; # Other forces control us.  
    }  
         </validator>  
     </string>  
     <message></td></tr><tr><td></message>  
         $code_selection  
     <message></td></tr></table></message>  
     <message><hr /><h3>Reprint a Set of Saved CODEs</h3><table><tr><td></message>  
     <message><b>Select saved CODEs:</b></message>  
     <message></td><td></message>  
     <dropdown variable="REUSE_OLD_CODES">  
         $namechoice  
     </dropdown>  
     <message></td></tr></table></message>  
   </state>  
   $resource_selector  
 CHOOSE_ANON1  
   
   
  if ($helper->{VARS}->{'assignment'}) {   if ($helper->{VARS}->{'assignment'}) {
Removed from v.1.560.2.5  
changed lines
  Added in v.1.560.2.6

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>