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

Agregado nro z inicial y nro z final a tabla ingresos

Browse Source
This commit is contained in:
Daniel Cortes
2019-01-05 18:15:49 -03:00
parent 543ee9ffde
commit 4c087680cd
13 changed files with 636 additions and 344 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.idea/dataSources.xml generated
View File

@@ -19,7 +19,7 @@
<driver-ref>sqlite.xerial</driver-ref>
<synchronize>true</synchronize>
<jdbc-driver>org.sqlite.JDBC</jdbc-driver>
<jdbc-url>jdbc:sqlite:$PROJECT_DIR$/database.sqlite</jdbc-url>
<jdbc-url>jdbc:sqlite:$PROJECT_DIR$/dist/database.sqlite</jdbc-url>
<driver-properties>
<property name="enable_load_extension" value="true" />
</driver-properties>

36
.idea/dataSources/6e2ee496-6ca2-4cc4-a2b0-4f122e6bfd50.xml generated
View File

@@ -205,67 +205,75 @@
<DataType>integer unsigned|0s</DataType>
<NotNull>1</NotNull>
</column>
<key id="51" parent="10">
<column id="51" parent="10" name="nro_z_inicial">
<Position>7</Position>
<DataType>text|0s</DataType>
</column>
<column id="52" parent="10" name="nro_z_final">
<Position>8</Position>
<DataType>text|0s</DataType>
</column>
<key id="53" parent="10">
<ColNames>id</ColNames>
<Primary>1</Primary>
</key>
<foreign-key id="52" parent="10">
<foreign-key id="54" parent="10">
<ColNames>tipo_ingreso_id</ColNames>
<RefTableName>tipos_ingreso</RefTableName>
<RefColNames>id</RefColNames>
<OnDelete>restrict</OnDelete>
<OnUpdate>cascade</OnUpdate>
</foreign-key>
<foreign-key id="53" parent="10">
<foreign-key id="55" parent="10">
<ColNames>caja_id</ColNames>
<RefTableName>caja</RefTableName>
<RefColNames>id</RefColNames>
<OnDelete>restrict</OnDelete>
<OnUpdate>cascade</OnUpdate>
</foreign-key>
<column id="54" parent="11" name="type">
<column id="56" parent="11" name="type">
<Position>1</Position>
<DataType>text|0s</DataType>
</column>
<column id="55" parent="11" name="name">
<column id="57" parent="11" name="name">
<Position>2</Position>
<DataType>text|0s</DataType>
</column>
<column id="56" parent="11" name="tbl_name">
<column id="58" parent="11" name="tbl_name">
<Position>3</Position>
<DataType>text|0s</DataType>
</column>
<column id="57" parent="11" name="rootpage">
<column id="59" parent="11" name="rootpage">
<Position>4</Position>
<DataType>int|0s</DataType>
</column>
<column id="58" parent="11" name="sql">
<column id="60" parent="11" name="sql">
<Position>5</Position>
<DataType>text|0s</DataType>
</column>
<column id="59" parent="12" name="id">
<column id="61" parent="12" name="id">
<Position>1</Position>
<DataType>integer|0s</DataType>
</column>
<column id="60" parent="12" name="nombre">
<column id="62" parent="12" name="nombre">
<Position>2</Position>
<DataType>text|0s</DataType>
<NotNull>1</NotNull>
</column>
<key id="61" parent="12">
<key id="63" parent="12">
<ColNames>id</ColNames>
<Primary>1</Primary>
</key>
<column id="62" parent="13" name="id">
<column id="64" parent="13" name="id">
<Position>1</Position>
<DataType>integer|0s</DataType>
</column>
<column id="63" parent="13" name="nombre">
<column id="65" parent="13" name="nombre">
<Position>2</Position>
<DataType>text|0s</DataType>
<NotNull>1</NotNull>
</column>
<key id="64" parent="13">
<key id="66" parent="13">
<ColNames>id</ColNames>
<Primary>1</Primary>
</key>

639
.idea/workspace.xml generated
View File

