diff --git a/dist/local-release/Programa Caja.jar b/dist/local-release/Programa Caja.jar index 6695b4a..415c874 100644 Binary files a/dist/local-release/Programa Caja.jar and b/dist/local-release/Programa Caja.jar differ diff --git a/dist/local-release/config/app.properties b/dist/local-release/config/app.properties index a094cb9..74583c0 100644 --- a/dist/local-release/config/app.properties +++ b/dist/local-release/config/app.properties @@ -20,7 +20,7 @@ look_and_feel = javax.swing.plaf.metal.MetalLookAndFeel #look_and_feel = com.sun.java.swing.plaf.windows.WindowsLookAndFeel # nombre_caja sirve para darle un nombre a la caja con la que se esta trabajando, por ahora le da un nombre a las ventanas del sistema. -nombre_caja = Rodriguez +nombre_caja = DEV # directorio en el que sugerir donde guardar los informes. base_save_directory =/home/ryuuji/src/caja/dist/local-release/informes/ diff --git a/src/danielcortes/xyz/Main.java b/src/danielcortes/xyz/Main.java index 48eac3f..498e6af 100644 --- a/src/danielcortes/xyz/Main.java +++ b/src/danielcortes/xyz/Main.java @@ -24,9 +24,9 @@ package danielcortes.xyz; -import danielcortes.xyz.controllers.ManagerController; +import danielcortes.xyz.controllers.MainController; import danielcortes.xyz.data.Configuration; -import danielcortes.xyz.views.ManagerView; +import danielcortes.xyz.views.MainView; import javax.swing.*; import java.io.FileInputStream; @@ -45,18 +45,18 @@ public class Main { } private static void run() { - ManagerView view = new ManagerView(); - ManagerController managerController = new ManagerController(view); + MainView view = new MainView(); + MainController mainController = new MainController(view); executeView(view.getContentPanel()); } private static void executeView(JComponent view) { - JFrame frame = new JFrame("Caja: " + Configuration.get("nombre_caja")); + JFrame frame = new JFrame(Configuration.get("nombre_caja")); frame.setContentPane(view); frame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE); - frame.pack(); + frame.setSize(250,500); frame.setLocationRelativeTo(null); frame.setVisible(true); } diff --git a/src/danielcortes/xyz/controllers/ManagerController.java b/src/danielcortes/xyz/controllers/CajasController.java similarity index 89% rename from src/danielcortes/xyz/controllers/ManagerController.java rename to src/danielcortes/xyz/controllers/CajasController.java index 41ea46e..6ad2071 100644 --- a/src/danielcortes/xyz/controllers/ManagerController.java +++ b/src/danielcortes/xyz/controllers/CajasController.java @@ -34,16 +34,15 @@ import java.awt.*; import java.time.LocalDate; /** - * Controlador destinado a controlar la vista de ManagerView + * Controlador destinado a controlar la vista de CajasView * Ademas es la que crea las vistas internas en un CardLayaut junto a sus controladores */ -public class ManagerController { - private ManagerView view; +public class CajasController { + private CajasView view; private IngresosController ingresosController; private EgresosController egresosController; private ArqueoController arqueoController; - private InformesController informesController; /** * Crea el controlador @@ -56,7 +55,7 @@ public class ManagerController { * - Genera los eventos de la vista * - Presiona el boton de la vista inicial */ - public ManagerController(ManagerView view) { + public CajasController(CajasView view) { this.view = view; this.loadCardContents(); this.setUpDate(); @@ -92,10 +91,6 @@ public class ManagerController { CardLayout layout = (CardLayout) this.view.getCardPanel().getLayout(); layout.show(this.view.getCardPanel(), "ARQUEO"); }); - this.view.getInformesButton().addActionListener(e -> { - CardLayout layout = (CardLayout) this.view.getCardPanel().getLayout(); - layout.show(this.view.getCardPanel(), "INFORMES"); - }); this.view.getDatePicker().addDateChangeListener(e -> updateCaja()); } @@ -132,7 +127,6 @@ public class ManagerController { this.loadEgresosView(); this.loadIngresosView(); this.loadArqueoView(); - this.loadInformesView(); } /** @@ -168,13 +162,6 @@ public class ManagerController { this.arqueoController = new ArqueoController(arqueoView); } - private void loadInformesView() { - InformesView informesView = new InformesView(); - this.view.getCardPanel().add(informesView.getContentPanel(), "INFORMES"); - - this.informesController = new InformesController(informesView); - } - /** * Activa el primer boton del manager */ diff --git a/src/danielcortes/xyz/controllers/MainController.java b/src/danielcortes/xyz/controllers/MainController.java new file mode 100644 index 0000000..50f3b65 --- /dev/null +++ b/src/danielcortes/xyz/controllers/MainController.java @@ -0,0 +1,52 @@ +package danielcortes.xyz.controllers; + +import danielcortes.xyz.data.Configuration; +import danielcortes.xyz.views.CajasView; +import danielcortes.xyz.views.InformesView; +import danielcortes.xyz.views.MainView; + +import javax.swing.*; +import javax.swing.border.TitledBorder; +import java.awt.*; + +public class MainController { + private MainView view; + + private CajasController cajasController; + + public MainController(MainView view){ + this.view = view; + this.setupViewEvents(); + this.loadRestaurantName(); + } + + private void loadRestaurantName(){ + String nombre = Configuration.get("nombre_caja"); + ((TitledBorder)this.view.getButtonPanel().getBorder()).setTitle("Restaurant: " + nombre); + } + + private void setupViewEvents(){ + this.view.getCajasButton().addActionListener(e -> { + CajasView view = new CajasView(); + CajasController cajasController = new CajasController(view); + + this.executeView(view.getContentPanel(), "Caja", new Dimension(1280, 720)); + }); + this.view.getInformesMensualesButton().addActionListener(e -> { + InformesView view = new InformesView(); + InformesController informesController = new InformesController(view); + + this.executeView(view.getContentPanel(), "Informes Mensuales", new Dimension(250, 500)); + }); + } + + private void executeView(JComponent view, String title, Dimension d){ + JFrame frame = new JFrame(title + ": " + Configuration.get("nombre_caja")); + frame.setContentPane(view); + frame.setDefaultCloseOperation(JFrame.DISPOSE_ON_CLOSE); + + frame.setSize(d); + frame.setLocationRelativeTo(null); + frame.setVisible(true); + } +} diff --git a/src/danielcortes/xyz/views/ManagerView.form b/src/danielcortes/xyz/views/CajasView.form similarity index 85% rename from src/danielcortes/xyz/views/ManagerView.form rename to src/danielcortes/xyz/views/CajasView.form index 5dc9392..fb7c617 100644 --- a/src/danielcortes/xyz/views/ManagerView.form +++ b/src/danielcortes/xyz/views/CajasView.form @@ -1,9 +1,9 @@ -
+ - + @@ -16,7 +16,7 @@ - + @@ -65,16 +65,6 @@ - - - - - - - - - - diff --git a/src/danielcortes/xyz/views/ManagerView.java b/src/danielcortes/xyz/views/CajasView.java similarity index 89% rename from src/danielcortes/xyz/views/ManagerView.java rename to src/danielcortes/xyz/views/CajasView.java index 9884f6d..1705f37 100644 --- a/src/danielcortes/xyz/views/ManagerView.java +++ b/src/danielcortes/xyz/views/CajasView.java @@ -32,7 +32,7 @@ import com.intellij.uiDesigner.core.Spacer; import javax.swing.*; import java.awt.*; -public class ManagerView { +public class CajasView { private JToggleButton egresosButton; private JToggleButton ingresosButton; private JPanel contentPanel; @@ -40,7 +40,6 @@ public class ManagerView { private JPanel controlsPanel; private JToggleButton arqueoButton; private DatePicker datePicker; - private JToggleButton informesButton; public JToggleButton getEgresosButton() { return egresosButton; @@ -54,10 +53,6 @@ public class ManagerView { return arqueoButton; } - public JToggleButton getInformesButton() { - return informesButton; - } - public DatePicker getDatePicker() { return datePicker; } @@ -92,7 +87,7 @@ public class ManagerView { cardPanel.setLayout(new CardLayout(0, 0)); contentPanel.add(cardPanel, new GridConstraints(1, 0, 1, 1, GridConstraints.ANCHOR_CENTER, GridConstraints.FILL_BOTH, GridConstraints.SIZEPOLICY_CAN_SHRINK | GridConstraints.SIZEPOLICY_CAN_GROW, GridConstraints.SIZEPOLICY_CAN_SHRINK | GridConstraints.SIZEPOLICY_CAN_GROW, null, null, null, 0, false)); controlsPanel = new JPanel(); - controlsPanel.setLayout(new GridLayoutManager(1, 6, new Insets(0, 0, 0, 0), -1, -1)); + controlsPanel.setLayout(new GridLayoutManager(1, 5, new Insets(0, 0, 0, 0), -1, -1)); contentPanel.add(controlsPanel, new GridConstraints(0, 0, 1, 1, GridConstraints.ANCHOR_NORTH, GridConstraints.FILL_HORIZONTAL, GridConstraints.SIZEPOLICY_CAN_SHRINK | GridConstraints.SIZEPOLICY_CAN_GROW, 1, null, null, null, 0, false)); egresosButton = new JToggleButton(); egresosButton.setText("Egresos"); @@ -113,15 +108,11 @@ public class ManagerView { controlsPanel.add(datePicker, new GridConstraints(0, 0, 1, 1, GridConstraints.ANCHOR_CENTER, GridConstraints.FILL_NONE, GridConstraints.SIZEPOLICY_CAN_SHRINK | GridConstraints.SIZEPOLICY_CAN_GROW, GridConstraints.SIZEPOLICY_CAN_SHRINK | GridConstraints.SIZEPOLICY_CAN_GROW, null, null, null, 0, false)); final Spacer spacer1 = new Spacer(); controlsPanel.add(spacer1, new GridConstraints(0, 1, 1, 1, GridConstraints.ANCHOR_CENTER, GridConstraints.FILL_HORIZONTAL, GridConstraints.SIZEPOLICY_WANT_GROW, 1, null, null, null, 0, false)); - informesButton = new JToggleButton(); - informesButton.setText("Informes"); - controlsPanel.add(informesButton, new GridConstraints(0, 5, 1, 1, GridConstraints.ANCHOR_CENTER, GridConstraints.FILL_NONE, GridConstraints.SIZEPOLICY_CAN_SHRINK | GridConstraints.SIZEPOLICY_CAN_GROW, GridConstraints.SIZEPOLICY_CAN_SHRINK | GridConstraints.SIZEPOLICY_CAN_GROW, null, new Dimension(200, -1), null, 0, false)); ButtonGroup buttonGroup; buttonGroup = new ButtonGroup(); buttonGroup.add(egresosButton); buttonGroup.add(ingresosButton); buttonGroup.add(arqueoButton); - buttonGroup.add(informesButton); } /** @@ -130,4 +121,5 @@ public class ManagerView { public JComponent $$$getRootComponent$$$() { return contentPanel; } + } diff --git a/src/danielcortes/xyz/views/InformesView.form b/src/danielcortes/xyz/views/InformesView.form index a0e71be..5a969ad 100644 --- a/src/danielcortes/xyz/views/InformesView.form +++ b/src/danielcortes/xyz/views/InformesView.form @@ -1,7 +1,7 @@ - - + + @@ -9,12 +9,12 @@ - + - + @@ -39,11 +39,6 @@ - - - - - diff --git a/src/danielcortes/xyz/views/InformesView.java b/src/danielcortes/xyz/views/InformesView.java index 7576628..e4d119b 100644 --- a/src/danielcortes/xyz/views/InformesView.java +++ b/src/danielcortes/xyz/views/InformesView.java @@ -65,11 +65,11 @@ public class InformesView { */ private void $$$setupUI$$$() { contentPanel = new JPanel(); - contentPanel.setLayout(new GridLayoutManager(1, 2, new Insets(0, 0, 0, 0), -1, -1)); + contentPanel.setLayout(new GridLayoutManager(1, 1, new Insets(10, 10, 10, 10), -1, -1)); final JPanel panel1 = new JPanel(); - panel1.setLayout(new GridLayoutManager(3, 1, new Insets(0, 0, 0, 0), -1, -1)); + panel1.setLayout(new GridLayoutManager(3, 1, new Insets(10, 10, 10, 10), -1, -1)); contentPanel.add(panel1, new GridConstraints(0, 0, 1, 1, GridConstraints.ANCHOR_CENTER, GridConstraints.FILL_BOTH, GridConstraints.SIZEPOLICY_CAN_SHRINK | GridConstraints.SIZEPOLICY_CAN_GROW, GridConstraints.SIZEPOLICY_CAN_SHRINK | GridConstraints.SIZEPOLICY_CAN_GROW, null, null, null, 0, false)); - panel1.setBorder(BorderFactory.createTitledBorder(BorderFactory.createEtchedBorder(), "Informes Generales")); + panel1.setBorder(BorderFactory.createTitledBorder(BorderFactory.createEtchedBorder(), "Informes Mensuales")); generarLibroVentasButton = new JButton(); generarLibroVentasButton.setText("Libro de Ventas Mensual"); panel1.add(generarLibroVentasButton, new GridConstraints(0, 0, 1, 1, GridConstraints.ANCHOR_CENTER, GridConstraints.FILL_HORIZONTAL, GridConstraints.SIZEPOLICY_CAN_SHRINK | GridConstraints.SIZEPOLICY_CAN_GROW, GridConstraints.SIZEPOLICY_FIXED, null, null, null, 0, false)); @@ -78,8 +78,6 @@ public class InformesView { panel1.add(GenerarEgresosFacturasMateriaPrimaButton, new GridConstraints(1, 0, 1, 1, GridConstraints.ANCHOR_CENTER, GridConstraints.FILL_HORIZONTAL, GridConstraints.SIZEPOLICY_CAN_SHRINK | GridConstraints.SIZEPOLICY_CAN_GROW, GridConstraints.SIZEPOLICY_FIXED, null, null, null, 0, false)); final Spacer spacer1 = new Spacer(); panel1.add(spacer1, new GridConstraints(2, 0, 1, 1, GridConstraints.ANCHOR_CENTER, GridConstraints.FILL_VERTICAL, 1, GridConstraints.SIZEPOLICY_WANT_GROW, null, null, null, 0, false)); - final Spacer spacer2 = new Spacer(); - contentPanel.add(spacer2, new GridConstraints(0, 1, 1, 1, GridConstraints.ANCHOR_CENTER, GridConstraints.FILL_HORIZONTAL, GridConstraints.SIZEPOLICY_WANT_GROW, 1, null, null, null, 0, false)); } /** @@ -88,4 +86,5 @@ public class InformesView { public JComponent $$$getRootComponent$$$() { return contentPanel; } + } diff --git a/src/danielcortes/xyz/views/MainView.form b/src/danielcortes/xyz/views/MainView.form new file mode 100644 index 0000000..ca1ea00 --- /dev/null +++ b/src/danielcortes/xyz/views/MainView.form @@ -0,0 +1,52 @@ + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
diff --git a/src/danielcortes/xyz/views/MainView.java b/src/danielcortes/xyz/views/MainView.java new file mode 100644 index 0000000..2f01361 --- /dev/null +++ b/src/danielcortes/xyz/views/MainView.java @@ -0,0 +1,79 @@ +package danielcortes.xyz.views; + +import com.intellij.uiDesigner.core.GridConstraints; +import com.intellij.uiDesigner.core.GridLayoutManager; +import com.intellij.uiDesigner.core.Spacer; + +import javax.swing.*; +import java.awt.*; + +public class MainView { + private JPanel contentPanel; + private JButton informesMensualesButton; + private JButton cajasButton; + private JButton informesGeneralesButton; + private JPanel buttonPanel; + + public JPanel getContentPanel() { + return contentPanel; + } + + public JPanel getButtonPanel() { + return buttonPanel; + } + + public JButton getInformesMensualesButton() { + return informesMensualesButton; + } + + public JButton getCajasButton() { + return cajasButton; + } + + public JButton getInformesGeneralesButton() { + return informesGeneralesButton; + } + + + { +// GUI initializer generated by IntelliJ IDEA GUI Designer +// >>> IMPORTANT!! <<< +// DO NOT EDIT OR ADD ANY CODE HERE! + $$$setupUI$$$(); + } + + /** + * Method generated by IntelliJ IDEA GUI Designer + * >>> IMPORTANT!! <<< + * DO NOT edit this method OR call it in your code! + * + * @noinspection ALL + */ + private void $$$setupUI$$$() { + contentPanel = new JPanel(); + contentPanel.setLayout(new GridLayoutManager(1, 1, new Insets(10, 10, 10, 10), -1, -1)); + buttonPanel = new JPanel(); + buttonPanel.setLayout(new GridLayoutManager(4, 1, new Insets(10, 10, 10, 10), -1, -1)); + contentPanel.add(buttonPanel, new GridConstraints(0, 0, 1, 1, GridConstraints.ANCHOR_CENTER, GridConstraints.FILL_BOTH, GridConstraints.SIZEPOLICY_CAN_SHRINK | GridConstraints.SIZEPOLICY_CAN_GROW, GridConstraints.SIZEPOLICY_CAN_SHRINK | GridConstraints.SIZEPOLICY_CAN_GROW, null, null, null, 0, false)); + buttonPanel.setBorder(BorderFactory.createTitledBorder(BorderFactory.createEtchedBorder(), null)); + cajasButton = new JButton(); + cajasButton.setText("Cajas"); + buttonPanel.add(cajasButton, new GridConstraints(0, 0, 1, 1, GridConstraints.ANCHOR_CENTER, GridConstraints.FILL_HORIZONTAL, GridConstraints.SIZEPOLICY_CAN_SHRINK | GridConstraints.SIZEPOLICY_CAN_GROW, GridConstraints.SIZEPOLICY_FIXED, null, null, null, 0, false)); + informesGeneralesButton = new JButton(); + informesGeneralesButton.setText("Informes Generales"); + buttonPanel.add(informesGeneralesButton, new GridConstraints(2, 0, 1, 1, GridConstraints.ANCHOR_CENTER, GridConstraints.FILL_HORIZONTAL, GridConstraints.SIZEPOLICY_CAN_SHRINK | GridConstraints.SIZEPOLICY_CAN_GROW, GridConstraints.SIZEPOLICY_FIXED, null, null, null, 0, false)); + final Spacer spacer1 = new Spacer(); + buttonPanel.add(spacer1, new GridConstraints(3, 0, 1, 1, GridConstraints.ANCHOR_CENTER, GridConstraints.FILL_VERTICAL, 1, GridConstraints.SIZEPOLICY_WANT_GROW, null, null, null, 0, false)); + informesMensualesButton = new JButton(); + informesMensualesButton.setText("Informes Mensuales"); + buttonPanel.add(informesMensualesButton, new GridConstraints(1, 0, 1, 1, GridConstraints.ANCHOR_CENTER, GridConstraints.FILL_HORIZONTAL, GridConstraints.SIZEPOLICY_CAN_SHRINK | GridConstraints.SIZEPOLICY_CAN_GROW, GridConstraints.SIZEPOLICY_FIXED, null, null, null, 0, false)); + } + + /** + * @noinspection ALL + */ + public JComponent $$$getRootComponent$$$() { + return contentPanel; + } + +}