diff --git a/.idea/uiDesigner.xml b/.idea/uiDesigner.xml
index cf5a3b1..c0acea5 100644
--- a/.idea/uiDesigner.xml
+++ b/.idea/uiDesigner.xml
@@ -47,6 +47,9 @@
-
+ -
+
+
-
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index d93b832..f7c39dc 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,17 +7,15 @@
-
+
-
+
-
-
@@ -74,11 +72,11 @@
-
+
-
-
+
+
@@ -91,27 +89,32 @@
-
-
-
+
+
+
+
+
+
-
-
+
+
+
+
@@ -125,62 +128,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -292,9 +239,9 @@
-
+
@@ -413,7 +360,7 @@
-
+
@@ -595,7 +542,7 @@
-
+
1545280618093
@@ -793,11 +740,18 @@
1546722949902
-
+
+ 1546736429914
+
+
+
+ 1546736429914
+
+
-
+
@@ -901,7 +855,6 @@
-
@@ -926,7 +879,8 @@
-
+
+
@@ -1430,17 +1384,12 @@
-
-
+
+
-
-
-
-
-
@@ -1449,10 +1398,6 @@
-
-
-
-
@@ -1460,10 +1405,63 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
+
@@ -1476,27 +1474,32 @@
-
-
-
+
+
+
+
+
+
-
-
+
+
+
+
@@ -1509,60 +1512,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/dist/caja.jar b/dist/caja.jar
index af6a52b..a119c3d 100644
Binary files a/dist/caja.jar and b/dist/caja.jar differ
diff --git a/dist/database.sqlite b/dist/database.sqlite
index 4f54561..2c7ba86 100644
Binary files a/dist/database.sqlite and b/dist/database.sqlite differ
diff --git a/src/danielcortes/xyz/controllers/ArqueoController.java b/src/danielcortes/xyz/controllers/ArqueoController.java
index ba10ccc..6450290 100644
--- a/src/danielcortes/xyz/controllers/ArqueoController.java
+++ b/src/danielcortes/xyz/controllers/ArqueoController.java
@@ -33,6 +33,7 @@ import danielcortes.xyz.models.efectivo.EfectivoDAO;
import danielcortes.xyz.models.egreso.EgresoDAO;
import danielcortes.xyz.models.ingreso.IngresoDAO;
import danielcortes.xyz.views.ArqueoView;
+import danielcortes.xyz.views.components.NumberFormatedTextField;
import javax.swing.*;
import java.awt.*;
@@ -124,7 +125,7 @@ public class ArqueoController {
* Calcula el total de efectivo y lo muestra en el efectivoField
*/
private void updateResumenEfectivo() {
- JTextField efectivoField = this.view.getEfectivoField();
+ NumberFormatedTextField efectivoField = this.view.getEfectivoField();
int total = 0;
total += this.efectivo.getDiez();
total += this.efectivo.getCincuenta();
@@ -136,19 +137,19 @@ public class ArqueoController {
total += this.efectivo.getDiezMil();
total += this.efectivo.getVeinteMil();
- efectivoField.setText(String.valueOf(total));
+ efectivoField.setValue(total);
}
/**
* Calcula el total de documentos y lo muestra en el documentosField
*/
private void updateResumenDocumentos() {
- JTextField documentosField = this.view.getDocumentosField();
+ NumberFormatedTextField documentosField = this.view.getDocumentosField();
int total = 0;
total += this.documentos.getCheques();
total += this.documentos.getTarjetas();
- documentosField.setText(String.valueOf(total));
+ documentosField.setValue(total);
}
/**
@@ -156,24 +157,24 @@ public class ArqueoController {
*/
private void updateResumenEgresos() {
int total = this.egresoDAO.getTotalEgreso(this.caja);
- this.view.getEgresosField().setText(String.valueOf(total));
+ this.view.getEgresosField().setValue(total);
}
/**
* Calcula los datos de arqueo, rendido y ajuste y los muestra en sus campos correspondientes
*/
private void updateResumenArqueo() {
- int totalEfectivo = Integer.parseInt(this.view.getEfectivoField().getText());
- int totalDocumentos = Integer.parseInt(this.view.getDocumentosField().getText());
+ int totalEfectivo = this.view.getEfectivoField().getValue();
+ int totalDocumentos = this.view.getDocumentosField().getValue();
int totalIngresos = ingresoDAO.getTotalIngreso(this.caja);
- int totalEgresos = Integer.parseInt(this.view.getEgresosField().getText());
+ int totalEgresos = this.view.getEgresosField().getValue();
int rendido = totalDocumentos + totalEfectivo + totalEgresos;
int diferencia = rendido - totalIngresos;
- this.view.getRendidoField().setText(String.valueOf(rendido));
- this.view.getDebeRendirField().setText(String.valueOf(totalIngresos));
- this.view.getDiferenciaField().setText(String.valueOf(diferencia));
+ this.view.getRendidoField().setValue(rendido);
+ this.view.getDebeRendirField().setValue(totalIngresos);
+ this.view.getDiferenciaField().setValue(diferencia);
if(diferencia < 0) {
this.view.getDiferenciaField().setForeground(new Color(255,0,0));
diff --git a/src/danielcortes/xyz/views/ArqueoView.form b/src/danielcortes/xyz/views/ArqueoView.form
index 1c33ac3..ed369a9 100644
--- a/src/danielcortes/xyz/views/ArqueoView.form
+++ b/src/danielcortes/xyz/views/ArqueoView.form
@@ -26,7 +26,7 @@
-
+
@@ -34,10 +34,10 @@
-
+
-
+
@@ -46,7 +46,7 @@
-
+
@@ -71,7 +71,7 @@
-
+
@@ -80,10 +80,10 @@
-
+
-
+
@@ -92,7 +92,7 @@
-
+
@@ -111,7 +111,7 @@
-
+
@@ -119,7 +119,7 @@
-
+
@@ -130,7 +130,7 @@
-
+
@@ -138,7 +138,7 @@
-
+
diff --git a/src/danielcortes/xyz/views/ArqueoView.java b/src/danielcortes/xyz/views/ArqueoView.java
index 13af181..c148659 100644
--- a/src/danielcortes/xyz/views/ArqueoView.java
+++ b/src/danielcortes/xyz/views/ArqueoView.java
@@ -47,16 +47,16 @@ public class ArqueoView {
private NumberFormatedTextField diezField;
private JTextField chequesField;
private JTextField tarjetasField;
- private JTextField efectivoField;
- private JTextField documentosField;
- private JTextField egresosField;
- private JTextField rendidoField;
+ private NumberFormatedTextField efectivoField;
+ private NumberFormatedTextField documentosField;
+ private NumberFormatedTextField egresosField;
+ private NumberFormatedTextField rendidoField;
private JButton guardarEfectivoButton;
private JButton guardarDocumentosButton;
private JLabel errorCheques;
private JLabel errorTarjetas;
- private JTextField diferenciaField;
- private JTextField debeRendirField;
+ private NumberFormatedTextField diferenciaField;
+ private NumberFormatedTextField debeRendirField;
public JPanel getContentPanel() {
return contentPanel;
@@ -106,19 +106,19 @@ public class ArqueoView {
return tarjetasField;
}
- public JTextField getEfectivoField() {
+ public NumberFormatedTextField getEfectivoField() {
return efectivoField;
}
- public JTextField getDocumentosField() {
+ public NumberFormatedTextField getDocumentosField() {
return documentosField;
}
- public JTextField getEgresosField() {
+ public NumberFormatedTextField getEgresosField() {
return egresosField;
}
- public JTextField getRendidoField() {
+ public NumberFormatedTextField getRendidoField() {
return rendidoField;
}
@@ -138,11 +138,11 @@ public class ArqueoView {
return errorTarjetas;
}
- public JTextField getDiferenciaField() {
+ public NumberFormatedTextField getDiferenciaField() {
return diferenciaField;
}
- public JTextField getDebeRendirField() {
+ public NumberFormatedTextField getDebeRendirField() {
return debeRendirField;
}
@@ -170,15 +170,15 @@ public class ArqueoView {
final JLabel label1 = new JLabel();
label1.setText("Total Egresos");
panel1.add(label1, new GridConstraints(1, 0, 1, 1, GridConstraints.ANCHOR_EAST, GridConstraints.FILL_NONE, GridConstraints.SIZEPOLICY_FIXED, GridConstraints.SIZEPOLICY_FIXED, null, null, null, 0, false));
- egresosField = new JTextField();
+ egresosField = new NumberFormatedTextField();
egresosField.setEditable(false);
- egresosField.setText("0");
+ egresosField.setText("");
panel1.add(egresosField, 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));
- diferenciaField = new JTextField();
+ diferenciaField = new NumberFormatedTextField();
diferenciaField.setEditable(false);
Font diferenciaFieldFont = this.$$$getFont$$$(null, Font.BOLD, -1, diferenciaField.getFont());
if (diferenciaFieldFont != null) diferenciaField.setFont(diferenciaFieldFont);
- diferenciaField.setText("0");
+ diferenciaField.setText("");
panel1.add(diferenciaField, new GridConstraints(6, 1, 1, 1, GridConstraints.ANCHOR_CENTER, 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("Diferencia");
@@ -188,17 +188,17 @@ public class ArqueoView {
final JLabel label3 = new JLabel();
label3.setText("Debe Rendir");
panel1.add(label3, new GridConstraints(5, 0, 1, 1, GridConstraints.ANCHOR_EAST, GridConstraints.FILL_NONE, GridConstraints.SIZEPOLICY_FIXED, GridConstraints.SIZEPOLICY_FIXED, null, null, null, 0, false));
- debeRendirField = new JTextField();
+ debeRendirField = new NumberFormatedTextField();
debeRendirField.setEditable(false);
Font debeRendirFieldFont = this.$$$getFont$$$(null, Font.BOLD, -1, debeRendirField.getFont());
if (debeRendirFieldFont != null) debeRendirField.setFont(debeRendirFieldFont);
- debeRendirField.setText("0");
+ debeRendirField.setText("");
panel1.add(debeRendirField, new GridConstraints(5, 1, 1, 1, GridConstraints.ANCHOR_WEST, GridConstraints.FILL_HORIZONTAL, GridConstraints.SIZEPOLICY_WANT_GROW, GridConstraints.SIZEPOLICY_FIXED, null, new Dimension(150, -1), null, 0, false));
- rendidoField = new JTextField();
+ rendidoField = new NumberFormatedTextField();
rendidoField.setEditable(false);
Font rendidoFieldFont = this.$$$getFont$$$(null, Font.BOLD, -1, rendidoField.getFont());
if (rendidoFieldFont != null) rendidoField.setFont(rendidoFieldFont);
- rendidoField.setText("0");
+ rendidoField.setText("");
panel1.add(rendidoField, 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 JLabel label4 = new JLabel();
label4.setText("Rendido");
@@ -206,16 +206,16 @@ public class ArqueoView {
final JLabel label5 = new JLabel();
label5.setText("Total Documentos");
panel1.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));
- documentosField = new JTextField();
+ documentosField = new NumberFormatedTextField();
documentosField.setEditable(false);
- documentosField.setText("0");
+ documentosField.setText("");
panel1.add(documentosField, 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 label6 = new JLabel();
label6.setText("Total Efectivo");
panel1.add(label6, 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 = new NumberFormatedTextField();
efectivoField.setEditable(false);
- efectivoField.setText("0");
+ efectivoField.setText("");
panel1.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 JPanel panel2 = new JPanel();
panel2.setLayout(new GridLayoutManager(2, 1, new Insets(0, 0, 0, 0), -1, -1));