@@ -6,61 +6,23 @@
</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/IngresosController.java" line="489" mnemonic="0" />
<bookmark url="file://$PROJECT_DIR$/src/danielcortes/xyz/controllers/ArqueoController.java" line="54" />
</component>
<component name="ChangeListManager">
<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" />
<list default="true" id="a633d35a-56a6-4479-b4c4-f97198052fb7" name="Default Changelist" comment="Agregado nro">
<change beforePath="$PROJECT_DIR$/.idea/dataSources.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/dataSources.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/dataSources/6e2ee496-6ca2-4cc4-a2b0-4f122e6bfd50.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/dataSources/6e2ee496-6ca2-4cc4-a2b0-4f122e6bfd50.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" 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/controllers/EgresosController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/danielcortes/xyz/controllers/EgresosController.java" 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$/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.form" beforeDir="false" afterPath="$PROJECT_DIR$/src/danielcortes/xyz/views/IngresosView.form" 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/" />
@@ -103,7 +65,7 @@
<item name="Sqlite" type="feb32156:DbDataSourceImpl" />
<item name="schemas" type="d4e8921:DatabaseStructure$FamilyGroup" />
<item name="main: schema" type="981a47c2:SqliteImplModel$Schema" />
<item name="sqlite_master: table" type="3d80ac25:SqliteImplModel$Table" />
<item name="ingresos: table" type="3d80ac25:SqliteImplModel$Table" />
</path>
</expand>
<select />
@@ -119,12 +81,8 @@
<component name="FileEditorManager">
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
<file pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/dist/conf.properties">
<provider selected="true" editor-type-id="text-editor">
<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 file="file://$PROJECT_DIR$/src/danielcortes/xyz/views/IngresosView.form">
<provider selected="true" editor-type-id="ui-designer" />
</entry>
</file>
</leaf>
@@ -190,11 +148,6 @@
<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" />
<option value="$PROJECT_DIR$/conf.properties" />
<option value="$PROJECT_DIR$/src/main/java/danielcortes/xyz/models/caja/MysqlCajaDAO.java" />
@@ -222,17 +175,11 @@
<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" />
<option value="$PROJECT_DIR$/src/danielcortes/xyz/data/ConnectionHolder.java" />
<option value="$PROJECT_DIR$/src/danielcortes/xyz/data/MysqlConnectionHolder.java" />
@@ -240,7 +187,18 @@
<option value="$PROJECT_DIR$/src/danielcortes/xyz/data/SQLiteConnectionHolder.java" />
<option value="$PROJECT_DIR$/src/danielcortes/xyz/models/caja/Caja.java" />
<option value="$PROJECT_DIR$/database/mysql.sql" />
<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/controllers/ArqueoController.java" />
<option value="$APPLICATION_CONFIG_DIR$/consoles/db/6e2ee496-6ca2-4cc4-a2b0-4f122e6bfd50/console.sql" />
<option value="$PROJECT_DIR$/src/danielcortes/xyz/models/ingreso/Ingreso.java" />
<option value="$PROJECT_DIR$/src/danielcortes/xyz/models/ingreso/IngresoDAO.java" />
<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$/database/sqlite.sql" />
<option value="$PROJECT_DIR$/src/danielcortes/xyz/controllers/IngresosController.java" />
<option value="$PROJECT_DIR$/src/danielcortes/xyz/models/ingreso/SQLiteIngresoDAO.java" />
<option value="$PROJECT_DIR$/src/danielcortes/xyz/views/IngresosView.form" />
</list>
</option>
</component>
@@ -295,6 +253,8 @@
<foldersAlwaysOnTop value="true" />
</navigator>
<panes>
<pane id="Scope" />
<pane id="PackagesPane" />
<pane id="ProjectPane">
<subPane>
<expand>
@@ -305,14 +265,45 @@
<path>
<item name="caja" type="b2602c69:ProjectViewProjectNode" />
<item name="caja" type="462c0819:PsiDirectoryNode" />
<item name="dist" 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="IngresosView" type="e9f4de52:FormNode" />
</path>
<path>
<item name="caja" type="b2602c69:ProjectViewProjectNode" />
<item name="caja" type="462c0819:PsiDirectoryNode" />
<item name="database" type="462c0819:PsiDirectoryNode" />
</path>
</expand>
<select />
</subPane>
</pane>
<pane id="Scope" />
<pane id="PackagesPane" />
</panes>
</component>
<component name="PropertiesComponent">
@@ -326,7 +317,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="1546540041105" />
<property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1546722936849" />
<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" />
@@ -339,7 +330,7 @@
<property name="project.structure.proportion" value="0.15" />
<property name="project.structure.side.proportion" value="0.2" />
<property name="restartRequiresConfirmation" value="false" />
<property name="settings.editor.selected.configurable" value="copyright.profiles" />
<property name="settings.editor.selected.configurable" value="database.data.views" />
</component>
<component name="RecentsManager">
<key name="MoveClassesOrPackagesDialog.RECENTS_KEY">
@@ -507,6 +498,7 @@
<workItem from="1546481590691" duration="518000" />
<workItem from="1546482678909" duration="5004000" />
<workItem from="1546533252017" duration="4537000" />
<workItem from="1546719990258" duration="2929000" />
</task>
<task id="LOCAL-00001" summary="First!! :3 Existe una pequeña base de proyecto por ahora">
<created>1545280618093</created>
@@ -690,11 +682,18 @@
<option name="project" value="LOCAL" />
<updated>1546536860193</updated>
</task>
<option name="localTasksCounter" value="27" />
<task id="LOCAL-00027" summary="Reordenado el resumen de arqueo para mayor claridad">
<created>1546720253879</created>
<option name="number" value="00027" />
<option name="presentableId" value="LOCAL-00027" />
<option name="project" value="LOCAL" />
<updated>1546720253879</updated>
</task>
<option name="localTasksCounter" value="28" />
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="201992000" />
<option name="totallyTimeSpent" value="204921000" />
</component>
<component name="TodoView">
<todo-panel id="selected-file">
@@ -707,17 +706,18 @@
</component>
<component name="ToolWindowManager">
<frame x="0" y="-18" width="1366" height="765" extended-state="6" />
<editor active="true" />
<layout>
<window_info active="true" content_ui="combo" id="Project" order="0" sideWeight="0.49438202" visible="true" weight="0.20471841" />
<window_info content_ui="combo" id="Project" order="0" sideWeight="0.49438202" weight="0.20776255" />
<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" />
<window_info x="458" y="95" width="450" height="453" id="UI Designer" order="3" visible="true" weight="0.32952815" />
<window_info id="Capture Tool" order="4" />
<window_info id="Favorites" order="5" show_stripe_button="false" sideWeight="0.505618" side_tool="true" weight="0.17275494" />
<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="4" y="0" width="902" height="488" id="Run" order="2" sideWeight="0.49923897" visible="true" weight="0.3258427" />
<window_info anchor="bottom" x="4" y="0" width="902" height="488" id="Run" order="2" sideWeight="0.49923897" 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" />
@@ -727,7 +727,7 @@
<window_info anchor="bottom" id="Terminal" order="9" show_stripe_button="false" weight="0.32744783" />
<window_info anchor="bottom" id="Event Log" order="10" sideWeight="0.50076103" side_tool="true" weight="0.24077046" />
<window_info anchor="bottom" id="Messages" order="11" weight="0.32744783" />
<window_info anchor="bottom" id="Database Console" order="12" weight="0.32905295" />
<window_info anchor="bottom" id="Database Console" order="12" weight="0.32744783" />
<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.25" />
@@ -821,17 +821,14 @@
<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" />
<option name="LAST_COMMIT_MESSAGE" value="Comodidades!&#10;Arreglado el problema de index al ordenar las tablas" />
<MESSAGE value="Reordenado el resumen de arqueo para mayor claridad" />
<option name="LAST_COMMIT_MESSAGE" value="Reordenado el resumen de arqueo para mayor claridad" />
</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" />
@@ -841,13 +838,7 @@
<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">
<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$/conf.properties" />
<entry file="file://$PROJECT_DIR$/caja.iml">
<provider selected="true" editor-type-id="text-editor" />
</entry>
@@ -875,13 +866,6 @@
</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">
@@ -918,22 +902,6 @@
</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>
@@ -953,31 +921,6 @@
</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">
@@ -1026,78 +969,6 @@
</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">
@@ -1154,61 +1025,6 @@
</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">
<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#IngresosController#0" />
<element signature="docComment;method#IngresosController#0;class#IngresosController#0" />
<element signature="method#IngresosController#0;class#IngresosController#0" />
<element signature="docComment;method#getIngresoDAO#0;class#IngresosController#0" />
<element signature="docComment;method#getTipoIngresoDAO#0;class#IngresosController#0" />
<element signature="docComment;method#updateCaja#0;class#IngresosController#0" />
<element signature="method#updateCaja#0;class#IngresosController#0" />
<element signature="docComment;method#fillTipoIngresoCombo#0;class#IngresosController#0" />
<element signature="method#fillTipoIngresoCombo#0;class#IngresosController#0" />
<element signature="docComment;method#fillIngresosTable#0;class#IngresosController#0" />
<element signature="method#fillIngresosTable#0;class#IngresosController#0" />
<element signature="docComment;method#setupViewEvents#0;class#IngresosController#0" />
<element signature="docComment;method#guardarActionListener#0;class#IngresosController#0" />
<element signature="docComment;method#eliminarActionListener#0;class#IngresosController#0" />
<element signature="method#eliminarActionListener#0;class#IngresosController#0" />
<element signature="docComment;method#editarActionListener#0;class#IngresosController#0" />
<element signature="docComment;method#updateTotalIngresos#0;class#IngresosController#0" />
<element signature="method#updateTotalIngresos#0;class#IngresosController#0" />
<element signature="docComment;method#updateButtonsEnabled#0;class#IngresosController#0" />
<element signature="method#updateButtonsEnabled#0;class#IngresosController#0" />
<element signature="docComment;method#guardarIngreso#0;class#IngresosController#0" />
<element signature="method#guardarIngreso#0;class#IngresosController#0" />
<element signature="docComment;method#editarIngreso#0;class#IngresosController#0" />
<element signature="method#editarIngreso#0;class#IngresosController#0" />
<element signature="docComment;method#validateInput#0;class#IngresosController#0" />
<element signature="method#validateInput#0;class#IngresosController#0" />
<element signature="docComment;method#validateCaja#0;class#IngresosController#0" />
<element signature="docComment;method#validateValor#0;class#IngresosController#0" />
<element signature="method#validateValor#0;class#IngresosController#0" />
<element signature="docComment;method#validateNroInicial#0;class#IngresosController#0" />
<element signature="method#validateNroInicial#0;class#IngresosController#0" />
<element signature="docComment;method#validateNroFinal#0;class#IngresosController#0" />
<element signature="method#validateNroFinal#0;class#IngresosController#0" />
<element signature="docComment;method#validateTipoIngreso#0;class#IngresosController#0" />
<element signature="method#validateTipoIngreso#0;class#IngresosController#0" />
<element signature="docComment;method#hideErrorMessages#0;class#IngresosController#0" />
<element signature="method#hideErrorMessages#0;class#IngresosController#0" />
<element signature="docComment;method#clearInputs#0;class#IngresosController#0" />
<element signature="method#clearInputs#0;class#IngresosController#0" />
<element signature="docComment;method#normalizeInputs#0;class#IngresosController#0" />
<element signature="method#normalizeInputs#0;class#IngresosController#0" />
<element signature="docComment;method#resetFocus#0;class#IngresosController#0" />
<element signature="class#NextAction#0;class#IngresosController#0" />
<element signature="n#!!block;n#NextAction#0;n#NextAction#0;n#IngresosController#0" />
<element signature="class#GuardarAction#0;class#IngresosController#0" />
<element signature="n#!!block;n#GuardarAction#0;n#GuardarAction#0;n#IngresosController#0" />
</folding>
</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">
@@ -1288,20 +1104,305 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/database/sqlite.sql">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="69">
<caret line="3" column="23" selection-start-line="3" selection-start-column="23" selection-end-line="3" selection-end-column="23" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/dist/conf.properties">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="46">
<state relative-caret-position="217">
<caret line="16" column="35" selection-start-line="16" selection-start-column="27" selection-end-line="16" selection-end-column="35" />
</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="368">
<caret line="65" lean-forward="true" selection-start-line="65" selection-end-line="65" />
</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/controllers/ArqueoController.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-612">
<caret line="115" column="31" selection-start-line="115" selection-start-column="31" selection-end-line="115" selection-end-column="31" />
<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#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="e#12059#12778#1" />
<element signature="docComment;method#guardarDocumentos#0;class#ArqueoController#0" />
<element signature="method#guardarDocumentos#0;class#ArqueoController#0" />
<element signature="e#13267#13558#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#15950#16094#1" />
<element signature="e#16125#16258#1" />
<element signature="e#16317#16448#1" />
<element signature="e#16483#16635#1" />
<element signature="docComment;method#validateDocumentosValor#0;class#ArqueoController#0" />
<element signature="method#validateDocumentosValor#0;class#ArqueoController#0" />
<element signature="e#17154#17298#1" />
<element signature="e#17329#17462#1" />
<element signature="e#17521#17652#1" />
<element signature="e#17687#17839#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/views/ArqueoView.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-389">
<caret line="128" selection-start-line="128" selection-end-line="128" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$APPLICATION_CONFIG_DIR$/consoles/db/6e2ee496-6ca2-4cc4-a2b0-4f122e6bfd50/console.sql">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="598">
<caret line="122" lean-forward="true" selection-start-line="122" selection-end-line="124" selection-end-column="52" />
<folding>
<element signature="e#26#1128#0" />
<element signature="e#1381#1453#0" />
<element signature="n#tipos_egreso#0" />
<element signature="n#egresos#0" />
<element signature="n#tipos_ingreso#0" />
<element signature="n#ingresos#0" />
<element signature="n#efectivos#0" />
<element signature="n#documentos#0" />
<element signature="e#3207#3586#0" />
<element signature="e#3241#3586#0" />
<element signature="e#3589#3719#0" />
<element signature="e#3624#3719#0" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/danielcortes/xyz/models/ingreso/Ingreso.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="368">
<caret line="39" column="24" selection-start-line="39" selection-start-column="24" selection-end-line="39" selection-end-column="24" />
<folding>
<element signature="e#1581#1582#0" expanded="true" />
<element signature="e#1614#1615#0" expanded="true" />
<element signature="e#1642#1643#0" expanded="true" />
<element signature="e#1671#1672#0" expanded="true" />
<element signature="e#1699#1700#0" expanded="true" />
<element signature="e#1738#1739#0" expanded="true" />
<element signature="e#1772#1773#0" expanded="true" />
<element signature="e#1810#1811#0" expanded="true" />
<element signature="e#1844#1845#0" expanded="true" />
<element signature="e#1898#1899#0" expanded="true" />
<element signature="e#1944#1945#0" expanded="true" />
<element signature="e#1980#1981#0" expanded="true" />
<element signature="e#2012#2013#0" expanded="true" />
<element signature="e#2062#2063#0" expanded="true" />
<element signature="e#2104#2105#0" expanded="true" />
<element signature="e#2141#2142#0" expanded="true" />
<element signature="e#2174#2175#0" expanded="true" />
<element signature="e#2226#2227#0" expanded="true" />
<element signature="e#2270#2271#0" expanded="true" />
<element signature="e#2305#2306#0" expanded="true" />
<element signature="e#2336#2337#0" expanded="true" />
<element signature="e#2384#2385#0" expanded="true" />
<element signature="e#2424#2425#0" expanded="true" />
<element signature="e#2467#2468#0" expanded="true" />
<element signature="e#2501#2502#0" expanded="true" />
<element signature="e#2560#2561#0" expanded="true" />
<element signature="e#2606#2607#0" expanded="true" />
<element signature="e#2635#2636#0" expanded="true" />
<element signature="e#2662#2663#0" expanded="true" />
<element signature="e#2700#2701#0" expanded="true" />
<element signature="e#2732#2733#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/danielcortes/xyz/models/ingreso/IngresoDAO.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="943">
<caret line="74" column="34" lean-forward="true" selection-start-line="74" selection-start-column="34" selection-end-line="74" selection-end-column="34" />
</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="370">
<caret line="132" column="38" selection-start-line="132" selection-start-column="38" selection-end-line="132" selection-end-column="38" />
<folding>
<element signature="method#createIngresosTable#0;class#IngresosView#0" />
<element signature="initializer##0;class#IngresosView#0" />
<element signature="e#3928#3986#0" />
<element signature="docComment;method#$$$setupUI$$$#0;class#IngresosView#0" />
<element signature="method#$$$setupUI$$$#0;class#IngresosView#0" />
<element signature="docComment;method#$$$getRootComponent$$$#0;class#IngresosView#0" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/database/sqlite.sql">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="374">
<caret line="123" column="51" lean-forward="true" selection-start-line="123" selection-start-column="51" selection-end-line="125" />
<folding>
<element signature="e#0#1102#0" />
<element signature="e#1355#1427#0" />
<element signature="e#1430#1512#0" />
<element signature="n#egresos#0" />
<element signature="n#tipos_ingreso#0" />
<element signature="n#ingresos#0" />
<element signature="n#efectivos#0" />
<element signature="n#documentos#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="370">
<caret line="101" selection-start-line="101" selection-end-line="101" />
<folding>
<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#setIngreso#0;class#IngresosTableModel#0" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/danielcortes/xyz/models/ingreso/SQLiteIngresoDAO.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="149">
<caret line="165" column="26" selection-start-line="165" selection-start-column="26" selection-end-line="165" selection-end-column="26" />
</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="299">
<caret line="277" column="63" selection-start-line="277" selection-start-column="63" selection-end-line="277" selection-end-column="63" />
<folding>
<element signature="docComment;class#IngresosController#0" />
<element signature="docComment;method#IngresosController#0;class#IngresosController#0" />
<element signature="method#IngresosController#0;class#IngresosController#0" />
<element signature="docComment;method#getIngresoDAO#0;class#IngresosController#0" />
<element signature="docComment;method#getTipoIngresoDAO#0;class#IngresosController#0" />
<element signature="docComment;method#updateCaja#0;class#IngresosController#0" />
<element signature="method#updateCaja#0;class#IngresosController#0" />
<element signature="docComment;method#fillTipoIngresoCombo#0;class#IngresosController#0" />
<element signature="method#fillTipoIngresoCombo#0;class#IngresosController#0" />
<element signature="e#3404#3452#1" />
<element signature="docComment;method#fillIngresosTable#0;class#IngresosController#0" />
<element signature="method#fillIngresosTable#0;class#IngresosController#0" />
<element signature="docComment;method#setupViewEvents#0;class#IngresosController#0" />
<element signature="e#6018#6105#1" />
<element signature="docComment;method#guardarActionListener#0;class#IngresosController#0" />
<element signature="docComment;method#eliminarActionListener#0;class#IngresosController#0" />
<element signature="method#eliminarActionListener#0;class#IngresosController#0" />
<element signature="e#7738#8039#1" />
<element signature="docComment;method#editarActionListener#0;class#IngresosController#0" />
<element signature="docComment;method#updateTotalIngresos#0;class#IngresosController#0" />
<element signature="method#updateTotalIngresos#0;class#IngresosController#0" />
<element signature="docComment;method#updateButtonsEnabled#0;class#IngresosController#0" />
<element signature="method#updateButtonsEnabled#0;class#IngresosController#0" />
<element signature="e#9848#9977#1" />
<element signature="e#9981#10112#1" />
<element signature="docComment;method#guardarIngreso#0;class#IngresosController#0" />
<element signature="method#guardarIngreso#0;class#IngresosController#0" />
<element signature="e#10577#11144#1" />
<element signature="docComment;method#editarIngreso#0;class#IngresosController#0" />
<element signature="docComment;method#validateInput#0;class#IngresosController#0" />
<element signature="method#validateInput#0;class#IngresosController#0" />
<element signature="docComment;method#validateCaja#0;class#IngresosController#0" />
<element signature="docComment;method#validateValor#0;class#IngresosController#0" />
<element signature="method#validateValor#0;class#IngresosController#0" />
<element signature="e#13936#14110#1" />
<element signature="e#14141#14304#1" />
<element signature="e#14363#14524#1" />
<element signature="e#14557#14739#1" />
<element signature="docComment;method#validateNroZInicial#0;class#IngresosController#0" />
<element signature="method#validateNroZInicial#0;class#IngresosController#0" />
<element signature="e#15183#15367#1" />
<element signature="e#15404#15577#1" />
<element signature="docComment;method#validateNroZFinal#0;class#IngresosController#0" />
<element signature="method#validateNroZFinal#0;class#IngresosController#0" />
<element signature="e#16011#16191#1" />
<element signature="e#16226#16395#1" />
<element signature="docComment;method#validateNroInicial#0;class#IngresosController#0" />
<element signature="method#validateNroInicial#0;class#IngresosController#0" />
<element signature="e#16834#17018#1" />
<element signature="e#17054#17227#1" />
<element signature="docComment;method#validateNroFinal#0;class#IngresosController#0" />
<element signature="method#validateNroFinal#0;class#IngresosController#0" />
<element signature="e#17658#17838#1" />
<element signature="e#17872#18041#1" />
<element signature="docComment;method#validateTipoIngreso#0;class#IngresosController#0" />
<element signature="method#validateTipoIngreso#0;class#IngresosController#0" />
<element signature="e#18407#18593#1" />
<element signature="docComment;method#hideErrorMessages#0;class#IngresosController#0" />
<element signature="method#hideErrorMessages#0;class#IngresosController#0" />
<element signature="docComment;method#clearInputs#0;class#IngresosController#0" />
<element signature="method#clearInputs#0;class#IngresosController#0" />
<element signature="docComment;method#normalizeInputs#0;class#IngresosController#0" />
<element signature="method#normalizeInputs#0;class#IngresosController#0" />
<element signature="docComment;method#resetFocus#0;class#IngresosController#0" />
<element signature="n#!!block;n#resetFocus#0;n#IngresosController#0" />
<element signature="class#NextAction#0;class#IngresosController#0" />
<element signature="n#!!block;n#NextAction#0;n#NextAction#0;n#IngresosController#0" />
<element signature="class#GuardarAction#0;class#IngresosController#0" />
<element signature="n#!!block;n#GuardarAction#0;n#GuardarAction#0;n#IngresosController#0" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/danielcortes/xyz/views/IngresosView.form">
<provider selected="true" editor-type-id="ui-designer" />
</entry>
</component>
<component name="masterDetails">
<states>

