[LON-CAPA-cvs] cvs: loncom /interface lonquickgrades.pm

bowersj2 lon-capa-cvs@mail.lon-capa.org
Fri, 22 Nov 2002 20:07:11 -0000


This is a MIME encoded message

--bowersj21037995631
Content-Type: text/plain

bowersj2		Fri Nov 22 15:07:11 2002 EDT

  Modified files:              
    /loncom/interface	lonquickgrades.pm 
  Log:
  Should now work as desired, though I've got a few tweaks left to do.
  
  
--bowersj21037995631
Content-Type: text/plain
Content-Disposition: attachment; filename="bowersj2-20021122150711.txt"

Index: loncom/interface/lonquickgrades.pm
diff -u loncom/interface/lonquickgrades.pm:1.4 loncom/interface/lonquickgrades.pm:1.5
--- loncom/interface/lonquickgrades.pm:1.4	Tue Nov 19 16:11:25 2002
+++ loncom/interface/lonquickgrades.pm	Fri Nov 22 15:07:11 2002
@@ -31,9 +31,15 @@
 
 use strict;
 use Apache::Constants qw(:common :http);
+use POSIX;
 
 sub handler {
     my $r = shift;
+    return real_handler($r);
+}
+
+sub real_handler {
+    my $r = shift;
 
     &Apache::loncommon::get_unprocessed_cgi($ENV{QUERY_STRING});
 
@@ -66,25 +72,6 @@
     # should match color/icon
     my $res = $navmap->firstResource(); # temp resource to access constants
 
-    my $green = "#AAFFAA";
-    my $red = "#FFAAAA";
-    my $yellow = "#FFFFAA";
-    my $orange = "#FFBB88";
-    my $neutral = "";
-    my %statusColorMap = 
-        ( $res->NETWORK_FAILURE    => $neutral,
-          $res->NOTHING_SET        => $neutral,
-          $res->CORRECT            => $green,
-          $res->EXCUSED            => $green,
-          $res->PAST_DUE_NO_ANSWER => $orange,
-          $res->PAST_DUE_ANSWER_LATER => $orange,
-          $res->ANSWER_OPEN        => $orange,
-          $res->OPEN_LATER         => $neutral,
-          $res->TRIES_LEFT         => $neutral,
-          $res->INCORRECT          => $orange,
-          $res->OPEN               => $yellow,
-          $res->ATTEMPTED          => $yellow );
-    
     if (!defined($navmap)) {
         my $requrl = $r->uri;
         $ENV{'user.error.msg'} = "$requrl:bre:0:0:Course not initialized";
@@ -103,18 +90,80 @@
     my $depth = 1;
     $iterator->next(); # ignore first BEGIN_MAP
     my $curRes = $iterator->next();
-    my $totalParts = 0;
-    my $totalRight = 0;
-    my $totalCurrentlyPossible = 0;
     
-    $r->print("<div width=\"50%\">\n"); # use this to format the col
-   
+    # General overview of the following: Walk along the course resources.
+    # For every problem in the resource, tell its parent maps how many
+    # parts and how many parts correct it has. After that, each map will
+    # have a count of the total parts underneath it, correct and otherwise.
+    # After that, we will walk through the course again and read off
+    # maps in order, with their data. 
+    # (If in the future people decide not to be cumulative, only add
+    #  the counts to the parent map.)
+
+    my $totalParts = 0; my $totalPossible = 0; my $totalRight = 0;
+
+    # Pre-run: Count parts correct
     while ( $depth > 0 ) {
         if ($curRes == $iterator->BEGIN_MAP()) {$depth++;}
         if ($curRes == $iterator->END_MAP()) { $depth--; }
 
-        if (ref($curRes) && $curRes->is_problem()) {
-            my $title = $curRes->compTitle();
+        if (ref($curRes) && $curRes->is_problem())
+        {
+            # Get number of correct, incorrect parts
+            my $parts = $curRes->parts();
+            if (scalar(@{$parts}) > 1) { shift @{$parts}; } # lose the first "0"
+            $totalParts += scalar(@{$parts});
+            my $partsRight = 0;
+            my $stack = $iterator->getStack();
+            
+            for my $part (@{$parts}) {
+                my $status = $curRes->getCompletionStatus($part);
+                if ($status == $curRes->CORRECT || $status == $curRes->CORRECT_BY_OVERRIDE
+                    || $status == $curRes->EXCUSED) {
+                    $partsRight++;
+                    $totalRight++;
+                }
+
+                my $dateStatus = $curRes->getDateStatus($part);
+                if ($status != $curRes->OPEN_LATER) {
+                    $totalPossible++;
+                }
+            }
+            
+            # Crawl down stack and record parts correct and total
+            for my $res (@{$stack}) {
+                if (ref($res) && $res->is_map()) {
+                    if (!defined($res->{DATA}->{CHILD_PARTS})) {
+                        $res->{DATA}->{CHILD_PARTS} = 0;
+                        $res->{DATA}->{CHILD_CORRECT} = 0;
+                    }
+                    
+                    $res->{DATA}->{CHILD_PARTS} += scalar(@{$parts});
+                    $res->{DATA}->{CHILD_CORRECT} += $partsRight;
+                }
+            }
+        }
+        $curRes = $iterator->next();
+    }
+
+    $iterator = $navmap->getIterator(undef, undef, undef, 1);
+    my $depth = 1;
+    $iterator->next(); # ignore first BEGIN_MAP
+    my $curRes = $iterator->next();
+
+    my @start = (255, 255, 0);
+    my @end   = (0, 192, 0);
+
+    my $indentString = '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
+
+    # Second pass: Print the maps.
+    $r->print('<table cellspacing="3" border="2"><tr><td align="center"><b>Sequence</b></td>');
+    $r->print('<td align="center">Correct / Total</td><tr>' . "\n\n");
+    while ($depth > 0) {
+        if ($curRes == $iterator->BEGIN_MAP()) {$depth++;}
+        if ($curRes == $iterator->END_MAP()) { $depth--; }
+
+        if (ref($curRes) && $curRes->is_map()) {
             my $stack = $iterator->getStack();
             my $src = Apache::lonnavmaps::getLinkForResource($stack);
             my $srcHasQuestion = $src =~ /\?/;
@@ -122,45 +171,58 @@
                 ($srcHasQuestion?'&':'?') .
                 'symb='.&Apache::lonnet::escape($curRes->symb()).
                 '"';
-            my $parts = $curRes->parts();
-            my $multipart = scalar(@{$parts}) > 1;
-
-            for my $part (@{$parts}) {
-                if ($multipart && $part eq '0') { next; }
-                $totalParts++;
-
-                my $status = $curRes->status($part);
-                my $color = $statusColorMap{$status};
-                if ($color eq $green) { # I'm being bad here... ;-)
-                    $totalRight++; $totalCurrentlyPossible++;
-                }
-                if ($color eq $yellow || $color eq $orange) {
-                    $totalCurrentlyPossible++;
-                }
-
-                $r->print("<div style=\"background-color: $color\" width=\"100%\">" .
-                          "<nobr><a href=\"$link\">$title" . 
-                          ($multipart ? ', ' . $part : '') . '</a></nobr></div>'
-                          ."\n");
+            my $title = $curRes->compTitle();
+            
+            my $correct = $curRes->{DATA}->{CHILD_CORRECT};
+            my $total = $curRes->{DATA}->{CHILD_PARTS};
+
+            my $ratio;
+            $ratio = $total==0 ? 1 : $correct / $total;
+            my $color = mixColors(\@start, \@end, $ratio);
+            $r->print("<tr><td bgcolor='$color'>");
+            
+            for (my $i = 1; $i < $depth; $i++) { $r->print($indentString); }
 
-                if (!($totalParts % 20)) { $r->rflush(); }
-            }
+            $r->print("<a href='$link'>$title</a></td>");
+            $r->print("<td>$correct / $total</td></tr>\n");
         }
 
         $curRes = $iterator->next();
     }
 
-    $r->print("<br><hr>\n");
-    $r->print("<div width=\"100%\" align=\"right\">");
-    $r->print("Total Parts Correct: <b>$totalRight</b><br>");
-    $r->print("Number Of Parts Possibly Correct: <b>$totalCurrentlyPossible</b><br>");
-    $r->print("Total Parts In Course: <b>$totalParts</b></div></div>\n\n");
 
-    $r->print("</body></html>");
+    $r->print("\n</tr>\n\n");
+
+    $r->print("<tr><td colspan='2' align='right'>Total Parts Correct: <b>$totalRight</b><br>");
+    $r->print("Number Of Parts Possibly Correct: <b>$totalPossible</b><br>");
+    $r->print("Total Parts In Course: <b>$totalParts</b></td></tr>\n\n");
+
+
+    $r->print("</table></body></html>");
 
     $navmap->untieHashes();
 
     return OK;
+}
+
+# Pass this two refs to arrays for the start and end color, and a number
+# from 0 to 1 for how much of the latter you want to mix in. It will
+# return a string ready to show ("#FFC309");
+sub mixColors {
+    my $start = shift;
+    my $end = shift;
+    my $ratio = shift;
+    
+    my $final = "";
+    my $a = $start->[0]; my $b = $end->[0];
+    my $mix1 = POSIX::floor((1-$ratio)*$a + $ratio*$b);
+    my $a = $start->[1]; my $b = $end->[1];
+    my $mix2 = POSIX::floor((1-$ratio)*$a + $ratio*$b);
+    my $a = $start->[2]; my $b = $end->[2];
+    my $mix3 = POSIX::floor((1-$ratio)*$a + $ratio*$b);
+
+    my $final = sprintf "%2x%2x%2x", $mix1, $mix2, $mix3;
+    return "#" . $final;
 }
 
 1;

--bowersj21037995631--