Cambiados JTextFields del resumen de arqueo por NumberFormatedTextFields
This commit is contained in:
@@ -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));
|
||||
|
||||
@@ -26,7 +26,7 @@
|
||||
<text value="Total Egresos"/>
|
||||
</properties>
|
||||
</component>
|
||||
<component id="3093a" class="javax.swing.JTextField" binding="egresosField">
|
||||
<component id="167a8" class="danielcortes.xyz.views.components.NumberFormatedTextField" binding="egresosField">
|
||||
<constraints>
|
||||
<grid row="1" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="6" anchor="8" fill="1" indent="0" use-parent-layout="false">
|
||||
<preferred-size width="150" height="-1"/>
|
||||
@@ -34,10 +34,10 @@
|
||||
</constraints>
|
||||
<properties>
|
||||
<editable value="false"/>
|
||||
<text value="0"/>
|
||||
<text value=""/>
|
||||
</properties>
|
||||
</component>
|
||||
<component id="509b2" class="javax.swing.JTextField" binding="diferenciaField">
|
||||
<component id="3ea68" class="danielcortes.xyz.views.components.NumberFormatedTextField" binding="diferenciaField">
|
||||
<constraints>
|
||||
<grid row="6" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="6" anchor="0" fill="1" indent="0" use-parent-layout="false">
|
||||
<preferred-size width="150" height="-1"/>
|
||||
@@ -46,7 +46,7 @@
|
||||
<properties>
|
||||
<editable value="false"/>
|
||||
<font style="1"/>
|
||||
<text value="0"/>
|
||||
<text value=""/>
|
||||
</properties>
|
||||
</component>
|
||||
<component id="bafd7" class="javax.swing.JLabel">
|
||||
@@ -71,7 +71,7 @@
|
||||
<text value="Debe Rendir"/>
|
||||
</properties>
|
||||
</component>
|
||||
<component id="b117a" class="javax.swing.JTextField" binding="debeRendirField">
|
||||
<component id="e8102" class="danielcortes.xyz.views.components.NumberFormatedTextField" binding="debeRendirField">
|
||||
<constraints>
|
||||
<grid row="5" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="6" anchor="8" fill="1" indent="0" use-parent-layout="false">
|
||||
<preferred-size width="150" height="-1"/>
|
||||
@@ -80,10 +80,10 @@
|
||||
<properties>
|
||||
<editable value="false"/>
|
||||
<font style="1"/>
|
||||
<text value="0"/>
|
||||
<text value=""/>
|
||||
</properties>
|
||||
</component>
|
||||
<component id="b0664" class="javax.swing.JTextField" binding="rendidoField">
|
||||
<component id="b7f03" class="danielcortes.xyz.views.components.NumberFormatedTextField" binding="rendidoField">
|
||||
<constraints>
|
||||
<grid row="4" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="6" anchor="8" fill="1" indent="0" use-parent-layout="false">
|
||||
<preferred-size width="150" height="-1"/>
|
||||
@@ -92,7 +92,7 @@
|
||||
<properties>
|
||||
<editable value="false"/>
|
||||
<font style="1"/>
|
||||
<text value="0"/>
|
||||
<text value=""/>
|
||||
</properties>
|
||||
</component>
|
||||
<component id="cee37" class="javax.swing.JLabel">
|
||||
@@ -111,7 +111,7 @@
|
||||
<text value="Total Documentos"/>
|
||||
</properties>
|
||||
</component>
|
||||
<component id="42661" class="javax.swing.JTextField" binding="documentosField">
|
||||
<component id="ac144" class="danielcortes.xyz.views.components.NumberFormatedTextField" binding="documentosField">
|
||||
<constraints>
|
||||
<grid row="2" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="6" anchor="8" fill="1" indent="0" use-parent-layout="false">
|
||||
<preferred-size width="150" height="-1"/>
|
||||
@@ -119,7 +119,7 @@
|
||||
</constraints>
|
||||
<properties>
|
||||
<editable value="false"/>
|
||||
<text value="0"/>
|
||||
<text value=""/>
|
||||
</properties>
|
||||
</component>
|
||||
<component id="1dc40" class="javax.swing.JLabel">
|
||||
@@ -130,7 +130,7 @@
|
||||
<text value="Total Efectivo"/>
|
||||
</properties>
|
||||
</component>
|
||||
<component id="df645" class="javax.swing.JTextField" binding="efectivoField">
|
||||
<component id="80dc1" class="danielcortes.xyz.views.components.NumberFormatedTextField" binding="efectivoField">
|
||||
<constraints>
|
||||
<grid row="0" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="6" anchor="8" fill="1" indent="0" use-parent-layout="false">
|
||||
<preferred-size width="150" height="-1"/>
|
||||
@@ -138,7 +138,7 @@
|
||||
</constraints>
|
||||
<properties>
|
||||
<editable value="false"/>
|
||||
<text value="0"/>
|
||||
<text value=""/>
|
||||
</properties>
|
||||
</component>
|
||||
</children>
|
||||
|
||||
@@ -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));
|
||||
|
||||
Reference in New Issue
Block a user