--- loncom/interface/statistics/longradinganalysis.pm	2006/02/14 16:05:46	1.1
+++ loncom/interface/statistics/longradinganalysis.pm	2006/08/18 15:15:38	1.7
@@ -1,6 +1,6 @@
 # The LearningOnline Network with CAPA
 #
-# $Id: longradinganalysis.pm,v 1.1 2006/02/14 16:05:46 albertel Exp $
+# $Id: longradinganalysis.pm,v 1.7 2006/08/18 15:15:38 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -34,7 +34,8 @@ use Apache::loncoursedata();
 use Apache::lonstatistics;
 use Apache::lonlocal;
 use Apache::lonstathelpers();
-use Apache::lonstudentsubmissions();
+use Spreadsheet::WriteExcel;
+use Spreadsheet::WriteExcel::Utility();
 use HTML::Entities();
 use Time::Local();
 use Data::Dumper;
@@ -54,6 +55,7 @@ sub build_grading_analysis_page {
     #
     my %saveable_parameters = ('Status' => 'scalar',
                                'Section' => 'array',
+                               'Group' => 'array',
                                );
     &Apache::loncommon::store_course_settings('grading_analysis',
                                               \%saveable_parameters);
@@ -67,7 +69,7 @@ sub build_grading_analysis_page {
     my @students = @Apache::lonstatistics::Students;
     #
     if (@students < 1 && exists($env{'form.firstrun'})) {
-        $r->print('<h2>There are no students in the sections selected</h2>');
+        $r->print('<h2>There are no students in the sections/groups selected</h2>');
     }
     #
     #my @cache_button_HTML = 
@@ -158,31 +160,129 @@ sub task_analysis {
 	my %data =  &Apache::lonnet::restore($problem->symb(),
 					     $env{'request.course.id'},
 					     $sdom,$sname);
+	my $last_grader;
 	foreach my $ver (0..$data{'version'}) {
 	    if (exists($data{"$ver:resource.0.regrader"})
 		&& $data{"$ver:resource.0.regrader"} =~ /\S/) {
-		$graders{$data{"$ver:resource.0.regrader"}}++;
+		$last_grader=$data{"$ver:resource.0.regrader"};
 	    }
+	    if (exists($data{"$ver:resource.0.version"})
+		&& $last_grader =~ /\S/) {
+		$graders{$last_grader}++;
+	    }
+	}
+	if ($last_grader =~ /\S/) {
+	    $graders{$last_grader}++;
 	}
+
 	&Apache::lonhtmlcommon::Increment_PrgWin($r,\%prog_state,
                                                  &mt('last student'));
 
     }
+
+    my @output;
+    foreach my $grader (sort(keys(%graders))) {
+	my ($gname,$gdom) = split(/(?:\:|\@)/,$grader,2);
+	my $name = &Apache::loncommon::plainname($gname,$gdom);
+	push(@output,[$name,$gname."@".$gdom,$graders{$grader}]);
+    }
+
     if ($env{'form.output'} eq 'csv') {
+	my ($outputfile,$filename) = &init_csv_output($r);
+	foreach my $line (@output) {
+	    print $outputfile 
+		('"'.join(q{","},
+			  map {&Apache::loncommon::csv_translate($_)} @{$line})
+		 .'"'."\n");
+	}
+	close($outputfile);
+	$r->print('<br />'.
+		  '<a href="'.$filename.'">'.&mt('Your csv file.')."</a>\n");
     } elsif ($env{'form.output'} eq 'excel') {
+	my ($excel_workbook,$excel_sheet,$filename,$format,$rows_output) = 
+	    &init_excel_output($r);
+	foreach my $line (@output) {
+	    my $cols_output = 0;
+	    foreach my $item (@{ $line }) {
+		$excel_sheet->write($rows_output,$cols_output++,$item);
+	    }
+	    $rows_output++;
+	}
+	# Write the excel file
+	$excel_workbook->close();
+
+	# Tell the user where to get their excel file
+	$r->print('<br />'.
+		  '<a href="'.$filename.'">'.
+		  &mt('Your Excel spreadsheet.').'</a>'."\n");
     } else {
-	$r->print('<table class="thinborder">');
-	foreach my $grader (sort(keys(%graders))) {
-	    my ($gname,$gdom) = split('@',$grader,2);
-	    my $name = &Apache::loncommon::plainname($gname,$gdom);
-	    my $link = &Apache::loncommon::aboutmewrapper($name,$gname,$gdom);
-	    $r->print("<tr><td>$link (<tt>$grader</tt>)</td><td>$graders{$grader}</td></tr>");
+	$r->print(&Apache::loncommon::start_data_table());
+	$r->print(&Apache::loncommon::start_data_table_header_row().
+		  '<th>Name (username)</th><th>Grades Assigned</th>'.
+		  &Apache::loncommon::end_data_table_header_row() );
+	foreach my $line (@output) {
+	    $r->print(&Apache::loncommon::start_data_table_row().
+		      sprintf("<td>%s (<tt>%s</tt>)</td><td>%s</td></tr>",
+			      @{$line}).
+		      &Apache::loncommon::end_data_table_row());
 	}
-	$r->print('</table>');
+	$r->print(&Apache::loncommon::end_data_table());
     }
     &Apache::lonhtmlcommon::Close_PrgWin($r,\%prog_state);
 }
 
+sub init_csv_output {
+    my ($r) = @_;
+    my ($outputfile,$filename) = 
+	&Apache::loncommon::create_text_file($r,'csv');
+    my $description = $env{'course.'.$env{'request.course.id'}.'.description'};
+    print $outputfile ('"'.&Apache::loncommon::csv_translate($description).
+		       '","'.&Apache::loncommon::csv_translate(scalar(localtime(time))).
+		       '"'."\n");
+    print $outputfile ('"'.
+		       &Apache::loncommon::csv_translate(&Apache::lonstatistics::section_and_enrollment_description()).
+		       '"'."\n");
+    print $outputfile ('"'  .&Apache::loncommon::csv_translate('Grader Name'));
+    print $outputfile ('","'.&Apache::loncommon::csv_translate('Username'));
+    print $outputfile ('","'.&Apache::loncommon::csv_translate('Grades Assigned').
+		       '"'."\n");
+    return ($outputfile,$filename);
+}
+
+sub init_excel_output {
+    my ($r) = @_;
+    my ($excel_workbook,$filename,$format)=
+	&Apache::loncommon::create_workbook($r);
+    return if (! defined($excel_workbook));
+    my $rows_output = 0;
+    my $cols_output = 0;
+    my $header_row = $rows_output++;
+    my $description_row = $rows_output++;
+    $rows_output++;        # blank row
+    
+    my $sheetname = $env{'course.'.$env{'request.course.id'}.'.description'};
+    $sheetname = &Apache::loncommon::clean_excel_name($sheetname);
+    my $excel_sheet = $excel_workbook->addworksheet($sheetname);
+    $excel_sheet->write($header_row,$cols_output++,
+			$env{'course.'.$env{'request.course.id'}.'.description'},
+			$format->{'h1'});
+    $cols_output += 3;
+    my $sectionstring = '';
+#    my @Sections = &Apache::lonstatistics::get_selected_sections(); #This is never used
+    $excel_sheet->write($header_row,$cols_output++,
+			&Apache::lonstatistics::section_and_enrollment_description('plaintext'),
+			$format->{'h3'});
+    
+    $excel_sheet->write($header_row,$cols_output++,
+			'Compiled on '.localtime(time),$format->{'h3'});
+    $cols_output = 0;
+    foreach my $field ('Grader Name','Username','Grades Assigned') {
+	$excel_sheet->write($description_row,$cols_output++,$field,
+			    $format->{'bold'});
+    }
+    return ($excel_workbook,$excel_sheet,$filename,$format,$rows_output);
+}
+
 #########################################################
 #########################################################
 ##
@@ -204,12 +304,12 @@ sub create_interface {
     $output_selector .= '</select>'.$/;
 
     my $str = '';
-    $str .= &Apache::lonhtmlcommon::breadcrumbs
-        (undef,'Detailed Grading Statistics');
+    $str .= &Apache::lonhtmlcommon::breadcrumbs('Detailed Grading Statistics');
     $str .= '<table cellspacing="5">'."\n";
     $str .= '<tr>';
     $str .= '<td align="center"><b>'.&mt('Sections').'</b></td>';
-    $str .= '<td align="center"><b>'.&mt('Enrollment Status').'</b></td>';
+    $str .= '<td align="center"><b>'.&mt('Groups').'</b></td>';
+    $str .= '<td align="center"><b>'.&mt('Access Status').'</b></td>';
     $str .= '<td>'.&mt('<b>Output as</b> [_1]',$output_selector).'</td>';
     $str .= '</tr>'."\n";
     ##
@@ -218,6 +318,10 @@ sub create_interface {
     $str .= &Apache::lonstatistics::SectionSelect('Section','multiple',5);
     $str .= '</td>';
     #
+    $str .= '<td align="center">'."\n";
+    $str .= &Apache::lonstatistics::GroupSelect('Group','multiple',5);
+    $str .= '</td>';
+    #
     $str .= '<td align="center">';
     $str .= &Apache::lonhtmlcommon::StatusOptions(undef,undef,5);
     $str .= '</td>';