snsd0805/NCNU-Scholarship
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

merge problem

Browse Source
This commit is contained in:
Chen,Hui Chen 2024-06-29 18:53:08 +08:00
parent 68c7540795
commit 03b8b5e23e
4 changed files with 4 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
api/audit.js
View File

@ -8,16 +8,9 @@ router.get("/", async function(req, res) {
let conn; let conn;
try { try {
conn = await util.getDBConnection(); // get connection from db conn = await util.getDBConnection(); // get connection from db
<<<<<<< HEAD
const query = `
SELECT
item_form.application_id,
item_form.item_info_id,
=======
const query = const query =
` `
SELECT item_form.application_id, item_form.item_info_id, item_info.item_content, SELECT item_form.application_id, item_form.item_info_id, item_info.item_content,
>>>>>>> 4e70160c94fd9e085e7a88cae6638beb2998fb45
item_form.application_unit, item_form.application_unit,
item_form.subsidy, item_form.subsidy,
scholarship_application.application_date, scholarship_application.application_date,
@ -27,13 +20,6 @@ router.get("/", async function(req, res) {
item_form item_form
RIGHT JOIN RIGHT JOIN
scholarship_application ON item_form.application_id = scholarship_application.application_id scholarship_application ON item_form.application_id = scholarship_application.application_id
<<<<<<< HEAD
RIGHT JOIN
student ON scholarship_application.student_id = student.student_id;
`;
const result = await conn.query(query);
res.json({ success: true, data: result });
=======
LEFT JOIN LEFT JOIN
student ON scholarship_application.student_id = student.student_id student ON scholarship_application.student_id = student.student_id
LEFT JOIN LEFT JOIN
@ -42,7 +28,6 @@ router.get("/", async function(req, res) {
`; `;
const result = await conn.query(query); const result = await conn.query(query);
res.json({ success: true, data: result }); res.json({ success: true, data: result });
>>>>>>> 4e70160c94fd9e085e7a88cae6638beb2998fb45
} }
catch(e) { catch(e) {
console.error(e); console.error(e);

5
js/login.js
View File

@ -6,10 +6,6 @@ async function submit() {
suc_login = suc_login.data; suc_login = suc_login.data;
console.log(suc_login); console.log(suc_login);
if (suc_login.suc) { if (suc_login.suc) {
<<<<<<< HEAD
location.href = '/main';
=======
if (account.length >= 9) { if (account.length >= 9) {
// student // student
location.href = `/main?name=${suc_login.authen_result}&s_num=${account}`; location.href = `/main?name=${suc_login.authen_result}&s_num=${account}`;
@ -18,7 +14,6 @@ async function submit() {
// assistant // assistant
location.href = `/audit?name=${suc_login.authen_result}&s_num=${account}`; location.href = `/audit?name=${suc_login.authen_result}&s_num=${account}`;
} }
>>>>>>> 4e70160c94fd9e085e7a88cae6638beb2998fb45
} }
else { else {
alert("帳號或密碼錯誤"); alert("帳號或密碼錯誤");

8
utilities/utilities.js
View File

@ -4,14 +4,10 @@ const db = require("mariadb");
// create pool // create pool
const pool = db.createPool({ const pool = db.createPool({
<<<<<<< HEAD
connectionLimit : 10,
=======
connectionLimit : 50, connectionLimit : 50,
>>>>>>> 4e70160c94fd9e085e7a88cae6638beb2998fb45
host : 'localhost', host : 'localhost',
user : 'test', user : 'user',
password : '123', password : '',
database : 'scholarship' database : 'scholarship'
}); });

8
utilities/utilities_main.js
View File

@ -4,14 +4,10 @@ const db = require("mariadb");
// create pool // create pool
const pool = db.createPool({ const pool = db.createPool({
<<<<<<< HEAD
connectionLimit : 10,
=======
connectionLimit : 50, connectionLimit : 50,
>>>>>>> 4e70160c94fd9e085e7a88cae6638beb2998fb45
host : 'localhost', host : 'localhost',
user : 'test', user : 'user',
password : '123', password : '',
database : 'scholarship' database : 'scholarship'
}); });