[LON-CAPA-cvs] cvs: loncom /homework grades.pm lonhomework.pm /interface loncommon.pm lonhtmlcommon.pm lonprintout.pm lontrackstudent.pm multidownload.pl printout.pl /interface/spreadsheet classcalc.pm /interface/statistics loncorrectproblemplot.pm longradinganalysis.pm lonproblemanalysis.pm lonproblemstatistics.pm lonstathelpers.pm lonstudentassessment.pm lonstudentsubmissions.pm lonsubmissiontimeanalysis.pm lonsurveyreports.pm

www www at source.lon-capa.org
Wed Dec 21 16:25:51 EST 2011


www		Wed Dec 21 21:25:51 2011 EDT

  Modified files:              
    /loncom/homework	grades.pm lonhomework.pm 
    /loncom/interface	loncommon.pm lonhtmlcommon.pm lonprintout.pm 
                     	lontrackstudent.pm multidownload.pl printout.pl 
    /loncom/interface/spreadsheet	classcalc.pm 
    /loncom/interface/statistics	loncorrectproblemplot.pm 
                                	longradinganalysis.pm 
                                	lonproblemanalysis.pm 
                                	lonproblemstatistics.pm 
                                	lonstathelpers.pm 
                                	lonstudentassessment.pm 
                                	lonstudentsubmissions.pm 
                                	lonsubmissiontimeanalysis.pm 
                                	lonsurveyreports.pm 
  Log:
  Bug 6455 - Progress Indicator now jQuery. Still need to test across browsers.
  
  
-------------- next part --------------
Index: loncom/homework/grades.pm
diff -u loncom/homework/grades.pm:1.666 loncom/homework/grades.pm:1.667
--- loncom/homework/grades.pm:1.666	Sat Dec  3 01:16:39 2011
+++ loncom/homework/grades.pm	Wed Dec 21 21:25:36 2011
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # The LON-CAPA Grading handler
 #
-# $Id: grades.pm,v 1.666 2011/12/03 01:16:39 www Exp $
+# $Id: grades.pm,v 1.667 2011/12/21 21:25:36 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -7750,11 +7750,8 @@
     
     my $lock=&Apache::lonnet::set_lock(&mt('Grading bubblesheet exam'));
     my $count=&get_todo_count($scanlines,$scan_data);
-    my %prog_state=&Apache::lonhtmlcommon::Create_PrgWin($r,'Bubblesheet Status',
- 				    'Bubblesheet Progress',$count,
-				    'inline',undef,'scantronupload');
-    &Apache::lonhtmlcommon::Update_PrgWin($r,\%prog_state,
-					  'Processing first student');
+    my %prog_state=&Apache::lonhtmlcommon::Create_PrgWin($r,$count);
+    &Apache::lonhtmlcommon::Update_PrgWin($r,\%prog_state,'Processing first student');
     $r->print('<br />');
     my $start=&Time::HiRes::time();
     my $i=-1;
@@ -7786,8 +7783,7 @@
  	my $line=&scantron_get_line($scanlines,$scan_data,$i);
  	if ($line=~/^[\s\cz]*$/) { next; }
 	if ($started) {
-	    &Apache::lonhtmlcommon::Increment_PrgWin($r,\%prog_state,
-						     'last student');
+	    &Apache::lonhtmlcommon::Increment_PrgWin($r,\%prog_state,'last student');
 	}
 	$started=1;
  	my $scan_record=&scantron_parse_scanline($line,$i,\%scantron_config,
@@ -8278,9 +8274,7 @@
     my %completedstudents;
 
     my $count=&Apache::grades::get_todo_count($scanlines,$scan_data);
-    my %prog_state=&Apache::lonhtmlcommon::Create_PrgWin($r,'Bubblesheet/Submissions Comparison Status',
-                                    'Progress of Bubblesheet Data/Submission Records Comparison',$count,
-                                    'inline',undef,'checkscantron');
+    my %prog_state=&Apache::lonhtmlcommon::Create_PrgWin($r,$count);
     my ($username,$domain,$started);
     my $nav_error;
     &scantron_get_maxbubble(\$nav_error,\%scantron_config); # Need the bubble lines array to parse.
@@ -8289,8 +8283,7 @@
         return '';
     }
 
-    &Apache::lonhtmlcommon::Update_PrgWin($r,\%prog_state,
-                                          'Processing first student');
+    &Apache::lonhtmlcommon::Update_PrgWin($r,\%prog_state,'Processing first student');
     my $start=&Time::HiRes::time();
     my $i=-1;
 
@@ -8300,8 +8293,7 @@
         my $line=&Apache::grades::scantron_get_line($scanlines,$scan_data,$i);
         if ($line=~/^[\s\cz]*$/) { next; }
         if ($started) {
-            &Apache::lonhtmlcommon::Increment_PrgWin($r,\%prog_state,
-                                                     'last student');
+            &Apache::lonhtmlcommon::Increment_PrgWin($r,\%prog_state,'last student');
         }
         $started=1;
         my $scan_record=
Index: loncom/homework/lonhomework.pm
diff -u loncom/homework/lonhomework.pm:1.334 loncom/homework/lonhomework.pm:1.335
--- loncom/homework/lonhomework.pm:1.334	Tue Dec 20 22:46:06 2011
+++ loncom/homework/lonhomework.pm	Wed Dec 21 21:25:36 2011
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # The LON-CAPA Homework handler
 #
-# $Id: lonhomework.pm,v 1.334 2011/12/20 22:46:06 raeburn Exp $
+# $Id: lonhomework.pm,v 1.335 2011/12/21 21:25:36 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -779,13 +779,9 @@
     my $rndseed=$env{'form.rndseed'};
     &analyze_header($request);
     my %prog_state=
