Merge branch 'dev' into categories

eLearning-TUDarmstadt · Jan 5, 2024 · 1fab619 · 1fab619
2 parents 3979461 + 8a9be06
commit 1fab619
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 23 deletions.
diff --git a/.github/workflows/moodle-ci.yml b/.github/workflows/moodle-ci.yml
@@ -30,14 +30,12 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php: ['7.4', '8.0', '8.1']
-        moodle-branch: ['MOODLE_400_STABLE', 'MOODLE_401_STABLE', 'MOODLE_402_STABLE']
-        database: [pgsql, mariadb]
+        php: [ '8.0', '8.1', '8.2' ]
+        moodle-branch: [ 'MOODLE_401_STABLE', 'MOODLE_402_STABLE', 'MOODLE_403_STABLE' ]
+        database: [ 'mariadb', 'pgsql' ]
         exclude:
-          - php: '8.1'
-            moodle-branch: 'MOODLE_400_STABLE'
-          - php: '7.4'
-            moodle-branch: 'MOODLE_402_STABLE'
+          - php: '8.2'
+            moodle-branch: 'MOODLE_401_STABLE'
 
     steps:
       - name: Check out repository code

diff --git a/block_overviewmyrolesincourses.php b/block_overviewmyrolesincourses.php
@@ -188,8 +188,8 @@ public function get_courses_enroled_with_roleid(
                     // Add additional information like url to the course, ...
                     $url = new moodle_url('/course/view.php', ['id' => $enroledcourse->id]);
                     $urldelete = new moodle_url('/course/delete.php', ['id' => $enroledcourse->id]);
-                    $enroledcoursewithrole->url = $url;
-                    $enroledcoursewithrole->urldelete = $urldelete;
+                    $enroledcoursewithrole->url = $url.__toString();
+                    $enroledcoursewithrole->urldelete = $urldelete.__toString();
                     $enroledcoursewithrole->dimmed = $dimmed;
                     $enroledcoursewithrole->duration = $this->create_duration($enroledcourse)->duration;
                     $enroledcoursewithrole->durationstatus = $this->create_duration($enroledcourse)->durationstatus;

diff --git a/styles.css b/styles.css
@@ -51,11 +51,11 @@
     padding-left: 5px;
 }
 .overviewmyrolesincourses-foldonstart {
-     display: none;
- }
+    display: none;
+}
 
 .row.duration {
-    margin-left: 0px;
+    margin-left: 0;
 }
 .row.duration .col-8 {
     padding-left: 0;
@@ -64,11 +64,6 @@
     padding-right: 10px;
 }
 
-
-
-
-
-
 .overviewmyrolesincourses-tools {
     text-align: right;
 }

diff --git a/templates/overviewmyrolesincourses.mustache b/templates/overviewmyrolesincourses.mustache
@@ -31,8 +31,8 @@
           "coursefullname": "Mathe fractions xxx",
           "visible": "1",
           "favourite": true,
-          "url": {},
-          "urldelete": {},
+          "url": "",
+          "urldelete": "",
           "dimmed": "",
           "duration": "19\/08\/30 - 19\/08\/40",
           "cssselectordurationstatusofcourse": "overviewmyrolesincourses-coursefuture",
@@ -47,8 +47,8 @@
           "coursefullname": "Activities (plugins)",
           "visible": "1",
           "favourite": true,
-          "url": {},
-          "urldelete": {},
+          "url": "",
+          "urldelete": "",
           "dimmed": "",
           "duration": "23\/07\/21 - 24\/07\/23",
           "cssselectordurationstatusofcourse": "overviewmyrolesincourses-courseinprogress",
@@ -63,8 +63,8 @@
           "coursefullname": "Testing filters",
           "visible": "0",
           "favourite": true,
-          "url": {},
-          "urldelete": {},
+          "url": "",
+          "urldelete": "",
           "dimmed": "dimmed",
           "duration": "23\/07\/21 - 24\/07\/22",
           "cssselectordurationstatusofcourse": "overviewmyrolesincourses-coursefinished",