diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 5a98dc8..8d12732 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -6,20 +6,23 @@
-
+
-
-
-
-
+
+
+
+
+
+
+
@@ -79,8 +82,8 @@
-
-
+
+
@@ -94,12 +97,12 @@
+
-
@@ -134,73 +137,83 @@
-
-
+
+
-
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -219,7 +232,6 @@
- getValueAt
getColumn
select
addRow
@@ -249,6 +261,7 @@
mysql
updateB
inputmap
+ editar
2018 Daniel Cortes
@@ -268,10 +281,6 @@
@@ -373,7 +386,6 @@
-
@@ -404,13 +416,29 @@
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -425,7 +453,7 @@
-
+
@@ -599,7 +627,8 @@
-
+
+
1545280618093
@@ -769,11 +798,18 @@
1546303228134
-
+
+ 1546485955113
+
+
+
+ 1546485955116
+
+
-
+
@@ -788,7 +824,7 @@
-
+
@@ -899,79 +935,14 @@
-
+
+
-
-
-
-
-
- JAVA
- danielcortes.xyz
-
- danielcortes.xyz.views.components.EgresosTableModel
- danielcortes.xyz.controllers.IngresosController
- danielcortes.xyz.models.documentos.DocumentosDAO
- danielcortes.xyz.models.caja.MysqlCajaDAO
- danielcortes.xyz.models.caja.Caja
- danielcortes.xyz.models.tipo_egreso.TipoEgresoDAO
- danielcortes.xyz.models.efectivo.EfectivoDAO
- danielcortes.xyz.data.Properties
- danielcortes.xyz.models.tipo_egreso.TipoEgreso
- danielcortes.xyz.models.ingreso.MysqlIngresoDAO
- danielcortes.xyz.models.efectivo.MysqlEfectivoDAO
- danielcortes.xyz.views.IngresosView
- danielcortes.xyz.models.caja.SQLiteCajaDAO
- danielcortes.xyz.models.ingreso.IngresoDAO
- danielcortes.xyz.models.documentos.Documentos
- danielcortes.xyz.controllers.ManagerController
- danielcortes.xyz.models.efectivo.Efectivo
- danielcortes.xyz.controllers.ArqueoController
- danielcortes.xyz.models.documentos.SQLiteDocumentosDAO
- danielcortes.xyz.models.egreso.MysqlEgresoDAO
- danielcortes.xyz.data.MysqlConnectionHolder
- danielcortes.xyz.models.egreso.SQLiteEgresoDAO
- danielcortes.xyz.data.SQLiteConnectionHolder
- danielcortes.xyz.Main
- danielcortes.xyz.models.tipo_ingreso.SQLiteTipoIngresoDAO
- danielcortes.xyz.models.tipo_egreso.MysqlTipoEgresoDAO
- danielcortes.xyz.models.egreso.Egreso
- danielcortes.xyz.models.ingreso.Ingreso
- danielcortes.xyz.models.egreso.EgresoDAO
- danielcortes.xyz.models.tipo_ingreso.TipoIngresoDAO
- danielcortes.xyz.controllers.EgresosController
- danielcortes.xyz.views.ArqueoView
- danielcortes.xyz.models.caja.CajaDAO
- danielcortes.xyz.models.ingreso.SQLiteIngresoDAO
- danielcortes.xyz.models.tipo_egreso.SQLiteTipoEgresoDAO
- danielcortes.xyz.views.EgresosView
- danielcortes.xyz.views.ManagerView
- danielcortes.xyz.models.tipo_ingreso.TipoIngreso
- danielcortes.xyz.data.ConnectionHolder
- danielcortes.xyz.models.documentos.MysqlDocumentosDAO
- danielcortes.xyz.views.components.IngresosTableModel
- danielcortes.xyz.models.tipo_ingreso.MysqlTipoIngresoDAO
- danielcortes.xyz.models.efectivo.SQLiteEfectivoDAO
-
-
-
-
-
-
- All
- private
-
-
-
-
-
-
-
@@ -1010,16 +981,6 @@
-
-
-
-
-
-
-
-
-
-
@@ -1027,16 +988,6 @@
-
-
-
-
-
-
-
-
-
-
@@ -1093,84 +1044,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -1212,18 +1085,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
@@ -1252,10 +1113,142 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
+
@@ -1269,12 +1262,12 @@
+
-
@@ -1308,72 +1301,88 @@
-
+
-
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/database.sqlite b/database.sqlite
index 3996d83..f3a435e 100644
Binary files a/database.sqlite and b/database.sqlite differ
diff --git a/src/danielcortes/xyz/controllers/ArqueoController.java b/src/danielcortes/xyz/controllers/ArqueoController.java
index 51bb980..6e655ab 100644
--- a/src/danielcortes/xyz/controllers/ArqueoController.java
+++ b/src/danielcortes/xyz/controllers/ArqueoController.java
@@ -177,17 +177,17 @@ public class ArqueoController {
int totalIngresos = Integer.parseInt(this.view.getIngresosField().getText());
int totalEgresos = Integer.parseInt(this.view.getEgresosField().getText());
- int arqueo = totalDocumentos + totalEfectivo + totalEgresos;
- int ajuste = arqueo - totalIngresos;
+ int rendido = totalDocumentos + totalEfectivo + totalEgresos;
+ int diferencia = rendido - totalIngresos;
- this.view.getArqueoField().setText(String.valueOf(arqueo));
- this.view.getRendidoField().setText(String.valueOf(totalIngresos));
- this.view.getAjusteField().setText(String.valueOf(ajuste));
+ this.view.getRendidoField().setText(String.valueOf(rendido));
+ this.view.getDebeRendirField().setText(String.valueOf(totalIngresos));
+ this.view.getDiferenciaField().setText(String.valueOf(diferencia));
- if(ajuste < 0) {
- this.view.getAjusteField().setForeground(new Color(255,0,0));
+ if(diferencia < 0) {
+ this.view.getDiferenciaField().setForeground(new Color(255,0,0));
}else{
- this.view.getAjusteField().setForeground(new Color(0,0,0));
+ this.view.getDiferenciaField().setForeground(new Color(0,0,0));
}
}
diff --git a/src/danielcortes/xyz/controllers/EgresosController.java b/src/danielcortes/xyz/controllers/EgresosController.java
index f97b86c..d38372d 100644
--- a/src/danielcortes/xyz/controllers/EgresosController.java
+++ b/src/danielcortes/xyz/controllers/EgresosController.java
@@ -194,11 +194,13 @@ public class EgresosController {
private void editarActionListener() {
this.hideErrorMessages();
- int selectedID = this.view.getEgresosTable().getSelectedRow();
- if (selectedID >= 0) {
- Egreso egreso = this.view.getEgresosTableModel().getEgreso(selectedID);
- this.editingId = selectedID;
+ int selectedID = this.view.getEgresosTable().getSelectedRow();
+ int selectedModelID = this.view.getEgresosTable().getRowSorter().convertRowIndexToModel(selectedID);
+ if (selectedModelID >= 0) {
+ Egreso egreso = this.view.getEgresosTableModel().getEgreso(selectedModelID);
+
+ this.editingId = selectedModelID;
this.editingEgreso = egreso;
this.editing = true;
diff --git a/src/danielcortes/xyz/controllers/IngresosController.java b/src/danielcortes/xyz/controllers/IngresosController.java
index add907d..6f4d556 100644
--- a/src/danielcortes/xyz/controllers/IngresosController.java
+++ b/src/danielcortes/xyz/controllers/IngresosController.java
@@ -194,10 +194,11 @@ public class IngresosController {
this.hideErrorMessages();
int selectedID = this.view.getIngresosTable().getSelectedRow();
- if(selectedID >= 0) {
- Ingreso ingreso = this.view.getIngresosTableModel().getIngreso(selectedID);
+ int selectedModelID = this.view.getIngresosTable().getRowSorter().convertRowIndexToModel(selectedID);
+ if(selectedModelID >= 0) {
+ Ingreso ingreso = this.view.getIngresosTableModel().getIngreso(selectedModelID);
- this.editingId = selectedID;
+ this.editingId = selectedModelID;
this.editingIngreso = ingreso;
this.editing = true;
diff --git a/src/danielcortes/xyz/views/ArqueoView.form b/src/danielcortes/xyz/views/ArqueoView.form
index d6c0746..25e8ce3 100644
--- a/src/danielcortes/xyz/views/ArqueoView.form
+++ b/src/danielcortes/xyz/views/ArqueoView.form
@@ -1,156 +1,34 @@
@@ -192,7 +192,7 @@
-
+
diff --git a/src/danielcortes/xyz/views/EgresosView.java b/src/danielcortes/xyz/views/EgresosView.java
index a21aa4f..38fcc9d 100644
--- a/src/danielcortes/xyz/views/EgresosView.java
+++ b/src/danielcortes/xyz/views/EgresosView.java
@@ -31,6 +31,7 @@ import danielcortes.xyz.models.tipo_egreso.TipoEgreso;
import danielcortes.xyz.views.components.EgresosTableModel;
import javax.swing.*;
+import javax.swing.table.TableRowSorter;
import java.awt.*;
public class EgresosView {
@@ -60,7 +61,9 @@ public class EgresosView {
private void createEgresosTable() {
egresosTableModel = new EgresosTableModel();
egresosTable = new JTable(egresosTableModel);
- egresosTable.setAutoCreateRowSorter(true);
+
+ RowSorter sorter = new TableRowSorter<>(egresosTableModel);
+ egresosTable.setRowSorter(sorter);
egresosTable.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
}
@@ -203,8 +206,8 @@ public class EgresosView {
panel4.setLayout(new GridLayoutManager(1, 3, new Insets(0, 0, 0, 0), -1, -1));
panel3.add(panel4, 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));
guardarButton = new JButton();
- guardarButton.setText("Guardar");
- guardarButton.setMnemonic('G');
+ guardarButton.setText("Añadir");
+ guardarButton.setMnemonic('A');
guardarButton.setDisplayedMnemonicIndex(0);
panel4.add(guardarButton, new GridConstraints(0, 0, 1, 1, GridConstraints.ANCHOR_CENTER, GridConstraints.FILL_HORIZONTAL, GridConstraints.SIZEPOLICY_CAN_SHRINK | GridConstraints.SIZEPOLICY_CAN_GROW, GridConstraints.SIZEPOLICY_FIXED, null, new Dimension(150, -1), null, 0, false));
eliminarButton = new JButton();
@@ -216,8 +219,8 @@ public class EgresosView {
editarButton = new JButton();
editarButton.setEnabled(false);
editarButton.setText("Editar");
- editarButton.setMnemonic('E');
- editarButton.setDisplayedMnemonicIndex(0);
+ editarButton.setMnemonic('D');
+ editarButton.setDisplayedMnemonicIndex(1);
panel4.add(editarButton, new GridConstraints(0, 2, 1, 1, GridConstraints.ANCHOR_CENTER, GridConstraints.FILL_HORIZONTAL, GridConstraints.SIZEPOLICY_CAN_SHRINK | GridConstraints.SIZEPOLICY_CAN_GROW, GridConstraints.SIZEPOLICY_FIXED, null, new Dimension(150, -1), null, 0, false));
final Spacer spacer1 = new Spacer();
panel3.add(spacer1, new GridConstraints(0, 1, 1, 1, GridConstraints.ANCHOR_CENTER, GridConstraints.FILL_HORIZONTAL, GridConstraints.SIZEPOLICY_WANT_GROW, 1, null, null, null, 0, false));
@@ -238,4 +241,5 @@ public class EgresosView {
public JComponent $$$getRootComponent$$$() {
return contentPanel;
}
+
}
diff --git a/src/danielcortes/xyz/views/IngresosView.java b/src/danielcortes/xyz/views/IngresosView.java
index 50e8751..12d5930 100644
--- a/src/danielcortes/xyz/views/IngresosView.java
+++ b/src/danielcortes/xyz/views/IngresosView.java
@@ -28,9 +28,11 @@ 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.*;
+import javax.swing.table.TableRowSorter;
import java.awt.*;
public class IngresosView {
@@ -58,7 +60,9 @@ public class IngresosView {
private void createIngresosTable() {
this.ingresosTableModel = new IngresosTableModel();
this.ingresosTable = new JTable(ingresosTableModel);
- this.ingresosTable.setAutoCreateRowSorter(true);
+
+ RowSorter sorter = new TableRowSorter<>(ingresosTableModel);
+ this.ingresosTable.setRowSorter(sorter);
this.ingresosTable.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
}
diff --git a/src/danielcortes/xyz/views/components/EgresosTableModel.java b/src/danielcortes/xyz/views/components/EgresosTableModel.java
index 7b1403e..4f97a63 100644
--- a/src/danielcortes/xyz/views/components/EgresosTableModel.java
+++ b/src/danielcortes/xyz/views/components/EgresosTableModel.java
@@ -39,14 +39,17 @@ public class EgresosTableModel extends AbstractTableModel {
this.rows = new ArrayList<>();
}
+ @Override
public String getColumnName(int col) {
return columns[col];
}
+ @Override
public int getColumnCount() {
return columns.length;
}
+ @Override
public int getRowCount() {
return rows.size();
}
@@ -75,6 +78,7 @@ public class EgresosTableModel extends AbstractTableModel {
this.fireTableRowsUpdated(0,getRowCount()-1);
}
+ @Override
public Object getValueAt(int row, int col) {
switch (col){
case 0:
@@ -93,4 +97,12 @@ public class EgresosTableModel extends AbstractTableModel {
return rows.get(row);
}
+ @Override
+ public Class> getColumnClass(int columnIndex) {
+ if (rows.isEmpty()) {
+ return Object.class;
+ }
+ return getValueAt(0, columnIndex).getClass();
+ }
+
}
diff --git a/src/danielcortes/xyz/views/components/IngresosTableModel.java b/src/danielcortes/xyz/views/components/IngresosTableModel.java
index e7d4aaa..1b60d23 100644
--- a/src/danielcortes/xyz/views/components/IngresosTableModel.java
+++ b/src/danielcortes/xyz/views/components/IngresosTableModel.java
@@ -39,14 +39,17 @@ public class IngresosTableModel extends AbstractTableModel {
this.rows = new ArrayList<>();
}
+ @Override
public String getColumnName(int col) {
return this.columns[col];
}
+ @Override
public int getColumnCount() {
return this.columns.length;
}
+ @Override
public int getRowCount() {
return this.rows.size();
}
@@ -69,6 +72,7 @@ public class IngresosTableModel extends AbstractTableModel {
}
}
+ @Override
public Object getValueAt(int row, int col) {
switch (col) {
case 0:
@@ -91,4 +95,12 @@ public class IngresosTableModel extends AbstractTableModel {
this.rows.set(editingId, ingreso);
this.fireTableRowsUpdated(getRowCount() - 2, getRowCount() - 1);
}
+
+ @Override
+ public Class> getColumnClass(int columnIndex) {
+ if (rows.isEmpty()) {
+ return Object.class;
+ }
+ return getValueAt(0, columnIndex).getClass();
+ }
}