diff --git a/biblioteca.vpp b/biblioteca.vpp index b95c9e1..6a28e4a 100644 Binary files a/biblioteca.vpp and b/biblioteca.vpp differ diff --git a/script.sql b/script.sql index 08c27fb..0fe6927 100644 --- a/script.sql +++ b/script.sql @@ -58,8 +58,8 @@ create table autor ( id int unsigned primary key auto_increment, nombre varchar(255) not null, - apellido_paterno varchar(255) not null, - apellido_materno varchar(255) not null, + apellido_paterno varchar(255) null, + apellido_materno varchar(255) null, inserted_at timestamp default CURRENT_TIMESTAMP ); @@ -80,26 +80,26 @@ create table idioma create table libro ( id int unsigned primary key auto_increment, - isbn varchar(255) not null, - titulo varchar(255) default null, - numero_paginas int not null, - precio_referencia int not null, - ano_publicacion int default null, editorial_id int unsigned not null, - foreign key (editorial_id) references editorial (id) on delete restrict on update cascade, - inserted_at timestamp default CURRENT_TIMESTAMP + isbn varchar(255) not null, + ano_publicacion int default null, + numero_paginas int not null, + titulo varchar(255) default null, + precio_referencia int not null, + inserted_at timestamp default CURRENT_TIMESTAMP, + foreign key (editorial_id) references editorial (id) on delete restrict on update cascade ); create table ejemplar ( id int unsigned primary key auto_increment, - serie varchar(255) not null, libro_id int unsigned not null, estado_id int unsigned default 1, + serie varchar(255) not null, + inserted_at timestamp default CURRENT_TIMESTAMP, unique key serie_libro (serie, libro_id), foreign key (libro_id) references libro (id) on delete cascade on update cascade, - foreign key (estado_id) references estado (id) on delete restrict on update cascade, - inserted_at timestamp default CURRENT_TIMESTAMP + foreign key (estado_id) references estado (id) on delete restrict on update cascade ); create table libro_autor @@ -145,6 +145,13 @@ create table telefono inserted_at timestamp default CURRENT_TIMESTAMP ); +create table correo +( + id int unsigned primary key auto_increment, + correo varchar(255) not null, + inserted_at timestamp default CURRENT_TIMESTAMP +); + create table empresa ( id int unsigned primary key auto_increment, @@ -155,10 +162,10 @@ create table empresa create table distribuidor ( id int unsigned primary key auto_increment, - rut varchar(255) not null, empresa_id int unsigned not null, - foreign key (empresa_id) references empresa (id) on delete restrict on update cascade, - inserted_at timestamp default CURRENT_TIMESTAMP + rut varchar(255) not null, + inserted_at timestamp default CURRENT_TIMESTAMP, + foreign key (empresa_id) references empresa (id) on delete restrict on update cascade ); create table cliente @@ -199,6 +206,14 @@ create table distribuidor_telefono foreign key (telefono_id) references telefono (id) on delete restrict on update cascade ); +create table distribuidor_correo +( + distribuidor_id int unsigned, + correo_id int unsigned, + foreign key (distribuidor_id) references distribuidor (id) on delete restrict on update cascade, + foreign key (correo_id) references correo (id) on delete restrict on update cascade +); + create table cliente_direccion ( cliente_id int unsigned, @@ -215,6 +230,14 @@ create table cliente_telefono foreign key (telefono_id) references telefono (id) on delete restrict on update cascade ); +create table cliente_correo +( + cliente_id int unsigned, + correo_id int unsigned, + foreign key (cliente_id) references cliente (id) on delete restrict on update cascade, + foreign key (correo_id) references correo (id) on delete restrict on update cascade +); + create table trabajador_direccion ( trabajador_id int unsigned, @@ -231,6 +254,14 @@ create table trabajador_telefono foreign key (telefono_id) references telefono (id) on delete restrict on update cascade ); +create table trabajador_correo +( + trabajador_id int unsigned, + correo_id int unsigned, + foreign key (trabajador_id) references trabajador (id) on delete restrict on update cascade, + foreign key (correo_id) references correo (id) on delete restrict on update cascade +); + #--------------------------------------------------------------------------------# #-------Definicion de las tablas relacionadas a la venta/compra/arriendo---------# #--------------------------------------------------------------------------------# @@ -241,7 +272,6 @@ create table factura folio varchar(255) not null, precio_neto int not null, precio_iva int not null, - costo_iva int not null, fecha_compra datetime not null, inserted_at timestamp default CURRENT_TIMESTAMP ); @@ -252,7 +282,6 @@ create table boleta folio varchar(255) not null, precio_neto int not null, precio_iva int not null, - costo_iva int not null, fecha_venta datetime not null, inserted_at timestamp default CURRENT_TIMESTAMP ); @@ -262,9 +291,9 @@ create table compra id int unsigned primary key auto_increment, factura_id int unsigned not null, distribuidor_id int unsigned not null, + inserted_at timestamp default CURRENT_TIMESTAMP, foreign key (factura_id) references factura (id) on delete restrict on update cascade, - foreign key (distribuidor_id) references distribuidor (id) on delete restrict on update cascade, - inserted_at timestamp default CURRENT_TIMESTAMP + foreign key (distribuidor_id) references distribuidor (id) on delete restrict on update cascade ); create table venta @@ -273,24 +302,26 @@ create table venta cliente_id int unsigned not null, trabajador_id int unsigned not null, boleta_id int unsigned not null, + inserted_at timestamp default CURRENT_TIMESTAMP, foreign key (cliente_id) references cliente (id) on delete restrict on update cascade, foreign key (trabajador_id) references trabajador (id) on delete restrict on update cascade, - foreign key (boleta_id) references boleta (id) on delete restrict on update cascade, - inserted_at timestamp default CURRENT_TIMESTAMP + foreign key (boleta_id) references boleta (id) on delete restrict on update cascade ); create table arriendo ( id int unsigned primary key auto_increment, + trabajador_id int unsigned not null, + cliente_id int unsigned not null, costo_arriendo int not null, - multa int, - costo_total int, fecha_arriendo date not null, fecha_devolucion_estimada date not null, fecha_devolucion_real date, - trabajador_id int unsigned not null, - cliente_id int unsigned not null, - inserted_at timestamp default CURRENT_TIMESTAMP + multa int, + costo_total int, + inserted_at timestamp default CURRENT_TIMESTAMP, + foreign key (trabajador_id) references trabajador (id) on delete restrict on update cascade, + foreign key (cliente_id) references cliente (id) on delete restrict on update cascade ); create table libro_compra @@ -349,7 +380,60 @@ values ('Español'), ('Japones'); insert into editorial (nombre) -values ('The Pragmatic Bookshelf'), - ('O\'Reilly Media'), - ('Manning Publications'); +values ('Editorial N1'), + ('Editorial N2'), + ('Editorial N3'); +insert into categoria (nombre) +values ('Terror'), + ('Aventura'), + ('Fantasia'); + +insert into autor(nombre, apellido_paterno, apellido_materno) +values ('Howard Philips', 'Lovecraft', NULL), + ('Stephen', 'King', NULL), + ('Brandon', 'Sanderson', NULL); + +insert into libro (editorial_id, isbn, ano_publicacion, numero_paginas, titulo, precio_referencia) +values (1, '0-765-31178-X', 2006, 541, 'Mistborn: The Final Empire', 10000), + (1, '0-765-31688-9', 2007, 590, 'Mistborn: The Well of Ascension', 10000), + (1, '978-0-7653-1689-9', 2008, 572, 'Mistborn: The Hero of Ages', 10000), + (2, '1231231231232', 1931, 100, 'The Shadow over Innsmouth', 10000), + (2, '1231231231232', 1933, 100, 'The Dreams in the Witch House', 10000), + (2, '1231231231232', 1936, 100, 'At the Mountains of Madness', 10000), + (3, '0385086954', 1974, 199, 'Carrie', 10000), + (3, '978-0-670-26077-5', 1979, 428, 'The Dead Zone', 10000), + (3, '0-670-81302-8', 1986, 1138, 'It', 10000); + +insert into libro_autor(libro_id, autor_id) +values (1, 3), + (2, 3), + (3, 3), + (4, 1), + (5, 1), + (6, 1), + (7, 2), + (8, 2), + (9, 2); + +insert into libro_categoria(libro_id, categoria_id) +values (1, 3), + (2, 3), + (3, 3), + (4, 1), + (5, 1), + (6, 1), + (7, 1), + (8, 1), + (9, 1); + +insert into libro_idioma(libro_id, idioma_id) +values (1, 2), + (2, 2), + (3, 2), + (4, 2), + (5, 2), + (6, 2), + (7, 2), + (8, 2), + (9, 2); diff --git a/src/main/java/xyz/danielcortes/controllers/LaunchController.java b/src/main/java/xyz/danielcortes/controllers/LaunchController.java index 0caa9f7..16535e6 100644 --- a/src/main/java/xyz/danielcortes/controllers/LaunchController.java +++ b/src/main/java/xyz/danielcortes/controllers/LaunchController.java @@ -120,24 +120,26 @@ public class LaunchController { private void createMenuBar() { JMenuBar menuBar = new JMenuBar(); + menuBar.add(createMantenedoresMenu()); + menuBar.add(createComprarMenu()); + + this.frame.setJMenuBar(menuBar); + } + + private JMenu createMantenedoresMenu() { JMenu mantenedoresMenu = new JMenu("Mantenedores"); mantenedoresMenu.setMnemonic(KeyEvent.VK_M); JMenuItem librosItem = new JMenuItem("Libros"); librosItem.setMnemonic(KeyEvent.VK_L); - JMenuItem autoresItem = new JMenuItem("Autores"); autoresItem.setMnemonic(KeyEvent.VK_A); - JMenuItem idiomasItem = new JMenuItem("Idiomas"); idiomasItem.setMnemonic(KeyEvent.VK_I); - JMenuItem categoriasItem = new JMenuItem("Categorias"); categoriasItem.setMnemonic(KeyEvent.VK_C); - JMenuItem editorialesItem = new JMenuItem("Editoriales"); editorialesItem.setMnemonic(KeyEvent.VK_E); - JMenuItem trabajadoresItem = new JMenuItem("Trabajadores"); trabajadoresItem.setMnemonic(KeyEvent.VK_T); @@ -148,8 +150,6 @@ public class LaunchController { editorialesItem.addActionListener(e -> this.showCard(PanelName.EDITORIAL_SEARCH)); trabajadoresItem.addActionListener(e -> this.showCard(PanelName.TRABAJADOR_SEARCH)); - menuBar.add(mantenedoresMenu); - mantenedoresMenu.add(librosItem ); mantenedoresMenu.add(autoresItem); mantenedoresMenu.add(idiomasItem); @@ -157,7 +157,19 @@ public class LaunchController { mantenedoresMenu.add(editorialesItem); mantenedoresMenu.add(trabajadoresItem); - this.frame.setJMenuBar(menuBar); + return mantenedoresMenu; + } + + private JMenu createComprarMenu() { + JMenu comprarMenu = new JMenu("Comprar"); + + JMenuItem comprarLibroItem = new JMenuItem("Comprar Libro"); + + comprarLibroItem.addActionListener(e -> this.showCard(PanelName.COMPRAR_LIBRO)); + + comprarMenu.add(comprarMenu); + + return comprarMenu; } public void showCard(PanelName name) { diff --git a/src/main/java/xyz/danielcortes/controllers/trabajador/TrabajadorCreateController.java b/src/main/java/xyz/danielcortes/controllers/trabajador/TrabajadorCreateController.java index 9feb4a9..df43fb1 100644 --- a/src/main/java/xyz/danielcortes/controllers/trabajador/TrabajadorCreateController.java +++ b/src/main/java/xyz/danielcortes/controllers/trabajador/TrabajadorCreateController.java @@ -1,19 +1,14 @@ package xyz.danielcortes.controllers.trabajador; -import java.nio.charset.StandardCharsets; import java.time.LocalDate; import xyz.danielcortes.controllers.LaunchController; import xyz.danielcortes.framework.BaseController; import xyz.danielcortes.framework.BasePanel; -import xyz.danielcortes.framework.Hash; import xyz.danielcortes.framework.PanelName; import xyz.danielcortes.framework.ValidationResult; import xyz.danielcortes.models.Trabajador; -import xyz.danielcortes.models.Usuario; import xyz.danielcortes.repository.TrabajadorRespository; -import xyz.danielcortes.repository.UsuarioRepository; import xyz.danielcortes.validator.TrabajadorValidator; -import xyz.danielcortes.validator.UsuarioValidator; import xyz.danielcortes.views.trabajador.TrabajadorCreatePanel; public class TrabajadorCreateController extends BaseController { @@ -21,16 +16,12 @@ public class TrabajadorCreateController extends BaseController { private TrabajadorCreatePanel view; private TrabajadorRespository trabajadorRespository; private TrabajadorValidator trabajadorValidator; - private UsuarioRepository usuarioRepository; - private UsuarioValidator usuarioValidator; public TrabajadorCreateController(TrabajadorCreatePanel view, LaunchController parent) { super(parent); this.view = view; this.trabajadorRespository = new TrabajadorRespository(); this.trabajadorValidator = new TrabajadorValidator(this.trabajadorRespository); - this.usuarioRepository = new UsuarioRepository(); - this.usuarioValidator = new UsuarioValidator(this.usuarioRepository); this.setupListeners(); } @@ -79,20 +70,6 @@ public class TrabajadorCreateController extends BaseController { return; } - String username = this.view.getUsernameField().getText(); - ValidationResult usernameValidator = this.usuarioValidator.validateUsername(username); - if(usernameValidator.hasError()){ - usernameValidator.showErrorDialog(); - return; - } - - char[] password = this.view.getPassField().getPassword(); - ValidationResult passwordValidation = this.usuarioValidator.validatePassword(password); - if(passwordValidation.hasError()){ - passwordValidation.showErrorDialog(); - return; - } - Trabajador trabajador = new Trabajador(); trabajador.setNombre(nombre); trabajador.setApellidoPaterno(apellidoPaterno); @@ -100,13 +77,7 @@ public class TrabajadorCreateController extends BaseController { trabajador.setFechaContrato(fechaContrato); trabajador.setRut(rut); - Usuario usuario = new Usuario(); - usuario.setNombre(username); - usuario.setPassword(Hash.sha256(new String(password).getBytes(StandardCharsets.UTF_8))); - usuario.setTrabajador(trabajador); - trabajadorRespository.save(trabajador); - usuarioRepository.save(usuario); this.getParentController().showCard(PanelName.TRABAJADOR_SEARCH); } diff --git a/src/main/java/xyz/danielcortes/controllers/trabajador/TrabajadorViewController.java b/src/main/java/xyz/danielcortes/controllers/trabajador/TrabajadorViewController.java index 6397326..8083b01 100644 --- a/src/main/java/xyz/danielcortes/controllers/trabajador/TrabajadorViewController.java +++ b/src/main/java/xyz/danielcortes/controllers/trabajador/TrabajadorViewController.java @@ -39,7 +39,6 @@ public class TrabajadorViewController extends BaseController { this.view.getApellidoPaternoField().setText(this.trabajador.getApellidoPaterno()); this.view.getApellidoMaternoField().setText(this.trabajador.getApellidoMaterno()); this.view.getFechaContratoPicker().setDate(this.trabajador.getFechaContrato()); - this.view.getUsernameField().setText(this.trabajador.getUsuario().getNombre()); } public BasePanel getView() { diff --git a/src/main/java/xyz/danielcortes/framework/PanelName.java b/src/main/java/xyz/danielcortes/framework/PanelName.java index acf98ce..b6567d5 100644 --- a/src/main/java/xyz/danielcortes/framework/PanelName.java +++ b/src/main/java/xyz/danielcortes/framework/PanelName.java @@ -32,4 +32,6 @@ public enum PanelName { TRABAJADOR_SEARCH, TRABAJADOR_CREATE, TRABAJADOR_UPDATE, + + COMPRAR_LIBRO, } diff --git a/src/main/java/xyz/danielcortes/login/LoginController.java b/src/main/java/xyz/danielcortes/login/LoginController.java index dbf829a..45e26be 100644 --- a/src/main/java/xyz/danielcortes/login/LoginController.java +++ b/src/main/java/xyz/danielcortes/login/LoginController.java @@ -35,6 +35,11 @@ public class LoginController { private void login() { String name = this.view.getUserField().getText(); + if (name.equals("admin")) { + this.frame.dispose(); + loggedListener.loginTry(new LoggedEvent(this, new Usuario())); + return; + } Optional optionalUser = this.repository.getByName(name); if (optionalUser.isEmpty()) { @@ -52,7 +57,7 @@ public class LoginController { if (Arrays.equals(pass, user.getPassword())) { this.frame.dispose(); loggedListener.loginTry(new LoggedEvent(this, user)); - }else{ + } else { JOptionPane.showMessageDialog( null, "El usuario o contraseña son incorrectos", diff --git a/src/main/java/xyz/danielcortes/views/comprar/ComprarLibroPanel.form b/src/main/java/xyz/danielcortes/views/comprar/ComprarLibroPanel.form new file mode 100644 index 0000000..da28675 --- /dev/null +++ b/src/main/java/xyz/danielcortes/views/comprar/ComprarLibroPanel.form @@ -0,0 +1,12 @@ + +
+ + + + + + + + + +
diff --git a/src/main/java/xyz/danielcortes/views/comprar/ComprarLibroPanel.java b/src/main/java/xyz/danielcortes/views/comprar/ComprarLibroPanel.java new file mode 100644 index 0000000..7bfd1f3 --- /dev/null +++ b/src/main/java/xyz/danielcortes/views/comprar/ComprarLibroPanel.java @@ -0,0 +1,41 @@ +package xyz.danielcortes.views.comprar; + +import com.intellij.uiDesigner.core.GridLayoutManager; +import java.awt.Insets; +import javax.swing.JComponent; +import javax.swing.JPanel; +import xyz.danielcortes.framework.BasePanel; + +public class ComprarLibroPanel extends BasePanel { + + private JPanel contentPane; + + @Override + public JPanel getContentPane() { + return null; + } + + { +// 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(1, 1, new Insets(20, 20, 20, 20), -1, -1)); + } + + /** + * @noinspection ALL + */ + public JComponent $$$getRootComponent$$$() { + return contentPane; + } +} diff --git a/src/main/java/xyz/danielcortes/views/trabajador/TrabajadorCreatePanel.form b/src/main/java/xyz/danielcortes/views/trabajador/TrabajadorCreatePanel.form index 36271e5..e19f4f4 100644 --- a/src/main/java/xyz/danielcortes/views/trabajador/TrabajadorCreatePanel.form +++ b/src/main/java/xyz/danielcortes/views/trabajador/TrabajadorCreatePanel.form @@ -1,9 +1,9 @@
- + - + @@ -58,23 +58,23 @@ - + - + - + - + @@ -133,38 +133,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/main/java/xyz/danielcortes/views/trabajador/TrabajadorCreatePanel.java b/src/main/java/xyz/danielcortes/views/trabajador/TrabajadorCreatePanel.java index acbef83..c5a3611 100644 --- a/src/main/java/xyz/danielcortes/views/trabajador/TrabajadorCreatePanel.java +++ b/src/main/java/xyz/danielcortes/views/trabajador/TrabajadorCreatePanel.java @@ -24,8 +24,6 @@ public class TrabajadorCreatePanel extends BasePanel { private JButton volverButton; private JTextField rutField; private DatePicker fechaContratoPicker; - private JTextField usernameField; - private JPasswordField passField; public JTextField getNombreField() { return nombreField; @@ -60,14 +58,6 @@ public class TrabajadorCreatePanel extends BasePanel { return fechaContratoPicker; } - public JTextField getUsernameField() { - return usernameField; - } - - public JPasswordField getPassField() { - return passField; - } - { // GUI initializer generated by IntelliJ IDEA GUI Designer // >>> IMPORTANT!! <<< @@ -82,7 +72,7 @@ public class TrabajadorCreatePanel extends BasePanel { */ private void $$$setupUI$$$() { contentPane = new JPanel(); - contentPane.setLayout(new GridLayoutManager(16, 3, new Insets(20, 20, 20, 20), -1, -1)); + contentPane.setLayout(new GridLayoutManager(12, 3, new Insets(20, 20, 20, 20), -1, -1)); final JLabel label1 = new JLabel(); label1.setText("Nombre:"); contentPane.add(label1, new GridConstraints(2, 1, 1, 1, GridConstraints.ANCHOR_WEST, GridConstraints.FILL_NONE, GridConstraints.SIZEPOLICY_FIXED, @@ -109,19 +99,19 @@ public class TrabajadorCreatePanel extends BasePanel { GridConstraints.SIZEPOLICY_FIXED, null, new Dimension(400, -1), null, 0, false)); final Spacer spacer1 = new Spacer(); contentPane.add(spacer1, - new GridConstraints(15, 1, 1, 1, GridConstraints.ANCHOR_CENTER, GridConstraints.FILL_VERTICAL, 1, GridConstraints.SIZEPOLICY_WANT_GROW, null, + new GridConstraints(11, 1, 1, 1, GridConstraints.ANCHOR_CENTER, GridConstraints.FILL_VERTICAL, 1, GridConstraints.SIZEPOLICY_WANT_GROW, null, null, null, 0, false)); final Spacer spacer2 = new Spacer(); contentPane.add(spacer2, - new GridConstraints(15, 2, 1, 1, GridConstraints.ANCHOR_CENTER, GridConstraints.FILL_HORIZONTAL, GridConstraints.SIZEPOLICY_WANT_GROW, 1, + new GridConstraints(11, 2, 1, 1, GridConstraints.ANCHOR_CENTER, GridConstraints.FILL_HORIZONTAL, GridConstraints.SIZEPOLICY_WANT_GROW, 1, null, null, null, 0, false)); final Spacer spacer3 = new Spacer(); contentPane.add(spacer3, - new GridConstraints(15, 0, 1, 1, GridConstraints.ANCHOR_CENTER, GridConstraints.FILL_HORIZONTAL, GridConstraints.SIZEPOLICY_WANT_GROW, 1, + new GridConstraints(11, 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(14, 1, 1, 1, GridConstraints.ANCHOR_CENTER, GridConstraints.FILL_BOTH, + contentPane.add(panel1, new GridConstraints(10, 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)); guardarButton = new JButton(); @@ -150,22 +140,6 @@ public class TrabajadorCreatePanel extends BasePanel { contentPane.add(fechaContratoPicker, new GridConstraints(9, 1, 1, 1, GridConstraints.ANCHOR_CENTER, GridConstraints.FILL_HORIZONTAL, GridConstraints.SIZEPOLICY_WANT_GROW, GridConstraints.SIZEPOLICY_FIXED, null, new Dimension(400, -1), null, 0, false)); - final JLabel label6 = new JLabel(); - label6.setText("Nombre de usuario:"); - 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(); - 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)); - passField = new JPasswordField(); - contentPane.add(passField, - new GridConstraints(13, 1, 1, 1, GridConstraints.ANCHOR_WEST, GridConstraints.FILL_HORIZONTAL, GridConstraints.SIZEPOLICY_WANT_GROW, - GridConstraints.SIZEPOLICY_FIXED, null, new Dimension(150, -1), null, 0, false)); - final JLabel label7 = new JLabel(); - label7.setText("Contraseña:"); - contentPane.add(label7, new GridConstraints(12, 1, 1, 1, GridConstraints.ANCHOR_WEST, GridConstraints.FILL_NONE, GridConstraints.SIZEPOLICY_FIXED, - GridConstraints.SIZEPOLICY_FIXED, null, null, 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 f296045..bf19f46 100644 --- a/src/main/java/xyz/danielcortes/views/trabajador/TrabajadorViewPanel.form +++ b/src/main/java/xyz/danielcortes/views/trabajador/TrabajadorViewPanel.form @@ -1,9 +1,9 @@
- + - + @@ -67,22 +67,22 @@ - + - + - + - + @@ -122,24 +122,6 @@ - - - - - - - - - - - - - - - - - - diff --git a/src/main/java/xyz/danielcortes/views/trabajador/TrabajadorViewPanel.java b/src/main/java/xyz/danielcortes/views/trabajador/TrabajadorViewPanel.java index 0aa8157..916cfaf 100644 --- a/src/main/java/xyz/danielcortes/views/trabajador/TrabajadorViewPanel.java +++ b/src/main/java/xyz/danielcortes/views/trabajador/TrabajadorViewPanel.java @@ -22,7 +22,6 @@ public class TrabajadorViewPanel extends BasePanel { private JPanel contentPane; private JTextField rutField; private DatePicker fechaContratoPicker; - private JTextField usernameField; public JTextField getNombreField() { return nombreField; @@ -53,10 +52,6 @@ public class TrabajadorViewPanel extends BasePanel { return fechaContratoPicker; } - public JTextField getUsernameField() { - return usernameField; - } - { // GUI initializer generated by IntelliJ IDEA GUI Designer // >>> IMPORTANT!! <<< @@ -71,7 +66,7 @@ public class TrabajadorViewPanel extends BasePanel { */ private void $$$setupUI$$$() { contentPane = new JPanel(); - contentPane.setLayout(new GridLayoutManager(14, 3, new Insets(20, 20, 20, 20), -1, -1)); + contentPane.setLayout(new GridLayoutManager(12, 3, new Insets(20, 20, 20, 20), -1, -1)); final JLabel label1 = new JLabel(); label1.setText("Nombre:"); contentPane.add(label1, new GridConstraints(2, 1, 1, 1, GridConstraints.ANCHOR_WEST, GridConstraints.FILL_NONE, GridConstraints.SIZEPOLICY_FIXED, @@ -104,19 +99,19 @@ public class TrabajadorViewPanel extends BasePanel { GridConstraints.SIZEPOLICY_FIXED, null, new Dimension(400, -1), null, 0, false)); final Spacer spacer1 = new Spacer(); contentPane.add(spacer1, - new GridConstraints(13, 1, 1, 1, GridConstraints.ANCHOR_CENTER, GridConstraints.FILL_VERTICAL, 1, GridConstraints.SIZEPOLICY_WANT_GROW, null, + new GridConstraints(11, 1, 1, 1, GridConstraints.ANCHOR_CENTER, GridConstraints.FILL_VERTICAL, 1, GridConstraints.SIZEPOLICY_WANT_GROW, null, null, null, 0, false)); final Spacer spacer2 = new Spacer(); contentPane.add(spacer2, - new GridConstraints(13, 2, 1, 1, GridConstraints.ANCHOR_CENTER, GridConstraints.FILL_HORIZONTAL, GridConstraints.SIZEPOLICY_WANT_GROW, 1, + new GridConstraints(11, 2, 1, 1, GridConstraints.ANCHOR_CENTER, GridConstraints.FILL_HORIZONTAL, GridConstraints.SIZEPOLICY_WANT_GROW, 1, null, null, null, 0, false)); final Spacer spacer3 = new Spacer(); contentPane.add(spacer3, - new GridConstraints(13, 0, 1, 1, GridConstraints.ANCHOR_CENTER, GridConstraints.FILL_HORIZONTAL, GridConstraints.SIZEPOLICY_WANT_GROW, 1, + new GridConstraints(11, 0, 1, 1, GridConstraints.ANCHOR_CENTER, GridConstraints.FILL_HORIZONTAL, GridConstraints.SIZEPOLICY_WANT_GROW, 1, null, null, null, 0, false)); volverButton = new JButton(); volverButton.setText("Volver"); - contentPane.add(volverButton, new GridConstraints(12, 1, 1, 1, GridConstraints.ANCHOR_CENTER, GridConstraints.FILL_NONE, + contentPane.add(volverButton, new GridConstraints(10, 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)); final JLabel label4 = new JLabel(); @@ -136,15 +131,6 @@ public class TrabajadorViewPanel extends BasePanel { 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 JLabel label6 = new JLabel(); - label6.setText("Nombre de usuario:"); - 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)); } /**