diff --git a/src/app/api/connection.mjs b/src/app/api/connection.mjs
index 2de3fa55..8a191368 100644
--- a/src/app/api/connection.mjs
+++ b/src/app/api/connection.mjs
@@ -189,6 +189,7 @@ app.get('/application', async (req, res) => {
const application = await getApp();
res.json(application);
});
+
app.get('/application/summary', async (req, res) => {
const application = await getApplication();
res.json(application);
diff --git a/src/app/api/db.mjs b/src/app/api/db.mjs
index 8dc8cc74..e3486c96 100644
--- a/src/app/api/db.mjs
+++ b/src/app/api/db.mjs
@@ -73,9 +73,25 @@ export async function updateUser(userName,fname,lname,age, email, phone, city, l
// return result;
// }
export async function getApp() {
- const [rows] = await pool.query("SELECT * FROM application");
- return rows;
- }
+ const query = `
+ SELECT
+ app.applicationID,
+ users.fname AS user_fname,
+ job.title AS job_title,
+ app.status,
+ app.created_at
+ FROM
+ application AS app
+ INNER JOIN
+ users ON app.userid = users.userid
+ INNER JOIN
+ joblisting AS job ON app.jobid = job.jobid
+ `;
+
+ const [rows] = await pool.query(query);
+ return rows;
+}
+
export async function getApplication() {
try {
const [rows] = await pool.query("SELECT userid, GROUP_CONCAT(jobid) AS job_application_id FROM application GROUP BY userid");
diff --git a/src/app/tables/table-1/page.tsx b/src/app/tables/table-1/page.tsx
index 4d8431e2..0f836438 100644
--- a/src/app/tables/table-1/page.tsx
+++ b/src/app/tables/table-1/page.tsx
@@ -14,7 +14,7 @@ const Table1Page = () => {
- User ID + User First Name | - Job ID + Job title | Status @@ -153,13 +151,13 @@ const handleAddUser = async () => { |
- {item.userid} + {item.user_fname} |
- {item.jobid} + {item.job_title} |
@@ -197,8 +195,8 @@ const handleAddUser = async () => {
setNewUserUserid(e.target.value)}
+ value={newUseruser_fname}
+ onChange={(e) => setNewUseruser_fname(e.target.value)}
className="border p-2 w-full"
/>
@@ -206,8 +204,8 @@ const handleAddUser = async () => {
setNewUserJobid(e.target.value)}
+ value={newUserjob_title}
+ onChange={(e) => setNewUserjob_title(e.target.value)}
className="border p-2 w-full"
/>
---|