From 5af0c03d54aae7805a106caa94bf9a6140c787fd Mon Sep 17 00:00:00 2001
From: "jacob.viertel@wunderbyte.at" <jacob.viertel@wunderbyte.at>
Date: Wed, 3 Jan 2024 16:10:12 +0100
Subject: [PATCH] Bugfix: fas to fa icons, adjusted query courses

---
 classes/learning_path_courses.php         |  9 ++++-----
 vue3/components/completion/Completion.vue | 10 +++++-----
 vue3/components/modals/Modal.vue          |  2 +-
 vue3/components/nodes/feedbackNode.vue    |  6 +++---
 vue3/components/user_view/UserPath.vue    | 10 +++++-----
 5 files changed, 18 insertions(+), 19 deletions(-)

diff --git a/classes/learning_path_courses.php b/classes/learning_path_courses.php
index 428a099..b6a8a79 100644
--- a/classes/learning_path_courses.php
+++ b/classes/learning_path_courses.php
@@ -57,11 +57,10 @@ public static function buildsqlquery() {
         $select = "SELECT s1.*
         FROM (
             SELECT ti.itemid AS course_node_id, c.fullname, c.shortname, c.category, " . $selectagg . "
-            FROM {tag_instance} ti
+            FROM {course} c
+            LEFT JOIN {tag_instance} ti ON ti.itemid = c.id AND ti.itemtype = 'course'
             LEFT JOIN {tag} tag ON ti.tagid = tag.id
-            LEFT JOIN {course} c ON ti.itemid = c.id
             %USERQUERY%
-            WHERE ti.itemtype = 'course'
             GROUP BY ti.itemid, c.id
         ) AS s1 %WHEREQUERY%
         ";
@@ -77,9 +76,9 @@ public static function buildsqlquery() {
         // Filter according to select button.
         if ($configadele->selectconfig != null && $configadele->selectconfig == 'only_subscribed') {
             global $USER;
-            $userquery = "JOIN (SELECT DISTINCT e.courseid
+            $userquery = "LEFT JOIN (SELECT DISTINCT e.courseid
                 FROM {enrol} e
-                JOIN {user_enrolments} ue ON
+                LEFT JOIN {user_enrolments} ue ON
                 (ue.enrolid = e.id AND ue.userid = :userid)
                 ) en ON (en.courseid = c.id) ";
 
diff --git a/vue3/components/completion/Completion.vue b/vue3/components/completion/Completion.vue
index 3ba5404..ebaca65 100644
--- a/vue3/components/completion/Completion.vue
+++ b/vue3/components/completion/Completion.vue
@@ -5,14 +5,14 @@
 
     <div class="card-body">
       <h5 class="card-title">
-          <i class="fas fa-check-circle"></i> Completion Criteria for:
+          <i class="fa fa-check-circle"></i> Completion Criteria for:
       </h5>
       <ul class="list-group list-group-flush">
           <li class="list-group-item">
-              <i class="fas fa-header"></i> Course Title: {{ store.state.node.fullname }}
+              <i class="fa fa-header"></i> Course Title: {{ store.state.node.fullname }}
           </li>
           <li class="list-group-item">
-              <i class="fas fa-tag"></i> Tags: {{ store.state.node.tags }}
+              <i class="fa fa-tag"></i> Tags: {{ store.state.node.tags }}
           </li>
       </ul>
     </div>
@@ -20,7 +20,7 @@
     <div v-if="completions !== null">
       <div class="card-body">
         <h5 class="card-title">
-            <i class="fas fa-arrow-circle-up"></i> Parent Nodes:
+            <i class="fa fa-arrow-circle-up"></i> Parent Nodes:
         </h5>
         <ul class="list-group list-group-flush">
           <template v-if="parentNodes.length > 0">
@@ -65,7 +65,7 @@
 
         <div class="card-body">
           <h5 class="card-title">
-              <i class="fas fa-arrow-circle-down"></i> Child Nodes:
+              <i class="fa fa-arrow-circle-down"></i> Child Nodes:
           </h5>
           <ul class="list-group list-group-flush">
             <template v-if="childNodes.length > 0">
diff --git a/vue3/components/modals/Modal.vue b/vue3/components/modals/Modal.vue
index 1018dfd..3fdc50d 100644
--- a/vue3/components/modals/Modal.vue
+++ b/vue3/components/modals/Modal.vue
@@ -48,7 +48,7 @@
               <p class="form-control-static">{{shortname}}</p>
             </div>
             <div class="form-group">
-              <label for="tags"><b>Tags <i class="fas fa-tag"></i>:</b></label>
+              <label for="tags"><b>Tags <i class="fa fa-tag"></i>:</b></label>
               <p class="form-control-static">{{tags}}</p>
             </div>
           </div>
diff --git a/vue3/components/nodes/feedbackNode.vue b/vue3/components/nodes/feedbackNode.vue
index 9d211a8..401a598 100644
--- a/vue3/components/nodes/feedbackNode.vue
+++ b/vue3/components/nodes/feedbackNode.vue
@@ -110,13 +110,13 @@ const applyFormatting = () => {
     </p>
     <div class="formatting-toolbar">
       <button @click="toggleFormatting('italic')" :class="{ active: isFormattingActive('italic') }">
-        <i class="fas fa-italic"></i>
+        <i class="fa fa-italic"></i>
       </button>
       <button @click="toggleFormatting('bold')" :class="{ active: isFormattingActive('bold') }">
-        <i class="fas fa-bold"></i>
+        <i class="fa fa-bold"></i>
       </button>
       <button @click="toggleFormatting('code')" :class="{ active: isFormattingActive('code') }">
-        <i class="fas fa-code"></i>
+        <i class="fa fa-code"></i>
       </button>
     </div>
     <textarea
diff --git a/vue3/components/user_view/UserPath.vue b/vue3/components/user_view/UserPath.vue
index 3e00d71..360d3a9 100644
--- a/vue3/components/user_view/UserPath.vue
+++ b/vue3/components/user_view/UserPath.vue
@@ -26,24 +26,24 @@
   <notifications width="100%" />
     <div>
       <button @click="goBack" class="btn btn-outline-primary">
-        <i class="fas fa-arrow-left"></i> Go Back to Overview
+        <i class="fa fa-arrow-left"></i> Go Back to Overview
       </button>
       <h2 class="mt-3">User path for:</h2>
       <div class="card">
     <div v-if="store.state.lpuserpathrelation">
       <div class="card-body">
           <h5 class="card-title">
-              <i class="fas fa-user-circle"></i> {{ store.state.lpuserpathrelation.username }}
+              <i class="fa fa-user-circle"></i> {{ store.state.lpuserpathrelation.username }}
           </h5>
           <ul class="list-group list-group-flush">
               <li class="list-group-item">
-                  <i class="fas fa-user"></i> Firstname: {{ store.state.lpuserpathrelation.firstname }}
+                  <i class="fa fa-user"></i> Firstname: {{ store.state.lpuserpathrelation.firstname }}
               </li>
               <li class="list-group-item">
-                  <i class="fas fa-user"></i> Lastname: {{ store.state.lpuserpathrelation.lastname }}
+                  <i class="fa fa-user"></i> Lastname: {{ store.state.lpuserpathrelation.lastname }}
               </li>
               <li class="list-group-item">
-                  <i class="fas fa-envelope"></i> Email: {{ store.state.lpuserpathrelation.email }}
+                  <i class="fa fa-envelope"></i> Email: {{ store.state.lpuserpathrelation.email }}
               </li>
           </ul>
         </div>