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

bowersj2 lon-capa-cvs@mail.lon-capa.org
Wed, 25 Jun 2003 19:29:43 -0000


bowersj2		Wed Jun 25 15:29:43 2003 EDT

  Modified files:              
    /loncom/interface	lonquickgrades.pm 
  Log:
  Fix some wording, remove link to spreadsheet if we're viewing grades, 
  change "Sequence" to "Folder" which should make more sense to the 
  students, and just generally look nicer (fiddling with the whitespace).
  
  
Index: loncom/interface/lonquickgrades.pm
diff -u loncom/interface/lonquickgrades.pm:1.19 loncom/interface/lonquickgrades.pm:1.20
--- loncom/interface/lonquickgrades.pm:1.19	Wed Jun 25 15:01:23 2003
+++ loncom/interface/lonquickgrades.pm	Wed Jun 25 15:29:43 2003
@@ -84,20 +84,15 @@
     my $title = $showPoints ? "Quick Points Display" : "Quick Completed Problems Display";
     $r->print(&Apache::loncommon::bodytag($title, '', ''));
 
-    if ($showPoints) {
-	$r->print(<<HEADER);
+    if (!$showPoints) {
+        $r->print(<<HEADER); 
 <p>This screen shows how many problems (or problem parts) you have completed, and
 how many you have not yet done. You can also look at <a href="/adm/studentcalc">a detailed
 score sheet</a>.</p>
 HEADER
-    } else {
-        $r->print(<<HEADER); 
-<p>This screen shows how many points you have. You can also look at 
-<a href="/adm/studentcalc">a detailed score sheet</a>.</p>
-HEADER
     }
 
-    $r->print("<p>This may take a few moments to display.</p>");
+    $r->print("This may take a few moments to display.");
 
     $r->rflush();
 
@@ -147,7 +142,7 @@
 		    $partsCount += $curRes->weight($part);
 
 		    if ($curRes->opendate($part) < $now) {
-			$totalPossible += $curRes->weight();
+			$totalPossible += $curRes->weight($part);
 		    }
 		    $totalParts += $curRes->weight($part);
 		} else {
@@ -174,7 +169,6 @@
             if ($depth == 1) { # in top-level only
 		$topLevelParts += $partsCount;
 		$topLevelRight += $partsRight;
-		$r->print($curRes->compTitle() . '<br>');
 	    }
 
             # Crawl down stack and record parts correct and total
@@ -204,8 +198,9 @@
     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">Done / Total</td><tr>' . "\n\n");
+    $r->print('<table cellspacing="3" border="2"><tr><td align="center"><b>Folder</b></td>');
+    $title = $showPoints ? "Points Scored" : "Done";
+    $r->print("<td align='center'>$title / Total</td><tr>" . "\n\n");
     while ($depth > 0) {
         if ($curRes == $iterator->BEGIN_MAP()) {$depth++;}
         if ($curRes == $iterator->END_MAP()) { $depth--; }