diff --git a/src/main/java/xyz/danielcortes/controllers/categoria/CategoriaSearchController.java b/src/main/java/xyz/danielcortes/controllers/categoria/CategoriaSearchController.java index dc3379f..58e38cc 100644 --- a/src/main/java/xyz/danielcortes/controllers/categoria/CategoriaSearchController.java +++ b/src/main/java/xyz/danielcortes/controllers/categoria/CategoriaSearchController.java @@ -114,12 +114,13 @@ public class CategoriaSearchController extends BaseController { public void reload() { this.loadCategoriaTable(); + this.view.getCategoriaTable().setRowSelectionInterval(0, 0); + this.view.getSearchField().requestFocus(); } @Override public void show() { this.reload(); - this.view.getCategoriaTable().clearSelection(); } @Override diff --git a/src/main/java/xyz/danielcortes/controllers/cliente/ClienteSearchController.java b/src/main/java/xyz/danielcortes/controllers/cliente/ClienteSearchController.java index 2a7ab21..7a3091b 100644 --- a/src/main/java/xyz/danielcortes/controllers/cliente/ClienteSearchController.java +++ b/src/main/java/xyz/danielcortes/controllers/cliente/ClienteSearchController.java @@ -113,6 +113,8 @@ public class ClienteSearchController extends BaseController { private void reload() { this.loadClienteTable(); + this.view.getClienteTable().setRowSelectionInterval(0, 0); + this.view.getSearchField().requestFocus(); } private void loadClienteTable() { @@ -123,7 +125,6 @@ public class ClienteSearchController extends BaseController { @Override public void show() { this.reload(); - this.view.getClienteTable().clearSelection(); } @Override diff --git a/src/main/java/xyz/danielcortes/controllers/distribuidor/DistribuidorCreateController.java b/src/main/java/xyz/danielcortes/controllers/distribuidor/DistribuidorCreateController.java index ec51832..7c4865c 100644 --- a/src/main/java/xyz/danielcortes/controllers/distribuidor/DistribuidorCreateController.java +++ b/src/main/java/xyz/danielcortes/controllers/distribuidor/DistribuidorCreateController.java @@ -60,6 +60,7 @@ public class DistribuidorCreateController extends BaseController { @Override public void show() { this.fillEmpresasCombobox(); + this.view.getEmpresaCombobox().setSelectedIndex(0); this.view.getRutField().requestFocus(); } diff --git a/src/main/java/xyz/danielcortes/controllers/distribuidor/DistribuidorSearchController.java b/src/main/java/xyz/danielcortes/controllers/distribuidor/DistribuidorSearchController.java index 128e73c..79f3c9a 100644 --- a/src/main/java/xyz/danielcortes/controllers/distribuidor/DistribuidorSearchController.java +++ b/src/main/java/xyz/danielcortes/controllers/distribuidor/DistribuidorSearchController.java @@ -114,6 +114,8 @@ public class DistribuidorSearchController extends BaseController { private void reload() { this.loadDistribuidorTable(); + this.view.getDistribuidorTable().setRowSelectionInterval(0, 0); + this.view.getSearchField().requestFocus(); } private void loadDistribuidorTable() { @@ -124,7 +126,6 @@ public class DistribuidorSearchController extends BaseController { @Override public void show() { this.reload(); - this.view.getDistribuidorTable().clearSelection(); } @Override diff --git a/src/main/java/xyz/danielcortes/controllers/editorial/EditorialSearchController.java b/src/main/java/xyz/danielcortes/controllers/editorial/EditorialSearchController.java index 6c9103c..6b77d04 100644 --- a/src/main/java/xyz/danielcortes/controllers/editorial/EditorialSearchController.java +++ b/src/main/java/xyz/danielcortes/controllers/editorial/EditorialSearchController.java @@ -112,6 +112,8 @@ public class EditorialSearchController extends BaseController { public void reload() { this.loadEditorialTable(); + this.view.getEditorialTable().setRowSelectionInterval(0, 0); + this.view.getBuscarField().requestFocus(); } @Override diff --git a/src/main/java/xyz/danielcortes/controllers/editorial/EditorialUpdateController.java b/src/main/java/xyz/danielcortes/controllers/editorial/EditorialUpdateController.java index 0532a83..deab762 100644 --- a/src/main/java/xyz/danielcortes/controllers/editorial/EditorialUpdateController.java +++ b/src/main/java/xyz/danielcortes/controllers/editorial/EditorialUpdateController.java @@ -28,6 +28,7 @@ public class EditorialUpdateController extends BaseController { private void setupListeners() { this.view.getNombreField().addActionListener(e -> this.update()); this.view.getActualizarButton().addActionListener(e -> this.update()); + this.view.getVolverButton().addActionListener(e -> this.parentController.showCard(PanelName.EDITORIAL_SEARCH)); } private void update() { diff --git a/src/main/java/xyz/danielcortes/controllers/empresa/EmpresaSearchController.java b/src/main/java/xyz/danielcortes/controllers/empresa/EmpresaSearchController.java index 22633e7..5f9d26c 100644 --- a/src/main/java/xyz/danielcortes/controllers/empresa/EmpresaSearchController.java +++ b/src/main/java/xyz/danielcortes/controllers/empresa/EmpresaSearchController.java @@ -106,6 +106,8 @@ public class EmpresaSearchController extends BaseController { public void reload() { this.loadEmpresaTable(); + this.view.getEmpresaTable().setRowSelectionInterval(0, 0); + this.view.getBuscarField().requestFocus(); } @Override diff --git a/src/main/java/xyz/danielcortes/controllers/empresa/EmpresaUpdateController.java b/src/main/java/xyz/danielcortes/controllers/empresa/EmpresaUpdateController.java index efa3405..80b7e10 100644 --- a/src/main/java/xyz/danielcortes/controllers/empresa/EmpresaUpdateController.java +++ b/src/main/java/xyz/danielcortes/controllers/empresa/EmpresaUpdateController.java @@ -28,6 +28,7 @@ public class EmpresaUpdateController extends BaseController { private void setupListeners() { this.view.getNombreField().addActionListener(e -> this.update()); this.view.getActualizarButton().addActionListener(e -> this.update()); + this.view.getVolverButton().addActionListener(e -> this.getParentController().showCard(PanelName.EMPRESA_SEARCH)); } private void update() { diff --git a/src/main/java/xyz/danielcortes/controllers/trabajador/TrabajadorSearchController.java b/src/main/java/xyz/danielcortes/controllers/trabajador/TrabajadorSearchController.java index 6fc4f3c..d497a59 100644 --- a/src/main/java/xyz/danielcortes/controllers/trabajador/TrabajadorSearchController.java +++ b/src/main/java/xyz/danielcortes/controllers/trabajador/TrabajadorSearchController.java @@ -120,6 +120,8 @@ public class TrabajadorSearchController extends BaseController { private void reload() { this.loadTrabajadorTable(); + this.view.getSearchField().requestFocus(); + this.view.getTrabajadorTable().setRowSelectionInterval(0, 0); } private void loadTrabajadorTable() { @@ -130,7 +132,6 @@ public class TrabajadorSearchController extends BaseController { @Override public void show() { this.reload(); - this.view.getTrabajadorTable().clearSelection(); } @Override diff --git a/src/main/java/xyz/danielcortes/controllers/trabajador/TrabajadorViewController.java b/src/main/java/xyz/danielcortes/controllers/trabajador/TrabajadorViewController.java index 8bbeca0..a8afcd2 100644 --- a/src/main/java/xyz/danielcortes/controllers/trabajador/TrabajadorViewController.java +++ b/src/main/java/xyz/danielcortes/controllers/trabajador/TrabajadorViewController.java @@ -87,7 +87,7 @@ public class TrabajadorViewController extends BaseController { this.view.getNombreField().setText(this.trabajador.getNombre()); this.view.getApellidoPaternoField().setText(this.trabajador.getApellidoPaterno()); this.view.getApellidoMaternoField().setText(this.trabajador.getApellidoMaterno()); - this.view.getFechaContratoPicker().setDate(this.trabajador.getFechaContrato()); + this.view.getFechaContratoField().setText(this.trabajador.getFechaContrato().toString()); } @Override diff --git a/src/main/java/xyz/danielcortes/views/cliente/ClienteViewPanel.form b/src/main/java/xyz/danielcortes/views/cliente/ClienteViewPanel.form index b6cc580..b9d3e32 100644 --- a/src/main/java/xyz/danielcortes/views/cliente/ClienteViewPanel.form +++ b/src/main/java/xyz/danielcortes/views/cliente/ClienteViewPanel.form @@ -162,7 +162,9 @@ - + + + diff --git a/src/main/java/xyz/danielcortes/views/cliente/ClienteViewPanel.java b/src/main/java/xyz/danielcortes/views/cliente/ClienteViewPanel.java index 6ca344c..bc0630c 100644 --- a/src/main/java/xyz/danielcortes/views/cliente/ClienteViewPanel.java +++ b/src/main/java/xyz/danielcortes/views/cliente/ClienteViewPanel.java @@ -162,6 +162,7 @@ public class ClienteViewPanel extends BasePanel { GridConstraints.SIZEPOLICY_CAN_SHRINK | GridConstraints.SIZEPOLICY_CAN_GROW, GridConstraints.SIZEPOLICY_FIXED, null, new Dimension(150, -1), null, 0, false)); fechaNacimientoField = new JTextField(); + fechaNacimientoField.setEditable(false); contentPane.add(fechaNacimientoField, new GridConstraints(9, 1, 1, 1, GridConstraints.ANCHOR_WEST, GridConstraints.FILL_HORIZONTAL, GridConstraints.SIZEPOLICY_WANT_GROW, GridConstraints.SIZEPOLICY_FIXED, null, new Dimension(150, -1), null, 0, false)); diff --git a/src/main/java/xyz/danielcortes/views/editorial/EditorialUpdatePanel.form b/src/main/java/xyz/danielcortes/views/editorial/EditorialUpdatePanel.form index 5821d22..ad02dda 100644 --- a/src/main/java/xyz/danielcortes/views/editorial/EditorialUpdatePanel.form +++ b/src/main/java/xyz/danielcortes/views/editorial/EditorialUpdatePanel.form @@ -3,7 +3,7 @@ - + @@ -39,16 +39,36 @@ - + + - - - + - - - - + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/main/java/xyz/danielcortes/views/editorial/EditorialUpdatePanel.java b/src/main/java/xyz/danielcortes/views/editorial/EditorialUpdatePanel.java index 058efc9..1a45181 100644 --- a/src/main/java/xyz/danielcortes/views/editorial/EditorialUpdatePanel.java +++ b/src/main/java/xyz/danielcortes/views/editorial/EditorialUpdatePanel.java @@ -17,6 +17,7 @@ public class EditorialUpdatePanel extends BasePanel { private JPanel contentPane; private JTextField nombreField; private JButton actualizarButton; + private JButton volverButton; { // GUI initializer generated by IntelliJ IDEA GUI Designer @@ -38,6 +39,10 @@ public class EditorialUpdatePanel extends BasePanel { return this.actualizarButton; } + public JButton getVolverButton() { + return this.volverButton; + } + /** * Method generated by IntelliJ IDEA GUI Designer >>> IMPORTANT!! <<< DO NOT edit this method OR call it in your code! * @@ -66,9 +71,19 @@ public class EditorialUpdatePanel extends BasePanel { contentPane.add(spacer3, new GridConstraints(3, 0, 1, 1, GridConstraints.ANCHOR_CENTER, GridConstraints.FILL_HORIZONTAL, GridConstraints.SIZEPOLICY_WANT_GROW, 1, null, null, null, 0, false)); + final JPanel panel1 = new JPanel(); + panel1.setLayout(new GridLayoutManager(1, 2, new Insets(0, 0, 0, 0), -1, -1)); + contentPane.add(panel1, new GridConstraints(2, 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)); actualizarButton = new JButton(); actualizarButton.setText("Actualizar"); - contentPane.add(actualizarButton, new GridConstraints(2, 1, 1, 1, GridConstraints.ANCHOR_CENTER, GridConstraints.FILL_NONE, + panel1.add(actualizarButton, new GridConstraints(0, 0, 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)); + volverButton = new JButton(); + volverButton.setText("Volver"); + panel1.add(volverButton, new GridConstraints(0, 1, 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)); } diff --git a/src/main/java/xyz/danielcortes/views/empresa/EmpresaUpdatePanel.form b/src/main/java/xyz/danielcortes/views/empresa/EmpresaUpdatePanel.form index 6a9479f..19ae005 100644 --- a/src/main/java/xyz/danielcortes/views/empresa/EmpresaUpdatePanel.form +++ b/src/main/java/xyz/danielcortes/views/empresa/EmpresaUpdatePanel.form @@ -3,7 +3,7 @@ - + @@ -39,16 +39,36 @@ - + + - - - + - - - - + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/main/java/xyz/danielcortes/views/empresa/EmpresaUpdatePanel.java b/src/main/java/xyz/danielcortes/views/empresa/EmpresaUpdatePanel.java index fd96d93..95a3a3d 100644 --- a/src/main/java/xyz/danielcortes/views/empresa/EmpresaUpdatePanel.java +++ b/src/main/java/xyz/danielcortes/views/empresa/EmpresaUpdatePanel.java @@ -17,6 +17,7 @@ public class EmpresaUpdatePanel extends BasePanel { private JPanel contentPane; private JTextField nombreField; private JButton actualizarButton; + private JButton volverButton; { // GUI initializer generated by IntelliJ IDEA GUI Designer @@ -38,6 +39,10 @@ public class EmpresaUpdatePanel extends BasePanel { return this.actualizarButton; } + public JButton getVolverButton() { + return this.volverButton; + } + /** * Method generated by IntelliJ IDEA GUI Designer >>> IMPORTANT!! <<< DO NOT edit this method OR call it in your code! * @@ -66,9 +71,19 @@ public class EmpresaUpdatePanel extends BasePanel { contentPane.add(spacer3, new GridConstraints(3, 0, 1, 1, GridConstraints.ANCHOR_CENTER, GridConstraints.FILL_HORIZONTAL, GridConstraints.SIZEPOLICY_WANT_GROW, 1, null, null, null, 0, false)); + final JPanel panel1 = new JPanel(); + panel1.setLayout(new GridLayoutManager(1, 2, new Insets(0, 0, 0, 0), -1, -1)); + contentPane.add(panel1, new GridConstraints(2, 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)); actualizarButton = new JButton(); actualizarButton.setText("Actualizar"); - contentPane.add(actualizarButton, new GridConstraints(2, 1, 1, 1, GridConstraints.ANCHOR_CENTER, GridConstraints.FILL_NONE, + panel1.add(actualizarButton, new GridConstraints(0, 0, 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)); + volverButton = new JButton(); + volverButton.setText("Volver"); + panel1.add(volverButton, new GridConstraints(0, 1, 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)); } diff --git a/src/main/java/xyz/danielcortes/views/trabajador/TrabajadorViewPanel.form b/src/main/java/xyz/danielcortes/views/trabajador/TrabajadorViewPanel.form index d6cab0a..959f8b3 100644 --- a/src/main/java/xyz/danielcortes/views/trabajador/TrabajadorViewPanel.form +++ b/src/main/java/xyz/danielcortes/views/trabajador/TrabajadorViewPanel.form @@ -116,12 +116,6 @@ - - - - - - @@ -172,6 +166,16 @@ + + + + + + + + + + diff --git a/src/main/java/xyz/danielcortes/views/trabajador/TrabajadorViewPanel.java b/src/main/java/xyz/danielcortes/views/trabajador/TrabajadorViewPanel.java index 700b042..35fd98c 100644 --- a/src/main/java/xyz/danielcortes/views/trabajador/TrabajadorViewPanel.java +++ b/src/main/java/xyz/danielcortes/views/trabajador/TrabajadorViewPanel.java @@ -1,6 +1,5 @@ package xyz.danielcortes.views.trabajador; -import com.github.lgooddatepicker.components.DatePicker; import com.intellij.uiDesigner.core.GridConstraints; import com.intellij.uiDesigner.core.GridLayoutManager; import com.intellij.uiDesigner.core.Spacer; @@ -21,11 +20,11 @@ public class TrabajadorViewPanel extends BasePanel { private JButton volverButton; private JPanel contentPane; private JTextField rutField; - private DatePicker fechaContratoPicker; private JButton usuarioButton; private JButton direccionesButton; private JButton correosButton; private JButton telefonosButton; + private JTextField fechaContratoField; { // GUI initializer generated by IntelliJ IDEA GUI Designer @@ -59,10 +58,6 @@ public class TrabajadorViewPanel extends BasePanel { return this.rutField; } - public DatePicker getFechaContratoPicker() { - return this.fechaContratoPicker; - } - public JButton getUsuarioButton() { return this.usuarioButton; } @@ -79,6 +74,10 @@ public class TrabajadorViewPanel extends BasePanel { return this.telefonosButton; } + public JTextField getFechaContratoField() { + return this.fechaContratoField; + } + /** * Method generated by IntelliJ IDEA GUI Designer >>> IMPORTANT!! <<< DO NOT edit this method OR call it in your code! * @@ -147,10 +146,6 @@ public class TrabajadorViewPanel extends BasePanel { 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)); - fechaContratoPicker = new DatePicker(); - contentPane.add(fechaContratoPicker, - new GridConstraints(9, 1, 1, 1, GridConstraints.ANCHOR_CENTER, GridConstraints.FILL_HORIZONTAL, GridConstraints.SIZEPOLICY_WANT_GROW, - GridConstraints.SIZEPOLICY_FIXED, null, null, null, 0, false)); final JPanel panel1 = new JPanel(); panel1.setLayout(new GridLayoutManager(1, 4, new Insets(0, 0, 0, 0), -1, -1)); contentPane.add(panel1, new GridConstraints(10, 1, 1, 1, GridConstraints.ANCHOR_CENTER, GridConstraints.FILL_BOTH, @@ -176,6 +171,11 @@ public class TrabajadorViewPanel extends BasePanel { panel1.add(telefonosButton, new GridConstraints(0, 2, 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)); + fechaContratoField = new JTextField(); + fechaContratoField.setEditable(false); + contentPane.add(fechaContratoField, + new GridConstraints(9, 1, 1, 1, GridConstraints.ANCHOR_WEST, GridConstraints.FILL_HORIZONTAL, GridConstraints.SIZEPOLICY_WANT_GROW, + GridConstraints.SIZEPOLICY_FIXED, null, new Dimension(400, -1), null, 0, false)); } /** diff --git a/src/main/resources/META-INF/persistence.xml b/src/main/resources/META-INF/persistence.xml index f6a3eba..a69ef74 100644 --- a/src/main/resources/META-INF/persistence.xml +++ b/src/main/resources/META-INF/persistence.xml @@ -13,7 +13,7 @@ - +