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

[raeburn]

raeburn		Tue Sep  1 03:39:38 2020 EDT

  Modified files:              
    /loncom/interface	lonquickgrades.pm 
  Log:
  - Readability and white space changes.
    - Lists of args on a single (long) line split into multiple lines.
    - Standard indent is four spaces. 
  
  
Index: loncom/interface/lonquickgrades.pm
diff -u loncom/interface/lonquickgrades.pm:1.118 loncom/interface/lonquickgrades.pm:1.119
--- loncom/interface/lonquickgrades.pm:1.118	Tue Sep  1 03:35:54 2020
+++ loncom/interface/lonquickgrades.pm	Tue Sep  1 03:39:38 2020
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Quick Student Grades Display
 #
-# $Id: lonquickgrades.pm,v 1.118 2020/09/01 03:35:54 raeburn Exp $
+# $Id: lonquickgrades.pm,v 1.119 2020/09/01 03:39:38 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -246,16 +246,18 @@
     my $showCategories=
         $env{'course.'.$env{'request.course.id'}.'.grading'} eq 'categories';
 
-    my ($navmap,$totalParts,$totalPossible,$totalRight,$totalAttempted,$topLevelParts,$topLevelRight,$topLevelAttempted)=
-       &getData($showPoints,$uname,$udom);
+    my ($navmap,$totalParts,$totalPossible,$totalRight,$totalAttempted,$topLevelParts,
+        $topLevelRight,$topLevelAttempted) = &getData($showPoints,$uname,$udom);
 
     if (ref($navmap)) {
         if ($showCategories) {
-            &outputCategories($r,$showPoints,$notshowTotals,
-                $navmap,$totalParts,$totalPossible,$totalRight,$totalAttempted,$topLevelParts,$topLevelRight,$topLevelAttempted);
+            &outputCategories($r,$showPoints,$notshowTotals,$navmap,$totalParts,$totalPossible,
+                              $totalRight,$totalAttempted,$topLevelParts,$topLevelRight,
+                              $topLevelAttempted);
         } else {
-            &outputTable($r,$showPoints,$notshowTotals,
-                $navmap,$totalParts,$totalPossible,$totalRight,$totalAttempted,$topLevelParts,$topLevelRight,$topLevelAttempted);
+            &outputTable($r,$showPoints,$notshowTotals,$navmap,$totalParts,$totalPossible,
+                         $totalRight,$totalAttempted,$topLevelParts,$topLevelRight,
+                         $topLevelAttempted);
         }
     } else {
         if ($cangrade) { $r->print("\n</form>\n"); }
@@ -266,7 +268,6 @@
     if ($cangrade) { $r->print("\n</form>\n"); }
     &endGradeScreen($r);
     return OK;
-
 }
 
 sub grades_blocked {
@@ -338,11 +339,11 @@
         (($env{'course.'.$env{'request.course.id'}.'.grading'} eq 'external')
       || ($env{'course.'.$env{'request.course.id'}.'.grading'} eq 'externalnototals')
       || ($env{'course.'.$env{'request.course.id'}.'.grading'} eq 'categories'));
-    my $notshowTotals=
+    my $notshowTotals =
         $env{'course.'.$env{'request.course.id'}.'.grading'} eq 'externalnototals';
     my $showSPRSlink =
         $env{'course.'.$env{'request.course.id'}.'.grading'} eq 'spreadsheet';
-    my $showCategories=
+    my $showCategories =
         $env{'course.'.$env{'request.course.id'}.'.grading'} eq 'categories';
  
     my $allowed_to_view = &Apache::lonnet::allowed('vgr',$env{'request.course.id'});
@@ -402,9 +403,9 @@
 }
 
 sub endGradeScreen {
-   my ($r)=@_;
-   $r->print('</div></div></div>'.&Apache::loncommon::end_page());
-   return;
+    my ($r)=@_;
+    $r->print('</div></div></div>'.&Apache::loncommon::end_page());
+    return;
 }
 
 # -----------
@@ -487,7 +488,7 @@
     my $depth = 1;
     $iterator->next(); # ignore first BEGIN_MAP
     my $curRes = $iterator->next();
-    
+
     # 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
@@ -601,7 +602,8 @@
         }
         $curRes = $iterator->next();
     }
-    return ($navmap,$totalParts,$totalPossible,$totalRight,$totalAttempted,$topLevelParts,$topLevelRight,$topLevelAttempted);
+    return ($navmap,$totalParts,$totalPossible,$totalRight,$totalAttempted,
+            $topLevelParts,$topLevelRight,$topLevelAttempted);
 }
 
 #
@@ -610,8 +612,8 @@
 
 sub outputTable {
 
-    my ($r,$showPoints,$notshowTotals,
-           $navmap,$totalParts,$totalPossible,$totalRight,$totalAttempted,$topLevelParts,$topLevelRight,$topLevelAttempted)=@_;
+    my ($r,$showPoints,$notshowTotals,$navmap,$totalParts,$totalPossible,$totalRight,
+        $totalAttempted,$topLevelParts,$topLevelRight,$topLevelAttempted)=@_;
 
     my @start = (255, 255, 192);
     my @end   = (0, 192, 0);