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

NumberFormatTextField agregado en el campo value de egresos y el total egresos

Browse Source
This commit is contained in:
Daniel Cortes
2019-01-06 00:52:15 -03:00
parent 73f5b44cf5
commit 573df8fc03
8 changed files with 289 additions and 226 deletions
Download Patch File Download Diff File Expand all files Collapse all files

420
.idea/workspace.xml generated
View File

@@ -6,7 +6,7 @@
</artifacts-to-build> </artifacts-to-build>
</component> </component>
<component name="BookmarkManager"> <component name="BookmarkManager">
<bookmark url="file://$PROJECT_DIR$/src/danielcortes/xyz/controllers/IngresosController.java" line="489" mnemonic="0" /> <bookmark url="file://$PROJECT_DIR$/src/danielcortes/xyz/controllers/IngresosController.java" line="449" mnemonic="0" />
<bookmark url="file://$PROJECT_DIR$/src/danielcortes/xyz/controllers/ArqueoController.java" line="55" /> <bookmark url="file://$PROJECT_DIR$/src/danielcortes/xyz/controllers/ArqueoController.java" line="55" />
</component> </component>
<component name="ChangeListManager"> <component name="ChangeListManager">
@@ -14,10 +14,9 @@
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.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/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$/dist/database.sqlite" beforeDir="false" afterPath="$PROJECT_DIR$/dist/database.sqlite" 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$/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/views/EgresosView.form" beforeDir="false" afterPath="$PROJECT_DIR$/src/danielcortes/xyz/views/EgresosView.form" 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/components/NumberFormatedTextField.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/danielcortes/xyz/views/components/NumberFormatedTextField.java" afterDir="false" />
</list> </list>
<ignored path="$PROJECT_DIR$/target/" /> <ignored path="$PROJECT_DIR$/target/" />
<ignored path=".idea/" /> <ignored path=".idea/" />
@@ -73,7 +72,87 @@
<favorites_list name="caja" /> <favorites_list name="caja" />
</component> </component>
<component name="FileEditorManager"> <component name="FileEditorManager">
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300" /> <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
<file pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/src/danielcortes/xyz/controllers/EgresosController.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="304">
<caret line="399" column="37" selection-start-line="399" selection-start-column="37" selection-end-line="399" selection-end-column="37" />
<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>
</file>
</leaf>
</component> </component>
<component name="FileTemplateManagerImpl"> <component name="FileTemplateManagerImpl">
<option name="RECENT_TEMPLATES"> <option name="RECENT_TEMPLATES">
@@ -86,8 +165,6 @@
</component> </component>
<component name="FindInProjectRecents"> <component name="FindInProjectRecents">
<findStrings> <findStrings>
<find>print</find>
<find>&quot;</find>
<find>fec</find> <find>fec</find>
<find>System</find> <find>System</find>
<find>[2018] [Daniel Cortes]</find> <find>[2018] [Daniel Cortes]</find>
@@ -116,6 +193,8 @@
<find>Copyright (c) 2018 Daniel Cortes</find> <find>Copyright (c) 2018 Daniel Cortes</find>
<find>format</find> <find>format</find>
<find>format(</find> <find>format(</find>
<find>getvalor</find>
<find>gettotalIngreso</find>
</findStrings> </findStrings>
<replaceStrings> <replaceStrings>
<replace>2018 Daniel Cortes</replace> <replace>2018 Daniel Cortes</replace>
@@ -161,11 +240,7 @@
<option value="$PROJECT_DIR$/src/danielcortes/xyz/views/ManagerView.java" /> <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/Main.java" />
<option value="$PROJECT_DIR$/src/danielcortes/xyz/controllers/AbstractController.java" /> <option value="$PROJECT_DIR$/src/danielcortes/xyz/controllers/AbstractController.java" />
<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/EgresosView.java" />
<option value="$PROJECT_DIR$/src/danielcortes/xyz/controllers/actions/NextAction.java" /> <option value="$PROJECT_DIR$/src/danielcortes/xyz/controllers/actions/NextAction.java" />
<option value="$PROJECT_DIR$/src/danielcortes/xyz/controllers/EgresosController.java" />
<option value="$PROJECT_DIR$/src/danielcortes/xyz/controllers/ManagerController.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/ConnectionHolder.java" />
<option value="$PROJECT_DIR$/src/danielcortes/xyz/data/MysqlConnectionHolder.java" /> <option value="$PROJECT_DIR$/src/danielcortes/xyz/data/MysqlConnectionHolder.java" />
@@ -176,17 +251,21 @@
<option value="$APPLICATION_CONFIG_DIR$/consoles/db/6e2ee496-6ca2-4cc4-a2b0-4f122e6bfd50/console.sql" /> <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/Ingreso.java" />
<option value="$PROJECT_DIR$/src/danielcortes/xyz/models/ingreso/IngresoDAO.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$/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/models/ingreso/SQLiteIngresoDAO.java" />
<option value="$PROJECT_DIR$/src/danielcortes/xyz/views/IngresosView.form" />
<option value="$PROJECT_DIR$/src/danielcortes/xyz/views/components/JNumberFormatedTextField.java" /> <option value="$PROJECT_DIR$/src/danielcortes/xyz/views/components/JNumberFormatedTextField.java" />
<option value="$PROJECT_DIR$/src/danielcortes/xyz/views/ArqueoView.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/ArqueoView.form" />
<option value="$PROJECT_DIR$/src/danielcortes/xyz/controllers/ArqueoController.java" /> <option value="$PROJECT_DIR$/src/danielcortes/xyz/controllers/ArqueoController.java" />
<option value="$PROJECT_DIR$/src/danielcortes/xyz/views/components/NumberFormatedTextField.java" /> <option value="$PROJECT_DIR$/src/danielcortes/xyz/views/components/NumberFormatedTextField.java" />
<option value="$PROJECT_DIR$/src/danielcortes/xyz/views/IngresosView.form" />
<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/controllers/IngresosController.java" />
<option value="$PROJECT_DIR$/src/danielcortes/xyz/views/EgresosView.form" />
<option value="$PROJECT_DIR$/src/danielcortes/xyz/views/EgresosView.java" />
<option value="$PROJECT_DIR$/src/danielcortes/xyz/controllers/EgresosController.java" />
</list> </list>
</option> </option>
</component> </component>
@@ -273,14 +352,6 @@
<item name="xyz" type="462c0819:PsiDirectoryNode" /> <item name="xyz" type="462c0819:PsiDirectoryNode" />
<item name="views" type="462c0819:PsiDirectoryNode" /> <item name="views" type="462c0819:PsiDirectoryNode" />
</path> </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="components" type="462c0819:PsiDirectoryNode" />
</path>
<path> <path>
<item name="caja" type="b2602c69:ProjectViewProjectNode" /> <item name="caja" type="b2602c69:ProjectViewProjectNode" />
<item name="caja" type="462c0819:PsiDirectoryNode" /> <item name="caja" type="462c0819:PsiDirectoryNode" />
@@ -488,7 +559,7 @@
<workItem from="1546533252017" duration="4537000" /> <workItem from="1546533252017" duration="4537000" />
<workItem from="1546719990258" duration="3560000" /> <workItem from="1546719990258" duration="3560000" />
<workItem from="1546732125785" duration="5958000" /> <workItem from="1546732125785" duration="5958000" />
<workItem from="1546743888328" duration="1369000" /> <workItem from="1546743888328" duration="2596000" />
</task> </task>
<task id="LOCAL-00001" summary="First!! :3 Existe una pequeña base de proyecto por ahora"> <task id="LOCAL-00001" summary="First!! :3 Existe una pequeña base de proyecto por ahora">
<created>1545280618093</created> <created>1545280618093</created>
@@ -700,11 +771,25 @@
<option name="project" value="LOCAL" /> <option name="project" value="LOCAL" />
<updated>1546737934935</updated> <updated>1546737934935</updated>
</task> </task>
<option name="localTasksCounter" value="31" /> <task id="LOCAL-00031" summary="Mejora de los NumberFormatedTextFields">
<created>1546745282741</created>
<option name="number" value="00031" />
<option name="presentableId" value="LOCAL-00031" />
<option name="project" value="LOCAL" />
<updated>1546745282741</updated>
</task>
<task id="LOCAL-00032" summary="NumberFormatTextField agregado en el campo value de ingresos y formateado los campos integer en los tablemodels">
<created>1546746290385</created>
<option name="number" value="00032" />
<option name="presentableId" value="LOCAL-00032" />
<option name="project" value="LOCAL" />
<updated>1546746290385</updated>
</task>
<option name="localTasksCounter" value="33" />
<servers /> <servers />
</component> </component>
<component name="TimeTrackingManager"> <component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="212879000" /> <option name="totallyTimeSpent" value="214106000" />
</component> </component>
<component name="TodoView"> <component name="TodoView">
<todo-panel id="selected-file"> <todo-panel id="selected-file">
@@ -717,8 +802,9 @@
</component> </component>
<component name="ToolWindowManager"> <component name="ToolWindowManager">
<frame x="0" y="-18" width="1366" height="765" extended-state="6" /> <frame x="0" y="-18" width="1366" height="765" extended-state="6" />
<editor active="true" />
<layout> <layout>
<window_info active="true" content_ui="combo" id="Project" order="0" sideWeight="0.49438202" visible="true" weight="0.20776255" /> <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="Image Layers" order="1" />
<window_info id="Designer" order="2" /> <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" weight="0.32952815" />
@@ -807,8 +893,6 @@
<component name="VcsManagerConfiguration"> <component name="VcsManagerConfiguration">
<option name="CHECK_CODE_SMELLS_BEFORE_PROJECT_COMMIT" value="false" /> <option name="CHECK_CODE_SMELLS_BEFORE_PROJECT_COMMIT" value="false" />
<option name="CHECK_NEW_TODO" value="false" /> <option name="CHECK_NEW_TODO" value="false" />
<MESSAGE value="Ahora el modelo de egreso se autocarga con el objeto de tipo egreso en vez de con su id" />
<MESSAGE value="Validacion cuando se guarda un egreso desde la vista" />
<MESSAGE value="Creada seccion de ingresos completa." /> <MESSAGE value="Creada seccion de ingresos completa." />
<MESSAGE value="Mejorada interaccion con las vistas :3" /> <MESSAGE value="Mejorada interaccion con las vistas :3" />
<MESSAGE value="Cambiado JButtons de ManagerView por JToggleButtons" /> <MESSAGE value="Cambiado JButtons de ManagerView por JToggleButtons" />
@@ -832,7 +916,9 @@
<MESSAGE value="Agregado nro z inicial y nro z final a tabla ingresos" /> <MESSAGE value="Agregado nro z inicial y nro z final a tabla ingresos" />
<MESSAGE value="Creacion de number formated text field y implementacion de prueba como campos de efectivo" /> <MESSAGE value="Creacion de number formated text field y implementacion de prueba como campos de efectivo" />
<MESSAGE value="Cambiados JTextFields del resumen de arqueo por NumberFormatedTextFields" /> <MESSAGE value="Cambiados JTextFields del resumen de arqueo por NumberFormatedTextFields" />
<option name="LAST_COMMIT_MESSAGE" value="Cambiados JTextFields del resumen de arqueo por NumberFormatedTextFields" /> <MESSAGE value="Mejora de los NumberFormatedTextFields" />
<MESSAGE value="NumberFormatTextField agregado en el campo value de ingresos y formateado los campos integer en los tablemodels" />
<option name="LAST_COMMIT_MESSAGE" value="NumberFormatTextField agregado en el campo value de ingresos y formateado los campos integer en los tablemodels" />
</component> </component>
<component name="antWorkspaceConfiguration"> <component name="antWorkspaceConfiguration">
<option name="IS_AUTOSCROLL_TO_SOURCE" value="false" /> <option name="IS_AUTOSCROLL_TO_SOURCE" value="false" />
@@ -910,25 +996,6 @@
</state> </state>
</provider> </provider>
</entry> </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="jar:///usr/lib/jvm/java-11-openjdk/lib/src.zip!/java.desktop/javax/swing/RowSorter.java"> <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"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="2438"> <state relative-caret-position="2438">
@@ -957,16 +1024,6 @@
</state> </state>
</provider> </provider>
</entry> </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"> <entry file="file://$PROJECT_DIR$/src/danielcortes/xyz/controllers/actions/NextAction.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="69"> <state relative-caret-position="69">
@@ -977,62 +1034,6 @@
</state> </state>
</provider> </provider>
</entry> </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/ManagerController.java"> <entry file="file://$PROJECT_DIR$/src/danielcortes/xyz/controllers/ManagerController.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="69"> <state relative-caret-position="69">
@@ -1194,21 +1195,6 @@
</state> </state>
</provider> </provider>
</entry> </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"> <entry file="file://$PROJECT_DIR$/database/sqlite.sql">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="374"> <state relative-caret-position="374">
@@ -1226,19 +1212,6 @@
</state> </state>
</provider> </provider>
</entry> </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"> <entry file="file://$PROJECT_DIR$/src/danielcortes/xyz/models/ingreso/SQLiteIngresoDAO.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="149"> <state relative-caret-position="149">
@@ -1246,9 +1219,6 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/danielcortes/xyz/views/IngresosView.form">
<provider selected="true" editor-type-id="ui-designer" />
</entry>
<entry file="jar:///usr/lib/jvm/java-11-openjdk/lib/src.zip!/java.base/java/text/NumberFormat.java"> <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"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-6105"> <state relative-caret-position="-6105">
@@ -1345,10 +1315,46 @@
</state> </state>
</provider> </provider>
</entry> </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="230">
<caret line="93" column="57" selection-start-line="93" selection-start-column="57" selection-end-line="93" selection-end-column="57" />
</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="-345">
<caret line="41" selection-start-line="41" selection-end-line="42" />
<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/views/IngresosView.form">
<provider selected="true" editor-type-id="ui-designer" />
</entry>
<entry file="file://$PROJECT_DIR$/src/danielcortes/xyz/views/IngresosView.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="23">
<caret line="89" column="25" selection-start-line="89" selection-start-column="25" selection-end-line="89" selection-end-column="25" />
<folding>
<element signature="method#createIngresosTable#0;class#IngresosView#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$/src/danielcortes/xyz/controllers/IngresosController.java"> <entry file="file://$PROJECT_DIR$/src/danielcortes/xyz/controllers/IngresosController.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="669"> <state relative-caret-position="59">
<caret line="488" column="4" selection-start-line="488" selection-start-column="4" selection-end-line="488" selection-end-column="4" /> <caret line="431" column="44" selection-start-line="431" selection-start-column="44" selection-end-line="431" selection-end-column="44" />
<folding> <folding>
<element signature="docComment;class#IngresosController#0" /> <element signature="docComment;class#IngresosController#0" />
<element signature="docComment;method#IngresosController#0;class#IngresosController#0" /> <element signature="docComment;method#IngresosController#0;class#IngresosController#0" />
@@ -1362,37 +1368,57 @@
<element signature="e#3404#3452#1" /> <element signature="e#3404#3452#1" />
<element signature="docComment;method#fillIngresosTable#0;class#IngresosController#0" /> <element signature="docComment;method#fillIngresosTable#0;class#IngresosController#0" />
<element signature="method#fillIngresosTable#0;class#IngresosController#0" /> <element signature="method#fillIngresosTable#0;class#IngresosController#0" />
<element signature="e#3792#3851#1" />
<element signature="docComment;method#setupViewEvents#0;class#IngresosController#0" /> <element signature="docComment;method#setupViewEvents#0;class#IngresosController#0" />
<element signature="method#setupViewEvents#0;class#IngresosController#0" />
<element signature="e#6512#6599#1" />
<element signature="docComment;method#guardarActionListener#0;class#IngresosController#0" /> <element signature="docComment;method#guardarActionListener#0;class#IngresosController#0" />
<element signature="method#guardarActionListener#0;class#IngresosController#0" />
<element signature="e#7513#7633#1" />
<element signature="e#7639#7760#1" />
<element signature="docComment;method#eliminarActionListener#0;class#IngresosController#0" /> <element signature="docComment;method#eliminarActionListener#0;class#IngresosController#0" />
<element signature="method#eliminarActionListener#0;class#IngresosController#0" /> <element signature="method#eliminarActionListener#0;class#IngresosController#0" />
<element signature="e#8230#8531#1" />
<element signature="docComment;method#editarActionListener#0;class#IngresosController#0" /> <element signature="docComment;method#editarActionListener#0;class#IngresosController#0" />
<element signature="method#editarActionListener#0;class#IngresosController#0" />
<element signature="e#9163#9907#1" />
<element signature="docComment;method#updateTotalIngresos#0;class#IngresosController#0" /> <element signature="docComment;method#updateTotalIngresos#0;class#IngresosController#0" />
<element signature="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="docComment;method#updateButtonsEnabled#0;class#IngresosController#0" />
<element signature="method#updateButtonsEnabled#0;class#IngresosController#0" /> <element signature="method#updateButtonsEnabled#0;class#IngresosController#0" />
<element signature="e#10496#10625#1" />
<element signature="e#10629#10760#1" />
<element signature="docComment;method#guardarIngreso#0;class#IngresosController#0" /> <element signature="docComment;method#guardarIngreso#0;class#IngresosController#0" />
<element signature="method#guardarIngreso#0;class#IngresosController#0" /> <element signature="method#guardarIngreso#0;class#IngresosController#0" />
<element signature="e#11215#11765#1" />
<element signature="docComment;method#editarIngreso#0;class#IngresosController#0" /> <element signature="docComment;method#editarIngreso#0;class#IngresosController#0" />
<element signature="method#editarIngreso#0;class#IngresosController#0" />
<element signature="e#12256#12874#1" />
<element signature="docComment;method#validateInput#0;class#IngresosController#0" /> <element signature="docComment;method#validateInput#0;class#IngresosController#0" />
<element signature="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#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#validateNroZInicial#0;class#IngresosController#0" /> <element signature="docComment;method#validateNroZInicial#0;class#IngresosController#0" />
<element signature="method#validateNroZInicial#0;class#IngresosController#0" /> <element signature="method#validateNroZInicial#0;class#IngresosController#0" />
<element signature="e#14458#14642#1" />
<element signature="e#14679#14852#1" />
<element signature="docComment;method#validateNroZFinal#0;class#IngresosController#0" /> <element signature="docComment;method#validateNroZFinal#0;class#IngresosController#0" />
<element signature="method#validateNroZFinal#0;class#IngresosController#0" /> <element signature="method#validateNroZFinal#0;class#IngresosController#0" />
<element signature="e#15286#15466#1" />
<element signature="e#15501#15670#1" />
<element signature="docComment;method#validateNroInicial#0;class#IngresosController#0" /> <element signature="docComment;method#validateNroInicial#0;class#IngresosController#0" />
<element signature="method#validateNroInicial#0;class#IngresosController#0" /> <element signature="method#validateNroInicial#0;class#IngresosController#0" />
<element signature="e#16109#16293#1" />
<element signature="e#16329#16502#1" />
<element signature="docComment;method#validateNroFinal#0;class#IngresosController#0" /> <element signature="docComment;method#validateNroFinal#0;class#IngresosController#0" />
<element signature="method#validateNroFinal#0;class#IngresosController#0" /> <element signature="method#validateNroFinal#0;class#IngresosController#0" />
<element signature="e#16933#17113#1" />
<element signature="e#17147#17316#1" />
<element signature="docComment;method#validateTipoIngreso#0;class#IngresosController#0" /> <element signature="docComment;method#validateTipoIngreso#0;class#IngresosController#0" />
<element signature="method#validateTipoIngreso#0;class#IngresosController#0" /> <element signature="method#validateTipoIngreso#0;class#IngresosController#0" />
<element signature="e#17682#17868#1" />
<element signature="docComment;method#hideErrorMessages#0;class#IngresosController#0" /> <element signature="docComment;method#hideErrorMessages#0;class#IngresosController#0" />
<element signature="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="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="docComment;method#normalizeInputs#0;class#IngresosController#0" />
<element signature="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="docComment;method#resetFocus#0;class#IngresosController#0" />
@@ -1405,6 +1431,96 @@
</state> </state>
</provider> </provider>
</entry> </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/EgresosView.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="115">
<caret line="86" column="35" selection-start-line="86" selection-start-column="35" selection-end-line="86" selection-end-column="35" />
<folding>
<element signature="imports" expanded="true" />
</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="304">
<caret line="399" column="37" selection-start-line="399" selection-start-column="37" selection-end-line="399" selection-end-column="37" />
<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>
</component> </component>
<component name="masterDetails"> <component name="masterDetails">
<states> <states>

BIN
dist/caja.jar vendored
View File

Binary file not shown.

BIN
dist/database.sqlite vendored
View File

Binary file not shown.

63
src/danielcortes/xyz/controllers/EgresosController.java
View File

@@ -159,7 +159,7 @@ public class EgresosController {
String nro = this.view.getNroField().getText(); String nro = this.view.getNroField().getText();
String descripcion = this.view.getDescripcionField().getText(); String descripcion = this.view.getDescripcionField().getText();
String valor = this.view.getValorField().getText(); int valor = this.view.getValorField().getValue();
TipoEgreso tipo = (TipoEgreso) this.view.getTipoCombo().getSelectedItem(); TipoEgreso tipo = (TipoEgreso) this.view.getTipoCombo().getSelectedItem();
if(editing){ if(editing){
@@ -182,6 +182,7 @@ public class EgresosController {
this.egresoDAO.deleteEgreso(egreso); this.egresoDAO.deleteEgreso(egreso);
this.updateTotalEgresos(); this.updateTotalEgresos();
this.updateButtonsEnabled(); this.updateButtonsEnabled();
this.resetFocus();
} }
} }
@@ -206,7 +207,7 @@ public class EgresosController {
this.view.getNroField().setText(egreso.getNro()); this.view.getNroField().setText(egreso.getNro());
this.view.getDescripcionField().setText(egreso.getDescripcion()); this.view.getDescripcionField().setText(egreso.getDescripcion());
this.view.getValorField().setText(String.valueOf(egreso.getValor())); this.view.getValorField().setValue(egreso.getValor());
this.view.getTipoCombo().setSelectedItem(egreso.getTipoEgreso()); this.view.getTipoCombo().setSelectedItem(egreso.getTipoEgreso());
} }
} }
@@ -216,7 +217,7 @@ public class EgresosController {
*/ */
private void updateTotalEgresos() { private void updateTotalEgresos() {
int total = this.egresoDAO.getTotalEgreso(this.caja); int total = this.egresoDAO.getTotalEgreso(this.caja);
this.view.getTotalEgresosField().setText(String.valueOf(total)); this.view.getTotalEgresosField().setValue(total);
} }
/** /**
@@ -237,10 +238,10 @@ public class EgresosController {
* Guarda un egreso tras llamar a validar su input * Guarda un egreso tras llamar a validar su input
* Luego de guardar, agrega el egreso a la tabla, llama a actualizar el total de egresos y llama a limpiar a los inputs * Luego de guardar, agrega el egreso a la tabla, llama a actualizar el total de egresos y llama a limpiar a los inputs
*/ */
private void guardarEgreso(String nro, String descripcion, String valor, TipoEgreso tipo, Caja caja) { private void guardarEgreso(String nro, String descripcion, int valor, TipoEgreso tipo, Caja caja) {
if (this.validateInput(nro, descripcion, valor, tipo, caja)) { if (this.validateInput(nro, descripcion, tipo, caja)) {
Egreso egreso = new Egreso(); Egreso egreso = new Egreso();
egreso.setValor(Integer.valueOf(valor)); egreso.setValor(valor);
egreso.setDescripcion(descripcion); egreso.setDescripcion(descripcion);
egreso.setNro(nro); egreso.setNro(nro);
egreso.setTipoEgreso(tipo); egreso.setTipoEgreso(tipo);
@@ -257,8 +258,8 @@ public class EgresosController {
* Tras esto actualiza el egreso en la tabla, llama a actualizar el total de egresos y a limpiar los inputs * Tras esto actualiza el egreso en la tabla, llama a actualizar el total de egresos y a limpiar los inputs
* Finalmente setea la flag editing a false * Finalmente setea la flag editing a false
*/ */
private void editarEgreso(String nro, String descripcion, String valor, TipoEgreso tipo, Caja caja) { private void editarEgreso(String nro, String descripcion, int valor, TipoEgreso tipo, Caja caja) {
if (this.validateInput(nro, descripcion, valor, tipo, caja)) { if (this.validateInput(nro, descripcion, tipo, caja)) {
this.editingEgreso.setValor(Integer.valueOf(valor)); this.editingEgreso.setValor(Integer.valueOf(valor));
this.editingEgreso.setDescripcion(descripcion); this.editingEgreso.setDescripcion(descripcion);
this.editingEgreso.setNro(nro); this.editingEgreso.setNro(nro);
@@ -275,15 +276,14 @@ public class EgresosController {
* llama a los metodos necesarios para validar los inputs entregados * llama a los metodos necesarios para validar los inputs entregados
* @return true cuando todas las validaciones retoran true, si no, false * @return true cuando todas las validaciones retoran true, si no, false
*/ */
private boolean validateInput(String nro, String descripcion, String valor, TipoEgreso tipoEgreso, Caja caja) { private boolean validateInput(String nro, String descripcion, TipoEgreso tipoEgreso, Caja caja) {
boolean nroValidation = this.validateNro(nro); boolean nroValidation = this.validateNro(nro);
boolean descripcionValidation = this.validateDescripcion(descripcion); boolean descripcionValidation = this.validateDescripcion(descripcion);
boolean valorValidation = this.validateValor(valor);
boolean tipoEgresoValidation = this.validateTipoEgreso(tipoEgreso); boolean tipoEgresoValidation = this.validateTipoEgreso(tipoEgreso);
boolean cajaValidation = this.validateCaja(caja); boolean cajaValidation = this.validateCaja(caja);
return nroValidation && descripcionValidation && valorValidation && tipoEgresoValidation; return nroValidation && descripcionValidation && tipoEgresoValidation;
} }
/** /**
@@ -332,44 +332,6 @@ public class EgresosController {
return true; return true;
} }
/**
* Valida la variable valor contra los casos
* - Es null
* - Esta vacio
* - Los caracteres no son todos digitos
* - El largo del string es mayot a 10
* 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 validateValor(String valor) {
if (valor == null) {
this.view.getErrorValor().setText("Hubo un problema con los datos");
this.view.getErrorValor().setVisible(true);
return false;
}
if (valor.isEmpty()) {
this.view.getErrorValor().setText("El campo esta vacio");
this.view.getErrorValor().setVisible(true);
return false;
}
if (!valor.chars().allMatch(Character::isDigit)) {
this.view.getErrorValor().setText("Deben ser numeros");
this.view.getErrorValor().setVisible(true);
return false;
}
if (valor.length() > 10) {
this.view.getErrorValor().setText("El numero ingresado es demasiado largo");
this.view.getErrorValor().setVisible(true);
return false;
}
return true;
}
/** /**
* Valida la variable tipoEgreso contra los casos * Valida la variable tipoEgreso contra los casos
* - Es null * - Es null
@@ -399,7 +361,6 @@ public class EgresosController {
*/ */
private void hideErrorMessages() { private void hideErrorMessages() {
this.view.getErrorTipoEgreso().setVisible(false); this.view.getErrorTipoEgreso().setVisible(false);
this.view.getErrorValor().setVisible(false);
this.view.getErrorDescripcion().setVisible(false); this.view.getErrorDescripcion().setVisible(false);
this.view.getErrorNumero().setVisible(false); this.view.getErrorNumero().setVisible(false);
} }
@@ -410,6 +371,7 @@ public class EgresosController {
private void clearInputs() { private void clearInputs() {
this.view.getTipoCombo().setSelectedIndex(0); this.view.getTipoCombo().setSelectedIndex(0);
this.view.getNroField().setText(""); this.view.getNroField().setText("");
this.view.getValorField().setValue(0);
this.view.getValorField().setText(""); this.view.getValorField().setText("");
this.view.getDescripcionField().setText(""); this.view.getDescripcionField().setText("");
} }
@@ -418,7 +380,6 @@ public class EgresosController {
* Ejecuta trim sobre todos los campos de texto * Ejecuta trim sobre todos los campos de texto
*/ */
private void normalizeInputs(){ private void normalizeInputs(){
this.view.getValorField().setText(this.view.getValorField().getText().trim());
this.view.getNroField().setText(this.view.getNroField().getText().trim()); this.view.getNroField().setText(this.view.getNroField().getText().trim());
this.view.getDescripcionField().setText(this.view.getDescripcionField().getText().trim()); this.view.getDescripcionField().setText(this.view.getDescripcionField().getText().trim());

4
src/danielcortes/xyz/views/EgresosView.form
View File

@@ -69,7 +69,7 @@
</constraints> </constraints>
<properties/> <properties/>
</component> </component>
<component id="696ee" class="javax.swing.JTextField" binding="valorField"> <component id="228a2" class="danielcortes.xyz.views.components.NumberFormatedTextField" binding="valorField">
<constraints> <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="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"/> <preferred-size width="150" height="-1"/>
@@ -218,7 +218,7 @@
<text value="Total Egresos:"/> <text value="Total Egresos:"/>
</properties> </properties>
</component> </component>
<component id="2b8d0" class="javax.swing.JTextField" binding="totalEgresosField"> <component id="80b19" class="danielcortes.xyz.views.components.NumberFormatedTextField" binding="totalEgresosField">
<constraints> <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"> <grid row="0" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="6" anchor="8" fill="1" indent="0" use-parent-layout="false">
<preferred-size width="150" height="-1"/> <preferred-size width="150" height="-1"/>

13
src/danielcortes/xyz/views/EgresosView.java
View File

@@ -29,6 +29,7 @@ import com.intellij.uiDesigner.core.GridLayoutManager;
import com.intellij.uiDesigner.core.Spacer; import com.intellij.uiDesigner.core.Spacer;
import danielcortes.xyz.models.tipo_egreso.TipoEgreso; import danielcortes.xyz.models.tipo_egreso.TipoEgreso;
import danielcortes.xyz.views.components.EgresosTableModel; import danielcortes.xyz.views.components.EgresosTableModel;
import danielcortes.xyz.views.components.NumberFormatedTextField;
import javax.swing.*; import javax.swing.*;
import javax.swing.table.TableRowSorter; import javax.swing.table.TableRowSorter;
@@ -38,10 +39,10 @@ public class EgresosView {
public JPanel contentPanel; public JPanel contentPanel;
private JTable egresosTable; private JTable egresosTable;
private JButton guardarButton; private JButton guardarButton;
private JTextField valorField; private NumberFormatedTextField valorField;
private JTextField descripcionField; private JTextField descripcionField;
private JTextField nroField; private JTextField nroField;
private JTextField totalEgresosField; private NumberFormatedTextField totalEgresosField;
private JComboBox<TipoEgreso> tipoCombo; private JComboBox<TipoEgreso> tipoCombo;
@@ -83,7 +84,7 @@ public class EgresosView {
return editarButton; return editarButton;
} }
public JTextField getValorField() { public NumberFormatedTextField getValorField() {
return valorField; return valorField;
} }
@@ -95,7 +96,7 @@ public class EgresosView {
return nroField; return nroField;
} }
public JTextField getTotalEgresosField() { public NumberFormatedTextField getTotalEgresosField() {
return totalEgresosField; return totalEgresosField;
} }
@@ -165,7 +166,7 @@ public class EgresosView {
panel2.add(descripcionField, 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(descripcionField, 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));
nroField = new JTextField(); nroField = new JTextField();
panel2.add(nroField, 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)); panel2.add(nroField, 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));
valorField = new JTextField(); valorField = new NumberFormatedTextField();
panel2.add(valorField, 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(valorField, 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));
final JLabel label3 = new JLabel(); final JLabel label3 = new JLabel();
label3.setText("Valor"); label3.setText("Valor");
@@ -230,7 +231,7 @@ public class EgresosView {
final JLabel label5 = new JLabel(); final JLabel label5 = new JLabel();
label5.setText("Total Egresos:"); label5.setText("Total Egresos:");
panel5.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)); panel5.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));
totalEgresosField = new JTextField(); totalEgresosField = new NumberFormatedTextField();
totalEgresosField.setEditable(false); totalEgresosField.setEditable(false);
panel5.add(totalEgresosField, new GridConstraints(0, 1, 1, 1, GridConstraints.ANCHOR_WEST, GridConstraints.FILL_HORIZONTAL, GridConstraints.SIZEPOLICY_WANT_GROW, GridConstraints.SIZEPOLICY_FIXED, null, new Dimension(150, -1), null, 0, false)); panel5.add(totalEgresosField, new GridConstraints(0, 1, 1, 1, GridConstraints.ANCHOR_WEST, GridConstraints.FILL_HORIZONTAL, GridConstraints.SIZEPOLICY_WANT_GROW, GridConstraints.SIZEPOLICY_FIXED, null, new Dimension(150, -1), null, 0, false));
} }

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

@@ -115,16 +115,6 @@
<visible value="false"/> <visible value="false"/>
</properties> </properties>
</component> </component>
<component id="4b7ff" class="javax.swing.JLabel" binding="errorValor">
<constraints>
<grid row="2" column="0" 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="7d011" class="javax.swing.JLabel" binding="errorNroInicial"> <component id="7d011" class="javax.swing.JLabel" binding="errorNroInicial">
<constraints> <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="3" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>

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

@@ -201,11 +201,6 @@ public class IngresosView {
errorTipoIngreso.setText("Label"); errorTipoIngreso.setText("Label");
errorTipoIngreso.setVisible(false); errorTipoIngreso.setVisible(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)); 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");
errorValor.setVisible(false);
panel2.add(errorValor, new GridConstraints(2, 0, 1, 1, GridConstraints.ANCHOR_WEST, GridConstraints.FILL_NONE, GridConstraints.SIZEPOLICY_FIXED, GridConstraints.SIZEPOLICY_FIXED, null, null, null, 0, false));
errorNroInicial = new JLabel(); errorNroInicial = new JLabel();
errorNroInicial.setForeground(new Color(-65536)); errorNroInicial.setForeground(new Color(-65536));
errorNroInicial.setText("Label"); errorNroInicial.setText("Label");