diff --git a/Workspace/client/src/main/java/com/pqt/client/Main.java b/Workspace/client/src/main/java/com/pqt/client/Main.java index c7240576..7bed42e7 100644 --- a/Workspace/client/src/main/java/com/pqt/client/Main.java +++ b/Workspace/client/src/main/java/com/pqt/client/Main.java @@ -5,15 +5,10 @@ import com.pqt.client.gui.modules.account_screen.AccountScreen; import com.pqt.client.gui.modules.sale_screen.SaleScreen; import com.pqt.client.gui.modules.stat_screen.StatScreen; import com.pqt.client.gui.modules.stock_screen.StockScreen; -import com.pqt.client.gui.ressources.components.generics.others.SideBar; -import com.pqt.client.gui.ressources.components.generics.others.listeners.ISideBarListener; import com.pqt.client.gui.ressources.components.generics.toast.ToastFactory; import com.pqt.client.gui.ressources.css.GUICssTool; import com.pqt.client.gui.ressources.strings.GUIStringTool; -import com.pqt.client.module.account.AccountService; -import com.pqt.client.module.sale.SaleService; -import com.pqt.client.module.stat.StatService; -import com.pqt.client.module.stock.StockService; +import com.pqt.client.module.ClientBackEndModuleManager; import javafx.application.Application; import javafx.scene.Scene; import javafx.stage.Stage; @@ -26,16 +21,15 @@ public class Main extends Application{ @Override public void start(Stage primaryStage) throws Exception { - SaleService saleService = new SaleService(); - StockService stockService = new StockService(); - AccountService accountService = new AccountService(); - StatService statService = new StatService(); + //TODO ajouter écran de préloading - MainFrame mainFrame = new MainFrame(accountService); - mainFrame.addModule(new SaleScreen(accountService, stockService, saleService), true); - mainFrame.addModule(new StockScreen(stockService, accountService)); - mainFrame.addModule(new StatScreen(statService)); - mainFrame.addModule(new AccountScreen(accountService)); + ClientBackEndModuleManager moduleManager = new ClientBackEndModuleManager(null); + + MainFrame mainFrame = new MainFrame(moduleManager.getAccountService()); + mainFrame.addModule(new SaleScreen(moduleManager.getAccountService(), moduleManager.getStockService(), moduleManager.getSaleService()), true); + mainFrame.addModule(new StockScreen(moduleManager.getStockService(), moduleManager.getAccountService())); + mainFrame.addModule(new StatScreen(moduleManager.getStatService())); + mainFrame.addModule(new AccountScreen(moduleManager.getAccountService())); Scene scene = new Scene(mainFrame.getPane(), 800, 600); diff --git a/Workspace/client/src/main/java/com/pqt/client/gui/main_frame/MainFrameModel.java b/Workspace/client/src/main/java/com/pqt/client/gui/main_frame/MainFrameModel.java index c8cb5fc7..755269a1 100644 --- a/Workspace/client/src/main/java/com/pqt/client/gui/main_frame/MainFrameModel.java +++ b/Workspace/client/src/main/java/com/pqt/client/gui/main_frame/MainFrameModel.java @@ -23,6 +23,11 @@ class MainFrameModel { MainFrameModel.this.fireAccountStatusChangedEvent(status); } + @Override + public void onAccountStatusNotChangedEvent(Throwable cause) { + + } + @Override public void onAccountListChangedEvent() { MainFrameModel.this.fireAccountCollectionChangedEvent(); diff --git a/Workspace/client/src/main/java/com/pqt/client/gui/modules/sale_screen/SaleScreenModel.java b/Workspace/client/src/main/java/com/pqt/client/gui/modules/sale_screen/SaleScreenModel.java index 4cfc6d54..8a07a511 100644 --- a/Workspace/client/src/main/java/com/pqt/client/gui/modules/sale_screen/SaleScreenModel.java +++ b/Workspace/client/src/main/java/com/pqt/client/gui/modules/sale_screen/SaleScreenModel.java @@ -104,6 +104,11 @@ class SaleScreenModel { fireAccountConnectedStatusUpdateEvent(); } + @Override + public void onAccountStatusNotChangedEvent(Throwable cause) { + + } + @Override public void onAccountListChangedEvent() { fireAccountListUpdatedEvent(); diff --git a/Workspace/client/src/main/java/com/pqt/client/gui/modules/stock_screen/StockScreenModel.java b/Workspace/client/src/main/java/com/pqt/client/gui/modules/stock_screen/StockScreenModel.java index 365c0648..225fcb4f 100644 --- a/Workspace/client/src/main/java/com/pqt/client/gui/modules/stock_screen/StockScreenModel.java +++ b/Workspace/client/src/main/java/com/pqt/client/gui/modules/stock_screen/StockScreenModel.java @@ -34,6 +34,11 @@ class StockScreenModel { StockScreenModel.this.fireConnectedStatusChanged(); } + @Override + public void onAccountStatusNotChangedEvent(Throwable cause) { + + } + @Override public void onAccountListChangedEvent() { diff --git a/Workspace/client/src/main/java/com/pqt/client/module/ClientBackEndModuleManager.java b/Workspace/client/src/main/java/com/pqt/client/module/ClientBackEndModuleManager.java new file mode 100644 index 00000000..9f2a0fb5 --- /dev/null +++ b/Workspace/client/src/main/java/com/pqt/client/module/ClientBackEndModuleManager.java @@ -0,0 +1,41 @@ +package com.pqt.client.module; + +import com.pqt.client.module.account.AccountService; +import com.pqt.client.module.connection.ConnectionService; +import com.pqt.client.module.query.QueryExecutor; +import com.pqt.client.module.sale.SaleService; +import com.pqt.client.module.stat.StatService; +import com.pqt.client.module.stock.StockService; + +public class ClientBackEndModuleManager { + + private SaleService saleService; + private StockService stockService; + private AccountService accountService; + private StatService statService; + + public ClientBackEndModuleManager(String serverUrl) { + ConnectionService connectionService = new ConnectionService(serverUrl); + QueryExecutor queryExecutor = new QueryExecutor(connectionService); + saleService = new SaleService(queryExecutor); + stockService = new StockService(queryExecutor); + accountService = new AccountService(queryExecutor); + statService = new StatService(queryExecutor); + } + + public SaleService getSaleService() { + return saleService; + } + + public StockService getStockService() { + return stockService; + } + + public AccountService getAccountService() { + return accountService; + } + + public StatService getStatService() { + return statService; + } +}