-	&Apache::lonhtmlcommon::Create_PrgWin($request,&mt('Analyze Progress'),
-					      &mt('Getting Problem Variants'),
-					      $env{'form.numtoanalyze'},
-					      'inline',undef);
+	&Apache::lonhtmlcommon::Create_PrgWin($request,$env{'form.numtoanalyze'});
     for(my $i=1;$i<$env{'form.numtoanalyze'}+1;$i++) {
-	&Apache::lonhtmlcommon::Increment_PrgWin($request,\%prog_state,
-						 &mt('last problem'));
+	&Apache::lonhtmlcommon::Increment_PrgWin($request,\%prog_state,'last problem');
 	if (&Apache::loncommon::connection_aborted($request)) { return; }
         my $thisseed=$i+$rndseed;
 	my $subresult=&Apache::lonnet::ssi($request->uri,
@@ -827,8 +823,7 @@
 	    }
 	}
     }
-    &Apache::lonhtmlcommon::Update_PrgWin($request,\%prog_state,
-					  &mt('Analyzing Results'));
+    &Apache::lonhtmlcommon::Update_PrgWin($request,\%prog_state,&mt('Analyzing Results'));
     $request->print('<hr />'
                    .'<h3>'
                    .&mt('List of possible answers')
Index: loncom/interface/loncommon.pm
diff -u loncom/interface/loncommon.pm:1.1043 loncom/interface/loncommon.pm:1.1044
--- loncom/interface/loncommon.pm:1.1043	Wed Dec 21 20:21:49 2011
+++ loncom/interface/loncommon.pm	Wed Dec 21 21:25:40 2011
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # a pile of common routines
 #
-# $Id: loncommon.pm,v 1.1043 2011/12/21 20:21:49 raeburn Exp $
+# $Id: loncommon.pm,v 1.1044 2011/12/21 21:25:40 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -7193,8 +7193,7 @@
   </div>
 </p>
 ENDPROGBAR
-    $r->print($content.&LCprogressbar_script());
-    $r->rflush();
+    &r_print($r,$content.&LCprogressbar_script());
 }
 
 sub LCprogressbarUpdate {
@@ -7211,27 +7210,35 @@
     $LClastpercent=$val;
     unless ($text) { $text=$val.'%'; }
     $text=&js_ready($text);
-    $r->print(<<ENDUPDATE);
+    &r_print($r,<<ENDUPDATE);
 <script type="text/javascript">
 // <![CDATA[
 LCupdateProgress($val,'$text');
 // ]]>
 </script>
 ENDUPDATE
-    $r->rflush();
 }
 
 sub LCprogressbarClose {
     my ($r)=@_;
     $LClastpercent=0;
-    $r->print(<<ENDCLOSE);
+    &r_print($r,<<ENDCLOSE);
 <script type="text/javascript">
 // <![CDATA[
 \$("#progressbar").hide('slow'); 
 // ]]>
 </script>
 ENDCLOSE
-    $r->rflush();
+}
+
+sub r_print {
+    my ($r,$to_print)=@_;
+    if ($r) {
+      $r->print($to_print);
+      $r->rflush();
+    } else {
+      print($to_print);
+    }
 }
 
 sub html_encode {
@@ -7241,6 +7248,7 @@
     
     return $result;
 }
