From 9acffb2c38194b4a2379d793178e3a9b66147405 Mon Sep 17 00:00:00 2001 From: Riedler Date: Thu, 13 Feb 2025 02:06:50 +0100 Subject: [PATCH 1/2] fix: protect against $maxgrade being equal to $gradepass --- lbplanner/classes/helpers/modules_helper.php | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/lbplanner/classes/helpers/modules_helper.php b/lbplanner/classes/helpers/modules_helper.php index 0c32e930..fa03f56e 100644 --- a/lbplanner/classes/helpers/modules_helper.php +++ b/lbplanner/classes/helpers/modules_helper.php @@ -82,6 +82,10 @@ class modules_helper { * @return integer The enum value for the grade. */ public static function determine_uinified_grade(int $grade, int $maxgrade, int $gradepass): int { + if ($maxgrade <= $gradepass) { + return ($grade >= $gradepass) ? MODULE_GRADE::GKV : MODULE_GRADE::RIP; + } + $p = ($grade - $gradepass) / ($maxgrade - $gradepass); if ($p >= 0.75) { From 647462b58bcded90df4759677af33aadbbd11d2b Mon Sep 17 00:00:00 2001 From: Riedler Date: Thu, 13 Feb 2025 02:16:12 +0100 Subject: [PATCH 2/2] fix: made code checker happy --- lbplanner/classes/helpers/course_helper.php | 2 +- lbplanner/classes/model/course.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lbplanner/classes/helpers/course_helper.php b/lbplanner/classes/helpers/course_helper.php index 7fda17af..e4a74da3 100644 --- a/lbplanner/classes/helpers/course_helper.php +++ b/lbplanner/classes/helpers/course_helper.php @@ -114,7 +114,7 @@ public static function get_all_lbplanner_courses(bool $onlyenrolled=true): array $fetchedcourse->prepare_for_db() ) ); - } catch(dml_write_exception $e) { + } catch (dml_write_exception $e) { var_dump($fetchedcourse->prepare_for_db()); throw $e; } diff --git a/lbplanner/classes/model/course.php b/lbplanner/classes/model/course.php index f18f7736..26f49cae 100644 --- a/lbplanner/classes/model/course.php +++ b/lbplanner/classes/model/course.php @@ -145,7 +145,7 @@ public function set_color(string $color) { */ public function set_shortname(string $shortname) { $length = strlen($shortname); - if($length > 5 || $length < 0) { + if ($length > 5 || $length < 0) { throw new \moodle_exception("shortname length must be <=5 and >0, but is {$length} instead"); } $this->shortname = $shortname;