diff --git a/dist/Programa Caja.jar b/dist/Programa Caja.jar index 6433fa3..23eba7c 100644 Binary files a/dist/Programa Caja.jar and b/dist/Programa Caja.jar differ diff --git a/dist/config/logging.properties b/dist/config/logging.properties index a4df2a5..eb1acd4 100644 --- a/dist/config/logging.properties +++ b/dist/config/logging.properties @@ -2,10 +2,10 @@ handlers= java.util.logging.FileHandler java.util.logging.FileHandler.level = ALL -java.util.logging.FileHandler.pattern = logs/logs-%u.xml -java.util.logging.FileHandler.formatter = java.util.logging.XMLFormatter +java.util.logging.FileHandler.pattern = logs/logs-%u.log +java.util.logging.FileHandler.formatter = java.util.logging.SimpleFormatter #java.util.logging.ConsoleHandler.level = ALL #java.util.logging.ConsoleHandler.formatter=java.util.logging.SimpleFormatter -danielcortes.level= FINE \ No newline at end of file +danielcortes.level= ALL \ No newline at end of file diff --git a/src/danielcortes/xyz/views/ArqueoView.java b/src/danielcortes/xyz/views/ArqueoView.java index 600e6ec..4222e1e 100644 --- a/src/danielcortes/xyz/views/ArqueoView.java +++ b/src/danielcortes/xyz/views/ArqueoView.java @@ -340,5 +340,4 @@ public class ArqueoView { public JComponent $$$getRootComponent$$$() { return contentPanel; } - } diff --git a/src/danielcortes/xyz/views/CalcularFondoView.java b/src/danielcortes/xyz/views/CalcularFondoView.java index f80fc45..2779644 100644 --- a/src/danielcortes/xyz/views/CalcularFondoView.java +++ b/src/danielcortes/xyz/views/CalcularFondoView.java @@ -98,6 +98,28 @@ public class CalcularFondoView { return tableModel; } + + private void createUIComponents() { + this.createTable(); + } + + private void createTable() { + this.tableModel = new FondoTableModel(); + this.table = new JTable(this.tableModel); + + RowSorter sorter = new TableRowSorter<>(this.tableModel); + this.table.setRowSorter(sorter); + this.table.setSelectionMode(ListSelectionModel.SINGLE_SELECTION); + } + + private void fillDefaultsValues() { + this.valorField.setValue(0); + this.depositoField.setValue(0); + this.fondoField.setValue(0); + this.sumaField.setValue(0); + this.depositoField.setValue(0); + } + /** * Method generated by IntelliJ IDEA GUI Designer * >>> IMPORTANT!! <<< @@ -165,25 +187,4 @@ public class CalcularFondoView { public JComponent $$$getRootComponent$$$() { return contentPanel; } - - private void createUIComponents() { - this.createTable(); - } - - private void createTable() { - this.tableModel = new FondoTableModel(); - this.table = new JTable(this.tableModel); - - RowSorter sorter = new TableRowSorter<>(this.tableModel); - this.table.setRowSorter(sorter); - this.table.setSelectionMode(ListSelectionModel.SINGLE_SELECTION); - } - - private void fillDefaultsValues() { - this.valorField.setValue(0); - this.depositoField.setValue(0); - this.fondoField.setValue(0); - this.sumaField.setValue(0); - this.depositoField.setValue(0); - } } diff --git a/src/danielcortes/xyz/views/EgresosView.java b/src/danielcortes/xyz/views/EgresosView.java index 71abfc9..ba0c8e0 100644 --- a/src/danielcortes/xyz/views/EgresosView.java +++ b/src/danielcortes/xyz/views/EgresosView.java @@ -128,6 +128,7 @@ public class EgresosView { return errorTipoEgreso; } + { // GUI initializer generated by IntelliJ IDEA GUI Designer // >>> IMPORTANT!! <<< @@ -242,5 +243,4 @@ public class EgresosView { public JComponent $$$getRootComponent$$$() { return contentPanel; } - } diff --git a/src/danielcortes/xyz/views/InformesView.java b/src/danielcortes/xyz/views/InformesView.java index 240f21e..7576628 100644 --- a/src/danielcortes/xyz/views/InformesView.java +++ b/src/danielcortes/xyz/views/InformesView.java @@ -48,6 +48,7 @@ public class InformesView { return GenerarEgresosFacturasMateriaPrimaButton; } + { // GUI initializer generated by IntelliJ IDEA GUI Designer // >>> IMPORTANT!! <<< @@ -87,5 +88,4 @@ public class InformesView { public JComponent $$$getRootComponent$$$() { return contentPanel; } - } diff --git a/src/danielcortes/xyz/views/IngresosView.java b/src/danielcortes/xyz/views/IngresosView.java index c2585ee..22bddf8 100644 --- a/src/danielcortes/xyz/views/IngresosView.java +++ b/src/danielcortes/xyz/views/IngresosView.java @@ -146,6 +146,7 @@ public class IngresosView { return errorNroZInicial; } + { // GUI initializer generated by IntelliJ IDEA GUI Designer // >>> IMPORTANT!! <<< @@ -267,5 +268,4 @@ public class IngresosView { public JComponent $$$getRootComponent$$$() { return contentPanel; } - } diff --git a/src/danielcortes/xyz/views/ManagerView.java b/src/danielcortes/xyz/views/ManagerView.java index d9759f1..9884f6d 100644 --- a/src/danielcortes/xyz/views/ManagerView.java +++ b/src/danielcortes/xyz/views/ManagerView.java @@ -70,6 +70,7 @@ public class ManagerView { return cardPanel; } + { // GUI initializer generated by IntelliJ IDEA GUI Designer // >>> IMPORTANT!! <<< @@ -129,5 +130,4 @@ public class ManagerView { public JComponent $$$getRootComponent$$$() { return contentPanel; } - } diff --git a/src/danielcortes/xyz/views/MonthSelectDialog.java b/src/danielcortes/xyz/views/MonthSelectDialog.java index c2831f7..f8712b8 100644 --- a/src/danielcortes/xyz/views/MonthSelectDialog.java +++ b/src/danielcortes/xyz/views/MonthSelectDialog.java @@ -95,6 +95,41 @@ public class MonthSelectDialog extends JDialog { return monthDate; } + + private void createUIComponents() { + createYearSpinner(); + createMonthCombo(); + } + + private void createYearSpinner() { + SpinnerModel model = new YearSpinnerModel(); + this.yearSpinner = new JSpinner(); + this.yearSpinner.setModel(model); + ((JSpinner.DefaultEditor) this.yearSpinner.getEditor()).getTextField().setEditable(true); + } + + private void createMonthCombo() { + months = new ArrayList<>(); + months.add("Enero"); + months.add("Febrero"); + months.add("Marzo"); + months.add("Abril"); + months.add("Mayo"); + months.add("Junio"); + months.add("Julio"); + months.add("Agosto"); + months.add("Septiembre"); + months.add("Octubre"); + months.add("Noviembre"); + months.add("Diciembre"); + + monthCombo = new JComboBox<>(); + for (String month : months) { + monthCombo.addItem(month); + } + + } + /** * Method generated by IntelliJ IDEA GUI Designer * >>> IMPORTANT!! <<< @@ -142,38 +177,4 @@ public class MonthSelectDialog extends JDialog { public JComponent $$$getRootComponent$$$() { return contentPane; } - - private void createUIComponents() { - createYearSpinner(); - createMonthCombo(); - } - - private void createYearSpinner() { - SpinnerModel model = new YearSpinnerModel(); - this.yearSpinner = new JSpinner(); - this.yearSpinner.setModel(model); - ((JSpinner.DefaultEditor) this.yearSpinner.getEditor()).getTextField().setEditable(true); - } - - private void createMonthCombo() { - months = new ArrayList<>(); - months.add("Enero"); - months.add("Febrero"); - months.add("Marzo"); - months.add("Abril"); - months.add("Mayo"); - months.add("Junio"); - months.add("Julio"); - months.add("Agosto"); - months.add("Septiembre"); - months.add("Octubre"); - months.add("Noviembre"); - months.add("Diciembre"); - - monthCombo = new JComboBox<>(); - for (String month : months) { - monthCombo.addItem(month); - } - - } } diff --git a/src/danielcortes/xyz/views/TipoEgresoSelectDialog.java b/src/danielcortes/xyz/views/TipoEgresoSelectDialog.java index 5c76928..0960fb8 100644 --- a/src/danielcortes/xyz/views/TipoEgresoSelectDialog.java +++ b/src/danielcortes/xyz/views/TipoEgresoSelectDialog.java @@ -136,5 +136,4 @@ public class TipoEgresoSelectDialog extends JDialog { public JComponent $$$getRootComponent$$$() { return contentPane; } - }