+
 sub js_ready {
     my ($result) = @_;
 
Index: loncom/interface/lonhtmlcommon.pm
diff -u loncom/interface/lonhtmlcommon.pm:1.296 loncom/interface/lonhtmlcommon.pm:1.297
--- loncom/interface/lonhtmlcommon.pm:1.296	Sun Dec 11 13:23:24 2011
+++ loncom/interface/lonhtmlcommon.pm	Wed Dec 21 21:25:40 2011
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # a pile of common html routines
 #
-# $Id: lonhtmlcommon.pm,v 1.296 2011/12/11 13:23:24 www Exp $
+# $Id: lonhtmlcommon.pm,v 1.297 2011/12/21 21:25:40 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -991,82 +991,23 @@
 ########################################################
 ########################################################
 
-my $uniq=0;
-sub get_uniq_name {
-    $uniq++;
-    return 'uniquename'.$uniq;
-}
 
 # Create progress
 sub Create_PrgWin {
-    my ($r, $title, $heading, $number_to_do,$type,$width,$formname,
-	$inputname)=@_;
-    if (!defined($type)) { $type='popup'; }
-    if (!defined($width)) { $width=55; }
+    my ($r,$number_to_do)=@_;
     my %prog_state;
-    $prog_state{'type'}=$type;
-    if ($type eq 'popup') {
-	$prog_state{'window'}='popwin';
-	my $start_page =
-	    &Apache::loncommon::start_page($title,undef,
-					   {'only_body' => 1,
-					    'bgcolor'   => '#88DDFF',
-					    'js_ready'  => 1});
-	my $end_page = &Apache::loncommon::end_page({'js_ready'  => 1});
-
-	#the whole function called through timeout is due to issues
-	#in mozilla Read BUG #2665 if you want to know the whole story
-	&r_print($r,&Apache::lonhtmlcommon::scripttag(
-        "var popwin;
-         function openpopwin () {
-         popwin=open(\'\',\'popwin\',\'width=400,height=100\');".
-        "popwin.document.writeln(\'".$start_page.
-              "<h4>".&mt("$heading")."<\/h4>".
-              "<form action=\"\" name=\"popremain\" method=\"post\">".
-              '<input type="text" size="'.$width.'" name="remaining" value="'.
-	      &mt('Starting').'" /><\\/form>'.$end_page.
-              "\');".
-        "popwin.document.close();}".
-        "\nwindow.setTimeout(openpopwin,0)"
-    ));
-	$prog_state{'formname'}='popremain';
-	$prog_state{'inputname'}="remaining";
-    } elsif ($type eq 'inline') {
-	$prog_state{'window'}='window';
-	if (!$formname) {
-	    $prog_state{'formname'}=&get_uniq_name();
-	    &r_print($r,'<form action="" name="'.$prog_state{'formname'}.'">');
-	} else {
-	    $prog_state{'formname'}=$formname;
-	}
-	if (!$inputname) {
-	    $prog_state{'inputname'}=&get_uniq_name();
-	    &r_print($r,&mt("$heading [_1]",' <input type="text" name="'.$prog_state{'inputname'}.'" size="'.$width.'" />'));
-	} else {
-	    $prog_state{'inputname'}=$inputname;
-	    
-	}
-	if (!$formname) { &r_print($r,'</form>'); }
-	&Update_PrgWin($r,\%prog_state,&mt('Starting'));
-    }
-
     $prog_state{'done'}=0;
     $prog_state{'firststart'}=&Time::HiRes::time();
     $prog_state{'laststart'}=&Time::HiRes::time();
     $prog_state{'max'}=$number_to_do;
-    
+    &Apache::loncommon::LCprogressbar($r); 
     return %prog_state;
 }
 
 # update progress
 sub Update_PrgWin {
     my ($r,$prog_state,$displayString)=@_;
-    &r_print($r,&Apache::lonhtmlcommon::scripttag(
-        $$prog_state{'window'}.'.document.'.
-        $$prog_state{'formname'}.'.'.
-        $$prog_state{'inputname'}.'.value="'.
-        $displayString.'";'
-    ));
+    &Apache::loncommon::LCprogressbarUpdate($r,undef,$displayString);
     $$prog_state{'laststart'}=&Time::HiRes::time();
 }
 
@@ -1112,38 +1053,21 @@
             $min,
             $sec,
             $lasttime);
-
-    &r_print($r,&Apache::lonhtmlcommon::scripttag(
-        $$prog_state{'window'}.'.document.'.
-        $$prog_state{'formname'}.'.'.
-        $$prog_state{'inputname'}.'.value="'.$timeinfo.'";'
-    ));
+    my $percent=0;
+    if ($$prog_state{'max'}) {
+       $percent=int(100.*$current/$$prog_state{'max'});
+    }
+    &Apache::loncommon::LCprogressbarUpdate($r,$percent,$timeinfo);
     $$prog_state{'laststart'}=&Time::HiRes::time();
 }
 
 # close Progress Line
 sub Close_PrgWin {
     my ($r,$prog_state)=@_;
-    if ($$prog_state{'type'} eq 'popup') {
-        &r_print($r,&Apache::lonhtmlcommon::scripttag(
-            'popwin.close()'
-        ));
-    } elsif ($$prog_state{'type'} eq 'inline') {
-	&Update_PrgWin($r,$prog_state,&mt('Done'));
-    }
+    &Apache::loncommon::LCprogressbarClose($r);
     undef(%$prog_state);
 }
 
-sub r_print {
-    my ($r,$to_print)=@_;
-    if ($r) {
-	$r->print($to_print);
-	$r->rflush();
-    } else {
-	print($to_print);
-    }
-}
-
 # ------------------------------------------------------- Puts directory header
 
 sub crumbs {
Index: loncom/interface/lonprintout.pm
diff -u loncom/interface/lonprintout.pm:1.610 loncom/interface/lonprintout.pm:1.611
--- loncom/interface/lonprintout.pm:1.610	Tue Nov 29 11:57:33 2011
+++ loncom/interface/lonprintout.pm	Wed Dec 21 21:25:40 2011
@@ -2,7 +2,7 @@
 # The LearningOnline Network
 # Printout
 #
-# $Id: lonprintout.pm,v 1.610 2011/11/29 11:57:33 foxr Exp $
+# $Id: lonprintout.pm,v 1.611 2011/12/21 21:25:40 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -2878,7 +2878,7 @@
 	     ($helper->{'VARS'}->{'PRINT_ANNOTATIONS'} eq 'yes')) {
 	     $moreenv{'problem_split'}='yes';
 	 }
-	 my %prog_state=&Apache::lonhtmlcommon::Create_PrgWin($r,'Print Status','Class Print Status',$#students+1,'inline','75');
+	 my %prog_state=&Apache::lonhtmlcommon::Create_PrgWin($r,$#students+1);
 	 my $student_counter=-1;
 	 my $i = 0;
 	 my $last_section = (split(/:/,$students[0]))[2];
@@ -2993,7 +2993,7 @@
 	     $number_per_page=$num_todo > 0 ? $num_todo : 1;
 	 }
 	 my $flag_latex_header_remove = 'NO'; 
-	 my %prog_state=&Apache::lonhtmlcommon::Create_PrgWin($r,'Print Status','Class Print Status',$num_todo,'inline','75');
+	 my %prog_state=&Apache::lonhtmlcommon::Create_PrgWin($r,$num_todo);
 	 my $count=0;
 	 foreach my $code (sort(@allcodes)) {
 	     my $file_num=int($count/$number_per_page);
Index: loncom/interface/lontrackstudent.pm
diff -u loncom/interface/lontrackstudent.pm:1.32 loncom/interface/lontrackstudent.pm:1.33
--- loncom/interface/lontrackstudent.pm:1.32	Sun Jun  6 21:34:23 2010
+++ loncom/interface/lontrackstudent.pm	Wed Dec 21 21:25:40 2011
@@ -1,6 +1,6 @@
 # The LearningOnline Network with CAPA
 #
-# $Id: lontrackstudent.pm,v 1.32 2010/06/06 21:34:23 raeburn Exp $
+# $Id: lontrackstudent.pm,v 1.33 2011/12/21 21:25:40 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -592,10 +592,7 @@
                   '<input type="text" name="status" size="60" value="" readonly="readonly" />').
               '</div>');
     $r->rflush();
-    my %prog_state=&Apache::lonhtmlcommon::Create_PrgWin
-        ($r,&mt('Student Activity Retrieval'),
-         &mt('Student Activity Retrieval'),undef,'inline',undef,
-         'trackstudent','status');
+    my %prog_state=&Apache::lonhtmlcommon::Create_PrgWin($r);
     &Apache::lonhtmlcommon::Update_PrgWin
         ($r,\%prog_state,&mt('Contacting course home server'));
     #
Index: loncom/interface/multidownload.pl
diff -u loncom/interface/multidownload.pl:1.38 loncom/interface/multidownload.pl:1.39
--- loncom/interface/multidownload.pl:1.38	Tue Dec 30 23:18:24 2008
+++ loncom/interface/multidownload.pl	Wed Dec 21 21:25:40 2011
@@ -2,7 +2,7 @@
 # CGI-script to allow download of all essay submissions of 
 # multiple students.
 #
-# $Id: multidownload.pl,v 1.38 2008/12/30 23:18:24 raeburn Exp $
+# $Id: multidownload.pl,v 1.39 2011/12/21 21:25:40 www Exp $
 # Copyright Michigan State University Board of Trustees
 #
 # This file is part of the LearningOnline Network with CAPA (LON-CAPA).
@@ -100,8 +100,7 @@
     my $courseid = $env{'request.course.id'};
     my @stuchecked = split(/\n/,$env{'cgi.'.$identifier.'.students'});
     my $number_of_students = scalar(@stuchecked);
-    my %prog_state=&Apache::lonhtmlcommon::Create_PrgWin('','Processing Status',
-                                                    'Preparing Zip File',$number_of_students,'inline','80');
+    my %prog_state=&Apache::lonhtmlcommon::Create_PrgWin('',$number_of_students);
     my @parts = split(/\n/,$env{'cgi.'.$identifier.'.parts'});
     my $doc_zip_root = $Apache::lonnet::perlvar{'lonZipDir'};
     my $uname = $env{'user.name'};
@@ -119,7 +118,7 @@
     my $current_student = 0;
     foreach my $stu (@stuchecked) {
         $current_student ++;
-        &Apache::lonhtmlcommon::Update_PrgWin('',\%prog_state,"Processing student $current_student of $number_of_students");
+        &Apache::lonhtmlcommon::Update_PrgWin('',\%prog_state,&mt("Processing student [_1] of [_2]",$current_student,$number_of_students));
         my %files_saved;
         my ($stuname,$studom,$fullname) = split(/:/,$stu);
         my %record = &Apache::lonnet::restore($symb,$courseid,$studom,$stuname);
Index: loncom/interface/printout.pl
diff -u loncom/interface/printout.pl:1.150 loncom/interface/printout.pl:1.151
--- loncom/interface/printout.pl:1.150	Wed Oct 26 02:09:42 2011
+++ loncom/interface/printout.pl	Wed Dec 21 21:25:40 2011
@@ -1,7 +1,7 @@
 #!/usr/bin/perl
 # CGI-script to run LaTeX, dvips, ps2ps, ps2pdf etc.
 #
-# $Id: printout.pl,v 1.150 2011/10/26 02:09:42 www Exp $
+# $Id: printout.pl,v 1.151 2011/12/21 21:25:40 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -237,7 +237,7 @@
     close $temporary_file;  
     my $noteps;
     my %prog_state;
-    if ($advanced_role) { %prog_state=&Apache::lonhtmlcommon::Create_PrgWin('','Converting Images to EPS','Picture Conversion Status',$#content_of_file,'inline','80');  }
+    if ($advanced_role) { %prog_state=&Apache::lonhtmlcommon::Create_PrgWin('',$#content_of_file);  }
     print('<br />');
     foreach my $not_eps (@content_of_file) {
 	chomp($not_eps);
@@ -283,7 +283,7 @@
 
 my %prog_state;
 if ($advanced_role) { 
-    %prog_state=&Apache::lonhtmlcommon::Create_PrgWin('','Print Status',&mt('Class Print Status'),$number_of_files,'inline','80'); 
+    %prog_state=&Apache::lonhtmlcommon::Create_PrgWin('',$number_of_files); 
 }
 print "<br />";
 my $num_files = @texfile;	# How does this differ from $number_of_files , can that be 0?
@@ -372,7 +372,7 @@
 
   print "<br/>";
   if ($advanced_role) { 
-      &Apache::lonhtmlcommon::Update_PrgWin('',\%prog_state,'Creating PDF for '.$status_statement); 
+      &Apache::lonhtmlcommon::Update_PrgWin('',\%prog_state,&mt('Creating PDF for: [_1]',$status_statement)); 
   }
 
   if (-e $texfile) {		# Ensure the tex file exists:
@@ -629,8 +629,7 @@
 	    }
 	}
 	if ($advanced_role) {
-	    &Apache::lonhtmlcommon::Update_PrgWin('',$progress_win,
-						  $message.$extra_msg);
+	    &Apache::lonhtmlcommon::Update_PrgWin('',$progress_win,$message.$extra_msg);
 	}
     }
     $SIG{CHLD}='IGNORE';
@@ -727,8 +726,7 @@
     my @pages_in_student;	# For each student his/her initial page count.
     my $max_pages = 0;		# Pages in 'longest' student.
     my $page_number = 0;
-    &Apache::lonhtmlcommon::Update_PrgWin('',\%prog_state, 
-					  &mt("Counting pages for student: [_1]",1));
+    &Apache::lonhtmlcommon::Update_PrgWin('',\%prog_state,&mt("Counting pages for student: [_1]",1));
 
     while ($line = <PSFILE>) {
 	
@@ -756,8 +754,7 @@
 		# - save the page_number, reset and, if necessary
 		#    update max_pages.
 		push(@pages_in_student, $page_number);
-		&Apache::lonhtmlcommon::Update_PrgWin('',\%prog_state, 
-						      &mt("Counting pages for student: [_1]", scalar(@pages_in_student)));
+		&Apache::lonhtmlcommon::Update_PrgWin('',\%prog_state,&mt("Counting pages for student: [_1]", scalar(@pages_in_student)));
 		if ($page_number > $max_pages) {
 		    $max_pages = $page_number;
 		}
@@ -769,8 +766,7 @@
     }
     # file ended so one more student
     push(@pages_in_student, $page_number);
-    &Apache::lonhtmlcommon::Update_PrgWin('',\%prog_state, 
-					  &mt("Counting pages for student: [_1]",scalar(@pages_in_student)));
+    &Apache::lonhtmlcommon::Update_PrgWin('',\%prog_state,&mt("Counting pages for student: [_1]",scalar(@pages_in_student)));
     if ($page_number > $max_pages) {
 	$max_pages = $page_number;
     }
@@ -797,8 +793,7 @@
 
 
     my $student_number    = 0;	# Index of student we're working on.
-    &Apache::lonhtmlcommon::Update_PrgWin('',\%prog_state, 
-					  "Repaginating student ".$student_number+1);
+    &Apache::lonhtmlcommon::Update_PrgWin('',\%prog_state,&mt("Repaginating student: [_1]",$student_number+1));
 
     while (my $line = <LATEXIN>) {
 	if ($line eq "\\special{ps:ENDOFSTUDENTSTAMP}\n") {
@@ -815,8 +810,7 @@
 	    }
 	    
 	    $student_number++;
-	    &Apache::lonhtmlcommon::Update_PrgWin('',\%prog_state, 
-						  "Repaginating student ".$student_number+1);
+	    &Apache::lonhtmlcommon::Update_PrgWin('',\%prog_state,&mt("Repaginating student: [_1]",$student_number+1));
 	    
 	} else {
 	    print LATEXOUT $line;
@@ -932,8 +926,7 @@
     my $prettyname=$not_eps;
 	if ($advanced_role) {
 	    $prettyname=~s|$perlvar{'lonDocRoot'}/|/|;
-	    &Apache::lonhtmlcommon::Update_PrgWin('',\%prog_state,
-						  'Converting to EPS '.$prettyname);
+	    &Apache::lonhtmlcommon::Update_PrgWin('',\%prog_state,&mt('Converting to EPS: [_1]',$prettyname));
 	}
 	#
 	#  If the file is a PDF, need to use pdftops to convert it to a ps file.
Index: loncom/interface/spreadsheet/classcalc.pm
diff -u loncom/interface/spreadsheet/classcalc.pm:1.30 loncom/interface/spreadsheet/classcalc.pm:1.31
--- loncom/interface/spreadsheet/classcalc.pm:1.30	Fri Dec  3 21:33:56 2010
+++ loncom/interface/spreadsheet/classcalc.pm	Wed Dec 21 21:25:46 2011
@@ -1,5 +1,5 @@
 #
-# $Id: classcalc.pm,v 1.30 2010/12/03 21:33:56 www Exp $
+# $Id: classcalc.pm,v 1.31 2011/12/21 21:25:46 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -91,16 +91,10 @@
         $toprow .= '<th align="center"><b>'.&mt($name).'</b></th>';
         $bottomrow .= '<td>'.$selector.'</td>';
     }
-    my $status .= '<p><span class="LC_nobreak">'
-                 .&mt('Status: [_1]',
-                          '<input type="text" name="spreadsheet_status"'
-                         .' size="60" value="" readonly="readonly" />')
-                 .'</span></p>';
-
     return "<p>\n<table>\n".
         "<tr>".$toprow."</tr>\n".
         "<tr>".$bottomrow."</tr>\n".
-        "</table>\n".$status."\n".
+        "</table>\n".
         "</p>";
 }
 
@@ -386,16 +380,6 @@
     return;
 }
 
-sub update_status {
-    my ($r,$message) = @_;
-    $r->print('<script>'.
-              'window.document.sheet.spreadsheet_status.value="'.
-              $message.
-              '";</script>');
-    $r->rflush();
-    return;
-}
-
 sub compute {
     my $self = shift;
     my ($r) = @_;
@@ -404,14 +388,9 @@
     $self->initialize_safe_space();
     my %c = $self->constants();
     my %f = $self->formulas();
-    &update_status($r,'Initializing Course Structure');
     &Apache::studentcalc::initialize_package();
-    my %prog_state=&Apache::lonhtmlcommon::Create_PrgWin
-        ($r,&mt('Spreadsheet Computation Status'),
-         &mt('Spreadsheet Computation'), scalar(@Students),'inline',undef,
-         'sheet','spreadsheet_status');
-    &Apache::lonhtmlcommon::Update_PrgWin($r,\%prog_state,
-                                          &mt('Processing first student'));
+    my %prog_state=&Apache::lonhtmlcommon::Create_PrgWin($r,scalar(@Students));
+    &Apache::lonhtmlcommon::Update_PrgWin($r,\%prog_state,&mt('Processing first student'));
     foreach my $student (@Students) {
         if ($connection->aborted()) { $self->cleanup(); return; }
         my $sname = $student->{'username'}.':'.$student->{'domain'};
@@ -437,17 +416,14 @@
                 $c{$cell} = $data;
             }
 	}
-        &Apache::lonhtmlcommon::Increment_PrgWin($r,\%prog_state,
-                                                 'last student');
+        &Apache::lonhtmlcommon::Increment_PrgWin($r,\%prog_state,'last student');
     }
     &Apache::lonhtmlcommon::Close_PrgWin($r,\%prog_state);
-    &update_status($r,'Done computing student sheets');
     $r->rflush();
     $self->constants(\%c);
     $self->formulas(\%f);
     $self->calcsheet();
     $self->save() if ($self->need_to_save());
-    &update_status($r,'Done!');
 }
 
 1;
Index: loncom/interface/statistics/loncorrectproblemplot.pm
diff -u loncom/interface/statistics/loncorrectproblemplot.pm:1.25 loncom/interface/statistics/loncorrectproblemplot.pm:1.26
--- loncom/interface/statistics/loncorrectproblemplot.pm:1.25	Mon Jan 17 00:19:41 2011
+++ loncom/interface/statistics/loncorrectproblemplot.pm	Wed Dec 21 21:25:51 2011
@@ -1,6 +1,6 @@
 # The LearningOnline Network with CAPA
 #
-# $Id: loncorrectproblemplot.pm,v 1.25 2011/01/17 00:19:41 www Exp $
+# $Id: loncorrectproblemplot.pm,v 1.26 2011/12/21 21:25:51 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -327,13 +327,6 @@
     #
     $Str .= &Apache::loncommon::end_data_table_row();
     $Str .= &Apache::loncommon::end_data_table();
-    #
-    $Str .= '<p><span class="LC_nobreak">'
-           .&mt('Status: [_1]',
-                    '<input type="text" name="stats_status"'
-                   .' size="60" value="" readonly="readonly" />')
-           .'</span></p>';
-    $Str .= '</p>';
     ##
     return $Str;
 }
