Merge branch 'release/2.0.4'

* release/2.0.4: fix(documents): Shortened long course names in exported documents. fix(files): Renamed more files from camelCase to lowercase.
coactum · Feb 26, 2024 · 371d1c0 · 371d1c0
2 parents 81046b7 + 0e2fe68
commit 371d1c0
Show file tree

Hide file tree

Showing 9 changed files with 37 additions and 8 deletions.
diff --git a/CHANGES.md b/CHANGES.md
@@ -1,5 +1,11 @@
 ## Changelog ##
 
+- [2.0.4]:
+    - Shortened long course names in exported documents.
+
+- [2.0.3]:
+    - Renamed more files from camelCase to lowercase.
+
 - [2.0.2]:
     - Renamed files from camelCase to lowercase.
 

diff --git a/classes/pdfs/examLabels.php → classes/pdfs/examlabels.php b/classes/pdfs/examLabels.php → classes/pdfs/examlabels.php
diff --git a/classes/pdfs/participantsList.php → classes/pdfs/participantslist.php b/classes/pdfs/participantsList.php → classes/pdfs/participantslist.php
@@ -60,6 +60,12 @@ public function header() {
             throw new moodle_exception('missingparameter');
         }
 
+        if (strlen($course->fullname) <= 40) {
+            $coursename = $course->fullname;
+        } else {
+            $coursename = $course->shortname;
+        }
+
         if (file_exists(__DIR__.'/../../data/logo_full.ai')) {
             $this->ImageEps(__DIR__.'/../../data/logo_full.ai', 25, 12, 70);
             $this->SetFont('freeserif', 'B', 22);
@@ -79,8 +85,7 @@ public function header() {
         $this->SetTextColor(0, 0, 0);
         $this->SetFont('freeserif', '', 14);
         $this->MultiCell(130, 50, strtoupper(helper::getcleancoursecategoryname()) . ' / ' .
-            $course->fullname . ' ('. $moduleinstance->name .
-            ')', 0, 'L', 0, 0, 25, 40);
+            $coursename . ' (' . $moduleinstance->name . ')', 0, 'L', 0, 0, 25, 40);
         $this->MultiCell(26, 50, helper::gethrexamtime($moduleinstance), 0, 'R', 0, 0, 159, 40);
     }
 

diff --git a/classes/pdfs/resultsExamReview.php → classes/pdfs/resultsexamreview.php b/classes/pdfs/resultsExamReview.php → classes/pdfs/resultsexamreview.php
diff --git a/classes/pdfs/resultsPercentages.php → classes/pdfs/resultspercentages.php b/classes/pdfs/resultsPercentages.php → classes/pdfs/resultspercentages.php
diff --git a/classes/pdfs/seatingPlan.php → classes/pdfs/seatingplan.php b/classes/pdfs/seatingPlan.php → classes/pdfs/seatingplan.php
@@ -59,6 +59,13 @@ public function header() {
         } else {
             throw new moodle_exception('missingparameter');
         }
+
+        if (strlen($course->fullname) <= 40) {
+            $coursename = $course->fullname;
+        } else {
+            $coursename = $course->shortname;
+        }
+
         if (file_exists(__DIR__.'/../../data/logo_full.ai')) {
             $this->ImageEps(__DIR__.'/../../data/logo_full.ai', 25, 12, 70);
             $this->SetFont('helvetica', 'B', 22);
@@ -70,8 +77,7 @@ public function header() {
 
         $this->SetFont('helvetica', 'B', 14);
         $this->MultiCell(130, 5, strtoupper(helper::getcleancoursecategoryname()) . ' / ' .
-            $course->fullname . ' ('. $moduleinstance->name .')',
-            0, 'L', 0, 0, 25, 40);
+            $coursename . ' (' . $moduleinstance->name . ')', 0, 'L', 0, 0, 25, 40);
         $this->MultiCell(26, 5, helper::gethrexamtime($moduleinstance), 0, 'R', 0, 0, 159, 40);
     }
 

diff --git a/exportresultsexamreview.php b/exportresultsexamreview.php
@@ -129,8 +129,14 @@
 $pdf->SetFont('helvetica', '', 16);
 $pdf->MultiCell(130, 3, get_string('pointslist_examreview', 'mod_exammanagement'), 0, 'C', 0, 0, 50, 17);
 
+if (strlen($course->fullname) <= 40) {
+    $coursename = $course->fullname;
+} else {
+    $coursename = $course->shortname;
+}
+
 $pdf->SetFont('helvetica', 'B', 16);
-$pdf->MultiCell(130, 3, $course->fullname . ', ' . $moduleinstance->name, 0, 'C', 0, 0, 50, 25);
+$pdf->MultiCell(130, 3, $coursename . ', ' . $moduleinstance->name, 0, 'C', 0, 0, 50, 25);
 $pdf->SetFont('helvetica', '', 16);
 
 $date = helper::gethrexamtime($moduleinstance);

diff --git a/exportresultspercentages.php b/exportresultspercentages.php
@@ -131,8 +131,14 @@
 $pdf->SetFont('helvetica', '', 16);
 $pdf->MultiCell(130, 3, get_string('pointslist_examreview', 'mod_exammanagement'), 0, 'C', 0, 0, 50, 17);
 
+if (strlen($course->fullname) <= 40) {
+    $coursename = $course->fullname;
+} else {
+    $coursename = $course->shortname;
+}
+
 $pdf->SetFont('helvetica', 'B', 16);
-$pdf->MultiCell(130, 3, $course->fullname . ', ' . $moduleinstance->name, 0, 'C', 0, 0, 50, 25);
+$pdf->MultiCell(130, 3, $coursename . ', ' . $moduleinstance->name, 0, 'C', 0, 0, 50, 25);
 $pdf->SetFont('helvetica', '', 16);
 
 $date = helper::gethrexamtime($moduleinstance);

diff --git a/version.php b/version.php
@@ -25,7 +25,7 @@
 defined('MOODLE_INTERNAL') || die();
 
 $plugin->component = 'mod_exammanagement'; // Full name of the plugin (used for diagnostics).
-$plugin->release = '2.0.2';        // User-friendly version number.
-$plugin->version = 2024022301;        // The current module version (Date: YYYYMMDDXX).
+$plugin->release = '2.0.4';        // User-friendly version number.
+$plugin->version = 2024022601;        // The current module version (Date: YYYYMMDDXX).
 $plugin->requires = 2020061500; // Requires this Moodle version.
 $plugin->maturity = MATURITY_STABLE;