From 7e509555c799d640116cad4bb610ba6ac9d42ba4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Cort=C3=A9s?= Date: Wed, 29 May 2019 13:49:47 -0400 Subject: [PATCH] Cambiare la forma enque se maneja el stock --- .../libro/LibroSearchController.java | 42 +----- .../views/libro/LibroAgregarStockDialog.form | 85 ------------- .../views/libro/LibroAgregarStockDialog.java | 120 ------------------ .../views/libro/LibroSearchPanel.form | 14 +- .../views/libro/LibroSearchPanel.java | 16 +-- .../views/trabajador/TrabajadorViewPanel.java | 2 + 6 files changed, 9 insertions(+), 270 deletions(-) delete mode 100644 src/main/java/xyz/danielcortes/views/libro/LibroAgregarStockDialog.form delete mode 100644 src/main/java/xyz/danielcortes/views/libro/LibroAgregarStockDialog.java diff --git a/src/main/java/xyz/danielcortes/controllers/libro/LibroSearchController.java b/src/main/java/xyz/danielcortes/controllers/libro/LibroSearchController.java index 0f99f60..1e92e18 100644 --- a/src/main/java/xyz/danielcortes/controllers/libro/LibroSearchController.java +++ b/src/main/java/xyz/danielcortes/controllers/libro/LibroSearchController.java @@ -2,36 +2,27 @@ package xyz.danielcortes.controllers.libro; import java.util.List; import javax.swing.JOptionPane; -import xyz.danielcortes.framework.BaseController; import xyz.danielcortes.controllers.LaunchController; +import xyz.danielcortes.framework.BaseController; +import xyz.danielcortes.framework.BasePanel; import xyz.danielcortes.framework.BaseTableModel; import xyz.danielcortes.framework.PanelName; -import xyz.danielcortes.framework.ValidationResult; -import xyz.danielcortes.models.Ejemplar; import xyz.danielcortes.models.Libro; -import xyz.danielcortes.repository.EjemplarRepository; import xyz.danielcortes.repository.LibroRepository; -import xyz.danielcortes.validator.EjemplarValidator; import xyz.danielcortes.validator.LibroValidator; -import xyz.danielcortes.framework.BasePanel; -import xyz.danielcortes.views.libro.LibroAgregarStockDialog; import xyz.danielcortes.views.libro.LibroSearchPanel; public class LibroSearchController extends BaseController { private LibroSearchPanel view; private LibroRepository libroRepository; - private EjemplarRepository ejemplarRepository; private LibroValidator libroValidator; - private EjemplarValidator ejemplarValidator; public LibroSearchController(LibroSearchPanel view, LaunchController parent) { super(parent); this.view = view; this.libroRepository = new LibroRepository(); this.libroValidator = new LibroValidator(this.libroRepository); - this.ejemplarRepository = new EjemplarRepository(); - this.ejemplarValidator = new EjemplarValidator(this.ejemplarRepository); this.loadLibroTable(); this.setupListeners(); } @@ -52,7 +43,6 @@ public class LibroSearchController extends BaseController { this.view.getEliminarButton().addActionListener(e -> delete()); this.view.getEditarButton().addActionListener(e -> edit()); this.view.getVerButton().addActionListener(e -> view()); - this.view.getAgregarStockButton().addActionListener(e -> addStock()); } private void view() { @@ -98,34 +88,6 @@ public class LibroSearchController extends BaseController { this.loadLibroTable(libros); } - private void addStock() { - Libro libro = getSelectedLibro(); - if (libro == null) - return; - - LibroAgregarStockDialog dialog = new LibroAgregarStockDialog(); - dialog.pack(); - dialog.setLocationRelativeTo(null); - dialog.setVisible(true); - - String serie = dialog.getSerie(); - if (serie == null) - return; - - ValidationResult ejemplarValidation = this.ejemplarValidator.validateSerie(serie, libro.getId()); - if (ejemplarValidation.hasError()){ - ejemplarValidation.showErrorDialog(); - return; - } - - Ejemplar ejemplar = new Ejemplar(); - ejemplar.setLibro(libro); - ejemplar.setSerie(serie); - this.ejemplarRepository.save(ejemplar); - - this.reload(); - } - private void loadLibroTable(List libros) { BaseTableModel model = this.view.getLibrosModel(); model.setRows(libros); diff --git a/src/main/java/xyz/danielcortes/views/libro/LibroAgregarStockDialog.form b/src/main/java/xyz/danielcortes/views/libro/LibroAgregarStockDialog.form deleted file mode 100644 index e9ea0c3..0000000 --- a/src/main/java/xyz/danielcortes/views/libro/LibroAgregarStockDialog.form +++ /dev/null @@ -1,85 +0,0 @@ - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
diff --git a/src/main/java/xyz/danielcortes/views/libro/LibroAgregarStockDialog.java b/src/main/java/xyz/danielcortes/views/libro/LibroAgregarStockDialog.java deleted file mode 100644 index 84e2f60..0000000 --- a/src/main/java/xyz/danielcortes/views/libro/LibroAgregarStockDialog.java +++ /dev/null @@ -1,120 +0,0 @@ -package xyz.danielcortes.views.libro; - -import com.intellij.uiDesigner.core.GridConstraints; -import com.intellij.uiDesigner.core.GridLayoutManager; -import com.intellij.uiDesigner.core.Spacer; -import java.awt.Dimension; -import java.awt.Insets; -import java.awt.event.KeyEvent; -import java.awt.event.WindowAdapter; -import java.awt.event.WindowEvent; -import javax.swing.JButton; -import javax.swing.JComponent; -import javax.swing.JDialog; -import javax.swing.JLabel; -import javax.swing.JPanel; -import javax.swing.JTextField; -import javax.swing.KeyStroke; - -public class LibroAgregarStockDialog extends JDialog { - - private JPanel contentPane; - private JButton buttonOK; - private JButton buttonCancel; - private JTextField serieField; - - private String serie; - - public LibroAgregarStockDialog() { - setContentPane(contentPane); - setModal(true); - getRootPane().setDefaultButton(buttonOK); - - buttonOK.addActionListener(e -> onOK()); - buttonCancel.addActionListener(e -> onCancel()); - - setDefaultCloseOperation(DO_NOTHING_ON_CLOSE); - addWindowListener(new WindowAdapter() { - public void windowClosing(WindowEvent e) { - onCancel(); - } - }); - - contentPane.registerKeyboardAction(e -> onCancel(), KeyStroke.getKeyStroke(KeyEvent.VK_ESCAPE, 0), JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT); - } - - private void onOK() { - this.serie = this.serieField.getText(); - dispose(); - } - - private void onCancel() { - dispose(); - } - - public String getSerie() { - return this.serie; - } - - { -// 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$$$() { - contentPane = new JPanel(); - contentPane.setLayout(new GridLayoutManager(2, 1, new Insets(10, 10, 10, 10), -1, -1)); - final JPanel panel1 = new JPanel(); - panel1.setLayout(new GridLayoutManager(1, 2, new Insets(0, 0, 0, 0), -1, -1)); - contentPane.add(panel1, new GridConstraints(1, 0, 1, 1, GridConstraints.ANCHOR_CENTER, GridConstraints.FILL_BOTH, - GridConstraints.SIZEPOLICY_CAN_SHRINK | GridConstraints.SIZEPOLICY_CAN_GROW, 1, null, null, null, 0, false)); - final Spacer spacer1 = new Spacer(); - panel1.add(spacer1, - new GridConstraints(0, 0, 1, 1, GridConstraints.ANCHOR_CENTER, GridConstraints.FILL_HORIZONTAL, GridConstraints.SIZEPOLICY_WANT_GROW, 1, null, - null, null, 0, false)); - final JPanel panel2 = new JPanel(); - panel2.setLayout(new GridLayoutManager(1, 2, new Insets(0, 0, 0, 0), -1, -1, true, false)); - panel1.add(panel2, new GridConstraints(0, 1, 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)); - buttonOK = new JButton(); - buttonOK.setText("OK"); - panel2.add(buttonOK, 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)); - buttonCancel = new JButton(); - buttonCancel.setText("Cancel"); - panel2.add(buttonCancel, new GridConstraints(0, 1, 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 JPanel panel3 = new JPanel(); - panel3.setLayout(new GridLayoutManager(3, 1, new Insets(0, 0, 0, 0), -1, -1)); - contentPane.add(panel3, 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)); - final JLabel label1 = new JLabel(); - label1.setText("Numero de Serie:"); - panel3.add(label1, new GridConstraints(0, 0, 1, 1, GridConstraints.ANCHOR_WEST, GridConstraints.FILL_NONE, GridConstraints.SIZEPOLICY_FIXED, - GridConstraints.SIZEPOLICY_FIXED, null, null, null, 0, false)); - serieField = new JTextField(); - panel3.add(serieField, - new GridConstraints(1, 0, 1, 1, GridConstraints.ANCHOR_WEST, GridConstraints.FILL_HORIZONTAL, GridConstraints.SIZEPOLICY_WANT_GROW, - GridConstraints.SIZEPOLICY_FIXED, null, new Dimension(150, -1), null, 0, false)); - final Spacer spacer2 = new Spacer(); - panel3.add(spacer2, - new GridConstraints(2, 0, 1, 1, GridConstraints.ANCHOR_CENTER, GridConstraints.FILL_VERTICAL, 1, GridConstraints.SIZEPOLICY_WANT_GROW, null, - null, null, 0, false)); - } - - /** - * @noinspection ALL - */ - public JComponent $$$getRootComponent$$$() { - return contentPane; - } -} diff --git a/src/main/java/xyz/danielcortes/views/libro/LibroSearchPanel.form b/src/main/java/xyz/danielcortes/views/libro/LibroSearchPanel.form index ea99ffa..bd9f356 100644 --- a/src/main/java/xyz/danielcortes/views/libro/LibroSearchPanel.form +++ b/src/main/java/xyz/danielcortes/views/libro/LibroSearchPanel.form @@ -51,7 +51,7 @@ - + @@ -80,23 +80,13 @@ - - - - - - - - - - - + diff --git a/src/main/java/xyz/danielcortes/views/libro/LibroSearchPanel.java b/src/main/java/xyz/danielcortes/views/libro/LibroSearchPanel.java index 308cc94..2cc7632 100644 --- a/src/main/java/xyz/danielcortes/views/libro/LibroSearchPanel.java +++ b/src/main/java/xyz/danielcortes/views/libro/LibroSearchPanel.java @@ -11,9 +11,9 @@ import javax.swing.JScrollPane; import javax.swing.JTable; import javax.swing.JTextField; import javax.swing.ListSelectionModel; +import xyz.danielcortes.framework.BasePanel; import xyz.danielcortes.framework.BaseTableModel; import xyz.danielcortes.models.Libro; -import xyz.danielcortes.framework.BasePanel; public class LibroSearchPanel extends BasePanel { @@ -25,7 +25,6 @@ public class LibroSearchPanel extends BasePanel { private JButton verButton; private JButton editarButton; private JButton eliminarButton; - private JButton agregarStockButton; private JButton crearButton; public JTable getLibrosTable() { @@ -60,10 +59,6 @@ public class LibroSearchPanel extends BasePanel { return eliminarButton; } - public JButton getAgregarStockButton() { - return agregarStockButton; - } - public JButton getCrearButton() { return crearButton; } @@ -127,7 +122,7 @@ public class LibroSearchPanel extends BasePanel { GridConstraints.SIZEPOLICY_CAN_SHRINK | GridConstraints.SIZEPOLICY_CAN_GROW, GridConstraints.SIZEPOLICY_FIXED, null, new Dimension(150, -1), null, 0, false)); final JPanel panel2 = new JPanel(); - panel2.setLayout(new GridLayoutManager(1, 5, new Insets(0, 0, 0, 0), -1, -1)); + panel2.setLayout(new GridLayoutManager(1, 4, new Insets(0, 0, 0, 0), -1, -1)); contentPane.add(panel2, new GridConstraints(2, 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)); @@ -143,12 +138,7 @@ public class LibroSearchPanel extends BasePanel { null, 0, false)); eliminarButton = new JButton(); eliminarButton.setText("Eliminar"); - panel2.add(eliminarButton, new GridConstraints(0, 4, 1, 1, GridConstraints.ANCHOR_CENTER, GridConstraints.FILL_NONE, - GridConstraints.SIZEPOLICY_CAN_SHRINK | GridConstraints.SIZEPOLICY_CAN_GROW, GridConstraints.SIZEPOLICY_FIXED, null, new Dimension(150, -1), - null, 0, false)); - agregarStockButton = new JButton(); - agregarStockButton.setText("Agregar Stock"); - panel2.add(agregarStockButton, new GridConstraints(0, 3, 1, 1, GridConstraints.ANCHOR_CENTER, GridConstraints.FILL_NONE, + panel2.add(eliminarButton, new GridConstraints(0, 3, 1, 1, GridConstraints.ANCHOR_CENTER, GridConstraints.FILL_NONE, GridConstraints.SIZEPOLICY_CAN_SHRINK | GridConstraints.SIZEPOLICY_CAN_GROW, GridConstraints.SIZEPOLICY_FIXED, null, new Dimension(150, -1), null, 0, false)); crearButton = new JButton(); diff --git a/src/main/java/xyz/danielcortes/views/trabajador/TrabajadorViewPanel.java b/src/main/java/xyz/danielcortes/views/trabajador/TrabajadorViewPanel.java index aa93b3e..0aa8157 100644 --- a/src/main/java/xyz/danielcortes/views/trabajador/TrabajadorViewPanel.java +++ b/src/main/java/xyz/danielcortes/views/trabajador/TrabajadorViewPanel.java @@ -128,6 +128,7 @@ public class TrabajadorViewPanel extends BasePanel { contentPane.add(label5, new GridConstraints(8, 1, 1, 1, GridConstraints.ANCHOR_WEST, GridConstraints.FILL_NONE, GridConstraints.SIZEPOLICY_FIXED, GridConstraints.SIZEPOLICY_FIXED, null, null, null, 0, false)); rutField = new JTextField(); + rutField.setEditable(false); contentPane.add(rutField, new GridConstraints(1, 1, 1, 1, GridConstraints.ANCHOR_WEST, GridConstraints.FILL_HORIZONTAL, GridConstraints.SIZEPOLICY_WANT_GROW, GridConstraints.SIZEPOLICY_FIXED, null, new Dimension(150, -1), null, 0, false)); @@ -140,6 +141,7 @@ public class TrabajadorViewPanel extends BasePanel { contentPane.add(label6, new GridConstraints(10, 1, 1, 1, GridConstraints.ANCHOR_WEST, GridConstraints.FILL_NONE, GridConstraints.SIZEPOLICY_FIXED, GridConstraints.SIZEPOLICY_FIXED, null, null, null, 0, false)); usernameField = new JTextField(); + usernameField.setEditable(false); contentPane.add(usernameField, new GridConstraints(11, 1, 1, 1, GridConstraints.ANCHOR_WEST, GridConstraints.FILL_HORIZONTAL, GridConstraints.SIZEPOLICY_WANT_GROW, GridConstraints.SIZEPOLICY_FIXED, null, new Dimension(150, -1), null, 0, false));