Index: loncom/interface/statistics/longradinganalysis.pm
diff -u loncom/interface/statistics/longradinganalysis.pm:1.10 loncom/interface/statistics/longradinganalysis.pm:1.11
--- loncom/interface/statistics/longradinganalysis.pm:1.10	Thu Jun 10 16:14:39 2010
+++ loncom/interface/statistics/longradinganalysis.pm	Wed Dec 21 21:25:51 2011
@@ -1,6 +1,6 @@
 # The LearningOnline Network with CAPA
 #
-# $Id: longradinganalysis.pm,v 1.10 2010/06/10 16:14:39 bisitz Exp $
+# $Id: longradinganalysis.pm,v 1.11 2011/12/21 21:25:51 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -149,10 +149,7 @@
 
 sub task_analysis {
     my ($r,$problem,$students) = @_;
-    my %prog_state=&Apache::lonhtmlcommon::Create_PrgWin
-        ($r,'Student Answer Compilation Status',
-         'Student Answer Compilation Progress', scalar(@$students),
-         'inline',undef,'Statistics','stats_status');
+    my %prog_state=&Apache::lonhtmlcommon::Create_PrgWin($r,scalar(@$students));
     my %graders;
     foreach my $student (@$students) {
 	my $sname = $student->{'username'};
@@ -327,12 +324,6 @@
     $str .= '</td>';
     #
     $str .= '<td>';
-    ##
-    $str .= '<span class="LC_nobreak"><label>'
-           .&mt('Status: [_1]',
-                    '<input type="text" name="stats_status"'
-                   .' size="60" value="" readonly="readonly" />')
-           .'</label></span>';
     $str .= '</td>';
     ##
     ##
Index: loncom/interface/statistics/lonproblemanalysis.pm
diff -u loncom/interface/statistics/lonproblemanalysis.pm:1.140 loncom/interface/statistics/lonproblemanalysis.pm:1.141
--- loncom/interface/statistics/lonproblemanalysis.pm:1.140	Mon Jan 17 00:19:41 2011
+++ loncom/interface/statistics/lonproblemanalysis.pm	Wed Dec 21 21:25:51 2011
@@ -1,6 +1,6 @@
 # The LearningOnline Network with CAPA
 #
-# $Id: lonproblemanalysis.pm,v 1.140 2011/01/17 00:19:41 www Exp $
+# $Id: lonproblemanalysis.pm,v 1.141 2011/12/21 21:25:51 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -630,10 +630,7 @@
     my ($r,$resource,$partid,$respid,$students)=@_;
     my $c = $r->connection();
     #
-    my %prog_state=&Apache::lonhtmlcommon::Create_PrgWin
-        ($r,'Student Answer Compilation Status',
-         'Student Answer Compilation Progress', scalar(@$students),
-         'inline',undef,'Statistics','stats_status');
+    my %prog_state=&Apache::lonhtmlcommon::Create_PrgWin($r,scalar(@$students));
     #
     # Read in the cache (if it exists) before we start timing things.
     &Apache::lonstathelpers::ensure_proper_cache($resource->{'symb'});
Index: loncom/interface/statistics/lonproblemstatistics.pm
diff -u loncom/interface/statistics/lonproblemstatistics.pm:1.119 loncom/interface/statistics/lonproblemstatistics.pm:1.120
--- loncom/interface/statistics/lonproblemstatistics.pm:1.119	Mon Jan 17 00:19:41 2011
+++ loncom/interface/statistics/lonproblemstatistics.pm	Wed Dec 21 21:25:51 2011
@@ -1,6 +1,6 @@
 # The LearningOnline Network with CAPA
 #
-# $Id: lonproblemstatistics.pm,v 1.119 2011/01/17 00:19:41 www Exp $
+# $Id: lonproblemstatistics.pm,v 1.120 2011/12/21 21:25:51 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -644,12 +644,6 @@
     $Str .=  &Apache::loncommon::end_data_table_row();
     $Str .= &Apache::loncommon::end_data_table();
     #
-    $Str .= '<p><span class="LC_nobreak">'
-           .&mt('Status: [_1]',
-                    '<input type="text" name="stats_status"'
-                   .' size="60" value="" readonly="readonly" />')
-           .'</span></p>';
-    #
     $Str .= '</p>';
     $Str .= '<input type="submit" name="GenerateStatistics" value="'.
         &mt('Generate Statistics').'" />';
Index: loncom/interface/statistics/lonstathelpers.pm
diff -u loncom/interface/statistics/lonstathelpers.pm:1.67 loncom/interface/statistics/lonstathelpers.pm:1.68
--- loncom/interface/statistics/lonstathelpers.pm:1.67	Mon Jul  4 09:25:02 2011
+++ loncom/interface/statistics/lonstathelpers.pm	Wed Dec 21 21:25:51 2011
@@ -1,6 +1,6 @@
 # The LearningOnline Network with CAPA
 #
-# $Id: lonstathelpers.pm,v 1.67 2011/07/04 09:25:02 foxr Exp $
+# $Id: lonstathelpers.pm,v 1.68 2011/12/21 21:25:51 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -716,10 +716,7 @@
     # Read in the cache (if it exists) before we start timing things.
     &Apache::lonstathelpers::ensure_proper_cache($resource->{'symb'});
     # Open progress window
-    my %prog_state=&Apache::lonhtmlcommon::Create_PrgWin
-        ($r,'Student Answer Compilation Status',
-         'Student Answer Compilation Progress', scalar(@$Students),
-         $status_type,undef,$formname,$inputname);
+    my %prog_state=&Apache::lonhtmlcommon::Create_PrgWin($r,scalar(@$Students));
     $r->rflush();
     foreach my $student (@$Students) {
         last if ($c->aborted());
@@ -1492,10 +1489,7 @@
     my @Students = @Apache::lonstatistics::Students;
     #
     # Open the progress window
-    my %prog_state=&Apache::lonhtmlcommon::Create_PrgWin
-        ($r,&mt('Student Data Compilation Status'),
-         &mt('Student Data Compilation Progress'), scalar(@Students),
-         $status_type,undef,$formname,$inputname);
+    my %prog_state=&Apache::lonhtmlcommon::Create_PrgWin($r,scalar(@Students));
     #
     while (my $student = shift @Students) {
         return if ($c->aborted());
Index: loncom/interface/statistics/lonstudentassessment.pm
diff -u loncom/interface/statistics/lonstudentassessment.pm:1.164 loncom/interface/statistics/lonstudentassessment.pm:1.165
--- loncom/interface/statistics/lonstudentassessment.pm:1.164	Wed Oct  5 18:56:00 2011
+++ loncom/interface/statistics/lonstudentassessment.pm	Wed Dec 21 21:25:51 2011
@@ -1,6 +1,6 @@
 # The LearningOnline Network with CAPA
 #
-# $Id: lonstudentassessment.pm,v 1.164 2011/10/05 18:56:00 raeburn Exp $
+# $Id: lonstudentassessment.pm,v 1.165 2011/12/21 21:25:51 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -813,10 +813,7 @@
     }
     #
     # Initialize progress window
-    %prog_state=&Apache::lonhtmlcommon::Create_PrgWin
-        ($r,'HTML Chart Status',
-         'HTML Chart Progress', $studentcount,
-         'inline',undef,'Statistics','stats_status');
+    %prog_state=&Apache::lonhtmlcommon::Create_PrgWin($r,$studentcount);
     #
     &Apache::lonhtmlcommon::Update_PrgWin($r,\%prog_state,
                                           'Processing first student');
@@ -1457,10 +1454,7 @@
     $r->rflush();
     #
     # Initialize progress window
-    %prog_state=&Apache::lonhtmlcommon::Create_PrgWin
-        ($r,'Excel File Compilation Status',
-         'Excel File Compilation Progress', $studentcount,
-         'inline',undef,'Statistics','stats_status');
+    %prog_state=&Apache::lonhtmlcommon::Create_PrgWin($r,$studentcount);
     #
     &Apache::lonhtmlcommon::Update_PrgWin($r,\%prog_state,
                                           'Processing first student');
@@ -1674,10 +1668,7 @@
     #
     # Initialize progress window
     my $studentcount = scalar(@Apache::lonstatistics::Students);
-    %prog_state=&Apache::lonhtmlcommon::Create_PrgWin
-        ($r,'CSV File Compilation Status',
-         'CSV File Compilation Progress', $studentcount,
-         'inline',undef,'Statistics','stats_status');
+    %prog_state=&Apache::lonhtmlcommon::Create_PrgWin($r,$studentcount);
     #
     # Open a file
     ($outputfile,$filename) = &Apache::loncommon::create_text_file($r,'csv');
Index: loncom/interface/statistics/lonstudentsubmissions.pm
diff -u loncom/interface/statistics/lonstudentsubmissions.pm:1.65 loncom/interface/statistics/lonstudentsubmissions.pm:1.66
--- loncom/interface/statistics/lonstudentsubmissions.pm:1.65	Mon Nov 21 20:12:36 2011
+++ loncom/interface/statistics/lonstudentsubmissions.pm	Wed Dec 21 21:25:51 2011
@@ -1,6 +1,6 @@
 # The LearningOnline Network with CAPA
 #
-# $Id: lonstudentsubmissions.pm,v 1.65 2011/11/21 20:12:36 raeburn Exp $
+# $Id: lonstudentsubmissions.pm,v 1.66 2011/12/21 21:25:51 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -875,10 +875,7 @@
     }
     #
     # Populate the worksheet with the student data
-    my %prog_state=&Apache::lonhtmlcommon::Create_PrgWin
-        ($r,'Excel File Compilation Status',
-         'Excel File Compilation Progress', 
-         scalar(@$Students),'inline',undef,'Statistics','stats_status');
+    my %prog_state=&Apache::lonhtmlcommon::Create_PrgWin($r,scalar(@$Students));
     my $max_row = $rows_output;
     foreach my $student (@$Students) {
         last if ($c->aborted());
@@ -955,8 +952,7 @@
                 }
             }
         }
