Skip to content

Show people's names instead of IDs when signing in/out #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jasonli0616 wants to merge 1 commit into
base: 5409
Choose a base branch
from
Open

Show people's names instead of IDs when signing in/out #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion src/main/java/activities/LogoutActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
});
}
Expand Down
5 changes: 4 additions & 1 deletion src/main/java/activities/UserActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,14 +142,17 @@ 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) {
loginActivity.loginUser(userRow, formattedLoginTime);

Platform.runLater(
() -> {
GrizzlyScene.setMessageBoxText("Successfully logged in user: " + userID);
GrizzlyScene.setMessageBoxText("Successfully logged in user: " + userName);
GrizzlyScene.clearInput();
});
}
Expand Down