skrd/sistema-caja
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "Cambiados fields de efectivo por JFormattedtextfields y son formateados como numeros"

Browse Source 
This reverts commit 1647e6c9f4.

Volviendo a un estado anterior por problemas con los cambios sobre
jformatedtextfield, se usara otra estrategia
This commit is contained in:
Daniel Cortes
2019-01-05 17:24:03 -03:00
parent 72fc7dcf31
commit 4965633437
8 changed files with 415 additions and 699 deletions
Download Patch File Download Diff File Expand all files Collapse all files

807
.idea/workspace.xml generated
View File

@@ -6,19 +6,62 @@
</artifacts-to-build>
</component>
<component name="BookmarkManager">
<bookmark url="file://$PROJECT_DIR$/src/danielcortes/xyz/controllers/IngresosController.java" line="426" mnemonic="0" />
<bookmark url="file://$PROJECT_DIR$/src/danielcortes/xyz/controllers/ArqueoController.java" line="54" />
<bookmark url="file://$PROJECT_DIR$/src/danielcortes/xyz/views/ArqueoView.java" line="383" mnemonic="0" />
</component>
<component name="ChangeListManager">
<list default="true" id="a633d35a-56a6-4479-b4c4-f97198052fb7" name="Default Changelist" comment="Se me olvido agregar el jar XD">
<change afterPath="$PROJECT_DIR$/src/danielcortes/xyz/views/components/LimitDocumentFilter.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/danielcortes/xyz/views/components/NumberFormatFactory.java" afterDir="false" />
<list default="true" id="a633d35a-56a6-4479-b4c4-f97198052fb7" name="Default Changelist" comment="">
<change afterPath="$PROJECT_DIR$/dist/conf.properties" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/artifacts/caja_jar.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/artifacts/caja_jar.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/copyright/MIT_License.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/copyright/MIT_License.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/dist/caja.jar" beforeDir="false" afterPath="$PROJECT_DIR$/dist/caja.jar" afterDir="false" />
<change beforePath="$PROJECT_DIR$/dist/database.sqlite" beforeDir="false" afterPath="$PROJECT_DIR$/dist/database.sqlite" afterDir="false" />
<change beforePath="$PROJECT_DIR$/database.sqlite" beforeDir="false" afterPath="$PROJECT_DIR$/dist/database.sqlite" afterDir="false" />
<change beforePath="$PROJECT_DIR$/database/mysql.sql" beforeDir="false" afterPath="$PROJECT_DIR$/database/mysql.sql" afterDir="false" />
<change beforePath="$PROJECT_DIR$/database/sqlite.sql" beforeDir="false" afterPath="$PROJECT_DIR$/database/sqlite.sql" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/danielcortes/xyz/Main.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/danielcortes/xyz/Main.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/danielcortes/xyz/controllers/ArqueoController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/danielcortes/xyz/controllers/ArqueoController.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/danielcortes/xyz/views/ArqueoView.form" beforeDir="false" afterPath="$PROJECT_DIR$/src/danielcortes/xyz/views/ArqueoView.form" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/danielcortes/xyz/controllers/EgresosController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/danielcortes/xyz/controllers/EgresosController.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/danielcortes/xyz/controllers/IngresosController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/danielcortes/xyz/controllers/IngresosController.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/danielcortes/xyz/controllers/ManagerController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/danielcortes/xyz/controllers/ManagerController.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/danielcortes/xyz/controllers/actions/NextAction.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/danielcortes/xyz/controllers/actions/NextAction.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/danielcortes/xyz/data/ConnectionHolder.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/danielcortes/xyz/data/ConnectionHolder.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/danielcortes/xyz/data/MysqlConnectionHolder.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/danielcortes/xyz/data/MysqlConnectionHolder.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/danielcortes/xyz/data/Properties.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/danielcortes/xyz/data/Properties.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/danielcortes/xyz/data/SQLiteConnectionHolder.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/danielcortes/xyz/data/SQLiteConnectionHolder.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/danielcortes/xyz/models/caja/Caja.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/danielcortes/xyz/models/caja/Caja.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/danielcortes/xyz/models/caja/CajaDAO.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/danielcortes/xyz/models/caja/CajaDAO.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/danielcortes/xyz/models/caja/MysqlCajaDAO.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/danielcortes/xyz/models/caja/MysqlCajaDAO.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/danielcortes/xyz/models/caja/SQLiteCajaDAO.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/danielcortes/xyz/models/caja/SQLiteCajaDAO.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/danielcortes/xyz/models/documentos/Documentos.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/danielcortes/xyz/models/documentos/Documentos.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/danielcortes/xyz/models/documentos/DocumentosDAO.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/danielcortes/xyz/models/documentos/DocumentosDAO.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/danielcortes/xyz/models/documentos/MysqlDocumentosDAO.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/danielcortes/xyz/models/documentos/MysqlDocumentosDAO.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/danielcortes/xyz/models/documentos/SQLiteDocumentosDAO.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/danielcortes/xyz/models/documentos/SQLiteDocumentosDAO.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/danielcortes/xyz/models/efectivo/Efectivo.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/danielcortes/xyz/models/efectivo/Efectivo.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/danielcortes/xyz/models/efectivo/EfectivoDAO.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/danielcortes/xyz/models/efectivo/EfectivoDAO.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/danielcortes/xyz/models/efectivo/MysqlEfectivoDAO.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/danielcortes/xyz/models/efectivo/MysqlEfectivoDAO.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/danielcortes/xyz/models/efectivo/SQLiteEfectivoDAO.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/danielcortes/xyz/models/efectivo/SQLiteEfectivoDAO.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/danielcortes/xyz/models/egreso/Egreso.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/danielcortes/xyz/models/egreso/Egreso.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/danielcortes/xyz/models/egreso/EgresoDAO.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/danielcortes/xyz/models/egreso/EgresoDAO.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/danielcortes/xyz/models/egreso/MysqlEgresoDAO.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/danielcortes/xyz/models/egreso/MysqlEgresoDAO.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/danielcortes/xyz/models/egreso/SQLiteEgresoDAO.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/danielcortes/xyz/models/egreso/SQLiteEgresoDAO.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/danielcortes/xyz/models/ingreso/Ingreso.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/danielcortes/xyz/models/ingreso/Ingreso.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/danielcortes/xyz/models/ingreso/IngresoDAO.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/danielcortes/xyz/models/ingreso/IngresoDAO.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/danielcortes/xyz/models/ingreso/MysqlIngresoDAO.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/danielcortes/xyz/models/ingreso/MysqlIngresoDAO.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/danielcortes/xyz/models/ingreso/SQLiteIngresoDAO.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/danielcortes/xyz/models/ingreso/SQLiteIngresoDAO.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/danielcortes/xyz/models/tipo_egreso/MysqlTipoEgresoDAO.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/danielcortes/xyz/models/tipo_egreso/MysqlTipoEgresoDAO.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/danielcortes/xyz/models/tipo_egreso/SQLiteTipoEgresoDAO.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/danielcortes/xyz/models/tipo_egreso/SQLiteTipoEgresoDAO.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/danielcortes/xyz/models/tipo_egreso/TipoEgreso.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/danielcortes/xyz/models/tipo_egreso/TipoEgreso.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/danielcortes/xyz/models/tipo_egreso/TipoEgresoDAO.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/danielcortes/xyz/models/tipo_egreso/TipoEgresoDAO.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/danielcortes/xyz/models/tipo_ingreso/MysqlTipoIngresoDAO.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/danielcortes/xyz/models/tipo_ingreso/MysqlTipoIngresoDAO.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/danielcortes/xyz/models/tipo_ingreso/SQLiteTipoIngresoDAO.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/danielcortes/xyz/models/tipo_ingreso/SQLiteTipoIngresoDAO.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/danielcortes/xyz/models/tipo_ingreso/TipoIngreso.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/danielcortes/xyz/models/tipo_ingreso/TipoIngreso.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/danielcortes/xyz/models/tipo_ingreso/TipoIngresoDAO.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/danielcortes/xyz/models/tipo_ingreso/TipoIngresoDAO.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/danielcortes/xyz/views/ArqueoView.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/danielcortes/xyz/views/ArqueoView.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/danielcortes/xyz/views/EgresosView.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/danielcortes/xyz/views/EgresosView.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/danielcortes/xyz/views/IngresosView.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/danielcortes/xyz/views/IngresosView.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/danielcortes/xyz/views/ManagerView.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/danielcortes/xyz/views/ManagerView.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/danielcortes/xyz/views/components/EgresosTableModel.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/danielcortes/xyz/views/components/EgresosTableModel.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/danielcortes/xyz/views/components/IngresosTableModel.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/danielcortes/xyz/views/components/IngresosTableModel.java" afterDir="false" />
</list>
<ignored path="$PROJECT_DIR$/target/" />
<ignored path=".idea/" />
@@ -74,96 +117,12 @@
<favorites_list name="caja" />
</component>
<component name="FileEditorManager">
<leaf>
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
<file pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/src/danielcortes/xyz/controllers/ArqueoController.java">
<entry file="file://$PROJECT_DIR$/dist/conf.properties">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="75">
<caret line="93" column="68" selection-start-line="93" selection-start-column="68" selection-end-line="93" selection-end-column="68" />
<folding>
<element signature="docComment;class#ArqueoController#0" />
<element signature="docComment;method#ArqueoController#0;class#ArqueoController#0" />
<element signature="method#ArqueoController#0;class#ArqueoController#0" />
<element signature="docComment;method#updateCaja#0;class#ArqueoController#0" />
<element signature="method#updateCaja#0;class#ArqueoController#0" />
<element signature="docComment;method#updateResumen#0;class#ArqueoController#0" />
<element signature="docComment;method#fillEfectivo#0;class#ArqueoController#0" />
<element signature="docComment;method#fillDocumentos#0;class#ArqueoController#0" />
<element signature="method#fillDocumentos#0;class#ArqueoController#0" />
<element signature="docComment;method#fillResumen#0;class#ArqueoController#0" />
<element signature="method#fillResumen#0;class#ArqueoController#0" />
<element signature="docComment;method#updateResumenEfectivo#0;class#ArqueoController#0" />
<element signature="method#updateResumenEfectivo#0;class#ArqueoController#0" />
<element signature="docComment;method#updateResumenDocumentos#0;class#ArqueoController#0" />
<element signature="method#updateResumenDocumentos#0;class#ArqueoController#0" />
<element signature="docComment;method#updateResumenIngresos#0;class#ArqueoController#0" />
<element signature="method#updateResumenIngresos#0;class#ArqueoController#0" />
<element signature="docComment;method#updateResumenEgresos#0;class#ArqueoController#0" />
<element signature="method#updateResumenEgresos#0;class#ArqueoController#0" />
<element signature="docComment;method#updateResumenArqueo#0;class#ArqueoController#0" />
<element signature="method#updateResumenArqueo#0;class#ArqueoController#0" />
<element signature="e#7246#7335#1" />
<element signature="e#7339#7426#1" />
<element signature="docComment;method#setUpViewEvents#0;class#ArqueoController#0" />
<element signature="method#setUpViewEvents#0;class#ArqueoController#0" />
<element signature="docComment;method#guardarEfectivoActionListener#0;class#ArqueoController#0" />
<element signature="method#guardarEfectivoActionListener#0;class#ArqueoController#0" />
<element signature="docComment;method#guardarDocumentosActionListener#0;class#ArqueoController#0" />
<element signature="method#guardarDocumentosActionListener#0;class#ArqueoController#0" />
<element signature="docComment;method#guardarEfectivo#0;class#ArqueoController#0" />
<element signature="method#guardarEfectivo#0;class#ArqueoController#0" />
<element signature="docComment;method#guardarDocumentos#0;class#ArqueoController#0" />
<element signature="method#guardarDocumentos#0;class#ArqueoController#0" />
<element signature="e#13262#13553#1" />
<element signature="docComment;method#validateEfectivoInput#0;class#ArqueoController#0" />
<element signature="method#validateEfectivoInput#0;class#ArqueoController#0" />
<element signature="docComment;method#validateDocumentosInput#0;class#ArqueoController#0" />
<element signature="method#validateDocumentosInput#0;class#ArqueoController#0" />
<element signature="docComment;method#validateEfectivoMoneda#0;class#ArqueoController#0" />
<element signature="method#validateEfectivoMoneda#0;class#ArqueoController#0" />
<element signature="e#15945#16089#1" />
<element signature="e#16120#16253#1" />
<element signature="e#16312#16443#1" />
<element signature="e#16478#16630#1" />
<element signature="docComment;method#validateDocumentosValor#0;class#ArqueoController#0" />
<element signature="method#validateDocumentosValor#0;class#ArqueoController#0" />
<element signature="e#17149#17293#1" />
<element signature="e#17324#17457#1" />
<element signature="e#17516#17647#1" />
<element signature="e#17682#17834#1" />
<element signature="docComment;method#hiddeEfectivoErrorMessages#0;class#ArqueoController#0" />
<element signature="method#hiddeEfectivoErrorMessages#0;class#ArqueoController#0" />
<element signature="docComment;method#hiddeDocumentosErrorMessages#0;class#ArqueoController#0" />
<element signature="method#hiddeDocumentosErrorMessages#0;class#ArqueoController#0" />
<element signature="docComment;method#normalizeEfectivoInput#0;class#ArqueoController#0" />
<element signature="method#normalizeEfectivoInput#0;class#ArqueoController#0" />
<element signature="docComment;method#normalizeDocumentosInput#0;class#ArqueoController#0" />
<element signature="method#normalizeDocumentosInput#0;class#ArqueoController#0" />
<element signature="class#GuardarEfectivoAction#0;class#ArqueoController#0" />
<element signature="n#!!block;n#GuardarEfectivoAction#0;n#GuardarEfectivoAction#0;n#ArqueoController#0" />
<element signature="class#GuardarDocumentosAction#0;class#ArqueoController#0" />
<element signature="n#!!block;n#GuardarDocumentosAction#0;n#GuardarDocumentosAction#0;n#ArqueoController#0" />
</folding>
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/danielcortes/xyz/views/ArqueoView.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="170">
<caret line="459" column="31" selection-start-line="459" selection-start-column="31" selection-end-line="459" selection-end-column="31" />
<folding>
<element signature="e#6074#6254#0" />
<element signature="e#6074#26437#0" />
<element signature="e#26443#26479#0" />
<element signature="e#26443#27140#0" />
<element signature="e#26672#26731#1" />
<element signature="e#26737#27010#1" />
<element signature="e#26873#26927#1" />
<element signature="e#26933#27000#1" />
<element signature="e#27146#27182#0" />
</folding>
<state relative-caret-position="46">
<caret line="16" column="35" selection-start-line="16" selection-start-column="27" selection-end-line="16" selection-end-column="35" />
</state>
</provider>
</entry>
@@ -181,6 +140,11 @@
</component>
<component name="FindInProjectRecents">
<findStrings>
<find>addRow</find>
<find>set</find>
<find>print</find>
<find>&quot;</find>
<find>fec</find>
<find>System</find>
<find>[2018] [Daniel Cortes]</find>
<find>id</find>
@@ -206,11 +170,6 @@
<find>editar</find>
<find>toggleSortOrder</find>
<find>Copyright (c) 2018 Daniel Cortes</find>
<find>JFormattedTextField(NumberFormat.getCurrencyInstance())</find>
<find>NumberFormat.getCurrencyInstance(Locale.forLanguageTag(&quot;CL&quot;))</find>
<find>new JFormattedTextField()</find>
<find>DosMil</find>
<find>document</find>
</findStrings>
<replaceStrings>
<replace>2018 Daniel Cortes</replace>
@@ -220,8 +179,6 @@
<replace>text</replace>
<replace>integer primary key</replace>
<replace>Copyright (c) 2018-2019 Daniel Cortes</replace>
<replace>JFormattedTextField(NumberFormat.getCurrencyInstance(Locale.forLanguageTag(&quot;CL&quot;)))</replace>
<replace>new JFormattedTextField(formatter)</replace>
</replaceStrings>
<dirStrings>
<dir>$PROJECT_DIR$/src</dir>
@@ -233,6 +190,9 @@
<component name="IdeDocumentHistory">
<option name="CHANGED_PATHS">
<list>
<option value="$PROJECT_DIR$/src/main/java/danielcortes/xyz/models/caja/CajaOperations.java" />
<option value="$PROJECT_DIR$/src/main/java/danielcortes/xyz/controllers/ManagerController.java" />
<option value="$PROJECT_DIR$/conf" />
<option value="$PROJECT_DIR$/src/main/java/danielcortes/xyz/Main.java" />
<option value="$PROJECT_DIR$/src/main/java/danielcortes/xyz/data/SQLiteConnectionHolder.java" />
<option value="$PROJECT_DIR$/pom.xml" />
@@ -262,9 +222,15 @@
<option value="$PROJECT_DIR$/src/danielcortes/xyz/views/ManagerView.java" />
<option value="$PROJECT_DIR$/src/danielcortes/xyz/Main.java" />
<option value="$PROJECT_DIR$/src/danielcortes/xyz/controllers/AbstractController.java" />
<option value="$PROJECT_DIR$/src/danielcortes/xyz/views/ArqueoView.java" />
<option value="$PROJECT_DIR$/src/danielcortes/xyz/views/ArqueoView.form" />
<option value="$PROJECT_DIR$/src/danielcortes/xyz/views/EgresosView.form" />
<option value="$PROJECT_DIR$/src/danielcortes/xyz/views/components/EgresosTableModel.java" />
<option value="$PROJECT_DIR$/src/danielcortes/xyz/views/components/IngresosTableModel.java" />
<option value="$PROJECT_DIR$/src/danielcortes/xyz/views/IngresosView.java" />
<option value="$PROJECT_DIR$/src/danielcortes/xyz/views/EgresosView.java" />
<option value="$PROJECT_DIR$/src/danielcortes/xyz/controllers/actions/NextAction.java" />
<option value="$PROJECT_DIR$/src/danielcortes/xyz/controllers/ArqueoController.java" />
<option value="$PROJECT_DIR$/src/danielcortes/xyz/controllers/EgresosController.java" />
<option value="$PROJECT_DIR$/src/danielcortes/xyz/controllers/IngresosController.java" />
<option value="$PROJECT_DIR$/src/danielcortes/xyz/controllers/ManagerController.java" />
@@ -275,15 +241,6 @@
<option value="$PROJECT_DIR$/src/danielcortes/xyz/models/caja/Caja.java" />
<option value="$PROJECT_DIR$/database/mysql.sql" />
<option value="$PROJECT_DIR$/database/sqlite.sql" />
<option value="$PROJECT_DIR$/src/danielcortes/xyz/views/IngresosView.java" />
<option value="$PROJECT_DIR$/src/danielcortes/xyz/views/components/IngresosTableModel.java" />
<option value="$PROJECT_DIR$/src/danielcortes/xyz/views/components/EgresosTableModel.java" />
<option value="$PROJECT_DIR$/src/danielcortes/xyz/views/components/NumberFormatFactory.java" />
<option value="$PROJECT_DIR$/src/danielcortes/xyz/views/components/LimitDocumentFilter.java" />
<option value="$PROJECT_DIR$/src/danielcortes/xyz/views/components/JLimitFormatedTextField.java" />
<option value="$PROJECT_DIR$/src/danielcortes/xyz/views/ArqueoView.form" />
<option value="$PROJECT_DIR$/src/danielcortes/xyz/views/ArqueoView.java" />
<option value="$PROJECT_DIR$/src/danielcortes/xyz/controllers/ArqueoController.java" />
</list>
</option>
</component>
@@ -338,8 +295,6 @@
<foldersAlwaysOnTop value="true" />
</navigator>
<panes>
<pane id="PackagesPane" />
<pane id="Scope" />
<pane id="ProjectPane">
<subPane>
<expand>
@@ -350,40 +305,14 @@
<path>
<item name="caja" type="b2602c69:ProjectViewProjectNode" />
<item name="caja" type="462c0819:PsiDirectoryNode" />
<item name="src" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="caja" type="b2602c69:ProjectViewProjectNode" />
<item name="caja" type="462c0819:PsiDirectoryNode" />
<item name="src" type="462c0819:PsiDirectoryNode" />
<item name="xyz" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="caja" type="b2602c69:ProjectViewProjectNode" />
<item name="caja" type="462c0819:PsiDirectoryNode" />
<item name="src" type="462c0819:PsiDirectoryNode" />
<item name="xyz" type="462c0819:PsiDirectoryNode" />
<item name="controllers" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="caja" type="b2602c69:ProjectViewProjectNode" />
<item name="caja" type="462c0819:PsiDirectoryNode" />
<item name="src" type="462c0819:PsiDirectoryNode" />
<item name="xyz" type="462c0819:PsiDirectoryNode" />
<item name="views" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="caja" type="b2602c69:ProjectViewProjectNode" />
<item name="caja" type="462c0819:PsiDirectoryNode" />
<item name="src" type="462c0819:PsiDirectoryNode" />
<item name="xyz" type="462c0819:PsiDirectoryNode" />
<item name="views" type="462c0819:PsiDirectoryNode" />
<item name="ArqueoView" type="e9f4de52:FormNode" />
<item name="dist" type="462c0819:PsiDirectoryNode" />
</path>
</expand>
<select />
</subPane>
</pane>
<pane id="Scope" />
<pane id="PackagesPane" />
</panes>
</component>
<component name="PropertiesComponent">
@@ -397,7 +326,7 @@
<property name="UI_DESIGNER_EDITOR_MODE.UIDesignerToolWindowManager.STATE" value="ToolWindow" />
<property name="WebServerToolWindowFactoryState" value="false" />
<property name="aspect.path.notification.shown" value="true" />
<property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1546644040700" />
<property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1546540041105" />
<property name="com.intellij.ide.scratch.LRUPopupBuilder$1/Change SQL Dialect" value="SQLite" />
<property name="database.console.LAST_STATE" value="false" />
<property name="extract.method.default.visibility" value="private" />
@@ -577,12 +506,7 @@
<workItem from="1546412576852" duration="574000" />
<workItem from="1546481590691" duration="518000" />
<workItem from="1546482678909" duration="5004000" />
<workItem from="1546533252017" duration="6146000" />
<workItem from="1546567665171" duration="5678000" />
<workItem from="1546634940442" duration="1027000" />
<workItem from="1546637327660" duration="1114000" />
<workItem from="1546638522572" duration="2869000" />
<workItem from="1546641714073" duration="2208000" />
<workItem from="1546533252017" duration="4537000" />
</task>
<task id="LOCAL-00001" summary="First!! :3 Existe una pequeña base de proyecto por ahora">
<created>1545280618093</created>
@@ -766,25 +690,11 @@
<option name="project" value="LOCAL" />
<updated>1546536860193</updated>
</task>
<task id="LOCAL-00027" summary="Actualizada licencia al año 2019&#10;Ademas se cambio el output de la compilacion a la carpeta dist, donde se almacenaran todos los archivos necesarios para el funcionamiento del sistema">
<created>1546540174373</created>
<option name="number" value="00027" />
<option name="presentableId" value="LOCAL-00027" />
<option name="project" value="LOCAL" />
<updated>1546540174373</updated>
</task>
<task id="LOCAL-00028" summary="Se me olvido agregar el jar XD">
<created>1546540666662</created>
<option name="number" value="00028" />
<option name="presentableId" value="LOCAL-00028" />
<option name="project" value="LOCAL" />
<updated>1546540666662</updated>
</task>
<option name="localTasksCounter" value="29" />
<option name="localTasksCounter" value="27" />
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="216497000" />
<option name="totallyTimeSpent" value="201992000" />
</component>
<component name="TodoView">
<todo-panel id="selected-file">
@@ -797,9 +707,8 @@
</component>
<component name="ToolWindowManager">
<frame x="0" y="-18" width="1366" height="765" extended-state="6" />
<editor active="true" />
<layout>
<window_info content_ui="combo" id="Project" order="0" sideWeight="0.49438202" visible="true" weight="0.20776255" />
<window_info active="true" content_ui="combo" id="Project" order="0" sideWeight="0.49438202" visible="true" weight="0.20471841" />
<window_info id="Image Layers" order="1" />
<window_info id="Designer" order="2" />
<window_info x="458" y="95" width="450" height="453" id="UI Designer" order="3" weight="0.32952815" />
@@ -808,7 +717,7 @@
<window_info id="simpleUML" order="6" weight="0.329429" />
<window_info anchor="bottom" id="Message" order="0" />
<window_info anchor="bottom" id="Find" order="1" weight="0.32744783" />
<window_info anchor="bottom" x="232" y="111" width="898" height="466" id="Run" order="2" sideWeight="0.49923897" weight="0.3258427" />
<window_info anchor="bottom" x="4" y="0" width="902" height="488" id="Run" order="2" sideWeight="0.49923897" visible="true" weight="0.3258427" />
<window_info anchor="bottom" id="Debug" order="3" weight="0.39968896" />
<window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
<window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
@@ -821,7 +730,7 @@
<window_info anchor="bottom" id="Database Console" order="12" weight="0.32905295" />
<window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
<window_info anchor="right" id="Ant Build" order="1" show_stripe_button="false" weight="0.24961948" />
<window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.24961948" />
<window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
<window_info anchor="right" id="Palette" order="3" />
<window_info anchor="right" id="Theme Preview" order="4" />
<window_info anchor="right" id="Maven" order="5" show_stripe_button="false" weight="0.32876712" />
@@ -888,6 +797,7 @@
<component name="VcsManagerConfiguration">
<option name="CHECK_CODE_SMELLS_BEFORE_PROJECT_COMMIT" value="false" />
<option name="CHECK_NEW_TODO" value="false" />
<MESSAGE value="First!! :3 Existe una pequeña base de proyecto por ahora" />
<MESSAGE value="Creada ventana principal para mostrar el resto de ellas en un cardlayout!" />
<MESSAGE value="Cambiado el egresotablemodel para que acepte un egreso como modelo para llenar la tabla" />
<MESSAGE value="Ahora el modelo de egreso se autocarga con el objeto de tipo egreso en vez de con su id" />
@@ -911,22 +821,33 @@
<MESSAGE value="Mas documentacion!! &#10;Bendita documentacion &lt;3" />
<MESSAGE value="Mas documentacion y cambiados la mayoria de los action listeners por keybindings" />
<MESSAGE value="Comodidades!&#10;Arreglado el problema de index al ordenar las tablas" />
<MESSAGE value="Actualizada licencia al año 2019&#10;Ademas se cambio el output de la compilacion a la carpeta dist, donde se almacenaran todos los archivos necesarios para el funcionamiento del sistema" />
<MESSAGE value="Se me olvido agregar el jar XD" />
<option name="LAST_COMMIT_MESSAGE" value="Se me olvido agregar el jar XD" />
<option name="LAST_COMMIT_MESSAGE" value="Comodidades!&#10;Arreglado el problema de index al ordenar las tablas" />
</component>
<component name="antWorkspaceConfiguration">
<option name="IS_AUTOSCROLL_TO_SOURCE" value="false" />
<option name="FILTER_TARGETS" value="false" />
</component>
<component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/src/main/java/danielcortes/xyz/models/egreso/MysqlEgresoDAO.java" />
<entry file="file://$PROJECT_DIR$/src/main/java/danielcortes/xyz/models/egreso/SQLiteEgresoDAO.java" />
<entry file="file://$PROJECT_DIR$/src/main/java/danielcortes/xyz/models/egreso/EgresoDAO.java" />
<entry file="file://$PROJECT_DIR$/src/main/java/danielcortes/xyz/models/ingreso/SQLiteIngresoDAO.java" />
<entry file="file://$PROJECT_DIR$/src/main/java/danielcortes/xyz/models/ingreso/MysqlIngresoDAO.java" />
<entry file="file://$PROJECT_DIR$/src/main/java/danielcortes/xyz/models/ingreso/IngresoDAO.java" />
<entry file="file://$PROJECT_DIR$/src/main/java/danielcortes/xyz/models/tipo_egreso/MysqlTipoEgresoDAO.java" />
<entry file="file://$PROJECT_DIR$/src/main/java/danielcortes/xyz/models/tipo_egreso/SQLiteTipoEgresoDAO.java" />
<entry file="file://$PROJECT_DIR$/src/main/java/danielcortes/xyz/models/tipo_egreso/TipoEgresoDAO.java" />
<entry file="file://$PROJECT_DIR$/src/main/java/danielcortes/xyz/models/tipo_ingreso/SQLiteTipoIngresoDAO.java" />
<entry file="file://$PROJECT_DIR$/src/main/java/danielcortes/xyz/models/tipo_ingreso/TipoIngresoDAO.java" />
<entry file="file://$PROJECT_DIR$/src/main/java/danielcortes/xyz/models/tipo_ingreso/MysqlTipoIngresoDAO.java" />
<entry file="file://$PROJECT_DIR$/caja-intellij.iml" />
<entry file="file://$PROJECT_DIR$/conf.properties" />
<entry file="file://$PROJECT_DIR$/conf.properties">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="529">
<caret line="21" selection-start-line="21" selection-end-line="21" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/caja.iml">
<provider selected="true" editor-type-id="text-editor" />
</entry>
@@ -954,6 +875,13 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/danielcortes/xyz/Main.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="391">
<caret line="101" column="8" selection-start-line="101" selection-start-column="8" selection-end-line="101" selection-end-column="8" />
</state>
</provider>
</entry>
<entry file="jar:///usr/lib/jvm/java-11-openjdk/lib/src.zip!/java.desktop/javax/swing/AbstractAction.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-6132">
@@ -990,12 +918,66 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/danielcortes/xyz/views/ArqueoView.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="508">
<caret line="442" selection-start-line="442" selection-end-line="442" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/danielcortes/xyz/views/ArqueoView.form">
<provider selected="true" editor-type-id="ui-designer" />
</entry>
<entry file="file://$PROJECT_DIR$/src/danielcortes/xyz/views/IngresosView.form">
<provider selected="true" editor-type-id="ui-designer" />
</entry>
<entry file="file://$PROJECT_DIR$/src/danielcortes/xyz/views/EgresosView.form">
<provider selected="true" editor-type-id="ui-designer" />
</entry>
<entry file="file://$PROJECT_DIR$/src/danielcortes/xyz/views/components/EgresosTableModel.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="29">
<caret line="98" lean-forward="true" selection-start-line="98" selection-end-line="105" selection-end-column="5" />
<folding>
<element signature="method#EgresosTableModel#0;class#EgresosTableModel#0" />
<element signature="method#addRow#0;class#EgresosTableModel#0" />
<element signature="method#removeRow#0;class#EgresosTableModel#0" />
<element signature="method#removeRows#0;class#EgresosTableModel#0" />
<element signature="method#setEgreso#0;class#EgresosTableModel#0" />
<element signature="method#getValueAt#0;class#EgresosTableModel#0" />
<element signature="n#!!block;n#getEgreso#0;n#EgresosTableModel#0" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/danielcortes/xyz/views/components/IngresosTableModel.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="190">
<caret line="100" column="28" lean-forward="true" selection-start-line="100" selection-start-column="28" selection-end-line="100" selection-end-column="28" />
<folding>
<element signature="method#IngresosTableModel#0;class#IngresosTableModel#0" />
<element signature="method#addRow#0;class#IngresosTableModel#0" />
<element signature="method#removeRow#0;class#IngresosTableModel#0" />
<element signature="method#removeRows#0;class#IngresosTableModel#0" />
<element signature="method#getValueAt#0;class#IngresosTableModel#0" />
<element signature="method#setIngreso#0;class#IngresosTableModel#0" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/danielcortes/xyz/views/IngresosView.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="236">
<caret line="62" lean-forward="true" selection-start-line="62" selection-end-line="62" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="jar:///usr/lib/jvm/java-11-openjdk/lib/src.zip!/java.desktop/javax/swing/RowSorter.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="2438">
@@ -1024,6 +1006,16 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/danielcortes/xyz/views/EgresosView.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="172">
<caret line="64" column="58" selection-start-line="64" selection-start-column="58" selection-end-line="64" selection-end-column="58" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/danielcortes/xyz/controllers/actions/NextAction.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="69">
@@ -1034,6 +1026,134 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/danielcortes/xyz/controllers/ArqueoController.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="69">
<caret line="3" column="26" selection-start-line="3" selection-start-column="26" selection-end-line="3" selection-end-column="26" />
<folding>
<element signature="docComment;class#ArqueoController#0" />
<element signature="docComment;method#ArqueoController#0;class#ArqueoController#0" />
<element signature="method#ArqueoController#0;class#ArqueoController#0" />
<element signature="docComment;method#updateCaja#0;class#ArqueoController#0" />
<element signature="method#updateCaja#0;class#ArqueoController#0" />
<element signature="docComment;method#updateResumen#0;class#ArqueoController#0" />
<element signature="docComment;method#fillEfectivo#0;class#ArqueoController#0" />
<element signature="method#fillEfectivo#0;class#ArqueoController#0" />
<element signature="docComment;method#fillDocumentos#0;class#ArqueoController#0" />
<element signature="method#fillDocumentos#0;class#ArqueoController#0" />
<element signature="docComment;method#fillResumen#0;class#ArqueoController#0" />
<element signature="method#fillResumen#0;class#ArqueoController#0" />
<element signature="docComment;method#updateResumenEfectivo#0;class#ArqueoController#0" />
<element signature="method#updateResumenEfectivo#0;class#ArqueoController#0" />
<element signature="docComment;method#updateResumenDocumentos#0;class#ArqueoController#0" />
<element signature="method#updateResumenDocumentos#0;class#ArqueoController#0" />
<element signature="docComment;method#updateResumenIngresos#0;class#ArqueoController#0" />
<element signature="method#updateResumenIngresos#0;class#ArqueoController#0" />
<element signature="docComment;method#updateResumenEgresos#0;class#ArqueoController#0" />
<element signature="method#updateResumenEgresos#0;class#ArqueoController#0" />
<element signature="docComment;method#updateResumenArqueo#0;class#ArqueoController#0" />
<element signature="e#7241#7330#1" />
<element signature="e#7334#7421#1" />
<element signature="docComment;method#setUpViewEvents#0;class#ArqueoController#0" />
<element signature="method#setUpViewEvents#0;class#ArqueoController#0" />
<element signature="docComment;method#guardarEfectivoActionListener#0;class#ArqueoController#0" />
<element signature="method#guardarEfectivoActionListener#0;class#ArqueoController#0" />
<element signature="docComment;method#guardarDocumentosActionListener#0;class#ArqueoController#0" />
<element signature="method#guardarDocumentosActionListener#0;class#ArqueoController#0" />
<element signature="docComment;method#guardarEfectivo#0;class#ArqueoController#0" />
<element signature="method#guardarEfectivo#0;class#ArqueoController#0" />
<element signature="e#12054#12773#1" />
<element signature="docComment;method#guardarDocumentos#0;class#ArqueoController#0" />
<element signature="method#guardarDocumentos#0;class#ArqueoController#0" />
<element signature="e#13262#13553#1" />
<element signature="docComment;method#validateEfectivoInput#0;class#ArqueoController#0" />
<element signature="method#validateEfectivoInput#0;class#ArqueoController#0" />
<element signature="docComment;method#validateDocumentosInput#0;class#ArqueoController#0" />
<element signature="method#validateDocumentosInput#0;class#ArqueoController#0" />
<element signature="docComment;method#validateEfectivoMoneda#0;class#ArqueoController#0" />
<element signature="method#validateEfectivoMoneda#0;class#ArqueoController#0" />
<element signature="e#15945#16089#1" />
<element signature="e#16120#16253#1" />
<element signature="e#16312#16443#1" />
<element signature="e#16478#16630#1" />
<element signature="docComment;method#validateDocumentosValor#0;class#ArqueoController#0" />
<element signature="method#validateDocumentosValor#0;class#ArqueoController#0" />
<element signature="e#17149#17293#1" />
<element signature="e#17324#17457#1" />
<element signature="e#17516#17647#1" />
<element signature="e#17682#17834#1" />
<element signature="docComment;method#hiddeEfectivoErrorMessages#0;class#ArqueoController#0" />
<element signature="method#hiddeEfectivoErrorMessages#0;class#ArqueoController#0" />
<element signature="docComment;method#hiddeDocumentosErrorMessages#0;class#ArqueoController#0" />
<element signature="method#hiddeDocumentosErrorMessages#0;class#ArqueoController#0" />
<element signature="docComment;method#normalizeEfectivoInput#0;class#ArqueoController#0" />
<element signature="method#normalizeEfectivoInput#0;class#ArqueoController#0" />
<element signature="docComment;method#normalizeDocumentosInput#0;class#ArqueoController#0" />
<element signature="method#normalizeDocumentosInput#0;class#ArqueoController#0" />
<element signature="class#GuardarEfectivoAction#0;class#ArqueoController#0" />
<element signature="n#!!block;n#GuardarEfectivoAction#0;n#GuardarEfectivoAction#0;n#ArqueoController#0" />
<element signature="class#GuardarDocumentosAction#0;class#ArqueoController#0" />
<element signature="n#!!block;n#GuardarDocumentosAction#0;n#GuardarDocumentosAction#0;n#ArqueoController#0" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/danielcortes/xyz/controllers/EgresosController.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="69">
<caret line="3" column="26" selection-start-line="3" selection-start-column="26" selection-end-line="3" selection-end-column="26" />
<folding>
<element signature="docComment;class#EgresosController#0" />
<element signature="docComment;method#EgresosController#0;class#EgresosController#0" />
<element signature="method#EgresosController#0;class#EgresosController#0" />
<element signature="docComment;method#getEgresoDAO#0;class#EgresosController#0" />
<element signature="docComment;method#getTipoEgresoDAO#0;class#EgresosController#0" />
<element signature="docComment;method#updateCaja#0;class#EgresosController#0" />
<element signature="method#updateCaja#0;class#EgresosController#0" />
<element signature="docComment;method#fillTipoEgresoCombo#0;class#EgresosController#0" />
<element signature="method#fillTipoEgresoCombo#0;class#EgresosController#0" />
<element signature="docComment;method#fillEgresosTable#0;class#EgresosController#0" />
<element signature="method#fillEgresosTable#0;class#EgresosController#0" />
<element signature="docComment;method#setUpViewEvents#0;class#EgresosController#0" />
<element signature="method#setUpViewEvents#0;class#EgresosController#0" />
<element signature="docComment;method#guardarActionListener#0;class#EgresosController#0" />
<element signature="method#guardarActionListener#0;class#EgresosController#0" />
<element signature="docComment;method#eliminarActionListener#0;class#EgresosController#0" />
<element signature="method#eliminarActionListener#0;class#EgresosController#0" />
<element signature="docComment;method#editarActionListener#0;class#EgresosController#0" />
<element signature="docComment;method#updateTotalEgresos#0;class#EgresosController#0" />
<element signature="method#updateTotalEgresos#0;class#EgresosController#0" />
<element signature="docComment;method#updateButtonsEnabled#0;class#EgresosController#0" />
<element signature="method#updateButtonsEnabled#0;class#EgresosController#0" />
<element signature="docComment;method#guardarEgreso#0;class#EgresosController#0" />
<element signature="method#guardarEgreso#0;class#EgresosController#0" />
<element signature="docComment;method#editarEgreso#0;class#EgresosController#0" />
<element signature="method#editarEgreso#0;class#EgresosController#0" />
<element signature="docComment;method#validateInput#0;class#EgresosController#0" />
<element signature="method#validateInput#0;class#EgresosController#0" />
<element signature="docComment;method#validateNro#0;class#EgresosController#0" />
<element signature="method#validateNro#0;class#EgresosController#0" />
<element signature="docComment;method#validateDescripcion#0;class#EgresosController#0" />
<element signature="method#validateDescripcion#0;class#EgresosController#0" />
<element signature="docComment;method#validateValor#0;class#EgresosController#0" />
<element signature="method#validateValor#0;class#EgresosController#0" />
<element signature="docComment;method#validateTipoEgreso#0;class#EgresosController#0" />
<element signature="method#validateTipoEgreso#0;class#EgresosController#0" />
<element signature="docComment;method#validateCaja#0;class#EgresosController#0" />
<element signature="n#!!block;n#validateCaja#0;n#EgresosController#0" />
<element signature="docComment;method#hideErrorMessages#0;class#EgresosController#0" />
<element signature="method#hideErrorMessages#0;class#EgresosController#0" />
<element signature="docComment;method#clearInputs#0;class#EgresosController#0" />
<element signature="method#clearInputs#0;class#EgresosController#0" />
<element signature="docComment;method#normalizeInputs#0;class#EgresosController#0" />
<element signature="method#normalizeInputs#0;class#EgresosController#0" />
<element signature="docComment;method#resetFocus#0;class#EgresosController#0" />
<element signature="class#GuardarAction#0;class#EgresosController#0" />
<element signature="n#!!block;n#GuardarAction#0;n#GuardarAction#0;n#EgresosController#0" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/danielcortes/xyz/controllers/IngresosController.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="69">
@@ -1089,6 +1209,36 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/danielcortes/xyz/controllers/ManagerController.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="69">
<caret line="3" column="26" selection-start-line="3" selection-start-column="26" selection-end-line="3" selection-end-column="26" />
<folding>
<element signature="docComment;class#ManagerController#0" />
<element signature="docComment;method#ManagerController#0;class#ManagerController#0" />
<element signature="method#ManagerController#0;class#ManagerController#0" />
<element signature="docComment;method#setUpDate#0;class#ManagerController#0" />
<element signature="method#setUpDate#0;class#ManagerController#0" />
<element signature="docComment;method#setUpViewEvents#0;class#ManagerController#0" />
<element signature="method#setUpViewEvents#0;class#ManagerController#0" />
<element signature="e#4623#4784#0" />
<element signature="e#4843#5005#0" />
<element signature="e#5062#5274#0" />
<element signature="docComment;method#updateCaja#0;class#ManagerController#0" />
<element signature="method#updateCaja#0;class#ManagerController#0" />
<element signature="docComment;method#loadCardContents#0;class#ManagerController#0" />
<element signature="method#loadCardContents#0;class#ManagerController#0" />
<element signature="docComment;method#loadIngresosView#0;class#ManagerController#0" />
<element signature="method#loadIngresosView#0;class#ManagerController#0" />
<element signature="docComment;method#loadEgresosView#0;class#ManagerController#0" />
<element signature="method#loadEgresosView#0;class#ManagerController#0" />
<element signature="docComment;method#loadArqueoView#0;class#ManagerController#0" />
<element signature="method#loadArqueoView#0;class#ManagerController#0" />
<element signature="docComment;method#pressInitialButton#0;class#ManagerController#0" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/danielcortes/xyz/data/ConnectionHolder.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="69">
@@ -1147,315 +1297,8 @@
</entry>
<entry file="file://$PROJECT_DIR$/dist/conf.properties">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="230">
<caret line="23" column="40" lean-forward="true" selection-start-line="23" selection-start-column="40" selection-end-line="23" selection-end-column="40" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/danielcortes/xyz/controllers/EgresosController.java">
<provider selected="true" editor-type-id="text-editor">
<state>
<folding>
<element signature="docComment;class#EgresosController#0" />
<element signature="docComment;method#EgresosController#0;class#EgresosController#0" />
<element signature="method#EgresosController#0;class#EgresosController#0" />
<element signature="docComment;method#getEgresoDAO#0;class#EgresosController#0" />
<element signature="docComment;method#getTipoEgresoDAO#0;class#EgresosController#0" />
<element signature="docComment;method#updateCaja#0;class#EgresosController#0" />
<element signature="method#updateCaja#0;class#EgresosController#0" />
<element signature="docComment;method#fillTipoEgresoCombo#0;class#EgresosController#0" />
<element signature="method#fillTipoEgresoCombo#0;class#EgresosController#0" />
<element signature="e#3350#3404#1" />
<element signature="docComment;method#fillEgresosTable#0;class#EgresosController#0" />
<element signature="method#fillEgresosTable#0;class#EgresosController#0" />
<element signature="e#3739#3796#1" />
<element signature="docComment;method#setUpViewEvents#0;class#EgresosController#0" />
<element signature="method#setUpViewEvents#0;class#EgresosController#0" />
<element signature="e#5937#6023#1" />
<element signature="docComment;method#guardarActionListener#0;class#EgresosController#0" />
<element signature="method#guardarActionListener#0;class#EgresosController#0" />
<element signature="e#6846#6930#1" />
<element signature="e#6935#7020#1" />
<element signature="docComment;method#eliminarActionListener#0;class#EgresosController#0" />
<element signature="method#eliminarActionListener#0;class#EgresosController#0" />
<element signature="e#7416#7708#1" />
<element signature="docComment;method#editarActionListener#0;class#EgresosController#0" />
<element signature="method#editarActionListener#0;class#EgresosController#0" />
<element signature="e#8348#8870#1" />
<element signature="docComment;method#updateTotalEgresos#0;class#EgresosController#0" />
<element signature="method#updateTotalEgresos#0;class#EgresosController#0" />
<element signature="docComment;method#updateButtonsEnabled#0;class#EgresosController#0" />
<element signature="method#updateButtonsEnabled#0;class#EgresosController#0" />
<element signature="e#9421#9550#1" />
<element signature="e#9556#9687#1" />
<element signature="docComment;method#guardarEgreso#0;class#EgresosController#0" />
<element signature="method#guardarEgreso#0;class#EgresosController#0" />
<element signature="e#10066#10502#1" />
<element signature="docComment;method#editarEgreso#0;class#EgresosController#0" />
<element signature="method#editarEgreso#0;class#EgresosController#0" />
<element signature="e#10919#11404#1" />
<element signature="docComment;method#validateInput#0;class#EgresosController#0" />
<element signature="method#validateInput#0;class#EgresosController#0" />
<element signature="docComment;method#validateNro#0;class#EgresosController#0" />
<element signature="method#validateNro#0;class#EgresosController#0" />
<element signature="e#12513#12689#1" />
<element signature="e#12744#12909#1" />
<element signature="docComment;method#validateDescripcion#0;class#EgresosController#0" />
<element signature="method#validateDescripcion#0;class#EgresosController#0" />
<element signature="e#13354#13540#1" />
<element signature="e#13577#13752#1" />
<element signature="docComment;method#validateValor#0;class#EgresosController#0" />
<element signature="method#validateValor#0;class#EgresosController#0" />
<element signature="e#14262#14436#1" />
<element signature="e#14467#14630#1" />
<element signature="e#14689#14850#1" />
<element signature="e#14885#15067#1" />
<element signature="docComment;method#validateTipoEgreso#0;class#EgresosController#0" />
<element signature="method#validateTipoEgreso#0;class#EgresosController#0" />
<element signature="e#15471#15655#1" />
<element signature="docComment;method#validateCaja#0;class#EgresosController#0" />
<element signature="n#!!block;n#validateCaja#0;n#EgresosController#0" />
<element signature="docComment;method#hideErrorMessages#0;class#EgresosController#0" />
<element signature="method#hideErrorMessages#0;class#EgresosController#0" />
<element signature="docComment;method#clearInputs#0;class#EgresosController#0" />
<element signature="method#clearInputs#0;class#EgresosController#0" />
<element signature="docComment;method#normalizeInputs#0;class#EgresosController#0" />
<element signature="method#normalizeInputs#0;class#EgresosController#0" />
<element signature="docComment;method#resetFocus#0;class#EgresosController#0" />
<element signature="class#GuardarAction#0;class#EgresosController#0" />
<element signature="n#!!block;n#GuardarAction#0;n#GuardarAction#0;n#EgresosController#0" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/danielcortes/xyz/views/IngresosView.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="259">
<caret line="66" selection-start-line="66" selection-end-line="66" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/danielcortes/xyz/views/components/EgresosTableModel.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="393">
<caret line="98" selection-start-line="98" selection-end-line="98" />
<folding>
<element signature="method#EgresosTableModel#0;class#EgresosTableModel#0" />
<element signature="method#addRow#0;class#EgresosTableModel#0" />
<element signature="method#removeRow#0;class#EgresosTableModel#0" />
<element signature="method#removeRows#0;class#EgresosTableModel#0" />
<element signature="method#setEgreso#0;class#EgresosTableModel#0" />
<element signature="method#getValueAt#0;class#EgresosTableModel#0" />
<element signature="n#!!block;n#getEgreso#0;n#EgresosTableModel#0" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/danielcortes/xyz/views/EgresosView.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="379">
<caret line="64" column="58" selection-start-line="64" selection-start-column="58" selection-end-line="64" selection-end-column="58" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="jar:///usr/lib/jvm/java-11-openjdk/lib/src.zip!/java.base/java/text/spi/NumberFormatProvider.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-748">
<caret line="34" column="53" lean-forward="true" selection-start-line="34" selection-start-column="53" selection-end-line="34" selection-end-column="53" />
</state>
</provider>
</entry>
<entry file="jar:///usr/lib/jvm/java-11-openjdk/lib/src.zip!/java.base/java/text/NumberFormat.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="278">
<caret line="926" column="51" lean-forward="true" selection-start-line="926" selection-start-column="51" selection-end-line="926" selection-end-column="51" />
<folding>
<element signature="e#25098#25099#0" expanded="true" />
<element signature="e#25157#25158#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/danielcortes/xyz/Main.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1081">
<caret line="96" selection-start-line="96" selection-end-line="96" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/danielcortes/xyz/controllers/ManagerController.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="2001">
<caret line="192" selection-start-line="192" selection-end-line="192" />
<folding>
<element signature="e#0#7881#0" expanded="true" />
<element signature="docComment;class#ManagerController#0" />
<element signature="docComment;method#ManagerController#0;class#ManagerController#0" />
<element signature="docComment;method#setUpDate#0;class#ManagerController#0" />
<element signature="method#setUpDate#0;class#ManagerController#0" />
<element signature="docComment;method#setUpViewEvents#0;class#ManagerController#0" />
<element signature="method#setUpViewEvents#0;class#ManagerController#0" />
<element signature="docComment;method#updateCaja#0;class#ManagerController#0" />
<element signature="method#updateCaja#0;class#ManagerController#0" />
<element signature="docComment;method#loadCardContents#0;class#ManagerController#0" />
<element signature="docComment;method#loadIngresosView#0;class#ManagerController#0" />
<element signature="method#loadIngresosView#0;class#ManagerController#0" />
<element signature="docComment;method#loadEgresosView#0;class#ManagerController#0" />
<element signature="method#loadEgresosView#0;class#ManagerController#0" />
<element signature="docComment;method#loadArqueoView#0;class#ManagerController#0" />
<element signature="docComment;method#pressInitialButton#0;class#ManagerController#0" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/danielcortes/xyz/views/components/IngresosTableModel.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="255">
<caret line="97" selection-start-line="97" selection-end-line="97" />
<folding>
<element signature="method#IngresosTableModel#0;class#IngresosTableModel#0" />
<element signature="method#addRow#0;class#IngresosTableModel#0" />
<element signature="method#removeRow#0;class#IngresosTableModel#0" />
<element signature="method#removeRows#0;class#IngresosTableModel#0" />
<element signature="method#getValueAt#0;class#IngresosTableModel#0" />
<element signature="method#setIngreso#0;class#IngresosTableModel#0" />
</folding>
</state>
</provider>
</entry>
<entry file="jar:///usr/lib/jvm/java-11-openjdk/lib/src.zip!/java.desktop/java/awt/EventDispatchThread.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="126">
<caret line="100" selection-start-line="100" selection-end-line="100" />
<folding>
<element signature="e#3450#3451#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="jar:///usr/lib/jvm/java-11-openjdk/lib/src.zip!/java.desktop/javax/swing/JFormattedTextField.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="690">
<caret line="904" column="61" selection-start-line="904" selection-start-column="53" selection-end-line="904" selection-end-column="61" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/danielcortes/xyz/views/components/JLimitFormatedTextField.java" />
<entry file="file://$PROJECT_DIR$/src/danielcortes/xyz/views/components/LimitDocumentFilter.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="140">
<caret line="42" column="109" selection-start-line="42" selection-start-column="109" selection-end-line="42" selection-end-column="109" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/danielcortes/xyz/views/ArqueoView.form">
<provider selected="true" editor-type-id="ui-designer" />
</entry>
<entry file="file://$PROJECT_DIR$/src/danielcortes/xyz/views/components/NumberFormatFactory.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-150">
<caret line="31" column="11" selection-start-line="31" selection-start-column="11" selection-end-line="31" selection-end-column="11" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/danielcortes/xyz/views/ArqueoView.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="170">
<caret line="459" column="31" selection-start-line="459" selection-start-column="31" selection-end-line="459" selection-end-column="31" />
<folding>
<element signature="e#6074#6254#0" />
<element signature="e#6074#26437#0" />
<element signature="e#26443#26479#0" />
<element signature="e#26443#27140#0" />
<element signature="e#26672#26731#1" />
<element signature="e#26737#27010#1" />
<element signature="e#26873#26927#1" />
<element signature="e#26933#27000#1" />
<element signature="e#27146#27182#0" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/danielcortes/xyz/controllers/ArqueoController.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="75">
<caret line="93" column="68" selection-start-line="93" selection-start-column="68" selection-end-line="93" selection-end-column="68" />
<folding>
<element signature="docComment;class#ArqueoController#0" />
<element signature="docComment;method#ArqueoController#0;class#ArqueoController#0" />
<element signature="method#ArqueoController#0;class#ArqueoController#0" />
<element signature="docComment;method#updateCaja#0;class#ArqueoController#0" />
<element signature="method#updateCaja#0;class#ArqueoController#0" />
<element signature="docComment;method#updateResumen#0;class#ArqueoController#0" />
<element signature="docComment;method#fillEfectivo#0;class#ArqueoController#0" />
<element signature="docComment;method#fillDocumentos#0;class#ArqueoController#0" />
<element signature="method#fillDocumentos#0;class#ArqueoController#0" />
<element signature="docComment;method#fillResumen#0;class#ArqueoController#0" />
<element signature="method#fillResumen#0;class#ArqueoController#0" />
<element signature="docComment;method#updateResumenEfectivo#0;class#ArqueoController#0" />
<element signature="method#updateResumenEfectivo#0;class#ArqueoController#0" />
<element signature="docComment;method#updateResumenDocumentos#0;class#ArqueoController#0" />
<element signature="method#updateResumenDocumentos#0;class#ArqueoController#0" />
<element signature="docComment;method#updateResumenIngresos#0;class#ArqueoController#0" />
<element signature="method#updateResumenIngresos#0;class#ArqueoController#0" />
<element signature="docComment;method#updateResumenEgresos#0;class#ArqueoController#0" />
<element signature="method#updateResumenEgresos#0;class#ArqueoController#0" />
<element signature="docComment;method#updateResumenArqueo#0;class#ArqueoController#0" />
<element signature="method#updateResumenArqueo#0;class#ArqueoController#0" />
<element signature="e#7246#7335#1" />
<element signature="e#7339#7426#1" />
<element signature="docComment;method#setUpViewEvents#0;class#ArqueoController#0" />
<element signature="method#setUpViewEvents#0;class#ArqueoController#0" />
<element signature="docComment;method#guardarEfectivoActionListener#0;class#ArqueoController#0" />
<element signature="method#guardarEfectivoActionListener#0;class#ArqueoController#0" />
<element signature="docComment;method#guardarDocumentosActionListener#0;class#ArqueoController#0" />
<element signature="method#guardarDocumentosActionListener#0;class#ArqueoController#0" />
<element signature="docComment;method#guardarEfectivo#0;class#ArqueoController#0" />
<element signature="method#guardarEfectivo#0;class#ArqueoController#0" />
<element signature="docComment;method#guardarDocumentos#0;class#ArqueoController#0" />
<element signature="method#guardarDocumentos#0;class#ArqueoController#0" />
<element signature="e#13262#13553#1" />
<element signature="docComment;method#validateEfectivoInput#0;class#ArqueoController#0" />
<element signature="method#validateEfectivoInput#0;class#ArqueoController#0" />
<element signature="docComment;method#validateDocumentosInput#0;class#ArqueoController#0" />
<element signature="method#validateDocumentosInput#0;class#ArqueoController#0" />
<element signature="docComment;method#validateEfectivoMoneda#0;class#ArqueoController#0" />
<element signature="method#validateEfectivoMoneda#0;class#ArqueoController#0" />
<element signature="e#15945#16089#1" />
<element signature="e#16120#16253#1" />
<element signature="e#16312#16443#1" />
<element signature="e#16478#16630#1" />
<element signature="docComment;method#validateDocumentosValor#0;class#ArqueoController#0" />
<element signature="method#validateDocumentosValor#0;class#ArqueoController#0" />
<element signature="e#17149#17293#1" />
<element signature="e#17324#17457#1" />
<element signature="e#17516#17647#1" />
<element signature="e#17682#17834#1" />
<element signature="docComment;method#hiddeEfectivoErrorMessages#0;class#ArqueoController#0" />
<element signature="method#hiddeEfectivoErrorMessages#0;class#ArqueoController#0" />
<element signature="docComment;method#hiddeDocumentosErrorMessages#0;class#ArqueoController#0" />
<element signature="method#hiddeDocumentosErrorMessages#0;class#ArqueoController#0" />
<element signature="docComment;method#normalizeEfectivoInput#0;class#ArqueoController#0" />
<element signature="method#normalizeEfectivoInput#0;class#ArqueoController#0" />
<element signature="docComment;method#normalizeDocumentosInput#0;class#ArqueoController#0" />
<element signature="method#normalizeDocumentosInput#0;class#ArqueoController#0" />
<element signature="class#GuardarEfectivoAction#0;class#ArqueoController#0" />
<element signature="n#!!block;n#GuardarEfectivoAction#0;n#GuardarEfectivoAction#0;n#ArqueoController#0" />
<element signature="class#GuardarDocumentosAction#0;class#ArqueoController#0" />
<element signature="n#!!block;n#GuardarDocumentosAction#0;n#GuardarDocumentosAction#0;n#ArqueoController#0" />
</folding>
<state relative-caret-position="46">
<caret line="16" column="35" selection-start-line="16" selection-start-column="27" selection-end-line="16" selection-end-column="35" />
</state>
</provider>
</entry>