-        &Apache::lonhtmlcommon::Increment_PrgWin($r,\%prog_state,
-                                                 'last student');
+        &Apache::lonhtmlcommon::Increment_PrgWin($r,\%prog_state,'last student');
     }
     &Apache::lonhtmlcommon::Close_PrgWin($r,\%prog_state);
     #
@@ -1069,10 +1065,7 @@
               &mt('Generating CSV report of student responses').'</h2>');
     #
     # Progress window
-    my %prog_state=&Apache::lonhtmlcommon::Create_PrgWin
-        ($r,'CSV File Compilation Status',
-         'CSV File Compilation Progress', 
-         scalar(@$students),'inline',undef,'Statistics','stats_status');
+    my %prog_state=&Apache::lonhtmlcommon::Create_PrgWin($r,scalar(@$students));
     
     $r->rflush();
     #
@@ -1222,8 +1215,7 @@
             print $outputfile $/;
         }
         undef(@rows);
-        &Apache::lonhtmlcommon::Increment_PrgWin($r,\%prog_state,
-                                                 'last student');
+        &Apache::lonhtmlcommon::Increment_PrgWin($r,\%prog_state,'last student');
     }
     close($outputfile);
     #
@@ -1347,12 +1339,6 @@
     $Str .= &Apache::loncommon::end_data_table_row();
     $Str .= &Apache::loncommon::end_data_table();
     #
