gitea/amati
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Pull Request branch dev-clone to main #1

Merged
gitea merged 429 commits from dev-clone into main 2024-12-23 09:31:34 +00:00
Conversation 0 Commits 429 Files Changed 142 +12 -12
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit e8a0ab48e8 - Show all commits

24
apps/backend/src/routes/assessmentResult/route.ts
View File

@ -37,7 +37,7 @@ const assessmentRoute = new Hono<HonoEnv>()
const result = await db const result = await db
.select({ .select({
id: assessments.id, id: assessments.id,
respondentName: users.name, // Mengambil `name` langsung dari tabel `users` respondentName: users.name,
companyName: respondents.companyName, companyName: respondents.companyName,
statusAssessments: assessments.status, statusAssessments: assessments.status,
statusVerification: sql<string>` statusVerification: sql<string>`
@ -58,7 +58,7 @@ const assessmentRoute = new Hono<HonoEnv>()
}) })
.from(assessments) .from(assessments)
.leftJoin(respondents, eq(assessments.respondentId, respondents.id)) .leftJoin(respondents, eq(assessments.respondentId, respondents.id))
.leftJoin(users, eq(respondents.userId, users.id)) // Menghubungkan `respondents` dengan `users` melalui `userId` .leftJoin(users, eq(respondents.userId, users.id))
.offset(page * limit) .offset(page * limit)
.limit(limit); .limit(limit);
@ -89,16 +89,16 @@ const assessmentRoute = new Hono<HonoEnv>()
const result = await db const result = await db
.select({ .select({
respondentName: users.name, // Nama Responden respondentName: users.name,
position: respondents.position, // Jabatan position: respondents.position,
workExperience: respondents.workExperience, // Pengalaman Kerja workExperience: respondents.workExperience,
email: users.email, // Email email: users.email,
companyName: respondents.companyName, // Instansi/Perusahaan companyName: respondents.companyName,
address: respondents.address, // Alamat address: respondents.address,
phoneNumber: respondents.phoneNumber, // Nomor Telepon phoneNumber: respondents.phoneNumber,
username: users.username, // Username username: users.username,
assessmentDate: assessments.createdAt, // Tanggal Asesmen assessmentDate: assessments.createdAt,
statusAssessment: assessments.status, // Status Asesmen statusAssessment: assessments.status,
assessmentsResult: sql<number>` assessmentsResult: sql<number>`
(SELECT ROUND(AVG(${options.score}), 2) (SELECT ROUND(AVG(${options.score}), 2)
FROM ${answers} FROM ${answers}