diff --git a/.idea/dataSources.xml b/.idea/dataSources.xml index 7f27263..482786e 100644 --- a/.idea/dataSources.xml +++ b/.idea/dataSources.xml @@ -19,7 +19,7 @@ sqlite.xerial true org.sqlite.JDBC - jdbc:sqlite:$PROJECT_DIR$/database.sqlite + jdbc:sqlite:$PROJECT_DIR$/dist/database.sqlite diff --git a/.idea/dataSources/6e2ee496-6ca2-4cc4-a2b0-4f122e6bfd50.xml b/.idea/dataSources/6e2ee496-6ca2-4cc4-a2b0-4f122e6bfd50.xml index f1eea48..96521f8 100644 --- a/.idea/dataSources/6e2ee496-6ca2-4cc4-a2b0-4f122e6bfd50.xml +++ b/.idea/dataSources/6e2ee496-6ca2-4cc4-a2b0-4f122e6bfd50.xml @@ -205,67 +205,75 @@ integer unsigned|0s 1 - + + 7 + text|0s + + + 8 + text|0s + + id 1 - + tipo_ingreso_id tipos_ingreso id restrict cascade - + caja_id caja id restrict cascade - + 1 text|0s - + 2 text|0s - + 3 text|0s - + 4 int|0s - + 5 text|0s - + 1 integer|0s - + 2 text|0s 1 - + id 1 - + 1 integer|0s - + 2 text|0s 1 - + id 1 diff --git a/.idea/workspace.xml b/.idea/workspace.xml index f069337..f0f9c3b 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -6,61 +6,23 @@ - + - - - - + + + - - - - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - @@ -103,7 +65,7 @@ - + - - @@ -326,7 +317,7 @@ - + @@ -339,7 +330,7 @@ - + @@ -507,6 +498,7 @@ + 1545280618093 @@ -690,11 +682,18 @@ - - @@ -707,17 +706,18 @@ + - + - + - + @@ -727,7 +727,7 @@ - + @@ -821,17 +821,14 @@ - - - - - @@ -841,13 +838,7 @@ - - - - - - - + @@ -875,13 +866,6 @@ - - - - - - - @@ -918,22 +902,6 @@ - - - - - - - - - - - - - - - - @@ -953,31 +921,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1026,78 +969,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1154,61 +1025,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1288,20 +1104,305 @@ - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/database/sqlite.sql b/database/sqlite.sql index abb87a2..83ed8f9 100644 --- a/database/sqlite.sql +++ b/database/sqlite.sql @@ -98,7 +98,6 @@ create table documentos foreign key (caja_id) references caja (id) on update cascade on delete restrict ); - insert into tipos_egreso (nombre) values ('Factura Materia Prima'), ('Factura Gastos Generales'), @@ -116,5 +115,12 @@ insert into tipos_ingreso (nombre) values ('Boletas Fiscales'), ('Boletas Manuales'), ('Facturas'), - ('Guias') + ('Guias'); + +/* + Primera Migracion, se agrega las columnas de nro de z inicial y final para el ingreso. +*/ + +alter table ingresos add column nro_z_inicial text; +alter table ingresos add column nro_z_final text; diff --git a/dist/caja.jar b/dist/caja.jar index 4b90417..460f489 100644 Binary files a/dist/caja.jar and b/dist/caja.jar differ diff --git a/dist/database.sqlite b/dist/database.sqlite index 7e695ec..2aaa967 100644 Binary files a/dist/database.sqlite and b/dist/database.sqlite differ diff --git a/src/danielcortes/xyz/controllers/IngresosController.java b/src/danielcortes/xyz/controllers/IngresosController.java index fd7c802..2523c1b 100644 --- a/src/danielcortes/xyz/controllers/IngresosController.java +++ b/src/danielcortes/xyz/controllers/IngresosController.java @@ -31,7 +31,6 @@ import danielcortes.xyz.models.tipo_ingreso.TipoIngreso; import danielcortes.xyz.models.tipo_ingreso.TipoIngresoDAO; import danielcortes.xyz.views.IngresosView; import danielcortes.xyz.views.components.IngresosTableModel; -import org.jetbrains.annotations.Contract; import javax.swing.*; import java.awt.event.*; @@ -121,11 +120,15 @@ public class IngresosController { */ private void setupViewEvents() { this.view.getValorField().getInputMap(JComponent.WHEN_FOCUSED).put(KeyStroke.getKeyStroke("ENTER"), "nextField"); + this.view.getNroZInicialField().getInputMap(JComponent.WHEN_FOCUSED).put(KeyStroke.getKeyStroke("ENTER"), "nextField"); + this.view.getNroZFinalField().getInputMap(JComponent.WHEN_FOCUSED).put(KeyStroke.getKeyStroke("ENTER"), "nextField"); this.view.getNroInicialField().getInputMap(JComponent.WHEN_FOCUSED).put(KeyStroke.getKeyStroke("ENTER"), "nextField"); this.view.getNroFinalField().getInputMap(JComponent.WHEN_FOCUSED).put(KeyStroke.getKeyStroke("ENTER"), "nextField"); this.view.getTipoCombo().getInputMap(JComponent.WHEN_FOCUSED).put(KeyStroke.getKeyStroke("ENTER"), "save"); - this.view.getValorField().getActionMap().put("nextField", new NextAction(this.view.getNroInicialField())); + this.view.getValorField().getActionMap().put("nextField", new NextAction(this.view.getNroZInicialField())); + this.view.getNroZInicialField().getActionMap().put("nextField", new NextAction(this.view.getNroZFinalField())); + this.view.getNroZFinalField().getActionMap().put("nextField", new NextAction(this.view.getNroInicialField())); this.view.getNroInicialField().getActionMap().put("nextField", new NextAction(this.view.getNroFinalField())); this.view.getNroFinalField().getActionMap().put("nextField", new NextAction(this.view.getTipoCombo())); this.view.getTipoCombo().getActionMap().put("save", new GuardarAction(this)); @@ -156,14 +159,16 @@ public class IngresosController { this.hideErrorMessages(); String valor = this.view.getValorField().getText(); + String nroZInicial = this.view.getNroZInicialField().getText(); + String nroZFinal = this.view.getNroZFinalField().getText(); String nroInicial = this.view.getNroInicialField().getText(); String nroFinal = this.view.getNroFinalField().getText(); TipoIngreso tipoIngreso = (TipoIngreso) this.view.getTipoCombo().getSelectedItem(); if(editing) { - this.editarIngreso(valor, nroInicial, nroFinal, tipoIngreso, this.caja); + this.editarIngreso(valor, nroZInicial, nroZFinal, nroInicial, nroFinal, tipoIngreso, this.caja); } else { - this.guardarIngreso(valor, nroInicial, nroFinal, tipoIngreso, this.caja); + this.guardarIngreso(valor, nroZInicial, nroZFinal, nroInicial, nroFinal, tipoIngreso, this.caja); } this.resetFocus(); } @@ -204,6 +209,8 @@ public class IngresosController { this.view.getTipoCombo().setSelectedItem(ingreso.getTipoIngreso()); this.view.getValorField().setText(String.valueOf(ingreso.getValor())); + this.view.getNroZInicialField().setText(String.valueOf(ingreso.getNroZInicial())); + this.view.getNroZFinalField().setText(String.valueOf(ingreso.getNroZFinal())); this.view.getNroInicialField().setText(String.valueOf(ingreso.getNroInicial())); this.view.getNroFinalField().setText(String.valueOf(ingreso.getNroFinal())); } @@ -236,12 +243,14 @@ public class IngresosController { * Guarda un ingreso tras llamar a validar el input * Luego de guardar agrega a la tabla el ingreso, llama a limpiar los campos de input y a actualizar el total de ingresos */ - private void guardarIngreso(String valor, String nroInicial, String nroFinal, TipoIngreso tipoIngreso, Caja caja){ - if(this.validateInput(valor, nroInicial, nroFinal, tipoIngreso, caja)){ + private void guardarIngreso(String valor, String nroZInicial, String nroZFinal, String nroInicial, String nroFinal, TipoIngreso tipoIngreso, Caja caja){ + if(this.validateInput(valor, nroZInicial, nroZFinal, nroInicial, nroFinal, tipoIngreso, caja)){ Ingreso ingreso = new Ingreso(); ingreso.setTipoIngreso(tipoIngreso); ingreso.setCaja(caja); ingreso.setValor(Integer.valueOf(valor)); + ingreso.setNroZInicial(nroZInicial); + ingreso.setNroZFinal(nroZFinal); ingreso.setNroInicial(nroInicial); ingreso.setNroFinal(nroFinal); @@ -258,10 +267,12 @@ public class IngresosController { * Tras esto actualiza el ingreso en la tabla, llama a actualizar el total de ingresos, a limpiar los campos de input y a desactivar la flag de editing. * */ - private void editarIngreso(String valor, String nroInicial, String nroFinal, TipoIngreso tipoIngreso, Caja caja){ - if(this.validateInput(valor, nroInicial, nroFinal, tipoIngreso, caja)){ + private void editarIngreso(String valor, String nroZInicial, String nroZFinal, String nroInicial, String nroFinal, TipoIngreso tipoIngreso, Caja caja){ + if(this.validateInput(valor, nroZInicial, nroZFinal, nroInicial, nroFinal, tipoIngreso, caja)){ this.editingIngreso.setTipoIngreso(tipoIngreso); this.editingIngreso.setValor(Integer.valueOf(valor)); + this.editingIngreso.setNroZInicial(nroZInicial); + this.editingIngreso.setNroZFinal(nroZFinal); this.editingIngreso.setNroInicial(nroInicial); this.editingIngreso.setNroFinal(nroFinal); this.ingresoDAO.updateIngreso(this.editingIngreso); @@ -276,10 +287,12 @@ public class IngresosController { * Llama a los metodos necesarios para validar el input * @return true cuando todas las validaciones retoran true, si no, false */ - private boolean validateInput(String valor, String nroInicial, String nroFinal, TipoIngreso tipoIngreso, Caja caja) { + private boolean validateInput(String valor, String nroZInicial, String nroZFinal, String nroInicial, String nroFinal, TipoIngreso tipoIngreso, Caja caja) { this.hideErrorMessages(); boolean valorValidation = this.validateValor(valor); + boolean nroZInicialValidation = this.validateNroZInicial(nroZInicial); + boolean nroZFinalValidation = this.validateNroZFinal(nroZFinal); boolean nroInicialValidation = this.validateNroInicial(nroInicial); boolean nroFinalValidation = this.validateNroFinal(nroFinal); boolean tipoIngresoValidation = this.validateTipoIngreso(tipoIngreso); @@ -335,6 +348,50 @@ public class IngresosController { } + /** + * Valida la variable nroInicial contra los casos + * - Es null + * - Esta vacio + * Cuando el primer caso sea true, colocara un mensaje de error correspondiente en el jlabel correspondiente + * @return Si cualquiera de estos casos son true se retornara false, si no, se retorna true + */ + private boolean validateNroZInicial(String nroZInicial){ + if (nroZInicial == null) { + this.view.getErrorNroInicial().setText("Hubo un problema con los datos"); + this.view.getErrorNroInicial().setVisible(true); + return false; + } + + if (nroZInicial.isEmpty()) { + this.view.getErrorNroInicial().setText("El campo esta vacio"); + this.view.getErrorNroInicial().setVisible(true); + return false; + } + return true; + } + + /** + * Valida la variable nroFinal contra los casos + * - Es null + * - Esta vacio + * Cuando el primer caso sea true, colocara un mensaje de error correspondiente en el jlabel correspondiente + * @return Si cualquiera de estos casos son true se retornara false, si no, se retorna true + */ + private boolean validateNroZFinal(String nroZFinal){ + if (nroZFinal == null) { + this.view.getErrorNroFinal().setText("Hubo un problema con los datos"); + this.view.getErrorNroFinal().setVisible(true); + return false; + } + + if (nroZFinal.isEmpty()) { + this.view.getErrorNroFinal().setText("El campo esta vacio"); + this.view.getErrorNroFinal().setVisible(true); + return false; + } + return true; + } + /** * Valida la variable nroInicial contra los casos * - Es null @@ -400,6 +457,8 @@ public class IngresosController { private void hideErrorMessages() { this.view.getErrorTipoIngreso().setVisible(false); this.view.getErrorValor().setVisible(false); + this.view.getErrorNroZInicial().setVisible(false); + this.view.getErrorNroZFinal().setVisible(false); this.view.getErrorNroInicial().setVisible(false); this.view.getErrorNroFinal().setVisible(false); } @@ -410,6 +469,8 @@ public class IngresosController { private void clearInputs() { this.view.getTipoCombo().setSelectedIndex(0); this.view.getValorField().setText(""); + this.view.getNroZInicialField().setText(""); + this.view.getNroZFinalField().setText(""); this.view.getNroInicialField().setText(""); this.view.getNroFinalField().setText(""); } @@ -419,6 +480,8 @@ public class IngresosController { */ private void normalizeInputs(){ this.view.getValorField().setText(this.view.getValorField().getText().trim()); + this.view.getNroZInicialField().setText(this.view.getNroZInicialField().getText().trim()); + this.view.getNroZFinalField().setText(this.view.getNroZFinalField().getText().trim()); this.view.getNroInicialField().setText(this.view.getNroInicialField().getText().trim()); this.view.getNroFinalField().setText(this.view.getNroFinalField().getText().trim()); } diff --git a/src/danielcortes/xyz/models/ingreso/Ingreso.java b/src/danielcortes/xyz/models/ingreso/Ingreso.java index fb497b9..86992c2 100644 --- a/src/danielcortes/xyz/models/ingreso/Ingreso.java +++ b/src/danielcortes/xyz/models/ingreso/Ingreso.java @@ -30,6 +30,8 @@ import danielcortes.xyz.models.tipo_ingreso.TipoIngreso; public class Ingreso { private int id; private int valor; + private String nroZInicial; + private String nroZFinal; private String nroInicial; private String nroFinal; private TipoIngreso tipoIngreso; @@ -51,6 +53,22 @@ public class Ingreso { this.valor = valor; } + public String getNroZInicial() { + return nroZInicial; + } + + public void setNroZInicial(String nroZInicial) { + this.nroZInicial = nroZInicial; + } + + public String getNroZFinal() { + return nroZFinal; + } + + public void setNroZFinal(String nroZFinal) { + this.nroZFinal = nroZFinal; + } + public String getNroInicial() { return nroInicial; } diff --git a/src/danielcortes/xyz/models/ingreso/IngresoDAO.java b/src/danielcortes/xyz/models/ingreso/IngresoDAO.java index 9a1c066..826ac93 100644 --- a/src/danielcortes/xyz/models/ingreso/IngresoDAO.java +++ b/src/danielcortes/xyz/models/ingreso/IngresoDAO.java @@ -67,6 +67,8 @@ public abstract class IngresoDAO { ingreso.setId(rs.getInt("id")); ingreso.setValor(rs.getInt("valor")); + ingreso.setNroZInicial(rs.getString("nro_z_inicial")); + ingreso.setNroZFinal(rs.getString("nro_z_final")); ingreso.setNroInicial(rs.getString("nro_inicial")); ingreso.setNroFinal(rs.getString("nro_final")); ingreso.setTipoIngreso(tipoIngreso); diff --git a/src/danielcortes/xyz/models/ingreso/SQLiteIngresoDAO.java b/src/danielcortes/xyz/models/ingreso/SQLiteIngresoDAO.java index 0148206..9884afd 100644 --- a/src/danielcortes/xyz/models/ingreso/SQLiteIngresoDAO.java +++ b/src/danielcortes/xyz/models/ingreso/SQLiteIngresoDAO.java @@ -129,12 +129,14 @@ public class SQLiteIngresoDAO extends IngresoDAO { int updates; try { Connection conn = connectionHolder.getConnection(); - PreparedStatement ps = conn.prepareStatement("insert into ingresos (valor, nro_inicial, nro_final, tipo_ingreso_id, caja_id) values (?,?,?,?,?)"); + PreparedStatement ps = conn.prepareStatement("insert into ingresos (valor, nro_z_inicial, nro_z_final, nro_inicial, nro_final, tipo_ingreso_id, caja_id) values (?,?,?,?,?,?,?)"); ps.setInt(1, ingreso.getValor()); - ps.setString(2, ingreso.getNroInicial()); - ps.setString(3, ingreso.getNroFinal()); - ps.setInt(4, ingreso.getTipoIngreso().getId()); - ps.setInt(5, ingreso.getCaja().getId()); + ps.setString(2, ingreso.getNroZInicial()); + ps.setString(3, ingreso.getNroZFinal()); + ps.setString(4, ingreso.getNroInicial()); + ps.setString(5, ingreso.getNroFinal()); + ps.setInt(6, ingreso.getTipoIngreso().getId()); + ps.setInt(7, ingreso.getCaja().getId()); updates = ps.executeUpdate(); ps.close(); @@ -158,13 +160,15 @@ public class SQLiteIngresoDAO extends IngresoDAO { int updates; try { Connection conn = connectionHolder.getConnection(); - PreparedStatement ps = conn.prepareStatement("update ingresos set valor = ? , nro_inicial = ?, nro_final = ?, tipo_ingreso_id = ?, caja_id = ? where id = ?"); + PreparedStatement ps = conn.prepareStatement("update ingresos set valor = ?, nro_z_inicial = ?, nro_z_final = ?, nro_inicial = ?, nro_final = ?, tipo_ingreso_id = ?, caja_id = ? where id = ?"); ps.setInt(1,ingreso.getValor()); - ps.setString(2, ingreso.getNroInicial()); - ps.setString(3, ingreso.getNroFinal()); - ps.setInt(4, ingreso.getTipoIngreso().getId()); - ps.setInt(5, ingreso.getCaja().getId()); - ps.setInt(6, ingreso.getId()); + ps.setString(2, ingreso.getNroZInicial()); + ps.setString(3, ingreso.getNroZFinal()); + ps.setString(4, ingreso.getNroInicial()); + ps.setString(5, ingreso.getNroFinal()); + ps.setInt(6, ingreso.getTipoIngreso().getId()); + ps.setInt(7, ingreso.getCaja().getId()); + ps.setInt(8, ingreso.getId()); updates = ps.executeUpdate(); diff --git a/src/danielcortes/xyz/views/IngresosView.form b/src/danielcortes/xyz/views/IngresosView.form index 70cea4f..0b83138 100644 --- a/src/danielcortes/xyz/views/IngresosView.form +++ b/src/danielcortes/xyz/views/IngresosView.form @@ -3,7 +3,7 @@ - + @@ -29,17 +29,19 @@ - + - + + + - + @@ -47,7 +49,7 @@ - + @@ -73,7 +75,7 @@ - + @@ -81,7 +83,7 @@ - + @@ -89,7 +91,7 @@ - + @@ -97,7 +99,7 @@ - + @@ -105,7 +107,7 @@ - + @@ -125,7 +127,7 @@ - + @@ -134,6 +136,58 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/danielcortes/xyz/views/IngresosView.java b/src/danielcortes/xyz/views/IngresosView.java index 4ff1a33..125e8aa 100644 --- a/src/danielcortes/xyz/views/IngresosView.java +++ b/src/danielcortes/xyz/views/IngresosView.java @@ -28,7 +28,6 @@ import com.intellij.uiDesigner.core.GridConstraints; import com.intellij.uiDesigner.core.GridLayoutManager; import com.intellij.uiDesigner.core.Spacer; import danielcortes.xyz.models.tipo_ingreso.TipoIngreso; -import danielcortes.xyz.views.components.EgresosTableModel; import danielcortes.xyz.views.components.IngresosTableModel; import javax.swing.*; @@ -50,6 +49,10 @@ public class IngresosView { private JTextField nroFinalField; private JLabel errorNroInicial; private JLabel errorNroFinal; + private JTextField nroZInicialField; + private JTextField nroZFinalField; + private JLabel errorNroZFinal; + private JLabel errorNroZInicial; private IngresosTableModel ingresosTableModel; @@ -126,6 +129,21 @@ public class IngresosView { return ingresosTableModel; } + public JTextField getNroZInicialField() { + return nroZInicialField; + } + + public JTextField getNroZFinalField() { + return nroZFinalField; + } + + public JLabel getErrorNroZFinal() { + return errorNroZFinal; + } + + public JLabel getErrorNroZInicial() { + return errorNroZInicial; + } { // GUI initializer generated by IntelliJ IDEA GUI Designer @@ -153,35 +171,35 @@ public class IngresosView { panel1.add(scrollPane1, new GridConstraints(1, 0, 1, 1, GridConstraints.ANCHOR_CENTER, GridConstraints.FILL_BOTH, GridConstraints.SIZEPOLICY_CAN_SHRINK | GridConstraints.SIZEPOLICY_WANT_GROW, GridConstraints.SIZEPOLICY_CAN_SHRINK | GridConstraints.SIZEPOLICY_WANT_GROW, null, null, null, 0, false)); scrollPane1.setViewportView(ingresosTable); final JPanel panel2 = new JPanel(); - panel2.setLayout(new GridLayoutManager(3, 4, new Insets(0, 0, 0, 0), -1, -1)); - panel1.add(panel2, new GridConstraints(0, 0, 1, 1, GridConstraints.ANCHOR_CENTER, GridConstraints.FILL_BOTH, GridConstraints.SIZEPOLICY_CAN_SHRINK | GridConstraints.SIZEPOLICY_CAN_GROW, GridConstraints.SIZEPOLICY_CAN_SHRINK | GridConstraints.SIZEPOLICY_CAN_GROW, null, null, null, 0, false)); + panel2.setLayout(new GridLayoutManager(3, 6, new Insets(0, 0, 0, 0), -1, -1)); + panel1.add(panel2, new GridConstraints(0, 0, 1, 1, GridConstraints.ANCHOR_CENTER, GridConstraints.FILL_BOTH, GridConstraints.SIZEPOLICY_CAN_SHRINK | GridConstraints.SIZEPOLICY_CAN_GROW, GridConstraints.SIZEPOLICY_CAN_SHRINK | GridConstraints.SIZEPOLICY_CAN_GROW, null, new Dimension(150, -1), null, 0, false)); final JLabel label1 = new JLabel(); label1.setText("Tipo"); - panel2.add(label1, new GridConstraints(0, 3, 1, 1, GridConstraints.ANCHOR_WEST, GridConstraints.FILL_NONE, GridConstraints.SIZEPOLICY_FIXED, GridConstraints.SIZEPOLICY_FIXED, null, null, null, 0, false)); + panel2.add(label1, new GridConstraints(0, 5, 1, 1, GridConstraints.ANCHOR_WEST, GridConstraints.FILL_NONE, GridConstraints.SIZEPOLICY_FIXED, GridConstraints.SIZEPOLICY_FIXED, null, null, null, 0, false)); tipoCombo = new JComboBox(); final DefaultComboBoxModel defaultComboBoxModel1 = new DefaultComboBoxModel(); tipoCombo.setModel(defaultComboBoxModel1); - panel2.add(tipoCombo, new GridConstraints(1, 3, 1, 1, GridConstraints.ANCHOR_WEST, GridConstraints.FILL_HORIZONTAL, GridConstraints.SIZEPOLICY_WANT_GROW, GridConstraints.SIZEPOLICY_FIXED, null, new Dimension(150, -1), null, 0, false)); + panel2.add(tipoCombo, new GridConstraints(1, 5, 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("Valor"); panel2.add(label2, new GridConstraints(0, 0, 1, 1, GridConstraints.ANCHOR_WEST, GridConstraints.FILL_NONE, GridConstraints.SIZEPOLICY_FIXED, GridConstraints.SIZEPOLICY_FIXED, null, null, null, 0, false)); valorField = new JTextField(); panel2.add(valorField, new GridConstraints(1, 0, 1, 1, GridConstraints.ANCHOR_WEST, GridConstraints.FILL_HORIZONTAL, GridConstraints.SIZEPOLICY_WANT_GROW, GridConstraints.SIZEPOLICY_FIXED, null, new Dimension(150, -1), null, 0, false)); final JLabel label3 = new JLabel(); - label3.setText("N° Inicial"); - panel2.add(label3, new GridConstraints(0, 1, 1, 1, GridConstraints.ANCHOR_WEST, GridConstraints.FILL_NONE, GridConstraints.SIZEPOLICY_FIXED, GridConstraints.SIZEPOLICY_FIXED, null, null, null, 0, false)); + label3.setText("N° Boleta Inicial"); + panel2.add(label3, new GridConstraints(0, 3, 1, 1, GridConstraints.ANCHOR_WEST, GridConstraints.FILL_NONE, GridConstraints.SIZEPOLICY_FIXED, GridConstraints.SIZEPOLICY_FIXED, null, null, null, 0, false)); final JLabel label4 = new JLabel(); - label4.setText("N° Final"); - panel2.add(label4, new GridConstraints(0, 2, 1, 1, GridConstraints.ANCHOR_WEST, GridConstraints.FILL_NONE, GridConstraints.SIZEPOLICY_FIXED, GridConstraints.SIZEPOLICY_FIXED, null, null, null, 0, false)); + label4.setText("N° Boleta Final"); + panel2.add(label4, new GridConstraints(0, 4, 1, 1, GridConstraints.ANCHOR_WEST, GridConstraints.FILL_NONE, GridConstraints.SIZEPOLICY_FIXED, GridConstraints.SIZEPOLICY_FIXED, null, null, null, 0, false)); nroInicialField = new JTextField(); - panel2.add(nroInicialField, 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)); + panel2.add(nroInicialField, new GridConstraints(1, 3, 1, 1, GridConstraints.ANCHOR_WEST, GridConstraints.FILL_HORIZONTAL, GridConstraints.SIZEPOLICY_WANT_GROW, GridConstraints.SIZEPOLICY_FIXED, null, new Dimension(150, -1), null, 0, false)); nroFinalField = new JTextField(); - panel2.add(nroFinalField, new GridConstraints(1, 2, 1, 1, GridConstraints.ANCHOR_WEST, GridConstraints.FILL_HORIZONTAL, GridConstraints.SIZEPOLICY_WANT_GROW, GridConstraints.SIZEPOLICY_FIXED, null, new Dimension(150, -1), null, 0, false)); + panel2.add(nroFinalField, new GridConstraints(1, 4, 1, 1, GridConstraints.ANCHOR_WEST, GridConstraints.FILL_HORIZONTAL, GridConstraints.SIZEPOLICY_WANT_GROW, GridConstraints.SIZEPOLICY_FIXED, null, new Dimension(150, -1), null, 0, false)); errorTipoIngreso = new JLabel(); errorTipoIngreso.setForeground(new Color(-65536)); errorTipoIngreso.setText("Label"); errorTipoIngreso.setVisible(false); - panel2.add(errorTipoIngreso, new GridConstraints(2, 3, 1, 1, GridConstraints.ANCHOR_WEST, GridConstraints.FILL_NONE, GridConstraints.SIZEPOLICY_FIXED, GridConstraints.SIZEPOLICY_FIXED, null, null, null, 0, false)); + panel2.add(errorTipoIngreso, new GridConstraints(2, 5, 1, 1, GridConstraints.ANCHOR_WEST, GridConstraints.FILL_NONE, GridConstraints.SIZEPOLICY_FIXED, GridConstraints.SIZEPOLICY_FIXED, null, null, null, 0, false)); errorValor = new JLabel(); errorValor.setForeground(new Color(-65536)); errorValor.setText("Label"); @@ -191,21 +209,41 @@ public class IngresosView { errorNroInicial.setForeground(new Color(-65536)); errorNroInicial.setText("Label"); errorNroInicial.setVisible(false); - panel2.add(errorNroInicial, new GridConstraints(2, 1, 1, 1, GridConstraints.ANCHOR_WEST, GridConstraints.FILL_NONE, GridConstraints.SIZEPOLICY_FIXED, GridConstraints.SIZEPOLICY_FIXED, null, null, null, 0, false)); + panel2.add(errorNroInicial, new GridConstraints(2, 3, 1, 1, GridConstraints.ANCHOR_WEST, GridConstraints.FILL_NONE, GridConstraints.SIZEPOLICY_FIXED, GridConstraints.SIZEPOLICY_FIXED, null, null, null, 0, false)); errorNroFinal = new JLabel(); errorNroFinal.setForeground(new Color(-65536)); errorNroFinal.setText("Label"); errorNroFinal.setVisible(false); - panel2.add(errorNroFinal, new GridConstraints(2, 2, 1, 1, GridConstraints.ANCHOR_WEST, GridConstraints.FILL_NONE, GridConstraints.SIZEPOLICY_FIXED, GridConstraints.SIZEPOLICY_FIXED, null, null, null, 0, false)); + panel2.add(errorNroFinal, new GridConstraints(2, 4, 1, 1, GridConstraints.ANCHOR_WEST, GridConstraints.FILL_NONE, GridConstraints.SIZEPOLICY_FIXED, GridConstraints.SIZEPOLICY_FIXED, null, null, null, 0, false)); + final JLabel label5 = new JLabel(); + label5.setText("N° Z Inicial"); + panel2.add(label5, new GridConstraints(0, 1, 1, 1, GridConstraints.ANCHOR_WEST, GridConstraints.FILL_NONE, GridConstraints.SIZEPOLICY_FIXED, GridConstraints.SIZEPOLICY_FIXED, null, null, null, 0, false)); + final JLabel label6 = new JLabel(); + label6.setText("N° Z Final"); + panel2.add(label6, new GridConstraints(0, 2, 1, 1, GridConstraints.ANCHOR_WEST, GridConstraints.FILL_NONE, GridConstraints.SIZEPOLICY_FIXED, GridConstraints.SIZEPOLICY_FIXED, null, null, null, 0, false)); + nroZInicialField = new JTextField(); + panel2.add(nroZInicialField, 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)); + nroZFinalField = new JTextField(); + panel2.add(nroZFinalField, new GridConstraints(1, 2, 1, 1, GridConstraints.ANCHOR_WEST, GridConstraints.FILL_HORIZONTAL, GridConstraints.SIZEPOLICY_WANT_GROW, GridConstraints.SIZEPOLICY_FIXED, null, new Dimension(150, -1), null, 0, false)); + errorNroZInicial = new JLabel(); + errorNroZInicial.setForeground(new Color(-65536)); + errorNroZInicial.setText("Label"); + errorNroZInicial.setVisible(false); + panel2.add(errorNroZInicial, new GridConstraints(2, 1, 1, 1, GridConstraints.ANCHOR_WEST, GridConstraints.FILL_NONE, GridConstraints.SIZEPOLICY_FIXED, GridConstraints.SIZEPOLICY_FIXED, null, null, null, 0, false)); + errorNroZFinal = new JLabel(); + errorNroZFinal.setForeground(new Color(-65536)); + errorNroZFinal.setText("Label"); + errorNroZFinal.setVisible(false); + panel2.add(errorNroZFinal, new GridConstraints(2, 2, 1, 1, GridConstraints.ANCHOR_WEST, GridConstraints.FILL_NONE, GridConstraints.SIZEPOLICY_FIXED, GridConstraints.SIZEPOLICY_FIXED, null, null, null, 0, false)); final JPanel panel3 = new JPanel(); panel3.setLayout(new GridLayoutManager(1, 3, new Insets(0, 0, 0, 0), -1, -1)); panel1.add(panel3, new GridConstraints(2, 0, 1, 1, GridConstraints.ANCHOR_CENTER, GridConstraints.FILL_BOTH, GridConstraints.SIZEPOLICY_CAN_SHRINK | GridConstraints.SIZEPOLICY_CAN_GROW, GridConstraints.SIZEPOLICY_CAN_SHRINK | GridConstraints.SIZEPOLICY_CAN_GROW, null, null, null, 0, false)); final JPanel panel4 = new JPanel(); panel4.setLayout(new GridLayoutManager(1, 2, new Insets(0, 0, 0, 0), -1, -1)); panel3.add(panel4, new GridConstraints(0, 2, 1, 1, GridConstraints.ANCHOR_CENTER, GridConstraints.FILL_BOTH, GridConstraints.SIZEPOLICY_CAN_SHRINK | GridConstraints.SIZEPOLICY_CAN_GROW, GridConstraints.SIZEPOLICY_CAN_SHRINK | GridConstraints.SIZEPOLICY_CAN_GROW, null, null, null, 0, false)); - final JLabel label5 = new JLabel(); - label5.setText("Total Ingresos"); - panel4.add(label5, new GridConstraints(0, 0, 1, 1, GridConstraints.ANCHOR_EAST, GridConstraints.FILL_NONE, GridConstraints.SIZEPOLICY_FIXED, GridConstraints.SIZEPOLICY_FIXED, null, null, null, 0, false)); + final JLabel label7 = new JLabel(); + label7.setText("Total Ingresos"); + panel4.add(label7, new GridConstraints(0, 0, 1, 1, GridConstraints.ANCHOR_EAST, GridConstraints.FILL_NONE, GridConstraints.SIZEPOLICY_FIXED, GridConstraints.SIZEPOLICY_FIXED, null, null, null, 0, false)); totalIngresoField = new JTextField(); totalIngresoField.setEditable(false); panel4.add(totalIngresoField, new GridConstraints(0, 1, 1, 1, GridConstraints.ANCHOR_CENTER, GridConstraints.FILL_HORIZONTAL, GridConstraints.SIZEPOLICY_WANT_GROW, GridConstraints.SIZEPOLICY_FIXED, null, new Dimension(150, -1), null, 0, false)); @@ -233,4 +271,5 @@ public class IngresosView { public JComponent $$$getRootComponent$$$() { return contentPanel; } + } diff --git a/src/danielcortes/xyz/views/components/IngresosTableModel.java b/src/danielcortes/xyz/views/components/IngresosTableModel.java index 2b4c986..a1d8a35 100644 --- a/src/danielcortes/xyz/views/components/IngresosTableModel.java +++ b/src/danielcortes/xyz/views/components/IngresosTableModel.java @@ -35,7 +35,7 @@ public class IngresosTableModel extends AbstractTableModel { public IngresosTableModel() { super(); - this.columns = new String[]{"Valor", "N° Inicial", "N° Final", "Tipo"}; + this.columns = new String[]{"Valor","N° Z Inicial", "N° Z Final", "N° Inicial", "N° Final", "Tipo"}; this.rows = new ArrayList<>(); } @@ -78,10 +78,14 @@ public class IngresosTableModel extends AbstractTableModel { case 0: return this.rows.get(row).getValor(); case 1: - return this.rows.get(row).getNroInicial(); + return this.rows.get(row).getNroZInicial(); case 2: - return this.rows.get(row).getNroFinal(); + return this.rows.get(row).getNroZFinal(); case 3: + return this.rows.get(row).getNroInicial(); + case 4: + return this.rows.get(row).getNroFinal(); + case 5: return this.rows.get(row).getTipoIngreso().getNombre(); } return null; @@ -96,11 +100,4 @@ public class IngresosTableModel extends AbstractTableModel { this.fireTableRowsUpdated(getRowCount() - 2, getRowCount() - 1); } - @Override - public Class getColumnClass(int columnIndex) { - if (rows.isEmpty()) { - return Object.class; - } - return getValueAt(0, columnIndex).getClass(); - } }