diff --git a/src/csv_upload.js b/src/csv_upload.js
index 206343e4adc4b099d6adef82523d31b5460d9b8c..db57ba083ee60522c1563e605df5eb17477ae47f 100644
--- a/src/csv_upload.js
+++ b/src/csv_upload.js
@@ -21,9 +21,9 @@ const config = {
const uploadButton = document.querySelector('#csv_upload_btn');
uploadButton.addEventListener('click', async (event) => {
-
- const ses_user_id = ipcRenderer.send('get-user-session');
- //event.preventDefault();
+ event.preventDefault();
+ var ses_user_id = await getUserID();
+ console.log(ses_user_id);
const csv_file = document.querySelector('#csv_file_upload').files[0];
const stream = fs.createReadStream(csv_file.path).pipe(csv());
@@ -40,55 +40,55 @@ uploadButton.addEventListener('click', async (event) => {
const prediction_data = [];
request.input('encounterId', sql.Int, row.encounterId ? row.encounterId : 555);
- request.input('end_tidal_co2', sql.Int, row.end_tidal_co2 ? parseFloat(row.end_tidal_co2) : null);
+ request.input('end_tidal_co2', sql.Float, row.end_tidal_co2 ? parseFloat(row.end_tidal_co2) : null);
prediction_data.push(row.end_tidal_co2 ? parseFloat(row.end_tidal_co2) : 0);
- request.input('feed_vol', sql.Int, row.feed_vol ? parseFloat(row.feed_vol) : null);
+ request.input('feed_vol', sql.Float, row.feed_vol ? parseFloat(row.feed_vol) : null);
prediction_data.push(row.feed_vol ? parseFloat(row.feed_vol) : 0);
- request.input('feed_vol_adm', sql.Int, row.feed_vol_adm ? parseFloat(row.feed_vol_adm) : null);
+ request.input('feed_vol_adm', sql.Float, row.feed_vol_adm ? parseFloat(row.feed_vol_adm) : null);
prediction_data.push(row.feed_vol_adm ? parseFloat(row.feed_vol_adm) : 0);
- request.input('fio2', sql.Int, row.fio2 ? parseFloat(row.fio2) : null);
+ request.input('fio2', sql.Float, row.fio2 ? parseFloat(row.fio2) : null);
prediction_data.push(row.fio2 ? parseFloat(row.fio2) : 0);
- request.input('fio2_ratio', sql.Int, row.fio2_ratio ? parseFloat(row.fio2_ratio) : null);
+ request.input('fio2_ratio', sql.Float, row.fio2_ratio ? parseFloat(row.fio2_ratio) : null);
prediction_data.push(row.fio2_ratio ? parseFloat(row.fio2_ratio) : 0);
- request.input('insp_time', sql.Int, row.insp_time ? parseFloat(row.insp_time) : null);
+ request.input('insp_time', sql.Float, row.insp_time ? parseFloat(row.insp_time) : null);
prediction_data.push(row.insp_time ? parseFloat(row.insp_time) : 0);
- request.input('oxygen_flow_rate', sql.Int, row.oxygen_flow_rate ? parseFloat(row.oxygen_flow_rate) : null);
+ request.input('oxygen_flow_rate', sql.Float, row.oxygen_flow_rate ? parseFloat(row.oxygen_flow_rate) : null);
prediction_data.push(row.oxygen_flow_rate ? parseFloat(row.oxygen_flow_rate) : 0);
- request.input('peep', sql.Int, row.peep ? parseFloat(row.peep) : null);
+ request.input('peep', sql.Float, row.peep ? parseFloat(row.peep) : null);
prediction_data.push(row.peep ? parseFloat(row.peep) : 0);
- request.input('pip', sql.Int, row.pip ? parseFloat(row.pip) : null);
+ request.input('pip', sql.Float, row.pip ? parseFloat(row.pip) : null);
prediction_data.push(row.pip ? parseFloat(row.pip) : 0);
- request.input('resp_rate', sql.Int, row.resp_rate ? parseFloat(row.resp_rate) : null);
+ request.input('resp_rate', sql.Float, row.resp_rate ? parseFloat(row.resp_rate) : null);
prediction_data.push(row.resp_rate ? parseFloat(row.resp_rate) : 0);
- request.input('sip', sql.Int, row.sip ? parseFloat(row.sip) : null);
+ request.input('sip', sql.Float, row.sip ? parseFloat(row.sip) : null);
prediction_data.push(row.sip ? parseFloat(row.sip) : 0);
- request.input('tidal_vol', sql.Int, row.tidal_vol ? parseFloat(row.tidal_vol) : null);
+ request.input('tidal_vol', sql.Float, row.tidal_vol ? parseFloat(row.tidal_vol) : null);
prediction_data.push(row.tidal_vol ? parseFloat(row.tidal_vol) : 0);
- request.input('tidal_vol_actual', sql.Int, row.tidal_vol_actual ? parseFloat(row.tidal_vol_actual) : null);
+ request.input('tidal_vol_actual', sql.Float, row.tidal_vol_actual ? parseFloat(row.tidal_vol_actual) : null);
prediction_data.push(row.tidal_vol_actual ? parseFloat(row.tidal_vol_actual) : 0);
- request.input('tidal_vol_kg', sql.Int, row.tidal_vol_kg ? parseFloat(row.tidal_vol_kg) : null);
+ request.input('tidal_vol_kg', sql.Float, row.tidal_vol_kg ? parseFloat(row.tidal_vol_kg) : null);
prediction_data.push(row.tidal_vol_kg ? parseFloat(row.tidal_vol_kg) : 0);
- request.input('tidal_vol_spon', sql.Int, row.tidal_vol_spon ? parseFloat(row.tidal_vol_spon) : null);
+ request.input('tidal_vol_spon', sql.Float, row.tidal_vol_spon ? parseFloat(row.tidal_vol_spon) : null);
prediction_data.push(row.tidal_vol_spon ? parseFloat(row.tidal_vol_spon) : 0);
- request.input('bmi', sql.Int, row.bmi ? parseFloat(row.bmi) : null);
+ request.input('bmi', sql.Float, row.bmi ? parseFloat(row.bmi) : null);
prediction_data.push(row.bmi ? parseFloat(row.bmi) : 0);
- request.input('referral', sql.Int, row.referral ? parseInt(row.referral) : null);
+ request.input('referral', sql.Int, row.referral ? parseFloat(row.referral) : null);
request.input('recommend_patient_referral', parseInt(tf_model(model, prediction_data)));
@@ -113,7 +113,7 @@ uploadButton.addEventListener('click', async (event) => {
patient_tidal_vol_spon = @tidal_vol_spon,\
patient_bmi = @bmi,\
patient_referral = @referral,\
- user_id = ${ses_user_id},\
+ user_id = '${ses_user_id}',\
recommend_patient_referral = @recommend_patient_referral\
WHERE patient_id = @encounterId;\
END\
@@ -157,7 +157,7 @@ uploadButton.addEventListener('click', async (event) => {
@tidal_vol_spon,\
@bmi,\
@referral,\
- ${ses_user_id},\
+ '${ses_user_id}',\
@recommend_patient_referral);\
END`);
}
@@ -190,4 +190,13 @@ function checkLoggedIn() {
if (user == 0) {
window.location.href = 'login.html';
}
+}
+
+async function getUserID() {
+ try {
+ const response = await ipcRenderer.invoke('get-user-session');
+ return response;
+ } catch(err) {
+ console.error(err);
+ }
}
\ No newline at end of file
diff --git a/src/index.js b/src/index.js
index ffae800b6124b3daf3ada6993e3e8e517c98432b..868592259d1a0c33510b18782fb5a423554fdc0f 100644
--- a/src/index.js
+++ b/src/index.js
@@ -65,7 +65,7 @@ ipcMain.on('set-user-session', (event, sessionDetails) => {
});
// Return user ID in session
-ipcMain.on('get-user-session', (event, ) => {
+ipcMain.handle('get-user-session', (event, ) => {
return session_userID;
})
diff --git a/src/login.js b/src/login.js
index 02190dc6d2686cc56814907ee89b9414a1d84b05..a3cfcba17f339464a1c8b662e939863dc0fdcf8a 100644
--- a/src/login.js
+++ b/src/login.js
@@ -4,9 +4,6 @@ const bcrypt = require ('bcrypt');
const loginButton = document.querySelector('#submitLogin');
-const pw = '123';
-const user_id = 1;
-
const config = {
server: 'uwe-sdgp.database.windows.net',
database: 'feeding_inc',
@@ -20,19 +17,11 @@ const config = {
loginButton.addEventListener('click', function (event) {
event.preventDefault();
-
const username = document.getElementById('loginEmail').value;
const password = document.getElementById('loginPassword').value;
handleLogin(username, password);
-
- // if (username == user && password == pw) {
- // handleLogin(username, password);
- // }
- // else {
- // console.log('wrong credentials');
- // }
})
function loginUser(username, password) {