BIN
dist/caja.jar vendored
View File

Binary file not shown.

BIN
dist/database.sqlite vendored
View File

Binary file not shown.

58
src/danielcortes/xyz/controllers/ArqueoController.java
View File

@@ -90,15 +90,15 @@ public class ArqueoController {
*/
private void fillEfectivo() {
this.efectivo = this.efectivoDAO.findByCaja(this.caja);
this.view.getVeinteMilField().setValue(efectivo.getVeinteMil());
this.view.getDiezMilField().setValue(efectivo.getDiezMil());
this.view.getCincoMilField().setValue(efectivo.getCincoMil());
this.view.getDosMilField().setValue(efectivo.getDosMil());
this.view.getMilField().setValue(efectivo.getMil());
this.view.getQuinientosField().setValue(efectivo.getQuinientos());
this.view.getCienField().setValue(efectivo.getCien());
this.view.getCincuentaField().setValue(efectivo.getCincuenta());
this.view.getDiezField().setValue(efectivo.getDiez());
this.view.getVeinteMilField().setText(String.valueOf(efectivo.getVeinteMil()));
this.view.getDiezMilField().setText(String.valueOf(efectivo.getDiezMil()));
this.view.getCincoMilField().setText(String.valueOf(efectivo.getCincoMil()));
this.view.getDosMilField().setText(String.valueOf(efectivo.getDosMil()));
this.view.getMilField().setText(String.valueOf(efectivo.getMil()));
this.view.getQuinientosField().setText(String.valueOf(efectivo.getQuinientos()));
this.view.getCienField().setText(String.valueOf(efectivo.getCien()));
this.view.getCincuentaField().setText(String.valueOf(efectivo.getCincuenta()));
this.view.getDiezField().setText(String.valueOf(efectivo.getDiez()));
}
/**
@@ -252,31 +252,31 @@ public class ArqueoController {
* llama a updateResumenEfectivo y updateResumenArqueo para actualizar los datos en efectivoField y arqueoField
*/
private void guardarEfectivo() {
int diez = (Integer) this.view.getDiezField().getValue();
int cincuenta = (Integer) this.view.getCincuentaField().getValue();
int cien = (Integer) this.view.getCienField().getValue();
int quinientos = (Integer) this.view.getQuinientosField().getValue();
int mil = (Integer) this.view.getMilField().getValue();
int dosMil = (Integer) this.view.getDosMilField().getValue();
int cincoMil = (Integer) this.view.getCincoMilField().getValue();
int diezMil = (Integer) this.view.getDiezMilField().getValue();
int veinteMil = (Integer) this.view.getVeinteMilField().getValue();
String diez = this.view.getDiezField().getText();
String cincuenta = this.view.getCincuentaField().getText();
String cien = this.view.getCienField().getText();
String quinientos = this.view.getQuinientosField().getText();
String mil = this.view.getMilField().getText();
String dosMil = this.view.getDosMilField().getText();
String cincoMil = this.view.getCincoMilField().getText();
String diezMil = this.view.getDiezMilField().getText();
String veinteMil = this.view.getVeinteMilField().getText();
//if (this.validateEfectivoInput(diez, cincuenta, cien, quinientos, mil, dosMil, cincoMil, diezMil, veinteMil)) {
this.efectivo.setDiez(diez);
this.efectivo.setCincuenta(cincuenta);
this.efectivo.setCien(cien);
this.efectivo.setQuinientos(quinientos);
this.efectivo.setMil(mil);
this.efectivo.setDosMil(dosMil);
this.efectivo.setCincoMil(cincoMil);
this.efectivo.setDiezMil(diezMil);
this.efectivo.setVeinteMil(veinteMil);
if (this.validateEfectivoInput(diez, cincuenta, cien, quinientos, mil, dosMil, cincoMil, diezMil, veinteMil)) {
this.efectivo.setDiez(Integer.valueOf(diez));
this.efectivo.setCincuenta(Integer.valueOf(cincuenta));
this.efectivo.setCien(Integer.valueOf(cien));
this.efectivo.setQuinientos(Integer.valueOf(quinientos));
this.efectivo.setMil(Integer.valueOf(mil));
this.efectivo.setDosMil(Integer.valueOf(dosMil));
this.efectivo.setCincoMil(Integer.valueOf(cincoMil));
this.efectivo.setDiezMil(Integer.valueOf(diezMil));
this.efectivo.setVeinteMil(Integer.valueOf(veinteMil));
this.efectivoDAO.updateEfectivo(efectivo);
this.updateResumenEfectivo();
this.updateResumenArqueo();
//}
}
}
/**

36
src/danielcortes/xyz/views/ArqueoView.form
View File

@@ -188,14 +188,14 @@
<text value="$20000"/>
</properties>
</component>
<component id="ce2b2" class="javax.swing.JFormattedTextField" binding="veinteMilField">
<component id="99f2e" class="javax.swing.JTextField" binding="veinteMilField">
<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="200" height="-1"/>
</grid>
</constraints>
<properties>
<text value=""/>
<text value="0"/>
</properties>
</component>
<component id="584ed" class="javax.swing.JLabel">
@@ -206,24 +206,24 @@
<text value="$10000"/>
</properties>
</component>
<component id="5b2c6" class="javax.swing.JFormattedTextField" binding="diezMilField">
<component id="5431d" class="javax.swing.JTextField" binding="diezMilField">
<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="200" height="-1"/>
</grid>
</constraints>
<properties>
<text value=""/>
<text value="0"/>
</properties>
</component>
<component id="89afe" class="javax.swing.JFormattedTextField" binding="cincoMilField">
<component id="af49b" class="javax.swing.JTextField" binding="cincoMilField">
<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="200" height="-1"/>
</grid>
</constraints>
<properties>
<text value=""/>
<text value="0"/>
</properties>
</component>
<component id="8d468" class="javax.swing.JLabel">
@@ -242,24 +242,24 @@
<text value="$2000"/>
</properties>
</component>
<component id="de893" class="javax.swing.JFormattedTextField" binding="dosMilField">
<component id="bbb4" class="javax.swing.JTextField" binding="dosMilField">
<constraints>
<grid row="6" 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="200" height="-1"/>
</grid>
</constraints>
<properties>
<text value=""/>
<text value="0"/>
</properties>
</component>
<component id="bd2a0" class="javax.swing.JFormattedTextField" binding="milField">
<component id="4807e" class="javax.swing.JTextField" binding="milField">
<constraints>
<grid row="8" 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="200" height="-1"/>
</grid>
</constraints>
<properties>
<text value=""/>
<text value="0"/>
</properties>
</component>
<component id="e80c8" class="javax.swing.JLabel">
@@ -278,14 +278,14 @@
<text value="$500"/>
</properties>
</component>
<component id="63aff" class="javax.swing.JFormattedTextField" binding="quinientosField">
<component id="3d6c3" class="javax.swing.JTextField" binding="quinientosField">
<constraints>
<grid row="10" 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="200" height="-1"/>
</grid>
</constraints>
<properties>
<text value=""/>
<text value="0"/>
</properties>
</component>
<component id="7910b" class="javax.swing.JLabel">
@@ -296,14 +296,14 @@
<text value="$100"/>
</properties>
</component>
<component id="4ea8f" class="javax.swing.JFormattedTextField" binding="cienField">
<component id="8f6e8" class="javax.swing.JTextField" binding="cienField">
<constraints>
<grid row="12" 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="200" height="-1"/>
</grid>
</constraints>
<properties>
<text value=""/>
<text value="0"/>
</properties>
</component>
<component id="e105f" class="javax.swing.JLabel">
@@ -314,14 +314,14 @@
<text value="$50"/>
</properties>
</component>
<component id="2e4ef" class="javax.swing.JFormattedTextField" binding="cincuentaField">
<component id="22b2c" class="javax.swing.JTextField" binding="cincuentaField">
<constraints>
<grid row="14" 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="200" height="-1"/>
</grid>
</constraints>
<properties>
<text value=""/>
<text value="0"/>
</properties>
</component>
<component id="fcf59" class="javax.swing.JLabel">
@@ -332,14 +332,14 @@
<text value="$10"/>
</properties>
</component>
<component id="642a1" class="javax.swing.JFormattedTextField" binding="diezField">
<component id="6f156" class="javax.swing.JTextField" binding="diezField">
<constraints>
<grid row="16" 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="200" height="-1"/>
</grid>
</constraints>
<properties>
<text value=""/>
<text value="0"/>
</properties>
</component>
<component id="a2c3f" class="javax.swing.JButton" binding="guardarEfectivoButton">

108
src/danielcortes/xyz/views/ArqueoView.java
View File

@@ -28,26 +28,22 @@ package danielcortes.xyz.views;
import com.intellij.uiDesigner.core.GridConstraints;
import com.intellij.uiDesigner.core.GridLayoutManager;
import com.intellij.uiDesigner.core.Spacer;
import danielcortes.xyz.views.components.LimitDocumentFilter;
import danielcortes.xyz.views.components.NumberFormatFactory;
import javax.swing.*;
import javax.swing.border.TitledBorder;
import javax.swing.text.AbstractDocument;
import java.awt.*;
import java.util.ArrayList;
public class ArqueoView {
private JPanel contentPanel;
private JFormattedTextField veinteMilField;
private JFormattedTextField diezMilField;
private JFormattedTextField cincoMilField;
private JFormattedTextField dosMilField;
private JFormattedTextField milField;
private JFormattedTextField quinientosField;
private JFormattedTextField cienField;
private JFormattedTextField cincuentaField;
private JFormattedTextField diezField;
private JTextField veinteMilField;
private JTextField diezMilField;
private JTextField cincoMilField;
private JTextField dosMilField;
private JTextField milField;
private JTextField quinientosField;
private JTextField cienField;
private JTextField cincuentaField;
private JTextField diezField;
private JTextField chequesField;
private JTextField tarjetasField;
private JTextField efectivoField;
@@ -71,62 +67,43 @@ public class ArqueoView {
private JTextField diferenciaField;
private JTextField debeRendirField;
private ArrayList<JFormattedTextField> efectivoFieldList;
public ArqueoView() {
$$$setupUI$$$();
this.efectivoFieldList = new ArrayList<>();
this.efectivoFieldList.add(this.veinteMilField);
this.efectivoFieldList.add(this.diezMilField);
this.efectivoFieldList.add(this.cincoMilField);
this.efectivoFieldList.add(this.dosMilField);
this.efectivoFieldList.add(this.milField);
this.efectivoFieldList.add(this.quinientosField);
this.efectivoFieldList.add(this.cienField);
this.efectivoFieldList.add(this.cincuentaField);
this.efectivoFieldList.add(this.diezField);
this.setupFields();
}
public JPanel getContentPanel() {
return contentPanel;
}
public JFormattedTextField getVeinteMilField() {
public JTextField getVeinteMilField() {
return veinteMilField;
}
public JFormattedTextField getDiezMilField() {
public JTextField getDiezMilField() {
return diezMilField;
}
public JFormattedTextField getCincoMilField() {
public JTextField getCincoMilField() {
return cincoMilField;
}
public JFormattedTextField getDosMilField() {
public JTextField getDosMilField() {
return dosMilField;
}
public JFormattedTextField getMilField() {
public JTextField getMilField() {
return milField;
}
public JFormattedTextField getQuinientosField() {
public JTextField getQuinientosField() {
return quinientosField;
}
public JFormattedTextField getCienField() {
public JTextField getCienField() {
return cienField;
}
public JFormattedTextField getCincuentaField() {
public JTextField getCincuentaField() {
return cincuentaField;
}
public JFormattedTextField getDiezField() {
public JTextField getDiezField() {
return diezField;
}
@@ -218,6 +195,13 @@ public class ArqueoView {
return errorTarjetas;
}
{
// GUI initializer generated by IntelliJ IDEA GUI Designer
// >>> IMPORTANT!! <<<
// DO NOT EDIT OR ADD ANY CODE HERE!
$$$setupUI$$$();
}
/**
* Method generated by IntelliJ IDEA GUI Designer
* >>> IMPORTANT!! <<<
@@ -299,17 +283,17 @@ public class ArqueoView {
final JLabel label8 = new JLabel();
label8.setText("$20000");
panel3.add(label8, new GridConstraints(0, 0, 1, 1, GridConstraints.ANCHOR_EAST, GridConstraints.FILL_NONE, GridConstraints.SIZEPOLICY_FIXED, GridConstraints.SIZEPOLICY_FIXED, null, null, null, 0, false));
veinteMilField = new JFormattedTextField();
veinteMilField.setText("");
veinteMilField = new JTextField();
veinteMilField.setText("0");
panel3.add(veinteMilField, new GridConstraints(0, 1, 1, 1, GridConstraints.ANCHOR_WEST, GridConstraints.FILL_HORIZONTAL, GridConstraints.SIZEPOLICY_WANT_GROW, GridConstraints.SIZEPOLICY_FIXED, null, new Dimension(200, -1), null, 0, false));
final JLabel label9 = new JLabel();
label9.setText("$10000");
panel3.add(label9, new GridConstraints(2, 0, 1, 1, GridConstraints.ANCHOR_EAST, GridConstraints.FILL_NONE, GridConstraints.SIZEPOLICY_FIXED, GridConstraints.SIZEPOLICY_FIXED, null, null, null, 0, false));
diezMilField = new JFormattedTextField();
diezMilField.setText("");
diezMilField = new JTextField();
diezMilField.setText("0");
panel3.add(diezMilField, new GridConstraints(2, 1, 1, 1, GridConstraints.ANCHOR_WEST, GridConstraints.FILL_HORIZONTAL, GridConstraints.SIZEPOLICY_WANT_GROW, GridConstraints.SIZEPOLICY_FIXED, null, new Dimension(200, -1), null, 0, false));
cincoMilField = new JFormattedTextField();
cincoMilField.setText("");
cincoMilField = new JTextField();
cincoMilField.setText("0");
panel3.add(cincoMilField, new GridConstraints(4, 1, 1, 1, GridConstraints.ANCHOR_WEST, GridConstraints.FILL_HORIZONTAL, GridConstraints.SIZEPOLICY_WANT_GROW, GridConstraints.SIZEPOLICY_FIXED, null, new Dimension(200, -1), null, 0, false));
final JLabel label10 = new JLabel();
label10.setText("$5000");
@@ -317,11 +301,11 @@ public class ArqueoView {
final JLabel label11 = new JLabel();
label11.setText("$2000");
panel3.add(label11, new GridConstraints(6, 0, 1, 1, GridConstraints.ANCHOR_EAST, GridConstraints.FILL_NONE, GridConstraints.SIZEPOLICY_FIXED, GridConstraints.SIZEPOLICY_FIXED, null, null, null, 0, false));
dosMilField = new JFormattedTextField();
dosMilField.setText("");
dosMilField = new JTextField();
dosMilField.setText("0");
panel3.add(dosMilField, new GridConstraints(6, 1, 1, 1, GridConstraints.ANCHOR_WEST, GridConstraints.FILL_HORIZONTAL, GridConstraints.SIZEPOLICY_WANT_GROW, GridConstraints.SIZEPOLICY_FIXED, null, new Dimension(200, -1), null, 0, false));
milField = new JFormattedTextField();
milField.setText("");
milField = new JTextField();
milField.setText("0");
panel3.add(milField, new GridConstraints(8, 1, 1, 1, GridConstraints.ANCHOR_WEST, GridConstraints.FILL_HORIZONTAL, GridConstraints.SIZEPOLICY_WANT_GROW, GridConstraints.SIZEPOLICY_FIXED, null, new Dimension(200, -1), null, 0, false));
final JLabel label12 = new JLabel();
label12.setText("$1000");
@@ -329,26 +313,26 @@ public class ArqueoView {
final JLabel label13 = new JLabel();
label13.setText("$500");
panel3.add(label13, new GridConstraints(10, 0, 1, 1, GridConstraints.ANCHOR_EAST, GridConstraints.FILL_NONE, GridConstraints.SIZEPOLICY_FIXED, GridConstraints.SIZEPOLICY_FIXED, null, null, null, 0, false));
quinientosField = new JFormattedTextField();
quinientosField.setText("");
quinientosField = new JTextField();
quinientosField.setText("0");
panel3.add(quinientosField, new GridConstraints(10, 1, 1, 1, GridConstraints.ANCHOR_WEST, GridConstraints.FILL_HORIZONTAL, GridConstraints.SIZEPOLICY_WANT_GROW, GridConstraints.SIZEPOLICY_FIXED, null, new Dimension(200, -1), null, 0, false));
final JLabel label14 = new JLabel();
label14.setText("$100");
panel3.add(label14, new GridConstraints(12, 0, 1, 1, GridConstraints.ANCHOR_EAST, GridConstraints.FILL_NONE, GridConstraints.SIZEPOLICY_FIXED, GridConstraints.SIZEPOLICY_FIXED, null, null, null, 0, false));
cienField = new JFormattedTextField();
cienField.setText("");
cienField = new JTextField();
cienField.setText("0");
panel3.add(cienField, new GridConstraints(12, 1, 1, 1, GridConstraints.ANCHOR_WEST, GridConstraints.FILL_HORIZONTAL, GridConstraints.SIZEPOLICY_WANT_GROW, GridConstraints.SIZEPOLICY_FIXED, null, new Dimension(200, -1), null, 0, false));
final JLabel label15 = new JLabel();
label15.setText("$50");
panel3.add(label15, new GridConstraints(14, 0, 1, 1, GridConstraints.ANCHOR_EAST, GridConstraints.FILL_NONE, GridConstraints.SIZEPOLICY_FIXED, GridConstraints.SIZEPOLICY_FIXED, null, null, null, 0, false));
cincuentaField = new JFormattedTextField();
cincuentaField.setText("");
cincuentaField = new JTextField();
cincuentaField.setText("0");
panel3.add(cincuentaField, new GridConstraints(14, 1, 1, 1, GridConstraints.ANCHOR_WEST, GridConstraints.FILL_HORIZONTAL, GridConstraints.SIZEPOLICY_WANT_GROW, GridConstraints.SIZEPOLICY_FIXED, null, new Dimension(200, -1), null, 0, false));
final JLabel label16 = new JLabel();
label16.setText("$10");
panel3.add(label16, new GridConstraints(16, 0, 1, 1, GridConstraints.ANCHOR_EAST, GridConstraints.FILL_NONE, GridConstraints.SIZEPOLICY_FIXED, GridConstraints.SIZEPOLICY_FIXED, null, null, null, 0, false));
diezField = new JFormattedTextField();
diezField.setText("");
diezField = new JTextField();
diezField.setText("0");
panel3.add(diezField, new GridConstraints(16, 1, 1, 1, GridConstraints.ANCHOR_WEST, GridConstraints.FILL_HORIZONTAL, GridConstraints.SIZEPOLICY_WANT_GROW, GridConstraints.SIZEPOLICY_FIXED, null, new Dimension(200, -1), null, 0, false));
guardarEfectivoButton = new JButton();
guardarEfectivoButton.setText("Guardar");
@@ -457,10 +441,4 @@ public class ArqueoView {
return contentPanel;
}
private void setupFields() {
for (JFormattedTextField formattedTextField : this.efectivoFieldList) {
formattedTextField.setFormatterFactory(new NumberFormatFactory());
((AbstractDocument) formattedTextField.getDocument()).setDocumentFilter(new LimitDocumentFilter(9));
}
}
}

54
src/danielcortes/xyz/views/components/LimitDocumentFilter.java
View File

@@ -1,54 +0,0 @@
/*
* MIT License
*
* Copyright (c) 2018-2019 Daniel Cortes
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in all
* copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
* SOFTWARE.
*/
package danielcortes.xyz.views.components;
import javax.swing.text.AttributeSet;
import javax.swing.text.BadLocationException;
import javax.swing.text.DocumentFilter;
public class LimitDocumentFilter extends DocumentFilter {
private int limit;
public LimitDocumentFilter(int limit) {
if (limit <= 0) {
throw new IllegalArgumentException("Limit can not be <= 0");
}
this.limit = limit;
}
@Override
public void replace(FilterBypass fb, int offset, int length, String text, AttributeSet attrs) throws BadLocationException {
int currentLength = fb.getDocument().getLength();
int overLimit = (currentLength + text.length()) - limit - length;
if (overLimit > 0) {
text = text.substring(0, text.length() - overLimit);
}
if (text.length() > 0) {
super.replace(fb, offset, length, text, attrs);
}
}
}

51
src/danielcortes/xyz/views/components/NumberFormatFactory.java
View File

@@ -1,51 +0,0 @@
/*
* MIT License
*
* Copyright (c) 2018-2019 Daniel Cortes
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in all
* copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
* SOFTWARE.
*/
package danielcortes.xyz.views.components;
import javax.swing.text.DefaultFormatterFactory;
import javax.swing.text.NumberFormatter;
import java.text.NumberFormat;
public class NumberFormatFactory extends DefaultFormatterFactory {
public NumberFormatFactory() {
super();
NumberFormat pnDisplayFormat = NumberFormat.getIntegerInstance();
pnDisplayFormat.setMinimumIntegerDigits(1);
pnDisplayFormat.setMaximumIntegerDigits(9);
NumberFormatter displayFormatter = new NumberFormatter(pnDisplayFormat);
displayFormatter.setValueClass(Integer.class);
NumberFormat pnEditFormat = NumberFormat.getIntegerInstance();
pnEditFormat.setMinimumIntegerDigits(1);
pnEditFormat.setMaximumIntegerDigits(9);
NumberFormatter editFormatter = new NumberFormatter(pnEditFormat);
editFormatter.setValueClass(Integer.class);
this.setDefaultFormatter(displayFormatter);
this.setDisplayFormatter(displayFormatter);
this.setEditFormatter(editFormatter);
}
}