diff --git a/src/main/java/xyz/danielcortes/controllers/correo/CorreoCreateController.java b/src/main/java/xyz/danielcortes/controllers/correo/CorreoCreateController.java index afc4cbd..810a029 100644 --- a/src/main/java/xyz/danielcortes/controllers/correo/CorreoCreateController.java +++ b/src/main/java/xyz/danielcortes/controllers/correo/CorreoCreateController.java @@ -34,6 +34,7 @@ public class CorreoCreateController extends BaseController { @Override public void show() { this.view.getCorreoField().requestFocus(); + this.view.getCorreoField().setText(""); } @Override @@ -46,6 +47,7 @@ public class CorreoCreateController extends BaseController { } private void setupListeners() { + this.view.getCorreoField().addActionListener(e -> save()); this.view.getGuardarButton().addActionListener(e -> save()); this.view.getVolverButton().addActionListener(e -> volver()); } diff --git a/src/main/java/xyz/danielcortes/controllers/correo/CorreoUpdateController.java b/src/main/java/xyz/danielcortes/controllers/correo/CorreoUpdateController.java index 497cf75..fcd0a6f 100644 --- a/src/main/java/xyz/danielcortes/controllers/correo/CorreoUpdateController.java +++ b/src/main/java/xyz/danielcortes/controllers/correo/CorreoUpdateController.java @@ -56,25 +56,26 @@ public class CorreoUpdateController extends BaseController { } private void setupListeners() { + this.view.getCorreoField().addActionListener(e -> update()); this.view.getActualizarButton().addActionListener(e -> update()); this.view.getVolverButton().addActionListener(e -> volver()); } private void update() { - String correo = this.view.getCorreoField().getText(); + String sCorreo = this.view.getCorreoField().getText(); ValidationResult originalValidation = this.validator.validateOriginal(this.correo); if (originalValidation.hasError()) { originalValidation.showErrorDialog(); return; } - ValidationResult correoValidation = this.validator.validateCorreo(correo); + ValidationResult correoValidation = this.validator.validateCorreo(sCorreo); if(correoValidation.hasError()) { correoValidation.showErrorDialog(); return; } - this.correo.setCorreo(correo); + this.correo.setCorreo(sCorreo); this.repository.update(this.correo); this.volver(); diff --git a/src/main/java/xyz/danielcortes/controllers/direccion/DireccionCreateController.java b/src/main/java/xyz/danielcortes/controllers/direccion/DireccionCreateController.java index 2c06116..84006a2 100644 --- a/src/main/java/xyz/danielcortes/controllers/direccion/DireccionCreateController.java +++ b/src/main/java/xyz/danielcortes/controllers/direccion/DireccionCreateController.java @@ -34,6 +34,8 @@ public class DireccionCreateController extends BaseController { @Override public void show() { this.view.getCalleField().requestFocus(); + this.view.getCalleField().setText(""); + this.view.getNumeroField().setText(""); } @Override diff --git a/src/main/java/xyz/danielcortes/controllers/direccion/DireccionSearchController.java b/src/main/java/xyz/danielcortes/controllers/direccion/DireccionSearchController.java index 42510e6..e6d708b 100644 --- a/src/main/java/xyz/danielcortes/controllers/direccion/DireccionSearchController.java +++ b/src/main/java/xyz/danielcortes/controllers/direccion/DireccionSearchController.java @@ -44,7 +44,7 @@ public class DireccionSearchController extends BaseController { } public void reload() { - this.loadDireccionsTable(); + this.loadDireccionesTable(); this.view.getDireccionesTable().clearSelection(); } @@ -107,7 +107,7 @@ public class DireccionSearchController extends BaseController { private void search() { String term = this.view.getSearchField().getText(); List direccion = this.direccionRepository.search(term, trabajador); - this.loadDireccionsTable(direccion); + this.loadDireccionesTable(direccion); } private void volver() { @@ -116,12 +116,12 @@ public class DireccionSearchController extends BaseController { this.getParentController().showCard(PanelName.TRABAJADOR_VIEW); } - private void loadDireccionsTable() { + private void loadDireccionesTable() { List direccions = this.trabajador.getDirecciones(); - loadDireccionsTable(direccions); + loadDireccionesTable(direccions); } - private void loadDireccionsTable(List direccions) { + private void loadDireccionesTable(List direccions) { BaseTableModel model = this.view.getDireccionModel(); model.setRows(direccions); } @@ -131,7 +131,7 @@ public class DireccionSearchController extends BaseController { if (selectedRow == -1) { JOptionPane.showMessageDialog( null, - "No hay direccion seleccionado", + "No hay direccion seleccionada", "Error", JOptionPane.ERROR_MESSAGE ); diff --git a/src/main/java/xyz/danielcortes/controllers/direccion/DireccionUpdateController.java b/src/main/java/xyz/danielcortes/controllers/direccion/DireccionUpdateController.java index 8105ccd..1628821 100644 --- a/src/main/java/xyz/danielcortes/controllers/direccion/DireccionUpdateController.java +++ b/src/main/java/xyz/danielcortes/controllers/direccion/DireccionUpdateController.java @@ -57,6 +57,7 @@ public class DireccionUpdateController extends BaseController { } private void setupListeners() { + this.view.getNumeroField().addActionListener(e -> update()); this.view.getActualizarButton().addActionListener(e -> update()); this.view.getVolverButton().addActionListener(e -> volver()); } diff --git a/src/main/java/xyz/danielcortes/controllers/telefono/TelefonoCreateController.java b/src/main/java/xyz/danielcortes/controllers/telefono/TelefonoCreateController.java index fdb82cb..4b0d75f 100644 --- a/src/main/java/xyz/danielcortes/controllers/telefono/TelefonoCreateController.java +++ b/src/main/java/xyz/danielcortes/controllers/telefono/TelefonoCreateController.java @@ -34,6 +34,7 @@ public class TelefonoCreateController extends BaseController { @Override public void show() { this.view.getNumeroField().requestFocus(); + this.view.getNumeroField().setText(""); } @Override @@ -46,6 +47,7 @@ public class TelefonoCreateController extends BaseController { } private void setupListeners() { + this.view.getNumeroField().addActionListener(e -> save()); this.view.getGuardarButton().addActionListener(e -> save()); this.view.getVolverButton().addActionListener(e -> volver()); } @@ -65,7 +67,6 @@ public class TelefonoCreateController extends BaseController { this.repository.save(telefono); this.trabajador.getTelefonos().add(telefono); - this.volver(); } diff --git a/src/main/java/xyz/danielcortes/controllers/telefono/TelefonoUpdateController.java b/src/main/java/xyz/danielcortes/controllers/telefono/TelefonoUpdateController.java index 2cc32c3..49facca 100644 --- a/src/main/java/xyz/danielcortes/controllers/telefono/TelefonoUpdateController.java +++ b/src/main/java/xyz/danielcortes/controllers/telefono/TelefonoUpdateController.java @@ -56,6 +56,7 @@ public class TelefonoUpdateController extends BaseController { } private void setupListeners() { + this.view.getTelefonoField().addActionListener(e -> update()); this.view.getActualizarButton().addActionListener(e -> update()); this.view.getVolverButton().addActionListener(e -> volver()); }