From 60e3caf4de3a213c50778b4fc8c59237c6c7d772 Mon Sep 17 00:00:00 2001 From: Notmoo Date: Tue, 15 Aug 2017 00:40:51 +0200 Subject: [PATCH] =?UTF-8?q?Module=20Client,=20=C3=A9cran=20de=20vente=20:?= =?UTF-8?q?=20clss=20SaleScreen=20impl=C3=A9mente=20d=C3=A9sormais=20IGuiM?= =?UTF-8?q?odule;=20Corrections=20mineures?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/pqt/client/gui/modules/IGuiModule.java | 7 +++++++ .../pqt/client/gui/modules/sale_screen/SaleScreen.java | 9 ++++++++- .../gui/modules/sale_screen/SaleScreenController.java | 2 +- .../client/gui/modules/sale_screen/SaleScreenView.java | 1 - 4 files changed, 16 insertions(+), 3 deletions(-) create mode 100644 Workspace/client/src/main/java/com/pqt/client/gui/modules/IGuiModule.java diff --git a/Workspace/client/src/main/java/com/pqt/client/gui/modules/IGuiModule.java b/Workspace/client/src/main/java/com/pqt/client/gui/modules/IGuiModule.java new file mode 100644 index 00000000..a6a06023 --- /dev/null +++ b/Workspace/client/src/main/java/com/pqt/client/gui/modules/IGuiModule.java @@ -0,0 +1,7 @@ +package com.pqt.client.gui.modules; + +import com.pqt.client.gui.ressources.components.generics.IFXComponent; + +public interface IGuiModule extends IFXComponent{ + String getModuleName(); +} diff --git a/Workspace/client/src/main/java/com/pqt/client/gui/modules/sale_screen/SaleScreen.java b/Workspace/client/src/main/java/com/pqt/client/gui/modules/sale_screen/SaleScreen.java index ad94fafd..d9007117 100644 --- a/Workspace/client/src/main/java/com/pqt/client/gui/modules/sale_screen/SaleScreen.java +++ b/Workspace/client/src/main/java/com/pqt/client/gui/modules/sale_screen/SaleScreen.java @@ -1,12 +1,14 @@ package com.pqt.client.gui.modules.sale_screen; +import com.pqt.client.gui.modules.IGuiModule; import com.pqt.client.gui.ressources.components.generics.IFXComponent; +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.stock.StockService; import javafx.scene.layout.Pane; -public class SaleScreen implements IFXComponent { +public class SaleScreen implements IGuiModule { private SaleScreenView view; @@ -23,4 +25,9 @@ public class SaleScreen implements IFXComponent { public Pane getPane() { return view.getPane(); } + + @Override + public String getModuleName() { + return GUIStringTool.getSaleGuiModuleName(); + } } diff --git a/Workspace/client/src/main/java/com/pqt/client/gui/modules/sale_screen/SaleScreenController.java b/Workspace/client/src/main/java/com/pqt/client/gui/modules/sale_screen/SaleScreenController.java index a3f93988..5a65ebc5 100644 --- a/Workspace/client/src/main/java/com/pqt/client/gui/modules/sale_screen/SaleScreenController.java +++ b/Workspace/client/src/main/java/com/pqt/client/gui/modules/sale_screen/SaleScreenController.java @@ -133,7 +133,7 @@ class SaleScreenController { } Account getDefaultAccount() { - return new Account(" - ", null, AccountLevel.getLowest()); + return new Account(null, null, AccountLevel.getLowest()); } IValidatorComponentListener getValidatorListener() { diff --git a/Workspace/client/src/main/java/com/pqt/client/gui/modules/sale_screen/SaleScreenView.java b/Workspace/client/src/main/java/com/pqt/client/gui/modules/sale_screen/SaleScreenView.java index ade15612..24adaa81 100644 --- a/Workspace/client/src/main/java/com/pqt/client/gui/modules/sale_screen/SaleScreenView.java +++ b/Workspace/client/src/main/java/com/pqt/client/gui/modules/sale_screen/SaleScreenView.java @@ -4,7 +4,6 @@ import com.pqt.client.gui.modules.sale_screen.sale_validation_screen.SaleValidat import com.pqt.client.gui.ressources.components.CommandComposerSaleDisplayer; import com.pqt.client.gui.ressources.components.SimpleValidator; import com.pqt.client.gui.ressources.components.generics.javafx_override.CssEnabledGridPane; -import com.pqt.client.gui.ressources.css.GUICssTool; import com.pqt.client.gui.ressources.components.generics.IFXComponent; import com.pqt.client.gui.ressources.strings.GUIStringTool; import com.pqt.client.gui.ressources.components.CategoryTabStockDisplayer;