--- loncom/interface/lonquickgrades.pm	2011/05/28 16:55:49	1.95
+++ loncom/interface/lonquickgrades.pm	2016/01/31 21:25:38	1.108
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Quick Student Grades Display
 #
-# $Id: lonquickgrades.pm,v 1.95 2011/05/28 16:55:49 www Exp $
+# $Id: lonquickgrades.pm,v 1.108 2016/01/31 21:25:38 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -29,12 +29,31 @@
 package Apache::lonquickgrades;
 
 use strict;
-use Apache::Constants qw(:common :http);
+use Apache::Constants qw(:common :http REDIRECT);
 use POSIX;
 use Apache::loncommon;
 use Apache::lonlocal;
 use Apache::lonnet;
 use Apache::grades;
+use Apache::loncoursedata;
+use Apache::lonstudentassessment;
+use Apache::lonuserstate;
+
+use Time::HiRes;
+use Spreadsheet::WriteExcel;
+use Spreadsheet::WriteExcel::Utility();
+#
+# Excel data
+#
+my $excel_sheet;
+my $excel_workbook;
+my $filename;
+my $format;
+my $request_aborted;
+my $header_row;
+my $cols_output;
+my %prog_state;
+
 
 sub handler {
     my $r = shift;
@@ -57,6 +76,39 @@ sub real_handler {
         return OK;
     }
 
+    my $cangrade=&Apache::lonnet::allowed('mgr');
+
+    unless ($cangrade) {
+        # Check for critical messages and redirect if present.
+        my ($redirect,$url) = &Apache::loncommon::critical_redirect(300);
+        if ($redirect) {
+            &Apache::loncommon::content_type($r,'text/html');
+            $r->header_out(Location => $url);
+            return REDIRECT;
+        }
+
+        # Check if course needs to be re-initialized
+        my $loncaparev = $r->dir_config('lonVersion');
+        my ($result,@reinit) = &Apache::loncommon::needs_coursereinit($loncaparev);
+
+        if ($result eq 'switch') {
+            &Apache::loncommon::content_type($r,'text/html');
+            $r->send_http_header;
+            $r->print(&Apache::loncommon::check_release_result(@reinit));
+            return OK;
+        } elsif ($result eq 'update') {
+            my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
+            my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
+            my ($furl,$ferr) = &Apache::lonuserstate::readmap("$cdom/$cnum");
+            if ($ferr) {
+                my $requrl = $r->uri;
+                $env{'user.error.msg'}="$requrl:bre:0:0:Course not initialized";
+                $env{'user.reinit'} = 1;
+                return HTTP_NOT_ACCEPTABLE;
+            }
+        }
+    }
+
     # Send header, don't cache this page
     &Apache::loncommon::no_cache($r);
     $r->send_http_header;
@@ -81,7 +133,6 @@ sub real_handler {
 
     &startGradeScreen($r,'quick');
 
-    my $cangrade=&Apache::lonnet::allowed('mgr');
 #
 # Pick student
 #
@@ -89,11 +140,44 @@ sub real_handler {
     my $udom;
     my $stdid;
     if ($cangrade) {
+        $r->print("<h2>".&mt("Download Multiple")."</h2>".
+                  '<table cellspacing="5">'."\n".
+                  '<tr>'.
+                  '<td align="center"><b>'.&mt('Sections').'</b>'.
+                  &Apache::loncommon::help_open_topic("Chart_Sections").
+                  '</td>'.
+                  '<td align="center"><b>'.&mt('Groups').'</b>'.
+                  '</td>'.
+                  '<td align="center"><b>'.&mt('Student Data').'</b>'.
+                  &Apache::loncommon::help_open_topic("Chart_Student_Data").
+                  '</td>'.
+                  '<td align="center"><b>'.&mt('Access Status').'</b>'.
+                  &Apache::loncommon::help_open_topic("Chart_Enrollment_Status").
+                  '</td>'.
+                  '<td align="center"><b>'.&mt('Output Format').'</b>'.
+                  &Apache::loncommon::help_open_topic("Chart_Output_Formats").
+                  '</td><td>&nbsp;</td></tr>'."\n".
+                  '<tr><td align="center">'."\n".
+                  &Apache::lonstatistics::SectionSelect('Section','multiple',5).
+                  '</td><td align="center">'.
+                  &Apache::lonstatistics::GroupSelect('Group','multiple',5).
+                  '</td><td align="center">'.
+                  &Apache::lonstatistics::StudentDataSelect('StudentData','multiple',5,undef).
+                  '</td><td>'."\n".
+                  &Apache::lonhtmlcommon::StatusOptions(undef,undef,5).
+                  '</td><td>'."\n".
+                  &Apache::lonstudentassessment::CreateAndParseOutputSelector().
+                  '</td><td>'.
+                  '<input type="submit" name="download" value="'.&mt('Display/Download Multiple Students').'" />'.
+                  '</td></tr>'."\n".
+                  '</table>'."\n"
+                 );
+        $r->print("<hr /><h2>".&mt("Display Individual")."</h2>");
         if ($env{'form.uname'}) { $uname=$env{'form.uname'}; }
         if ($env{'form.udom'}) { $udom=$env{'form.udom'}; }
         if ($env{'form.id'}) { $stdid=$env{'form.id'}; }
         if (($stdid) && ($udom)) {
-            $uname=(&Apache::lonnet::idget($udom,$stdid))[1];
+            $uname=(&Apache::lonnet::idget($udom,[$stdid],'ids'))[1];
         }
         if (($stdid) && (!$uname)) {
             $r->print('<p><span class="LC_warning">'.&mt("Unknown Student/Employee ID: [_1]",$stdid).'</span></p>');
@@ -106,8 +190,8 @@ sub real_handler {
         $r->print(&mt('For User [_1] or Student/Employee ID [_2] at Domain [_3]'
                  ,'<input type="text" value="'.$uname.'" size="12" name="uname" />'
                  ,'<input type="text" value="'.$stdid.'" size="12" name="id" /> '
-                 ,$chooseopt).'<br />'.
-                 '<input type="submit" name="display" value="'.&mt('Update Display').'" /></p>');
+                 ,$chooseopt).
+                 '&nbsp;&nbsp;<input type="submit" name="display" value="'.&mt('Display Individual Student').'" /></p>');
         if (($uname) && ($udom)) {
             $r->print('<p>'.&mt('Full Name: [_1]',&Apache::loncommon::plainname($uname,$udom)).'</p>');
         }
@@ -130,6 +214,35 @@ sub real_handler {
 
 }
 
+sub getStudentCatGrade {
+    my ($uname,$udom,%categories)=@_;
+    my ($navmap,$totalParts,$totalPossible,$totalRight,$totalAttempted,$topLevelParts,$topLevelRight,$topLevelAttempted)=
+       &getData(1,$uname,$udom);
+    return &output_category_table(undef,0,$navmap,0,%categories);
+}
+
+sub getAllStudentData {
+    my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
+    my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
+
+    my %categories=&Apache::lonnet::dump('grading_categories',$cdom,$cnum);
+
+    my $classlist = &Apache::loncoursedata::get_classlist();
+
+    my $statusidx   = &Apache::loncoursedata::CL_STATUS();
+    my $usernameidx = &Apache::loncoursedata::CL_SNAME();
+    my $domainidx   = &Apache::loncoursedata::CL_SDOM();
+    my $fullnameidx = &Apache::loncoursedata::CL_FULLNAME();
+
+    foreach my $key (keys(%{$classlist})) {
+        my $student = $classlist->{$key};
+        my $perc=&getStudentCatGrade($classlist->{$student}->[$usernameidx],
+                                     $classlist->{$student}->[$domainidx],
+                                     %categories);
+    }
+}
+
+
 sub startGradeScreen {
     my ($r,$mode)=@_;
 
@@ -181,7 +294,7 @@ sub startGradeScreen {
        if ($env{'form.symb'}) {
           $r->print("\n".'<li'.($mode eq 'probgrading'?' class="active"':'').'><a href="/adm/grades?symb='.
                                               &Apache::lonhtmlcommon::entity_encode($env{'form.symb'}).
-                                              '&command=gradingmenu"><b>&nbsp;&nbsp;&nbsp;&nbsp;'.
+                                              '&amp;command=gradingmenu"><b>&nbsp;&nbsp;&nbsp;&nbsp;'.
                                               &mt('Problem Grading').'&nbsp;&nbsp;&nbsp;&nbsp;</b></a></li>');
 
        }
@@ -195,6 +308,68 @@ sub endGradeScreen {
    $r->print('</div></div></div>'.&Apache::loncommon::end_page());
 }
 
+# -----------
+
+
+sub excel_cleanup {
+    undef ($excel_sheet);
+    undef ($excel_workbook);
+    undef ($filename);
+    undef ($format);
+}
+
+
+sub excel_initialize {
+    my ($r) = @_;
+
+    &excel_cleanup();
+
+    # Create sheet
+    ($excel_workbook,$filename,$format)=
+        &Apache::loncommon::create_workbook($r);
+    return if (! defined($excel_workbook));
+   #
+   # Add a worksheet
+    my $sheetname = $env{'course.'.$env{'request.course.id'}.'.description'};
+    $sheetname = &Apache::loncommon::clean_excel_name($sheetname);
+    $excel_sheet = $excel_workbook->addworksheet($sheetname);
+   #
+   # Put the course description in the header
+    $excel_sheet->write($header_row,$cols_output++,
+                   $env{'course.'.$env{'request.course.id'}.'.description'},
+                        $format->{'h1'});
+} 
+
+sub excel_finish {
+    my ($r) = @_;
+    if ($request_aborted || ! defined($excel_sheet)) {
+        &excel_cleanup();
+        return;
+    }
+    #
+    # Write the excel file
+    $excel_workbook->close();
+    #
+    # Close the progress window
+    &Apache::lonhtmlcommon::Close_PrgWin($r,\%prog_state);
+    #
+    # Tell the user where to get their excel file
+    $r->print('<br />'.
+              '<a href="'.$filename.'">'.&mt('Your Excel spreadsheet').'</a>'."\n");
+    $r->rflush();
+    &excel_cleanup();
+    return;
+}
+
+
+#
+# CSV data
+#
+# -----------
+
+#
+# Go through the complete course and collect data
+#
 
 sub getData {
 
@@ -242,39 +417,40 @@ sub getData {
             my $stack = $iterator->getStack();
             
             for my $part (@{$parts}) {
-		my $completionStatus = $curRes->getCompletionStatus($part);
 		my $dateStatus = $curRes->getDateStatus($part);
-		
-                if ($completionStatus == $curRes->EXCUSED()) {
+                my $weight = $curRes->weight($part);
+                my $problemstatus = $curRes->problemstatus($part);
+
+                if ($curRes->solved($part) eq 'excused') {
                     next;
                 }
 		if ($showPoints) {
 		    my $score = 0;
 		    # If we're not telling status and the answer date isn't passed yet, 
 		    # it's an "attempted" point
-		    if ((($curRes->problemstatus($part) eq 'no') ||
-                        ($curRes->problemstatus($part) eq 'no_feedback_ever')) &&
+		    if ((($problemstatus eq 'no') ||
+                         ($problemstatus eq 'no_feedback_ever')) &&
 			($dateStatus != $curRes->ANSWER_OPEN)) {
 			my $status = $curRes->simpleStatus($part);
 			if ($status == $curRes->ATTEMPTED) {
-			    $partsAttempted += $curRes->weight($part);
+			    $partsAttempted += $weight;
 			    $totalAttempted += $partsAttempted;
 			}
 		    } else {
-			$score = &Apache::grades::compute_points($curRes->weight($part), $curRes->awarded($part));
+			$score = &Apache::grades::compute_points($weight, $curRes->awarded($part));
 		    }
 		    $partsRight += $score;
 		    $totalRight += $score;
-		    $partsCount += $curRes->weight($part);
+		    $partsCount += $weight;
 
                     $curRes->{DATA}->{PROB_SCORE}  += $score;
-                    $curRes->{DATA}->{PROB_WEIGHT} += $curRes->weight($part);
+                    $curRes->{DATA}->{PROB_WEIGHT} += $weight;
 
 		    if ($curRes->opendate($part) < $now) {
-			$totalPossible += $curRes->weight($part);
-                        $curRes->{DATA}->{PROB_POSSIBLE} += $curRes->weight($part);
+			$totalPossible += $weight;
+                        $curRes->{DATA}->{PROB_POSSIBLE} += $weight;
 		    }
-		    $totalParts += $curRes->weight($part);
+		    $totalParts += $weight;
 		} else {
 		    my $status = $curRes->simpleStatus($part);
 		    my $thisright = 0;
@@ -291,7 +467,6 @@ sub getData {
 			$totalAttempted++;
 		    }
 		    
-		    my $dateStatus = $curRes->getDateStatus($part);
 		    $totalParts++;
 		    if ($curRes->opendate($part) < $now) {
 			$totalPossible++;
@@ -461,7 +636,7 @@ sub outputCategories {
         &Apache::lonnet::put('grading_categories',\%categories,$cdom,$cnum);
     }
 # new categories loaded now
-    &output_category_table($r,$cangrade,$navmap,%categories);
+    &output_category_table($r,$cangrade,$navmap,1,%categories);
 #
     if ($cangrade) {
         $r->print(&Apache::loncommon::resourcebrowser_javascript().
@@ -471,40 +646,6 @@ sub outputCategories {
                   '<input type="submit" name="storechanges" value="'.&mt("Save changes to grading categories").'" />'.
                   '<script>function storecmd (cmd) { document.quickform.cmd.value=cmd; document.quickform.submit(); }</script>');
     }
-#
-# Debug
-#
-#    my %data=&dumpdata($navmap);
-#    foreach (keys(%data)) {
-#        $r->print("\n<br />".$_.'='.$data{$_});
-#    }
-#   my @debugarray=('5:1','4:3','1:1','5:5','6:7');
-#   $r->print("Array: ".join(',',@debugarray).'<br />');
-#   $r->print("0,0,0: ".join(',',&drop(0,0,0,@debugarray)).'<br />');
-#   $r->print("1,0,0: ".join(',',&drop(1,0,0,@debugarray)).'<br />');
-#   $r->print("0,1,0: ".join(',',&drop(0,1,0,@debugarray)).'<br />');
-#   $r->print("1,1,0: ".join(',',&drop(1,1,0,@debugarray)).'<br />');
-#
-#   $r->print("0,0,2: ".join(',',&drop(0,0,2,@debugarray)).'<br />');
-#   $r->print("1,0,2: ".join(',',&drop(1,0,2,@debugarray)).'<br />');
-#   $r->print("0,1,2: ".join(',',&drop(0,1,2,@debugarray)).'<br />');
-#   $r->print("1,1,2: ".join(',',&drop(1,1,2,@debugarray)).'<br />');
-#
-#   $r->print("0,0,4: ".join(',',&drop(0,0,4,@debugarray)).'<br />');
-#   $r->print("1,0,4: ".join(',',&drop(1,0,4,@debugarray)).'<br />');
-#   $r->print("0,1,4: ".join(',',&drop(0,1,4,@debugarray)).'<br />');
-#   $r->print("1,1,4: ".join(',',&drop(1,1,4,@debugarray)).'<br />');
-#
-#   $r->print("0,0,5: ".join(',',&drop(0,0,5,@debugarray)).'<br />');
-#   $r->print("1,0,5: ".join(',',&drop(1,0,5,@debugarray)).'<br />');
-#   $r->print("0,1,5: ".join(',',&drop(0,1,5,@debugarray)).'<br />');
-#   $r->print("1,1,5: ".join(',',&drop(1,1,5,@debugarray)).'<br />');
-#
-#   $r->print("0,0,7: ".join(',',&drop(0,0,7,@debugarray)).'<br />');
-#   $r->print("1,0,7: ".join(',',&drop(1,0,7,@debugarray)).'<br />');
-#   $r->print("0,1,7: ".join(',',&drop(0,1,7,@debugarray)).'<br />');
-#   $r->print("1,1,7: ".join(',',&drop(1,1,7,@debugarray)).'<br />');
-
 }
 
 #
@@ -587,27 +728,36 @@ sub process_category_edits {
 #
 
 sub output_category_table {
-    my ($r,$cangrade,$navmaps,%categories)=@_;
-    my $sum=0;
-    my $total=0;
-    $r->print(&Apache::loncommon::start_data_table());
+    my ($r,$cangrade,$navmaps,$output,%categories)=@_;
+    
+    my $totalweight=0;
+    my $totalpoints=0;
+
+    if ($output) { 
+       $r->print(&Apache::loncommon::start_data_table());
 #
-    &output_category_table_header($r,$cangrade);
+       &output_category_table_header($r,$cangrade);
+    }
 #
     my @order=split(/\,/,$categories{'order'});
 #
     my %performance=&dumpdata($navmaps);
     my $maxpos=$#order;
     for (my $i=0;$i<=$maxpos;$i++) {
-        my ($correct,$possible,$type,$weight)=&output_and_calc_category($r,$cangrade,$navmaps,$order[$i],$i,$maxpos,\%performance,1,%categories);
-        $sum+=$correct*$weight;
-        $total+=$weight;
+        my ($correct,$possible,$type,$weight)=&output_and_calc_category($r,$cangrade,$navmaps,$order[$i],$i,$maxpos,\%performance,$output,%categories);
+        unless ($possible) { next; }
+        $totalpoints+=$weight*$correct/$possible;
+        $totalweight+=$weight;
     }
 #
-    &bottom_line_category($r,$cangrade,$sum,$total);
-#
-    $r->print(&Apache::loncommon::end_data_table());
-    return $sum;
+    my $perc=0;
+    if ($totalweight) { $perc=100.*$totalpoints/$totalweight; }
+
+    if ($output) { 
+        &bottom_line_category($r,$cangrade,$perc); 
+        $r->print(&Apache::loncommon::end_data_table());
+    }
+    return $perc;
 }
 
 sub output_category_table_header {
@@ -632,14 +782,15 @@ sub output_category_table_header {
 
 sub output_and_calc_category {
     my ($r,$cangrade,$navmaps,$id,$currentpos,$maxpos,$performance,$output,%categories)=@_;
+    
+    if ($output) { $r->print("\n".&Apache::loncommon::start_data_table_row()); }
 
-    my $iconpath = &Apache::loncommon::lonhttpdurl($r->dir_config('lonIconsURL') . "/");
-    my %lt=&Apache::lonlocal::texthash(
+    if ($output && $cangrade) {
+        my $iconpath = &Apache::loncommon::lonhttpdurl($r->dir_config('lonIconsURL') . "/");
+        my %lt=&Apache::lonlocal::texthash(
            'up' => 'Move Up',
            'dw' => 'Move Down');
-    if ($output) { $r->print("\n".&Apache::loncommon::start_data_table_row()); }
 
-    if ($output && $cangrade) {
         $r->print(<<ENDMOVE);
 <td>
 <div class="LC_docs_entry_move">
@@ -681,7 +832,7 @@ ENDMOVE
         if ($possible>0) { push(@individual,"$possible:$correct"); }
         if ($output) {
            $r->print('<li>');
-           $r->print(&Apache::lonnet::gettitle($contentid).' ('.$correct.'/'.$possible.')');
+           $r->print(&Apache::lonnet::gettitle($contentid).' ('.&numberout($correct).'/'.&numberout($possible).')');
            if ($cangrade) {
               $r->print(' <a href="javascript:storecmd(\'delcont_'.$id.'______'.$contentid.'\');">'.&mt('Delete').'</a>');
            }
@@ -693,7 +844,7 @@ ENDMOVE
        if ($cangrade) {
            $r->print('<br />'.&Apache::loncommon::selectresource_link('quickform','addcont_'.$id,&mt('Add Problem or Folder')).'<br />');
        }
-       $r->print('<p>'.&mt('Total raw points: [_1]/[_2]',$totalcorrect,$totalpossible).'</p>');
+       $r->print('<p><b>'.&mt('Total raw points: [_1]/[_2]',&numberout($totalcorrect),&numberout($totalpossible)).'</b></p>');
        $r->print('</td>'); 
     }
 # Total
@@ -718,7 +869,7 @@ ENDMOVE
        $totalpossible=1.*$categories{$id.'_total'};
     }
     if ($output) {
-       $r->print('<p>'.&mt('Adjusted raw points: [_1]/[_2]',$totalcorrect,$totalpossible).'</p>');
+       $r->print('<p><b>'.&mt('Adjusted raw points: [_1]/[_2]',&numberout($totalcorrect),&numberout($totalpossible)).'</b></p>');
     }
 
 
@@ -762,7 +913,7 @@ ENDMOVE
     if ($output) { 
         $r->print('</ul>'); 
         if ($cangrade) { $r->print('<br />'.&new_calc_rule_form($id)); }
-        $r->print('<p>'.&mt('Calculated points: [_1]/[_2]',$totalcorrect,$totalpossible).'</p>');
+        $r->print('<p><b>'.&mt('Calculated points: [_1]/[_2]',&numberout($totalcorrect),&numberout($totalpossible)).'</b></p>');
         $r->print('</td>'); 
     }
 #
@@ -795,17 +946,17 @@ ENDMOVE
         }
     }
     if ($output) {
-        $r->print('<p>');
+        $r->print('<p><b>');
         if ($type eq 'percent') {
             my $perc='---';
             if ($totalpossible) {
                 $perc=100.*$totalcorrect/$totalpossible;
             }
-            $r->print(&mt('[_1] percent',$perc));
+            $r->print(&mt('[_1] percent',&numberout($perc)));
         } else {
-            $r->print(&mt('[_1]/[_2] points',$totalcorrect,$totalpossible));
+            $r->print(&mt('[_1]/[_2] points',&numberout($totalcorrect),&numberout($totalpossible)));
         }
-        $r->print('</p>');
+        $r->print('</b></p>');
     }
     if ($output) { $r->print('</td>'); }
 
@@ -857,14 +1008,21 @@ sub drop {
 #
 
 sub bottom_line_category {
-    my ($r,$cangrade,$sum,$total)=@_;
+    my ($r,$cangrade,$perc)=@_;
     $r->print(&Apache::loncommon::start_data_table_row());
     if ($cangrade) {
         $r->print('<td colspan="3"><a href="javascript:storecmd(\'createnewcat\');">'.&mt('Create New Category').'</a></td>');
     }
-    $r->print('<td colspan="6">'.&mt('Current:').$sum.'<br />'.&mt('Total:').$total.'<br /></td>');
+    $r->print('<td colspan="6"><b>'.&mt('Total: [_1] percent',&numberout($perc)).'</b></td>');
 }
 
+sub numberout {
+    my ($number)=@_;
+    my $printout=sprintf("%.3f", $number);
+    $printout=~s/0+$//;
+    $printout=~s/\.$//;
+    return $printout;
+}
 #
 # Make one new category
 #