From 0654c753a6964aee6963eba48fdfe27ad09160fd Mon Sep 17 00:00:00 2001
From: alex <alex@alexloehr.net>
Date: Thu, 05 Jun 2025 09:18:44 +0000
Subject: [PATCH] fixed user by login
---
lib/db.js | 19 ++++++++++---------
1 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/lib/db.js b/lib/db.js
index a4708f5..bc2ac32 100644
--- a/lib/db.js
+++ b/lib/db.js
@@ -85,9 +85,9 @@
const [results, fields] = await pool.query(
`SELECT ${sel}
FROM ${database}.usr_data AS ud
- WHERE login = '${login}'
- AND login REGEXP '^[0-9]+$'`
+ WHERE login = '${login}'`
)
+ console.log(results)
return joinUDF(results[0])
}
@@ -100,8 +100,7 @@
const [results, fields] = await pool.query(
`SELECT ${sel}
FROM ${database}.usr_data AS ud
- WHERE usr_id = '${userId}'
- AND login REGEXP '^[0-9]+$'`
+ WHERE usr_id = '${userId}'`
)
return joinUDF(results[0])
}
@@ -266,15 +265,17 @@
async function getUserTeilnahmen (usr_id) {
const pool = await poolP
- const q = `SELECT om.obj_id, om.usr_id, od.title, ulm.status, om.passed, ulm.status_changed
- FROM ilias_globusfachtest.obj_members om
- INNER JOIN ilias_globusfachtest.usr_data ud ON ud.usr_id = om.usr_id
- INNER JOIN ilias_globusfachtest.object_data od ON od.obj_id = om.obj_id
- LEFT JOIN ilias_globusfachtest.ut_lp_marks ulm
+ const q = `SELECT om.obj_id, or2.ref_id , om.usr_id, od.title , ulm.status, om.passed, ulm.status_changed
+ FROM ${database}.obj_members om
+ INNER JOIN ${database}.object_reference or2 ON or2.obj_id = om.obj_id
+ INNER JOIN ${database}.usr_data ud ON ud.usr_id = om.usr_id
+ INNER JOIN ${database}.object_data od ON od.obj_id = om.obj_id
+ LEFT JOIN ${database}.ut_lp_marks ulm
ON ulm.usr_id = om.usr_id AND ulm.obj_id = om.obj_id
WHERE om.usr_id = ${usr_id}
AND om.member = 1
`
+ console.log(q)
const [results] = await pool.query(q)
return results
}
--
Gitblit v1.8.0