diff --git a/src/main/java/danielcortes/xyz/Main.java b/src/main/java/danielcortes/xyz/Main.java index 43d2e8e..cbd5520 100644 --- a/src/main/java/danielcortes/xyz/Main.java +++ b/src/main/java/danielcortes/xyz/Main.java @@ -24,12 +24,8 @@ package danielcortes.xyz; -import danielcortes.xyz.controllers.CajaController; -import danielcortes.xyz.models.EgresoDAO; -import danielcortes.xyz.models.TipoEgresoDAO; -import danielcortes.xyz.models.mysql.MysqlEgresoDAO; -import danielcortes.xyz.models.mysql.MysqlTipoEgresoDAO; -import danielcortes.xyz.views.CajaView; +import danielcortes.xyz.controllers.ManagerController; +import danielcortes.xyz.views.ManagerView; import javax.swing.*; @@ -43,18 +39,13 @@ public class Main { } - CajaView view = new CajaView(); + ManagerView view = new ManagerView(); JFrame frame = new JFrame("Caja"); - frame.setContentPane(view.getUI()); - frame.setContentPane(view.contentPanel); + frame.setContentPane(view.getContentPanel()); frame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE); frame.setSize(1300,700); frame.setLocationRelativeTo(null); - - EgresoDAO egresoDAO = new MysqlEgresoDAO(); - TipoEgresoDAO tipoEgresoDAO = new MysqlTipoEgresoDAO(); - CajaController cajaController = new CajaController(view, egresoDAO, tipoEgresoDAO); - + ManagerController managerController = new ManagerController(view); frame.setVisible(true); diff --git a/src/main/java/danielcortes/xyz/controllers/CajaController.java b/src/main/java/danielcortes/xyz/controllers/CajaController.java index 60f5515..bb97fb2 100644 --- a/src/main/java/danielcortes/xyz/controllers/CajaController.java +++ b/src/main/java/danielcortes/xyz/controllers/CajaController.java @@ -28,17 +28,16 @@ import danielcortes.xyz.models.Egreso; import danielcortes.xyz.models.EgresoDAO; import danielcortes.xyz.models.TipoEgreso; import danielcortes.xyz.models.TipoEgresoDAO; -import danielcortes.xyz.views.CajaView; +import danielcortes.xyz.views.EgresosView; import javax.swing.*; - public class CajaController { - private CajaView view; + private EgresosView view; private EgresoDAO egresoDAO; private TipoEgresoDAO tipoEgresoDAO; - public CajaController(CajaView view, EgresoDAO egresoDAO, TipoEgresoDAO tipoEgresoDAO){ + public CajaController(EgresosView view, EgresoDAO egresoDAO, TipoEgresoDAO tipoEgresoDAO){ this.view = view; this.egresoDAO = egresoDAO; this.tipoEgresoDAO = tipoEgresoDAO; diff --git a/src/main/java/danielcortes/xyz/controllers/ManagerController.java b/src/main/java/danielcortes/xyz/controllers/ManagerController.java new file mode 100644 index 0000000..12f5f30 --- /dev/null +++ b/src/main/java/danielcortes/xyz/controllers/ManagerController.java @@ -0,0 +1,72 @@ +/* + * MIT License + * + * Copyright (c) 2018 Daniel Cortes + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + */ + +package danielcortes.xyz.controllers; + +import danielcortes.xyz.models.EgresoDAO; +import danielcortes.xyz.models.TipoEgresoDAO; +import danielcortes.xyz.models.mysql.MysqlEgresoDAO; +import danielcortes.xyz.models.mysql.MysqlTipoEgresoDAO; +import danielcortes.xyz.views.EgresosView; +import danielcortes.xyz.views.ManagerView; + +import javax.swing.*; +import java.awt.*; + + +public class ManagerController { + private ManagerView view; + + public ManagerController(ManagerView view) { + this.view = view; + this.loadCardContents(); + this.setUpViewEvents(); + } + + private void setUpViewEvents(){ + this.view.getEgresosButton().addActionListener(e -> { + CardLayout layout = (CardLayout) this.view.getCardPanel().getLayout(); + layout.show(this.view.getCardPanel(),"EGRESOS"); + }); + this.view.getIngresosButton().addActionListener(e -> { + CardLayout layout = (CardLayout) this.view.getCardPanel().getLayout(); + layout.show(this.view.getCardPanel(),"NONE"); + }); + } + + private void loadCardContents(){ + this.view.getCardPanel().add(new JPanel(), "NONE"); + this.loadEgresosView(); + } + + private void loadEgresosView(){ + EgresosView egresosView = new EgresosView(); + EgresoDAO egresoDAO = new MysqlEgresoDAO(); + TipoEgresoDAO tipoEgresoDAO = new MysqlTipoEgresoDAO(); + + this.view.getCardPanel().add(egresosView.getContentPanel(), "EGRESOS"); + + CajaController cajaController = new CajaController(egresosView, egresoDAO, tipoEgresoDAO); + } +} diff --git a/src/main/java/danielcortes/xyz/views/CajaView.form b/src/main/java/danielcortes/xyz/views/EgresosView.form similarity index 99% rename from src/main/java/danielcortes/xyz/views/CajaView.form rename to src/main/java/danielcortes/xyz/views/EgresosView.form index 9f266a7..fbc64a3 100644 --- a/src/main/java/danielcortes/xyz/views/CajaView.form +++ b/src/main/java/danielcortes/xyz/views/EgresosView.form @@ -1,5 +1,5 @@ -
+ diff --git a/src/main/java/danielcortes/xyz/views/CajaView.java b/src/main/java/danielcortes/xyz/views/EgresosView.java similarity index 97% rename from src/main/java/danielcortes/xyz/views/CajaView.java rename to src/main/java/danielcortes/xyz/views/EgresosView.java index 773b367..e936f91 100644 --- a/src/main/java/danielcortes/xyz/views/CajaView.java +++ b/src/main/java/danielcortes/xyz/views/EgresosView.java @@ -31,7 +31,7 @@ import javax.swing.*; import javax.swing.plaf.basic.BasicComboBoxRenderer; import java.awt.*; -public class CajaView { +public class EgresosView { public JPanel contentPanel; private JPanel egresosPanel; private JTable egresosTable; @@ -54,7 +54,7 @@ public class CajaView { egresosTable.setAutoCreateRowSorter(true); } - public JPanel getUI() { + public JPanel getContentPanel() { return contentPanel; } diff --git a/src/main/java/danielcortes/xyz/views/ManagerView.form b/src/main/java/danielcortes/xyz/views/ManagerView.form new file mode 100644 index 0000000..e862d4e --- /dev/null +++ b/src/main/java/danielcortes/xyz/views/ManagerView.form @@ -0,0 +1,75 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/main/java/danielcortes/xyz/views/ManagerView.java b/src/main/java/danielcortes/xyz/views/ManagerView.java new file mode 100644 index 0000000..ecc840c --- /dev/null +++ b/src/main/java/danielcortes/xyz/views/ManagerView.java @@ -0,0 +1,53 @@ +/* + * MIT License + * + * Copyright (c) 2018 Daniel Cortes + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + */ + +package danielcortes.xyz.views; + +import javax.swing.*; + +public class ManagerView { + private JButton egresosButton; + private JButton ingresosButton; + private JButton button3; + private JButton button4; + private JPanel contentPanel; + private JPanel cardPanel; + private JPanel controlsPanel; + + public JButton getEgresosButton() { + return egresosButton; + } + + public JButton getIngresosButton() { + return ingresosButton; + } + + public JPanel getContentPanel() { + return contentPanel; + } + + public JPanel getCardPanel() { + return cardPanel; + } +} diff --git a/src/main/java/danielcortes/xyz/views/components/EgresosTableModel.java b/src/main/java/danielcortes/xyz/views/components/EgresosTableModel.java index 353eb43..f9e0a74 100644 --- a/src/main/java/danielcortes/xyz/views/components/EgresosTableModel.java +++ b/src/main/java/danielcortes/xyz/views/components/EgresosTableModel.java @@ -24,7 +24,7 @@ package danielcortes.xyz.views.components; -public class EgresosTableModel extends TableModel{ +public class EgresosTableModel extends TableModel { private String[] columns; public EgresosTableModel(){ diff --git a/src/main/java/danielcortes/xyz/views/components/TableModel.java b/src/main/java/danielcortes/xyz/views/components/TableModel.java index 0e3f7c8..f2fd689 100644 --- a/src/main/java/danielcortes/xyz/views/components/TableModel.java +++ b/src/main/java/danielcortes/xyz/views/components/TableModel.java @@ -29,6 +29,7 @@ import java.util.ArrayList; public abstract class TableModel extends AbstractTableModel { private ArrayList rows = new ArrayList<>(); + public int getRowCount() { return rows.size(); }