From a20df0847dd21211c478968530c287e4aed32c78 Mon Sep 17 00:00:00 2001 From: Jason Li Date: Thu, 7 Mar 2024 15:14:50 -0500 Subject: [PATCH] Show people's names instead of IDs when signing in/out --- src/main/java/activities/LogoutActivity.java | 5 ++++- src/main/java/activities/UserActivity.java | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/src/main/java/activities/LogoutActivity.java b/src/main/java/activities/LogoutActivity.java index 79bd0dc..7dd6cad 100644 --- a/src/main/java/activities/LogoutActivity.java +++ b/src/main/java/activities/LogoutActivity.java @@ -104,10 +104,13 @@ public void logoutUserWithHours( dbUtils.setCellData(userRowLogout, userTimeColumn, timeTotalDay, Constants.kLogSheet); dbUtils.setCellData(userRow, Constants.kTotalHoursColumn, timeTotal, Constants.kMainSheet); + // get user name + String userName = dbUtils.getCellData(userRow, Constants.kFirstNameColumn, Constants.kMainSheet); + // show user logout text Platform.runLater( () -> { - GrizzlyScene.setMessageBoxText("Logged out user: " + userID); + GrizzlyScene.setMessageBoxText("Logged out user: " + userName); GrizzlyScene.clearInput(); }); } diff --git a/src/main/java/activities/UserActivity.java b/src/main/java/activities/UserActivity.java index 976e359..01888e5 100644 --- a/src/main/java/activities/UserActivity.java +++ b/src/main/java/activities/UserActivity.java @@ -142,6 +142,9 @@ public void loginUser(String userID) { int userRow = dbUtils.getCellRowFromColumn(userID, Constants.kStudentIdColumn, Constants.kMainSheet); + + // get user name + String userName = dbUtils.getCellData(userRow, Constants.kFirstNameColumn, Constants.kMainSheet); // log the user in if (userRow != -1) { @@ -149,7 +152,7 @@ public void loginUser(String userID) { Platform.runLater( () -> { - GrizzlyScene.setMessageBoxText("Successfully logged in user: " + userID); + GrizzlyScene.setMessageBoxText("Successfully logged in user: " + userName); GrizzlyScene.clearInput(); }); }