-    $Str .= '<p><span class="LC_nobreak">'
-           .&mt('Status: [_1]',
-                    '<input type="text" name="stats_status"'
-                   .' size="60" value="" readonly="readonly" />')
-           .'</span></p>';
-    ##
     return $Str;
 }
 
Index: loncom/interface/statistics/lonsubmissiontimeanalysis.pm
diff -u loncom/interface/statistics/lonsubmissiontimeanalysis.pm:1.32 loncom/interface/statistics/lonsubmissiontimeanalysis.pm:1.33
--- loncom/interface/statistics/lonsubmissiontimeanalysis.pm:1.32	Mon Jan 17 00:19:41 2011
+++ loncom/interface/statistics/lonsubmissiontimeanalysis.pm	Wed Dec 21 21:25:51 2011
@@ -1,6 +1,6 @@
 # The LearningOnline Network with CAPA
 #
-# $Id: lonsubmissiontimeanalysis.pm,v 1.32 2011/01/17 00:19:41 www Exp $
+# $Id: lonsubmissiontimeanalysis.pm,v 1.33 2011/12/21 21:25:51 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -438,11 +438,6 @@
     $Str .= &Apache::loncommon::end_data_table_row();
     $Str .= &Apache::loncommon::end_data_table();
     #
-    $Str .= '<p><span class="LC_nobreak">'
-           .&mt('Status: [_1]',
-                    '<input type="text" name="stats_status"'
-                   .' size="60" value="" readonly="readonly" />')
-           .'</span></p>';
     $Str .= '</p>';
     ##
     return $Str;
