From 9297f199f384b8f257a80c6254d335724705d995 Mon Sep 17 00:00:00 2001
From: alex <alex@alexloehr.net>
Date: Thu, 23 Oct 2025 15:38:26 +0000
Subject: [PATCH] GS-2375
---
lib/db.js | 4 +++-
vue/src/pages/KursDetailLp.vue | 14 ++++++++++----
2 files changed, 13 insertions(+), 5 deletions(-)
diff --git a/lib/db.js b/lib/db.js
index f990051..a9a41a7 100644
--- a/lib/db.js
+++ b/lib/db.js
@@ -505,6 +505,7 @@
ulc.item_id,
ulc.lpmode,
t.obj_id as item_obj_id,
+ od.type,
ulm.status,
ulm.status_changed,
ulm.percentage,
@@ -513,10 +514,11 @@
INNER JOIN ${database}.object_reference t ON t.ref_id = ulc.item_id
INNER JOIN ${database}.ut_lp_marks ulm ON ulm.obj_id = t.obj_id
INNER JOIN ${database}.usr_data ud ON ud.usr_id = ulm.usr_id
+ INNER JOIN ${database}.object_data od ON od.obj_id = t.obj_id
WHERE ulc.obj_id = ${obj_id} # obj_id Kurs
AND ulc.active = 1
AND ulc.lpmode = 5 # nur mode 5
- ORDER BY ud.usr_id
+ ORDER BY ud.usr_id, ulc.item_id
`
const [results] = await pool.query(q)
return results
diff --git a/vue/src/pages/KursDetailLp.vue b/vue/src/pages/KursDetailLp.vue
index cad8134..ff0830a 100644
--- a/vue/src/pages/KursDetailLp.vue
+++ b/vue/src/pages/KursDetailLp.vue
@@ -82,6 +82,7 @@
<!-- <pre>{{ kursLp }}</pre>-->
<h2>Combined <small>{{kursLp?.length || 0}}</small></h2>
+ <p>Kombinierter Lernfortschritt aus allen Unterobjekten die zum LF beitragen.</p>
<table class="w100p">
<thead>
<tr>
@@ -92,7 +93,6 @@
<!-- <th>passed</th>-->
<th>status</th>
<th>status_changed</th>
- <th>status_overwrite</th>
</tr>
</thead>
<tbody>
@@ -107,7 +107,6 @@
<td>{{ item.lastname }}</td>
<td>{{ item.status }}</td>
<td>{{ dayjs(item.status_changed).format("DD.MM.YYYY HH:mm:ss") }}</td>
- <td>{{ item.status_overwrite }}</td>
</tr>
</tbody>
</table>
@@ -115,6 +114,7 @@
<br>
<h2>Raw <small>{{kursLpRaw?.length || 0}}</small></h2>
+ <p>Lernfortschritt nicht kombiniert.</p>
<table class="w100p">
<thead>
<tr>
@@ -123,9 +123,9 @@
<th>firstname</th>
<th>lastname</th>
<!-- <th>passed</th>-->
+ <th>item_id</th>
<th>status</th>
<th>status_changed</th>
- <th>status_overwrite</th>
</tr>
</thead>
<tbody>
@@ -138,9 +138,15 @@
<td>{{ item.login }}</td>
<td>{{ item.firstname }}</td>
<td>{{ item.lastname }}</td>
+ <td>
+ <a :href="`${iliasBase}/goto.php?target=${item.type}_${item.item_id}`" target="_blank">
+ {{ item.item_id }}
+ <LinkExtern />
+ </a>
+<!-- {{ item.item_id }}-->
+ </td>
<td>{{ item.status }}</td>
<td>{{ dayjs(item.status_changed).format("DD.MM.YYYY HH:mm:ss") }}</td>
- <td>{{ item.status_overwrite }}</td>
</tr>
</tbody>
</table>
--
Gitblit v1.8.0