10
database/sqlite.sql
View File

@@ -98,7 +98,6 @@ create table documentos
foreign key (caja_id) references caja (id) on update cascade on delete restrict
);
insert into tipos_egreso (nombre)
values ('Factura Materia Prima'),
('Factura Gastos Generales'),
@@ -116,5 +115,12 @@ insert into tipos_ingreso (nombre)
values ('Boletas Fiscales'),
('Boletas Manuales'),
('Facturas'),
('Guias')
('Guias');
/*
Primera Migracion, se agrega las columnas de nro de z inicial y final para el ingreso.
*/
alter table ingresos add column nro_z_inicial text;
alter table ingresos add column nro_z_final text;

BIN
dist/caja.jar vendored
View File

Binary file not shown.

BIN
dist/database.sqlite vendored
View File

Binary file not shown.

81
src/danielcortes/xyz/controllers/IngresosController.java
View File

@@ -31,7 +31,6 @@ import danielcortes.xyz.models.tipo_ingreso.TipoIngreso;
import danielcortes.xyz.models.tipo_ingreso.TipoIngresoDAO;
import danielcortes.xyz.views.IngresosView;
import danielcortes.xyz.views.components.IngresosTableModel;
import org.jetbrains.annotations.Contract;
import javax.swing.*;
import java.awt.event.*;
@@ -121,11 +120,15 @@ public class IngresosController {
*/
private void setupViewEvents() {
this.view.getValorField().getInputMap(JComponent.WHEN_FOCUSED).put(KeyStroke.getKeyStroke("ENTER"), "nextField");
this.view.getNroZInicialField().getInputMap(JComponent.WHEN_FOCUSED).put(KeyStroke.getKeyStroke("ENTER"), "nextField");
this.view.getNroZFinalField().getInputMap(JComponent.WHEN_FOCUSED).put(KeyStroke.getKeyStroke("ENTER"), "nextField");
this.view.getNroInicialField().getInputMap(JComponent.WHEN_FOCUSED).put(KeyStroke.getKeyStroke("ENTER"), "nextField");
this.view.getNroFinalField().getInputMap(JComponent.WHEN_FOCUSED).put(KeyStroke.getKeyStroke("ENTER"), "nextField");
this.view.getTipoCombo().getInputMap(JComponent.WHEN_FOCUSED).put(KeyStroke.getKeyStroke("ENTER"), "save");
this.view.getValorField().getActionMap().put("nextField", new NextAction(this.view.getNroInicialField()));
this.view.getValorField().getActionMap().put("nextField", new NextAction(this.view.getNroZInicialField()));
this.view.getNroZInicialField().getActionMap().put("nextField", new NextAction(this.view.getNroZFinalField()));
this.view.getNroZFinalField().getActionMap().put("nextField", new NextAction(this.view.getNroInicialField()));
this.view.getNroInicialField().getActionMap().put("nextField", new NextAction(this.view.getNroFinalField()));
this.view.getNroFinalField().getActionMap().put("nextField", new NextAction(this.view.getTipoCombo()));
this.view.getTipoCombo().getActionMap().put("save", new GuardarAction(this));
@@ -156,14 +159,16 @@ public class IngresosController {
this.hideErrorMessages();
String valor = this.view.getValorField().getText();
String nroZInicial = this.view.getNroZInicialField().getText();
String nroZFinal = this.view.getNroZFinalField().getText();
String nroInicial = this.view.getNroInicialField().getText();
String nroFinal = this.view.getNroFinalField().getText();
TipoIngreso tipoIngreso = (TipoIngreso) this.view.getTipoCombo().getSelectedItem();
if(editing) {
this.editarIngreso(valor, nroInicial, nroFinal, tipoIngreso, this.caja);
this.editarIngreso(valor, nroZInicial, nroZFinal, nroInicial, nroFinal, tipoIngreso, this.caja);
} else {
this.guardarIngreso(valor, nroInicial, nroFinal, tipoIngreso, this.caja);
this.guardarIngreso(valor, nroZInicial, nroZFinal, nroInicial, nroFinal, tipoIngreso, this.caja);
}
this.resetFocus();
}
@@ -204,6 +209,8 @@ public class IngresosController {
this.view.getTipoCombo().setSelectedItem(ingreso.getTipoIngreso());
this.view.getValorField().setText(String.valueOf(ingreso.getValor()));
this.view.getNroZInicialField().setText(String.valueOf(ingreso.getNroZInicial()));
this.view.getNroZFinalField().setText(String.valueOf(ingreso.getNroZFinal()));
this.view.getNroInicialField().setText(String.valueOf(ingreso.getNroInicial()));
this.view.getNroFinalField().setText(String.valueOf(ingreso.getNroFinal()));
}
@@ -236,12 +243,14 @@ public class IngresosController {
* Guarda un ingreso tras llamar a validar el input
* Luego de guardar agrega a la tabla el ingreso, llama a limpiar los campos de input y a actualizar el total de ingresos
*/
private void guardarIngreso(String valor, String nroInicial, String nroFinal, TipoIngreso tipoIngreso, Caja caja){
if(this.validateInput(valor, nroInicial, nroFinal, tipoIngreso, caja)){
private void guardarIngreso(String valor, String nroZInicial, String nroZFinal, String nroInicial, String nroFinal, TipoIngreso tipoIngreso, Caja caja){
if(this.validateInput(valor, nroZInicial, nroZFinal, nroInicial, nroFinal, tipoIngreso, caja)){
Ingreso ingreso = new Ingreso();
ingreso.setTipoIngreso(tipoIngreso);
ingreso.setCaja(caja);
ingreso.setValor(Integer.valueOf(valor));
ingreso.setNroZInicial(nroZInicial);
ingreso.setNroZFinal(nroZFinal);
ingreso.setNroInicial(nroInicial);
ingreso.setNroFinal(nroFinal);
@@ -258,10 +267,12 @@ public class IngresosController {
* Tras esto actualiza el ingreso en la tabla, llama a actualizar el total de ingresos, a limpiar los campos de input y a desactivar la flag de editing.
*
*/
private void editarIngreso(String valor, String nroInicial, String nroFinal, TipoIngreso tipoIngreso, Caja caja){
if(this.validateInput(valor, nroInicial, nroFinal, tipoIngreso, caja)){
private void editarIngreso(String valor, String nroZInicial, String nroZFinal, String nroInicial, String nroFinal, TipoIngreso tipoIngreso, Caja caja){
if(this.validateInput(valor, nroZInicial, nroZFinal, nroInicial, nroFinal, tipoIngreso, caja)){
this.editingIngreso.setTipoIngreso(tipoIngreso);
this.editingIngreso.setValor(Integer.valueOf(valor));
this.editingIngreso.setNroZInicial(nroZInicial);
this.editingIngreso.setNroZFinal(nroZFinal);
this.editingIngreso.setNroInicial(nroInicial);
this.editingIngreso.setNroFinal(nroFinal);
this.ingresoDAO.updateIngreso(this.editingIngreso);
@@ -276,10 +287,12 @@ public class IngresosController {
* Llama a los metodos necesarios para validar el input
* @return true cuando todas las validaciones retoran true, si no, false
*/
private boolean validateInput(String valor, String nroInicial, String nroFinal, TipoIngreso tipoIngreso, Caja caja) {
private boolean validateInput(String valor, String nroZInicial, String nroZFinal, String nroInicial, String nroFinal, TipoIngreso tipoIngreso, Caja caja) {
this.hideErrorMessages();
boolean valorValidation = this.validateValor(valor);
boolean nroZInicialValidation = this.validateNroZInicial(nroZInicial);
boolean nroZFinalValidation = this.validateNroZFinal(nroZFinal);
boolean nroInicialValidation = this.validateNroInicial(nroInicial);
boolean nroFinalValidation = this.validateNroFinal(nroFinal);
boolean tipoIngresoValidation = this.validateTipoIngreso(tipoIngreso);
@@ -335,6 +348,50 @@ public class IngresosController {
}
/**
* Valida la variable nroInicial contra los casos
* - Es null
* - Esta vacio
* Cuando el primer caso sea true, colocara un mensaje de error correspondiente en el jlabel correspondiente
* @return Si cualquiera de estos casos son true se retornara false, si no, se retorna true
*/
private boolean validateNroZInicial(String nroZInicial){
if (nroZInicial == null) {
this.view.getErrorNroInicial().setText("Hubo un problema con los datos");
this.view.getErrorNroInicial().setVisible(true);
return false;
}
if (nroZInicial.isEmpty()) {
this.view.getErrorNroInicial().setText("El campo esta vacio");
this.view.getErrorNroInicial().setVisible(true);
return false;
}
return true;
}
/**
* Valida la variable nroFinal contra los casos
* - Es null
* - Esta vacio
* Cuando el primer caso sea true, colocara un mensaje de error correspondiente en el jlabel correspondiente
* @return Si cualquiera de estos casos son true se retornara false, si no, se retorna true
*/
private boolean validateNroZFinal(String nroZFinal){
if (nroZFinal == null) {
this.view.getErrorNroFinal().setText("Hubo un problema con los datos");
this.view.getErrorNroFinal().setVisible(true);
return false;
}
if (nroZFinal.isEmpty()) {
this.view.getErrorNroFinal().setText("El campo esta vacio");
this.view.getErrorNroFinal().setVisible(true);
return false;
}
return true;
}
/**
* Valida la variable nroInicial contra los casos
* - Es null
@@ -400,6 +457,8 @@ public class IngresosController {
private void hideErrorMessages() {
this.view.getErrorTipoIngreso().setVisible(false);
this.view.getErrorValor().setVisible(false);
this.view.getErrorNroZInicial().setVisible(false);
this.view.getErrorNroZFinal().setVisible(false);
this.view.getErrorNroInicial().setVisible(false);
this.view.getErrorNroFinal().setVisible(false);
}
@@ -410,6 +469,8 @@ public class IngresosController {
private void clearInputs() {
this.view.getTipoCombo().setSelectedIndex(0);
this.view.getValorField().setText("");
this.view.getNroZInicialField().setText("");
this.view.getNroZFinalField().setText("");
this.view.getNroInicialField().setText("");
this.view.getNroFinalField().setText("");
}
@@ -419,6 +480,8 @@ public class IngresosController {
*/
private void normalizeInputs(){
this.view.getValorField().setText(this.view.getValorField().getText().trim());
this.view.getNroZInicialField().setText(this.view.getNroZInicialField().getText().trim());
this.view.getNroZFinalField().setText(this.view.getNroZFinalField().getText().trim());
this.view.getNroInicialField().setText(this.view.getNroInicialField().getText().trim());
this.view.getNroFinalField().setText(this.view.getNroFinalField().getText().trim());
}

18
src/danielcortes/xyz/models/ingreso/Ingreso.java
View File

@@ -30,6 +30,8 @@ import danielcortes.xyz.models.tipo_ingreso.TipoIngreso;
public class Ingreso {
private int id;
private int valor;
private String nroZInicial;
private String nroZFinal;
private String nroInicial;
private String nroFinal;
private TipoIngreso tipoIngreso;
@@ -51,6 +53,22 @@ public class Ingreso {
this.valor = valor;
}
public String getNroZInicial() {
return nroZInicial;
}
public void setNroZInicial(String nroZInicial) {
this.nroZInicial = nroZInicial;
}
public String getNroZFinal() {
return nroZFinal;
}
public void setNroZFinal(String nroZFinal) {
this.nroZFinal = nroZFinal;
}
public String getNroInicial() {
return nroInicial;
}

2
src/danielcortes/xyz/models/ingreso/IngresoDAO.java
View File

@@ -67,6 +67,8 @@ public abstract class IngresoDAO {
ingreso.setId(rs.getInt("id"));
ingreso.setValor(rs.getInt("valor"));
ingreso.setNroZInicial(rs.getString("nro_z_inicial"));
ingreso.setNroZFinal(rs.getString("nro_z_final"));
ingreso.setNroInicial(rs.getString("nro_inicial"));
ingreso.setNroFinal(rs.getString("nro_final"));
ingreso.setTipoIngreso(tipoIngreso);

26
src/danielcortes/xyz/models/ingreso/SQLiteIngresoDAO.java
View File

@@ -129,12 +129,14 @@ public class SQLiteIngresoDAO extends IngresoDAO {
int updates;
try {
Connection conn = connectionHolder.getConnection();
PreparedStatement ps = conn.prepareStatement("insert into ingresos (valor, nro_inicial, nro_final, tipo_ingreso_id, caja_id) values (?,?,?,?,?)");
PreparedStatement ps = conn.prepareStatement("insert into ingresos (valor, nro_z_inicial, nro_z_final, nro_inicial, nro_final, tipo_ingreso_id, caja_id) values (?,?,?,?,?,?,?)");
ps.setInt(1, ingreso.getValor());
ps.setString(2, ingreso.getNroInicial());
ps.setString(3, ingreso.getNroFinal());
ps.setInt(4, ingreso.getTipoIngreso().getId());
ps.setInt(5, ingreso.getCaja().getId());
ps.setString(2, ingreso.getNroZInicial());
ps.setString(3, ingreso.getNroZFinal());
ps.setString(4, ingreso.getNroInicial());
ps.setString(5, ingreso.getNroFinal());
ps.setInt(6, ingreso.getTipoIngreso().getId());
ps.setInt(7, ingreso.getCaja().getId());
updates = ps.executeUpdate();
ps.close();
@@ -158,13 +160,15 @@ public class SQLiteIngresoDAO extends IngresoDAO {
int updates;
try {
Connection conn = connectionHolder.getConnection();
PreparedStatement ps = conn.prepareStatement("update ingresos set valor = ? , nro_inicial = ?, nro_final = ?, tipo_ingreso_id = ?, caja_id = ? where id = ?");
PreparedStatement ps = conn.prepareStatement("update ingresos set valor = ?, nro_z_inicial = ?, nro_z_final = ?, nro_inicial = ?, nro_final = ?, tipo_ingreso_id = ?, caja_id = ? where id = ?");
ps.setInt(1,ingreso.getValor());
ps.setString(2, ingreso.getNroInicial());
ps.setString(3, ingreso.getNroFinal());
ps.setInt(4, ingreso.getTipoIngreso().getId());
ps.setInt(5, ingreso.getCaja().getId());
ps.setInt(6, ingreso.getId());
ps.setString(2, ingreso.getNroZInicial());
ps.setString(3, ingreso.getNroZFinal());
ps.setString(4, ingreso.getNroInicial());
ps.setString(5, ingreso.getNroFinal());
ps.setInt(6, ingreso.getTipoIngreso().getId());
ps.setInt(7, ingreso.getCaja().getId());
ps.setInt(8, ingreso.getId());
updates = ps.executeUpdate();

76
src/danielcortes/xyz/views/IngresosView.form
View File

@@ -3,7 +3,7 @@
<grid id="27dc6" binding="contentPanel" layout-manager="GridLayoutManager" row-count="1" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
<margin top="0" left="0" bottom="0" right="0"/>
<constraints>
<xy x="20" y="20" width="766" height="411"/>
<xy x="20" y="20" width="994" height="411"/>
</constraints>
<properties/>
<border type="none"/>
@@ -29,17 +29,19 @@
</component>
</children>
</scrollpane>
<grid id="7fa26" layout-manager="GridLayoutManager" row-count="3" column-count="4" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
<grid id="7fa26" layout-manager="GridLayoutManager" row-count="3" column-count="6" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
<margin top="0" left="0" bottom="0" right="0"/>
<constraints>
<grid row="0" column="0" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
<grid row="0" column="0" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false">
<preferred-size width="150" height="-1"/>
</grid>
</constraints>
<properties/>
<border type="none"/>
<children>
<component id="50b32" class="javax.swing.JLabel">
<constraints>
<grid row="0" column="3" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
<grid row="0" column="5" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
</constraints>
<properties>
<text value="Tipo"/>
@@ -47,7 +49,7 @@
</component>
<component id="b5d8c" class="javax.swing.JComboBox" binding="tipoCombo">
<constraints>
<grid row="1" column="3" row-span="1" col-span="1" vsize-policy="0" hsize-policy="6" anchor="8" fill="1" indent="0" use-parent-layout="false">
<grid row="1" column="5" row-span="1" col-span="1" vsize-policy="0" hsize-policy="6" anchor="8" fill="1" indent="0" use-parent-layout="false">
<preferred-size width="150" height="-1"/>
</grid>
</constraints>
@@ -73,7 +75,7 @@
</component>
<component id="9bb1" class="javax.swing.JLabel">
<constraints>
<grid row="0" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
<grid row="0" column="3" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
</constraints>
<properties>
<text value="N° Inicial"/>
@@ -81,7 +83,7 @@
</component>
<component id="3f626" class="javax.swing.JLabel">
<constraints>
<grid row="0" column="2" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
<grid row="0" column="4" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
</constraints>
<properties>
<text value="N° Final"/>
@@ -89,7 +91,7 @@
</component>
<component id="461c1" class="javax.swing.JTextField" binding="nroInicialField">
<constraints>
<grid row="1" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="6" anchor="8" fill="1" indent="0" use-parent-layout="false">
<grid row="1" column="3" row-span="1" col-span="1" vsize-policy="0" hsize-policy="6" anchor="8" fill="1" indent="0" use-parent-layout="false">
<preferred-size width="150" height="-1"/>
</grid>
</constraints>
@@ -97,7 +99,7 @@
</component>
<component id="949e" class="javax.swing.JTextField" binding="nroFinalField">
<constraints>
<grid row="1" column="2" row-span="1" col-span="1" vsize-policy="0" hsize-policy="6" anchor="8" fill="1" indent="0" use-parent-layout="false">
<grid row="1" column="4" row-span="1" col-span="1" vsize-policy="0" hsize-policy="6" anchor="8" fill="1" indent="0" use-parent-layout="false">
<preferred-size width="150" height="-1"/>
</grid>
</constraints>
@@ -105,7 +107,7 @@
</component>
<component id="d11b0" class="javax.swing.JLabel" binding="errorTipoIngreso">
<constraints>
<grid row="2" column="3" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
<grid row="2" column="5" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
</constraints>
<properties>
<foreground color="-65536"/>
@@ -125,7 +127,7 @@
</component>
<component id="7d011" class="javax.swing.JLabel" binding="errorNroInicial">
<constraints>
<grid row="2" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
<grid row="2" column="3" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
</constraints>
<properties>
<foreground color="-65536"/>
@@ -134,6 +136,58 @@
</properties>
</component>
<component id="ef90" class="javax.swing.JLabel" binding="errorNroFinal">
<constraints>
<grid row="2" column="4" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
</constraints>
<properties>
<foreground color="-65536"/>
<text value="Label"/>
<visible value="false"/>
</properties>
</component>
<component id="12ae4" class="javax.swing.JLabel">
<constraints>
<grid row="0" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
</constraints>
<properties>
<text value="N° Z Inicial"/>
</properties>
</component>
<component id="b7649" class="javax.swing.JLabel">
<constraints>
<grid row="0" column="2" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
</constraints>
<properties>
<text value="N° Z Final"/>
</properties>
</component>
<component id="63176" class="javax.swing.JTextField" binding="nroZInicialField">
<constraints>
<grid row="1" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="6" anchor="8" fill="1" indent="0" use-parent-layout="false">
<preferred-size width="150" height="-1"/>
</grid>
</constraints>
<properties/>
</component>
<component id="a57c4" class="javax.swing.JTextField" binding="nroZFinalField">
<constraints>
<grid row="1" column="2" row-span="1" col-span="1" vsize-policy="0" hsize-policy="6" anchor="8" fill="1" indent="0" use-parent-layout="false">
<preferred-size width="150" height="-1"/>
</grid>
</constraints>
<properties/>
</component>
<component id="b4963" class="javax.swing.JLabel" binding="errorNroZInicial">
<constraints>
<grid row="2" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
</constraints>
<properties>
<foreground color="-65536"/>
<text value="Label"/>
<visible value="false"/>
</properties>
</component>
<component id="441ff" class="javax.swing.JLabel" binding="errorNroZFinal">
<constraints>
<grid row="2" column="2" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
</constraints>

73
src/danielcortes/xyz/views/IngresosView.java
View File

@@ -28,7 +28,6 @@ import com.intellij.uiDesigner.core.GridConstraints;
import com.intellij.uiDesigner.core.GridLayoutManager;
import com.intellij.uiDesigner.core.Spacer;
import danielcortes.xyz.models.tipo_ingreso.TipoIngreso;
import danielcortes.xyz.views.components.EgresosTableModel;
import danielcortes.xyz.views.components.IngresosTableModel;
import javax.swing.*;
@@ -50,6 +49,10 @@ public class IngresosView {
private JTextField nroFinalField;
private JLabel errorNroInicial;
private JLabel errorNroFinal;
private JTextField nroZInicialField;
private JTextField nroZFinalField;
private JLabel errorNroZFinal;
private JLabel errorNroZInicial;
private IngresosTableModel ingresosTableModel;
@@ -126,6 +129,21 @@ public class IngresosView {
return ingresosTableModel;
}
public JTextField getNroZInicialField() {
return nroZInicialField;
}
public JTextField getNroZFinalField() {
return nroZFinalField;
}
public JLabel getErrorNroZFinal() {
return errorNroZFinal;
}
public JLabel getErrorNroZInicial() {
return errorNroZInicial;
}
{
// GUI initializer generated by IntelliJ IDEA GUI Designer
@@ -153,35 +171,35 @@ public class IngresosView {
panel1.add(scrollPane1, new GridConstraints(1, 0, 1, 1, GridConstraints.ANCHOR_CENTER, GridConstraints.FILL_BOTH, GridConstraints.SIZEPOLICY_CAN_SHRINK | GridConstraints.SIZEPOLICY_WANT_GROW, GridConstraints.SIZEPOLICY_CAN_SHRINK | GridConstraints.SIZEPOLICY_WANT_GROW, null, null, null, 0, false));
scrollPane1.setViewportView(ingresosTable);
final JPanel panel2 = new JPanel();
panel2.setLayout(new GridLayoutManager(3, 4, new Insets(0, 0, 0, 0), -1, -1));
panel1.add(panel2, new GridConstraints(0, 0, 1, 1, GridConstraints.ANCHOR_CENTER, GridConstraints.FILL_BOTH, GridConstraints.SIZEPOLICY_CAN_SHRINK | GridConstraints.SIZEPOLICY_CAN_GROW, GridConstraints.SIZEPOLICY_CAN_SHRINK | GridConstraints.SIZEPOLICY_CAN_GROW, null, null, null, 0, false));
panel2.setLayout(new GridLayoutManager(3, 6, new Insets(0, 0, 0, 0), -1, -1));
panel1.add(panel2, new GridConstraints(0, 0, 1, 1, GridConstraints.ANCHOR_CENTER, GridConstraints.FILL_BOTH, GridConstraints.SIZEPOLICY_CAN_SHRINK | GridConstraints.SIZEPOLICY_CAN_GROW, GridConstraints.SIZEPOLICY_CAN_SHRINK | GridConstraints.SIZEPOLICY_CAN_GROW, null, new Dimension(150, -1), null, 0, false));
final JLabel label1 = new JLabel();
label1.setText("Tipo");
panel2.add(label1, new GridConstraints(0, 3, 1, 1, GridConstraints.ANCHOR_WEST, GridConstraints.FILL_NONE, GridConstraints.SIZEPOLICY_FIXED, GridConstraints.SIZEPOLICY_FIXED, null, null, null, 0, false));
panel2.add(label1, new GridConstraints(0, 5, 1, 1, GridConstraints.ANCHOR_WEST, GridConstraints.FILL_NONE, GridConstraints.SIZEPOLICY_FIXED, GridConstraints.SIZEPOLICY_FIXED, null, null, null, 0, false));
tipoCombo = new JComboBox();
final DefaultComboBoxModel defaultComboBoxModel1 = new DefaultComboBoxModel();
tipoCombo.setModel(defaultComboBoxModel1);
panel2.add(tipoCombo, new GridConstraints(1, 3, 1, 1, GridConstraints.ANCHOR_WEST, GridConstraints.FILL_HORIZONTAL, GridConstraints.SIZEPOLICY_WANT_GROW, GridConstraints.SIZEPOLICY_FIXED, null, new Dimension(150, -1), null, 0, false));
panel2.add(tipoCombo, new GridConstraints(1, 5, 1, 1, GridConstraints.ANCHOR_WEST, GridConstraints.FILL_HORIZONTAL, GridConstraints.SIZEPOLICY_WANT_GROW, GridConstraints.SIZEPOLICY_FIXED, null, new Dimension(150, -1), null, 0, false));
final JLabel label2 = new JLabel();
label2.setText("Valor");
panel2.add(label2, new GridConstraints(0, 0, 1, 1, GridConstraints.ANCHOR_WEST, GridConstraints.FILL_NONE, GridConstraints.SIZEPOLICY_FIXED, GridConstraints.SIZEPOLICY_FIXED, null, null, null, 0, false));
valorField = new JTextField();
panel2.add(valorField, new GridConstraints(1, 0, 1, 1, GridConstraints.ANCHOR_WEST, GridConstraints.FILL_HORIZONTAL, GridConstraints.SIZEPOLICY_WANT_GROW, GridConstraints.SIZEPOLICY_FIXED, null, new Dimension(150, -1), null, 0, false));
final JLabel label3 = new JLabel();
label3.setText("N° Inicial");
panel2.add(label3, new GridConstraints(0, 1, 1, 1, GridConstraints.ANCHOR_WEST, GridConstraints.FILL_NONE, GridConstraints.SIZEPOLICY_FIXED, GridConstraints.SIZEPOLICY_FIXED, null, null, null, 0, false));
label3.setText("N° Boleta Inicial");
panel2.add(label3, new GridConstraints(0, 3, 1, 1, GridConstraints.ANCHOR_WEST, GridConstraints.FILL_NONE, GridConstraints.SIZEPOLICY_FIXED, GridConstraints.SIZEPOLICY_FIXED, null, null, null, 0, false));
final JLabel label4 = new JLabel();
label4.setText("N° Final");
panel2.add(label4, new GridConstraints(0, 2, 1, 1, GridConstraints.ANCHOR_WEST, GridConstraints.FILL_NONE, GridConstraints.SIZEPOLICY_FIXED, GridConstraints.SIZEPOLICY_FIXED, null, null, null, 0, false));
label4.setText("N° Boleta Final");
panel2.add(label4, new GridConstraints(0, 4, 1, 1, GridConstraints.ANCHOR_WEST, GridConstraints.FILL_NONE, GridConstraints.SIZEPOLICY_FIXED, GridConstraints.SIZEPOLICY_FIXED, null, null, null, 0, false));
nroInicialField = new JTextField();
panel2.add(nroInicialField, new GridConstraints(1, 1, 1, 1, GridConstraints.ANCHOR_WEST, GridConstraints.FILL_HORIZONTAL, GridConstraints.SIZEPOLICY_WANT_GROW, GridConstraints.SIZEPOLICY_FIXED, null, new Dimension(150, -1), null, 0, false));
panel2.add(nroInicialField, new GridConstraints(1, 3, 1, 1, GridConstraints.ANCHOR_WEST, GridConstraints.FILL_HORIZONTAL, GridConstraints.SIZEPOLICY_WANT_GROW, GridConstraints.SIZEPOLICY_FIXED, null, new Dimension(150, -1), null, 0, false));
nroFinalField = new JTextField();
panel2.add(nroFinalField, new GridConstraints(1, 2, 1, 1, GridConstraints.ANCHOR_WEST, GridConstraints.FILL_HORIZONTAL, GridConstraints.SIZEPOLICY_WANT_GROW, GridConstraints.SIZEPOLICY_FIXED, null, new Dimension(150, -1), null, 0, false));
panel2.add(nroFinalField, new GridConstraints(1, 4, 1, 1, GridConstraints.ANCHOR_WEST, GridConstraints.FILL_HORIZONTAL, GridConstraints.SIZEPOLICY_WANT_GROW, GridConstraints.SIZEPOLICY_FIXED, null, new Dimension(150, -1), null, 0, false));
errorTipoIngreso = new JLabel();
errorTipoIngreso.setForeground(new Color(-65536));
errorTipoIngreso.setText("Label");
errorTipoIngreso.setVisible(false);
panel2.add(errorTipoIngreso, new GridConstraints(2, 3, 1, 1, GridConstraints.ANCHOR_WEST, GridConstraints.FILL_NONE, GridConstraints.SIZEPOLICY_FIXED, GridConstraints.SIZEPOLICY_FIXED, null, null, null, 0, false));
panel2.add(errorTipoIngreso, new GridConstraints(2, 5, 1, 1, GridConstraints.ANCHOR_WEST, GridConstraints.FILL_NONE, GridConstraints.SIZEPOLICY_FIXED, GridConstraints.SIZEPOLICY_FIXED, null, null, null, 0, false));
errorValor = new JLabel();
errorValor.setForeground(new Color(-65536));
errorValor.setText("Label");
@@ -191,21 +209,41 @@ public class IngresosView {
errorNroInicial.setForeground(new Color(-65536));
errorNroInicial.setText("Label");
errorNroInicial.setVisible(false);
panel2.add(errorNroInicial, new GridConstraints(2, 1, 1, 1, GridConstraints.ANCHOR_WEST, GridConstraints.FILL_NONE, GridConstraints.SIZEPOLICY_FIXED, GridConstraints.SIZEPOLICY_FIXED, null, null, null, 0, false));
panel2.add(errorNroInicial, new GridConstraints(2, 3, 1, 1, GridConstraints.ANCHOR_WEST, GridConstraints.FILL_NONE, GridConstraints.SIZEPOLICY_FIXED, GridConstraints.SIZEPOLICY_FIXED, null, null, null, 0, false));
errorNroFinal = new JLabel();
errorNroFinal.setForeground(new Color(-65536));
errorNroFinal.setText("Label");
errorNroFinal.setVisible(false);
panel2.add(errorNroFinal, new GridConstraints(2, 2, 1, 1, GridConstraints.ANCHOR_WEST, GridConstraints.FILL_NONE, GridConstraints.SIZEPOLICY_FIXED, GridConstraints.SIZEPOLICY_FIXED, null, null, null, 0, false));
panel2.add(errorNroFinal, new GridConstraints(2, 4, 1, 1, GridConstraints.ANCHOR_WEST, GridConstraints.FILL_NONE, GridConstraints.SIZEPOLICY_FIXED, GridConstraints.SIZEPOLICY_FIXED, null, null, null, 0, false));
final JLabel label5 = new JLabel();
label5.setText("N° Z Inicial");
panel2.add(label5, new GridConstraints(0, 1, 1, 1, GridConstraints.ANCHOR_WEST, GridConstraints.FILL_NONE, GridConstraints.SIZEPOLICY_FIXED, GridConstraints.SIZEPOLICY_FIXED, null, null, null, 0, false));
final JLabel label6 = new JLabel();
label6.setText("N° Z Final");
panel2.add(label6, new GridConstraints(0, 2, 1, 1, GridConstraints.ANCHOR_WEST, GridConstraints.FILL_NONE, GridConstraints.SIZEPOLICY_FIXED, GridConstraints.SIZEPOLICY_FIXED, null, null, null, 0, false));
nroZInicialField = new JTextField();
panel2.add(nroZInicialField, new GridConstraints(1, 1, 1, 1, GridConstraints.ANCHOR_WEST, GridConstraints.FILL_HORIZONTAL, GridConstraints.SIZEPOLICY_WANT_GROW, GridConstraints.SIZEPOLICY_FIXED, null, new Dimension(150, -1), null, 0, false));
nroZFinalField = new JTextField();
panel2.add(nroZFinalField, new GridConstraints(1, 2, 1, 1, GridConstraints.ANCHOR_WEST, GridConstraints.FILL_HORIZONTAL, GridConstraints.SIZEPOLICY_WANT_GROW, GridConstraints.SIZEPOLICY_FIXED, null, new Dimension(150, -1), null, 0, false));
errorNroZInicial = new JLabel();
errorNroZInicial.setForeground(new Color(-65536));
errorNroZInicial.setText("Label");
errorNroZInicial.setVisible(false);
panel2.add(errorNroZInicial, new GridConstraints(2, 1, 1, 1, GridConstraints.ANCHOR_WEST, GridConstraints.FILL_NONE, GridConstraints.SIZEPOLICY_FIXED, GridConstraints.SIZEPOLICY_FIXED, null, null, null, 0, false));
errorNroZFinal = new JLabel();
errorNroZFinal.setForeground(new Color(-65536));
errorNroZFinal.setText("Label");
errorNroZFinal.setVisible(false);
panel2.add(errorNroZFinal, new GridConstraints(2, 2, 1, 1, GridConstraints.ANCHOR_WEST, GridConstraints.FILL_NONE, GridConstraints.SIZEPOLICY_FIXED, GridConstraints.SIZEPOLICY_FIXED, null, null, null, 0, false));
final JPanel panel3 = new JPanel();
panel3.setLayout(new GridLayoutManager(1, 3, new Insets(0, 0, 0, 0), -1, -1));
panel1.add(panel3, new GridConstraints(2, 0, 1, 1, GridConstraints.ANCHOR_CENTER, GridConstraints.FILL_BOTH, GridConstraints.SIZEPOLICY_CAN_SHRINK | GridConstraints.SIZEPOLICY_CAN_GROW, GridConstraints.SIZEPOLICY_CAN_SHRINK | GridConstraints.SIZEPOLICY_CAN_GROW, null, null, null, 0, false));
final JPanel panel4 = new JPanel();
panel4.setLayout(new GridLayoutManager(1, 2, new Insets(0, 0, 0, 0), -1, -1));
panel3.add(panel4, new GridConstraints(0, 2, 1, 1, GridConstraints.ANCHOR_CENTER, GridConstraints.FILL_BOTH, GridConstraints.SIZEPOLICY_CAN_SHRINK | GridConstraints.SIZEPOLICY_CAN_GROW, GridConstraints.SIZEPOLICY_CAN_SHRINK | GridConstraints.SIZEPOLICY_CAN_GROW, null, null, null, 0, false));
final JLabel label5 = new JLabel();
label5.setText("Total Ingresos");
panel4.add(label5, new GridConstraints(0, 0, 1, 1, GridConstraints.ANCHOR_EAST, GridConstraints.FILL_NONE, GridConstraints.SIZEPOLICY_FIXED, GridConstraints.SIZEPOLICY_FIXED, null, null, null, 0, false));
final JLabel label7 = new JLabel();
label7.setText("Total Ingresos");
panel4.add(label7, new GridConstraints(0, 0, 1, 1, GridConstraints.ANCHOR_EAST, GridConstraints.FILL_NONE, GridConstraints.SIZEPOLICY_FIXED, GridConstraints.SIZEPOLICY_FIXED, null, null, null, 0, false));
totalIngresoField = new JTextField();
totalIngresoField.setEditable(false);
panel4.add(totalIngresoField, new GridConstraints(0, 1, 1, 1, GridConstraints.ANCHOR_CENTER, GridConstraints.FILL_HORIZONTAL, GridConstraints.SIZEPOLICY_WANT_GROW, GridConstraints.SIZEPOLICY_FIXED, null, new Dimension(150, -1), null, 0, false));
@@ -233,4 +271,5 @@ public class IngresosView {
public JComponent $$$getRootComponent$$$() {
return contentPanel;
}
}

17
src/danielcortes/xyz/views/components/IngresosTableModel.java
View File

@@ -35,7 +35,7 @@ public class IngresosTableModel extends AbstractTableModel {
public IngresosTableModel() {
super();
this.columns = new String[]{"Valor", "N° Inicial", "N° Final", "Tipo"};
this.columns = new String[]{"Valor","N° Z Inicial", "N° Z Final", "N° Inicial", "N° Final", "Tipo"};
this.rows = new ArrayList<>();
}
@@ -78,10 +78,14 @@ public class IngresosTableModel extends AbstractTableModel {
case 0:
return this.rows.get(row).getValor();
case 1:
return this.rows.get(row).getNroInicial();
return this.rows.get(row).getNroZInicial();
case 2:
return this.rows.get(row).getNroFinal();
return this.rows.get(row).getNroZFinal();
case 3:
return this.rows.get(row).getNroInicial();
case 4:
return this.rows.get(row).getNroFinal();
case 5:
return this.rows.get(row).getTipoIngreso().getNombre();
}
return null;
@@ -96,11 +100,4 @@ public class IngresosTableModel extends AbstractTableModel {
this.fireTableRowsUpdated(getRowCount() - 2, getRowCount() - 1);
}
@Override
public Class<?> getColumnClass(int columnIndex) {
if (rows.isEmpty()) {
return Object.class;
}
return getValueAt(0, columnIndex).getClass();
}
}