Index: loncom/interface/statistics/lonsurveyreports.pm
diff -u loncom/interface/statistics/lonsurveyreports.pm:1.25 loncom/interface/statistics/lonsurveyreports.pm:1.26
--- loncom/interface/statistics/lonsurveyreports.pm:1.25	Mon Jan 17 00:19:41 2011
+++ loncom/interface/statistics/lonsurveyreports.pm	Wed Dec 21 21:25:51 2011
@@ -1,6 +1,6 @@
 # The LearningOnline Network with CAPA
 #
-# $Id: lonsurveyreports.pm,v 1.25 2011/01/17 00:19:41 www Exp $
+# $Id: lonsurveyreports.pm,v 1.26 2011/12/21 21:25:51 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -234,10 +234,7 @@
 sub compile_student_answers {
     my ($r,$problem,$ProblemData,$Students) = @_;
     my $resource = $problem->{'resource'};
-    my %prog_state=&Apache::lonhtmlcommon::Create_PrgWin
-        ($r,'Processing Student Submissions',
-         'Processing Student Submissions', 
-         scalar(@$Students),'inline',undef,'Statistics','stats_status');
+    my %prog_state=&Apache::lonhtmlcommon::Create_PrgWin($r,scalar(@$Students));
     foreach my $student (@$Students) {
         foreach my $partid (@{$resource->parts}) {
             my @response_ids   = $resource->responseIds($partid);
@@ -279,8 +276,7 @@
                 }
             }
         }
-        &Apache::lonhtmlcommon::Increment_PrgWin($r,\%prog_state,
-                                                 'last student');
+        &Apache::lonhtmlcommon::Increment_PrgWin($r,\%prog_state,'last student');
     }
     &Apache::lonhtmlcommon::Close_PrgWin($r,\%prog_state);
     return;
@@ -671,11 +667,6 @@
     $Str .= &Apache::loncommon::end_data_table_row();
     $Str .= &Apache::loncommon::end_data_table();
     #
-    $Str .= '<p><span class="LC_nobreak">'
-           .&mt('Status: [_1]',
-                    '<input type="text" name="stats_status"'
-                   .' size="60" value="" readonly="readonly" />')
-           .'</span></p>';
     $Str .= '</p>';
     ##
     return $Str;


More information about the LON-CAPA-cvs mailing list