[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.4 and 1.560.2.5

version 1.560.2.4, 2009/10/06 11:02:12 version 1.560.2.5, 2009/10/12 10:59:48
Line 1 Line 1
 #  #
 #  Issues:  
 #   - Need to get the state flow for selected problems/resources for students  
 #     correct  
 #   - Need to do the CODEd stuff.  
 #   - Need to regularize and figure out for each case who puts on the latex  
 #     front matter and make sure it gets done.  
 #  
 #  
   
 # The LearningOnline Network  # The LearningOnline Network
 # Printout  # Printout
Line 99  sub generate_student_chooser { Line 92  sub generate_student_chooser {
  $sort_choice,    $sort_choice, 
  $variable,    $variable, 
  $next_state) = @_;   $next_state) = @_;
       &Apache::lonnet::logthis("Student chooser next state: $next_state, this state: $this_state");
     my $result = <<CHOOSE_STUDENTS;      my $result = <<CHOOSE_STUDENTS;
   <state name="$this_state" title="Select Students and Resources">    <state name="$this_state" title="Select Students and Resources">
       <message><b>Select sorting order of printout</b> </message>        <message><b>Select sorting order of printout</b> </message>
Line 155  sub generate_resource_chooser { Line 148  sub generate_resource_chooser {
  $value_func,   $value_func,
  $start_new_option)  = @_;   $start_new_option)  = @_;
   
           &Apache::lonnet::logthis("Top URL = $top_url");
     my $result = <<CHOOSE_RESOURCES;      my $result = <<CHOOSE_RESOURCES;
 <state name="$this_state" title="$prompt_text">  <state name="$this_state" title="$prompt_text">
     <resource variable="$variable" $resource_options      <resource variable="$variable" $resource_options
Line 2282  ENDPART Line 2275  ENDPART
  }   }
  $result .= '\end{document}';   $result .= '\end{document}';
      } elsif (($helper->{'VARS'}->{'PRINT_TYPE'} eq 'problems_for_students') ||       } elsif (($helper->{'VARS'}->{'PRINT_TYPE'} eq 'problems_for_students') ||
         ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'problems_for_students_from_page') ||
       ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'all_problems_students') ||        ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'all_problems_students') ||
       ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'resources_for_students')){        ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'resources_for_students')){
   
Line 2289  ENDPART Line 2283  ENDPART
      #-- prints assignments for whole class or for selected students         #-- prints assignments for whole class or for selected students  
  my $type;   my $type;
  if (($helper->{'VARS'}->{'PRINT_TYPE'} eq 'problems_for_students') ||   if (($helper->{'VARS'}->{'PRINT_TYPE'} eq 'problems_for_students') ||
        ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'problems_for_students_from_page') ||
      ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'all_problems_students') ) {       ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'all_problems_students') ) {
      $selectionmade=5;       $selectionmade=5;
      $type='problems';       $type='problems';
Line 3281  ALL_PROBLEMS Line 3276  ALL_PROBLEMS
     if ($page_ispage) {      if ($page_ispage) {
  push @{$printChoices}, [&mt('Selected [_1]Problems[_2] from page [_3] for [_4]selected people[_5]',   push @{$printChoices}, [&mt('Selected [_1]Problems[_2] from page [_3] for [_4]selected people[_5]',
     '<b>', '</b>', '<b><i>'.$page_title.'</i></b>', '<b>', '</b>'),      '<b>', '</b>', '<b><i>'.$page_title.'</i></b>', '<b>', '</b>'),
  'problems_for_students', 'CHOOSE_STUDENTS'];   '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'];   'problems_for_anon', '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 3334  ALL_PROBLEMS Line 3329  ALL_PROBLEMS
     </choices>      </choices>
     </state>      </state>
 RESOURCE_SELECTOR  RESOURCE_SELECTOR
           $resource_selector .= &generate_resource_chooser('CHOOSE_STUDENTS_PAGE',
    'Select Problem(s) to print',
    "multichoice='1' addstatus='1' closeallpages ='1'",
    'RESOURCES',
    'PRINT_FORMATTING',
    $url,
    $isProblem, '',  $symbFilter,
    $start_new_option);
   
 # Generate student choosers.  
   
   # Generate student choosers.
   
   
   
           &Apache::lonxml::xmlparse($r, 'helper',
     &generate_student_chooser('CHOOSE_TGT_STUDENTS_PAGE',
       'student_sort',
       'STUDENTS',
       'CHOOSE_STUDENTS_PAGE'));
  &Apache::lonxml::xmlparse($r, 'helper',    &Apache::lonxml::xmlparse($r, 'helper', 
   &generate_student_chooser('CHOOSE_STUDENTS',    &generate_student_chooser('CHOOSE_STUDENTS',
     'student_sort',      'student_sort',
Removed from v.1.560.2.4  
changed lines
  Added in v.1.560.2.5

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