Browse Source

Minor - Flint fixes

Angel Fernando Quiroz Campos 5 years ago
parent
commit
1a977dc2ac
1 changed files with 46 additions and 46 deletions
  1. 46 46
      main/gradebook/lib/flatview_data_generator.class.php

+ 46 - 46
main/gradebook/lib/flatview_data_generator.class.php

@@ -624,52 +624,6 @@ class FlatViewDataGenerator
         return $data;
     }
 
-    /**
-     * Add columns heders according to gradebook_flatview_extrafields_columns conf setting.
-     *
-     * @param array $headers
-     */
-    private function addExtraFieldColumnsHeaders(array &$headers)
-    {
-        $extraFieldColumns = api_get_configuration_value('gradebook_flatview_extrafields_columns');
-
-        if (!$extraFieldColumns || !is_array($extraFieldColumns)) {
-            return;
-        }
-
-        foreach ($extraFieldColumns['variables'] as $extraFieldVariable) {
-            $extraField = new ExtraField('user');
-            $extraFieldInfo = $extraField->get_handler_field_info_by_field_variable($extraFieldVariable);
-
-            $headers[] = $extraFieldInfo['display_text'];
-        }
-    }
-
-    /**
-     * Add columns data according to gradebook_flatview_extrafields_columns conf setting.
-     *
-     * @param array $row
-     * @param int   $userId
-     */
-    private function addExtraFieldColumnsData(array &$row, $userId)
-    {
-        $extraFieldColumns = api_get_configuration_value('gradebook_flatview_extrafields_columns');
-
-        if (!$extraFieldColumns || !is_array($extraFieldColumns)) {
-            return;
-        }
-
-        foreach ($extraFieldColumns['variables'] as $extraFieldVariable) {
-            $extraFieldValue = new ExtraFieldValue('user');
-            $extraFieldValueInfo = $extraFieldValue->get_values_by_handler_and_field_variable(
-                $userId,
-                $extraFieldVariable
-            );
-
-            $row[] = $extraFieldValueInfo ? $extraFieldValueInfo['value'] : null;
-        }
-    }
-
     /**
      * Parse evaluations.
      *
@@ -1073,4 +1027,50 @@ class FlatViewDataGenerator
     {
         return api_strcmp($item1[3], $item2[3]);
     }
+
+    /**
+     * Add columns heders according to gradebook_flatview_extrafields_columns conf setting.
+     *
+     * @param array $headers
+     */
+    private function addExtraFieldColumnsHeaders(array &$headers)
+    {
+        $extraFieldColumns = api_get_configuration_value('gradebook_flatview_extrafields_columns');
+
+        if (!$extraFieldColumns || !is_array($extraFieldColumns)) {
+            return;
+        }
+
+        foreach ($extraFieldColumns['variables'] as $extraFieldVariable) {
+            $extraField = new ExtraField('user');
+            $extraFieldInfo = $extraField->get_handler_field_info_by_field_variable($extraFieldVariable);
+
+            $headers[] = $extraFieldInfo['display_text'];
+        }
+    }
+
+    /**
+     * Add columns data according to gradebook_flatview_extrafields_columns conf setting.
+     *
+     * @param array $row
+     * @param int   $userId
+     */
+    private function addExtraFieldColumnsData(array &$row, $userId)
+    {
+        $extraFieldColumns = api_get_configuration_value('gradebook_flatview_extrafields_columns');
+
+        if (!$extraFieldColumns || !is_array($extraFieldColumns)) {
+            return;
+        }
+
+        foreach ($extraFieldColumns['variables'] as $extraFieldVariable) {
+            $extraFieldValue = new ExtraFieldValue('user');
+            $extraFieldValueInfo = $extraFieldValue->get_values_by_handler_and_field_variable(
+                $userId,
+                $extraFieldVariable
+            );
+
+            $row[] = $extraFieldValueInfo ? $extraFieldValueInfo['value'] : null;
+        }
+    }
 }