From 0febbbab934adcc8d43f65af39cc6fa0f822c050 Mon Sep 17 00:00:00 2001 From: Daniel Cortes Date: Thu, 27 Dec 2018 22:49:21 -0300 Subject: [PATCH] Funcionalidad de guardar el efectivo de una caja!! :3 --- caja.iml | 9 + src/main/java/danielcortes/xyz/Main.java | 4 +- .../xyz/controllers/ArqueoController.java | 204 +++++++++-- .../xyz/controllers/EgresosController.java | 10 + .../xyz/controllers/IngresosController.java | 5 + .../xyz/controllers/ManagerController.java | 44 ++- .../xyz/models/efectivo/Efectivo.java | 11 + .../xyz/models/efectivo/EfectivoDAO.java | 6 +- .../xyz/models/efectivo/MysqlEfectivoDAO.java | 89 +++-- .../danielcortes/xyz/views/ArqueoView.form | 322 +++++++++++------- .../danielcortes/xyz/views/ArqueoView.java | 201 ++++++++--- .../danielcortes/xyz/views/ManagerView.java | 2 - 12 files changed, 659 insertions(+), 248 deletions(-) diff --git a/caja.iml b/caja.iml index bb76540..213a563 100644 --- a/caja.iml +++ b/caja.iml @@ -15,5 +15,14 @@ + + + + + + + + + \ No newline at end of file diff --git a/src/main/java/danielcortes/xyz/Main.java b/src/main/java/danielcortes/xyz/Main.java index 814b148..0e8d026 100644 --- a/src/main/java/danielcortes/xyz/Main.java +++ b/src/main/java/danielcortes/xyz/Main.java @@ -54,8 +54,8 @@ public class Main { JFrame frame = new JFrame("Caja"); frame.setContentPane(view.getContentPanel()); frame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE); - frame.setSize(780, 450); - //frame.pack(); + //frame.setSize(780, 450); + frame.pack(); frame.setLocationRelativeTo(null); frame.setVisible(true); diff --git a/src/main/java/danielcortes/xyz/controllers/ArqueoController.java b/src/main/java/danielcortes/xyz/controllers/ArqueoController.java index cd36051..5ad5b40 100644 --- a/src/main/java/danielcortes/xyz/controllers/ArqueoController.java +++ b/src/main/java/danielcortes/xyz/controllers/ArqueoController.java @@ -24,53 +24,203 @@ package danielcortes.xyz.controllers; +import danielcortes.xyz.models.caja.Caja; import danielcortes.xyz.models.efectivo.Efectivo; import danielcortes.xyz.models.efectivo.EfectivoDAO; +import danielcortes.xyz.models.egreso.EgresoDAO; +import danielcortes.xyz.models.ingreso.IngresoDAO; import danielcortes.xyz.views.ArqueoView; -import java.util.ArrayList; -import java.util.List; +import javax.swing.*; + public class ArqueoController { private ArqueoView view; private EfectivoDAO efectivoDAO; + private Caja caja; + private Efectivo efectivo; + private IngresoDAO ingresoDAO; + private EgresoDAO egresoDAO; - public ArqueoController(ArqueoView view, EfectivoDAO efectivoDAO) { + public ArqueoController(ArqueoView view, EfectivoDAO efectivoDAO, IngresoDAO ingresoDAO, EgresoDAO egresoDAO) { this.view = view; this.efectivoDAO = efectivoDAO; -// this.fillEfectivo(); -// this.fillDocumentos(); -// this.fillDocumentos(); + this.ingresoDAO = ingresoDAO; + this.egresoDAO = egresoDAO; + + this.setUpViewEvents(); } + public void updateCaja(Caja caja) { + this.caja = caja; + fillDocumentos(); + fillEfectivo(); + fillResumen(); + } - private void fillEfectivo(){ - List efectivoList = this.efectivoDAO.findAll(); - if(efectivoList.size() > 0) { - Efectivo efectivo = efectivoList.get(0); - this.view.getVeinteMilField().setText(String.valueOf(efectivo.getVeinteMil())); - this.view.getDiezField().setText(String.valueOf(efectivo.getDiezMil())); - this.view.getCincoMilField().setText(String.valueOf(efectivo.getCincoMil())); - this.view.getDosMilField().setText(String.valueOf(efectivo.getDosMil())); - this.view.getMilField().setText(String.valueOf(efectivo.getMil())); - this.view.getQuinientosField().setText(String.valueOf(efectivo.getQuinientos())); - this.view.getCienField().setText(String.valueOf(efectivo.getCien())); - this.view.getCincuentaField().setText(String.valueOf(efectivo.getCincuenta())); - this.view.getDiezField().setText(String.valueOf(efectivo.getDiez())); + public void updateResumen() { + this.fillResumen(); + } + + private void fillEfectivo() { + this.efectivo = this.efectivoDAO.findByCaja(this.caja); + this.view.getVeinteMilField().setText(String.valueOf(efectivo.getVeinteMil())); + this.view.getDiezField().setText(String.valueOf(efectivo.getDiezMil())); + this.view.getCincoMilField().setText(String.valueOf(efectivo.getCincoMil())); + this.view.getDosMilField().setText(String.valueOf(efectivo.getDosMil())); + this.view.getMilField().setText(String.valueOf(efectivo.getMil())); + this.view.getQuinientosField().setText(String.valueOf(efectivo.getQuinientos())); + this.view.getCienField().setText(String.valueOf(efectivo.getCien())); + this.view.getCincuentaField().setText(String.valueOf(efectivo.getCincuenta())); + this.view.getDiezField().setText(String.valueOf(efectivo.getDiez())); + } + + private void fillDocumentos() { + + } + + private void fillResumen() { + this.updateResumenEfectivo(); + this.updateResumenDocumentos(); + this.updateResumenIngresos(); + this.updateResumenEgresos(); + this.updateResumenArqueo(); + } + + private void updateResumenEfectivo() { + JTextField efectivoField = this.view.getEfectivoField(); + int total = 0; + total += this.efectivo.getDiez(); + total += this.efectivo.getCincuenta(); + total += this.efectivo.getCien(); + total += this.efectivo.getQuinientos(); + total += this.efectivo.getMil(); + total += this.efectivo.getDosMil(); + total += this.efectivo.getCincoMil(); + total += this.efectivo.getDiezMil(); + total += this.efectivo.getVeinteMil(); + + efectivoField.setText(String.valueOf(total)); + } + + private void updateResumenDocumentos() { + + } + + private void updateResumenIngresos() { + int total = this.ingresoDAO.getTotalIngreso(this.caja); + this.view.getIngresosField().setText(String.valueOf(total)); + } + + private void updateResumenEgresos() { + int total = this.egresoDAO.getTotalEgreso(this.caja); + this.view.getEgresosField().setText(String.valueOf(total)); + } + + private void updateResumenArqueo() { + + } + + private void setUpViewEvents() { + this.view.getGuardarEfectivoButton().addActionListener(e -> { + this.normalizeEfectivoInput(); + this.guardarEfectivo(); + }); + } + + private void guardarEfectivo() { + String diez = this.view.getDiezField().getText(); + String cincuenta = this.view.getCincuentaField().getText(); + String cien = this.view.getCienField().getText(); + String quinientos = this.view.getQuinientosField().getText(); + String mil = this.view.getMilField().getText(); + String dosMil = this.view.getDosMilField().getText(); + String cincoMil = this.view.getCincoMilField().getText(); + String diezMil = this.view.getDiezMilField().getText(); + String veinteMil = this.view.getVeinteMilField().getText(); + + if (this.validateEfectivoInput(diez, cincuenta, cien, quinientos, mil, dosMil, cincoMil, diezMil, veinteMil)) { + this.efectivo.setDiez(Integer.valueOf(diez)); + this.efectivo.setCincuenta(Integer.valueOf(cincuenta)); + this.efectivo.setCien(Integer.valueOf(cien)); + this.efectivo.setQuinientos(Integer.valueOf(quinientos)); + this.efectivo.setMil(Integer.valueOf(mil)); + this.efectivo.setDosMil(Integer.valueOf(dosMil)); + this.efectivo.setCincoMil(Integer.valueOf(cincoMil)); + this.efectivo.setDiezMil(Integer.valueOf(diezMil)); + this.efectivo.setVeinteMil(Integer.valueOf(veinteMil)); + this.efectivoDAO.updateEfectivo(efectivo); + + this.updateResumenEfectivo(); } } - private void fillResumen(){ - List efectivoList = this.efectivoDAO.findAll(); - if(efectivoList.size() > 0) { - Efectivo efectivo = efectivoList.get(0); - int total = this.efectivoDAO.getTotalEfectivo(efectivo); - this.view.getEfectivoField().setText(String.valueOf(total)); - } + private boolean validateEfectivoInput(String diez, String cincuenta, String cien, String quinientos, String mil, String dosMil, String cincoMil, String diezMil, String veinteMil) { + this.hiddeEfectivoErrorMessages(); + + boolean diezValidation = validateEfectivoMoneda(diez, this.view.getErrorDiez()); + boolean cincuentaValidation = validateEfectivoMoneda(cincuenta, this.view.getErrorCincuenta()); + boolean cienValidation = validateEfectivoMoneda(cien, this.view.getErrorCien()); + boolean quinientosValidation = validateEfectivoMoneda(quinientos, this.view.getErrorQuinientos()); + boolean milValidation = validateEfectivoMoneda(mil, this.view.getErrorMil()); + boolean dosMilValidation = validateEfectivoMoneda(dosMil, this.view.getErrorDosMil()); + boolean cincoMilValidation = validateEfectivoMoneda(cincoMil, this.view.getErrorCincoMil()); + boolean diezMilValidation = validateEfectivoMoneda(diezMil, this.view.getErrorDiezMil()); + boolean veinteMilValidation = validateEfectivoMoneda(veinteMil, this.view.getErrorVeinteMil()); + + return diezValidation && cincuentaValidation && cienValidation && quinientosValidation && milValidation && dosMilValidation && cincoMilValidation && diezMilValidation && veinteMilValidation; } - private void fillDocumentos(){ + private boolean validateEfectivoMoneda(String valor, JLabel errorLabel) { + if (valor == null) { + errorLabel.setText("Hubo un problema con los datos"); + errorLabel.setVisible(true); + return false; + } + if (valor.isEmpty()) { + errorLabel.setText("El campo esta vacio"); + errorLabel.setVisible(true); + return false; + } + + if (!valor.chars().allMatch(Character::isDigit)) { + errorLabel.setText("Deben ser numeros"); + errorLabel.setVisible(true); + return false; + } + + if (valor.length() > 10) { + errorLabel.setText("El numero ingresado es demasiado largo"); + errorLabel.setVisible(true); + return false; + } + + return true; + } + + private void hiddeEfectivoErrorMessages() { + this.view.getErrorDiez().setVisible(false); + this.view.getErrorCincuenta().setVisible(false); + this.view.getErrorCien().setVisible(false); + this.view.getErrorQuinientos().setVisible(false); + this.view.getErrorMil().setVisible(false); + this.view.getErrorDosMil().setVisible(false); + this.view.getErrorCincoMil().setVisible(false); + this.view.getErrorDiezMil().setVisible(false); + this.view.getErrorVeinteMil().setVisible(false); + } + + private void normalizeEfectivoInput() { + this.view.getDiezField().setText(this.view.getDiezField().getText().trim()); + this.view.getCincuentaField().setText(this.view.getCincuentaField().getText().trim()); + this.view.getCienField().setText(this.view.getCienField().getText().trim()); + this.view.getQuinientosField().setText(this.view.getQuinientosField().getText().trim()); + this.view.getMilField().setText(this.view.getMilField().getText().trim()); + this.view.getDosMilField().setText(this.view.getDosMilField().getText().trim()); + this.view.getCincoMilField().setText(this.view.getCincoMilField().getText().trim()); + this.view.getDiezMilField().setText(this.view.getDiezMilField().getText().trim()); + this.view.getVeinteMilField().setText(this.view.getVeinteMilField().getText().trim()); } } diff --git a/src/main/java/danielcortes/xyz/controllers/EgresosController.java b/src/main/java/danielcortes/xyz/controllers/EgresosController.java index 7729124..797c5f5 100644 --- a/src/main/java/danielcortes/xyz/controllers/EgresosController.java +++ b/src/main/java/danielcortes/xyz/controllers/EgresosController.java @@ -113,10 +113,13 @@ public class EgresosController { } private void guardarActionListener() { + this.normalizeInputs(); + String nro = this.view.getNroField().getText(); String descripcion = this.view.getDescripcionField().getText(); String valor = this.view.getValorField().getText(); TipoEgreso tipo = (TipoEgreso) this.view.getTipoCombo().getSelectedItem(); + if(editing){ this.editarEgreso(nro, descripcion, valor, tipo, this.caja); }else { @@ -303,6 +306,13 @@ public class EgresosController { this.view.getDescripcionField().setText(""); } + private void normalizeInputs(){ + this.view.getValorField().setText(this.view.getValorField().getText().trim()); + this.view.getNroField().setText(this.view.getNroField().getText().trim()); + this.view.getDescripcionField().setText(this.view.getDescripcionField().getText().trim()); + + } + private void resetFocus() { this.view.getNroField().requestFocus(); } diff --git a/src/main/java/danielcortes/xyz/controllers/IngresosController.java b/src/main/java/danielcortes/xyz/controllers/IngresosController.java index 75741ea..6afd639 100644 --- a/src/main/java/danielcortes/xyz/controllers/IngresosController.java +++ b/src/main/java/danielcortes/xyz/controllers/IngresosController.java @@ -113,6 +113,7 @@ public class IngresosController { } private void guardarActionListener() { + this.normalizeInputs(); String valor = this.view.getValorField().getText(); TipoIngreso tipoIngreso = (TipoIngreso) this.view.getTipoCombo().getSelectedItem(); @@ -259,6 +260,10 @@ public class IngresosController { this.view.getValorField().setText(""); } + private void normalizeInputs(){ + this.view.getValorField().setText(this.view.getValorField().getText().trim()); + } + private void resetFocus(){ this.view.getTipoCombo().requestFocus(); } diff --git a/src/main/java/danielcortes/xyz/controllers/ManagerController.java b/src/main/java/danielcortes/xyz/controllers/ManagerController.java index 468da88..61a2536 100644 --- a/src/main/java/danielcortes/xyz/controllers/ManagerController.java +++ b/src/main/java/danielcortes/xyz/controllers/ManagerController.java @@ -26,6 +26,7 @@ package danielcortes.xyz.controllers; import danielcortes.xyz.models.caja.Caja; import danielcortes.xyz.models.caja.CajaDAO; +import danielcortes.xyz.models.efectivo.Efectivo; import danielcortes.xyz.models.efectivo.EfectivoDAO; import danielcortes.xyz.models.efectivo.MysqlEfectivoDAO; import danielcortes.xyz.models.egreso.EgresoDAO; @@ -57,10 +58,16 @@ public class ManagerController { this.view = view; this.cajaDAO = cajaDAO; this.loadCardContents(); + this.setUpDate(); this.setUpViewEvents(); this.pressInitialButton(); } + private void setUpDate(){ + this.view.getDatePicker().setDateToToday(); + this.updateCaja(); + } + private void setUpViewEvents() { this.view.getEgresosButton().addActionListener(e -> { CardLayout layout = (CardLayout) this.view.getCardPanel().getLayout(); @@ -72,23 +79,32 @@ public class ManagerController { }); this.view.getArqueoButton().addActionListener(e -> { + this.arqueoController.updateResumen(); + CardLayout layout = (CardLayout) this.view.getCardPanel().getLayout(); layout.show(this.view.getCardPanel(), "ARQUEO"); }); - this.view.getDatePicker().addDateChangeListener(e -> { - LocalDate selectedDate = this.view.getDatePicker().getDate(); - Caja caja = this.cajaDAO.findByFecha(selectedDate); - if(caja == null){ - caja = new Caja(); - caja.setFecha(selectedDate); - this.cajaDAO.insertCaja(caja); - } - this.ingresosController.updateCaja(caja); - this.egresosController.updateCaja(caja); -// this.arqueoController.updateCaja(caja); + this.view.getDatePicker().addDateChangeListener(e -> updateCaja()); + } - }); + private void updateCaja(){ + LocalDate selectedDate = this.view.getDatePicker().getDate(); + Caja caja = this.cajaDAO.findByFecha(selectedDate); + if(caja == null){ + caja = new Caja(); + caja.setFecha(selectedDate); + this.cajaDAO.insertCaja(caja); + + EfectivoDAO efectivoDAO = new MysqlEfectivoDAO(); + Efectivo efectivo = new Efectivo(); + efectivo.setCaja(caja); + efectivoDAO.insertDefaultEfectivo(efectivo); + + } + this.ingresosController.updateCaja(caja); + this.egresosController.updateCaja(caja); + this.arqueoController.updateCaja(caja); } private void loadCardContents() { @@ -120,10 +136,12 @@ public class ManagerController { private void loadArqueoView() { ArqueoView arqueoView = new ArqueoView(); EfectivoDAO efectivoDAO = new MysqlEfectivoDAO(); + EgresoDAO egresoDAO = new MysqlEgresoDAO(); + IngresoDAO ingresoDAO = new MysqlIngresoDAO(); this.view.getCardPanel().add(arqueoView.getContentPanel(), "ARQUEO"); - this.arqueoController = new ArqueoController(arqueoView, efectivoDAO); + this.arqueoController = new ArqueoController(arqueoView, efectivoDAO, ingresoDAO, egresoDAO); } private void pressInitialButton() { diff --git a/src/main/java/danielcortes/xyz/models/efectivo/Efectivo.java b/src/main/java/danielcortes/xyz/models/efectivo/Efectivo.java index 65a49c8..6261226 100644 --- a/src/main/java/danielcortes/xyz/models/efectivo/Efectivo.java +++ b/src/main/java/danielcortes/xyz/models/efectivo/Efectivo.java @@ -24,6 +24,8 @@ package danielcortes.xyz.models.efectivo; +import danielcortes.xyz.models.caja.Caja; + public class Efectivo { private int id; private int veinteMil; @@ -35,6 +37,7 @@ public class Efectivo { private int cien; private int cincuenta; private int diez; + private Caja caja; public int getId() { return id; @@ -115,4 +118,12 @@ public class Efectivo { public void setDiez(int diez) { this.diez = diez; } + + public Caja getCaja() { + return caja; + } + + public void setCaja(Caja caja) { + this.caja = caja; + } } diff --git a/src/main/java/danielcortes/xyz/models/efectivo/EfectivoDAO.java b/src/main/java/danielcortes/xyz/models/efectivo/EfectivoDAO.java index aa3904b..a4f13c4 100644 --- a/src/main/java/danielcortes/xyz/models/efectivo/EfectivoDAO.java +++ b/src/main/java/danielcortes/xyz/models/efectivo/EfectivoDAO.java @@ -24,13 +24,17 @@ package danielcortes.xyz.models.efectivo; +import danielcortes.xyz.models.caja.Caja; + import java.util.List; public interface EfectivoDAO { List findAll(); Efectivo findById(int id); + Efectivo findByCaja(Caja caja); + boolean insertEfectivo(Efectivo efectivo); + boolean insertDefaultEfectivo(Efectivo efectivo); boolean updateEfectivo(Efectivo efectivo); boolean deleteEfectivo(Efectivo efectivo); - int getTotalEfectivo(Efectivo efectivo); } diff --git a/src/main/java/danielcortes/xyz/models/efectivo/MysqlEfectivoDAO.java b/src/main/java/danielcortes/xyz/models/efectivo/MysqlEfectivoDAO.java index b93f6dd..5b8ad34 100644 --- a/src/main/java/danielcortes/xyz/models/efectivo/MysqlEfectivoDAO.java +++ b/src/main/java/danielcortes/xyz/models/efectivo/MysqlEfectivoDAO.java @@ -25,6 +25,9 @@ package danielcortes.xyz.models.efectivo; import danielcortes.xyz.data.MysqlConnection; +import danielcortes.xyz.models.caja.Caja; +import danielcortes.xyz.models.caja.CajaDAO; +import danielcortes.xyz.models.caja.MysqlCajaDAO; import java.sql.Connection; import java.sql.PreparedStatement; @@ -45,7 +48,7 @@ public class MysqlEfectivoDAO implements EfectivoDAO { List efectivoList = new ArrayList<>(); try { Connection conn = mysqlConnection.getConnection(); - PreparedStatement ps = conn.prepareStatement("select * from efectivo"); + PreparedStatement ps = conn.prepareStatement("select * from efectivos"); ResultSet rs = ps.executeQuery(); efectivoList = this.efectivosFromResultSet(rs); @@ -81,12 +84,36 @@ public class MysqlEfectivoDAO implements EfectivoDAO { return efectivo; } + @Override + public Efectivo findByCaja(Caja caja) { + Efectivo efectivo = null; + try { + Connection conn = mysqlConnection.getConnection(); + PreparedStatement ps = conn.prepareStatement("select * from efectivos where caja_id = ?"); + ps.setInt(1, caja.getId()); + ResultSet rs = ps.executeQuery(); + + List efectivoList = this.efectivosFromResultSet(rs); + if(efectivoList.size() > 0) { + efectivo = efectivoList.get(0); + } + + rs.close(); + ps.close(); + conn.close(); + } catch (SQLException e) { + e.printStackTrace(); + } + + return efectivo; + } + @Override public boolean insertEfectivo(Efectivo efectivo) { int updates; try { Connection conn = mysqlConnection.getConnection(); - PreparedStatement ps = conn.prepareStatement("insert into efectivos (veinte_mil, diez_mil, cinco_mil, dos_mil, mil, quinientos, cien, cincuenta, diez) values (?,?,?,?,?,?,?,?,?)"); + PreparedStatement ps = conn.prepareStatement("insert into efectivos (veinte_mil, diez_mil, cinco_mil, dos_mil, mil, quinientos, cien, cincuenta, diez, caja_id) values (?,?,?,?,?,?,?,?,?,?)"); ps.setInt(1, efectivo.getVeinteMil()); ps.setInt(2, efectivo.getDiezMil()); ps.setInt(3, efectivo.getCincoMil()); @@ -96,6 +123,7 @@ public class MysqlEfectivoDAO implements EfectivoDAO { ps.setInt(7, efectivo.getCien()); ps.setInt(8, efectivo.getCincuenta()); ps.setInt(9, efectivo.getDiez()); + ps.setInt(10, efectivo.getCaja().getId()); updates = ps.executeUpdate(); ps.close(); @@ -115,12 +143,39 @@ public class MysqlEfectivoDAO implements EfectivoDAO { return updates > 0; } + @Override + public boolean insertDefaultEfectivo(Efectivo efectivo) { + int updates; + try { + Connection conn = mysqlConnection.getConnection(); + PreparedStatement ps = conn.prepareStatement("insert into efectivos (veinte_mil, diez_mil, cinco_mil, dos_mil, mil, quinientos, cien, cincuenta, diez, caja_id) values (0,0,0,0,0,0,0,0,0,?)"); + ps.setInt(1, efectivo.getCaja().getId()); + + updates = ps.executeUpdate(); + System.out.println(updates); + ps.close(); + + ps = conn.prepareStatement("select last_insert_id()"); + ResultSet rs = ps.executeQuery(); + rs.next(); + efectivo.setId(rs.getInt(1)); + + rs.close(); + ps.close(); + conn.close(); + } catch (SQLException e) { + e.printStackTrace(); + return false; + } + return updates > 0; + } + @Override public boolean updateEfectivo(Efectivo efectivo) { int updates; try { Connection conn = mysqlConnection.getConnection(); - PreparedStatement ps = conn.prepareStatement("update efectivos set veinte_mil = ?, diez_mil = ?, cinco_mil = ?, dos_mil = ?, mil = ?, quinientos = ?, cien = ?, cincuenta = ?, diez = ? where id = ?"); + PreparedStatement ps = conn.prepareStatement("update efectivos set veinte_mil = ?, diez_mil = ?, cinco_mil = ?, dos_mil = ?, mil = ?, quinientos = ?, cien = ?, cincuenta = ?, diez = ?, caja_id = ? where id = ?"); ps.setInt(1, efectivo.getVeinteMil()); ps.setInt(2, efectivo.getDiezMil()); ps.setInt(3, efectivo.getCincoMil()); @@ -130,7 +185,8 @@ public class MysqlEfectivoDAO implements EfectivoDAO { ps.setInt(7, efectivo.getCien()); ps.setInt(8, efectivo.getCincuenta()); ps.setInt(9, efectivo.getDiez()); - ps.setInt(10, efectivo.getId()); + ps.setInt(10, efectivo.getCaja().getId()); + ps.setInt(11, efectivo.getId()); updates = ps.executeUpdate(); @@ -162,31 +218,14 @@ public class MysqlEfectivoDAO implements EfectivoDAO { return updates > 0; } - @Override - public int getTotalEfectivo(Efectivo efectivo) { - int total = 0; - try { - Connection conn = mysqlConnection.getConnection(); - PreparedStatement ps = conn.prepareStatement("select (veinte_mil + diez_mil + cinco_mil + dos_mil + mil + quinientos + cien + cincuenta + diez) as total from efectivos where id = ?"); - ps.setInt(1, efectivo.getId()); - ResultSet rs = ps.executeQuery(); - - rs.next(); - total = rs.getInt(1); - - rs.close(); - ps.close(); - conn.close(); - } catch (SQLException e) { - e.printStackTrace(); - } - return total; - } - private List efectivosFromResultSet(ResultSet rs) throws SQLException { List efectivoList = new ArrayList<>(); while (rs.next()) { + CajaDAO cajaDAO = new MysqlCajaDAO(); + Caja caja = cajaDAO.findById(rs.getInt("caja_id")); + Efectivo efectivo = new Efectivo(); + efectivo.setCaja(caja); efectivo.setId(rs.getInt("id")); efectivo.setVeinteMil(rs.getInt("veinte_mil")); efectivo.setDiezMil(rs.getInt("diez_mil")); diff --git a/src/main/java/danielcortes/xyz/views/ArqueoView.form b/src/main/java/danielcortes/xyz/views/ArqueoView.form index f4ee880..3f83ac9 100644 --- a/src/main/java/danielcortes/xyz/views/ArqueoView.form +++ b/src/main/java/danielcortes/xyz/views/ArqueoView.form @@ -1,16 +1,16 @@
- + - + - + @@ -56,6 +56,14 @@ + + + + + + + + @@ -163,37 +171,7 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -223,23 +201,13 @@ - + - - - - - - - - - - @@ -249,33 +217,7 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -285,41 +227,23 @@ - + - + - - - - - - - - - - - - - - - - - - - + - + - + @@ -329,33 +253,7 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -365,6 +263,186 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/main/java/danielcortes/xyz/views/ArqueoView.java b/src/main/java/danielcortes/xyz/views/ArqueoView.java index f891a42..ecebb8c 100644 --- a/src/main/java/danielcortes/xyz/views/ArqueoView.java +++ b/src/main/java/danielcortes/xyz/views/ArqueoView.java @@ -24,6 +24,9 @@ package danielcortes.xyz.views; +import com.intellij.uiDesigner.core.GridConstraints; +import com.intellij.uiDesigner.core.GridLayoutManager; + import javax.swing.*; import javax.swing.border.TitledBorder; import java.awt.*; @@ -46,7 +49,17 @@ public class ArqueoView { private JTextField EgresosField; private JTextField IngresosField; private JTextField ArqueoField; - private JButton guardarButton; + private JButton guardarEfectivoButton; + private JButton guardarDocumentosButton; + private JLabel errorVeinteMil; + private JLabel errorDiezMil; + private JLabel errorCincoMil; + private JLabel errorDosMil; + private JLabel errorMil; + private JLabel errorQuinientos; + private JLabel errorCien; + private JLabel errorCincuenta; + private JLabel errorDiez; public JPanel getContentPanel() { return contentPanel; @@ -116,14 +129,49 @@ public class ArqueoView { return ArqueoField; } - public JButton getGuardarButton() { - return guardarButton; + public JButton getGuardarEfectivoButton() { + return guardarEfectivoButton; } + public JButton getGuardarDocumentosButton() { + return guardarDocumentosButton; + } - /* - * @noinspection ALL - */ + public JLabel getErrorVeinteMil() { + return errorVeinteMil; + } + + public JLabel getErrorDiezMil() { + return errorDiezMil; + } + + public JLabel getErrorCincoMil() { + return errorCincoMil; + } + + public JLabel getErrorDosMil() { + return errorDosMil; + } + + public JLabel getErrorMil() { + return errorMil; + } + + public JLabel getErrorQuinientos() { + return errorQuinientos; + } + + public JLabel getErrorCien() { + return errorCien; + } + + public JLabel getErrorCincuenta() { + return errorCincuenta; + } + + public JLabel getErrorDiez() { + return errorDiez; + } { // GUI initializer generated by IntelliJ IDEA GUI Designer @@ -141,130 +189,171 @@ public class ArqueoView { */ private void $$$setupUI$$$() { contentPanel = new JPanel(); - contentPanel.setLayout(new com.intellij.uiDesigner.core.GridLayoutManager(3, 2, new Insets(0, 0, 0, 0), -1, -1)); + contentPanel.setLayout(new GridLayoutManager(2, 2, new Insets(0, 0, 0, 0), -1, -1)); final JPanel panel1 = new JPanel(); - panel1.setLayout(new com.intellij.uiDesigner.core.GridLayoutManager(2, 2, new Insets(10, 10, 10, 10), -1, -1)); - contentPanel.add(panel1, new com.intellij.uiDesigner.core.GridConstraints(0, 1, 1, 1, com.intellij.uiDesigner.core.GridConstraints.ANCHOR_CENTER, com.intellij.uiDesigner.core.GridConstraints.FILL_BOTH, com.intellij.uiDesigner.core.GridConstraints.SIZEPOLICY_CAN_SHRINK | com.intellij.uiDesigner.core.GridConstraints.SIZEPOLICY_CAN_GROW, com.intellij.uiDesigner.core.GridConstraints.SIZEPOLICY_CAN_SHRINK | com.intellij.uiDesigner.core.GridConstraints.SIZEPOLICY_CAN_GROW, null, null, null, 0, false)); + panel1.setLayout(new GridLayoutManager(3, 2, new Insets(10, 10, 10, 10), -1, -1)); + contentPanel.add(panel1, 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)); panel1.setBorder(BorderFactory.createTitledBorder(BorderFactory.createEtchedBorder(), "Detalle Documentos", TitledBorder.DEFAULT_JUSTIFICATION, TitledBorder.DEFAULT_POSITION, this.$$$getFont$$$(null, -1, -1, panel1.getFont()))); final JLabel label1 = new JLabel(); label1.setText("Cheques al Dia"); - panel1.add(label1, new com.intellij.uiDesigner.core.GridConstraints(0, 0, 1, 1, com.intellij.uiDesigner.core.GridConstraints.ANCHOR_EAST, com.intellij.uiDesigner.core.GridConstraints.FILL_NONE, com.intellij.uiDesigner.core.GridConstraints.SIZEPOLICY_FIXED, com.intellij.uiDesigner.core.GridConstraints.SIZEPOLICY_FIXED, null, null, null, 0, false)); + panel1.add(label1, new GridConstraints(0, 0, 1, 1, GridConstraints.ANCHOR_EAST, GridConstraints.FILL_NONE, GridConstraints.SIZEPOLICY_FIXED, GridConstraints.SIZEPOLICY_FIXED, null, null, null, 0, false)); chequesField = new JTextField(); chequesField.setText("0"); - panel1.add(chequesField, new com.intellij.uiDesigner.core.GridConstraints(0, 1, 1, 1, com.intellij.uiDesigner.core.GridConstraints.ANCHOR_WEST, com.intellij.uiDesigner.core.GridConstraints.FILL_HORIZONTAL, com.intellij.uiDesigner.core.GridConstraints.SIZEPOLICY_WANT_GROW, com.intellij.uiDesigner.core.GridConstraints.SIZEPOLICY_FIXED, null, new Dimension(150, -1), null, 0, false)); + panel1.add(chequesField, new GridConstraints(0, 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 label2 = new JLabel(); label2.setText("Tarjetas de Credito"); - panel1.add(label2, new com.intellij.uiDesigner.core.GridConstraints(1, 0, 1, 1, com.intellij.uiDesigner.core.GridConstraints.ANCHOR_WEST, com.intellij.uiDesigner.core.GridConstraints.FILL_NONE, com.intellij.uiDesigner.core.GridConstraints.SIZEPOLICY_FIXED, com.intellij.uiDesigner.core.GridConstraints.SIZEPOLICY_FIXED, null, null, null, 0, false)); + panel1.add(label2, new GridConstraints(1, 0, 1, 1, GridConstraints.ANCHOR_WEST, GridConstraints.FILL_NONE, GridConstraints.SIZEPOLICY_FIXED, GridConstraints.SIZEPOLICY_FIXED, null, null, null, 0, false)); tarjetasField = new JTextField(); tarjetasField.setText("0"); - panel1.add(tarjetasField, new com.intellij.uiDesigner.core.GridConstraints(1, 1, 1, 1, com.intellij.uiDesigner.core.GridConstraints.ANCHOR_WEST, com.intellij.uiDesigner.core.GridConstraints.FILL_HORIZONTAL, com.intellij.uiDesigner.core.GridConstraints.SIZEPOLICY_WANT_GROW, com.intellij.uiDesigner.core.GridConstraints.SIZEPOLICY_FIXED, null, new Dimension(150, -1), null, 0, false)); + panel1.add(tarjetasField, 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)); + guardarDocumentosButton = new JButton(); + guardarDocumentosButton.setText("Guardar"); + panel1.add(guardarDocumentosButton, new GridConstraints(2, 0, 1, 2, GridConstraints.ANCHOR_CENTER, GridConstraints.FILL_HORIZONTAL, GridConstraints.SIZEPOLICY_CAN_SHRINK | GridConstraints.SIZEPOLICY_CAN_GROW, GridConstraints.SIZEPOLICY_FIXED, null, null, null, 0, false)); final JPanel panel2 = new JPanel(); - panel2.setLayout(new com.intellij.uiDesigner.core.GridLayoutManager(5, 2, new Insets(10, 10, 10, 10), -1, -1)); - contentPanel.add(panel2, new com.intellij.uiDesigner.core.GridConstraints(1, 1, 1, 1, com.intellij.uiDesigner.core.GridConstraints.ANCHOR_CENTER, com.intellij.uiDesigner.core.GridConstraints.FILL_BOTH, com.intellij.uiDesigner.core.GridConstraints.SIZEPOLICY_CAN_SHRINK | com.intellij.uiDesigner.core.GridConstraints.SIZEPOLICY_CAN_GROW, com.intellij.uiDesigner.core.GridConstraints.SIZEPOLICY_CAN_SHRINK | com.intellij.uiDesigner.core.GridConstraints.SIZEPOLICY_CAN_GROW, null, null, null, 0, false)); + panel2.setLayout(new GridLayoutManager(5, 2, new Insets(10, 10, 10, 10), -1, -1)); + contentPanel.add(panel2, new GridConstraints(1, 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)); panel2.setBorder(BorderFactory.createTitledBorder(BorderFactory.createEtchedBorder(), "Resumen")); final JLabel label3 = new JLabel(); label3.setText("Efectivo"); - panel2.add(label3, new com.intellij.uiDesigner.core.GridConstraints(0, 0, 1, 1, com.intellij.uiDesigner.core.GridConstraints.ANCHOR_EAST, com.intellij.uiDesigner.core.GridConstraints.FILL_NONE, com.intellij.uiDesigner.core.GridConstraints.SIZEPOLICY_FIXED, com.intellij.uiDesigner.core.GridConstraints.SIZEPOLICY_FIXED, null, null, null, 0, false)); + panel2.add(label3, new GridConstraints(0, 0, 1, 1, GridConstraints.ANCHOR_EAST, GridConstraints.FILL_NONE, GridConstraints.SIZEPOLICY_FIXED, GridConstraints.SIZEPOLICY_FIXED, null, null, null, 0, false)); efectivoField = new JTextField(); efectivoField.setEditable(false); efectivoField.setText("0"); - panel2.add(efectivoField, new com.intellij.uiDesigner.core.GridConstraints(0, 1, 1, 1, com.intellij.uiDesigner.core.GridConstraints.ANCHOR_WEST, com.intellij.uiDesigner.core.GridConstraints.FILL_HORIZONTAL, com.intellij.uiDesigner.core.GridConstraints.SIZEPOLICY_WANT_GROW, com.intellij.uiDesigner.core.GridConstraints.SIZEPOLICY_FIXED, null, new Dimension(150, -1), null, 0, false)); + panel2.add(efectivoField, new GridConstraints(0, 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 label4 = new JLabel(); label4.setText("Documentos"); - panel2.add(label4, new com.intellij.uiDesigner.core.GridConstraints(1, 0, 1, 1, com.intellij.uiDesigner.core.GridConstraints.ANCHOR_EAST, com.intellij.uiDesigner.core.GridConstraints.FILL_NONE, com.intellij.uiDesigner.core.GridConstraints.SIZEPOLICY_FIXED, com.intellij.uiDesigner.core.GridConstraints.SIZEPOLICY_FIXED, null, null, null, 0, false)); + panel2.add(label4, new GridConstraints(1, 0, 1, 1, GridConstraints.ANCHOR_EAST, GridConstraints.FILL_NONE, GridConstraints.SIZEPOLICY_FIXED, GridConstraints.SIZEPOLICY_FIXED, null, null, null, 0, false)); documentosField = new JTextField(); documentosField.setEditable(false); documentosField.setText("0"); - panel2.add(documentosField, new com.intellij.uiDesigner.core.GridConstraints(1, 1, 1, 1, com.intellij.uiDesigner.core.GridConstraints.ANCHOR_WEST, com.intellij.uiDesigner.core.GridConstraints.FILL_HORIZONTAL, com.intellij.uiDesigner.core.GridConstraints.SIZEPOLICY_WANT_GROW, com.intellij.uiDesigner.core.GridConstraints.SIZEPOLICY_FIXED, null, new Dimension(150, -1), null, 0, false)); + panel2.add(documentosField, 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)); final JLabel label5 = new JLabel(); label5.setText("Ingresos"); - panel2.add(label5, new com.intellij.uiDesigner.core.GridConstraints(2, 0, 1, 1, com.intellij.uiDesigner.core.GridConstraints.ANCHOR_EAST, com.intellij.uiDesigner.core.GridConstraints.FILL_NONE, com.intellij.uiDesigner.core.GridConstraints.SIZEPOLICY_FIXED, com.intellij.uiDesigner.core.GridConstraints.SIZEPOLICY_FIXED, null, null, null, 0, false)); + panel2.add(label5, new GridConstraints(2, 0, 1, 1, GridConstraints.ANCHOR_EAST, GridConstraints.FILL_NONE, GridConstraints.SIZEPOLICY_FIXED, GridConstraints.SIZEPOLICY_FIXED, null, null, null, 0, false)); final JLabel label6 = new JLabel(); label6.setText("Egresos"); - panel2.add(label6, new com.intellij.uiDesigner.core.GridConstraints(3, 0, 1, 1, com.intellij.uiDesigner.core.GridConstraints.ANCHOR_EAST, com.intellij.uiDesigner.core.GridConstraints.FILL_NONE, com.intellij.uiDesigner.core.GridConstraints.SIZEPOLICY_FIXED, com.intellij.uiDesigner.core.GridConstraints.SIZEPOLICY_FIXED, null, null, null, 0, false)); + panel2.add(label6, new GridConstraints(3, 0, 1, 1, GridConstraints.ANCHOR_EAST, GridConstraints.FILL_NONE, GridConstraints.SIZEPOLICY_FIXED, GridConstraints.SIZEPOLICY_FIXED, null, null, null, 0, false)); EgresosField = new JTextField(); EgresosField.setEditable(false); EgresosField.setText("0"); - panel2.add(EgresosField, new com.intellij.uiDesigner.core.GridConstraints(3, 1, 1, 1, com.intellij.uiDesigner.core.GridConstraints.ANCHOR_WEST, com.intellij.uiDesigner.core.GridConstraints.FILL_HORIZONTAL, com.intellij.uiDesigner.core.GridConstraints.SIZEPOLICY_WANT_GROW, com.intellij.uiDesigner.core.GridConstraints.SIZEPOLICY_FIXED, null, new Dimension(150, -1), null, 0, false)); + panel2.add(EgresosField, new GridConstraints(3, 1, 1, 1, GridConstraints.ANCHOR_WEST, GridConstraints.FILL_HORIZONTAL, GridConstraints.SIZEPOLICY_WANT_GROW, GridConstraints.SIZEPOLICY_FIXED, null, new Dimension(150, -1), null, 0, false)); IngresosField = new JTextField(); IngresosField.setEditable(false); IngresosField.setText("0"); - panel2.add(IngresosField, new com.intellij.uiDesigner.core.GridConstraints(2, 1, 1, 1, com.intellij.uiDesigner.core.GridConstraints.ANCHOR_WEST, com.intellij.uiDesigner.core.GridConstraints.FILL_HORIZONTAL, com.intellij.uiDesigner.core.GridConstraints.SIZEPOLICY_WANT_GROW, com.intellij.uiDesigner.core.GridConstraints.SIZEPOLICY_FIXED, null, new Dimension(150, -1), null, 0, false)); + panel2.add(IngresosField, new GridConstraints(2, 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("Arqueo"); - panel2.add(label7, new com.intellij.uiDesigner.core.GridConstraints(4, 0, 1, 1, com.intellij.uiDesigner.core.GridConstraints.ANCHOR_EAST, com.intellij.uiDesigner.core.GridConstraints.FILL_NONE, com.intellij.uiDesigner.core.GridConstraints.SIZEPOLICY_FIXED, com.intellij.uiDesigner.core.GridConstraints.SIZEPOLICY_FIXED, null, null, null, 0, false)); + panel2.add(label7, new GridConstraints(4, 0, 1, 1, GridConstraints.ANCHOR_EAST, GridConstraints.FILL_NONE, GridConstraints.SIZEPOLICY_FIXED, GridConstraints.SIZEPOLICY_FIXED, null, null, null, 0, false)); ArqueoField = new JTextField(); ArqueoField.setEditable(false); ArqueoField.setText("0"); - panel2.add(ArqueoField, new com.intellij.uiDesigner.core.GridConstraints(4, 1, 1, 1, com.intellij.uiDesigner.core.GridConstraints.ANCHOR_WEST, com.intellij.uiDesigner.core.GridConstraints.FILL_HORIZONTAL, com.intellij.uiDesigner.core.GridConstraints.SIZEPOLICY_WANT_GROW, com.intellij.uiDesigner.core.GridConstraints.SIZEPOLICY_FIXED, null, new Dimension(150, -1), null, 0, false)); + panel2.add(ArqueoField, new GridConstraints(4, 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 JPanel panel3 = new JPanel(); - panel3.setLayout(new com.intellij.uiDesigner.core.GridLayoutManager(1, 3, new Insets(0, 0, 0, 0), -1, -1)); - contentPanel.add(panel3, new com.intellij.uiDesigner.core.GridConstraints(2, 0, 1, 2, com.intellij.uiDesigner.core.GridConstraints.ANCHOR_CENTER, com.intellij.uiDesigner.core.GridConstraints.FILL_BOTH, com.intellij.uiDesigner.core.GridConstraints.SIZEPOLICY_CAN_SHRINK | com.intellij.uiDesigner.core.GridConstraints.SIZEPOLICY_CAN_GROW, com.intellij.uiDesigner.core.GridConstraints.SIZEPOLICY_CAN_SHRINK | com.intellij.uiDesigner.core.GridConstraints.SIZEPOLICY_CAN_GROW, null, null, null, 0, false)); - guardarButton = new JButton(); - guardarButton.setText("Guardar"); - panel3.add(guardarButton, new com.intellij.uiDesigner.core.GridConstraints(0, 1, 1, 1, com.intellij.uiDesigner.core.GridConstraints.ANCHOR_CENTER, com.intellij.uiDesigner.core.GridConstraints.FILL_HORIZONTAL, com.intellij.uiDesigner.core.GridConstraints.SIZEPOLICY_CAN_SHRINK | com.intellij.uiDesigner.core.GridConstraints.SIZEPOLICY_CAN_GROW, com.intellij.uiDesigner.core.GridConstraints.SIZEPOLICY_FIXED, null, new Dimension(200, -1), null, 0, false)); - final com.intellij.uiDesigner.core.Spacer spacer1 = new com.intellij.uiDesigner.core.Spacer(); - panel3.add(spacer1, new com.intellij.uiDesigner.core.GridConstraints(0, 2, 1, 1, com.intellij.uiDesigner.core.GridConstraints.ANCHOR_CENTER, com.intellij.uiDesigner.core.GridConstraints.FILL_HORIZONTAL, com.intellij.uiDesigner.core.GridConstraints.SIZEPOLICY_WANT_GROW, 1, null, null, null, 0, false)); - final com.intellij.uiDesigner.core.Spacer spacer2 = new com.intellij.uiDesigner.core.Spacer(); - panel3.add(spacer2, new com.intellij.uiDesigner.core.GridConstraints(0, 0, 1, 1, com.intellij.uiDesigner.core.GridConstraints.ANCHOR_CENTER, com.intellij.uiDesigner.core.GridConstraints.FILL_HORIZONTAL, com.intellij.uiDesigner.core.GridConstraints.SIZEPOLICY_WANT_GROW, 1, null, null, null, 0, false)); - final JPanel panel4 = new JPanel(); - panel4.setLayout(new com.intellij.uiDesigner.core.GridLayoutManager(9, 2, new Insets(10, 10, 10, 10), -1, -1)); - contentPanel.add(panel4, new com.intellij.uiDesigner.core.GridConstraints(0, 0, 2, 1, com.intellij.uiDesigner.core.GridConstraints.ANCHOR_CENTER, com.intellij.uiDesigner.core.GridConstraints.FILL_BOTH, com.intellij.uiDesigner.core.GridConstraints.SIZEPOLICY_CAN_SHRINK | com.intellij.uiDesigner.core.GridConstraints.SIZEPOLICY_CAN_GROW, com.intellij.uiDesigner.core.GridConstraints.SIZEPOLICY_CAN_SHRINK | com.intellij.uiDesigner.core.GridConstraints.SIZEPOLICY_CAN_GROW, null, null, null, 0, false)); - panel4.setBorder(BorderFactory.createTitledBorder(BorderFactory.createEtchedBorder(), "Detalle Efectivo", TitledBorder.DEFAULT_JUSTIFICATION, TitledBorder.DEFAULT_POSITION, this.$$$getFont$$$(null, -1, -1, panel4.getFont()))); + panel3.setLayout(new GridLayoutManager(19, 2, new Insets(10, 10, 10, 10), -1, -1)); + contentPanel.add(panel3, new GridConstraints(0, 0, 2, 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)); + panel3.setBorder(BorderFactory.createTitledBorder(BorderFactory.createEtchedBorder(), "Detalle Efectivo", TitledBorder.DEFAULT_JUSTIFICATION, TitledBorder.DEFAULT_POSITION, this.$$$getFont$$$(null, -1, -1, panel3.getFont()))); final JLabel label8 = new JLabel(); label8.setText("$20000"); - panel4.add(label8, new com.intellij.uiDesigner.core.GridConstraints(0, 0, 1, 1, com.intellij.uiDesigner.core.GridConstraints.ANCHOR_EAST, com.intellij.uiDesigner.core.GridConstraints.FILL_NONE, com.intellij.uiDesigner.core.GridConstraints.SIZEPOLICY_FIXED, com.intellij.uiDesigner.core.GridConstraints.SIZEPOLICY_FIXED, null, null, null, 0, false)); + panel3.add(label8, new GridConstraints(0, 0, 1, 1, GridConstraints.ANCHOR_EAST, GridConstraints.FILL_NONE, GridConstraints.SIZEPOLICY_FIXED, GridConstraints.SIZEPOLICY_FIXED, null, null, null, 0, false)); veinteMilField = new JTextField(); veinteMilField.setText("0"); - panel4.add(veinteMilField, new com.intellij.uiDesigner.core.GridConstraints(0, 1, 1, 1, com.intellij.uiDesigner.core.GridConstraints.ANCHOR_WEST, com.intellij.uiDesigner.core.GridConstraints.FILL_HORIZONTAL, com.intellij.uiDesigner.core.GridConstraints.SIZEPOLICY_WANT_GROW, com.intellij.uiDesigner.core.GridConstraints.SIZEPOLICY_FIXED, null, new Dimension(200, -1), null, 0, false)); + panel3.add(veinteMilField, new GridConstraints(0, 1, 1, 1, GridConstraints.ANCHOR_WEST, GridConstraints.FILL_HORIZONTAL, GridConstraints.SIZEPOLICY_WANT_GROW, GridConstraints.SIZEPOLICY_FIXED, null, new Dimension(200, -1), null, 0, false)); final JLabel label9 = new JLabel(); label9.setText("$10000"); - panel4.add(label9, new com.intellij.uiDesigner.core.GridConstraints(1, 0, 1, 1, com.intellij.uiDesigner.core.GridConstraints.ANCHOR_EAST, com.intellij.uiDesigner.core.GridConstraints.FILL_NONE, com.intellij.uiDesigner.core.GridConstraints.SIZEPOLICY_FIXED, com.intellij.uiDesigner.core.GridConstraints.SIZEPOLICY_FIXED, null, null, null, 0, false)); + panel3.add(label9, new GridConstraints(2, 0, 1, 1, GridConstraints.ANCHOR_EAST, GridConstraints.FILL_NONE, GridConstraints.SIZEPOLICY_FIXED, GridConstraints.SIZEPOLICY_FIXED, null, null, null, 0, false)); diezMilField = new JTextField(); diezMilField.setText("0"); - panel4.add(diezMilField, new com.intellij.uiDesigner.core.GridConstraints(1, 1, 1, 1, com.intellij.uiDesigner.core.GridConstraints.ANCHOR_WEST, com.intellij.uiDesigner.core.GridConstraints.FILL_HORIZONTAL, com.intellij.uiDesigner.core.GridConstraints.SIZEPOLICY_WANT_GROW, com.intellij.uiDesigner.core.GridConstraints.SIZEPOLICY_FIXED, null, new Dimension(200, -1), null, 0, false)); + panel3.add(diezMilField, new GridConstraints(2, 1, 1, 1, GridConstraints.ANCHOR_WEST, GridConstraints.FILL_HORIZONTAL, GridConstraints.SIZEPOLICY_WANT_GROW, GridConstraints.SIZEPOLICY_FIXED, null, new Dimension(200, -1), null, 0, false)); cincoMilField = new JTextField(); cincoMilField.setText("0"); - panel4.add(cincoMilField, new com.intellij.uiDesigner.core.GridConstraints(2, 1, 1, 1, com.intellij.uiDesigner.core.GridConstraints.ANCHOR_WEST, com.intellij.uiDesigner.core.GridConstraints.FILL_HORIZONTAL, com.intellij.uiDesigner.core.GridConstraints.SIZEPOLICY_WANT_GROW, com.intellij.uiDesigner.core.GridConstraints.SIZEPOLICY_FIXED, null, new Dimension(200, -1), null, 0, false)); + panel3.add(cincoMilField, new GridConstraints(4, 1, 1, 1, GridConstraints.ANCHOR_WEST, GridConstraints.FILL_HORIZONTAL, GridConstraints.SIZEPOLICY_WANT_GROW, GridConstraints.SIZEPOLICY_FIXED, null, new Dimension(200, -1), null, 0, false)); final JLabel label10 = new JLabel(); label10.setText("$5000"); - panel4.add(label10, new com.intellij.uiDesigner.core.GridConstraints(2, 0, 1, 1, com.intellij.uiDesigner.core.GridConstraints.ANCHOR_EAST, com.intellij.uiDesigner.core.GridConstraints.FILL_NONE, com.intellij.uiDesigner.core.GridConstraints.SIZEPOLICY_FIXED, com.intellij.uiDesigner.core.GridConstraints.SIZEPOLICY_FIXED, null, null, null, 0, false)); + panel3.add(label10, new GridConstraints(4, 0, 1, 1, GridConstraints.ANCHOR_EAST, GridConstraints.FILL_NONE, GridConstraints.SIZEPOLICY_FIXED, GridConstraints.SIZEPOLICY_FIXED, null, null, null, 0, false)); final JLabel label11 = new JLabel(); label11.setText("$2000"); - panel4.add(label11, new com.intellij.uiDesigner.core.GridConstraints(3, 0, 1, 1, com.intellij.uiDesigner.core.GridConstraints.ANCHOR_EAST, com.intellij.uiDesigner.core.GridConstraints.FILL_NONE, com.intellij.uiDesigner.core.GridConstraints.SIZEPOLICY_FIXED, com.intellij.uiDesigner.core.GridConstraints.SIZEPOLICY_FIXED, null, null, null, 0, false)); + panel3.add(label11, new GridConstraints(6, 0, 1, 1, GridConstraints.ANCHOR_EAST, GridConstraints.FILL_NONE, GridConstraints.SIZEPOLICY_FIXED, GridConstraints.SIZEPOLICY_FIXED, null, null, null, 0, false)); dosMilField = new JTextField(); dosMilField.setText("0"); - panel4.add(dosMilField, new com.intellij.uiDesigner.core.GridConstraints(3, 1, 1, 1, com.intellij.uiDesigner.core.GridConstraints.ANCHOR_WEST, com.intellij.uiDesigner.core.GridConstraints.FILL_HORIZONTAL, com.intellij.uiDesigner.core.GridConstraints.SIZEPOLICY_WANT_GROW, com.intellij.uiDesigner.core.GridConstraints.SIZEPOLICY_FIXED, null, new Dimension(200, -1), null, 0, false)); + panel3.add(dosMilField, new GridConstraints(6, 1, 1, 1, GridConstraints.ANCHOR_WEST, GridConstraints.FILL_HORIZONTAL, GridConstraints.SIZEPOLICY_WANT_GROW, GridConstraints.SIZEPOLICY_FIXED, null, new Dimension(200, -1), null, 0, false)); milField = new JTextField(); milField.setText("0"); - panel4.add(milField, new com.intellij.uiDesigner.core.GridConstraints(4, 1, 1, 1, com.intellij.uiDesigner.core.GridConstraints.ANCHOR_WEST, com.intellij.uiDesigner.core.GridConstraints.FILL_HORIZONTAL, com.intellij.uiDesigner.core.GridConstraints.SIZEPOLICY_WANT_GROW, com.intellij.uiDesigner.core.GridConstraints.SIZEPOLICY_FIXED, null, new Dimension(200, -1), null, 0, false)); + panel3.add(milField, new GridConstraints(8, 1, 1, 1, GridConstraints.ANCHOR_WEST, GridConstraints.FILL_HORIZONTAL, GridConstraints.SIZEPOLICY_WANT_GROW, GridConstraints.SIZEPOLICY_FIXED, null, new Dimension(200, -1), null, 0, false)); final JLabel label12 = new JLabel(); label12.setText("$1000"); - panel4.add(label12, new com.intellij.uiDesigner.core.GridConstraints(4, 0, 1, 1, com.intellij.uiDesigner.core.GridConstraints.ANCHOR_EAST, com.intellij.uiDesigner.core.GridConstraints.FILL_NONE, com.intellij.uiDesigner.core.GridConstraints.SIZEPOLICY_FIXED, com.intellij.uiDesigner.core.GridConstraints.SIZEPOLICY_FIXED, null, null, null, 0, false)); + panel3.add(label12, new GridConstraints(8, 0, 1, 1, GridConstraints.ANCHOR_EAST, GridConstraints.FILL_NONE, GridConstraints.SIZEPOLICY_FIXED, GridConstraints.SIZEPOLICY_FIXED, null, null, null, 0, false)); final JLabel label13 = new JLabel(); label13.setText("$500"); - panel4.add(label13, new com.intellij.uiDesigner.core.GridConstraints(5, 0, 1, 1, com.intellij.uiDesigner.core.GridConstraints.ANCHOR_EAST, com.intellij.uiDesigner.core.GridConstraints.FILL_NONE, com.intellij.uiDesigner.core.GridConstraints.SIZEPOLICY_FIXED, com.intellij.uiDesigner.core.GridConstraints.SIZEPOLICY_FIXED, null, null, null, 0, false)); + panel3.add(label13, new GridConstraints(10, 0, 1, 1, GridConstraints.ANCHOR_EAST, GridConstraints.FILL_NONE, GridConstraints.SIZEPOLICY_FIXED, GridConstraints.SIZEPOLICY_FIXED, null, null, null, 0, false)); quinientosField = new JTextField(); quinientosField.setText("0"); - panel4.add(quinientosField, new com.intellij.uiDesigner.core.GridConstraints(5, 1, 1, 1, com.intellij.uiDesigner.core.GridConstraints.ANCHOR_WEST, com.intellij.uiDesigner.core.GridConstraints.FILL_HORIZONTAL, com.intellij.uiDesigner.core.GridConstraints.SIZEPOLICY_WANT_GROW, com.intellij.uiDesigner.core.GridConstraints.SIZEPOLICY_FIXED, null, new Dimension(200, -1), null, 0, false)); + panel3.add(quinientosField, new GridConstraints(10, 1, 1, 1, GridConstraints.ANCHOR_WEST, GridConstraints.FILL_HORIZONTAL, GridConstraints.SIZEPOLICY_WANT_GROW, GridConstraints.SIZEPOLICY_FIXED, null, new Dimension(200, -1), null, 0, false)); final JLabel label14 = new JLabel(); label14.setText("$100"); - panel4.add(label14, new com.intellij.uiDesigner.core.GridConstraints(6, 0, 1, 1, com.intellij.uiDesigner.core.GridConstraints.ANCHOR_EAST, com.intellij.uiDesigner.core.GridConstraints.FILL_NONE, com.intellij.uiDesigner.core.GridConstraints.SIZEPOLICY_FIXED, com.intellij.uiDesigner.core.GridConstraints.SIZEPOLICY_FIXED, null, null, null, 0, false)); + panel3.add(label14, new GridConstraints(12, 0, 1, 1, GridConstraints.ANCHOR_EAST, GridConstraints.FILL_NONE, GridConstraints.SIZEPOLICY_FIXED, GridConstraints.SIZEPOLICY_FIXED, null, null, null, 0, false)); cienField = new JTextField(); cienField.setText("0"); - panel4.add(cienField, new com.intellij.uiDesigner.core.GridConstraints(6, 1, 1, 1, com.intellij.uiDesigner.core.GridConstraints.ANCHOR_WEST, com.intellij.uiDesigner.core.GridConstraints.FILL_HORIZONTAL, com.intellij.uiDesigner.core.GridConstraints.SIZEPOLICY_WANT_GROW, com.intellij.uiDesigner.core.GridConstraints.SIZEPOLICY_FIXED, null, new Dimension(200, -1), null, 0, false)); + panel3.add(cienField, new GridConstraints(12, 1, 1, 1, GridConstraints.ANCHOR_WEST, GridConstraints.FILL_HORIZONTAL, GridConstraints.SIZEPOLICY_WANT_GROW, GridConstraints.SIZEPOLICY_FIXED, null, new Dimension(200, -1), null, 0, false)); final JLabel label15 = new JLabel(); label15.setText("$50"); - panel4.add(label15, new com.intellij.uiDesigner.core.GridConstraints(7, 0, 1, 1, com.intellij.uiDesigner.core.GridConstraints.ANCHOR_EAST, com.intellij.uiDesigner.core.GridConstraints.FILL_NONE, com.intellij.uiDesigner.core.GridConstraints.SIZEPOLICY_FIXED, com.intellij.uiDesigner.core.GridConstraints.SIZEPOLICY_FIXED, null, null, null, 0, false)); + panel3.add(label15, new GridConstraints(14, 0, 1, 1, GridConstraints.ANCHOR_EAST, GridConstraints.FILL_NONE, GridConstraints.SIZEPOLICY_FIXED, GridConstraints.SIZEPOLICY_FIXED, null, null, null, 0, false)); cincuentaField = new JTextField(); cincuentaField.setText("0"); - panel4.add(cincuentaField, new com.intellij.uiDesigner.core.GridConstraints(7, 1, 1, 1, com.intellij.uiDesigner.core.GridConstraints.ANCHOR_WEST, com.intellij.uiDesigner.core.GridConstraints.FILL_HORIZONTAL, com.intellij.uiDesigner.core.GridConstraints.SIZEPOLICY_WANT_GROW, com.intellij.uiDesigner.core.GridConstraints.SIZEPOLICY_FIXED, null, new Dimension(200, -1), null, 0, false)); + panel3.add(cincuentaField, new GridConstraints(14, 1, 1, 1, GridConstraints.ANCHOR_WEST, GridConstraints.FILL_HORIZONTAL, GridConstraints.SIZEPOLICY_WANT_GROW, GridConstraints.SIZEPOLICY_FIXED, null, new Dimension(200, -1), null, 0, false)); final JLabel label16 = new JLabel(); label16.setText("$10"); - panel4.add(label16, new com.intellij.uiDesigner.core.GridConstraints(8, 0, 1, 1, com.intellij.uiDesigner.core.GridConstraints.ANCHOR_EAST, com.intellij.uiDesigner.core.GridConstraints.FILL_NONE, com.intellij.uiDesigner.core.GridConstraints.SIZEPOLICY_FIXED, com.intellij.uiDesigner.core.GridConstraints.SIZEPOLICY_FIXED, null, null, null, 0, false)); + panel3.add(label16, new GridConstraints(16, 0, 1, 1, GridConstraints.ANCHOR_EAST, GridConstraints.FILL_NONE, GridConstraints.SIZEPOLICY_FIXED, GridConstraints.SIZEPOLICY_FIXED, null, null, null, 0, false)); diezField = new JTextField(); diezField.setText("0"); - panel4.add(diezField, new com.intellij.uiDesigner.core.GridConstraints(8, 1, 1, 1, com.intellij.uiDesigner.core.GridConstraints.ANCHOR_WEST, com.intellij.uiDesigner.core.GridConstraints.FILL_HORIZONTAL, com.intellij.uiDesigner.core.GridConstraints.SIZEPOLICY_WANT_GROW, com.intellij.uiDesigner.core.GridConstraints.SIZEPOLICY_FIXED, null, new Dimension(200, -1), null, 0, false)); + panel3.add(diezField, new GridConstraints(16, 1, 1, 1, GridConstraints.ANCHOR_WEST, GridConstraints.FILL_HORIZONTAL, GridConstraints.SIZEPOLICY_WANT_GROW, GridConstraints.SIZEPOLICY_FIXED, null, new Dimension(200, -1), null, 0, false)); + guardarEfectivoButton = new JButton(); + guardarEfectivoButton.setText("Guardar"); + panel3.add(guardarEfectivoButton, new GridConstraints(18, 0, 1, 2, GridConstraints.ANCHOR_CENTER, GridConstraints.FILL_HORIZONTAL, GridConstraints.SIZEPOLICY_CAN_SHRINK | GridConstraints.SIZEPOLICY_CAN_GROW, GridConstraints.SIZEPOLICY_FIXED, null, new Dimension(200, -1), null, 0, false)); + errorVeinteMil = new JLabel(); + errorVeinteMil.setForeground(new Color(-65536)); + errorVeinteMil.setText("Error"); + errorVeinteMil.setVisible(false); + panel3.add(errorVeinteMil, new GridConstraints(1, 1, 1, 1, GridConstraints.ANCHOR_WEST, GridConstraints.FILL_NONE, GridConstraints.SIZEPOLICY_FIXED, GridConstraints.SIZEPOLICY_FIXED, null, null, null, 0, false)); + errorDiezMil = new JLabel(); + errorDiezMil.setForeground(new Color(-65536)); + errorDiezMil.setText("Error"); + errorDiezMil.setVisible(false); + panel3.add(errorDiezMil, new GridConstraints(3, 1, 1, 1, GridConstraints.ANCHOR_WEST, GridConstraints.FILL_NONE, GridConstraints.SIZEPOLICY_FIXED, GridConstraints.SIZEPOLICY_FIXED, null, null, null, 0, false)); + errorCincoMil = new JLabel(); + errorCincoMil.setForeground(new Color(-65536)); + errorCincoMil.setText("Error"); + errorCincoMil.setVisible(false); + panel3.add(errorCincoMil, new GridConstraints(5, 1, 1, 1, GridConstraints.ANCHOR_WEST, GridConstraints.FILL_NONE, GridConstraints.SIZEPOLICY_FIXED, GridConstraints.SIZEPOLICY_FIXED, null, null, null, 0, false)); + errorDosMil = new JLabel(); + errorDosMil.setForeground(new Color(-65536)); + errorDosMil.setText("Error"); + errorDosMil.setVisible(false); + panel3.add(errorDosMil, new GridConstraints(7, 1, 1, 1, GridConstraints.ANCHOR_WEST, GridConstraints.FILL_NONE, GridConstraints.SIZEPOLICY_FIXED, GridConstraints.SIZEPOLICY_FIXED, null, null, null, 0, false)); + errorMil = new JLabel(); + errorMil.setForeground(new Color(-65536)); + errorMil.setText("Error"); + errorMil.setVisible(false); + panel3.add(errorMil, new GridConstraints(9, 1, 1, 1, GridConstraints.ANCHOR_WEST, GridConstraints.FILL_NONE, GridConstraints.SIZEPOLICY_FIXED, GridConstraints.SIZEPOLICY_FIXED, null, null, null, 0, false)); + errorQuinientos = new JLabel(); + errorQuinientos.setForeground(new Color(-65536)); + errorQuinientos.setText("Error"); + errorQuinientos.setVisible(false); + panel3.add(errorQuinientos, new GridConstraints(11, 1, 1, 1, GridConstraints.ANCHOR_WEST, GridConstraints.FILL_NONE, GridConstraints.SIZEPOLICY_FIXED, GridConstraints.SIZEPOLICY_FIXED, null, null, null, 0, false)); + errorCien = new JLabel(); + errorCien.setForeground(new Color(-65536)); + errorCien.setText("Error"); + errorCien.setVisible(false); + panel3.add(errorCien, new GridConstraints(13, 1, 1, 1, GridConstraints.ANCHOR_WEST, GridConstraints.FILL_NONE, GridConstraints.SIZEPOLICY_FIXED, GridConstraints.SIZEPOLICY_FIXED, null, null, null, 0, false)); + errorCincuenta = new JLabel(); + errorCincuenta.setForeground(new Color(-65536)); + errorCincuenta.setText("Error"); + errorCincuenta.setVisible(false); + panel3.add(errorCincuenta, new GridConstraints(15, 1, 1, 1, GridConstraints.ANCHOR_WEST, GridConstraints.FILL_NONE, GridConstraints.SIZEPOLICY_FIXED, GridConstraints.SIZEPOLICY_FIXED, null, null, null, 0, false)); + errorDiez = new JLabel(); + errorDiez.setForeground(new Color(-65536)); + errorDiez.setText("Error"); + errorDiez.setVisible(false); + panel3.add(errorDiez, new GridConstraints(17, 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/danielcortes/xyz/views/ManagerView.java b/src/main/java/danielcortes/xyz/views/ManagerView.java index 889a74d..a560265 100644 --- a/src/main/java/danielcortes/xyz/views/ManagerView.java +++ b/src/main/java/danielcortes/xyz/views/ManagerView.java @@ -62,7 +62,6 @@ public class ManagerView { return cardPanel; } - { // GUI initializer generated by IntelliJ IDEA GUI Designer // >>> IMPORTANT!! <<< @@ -116,5 +115,4 @@ public class ManagerView { public JComponent $$$getRootComponent$$$() { return contentPanel; } - }