From b13bcfd73431313e7f5fb8bffa3311e746499624 Mon Sep 17 00:00:00 2001 From: pro-alir Date: Wed, 21 Jul 2021 21:58:53 +0430 Subject: [PATCH 1/3] shop fixed --- .../java/sample/controller/ShopController.java | 4 ++++ .../java/sample/view/shop/ShopViewController.java | 14 +++++++++++++- src/main/java/sample/view/shop/ShopViewFxml.fxml | 2 +- 3 files changed, 18 insertions(+), 2 deletions(-) diff --git a/src/main/java/sample/controller/ShopController.java b/src/main/java/sample/controller/ShopController.java index efd20d8..1c143b6 100644 --- a/src/main/java/sample/controller/ShopController.java +++ b/src/main/java/sample/controller/ShopController.java @@ -82,4 +82,8 @@ public String allowCard(String cardName){ public String increaseNumberOfCard(String cardName, String amount){ return sender.getResponseWithToken(PREFIX, "increaseNumberOfCard", cardName,amount); } + + public String removeNumberOfCardToShop(String cardName, String amount){ + return sender.getResponseWithToken(PREFIX, "removeNumberOfCardToShop", cardName,amount); + } } diff --git a/src/main/java/sample/view/shop/ShopViewController.java b/src/main/java/sample/view/shop/ShopViewController.java index 6d7450b..9735492 100644 --- a/src/main/java/sample/view/shop/ShopViewController.java +++ b/src/main/java/sample/view/shop/ShopViewController.java @@ -67,7 +67,7 @@ public class ShopViewController implements StringMessages, Initializable { Label auctionPanelSearchCArdToAuctionSituationLabel, auctionPanelSearchAuctionIdSituationLabel, adminPanelSituationLabel; @FXML JFXButton adminPanelSearchConfirmButton, adminPanelCardAmountConfirmButton, adminPanelRestrictCardButton, - adminPanelUnRestrictCardButton, adminPanelLoginConfirmButton; + adminPanelUnRestrictCardButton, adminPanelLoginConfirmButton,adminPanelCardRemoveConfirmButton; @FXML JFXTextArea adminPanelCardAmountSlider; boolean isInShopMenu = true; @@ -149,6 +149,7 @@ public void run() { adminPanelRestrictCardButton.setVisible(false); adminPanelCardAmountSlider.setVisible(false); adminPanelUnRestrictCardButton.setVisible(false); + adminPanelCardRemoveConfirmButton.setVisible(false); // adminPanelCardAmountSlider.setMin(1); // adminPanelCardAmountSlider.setMax(100); showAllCardsOfShop(); @@ -331,6 +332,8 @@ public void sellCard(ActionEvent e) { } } + + public void adminLogin(ActionEvent e) { String username = adminPanelUsernameTextArea.getText(); String password = adminPanelPasswordTextArea.getText(); @@ -345,6 +348,7 @@ public void adminLogin(ActionEvent e) { adminPanelRestrictCardButton.setVisible(true); adminPanelCardAmountSlider.setVisible(true); adminPanelUnRestrictCardButton.setVisible(true); + adminPanelCardRemoveConfirmButton.setVisible(true); adminPanelSituationLabel.setText(""); } else { adminPanelCardSearchTextArea.setVisible(false); @@ -353,6 +357,7 @@ public void adminLogin(ActionEvent e) { adminPanelRestrictCardButton.setVisible(false); adminPanelCardAmountSlider.setVisible(false); adminPanelUnRestrictCardButton.setVisible(false); + adminPanelCardRemoveConfirmButton.setVisible(false); adminPanelSituationLabel.setText(response); } } @@ -379,4 +384,11 @@ public void increaseNumberOfCard(ActionEvent e) { adminPanelCardAmountSlider.getText()))); } } + public void decreaseNumberOfCard(ActionEvent e) { + String cardName = adminPanelCardSearchTextArea.getText(); + if (cardName != null && !cardName.equals("")) { + adminPanelSituationLabel.setText(shopController.removeNumberOfCardToShop(cardName, String.valueOf( + adminPanelCardAmountSlider.getText()))); + } + } } diff --git a/src/main/java/sample/view/shop/ShopViewFxml.fxml b/src/main/java/sample/view/shop/ShopViewFxml.fxml index af75c7c..1fdb463 100644 --- a/src/main/java/sample/view/shop/ShopViewFxml.fxml +++ b/src/main/java/sample/view/shop/ShopViewFxml.fxml @@ -468,7 +468,7 @@ add in initialize - + From 875c2715dd797deb54435a7c36f1d27d2b611e6d Mon Sep 17 00:00:00 2001 From: pro-alir Date: Wed, 21 Jul 2021 22:02:46 +0430 Subject: [PATCH 2/3] shop fixed --- .../scoreBoard/ScoreboardViewController.java | 402 +++++++++--------- 1 file changed, 201 insertions(+), 201 deletions(-) diff --git a/src/main/java/sample/view/scoreBoard/ScoreboardViewController.java b/src/main/java/sample/view/scoreBoard/ScoreboardViewController.java index 5e850af..3cc4cbd 100644 --- a/src/main/java/sample/view/scoreBoard/ScoreboardViewController.java +++ b/src/main/java/sample/view/scoreBoard/ScoreboardViewController.java @@ -173,46 +173,46 @@ public void initialize(URL url, ResourceBundle resourceBundle) { } public void makeEveryThingNull() { - player01.setStyle("-fx-background-color: #06f5c0; -fx-font-style: italic"); - player01Score.setStyle("-fx-background-color: #06f5c0; -fx-font-style: italic"); - player02.setStyle("-fx-background-color: #06f5c0; -fx-font-style: italic"); - player02Score.setStyle("-fx-background-color: #06f5c0; -fx-font-style: italic"); - player03.setStyle("-fx-background-color: #06f5c0; -fx-font-style: italic"); - player03Score.setStyle("-fx-background-color: #06f5c0; -fx-font-style: italic"); -// player04.setStyle(null); -// player04Score.setStyle(null); -// player05.setStyle(null); -// player05Score.setStyle(null); -// player06.setStyle(null); -// player06Score.setStyle(null); -// player07.setStyle(null); -// player07Score.setStyle(null); -// player08.setStyle(null); -// player08Score.setStyle(null); -// player09.setStyle(null); -// player09Score.setStyle(null); -// player10.setStyle(null); -// player10Score.setStyle(null); -// player11.setStyle(null); -// player11Score.setStyle(null); -// player12.setStyle(null); -// player12Score.setStyle(null); -// player13.setStyle(null); -// player13Score.setStyle(null); -// player14.setStyle(null); -// player14Score.setStyle(null); -// player15.setStyle(null); -// player15Score.setStyle(null); -// player16.setStyle(null); -// player16Score.setStyle(null); -// player17.setStyle(null); -// player17Score.setStyle(null); -// player18.setStyle(null); -// player18Score.setStyle(null); -// player19.setStyle(null); -// player19Score.setStyle(null); -// player20.setStyle(null); -// player20Score.setStyle(null); + player01.setStyle(null); + player01Score.setStyle(null); + player02.setStyle(null); + player02Score.setStyle(null); + player03.setStyle(null); + player03Score.setStyle(null); + player04.setStyle(null); + player04Score.setStyle(null); + player05.setStyle(null); + player05Score.setStyle(null); + player06.setStyle(null); + player06Score.setStyle(null); + player07.setStyle(null); + player07Score.setStyle(null); + player08.setStyle(null); + player08Score.setStyle(null); + player09.setStyle(null); + player09Score.setStyle(null); + player10.setStyle(null); + player10Score.setStyle(null); + player11.setStyle(null); + player11Score.setStyle(null); + player12.setStyle(null); + player12Score.setStyle(null); + player13.setStyle(null); + player13Score.setStyle(null); + player14.setStyle(null); + player14Score.setStyle(null); + player15.setStyle(null); + player15Score.setStyle(null); + player16.setStyle(null); + player16Score.setStyle(null); + player17.setStyle(null); + player17Score.setStyle(null); + player18.setStyle(null); + player18Score.setStyle(null); + player19.setStyle(null); + player19Score.setStyle(null); + player20.setStyle(null); + player20Score.setStyle(null); } public void setUsersInBoard() { @@ -226,167 +226,167 @@ public void setUsersInBoard() { a(listOfUsers, onlineUsers, size, 0, player01, player01Score); a(listOfUsers, onlineUsers, size, 1, player02, player02Score); a(listOfUsers, onlineUsers, size, 2, player03, player03Score); -// a(listOfUsers, onlineUsers, size, 3, player04, player04Score); -// if (size > 4) { -// properties = getProperties(listOfUsers, 4); -// firstProperties = properties[0]; -// player05.setText(firstProperties); -// player05Score.setText(properties[1]); -// if (checkIfUser(firstProperties)) -// setUserStyle(player05, player05Score); -// else -// setOnlineUsersStyle(player05, player05Score, onlineUsers); -// } -// if (size > 5) { -// properties = getProperties(listOfUsers, 5); -// firstProperties = properties[0]; -// player06.setText(firstProperties); -// player06Score.setText(properties[1]); -// if (checkIfUser(firstProperties)) -// setUserStyle(player06, player06Score); -// else -// setOnlineUsersStyle(player06, player06Score, onlineUsers); -// } -// if (size > 6) { -// properties = getProperties(listOfUsers, 6); -// firstProperties = properties[0]; -// player07.setText(firstProperties); -// player07Score.setText(properties[1]); -// if (checkIfUser(firstProperties)) -// setUserStyle(player07, player07Score); -// else -// setOnlineUsersStyle(player07, player07Score, onlineUsers); -// } -// if (size > 7) { -// properties = getProperties(listOfUsers, 7); -// firstProperties = properties[0]; -// player08.setText(firstProperties); -// player08Score.setText(properties[1]); -// if (checkIfUser(firstProperties)) -// setUserStyle(player08, player08Score); -// else -// setOnlineUsersStyle(player08, player08Score, onlineUsers); -// } -// if (size > 8) { -// properties = getProperties(listOfUsers, 8); -// firstProperties = properties[0]; -// player09.setText(firstProperties); -// player09Score.setText(properties[1]); -// if (checkIfUser(firstProperties)) -// setUserStyle(player09, player09Score); -// else -// setOnlineUsersStyle(player09, player09Score, onlineUsers); -// } -// if (size > 9) { -// properties = getProperties(listOfUsers, 9); -// firstProperties = properties[0]; -// player10.setText(firstProperties); -// player10Score.setText(properties[1]); -// if (checkIfUser(firstProperties)) -// setUserStyle(player10, player10Score); -// else -// setOnlineUsersStyle(player10, player10Score, onlineUsers); -// } -// if (size > 10) { -// properties = getProperties(listOfUsers, 10); -// firstProperties = properties[0]; -// player11.setText(firstProperties); -// player11Score.setText(properties[1]); -// if (checkIfUser(firstProperties)) -// setUserStyle(player11, player11Score); -// else -// setOnlineUsersStyle(player11, player11Score, onlineUsers); -// } -// if (size > 11) { -// properties = getProperties(listOfUsers, 11); -// firstProperties = properties[0]; -// player12.setText(firstProperties); -// player12Score.setText(properties[1]); -// if (checkIfUser(firstProperties)) -// setUserStyle(player12, player12Score); -// else -// setOnlineUsersStyle(player12, player12Score, onlineUsers); -// } -// if (size > 12) { -// properties = getProperties(listOfUsers, 12); -// firstProperties = properties[0]; -// player13.setText(firstProperties); -// player13Score.setText(properties[1]); -// if (checkIfUser(firstProperties)) -// setUserStyle(player13, player13Score); -// else -// setOnlineUsersStyle(player13, player13Score, onlineUsers); -// } -// if (size > 13) { -// properties = getProperties(listOfUsers, 13); -// firstProperties = properties[0]; -// player14.setText(firstProperties); -// player14Score.setText(properties[1]); -// if (checkIfUser(firstProperties)) -// setUserStyle(player14, player14Score); -// else -// setOnlineUsersStyle(player14, player14Score, onlineUsers); -// } -// if (size > 14) { -// properties = getProperties(listOfUsers, 14); -// firstProperties = properties[0]; -// player15.setText(firstProperties); -// player15Score.setText(properties[1]); -// if (checkIfUser(firstProperties)) -// setUserStyle(player15, player15Score); -// else -// setOnlineUsersStyle(player15, player15Score, onlineUsers); -// } -// if (size > 15) { -// properties = getProperties(listOfUsers, 15); -// firstProperties = properties[0]; -// player16.setText(firstProperties); -// player16Score.setText(properties[1]); -// if (checkIfUser(firstProperties)) -// setUserStyle(player16, player16Score); -// else -// setOnlineUsersStyle(player16, player16Score, onlineUsers); -// } -// if (size > 16) { -// properties = getProperties(listOfUsers, 16); -// firstProperties = properties[0]; -// player17.setText(firstProperties); -// player17Score.setText(properties[1]); -// if (checkIfUser(firstProperties)) -// setUserStyle(player17, player17Score); -// else -// setOnlineUsersStyle(player17, player17Score, onlineUsers); -// } -// if (size > 17) { -// properties = getProperties(listOfUsers, 17); -// firstProperties = properties[0]; -// player18.setText(firstProperties); -// player18Score.setText(properties[1]); -// if (checkIfUser(firstProperties)) -// setUserStyle(player18, player18Score); -// else -// setOnlineUsersStyle(player18, player18Score, onlineUsers); -// } -// if (size > 18) { -// properties = getProperties(listOfUsers, 18); -// firstProperties = properties[0]; -// player19.setText(firstProperties); -// player19Score.setText(properties[1]); -// if (checkIfUser(firstProperties)) -// setUserStyle(player19, player19Score); -// else -// setOnlineUsersStyle(player19, player19Score, onlineUsers); -// } -// if (size > 19) { -// properties = getProperties(listOfUsers, 19); -// firstProperties = properties[0]; -// player20.setText(firstProperties); -// player20Score.setText(properties[1]); -// if (checkIfUser(firstProperties)) -// setUserStyle(player20, player20Score); -// else -// setOnlineUsersStyle(player20, player20Score, onlineUsers); -// } + a(listOfUsers, onlineUsers, size, 3, player04, player04Score); + if (size > 4) { + properties = getProperties(listOfUsers, 4); + firstProperties = properties[0]; + player05.setText(firstProperties); + player05Score.setText(properties[1]); + if (checkIfUser(firstProperties)) + setUserStyle(player05, player05Score); + else + setOnlineUsersStyle(player05, player05Score, onlineUsers); + } + if (size > 5) { + properties = getProperties(listOfUsers, 5); + firstProperties = properties[0]; + player06.setText(firstProperties); + player06Score.setText(properties[1]); + if (checkIfUser(firstProperties)) + setUserStyle(player06, player06Score); + else + setOnlineUsersStyle(player06, player06Score, onlineUsers); + } + if (size > 6) { + properties = getProperties(listOfUsers, 6); + firstProperties = properties[0]; + player07.setText(firstProperties); + player07Score.setText(properties[1]); + if (checkIfUser(firstProperties)) + setUserStyle(player07, player07Score); + else + setOnlineUsersStyle(player07, player07Score, onlineUsers); + } + if (size > 7) { + properties = getProperties(listOfUsers, 7); + firstProperties = properties[0]; + player08.setText(firstProperties); + player08Score.setText(properties[1]); + if (checkIfUser(firstProperties)) + setUserStyle(player08, player08Score); + else + setOnlineUsersStyle(player08, player08Score, onlineUsers); + } + if (size > 8) { + properties = getProperties(listOfUsers, 8); + firstProperties = properties[0]; + player09.setText(firstProperties); + player09Score.setText(properties[1]); + if (checkIfUser(firstProperties)) + setUserStyle(player09, player09Score); + else + setOnlineUsersStyle(player09, player09Score, onlineUsers); + } + if (size > 9) { + properties = getProperties(listOfUsers, 9); + firstProperties = properties[0]; + player10.setText(firstProperties); + player10Score.setText(properties[1]); + if (checkIfUser(firstProperties)) + setUserStyle(player10, player10Score); + else + setOnlineUsersStyle(player10, player10Score, onlineUsers); + } + if (size > 10) { + properties = getProperties(listOfUsers, 10); + firstProperties = properties[0]; + player11.setText(firstProperties); + player11Score.setText(properties[1]); + if (checkIfUser(firstProperties)) + setUserStyle(player11, player11Score); + else + setOnlineUsersStyle(player11, player11Score, onlineUsers); + } + if (size > 11) { + properties = getProperties(listOfUsers, 11); + firstProperties = properties[0]; + player12.setText(firstProperties); + player12Score.setText(properties[1]); + if (checkIfUser(firstProperties)) + setUserStyle(player12, player12Score); + else + setOnlineUsersStyle(player12, player12Score, onlineUsers); + } + if (size > 12) { + properties = getProperties(listOfUsers, 12); + firstProperties = properties[0]; + player13.setText(firstProperties); + player13Score.setText(properties[1]); + if (checkIfUser(firstProperties)) + setUserStyle(player13, player13Score); + else + setOnlineUsersStyle(player13, player13Score, onlineUsers); + } + if (size > 13) { + properties = getProperties(listOfUsers, 13); + firstProperties = properties[0]; + player14.setText(firstProperties); + player14Score.setText(properties[1]); + if (checkIfUser(firstProperties)) + setUserStyle(player14, player14Score); + else + setOnlineUsersStyle(player14, player14Score, onlineUsers); + } + if (size > 14) { + properties = getProperties(listOfUsers, 14); + firstProperties = properties[0]; + player15.setText(firstProperties); + player15Score.setText(properties[1]); + if (checkIfUser(firstProperties)) + setUserStyle(player15, player15Score); + else + setOnlineUsersStyle(player15, player15Score, onlineUsers); + } + if (size > 15) { + properties = getProperties(listOfUsers, 15); + firstProperties = properties[0]; + player16.setText(firstProperties); + player16Score.setText(properties[1]); + if (checkIfUser(firstProperties)) + setUserStyle(player16, player16Score); + else + setOnlineUsersStyle(player16, player16Score, onlineUsers); + } + if (size > 16) { + properties = getProperties(listOfUsers, 16); + firstProperties = properties[0]; + player17.setText(firstProperties); + player17Score.setText(properties[1]); + if (checkIfUser(firstProperties)) + setUserStyle(player17, player17Score); + else + setOnlineUsersStyle(player17, player17Score, onlineUsers); + } + if (size > 17) { + properties = getProperties(listOfUsers, 17); + firstProperties = properties[0]; + player18.setText(firstProperties); + player18Score.setText(properties[1]); + if (checkIfUser(firstProperties)) + setUserStyle(player18, player18Score); + else + setOnlineUsersStyle(player18, player18Score, onlineUsers); + } + if (size > 18) { + properties = getProperties(listOfUsers, 18); + firstProperties = properties[0]; + player19.setText(firstProperties); + player19Score.setText(properties[1]); + if (checkIfUser(firstProperties)) + setUserStyle(player19, player19Score); + else + setOnlineUsersStyle(player19, player19Score, onlineUsers); + } + if (size > 19) { + properties = getProperties(listOfUsers, 19); + firstProperties = properties[0]; + player20.setText(firstProperties); + player20Score.setText(properties[1]); + if (checkIfUser(firstProperties)) + setUserStyle(player20, player20Score); + else + setOnlineUsersStyle(player20, player20Score, onlineUsers); + } } private void a(List listOfUsers, String onlineUsers, int size, int i, JFXTextArea player02, JFXTextArea player02Score) { From c910130e2a45b8adf9c9498cb04828f4cf045263 Mon Sep 17 00:00:00 2001 From: pro-alir Date: Wed, 21 Jul 2021 22:27:17 +0430 Subject: [PATCH 3/3] scoreboard is done --- .../ProfileAndSettingFxml.fxml | 2 +- .../view/scoreBoard/ScoreBoardFxml.fxml | 40 +++++++++++++++++++ .../scoreBoard/ScoreboardViewController.java | 27 ++++++++----- 3 files changed, 57 insertions(+), 12 deletions(-) diff --git a/src/main/java/sample/view/profileAndSetting/ProfileAndSettingFxml.fxml b/src/main/java/sample/view/profileAndSetting/ProfileAndSettingFxml.fxml index 1290090..c0699be 100644 --- a/src/main/java/sample/view/profileAndSetting/ProfileAndSettingFxml.fxml +++ b/src/main/java/sample/view/profileAndSetting/ProfileAndSettingFxml.fxml @@ -228,7 +228,7 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/main/java/sample/view/scoreBoard/ScoreboardViewController.java b/src/main/java/sample/view/scoreBoard/ScoreboardViewController.java index 3cc4cbd..3fa28b4 100644 --- a/src/main/java/sample/view/scoreBoard/ScoreboardViewController.java +++ b/src/main/java/sample/view/scoreBoard/ScoreboardViewController.java @@ -158,18 +158,23 @@ public void initialize(URL url, ResourceBundle resourceBundle) { // setUsersInBoard(); // }); - new Thread(()->{ - while (true){ - makeEveryThingNull(); - setUsersInBoard(); - try { - Thread.sleep(3000); - } catch (InterruptedException e) { - e.printStackTrace(); - } - } - }).start(); +// new Thread(()->{ +// while (true){ + makeEveryThingNull(); + setUsersInBoard(); +// try { +// Thread.sleep(3000); +// } catch (InterruptedException e) { +// e.printStackTrace(); +// } +// } +// }).start(); + + } + public void refresh(ActionEvent e) { + makeEveryThingNull(); + setUsersInBoard(); } public void makeEveryThingNull() {