feat: remove rounding in student competencies export

SlateFoundation · Sep 22, 2021 · 04211aa · 04211aa
1 parent ad8a272
commit 04211aa
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 17 deletions.
diff --git a/data-exporters/slate-cbl/student-competencies.php b/data-exporters/slate-cbl/student-competencies.php
@@ -130,16 +130,6 @@
 
             while ($record = $result->fetch_assoc()) {
                 $StudentCompetency = Slate\CBL\StudentCompetency::instantiateRecord($record);
-                $demonstrationsComplete = $StudentCompetency->getDemonstrationsComplete();
-                $demonstrationsRequired = $StudentCompetency->getDemonstrationsRequired();
-                $demonstrationsAverage = round(
-                    $StudentCompetency->getDemonstrationsAverage(),
-                    Slate\CBL\StudentCompetency::$averagePrecision
-                );
-                $growth = round(
-                    $StudentCompetency->getGrowth(),
-                    Slate\CBL\StudentCompetency::$averagePrecision
-                );
 
                 yield [
                     'ID' => $StudentCompetency->ID,
@@ -149,12 +139,12 @@
                     'StudentFullName' => $Student->FullName,
                     'CompetencyCode' => $StudentCompetency->Competency->Code,
                     'Level' => $StudentCompetency->Level,
-                    'BaselineRating' => round($StudentCompetency->BaselineRating, 1),
-                    'DemonstrationsAverage' => $demonstrationsAverage ?: null,
-                    'Growth' => $growth ?: null,
-                    'Progress' => round($demonstrationsRequired ? $demonstrationsComplete/$demonstrationsRequired : 1, 2),
-                    'DemonstrationsRequired' => $demonstrationsRequired,
-                    'DemonstrationsComplete' => $demonstrationsComplete,
+                    'BaselineRating' => $StudentCompetency->getBaselineRating(),
+                    'DemonstrationsAverage' => $StudentCompetency->getDemonstrationsAverage() ?: null,
+                    'Growth' => $StudentCompetency->getGrowth() ?: null,
+                    'Progress' => $StudentCompetency->getProgress() ?: null,
+                    'DemonstrationsRequired' => $StudentCompetency->getDemonstrationsRequired(),
+                    'DemonstrationsComplete' => $StudentCompetency->getDemonstrationsComplete(),
                     'DemonstrationsMissed' => $StudentCompetency->getDemonstrationsMissed(),
                     'DemonstrationOpportunities' => $StudentCompetency->getDemonstrationOpportunities()
                 ];

diff --git a/php-classes/Slate/CBL/StudentCompetency.php b/php-classes/Slate/CBL/StudentCompetency.php
@@ -23,6 +23,7 @@ class StudentCompetency extends \ActiveRecord
     public static $isLevelComplete;
     public static $growthCalculatorClass = Calculators\Growth\MostRecentMinusFirst::class;
     public static $averagePrecision = 1;
+    public static $progressPrecision = 2;
 
 
     // ActiveRecord configuration
@@ -117,6 +118,9 @@ class StudentCompetency extends \ActiveRecord
         'growth' => [
             'getter' => 'getGrowth'
         ],
+        'progress' => [
+            'getter' => 'getProgress'
+        ],
         'next' => [
             'getter' => 'getNext'
         ]
@@ -524,7 +528,19 @@ public function getGrowth()
             $this->competencyGrowth = $growthCalculationClass::calculateGrowth($this);
         }
 
-        return $this->competencyGrowth === false ? null : $this->competencyGrowth;
+        return $this->competencyGrowth === false ? null : round($this->competencyGrowth, static::$averagePrecision);
+    }
+
+    private $competencyProgress;
+    public function getProgress()
+    {
+        if ($this->competencyProgress === null) {
+            $required = $this->getDemonstrationsRequired();
+            $complete = $this->getDemonstrationsComplete();
+            $this->competencyProgress = $required ? $complete / $required : 1;
+        }
+
+        return $this->competencyProgress === false ? null : round($this->competencyProgress, static::$progressPrecision);
     }
 
     private $previous;