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

Mas documentacion y cambiados la mayoria de los action listeners por keybindings

Browse Source
This commit is contained in:
Daniel Cortes
2019-01-03 00:25:54 -03:00
parent 070a12b54e
commit c5da56117c
9 changed files with 588 additions and 356 deletions
Download Patch File Download Diff File Expand all files Collapse all files

692
.idea/workspace.xml generated
View File

@@ -6,17 +6,20 @@
</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="430" mnemonic="0" /> <bookmark url="file://$PROJECT_DIR$/src/danielcortes/xyz/controllers/IngresosController.java" line="425" mnemonic="0" />
<bookmark url="file://$PROJECT_DIR$/src/danielcortes/xyz/controllers/ArqueoController.java" line="54" /> <bookmark url="file://$PROJECT_DIR$/src/danielcortes/xyz/controllers/ArqueoController.java" line="54" />
</component> </component>
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="a633d35a-56a6-4479-b4c4-f97198052fb7" name="Default Changelist" comment=""> <list default="true" id="a633d35a-56a6-4479-b4c4-f97198052fb7" name="Default Changelist" comment="">
<change afterPath="$PROJECT_DIR$/src/danielcortes/xyz/controllers/actions/NextAction.java" afterDir="false" />
<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$/database.sqlite" beforeDir="false" afterPath="$PROJECT_DIR$/database.sqlite" afterDir="false" /> <change beforePath="$PROJECT_DIR$/database.sqlite" beforeDir="false" afterPath="$PROJECT_DIR$/database.sqlite" 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/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/controllers/EgresosController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/danielcortes/xyz/controllers/EgresosController.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/danielcortes/xyz/controllers/IngresosController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/danielcortes/xyz/controllers/IngresosController.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/danielcortes/xyz/controllers/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/views/ManagerView.form" beforeDir="false" afterPath="$PROJECT_DIR$/src/danielcortes/xyz/views/ManagerView.form" 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" />
</list> </list>
<ignored path="$PROJECT_DIR$/target/" /> <ignored path="$PROJECT_DIR$/target/" />
<ignored path=".idea/" /> <ignored path=".idea/" />
@@ -72,90 +75,132 @@
<favorites_list name="caja" /> <favorites_list name="caja" />
</component> </component>
<component name="FileEditorManager"> <component name="FileEditorManager">
<leaf> <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
<file pinned="false" current-in-tab="true"> <file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/danielcortes/xyz/controllers/ManagerController.java"> <entry file="file://$PROJECT_DIR$/src/danielcortes/xyz/controllers/EgresosController.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="347"> <state relative-caret-position="324">
<caret line="196" column="4" selection-start-line="196" selection-start-column="4" selection-end-line="196" selection-end-column="4" /> <caret line="132" lean-forward="true" selection-start-line="132" selection-end-line="132" />
<folding> <folding>
<element signature="docComment;class#ManagerController#0" /> <element signature="docComment;class#EgresosController#0" />
<element signature="docComment;method#ManagerController#0;class#ManagerController#0" /> <element signature="docComment;method#EgresosController#0;class#EgresosController#0" />
<element signature="method#ManagerController#0;class#ManagerController#0" /> <element signature="method#EgresosController#0;class#EgresosController#0" />
<element signature="docComment;method#setUpDate#0;class#ManagerController#0" /> <element signature="docComment;method#getEgresoDAO#0;class#EgresosController#0" />
<element signature="method#setUpDate#0;class#ManagerController#0" /> <element signature="docComment;method#getTipoEgresoDAO#0;class#EgresosController#0" />
<element signature="docComment;method#setUpViewEvents#0;class#ManagerController#0" /> <element signature="docComment;method#updateCaja#0;class#EgresosController#0" />
<element signature="method#setUpViewEvents#0;class#ManagerController#0" /> <element signature="method#updateCaja#0;class#EgresosController#0" />
<element signature="e#4623#4784#0" /> <element signature="docComment;method#fillTipoEgresoCombo#0;class#EgresosController#0" />
<element signature="e#4843#5005#0" /> <element signature="method#fillTipoEgresoCombo#0;class#EgresosController#0" />
<element signature="e#5062#5274#0" /> <element signature="docComment;method#fillEgresosTable#0;class#EgresosController#0" />
<element signature="docComment;method#updateCaja#0;class#ManagerController#0" /> <element signature="method#fillEgresosTable#0;class#EgresosController#0" />
<element signature="method#updateCaja#0;class#ManagerController#0" /> <element signature="docComment;method#setUpViewEvents#0;class#EgresosController#0" />
<element signature="e#5546#5980#1" /> <element signature="docComment;method#guardarActionListener#0;class#EgresosController#0" />
<element signature="docComment;method#loadCardContents#0;class#ManagerController#0" /> <element signature="method#guardarActionListener#0;class#EgresosController#0" />
<element signature="method#loadCardContents#0;class#ManagerController#0" /> <element signature="docComment;method#eliminarActionListener#0;class#EgresosController#0" />
<element signature="docComment;method#loadIngresosView#0;class#ManagerController#0" /> <element signature="method#eliminarActionListener#0;class#EgresosController#0" />
<element signature="method#loadIngresosView#0;class#ManagerController#0" /> <element signature="docComment;method#editarActionListener#0;class#EgresosController#0" />
<element signature="docComment;method#loadEgresosView#0;class#ManagerController#0" /> <element signature="method#editarActionListener#0;class#EgresosController#0" />
<element signature="method#loadEgresosView#0;class#ManagerController#0" /> <element signature="docComment;method#updateTotalEgresos#0;class#EgresosController#0" />
<element signature="docComment;method#loadArqueoView#0;class#ManagerController#0" /> <element signature="method#updateTotalEgresos#0;class#EgresosController#0" />
<element signature="method#loadArqueoView#0;class#ManagerController#0" /> <element signature="docComment;method#updateButtonsEnabled#0;class#EgresosController#0" />
<element signature="docComment;method#pressInitialButton#0;class#ManagerController#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> </folding>
</state> </state>
</provider> </provider>
</entry> </entry>
</file> </file>
<file pinned="false" current-in-tab="false"> <file pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/src/danielcortes/xyz/controllers/IngresosController.java"> <entry file="file://$PROJECT_DIR$/src/danielcortes/xyz/controllers/ArqueoController.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="230"> <state relative-caret-position="-155">
<caret line="88" column="7" selection-start-line="88" selection-start-column="7" selection-end-line="88" selection-end-column="7" /> <caret line="197" column="35" lean-forward="true" selection-start-line="197" selection-start-column="35" selection-end-line="197" selection-end-column="35" />
<folding> <folding>
<element signature="docComment;method#IngresosController#0;class#IngresosController#0" /> <element signature="docComment;class#ArqueoController#0" />
<element signature="method#IngresosController#0;class#IngresosController#0" /> <element signature="docComment;method#ArqueoController#0;class#ArqueoController#0" />
<element signature="docComment;method#getIngresoDAO#0;class#IngresosController#0" /> <element signature="method#ArqueoController#0;class#ArqueoController#0" />
<element signature="docComment;method#getTipoIngresoDAO#0;class#IngresosController#0" /> <element signature="docComment;method#updateCaja#0;class#ArqueoController#0" />
<element signature="method#updateCaja#0;class#IngresosController#0" /> <element signature="method#updateCaja#0;class#ArqueoController#0" />
<element signature="docComment;method#fillTipoIngresoCombo#0;class#IngresosController#0" /> <element signature="docComment;method#updateResumen#0;class#ArqueoController#0" />
<element signature="method#fillTipoIngresoCombo#0;class#IngresosController#0" /> <element signature="docComment;method#fillEfectivo#0;class#ArqueoController#0" />
<element signature="docComment;method#fillIngresosTable#0;class#IngresosController#0" /> <element signature="method#fillEfectivo#0;class#ArqueoController#0" />
<element signature="method#fillIngresosTable#0;class#IngresosController#0" /> <element signature="docComment;method#fillDocumentos#0;class#ArqueoController#0" />
<element signature="docComment;method#setupViewEvents#0;class#IngresosController#0" /> <element signature="method#fillDocumentos#0;class#ArqueoController#0" />
<element signature="method#setupViewEvents#0;class#IngresosController#0" /> <element signature="docComment;method#fillResumen#0;class#ArqueoController#0" />
<element signature="docComment;method#guardarActionListener#0;class#IngresosController#0" /> <element signature="method#fillResumen#0;class#ArqueoController#0" />
<element signature="method#guardarActionListener#0;class#IngresosController#0" /> <element signature="docComment;method#updateResumenEfectivo#0;class#ArqueoController#0" />
<element signature="docComment;method#eliminarActionListener#0;class#IngresosController#0" /> <element signature="method#updateResumenEfectivo#0;class#ArqueoController#0" />
<element signature="method#eliminarActionListener#0;class#IngresosController#0" /> <element signature="docComment;method#updateResumenDocumentos#0;class#ArqueoController#0" />
<element signature="docComment;method#editarActionListener#0;class#IngresosController#0" /> <element signature="method#updateResumenDocumentos#0;class#ArqueoController#0" />
<element signature="method#editarActionListener#0;class#IngresosController#0" /> <element signature="docComment;method#updateResumenIngresos#0;class#ArqueoController#0" />
<element signature="docComment;method#updateTotalIngresos#0;class#IngresosController#0" /> <element signature="method#updateResumenIngresos#0;class#ArqueoController#0" />
<element signature="method#updateTotalIngresos#0;class#IngresosController#0" /> <element signature="docComment;method#updateResumenEgresos#0;class#ArqueoController#0" />
<element signature="docComment;method#updateButtonsEnabled#0;class#IngresosController#0" /> <element signature="method#updateResumenEgresos#0;class#ArqueoController#0" />
<element signature="method#updateButtonsEnabled#0;class#IngresosController#0" /> <element signature="docComment;method#updateResumenArqueo#0;class#ArqueoController#0" />
<element signature="docComment;method#guardarIngreso#0;class#IngresosController#0" /> <element signature="method#updateResumenArqueo#0;class#ArqueoController#0" />
<element signature="method#guardarIngreso#0;class#IngresosController#0" /> <element signature="e#7218#7303#1" />
<element signature="docComment;method#editarIngreso#0;class#IngresosController#0" /> <element signature="e#7307#7390#1" />
<element signature="method#editarIngreso#0;class#IngresosController#0" /> <element signature="docComment;method#setUpViewEvents#0;class#ArqueoController#0" />
<element signature="docComment;method#validateInput#0;class#IngresosController#0" /> <element signature="method#guardarEfectivoActionListener#0;class#ArqueoController#0" />
<element signature="method#validateInput#0;class#IngresosController#0" /> <element signature="method#guardarEfectivoActionListener#1;class#ArqueoController#0" />
<element signature="docComment;method#validateCaja#0;class#IngresosController#0" /> <element signature="docComment;method#guardarEfectivo#0;class#ArqueoController#0" />
<element signature="docComment;method#validateValor#0;class#IngresosController#0" /> <element signature="method#guardarEfectivo#0;class#ArqueoController#0" />
<element signature="method#validateValor#0;class#IngresosController#0" /> <element signature="e#11243#11962#1" />
<element signature="docComment;method#validateNroInicial#0;class#IngresosController#0" /> <element signature="docComment;method#guardarDocumentos#0;class#ArqueoController#0" />
<element signature="method#validateNroInicial#0;class#IngresosController#0" /> <element signature="method#guardarDocumentos#0;class#ArqueoController#0" />
<element signature="docComment;method#validateNroFinal#0;class#IngresosController#0" /> <element signature="e#12451#12742#1" />
<element signature="method#validateNroFinal#0;class#IngresosController#0" /> <element signature="docComment;method#validateEfectivoInput#0;class#ArqueoController#0" />
<element signature="docComment;method#validateTipoIngreso#0;class#IngresosController#0" /> <element signature="method#validateEfectivoInput#0;class#ArqueoController#0" />
<element signature="method#validateTipoIngreso#0;class#IngresosController#0" /> <element signature="docComment;method#validateDocumentosInput#0;class#ArqueoController#0" />
<element signature="docComment;method#hideErrorMessages#0;class#IngresosController#0" /> <element signature="method#validateDocumentosInput#0;class#ArqueoController#0" />
<element signature="method#hideErrorMessages#0;class#IngresosController#0" /> <element signature="docComment;method#validateEfectivoMoneda#0;class#ArqueoController#0" />
<element signature="docComment;method#clearInputs#0;class#IngresosController#0" /> <element signature="method#validateEfectivoMoneda#0;class#ArqueoController#0" />
<element signature="method#clearInputs#0;class#IngresosController#0" /> <element signature="e#15134#15278#1" />
<element signature="docComment;method#normalizeInputs#0;class#IngresosController#0" /> <element signature="e#15309#15442#1" />
<element signature="method#normalizeInputs#0;class#IngresosController#0" /> <element signature="e#15501#15632#1" />
<element signature="docComment;method#resetFocus#0;class#IngresosController#0" /> <element signature="e#15667#15819#1" />
<element signature="n#!!block;n#resetFocus#0;n#IngresosController#0" /> <element signature="docComment;method#validateDocumentosValor#0;class#ArqueoController#0" />
<element signature="method#validateDocumentosValor#0;class#ArqueoController#0" />
<element signature="e#16338#16482#1" />
<element signature="e#16513#16646#1" />
<element signature="e#16705#16836#1" />
<element signature="e#16871#17023#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#GuardarAction#0;class#ArqueoController#0" />
<element signature="n#!!block;n#GuardarAction#0;n#GuardarAction#0;n#ArqueoController#0" />
<element signature="class#GuardarEfectivoAction#1;class#ArqueoController#0" />
<element signature="n#!!block;n#GuardarEfectivoAction#0;n#GuardarEfectivoAction#1;n#ArqueoController#0" />
</folding> </folding>
</state> </state>
</provider> </provider>
@@ -203,6 +248,7 @@
<find>DAO</find> <find>DAO</find>
<find>mysql</find> <find>mysql</find>
<find>updateB</find> <find>updateB</find>
<find>inputmap</find>
</findStrings> </findStrings>
<replaceStrings> <replaceStrings>
<replace>2018 Daniel Cortes</replace> <replace>2018 Daniel Cortes</replace>
@@ -222,8 +268,6 @@
<component name="IdeDocumentHistory"> <component name="IdeDocumentHistory">
<option name="CHANGED_PATHS"> <option name="CHANGED_PATHS">
<list> <list>
<option value="$PROJECT_DIR$/src/main/java/danielcortes/xyz/views/IngresosView.form" />
<option value="$PROJECT_DIR$/src/main/java/danielcortes/xyz/views/IngresosView.java" />
<option value="$PROJECT_DIR$/src/main/java/danielcortes/xyz/controllers/IngresosController.java" /> <option value="$PROJECT_DIR$/src/main/java/danielcortes/xyz/controllers/IngresosController.java" />
<option value="$PROJECT_DIR$/src/main/java/danielcortes/xyz/views/components/IngresosTableModel.java" /> <option value="$PROJECT_DIR$/src/main/java/danielcortes/xyz/views/components/IngresosTableModel.java" />
<option value="$PROJECT_DIR$/src/main/java/danielcortes/xyz/views/ArqueoView.java" /> <option value="$PROJECT_DIR$/src/main/java/danielcortes/xyz/views/ArqueoView.java" />
@@ -264,15 +308,17 @@
<option value="$PROJECT_DIR$/src/main/java/danielcortes/xyz/models/tipo_ingreso/TipoIngresoDAO.java" /> <option value="$PROJECT_DIR$/src/main/java/danielcortes/xyz/models/tipo_ingreso/TipoIngresoDAO.java" />
<option value="$PROJECT_DIR$/src/main/java/danielcortes/xyz/models/tipo_ingreso/MysqlTipoIngresoDAO.java" /> <option value="$PROJECT_DIR$/src/main/java/danielcortes/xyz/models/tipo_ingreso/MysqlTipoIngresoDAO.java" />
<option value="$PROJECT_DIR$/.gitignore" /> <option value="$PROJECT_DIR$/.gitignore" />
<option value="$PROJECT_DIR$/src/danielcortes/xyz/Main.java" />
<option value="$PROJECT_DIR$/src/danielcortes/xyz/views/EgresosView.java" /> <option value="$PROJECT_DIR$/src/danielcortes/xyz/views/EgresosView.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/IngresosView.java" /> <option value="$PROJECT_DIR$/src/danielcortes/xyz/views/IngresosView.java" />
<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/controllers/ManagerController.java" />
<option value="$PROJECT_DIR$/src/danielcortes/xyz/Main.java" />
<option value="$PROJECT_DIR$/src/danielcortes/xyz/controllers/IngresosController.java" />
<option value="$PROJECT_DIR$/src/danielcortes/xyz/controllers/AbstractController.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/EgresosController.java" />
<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/controllers/IngresosController.java" />
<option value="$PROJECT_DIR$/src/danielcortes/xyz/controllers/ManagerController.java" />
</list> </list>
</option> </option>
</component> </component>
@@ -327,7 +373,6 @@
<foldersAlwaysOnTop value="true" /> <foldersAlwaysOnTop value="true" />
</navigator> </navigator>
<panes> <panes>
<pane id="PackagesPane" />
<pane id="Scope" /> <pane id="Scope" />
<pane id="ProjectPane"> <pane id="ProjectPane">
<subPane> <subPane>
@@ -354,10 +399,19 @@
<item name="xyz" type="462c0819:PsiDirectoryNode" /> <item name="xyz" type="462c0819:PsiDirectoryNode" />
<item name="controllers" type="462c0819:PsiDirectoryNode" /> <item name="controllers" 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="controllers" type="462c0819:PsiDirectoryNode" />
<item name="actions" type="462c0819:PsiDirectoryNode" />
</path>
</expand> </expand>
<select /> <select />
</subPane> </subPane>
</pane> </pane>
<pane id="PackagesPane" />
</panes> </panes>
</component> </component>
<component name="PropertiesComponent"> <component name="PropertiesComponent">
@@ -371,7 +425,7 @@
<property name="UI_DESIGNER_EDITOR_MODE.UIDesignerToolWindowManager.STATE" value="ToolWindow" /> <property name="UI_DESIGNER_EDITOR_MODE.UIDesignerToolWindowManager.STATE" value="ToolWindow" />
<property name="WebServerToolWindowFactoryState" value="false" /> <property name="WebServerToolWindowFactoryState" value="false" />
<property name="aspect.path.notification.shown" value="true" /> <property name="aspect.path.notification.shown" value="true" />
<property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1546223434576" /> <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1546407672821" />
<property name="com.intellij.ide.scratch.LRUPopupBuilder$1/Change SQL Dialect" value="SQLite" /> <property name="com.intellij.ide.scratch.LRUPopupBuilder$1/Change SQL Dialect" value="SQLite" />
<property name="database.console.LAST_STATE" value="false" /> <property name="database.console.LAST_STATE" value="false" />
<property name="extract.method.default.visibility" value="private" /> <property name="extract.method.default.visibility" value="private" />
@@ -539,7 +593,13 @@
<workItem from="1546115694757" duration="3182000" /> <workItem from="1546115694757" duration="3182000" />
<workItem from="1546202000368" duration="9415000" /> <workItem from="1546202000368" duration="9415000" />
<workItem from="1546301923564" duration="529000" /> <workItem from="1546301923564" duration="529000" />
<workItem from="1546302513182" duration="700000" /> <workItem from="1546302513182" duration="1465000" />
<workItem from="1546400071198" duration="4830000" />
<workItem from="1546407266578" duration="201000" />
<workItem from="1546408047784" duration="2341000" />
<workItem from="1546412576852" duration="574000" />
<workItem from="1546481590691" duration="518000" />
<workItem from="1546482678909" duration="3047000" />
</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>
@@ -702,11 +762,18 @@
<option name="project" value="LOCAL" /> <option name="project" value="LOCAL" />
<updated>1546215759307</updated> <updated>1546215759307</updated>
</task> </task>
<option name="localTasksCounter" value="24" /> <task id="LOCAL-00024" summary="Mas documentacion!! &#10;Bendita documentacion &lt;3">
<created>1546303228134</created>
<option name="number" value="00024" />
<option name="presentableId" value="LOCAL-00024" />
<option name="project" value="LOCAL" />
<updated>1546303228134</updated>
</task>
<option name="localTasksCounter" value="25" />
<servers /> <servers />
</component> </component>
<component name="TimeTrackingManager"> <component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="183192000" /> <option name="totallyTimeSpent" value="195498000" />
</component> </component>
<component name="TodoView"> <component name="TodoView">
<todo-panel id="selected-file"> <todo-panel id="selected-file">
@@ -721,7 +788,7 @@
<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" /> <editor active="true" />
<layout> <layout>
<window_info active="true" content_ui="combo" id="Project" order="0" sideWeight="0.49438202" visible="true" weight="0.18112633" /> <window_info content_ui="combo" id="Project" order="0" sideWeight="0.49438202" visible="true" weight="0.20471841" />
<window_info id="Image Layers" order="1" /> <window_info id="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" />
@@ -751,7 +818,7 @@
<window_info anchor="right" id="Palette&#9;" order="7" /> <window_info anchor="right" id="Palette&#9;" order="7" />
<window_info anchor="right" id="Database" order="8" weight="0.32648402" /> <window_info anchor="right" id="Database" order="8" weight="0.32648402" />
<window_info anchor="right" id="Version Control" order="9" weight="0.7435312" /> <window_info anchor="right" id="Version Control" order="9" weight="0.7435312" />
<window_info anchor="right" id="Structure" order="10" show_stripe_button="false" sideWeight="0.5008026" weight="0.2283105" /> <window_info anchor="right" id="Structure" order="10" sideWeight="0.5008026" weight="0.2283105" />
</layout> </layout>
</component> </component>
<component name="TypeScriptGeneratedFilesManager"> <component name="TypeScriptGeneratedFilesManager">
@@ -831,54 +898,14 @@
<MESSAGE value="Creando documentacion basica" /> <MESSAGE value="Creando documentacion basica" />
<MESSAGE value="Documentado el controlador de egresos" /> <MESSAGE value="Documentado el controlador de egresos" />
<MESSAGE value="Documentado el controlador de ingresos" /> <MESSAGE value="Documentado el controlador de ingresos" />
<option name="LAST_COMMIT_MESSAGE" value="Documentado el controlador de ingresos" /> <MESSAGE value="Mas documentacion!! &#10;Bendita documentacion &lt;3" />
<option name="LAST_COMMIT_MESSAGE" value="Mas documentacion!! &#10;Bendita documentacion &lt;3" />
</component> </component>
<component name="antWorkspaceConfiguration"> <component name="antWorkspaceConfiguration">
<option name="IS_AUTOSCROLL_TO_SOURCE" value="false" /> <option name="IS_AUTOSCROLL_TO_SOURCE" value="false" />
<option name="FILTER_TARGETS" value="false" /> <option name="FILTER_TARGETS" value="false" />
</component> </component>
<component name="editorHistoryManager"> <component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/src/main/java/danielcortes/xyz/data/ConnectionHolder.java" />
<entry file="file://$PROJECT_DIR$/database/mysql.sql">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1127">
<caret line="71" column="52" selection-end-line="119" />
<folding>
<element signature="e#0#1097#0" />
</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>
<caret column="25" selection-start-column="25" selection-end-column="25" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/danielcortes/xyz/controllers/EgresosController.java" />
<entry file="file://$PROJECT_DIR$/src/main/java/danielcortes/xyz/controllers/IngresosController.java" />
<entry file="file://$PROJECT_DIR$/src/main/java/danielcortes/xyz/controllers/ArqueoController.java" />
<entry file="file://$PROJECT_DIR$/src/main/java/danielcortes/xyz/models/caja/CajaOperations.java" />
<entry file="das://6e2ee496-6ca2-4cc4-a2b0-4f122e6bfd50/schema/main/table/sqlite_master">
<provider selected="true" editor-type-id="com.intellij.database.editor.DatabaseTableFileEditorProvider">
<state>
<filtering enabled="true" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/database/sqlite.sql">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-1261">
<caret line="47" column="37" lean-forward="true" selection-start-line="47" selection-start-column="37" selection-end-line="47" selection-end-column="37" />
<folding>
<element signature="e#0#1097#0" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/danielcortes/xyz/controllers/ManagerController.java" />
<entry file="file://$PROJECT_DIR$/pom.xml" />
<entry file="file://$PROJECT_DIR$/src/main/java/danielcortes/xyz/Main.java" /> <entry file="file://$PROJECT_DIR$/src/main/java/danielcortes/xyz/Main.java" />
<entry file="file://$PROJECT_DIR$/src/main/java/danielcortes/xyz/data/SQLiteConnectionHolder.java" /> <entry file="file://$PROJECT_DIR$/src/main/java/danielcortes/xyz/data/SQLiteConnectionHolder.java" />
<entry file="uml://JAVA/danielcortes.xyz"> <entry file="uml://JAVA/danielcortes.xyz">
@@ -993,81 +1020,6 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/danielcortes/xyz/views/ArqueoView.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="184">
<caret line="25" selection-start-line="25" selection-end-line="25" />
<folding>
<element signature="e#0#5063#0" expanded="true" />
<element signature="imports" expanded="true" />
<element signature="e#2617#2618#0" expanded="true" />
<element signature="e#2652#2653#0" expanded="true" />
<element signature="e#2697#2698#0" expanded="true" />
<element signature="e#2734#2735#0" expanded="true" />
<element signature="e#2777#2778#0" expanded="true" />
<element signature="e#2812#2813#0" expanded="true" />
<element signature="e#2856#2857#0" expanded="true" />
<element signature="e#2892#2893#0" expanded="true" />
<element signature="e#2934#2935#0" expanded="true" />
<element signature="e#2968#2969#0" expanded="true" />
<element signature="e#3007#3008#0" expanded="true" />
<element signature="e#3038#3039#0" expanded="true" />
<element signature="e#3084#3085#0" expanded="true" />
<element signature="e#3122#3123#0" expanded="true" />
<element signature="e#3162#3163#0" expanded="true" />
<element signature="e#3194#3195#0" expanded="true" />
<element signature="e#3239#3240#0" expanded="true" />
<element signature="e#3276#3277#0" expanded="true" />
<element signature="e#3316#3317#0" expanded="true" />
<element signature="e#3348#3349#0" expanded="true" />
<element signature="e#3391#3392#0" expanded="true" />
<element signature="e#3426#3427#0" expanded="true" />
<element signature="e#3470#3471#0" expanded="true" />
<element signature="e#3506#3507#0" expanded="true" />
<element signature="e#3550#3551#0" expanded="true" />
<element signature="e#3586#3587#0" expanded="true" />
<element signature="e#3632#3633#0" expanded="true" />
<element signature="e#3670#3671#0" expanded="true" />
<element signature="e#3713#3714#0" expanded="true" />
<element signature="e#3748#3749#0" expanded="true" />
<element signature="e#3792#3793#0" expanded="true" />
<element signature="e#3828#3829#0" expanded="true" />
<element signature="e#3870#3871#0" expanded="true" />
<element signature="e#3904#3905#0" expanded="true" />
<element signature="e#3947#3948#0" expanded="true" />
<element signature="e#3982#3983#0" expanded="true" />
<element signature="e#4024#4025#0" expanded="true" />
<element signature="e#4058#4059#0" expanded="true" />
<element signature="e#4107#4108#0" expanded="true" />
<element signature="e#4151#4152#0" expanded="true" />
<element signature="e#4202#4203#0" expanded="true" />
<element signature="e#4248#4249#0" expanded="true" />
<element signature="e#4289#4290#0" expanded="true" />
<element signature="e#4326#4327#0" expanded="true" />
<element signature="e#4365#4366#0" expanded="true" />
<element signature="e#4400#4401#0" expanded="true" />
<element signature="e#4440#4441#0" expanded="true" />
<element signature="e#4476#4477#0" expanded="true" />
<element signature="e#4514#4515#0" expanded="true" />
<element signature="e#4548#4549#0" expanded="true" />
<element signature="e#4583#4584#0" expanded="true" />
<element signature="e#4614#4615#0" expanded="true" />
<element signature="e#4656#4657#0" expanded="true" />
<element signature="e#4694#4695#0" expanded="true" />
<element signature="e#4730#4731#0" expanded="true" />
<element signature="e#4762#4763#0" expanded="true" />
<element signature="e#4803#4804#0" expanded="true" />
<element signature="e#4840#4841#0" expanded="true" />
<element signature="e#4876#4877#0" expanded="true" />
<element signature="e#4908#4909#0" expanded="true" />
<element signature="e#4947#4948#0" expanded="true" />
<element signature="e#4982#4983#0" expanded="true" />
<element signature="e#5022#5023#0" expanded="true" />
<element signature="e#5058#5059#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/danielcortes/xyz/views/ManagerView.java"> <entry file="file://$PROJECT_DIR$/src/danielcortes/xyz/views/ManagerView.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="92"> <state relative-caret-position="92">
@@ -1085,13 +1037,6 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/danielcortes/xyz/Main.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-92">
<caret line="60" column="13" lean-forward="true" selection-start-line="60" selection-start-column="13" selection-end-line="60" selection-end-column="13" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/danielcortes/xyz/models/caja/Caja.java"> <entry file="file://$PROJECT_DIR$/src/danielcortes/xyz/models/caja/Caja.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="138"> <state relative-caret-position="138">
@@ -1106,11 +1051,214 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/danielcortes/xyz/data/MysqlConnectionHolder.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="138">
<caret line="28" column="13" selection-start-line="28" selection-start-column="13" selection-end-line="28" selection-end-column="13" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/danielcortes/xyz/data/ConnectionHolder.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="138">
<caret line="28" column="17" selection-start-line="28" selection-start-column="17" selection-end-line="28" selection-end-column="17" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/danielcortes/xyz/data/SQLiteConnectionHolder.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="138">
<caret line="29" column="13" selection-start-line="29" selection-start-column="13" selection-end-line="29" selection-end-column="13" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/danielcortes/xyz/data/Properties.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="138">
<caret line="29" column="13" selection-start-line="29" selection-start-column="13" selection-end-line="29" selection-end-column="13" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/danielcortes/xyz/Main.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="391">
<caret line="101" column="8" selection-start-line="101" selection-start-column="8" selection-end-line="101" selection-end-column="8" />
</state>
</provider>
</entry>
<entry file="jar:///usr/lib/jvm/java-11-openjdk/lib/src.zip!/java.desktop/javax/swing/AbstractAction.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-6132">
<caret line="64" column="7" lean-forward="true" selection-start-line="64" selection-start-column="7" selection-end-line="64" selection-end-column="7" />
</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="163">
<caret line="429" column="5" selection-start-line="429" selection-start-column="5" selection-end-line="429" selection-end-column="5" />
<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#3553#3601#1" />
<element signature="docComment;method#fillIngresosTable#0;class#IngresosController#0" />
<element signature="method#fillIngresosTable#0;class#IngresosController#0" />
<element signature="e#3941#4000#1" />
<element signature="docComment;method#setupViewEvents#0;class#IngresosController#0" />
<element signature="e#5786#5873#1" />
<element signature="docComment;method#guardarActionListener#0;class#IngresosController#0" />
<element signature="e#6649#6745#1" />
<element signature="e#6751#6848#1" />
<element signature="docComment;method#eliminarActionListener#0;class#IngresosController#0" />
<element signature="method#eliminarActionListener#0;class#IngresosController#0" />
<element signature="e#7318#7619#1" />
<element signature="docComment;method#editarActionListener#0;class#IngresosController#0" />
<element signature="method#editarActionListener#0;class#IngresosController#0" />
<element signature="e#8136#8699#1" />
<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#9303#9432#1" />
<element signature="e#9436#9567#1" />
<element signature="docComment;method#guardarIngreso#0;class#IngresosController#0" />
<element signature="method#guardarIngreso#0;class#IngresosController#0" />
<element signature="e#9970#10443#1" />
<element signature="docComment;method#editarIngreso#0;class#IngresosController#0" />
<element signature="method#editarIngreso#0;class#IngresosController#0" />
<element signature="e#10882#11399#1" />
<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#12865#13039#1" />
<element signature="e#13070#13233#1" />
<element signature="e#13292#13453#1" />
<element signature="e#13486#13668#1" />
<element signature="docComment;method#validateNroInicial#0;class#IngresosController#0" />
<element signature="method#validateNroInicial#0;class#IngresosController#0" />
<element signature="e#14109#14293#1" />
<element signature="e#14329#14502#1" />
<element signature="docComment;method#validateNroFinal#0;class#IngresosController#0" />
<element signature="method#validateNroFinal#0;class#IngresosController#0" />
<element signature="e#14933#15113#1" />
<element signature="e#15147#15316#1" />
<element signature="docComment;method#validateTipoIngreso#0;class#IngresosController#0" />
<element signature="method#validateTipoIngreso#0;class#IngresosController#0" />
<element signature="e#15682#15868#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="e#17047#17048#0" expanded="true" />
<element signature="e#17102#17103#0" expanded="true" />
<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/AbstractController.java" />
<entry file="file://$PROJECT_DIR$/src/danielcortes/xyz/controllers/ManagerController.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="374">
<caret line="196" column="4" selection-start-line="196" selection-start-column="4" selection-end-line="196" selection-end-column="4" />
<folding>
<element signature="docComment;class#ManagerController#0" />
<element signature="docComment;method#ManagerController#0;class#ManagerController#0" />
<element signature="method#ManagerController#0;class#ManagerController#0" />
<element signature="docComment;method#setUpDate#0;class#ManagerController#0" />
<element signature="method#setUpDate#0;class#ManagerController#0" />
<element signature="docComment;method#setUpViewEvents#0;class#ManagerController#0" />
<element signature="method#setUpViewEvents#0;class#ManagerController#0" />
<element signature="e#4623#4784#0" />
<element signature="e#4843#5005#0" />
<element signature="e#5062#5274#0" />
<element signature="docComment;method#updateCaja#0;class#ManagerController#0" />
<element signature="method#updateCaja#0;class#ManagerController#0" />
<element signature="docComment;method#loadCardContents#0;class#ManagerController#0" />
<element signature="method#loadCardContents#0;class#ManagerController#0" />
<element signature="docComment;method#loadIngresosView#0;class#ManagerController#0" />
<element signature="method#loadIngresosView#0;class#ManagerController#0" />
<element signature="docComment;method#loadEgresosView#0;class#ManagerController#0" />
<element signature="method#loadEgresosView#0;class#ManagerController#0" />
<element signature="docComment;method#loadArqueoView#0;class#ManagerController#0" />
<element signature="method#loadArqueoView#0;class#ManagerController#0" />
<element signature="docComment;method#pressInitialButton#0;class#ManagerController#0" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/danielcortes/xyz/controllers/actions/NextAction.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="161">
<caret line="30" column="28" lean-forward="true" selection-start-line="30" selection-start-column="28" selection-end-line="30" selection-end-column="28" />
<folding>
<element signature="n#!!block;n#NextAction#0;n#NextAction#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="193">
<caret line="73" column="19" selection-start-line="73" selection-start-column="19" selection-end-line="73" selection-end-column="19" />
<folding>
<element signature="imports" expanded="true" />
<element signature="e#2698#2699#0" expanded="true" />
<element signature="e#2735#2736#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="jar:///usr/lib/jvm/java-11-openjdk/lib/src.zip!/java.desktop/java/beans/BeanProperty.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="483">
<caret line="49" column="18" selection-start-line="49" selection-start-column="18" selection-end-line="49" selection-end-column="18" />
</state>
</provider>
</entry>
<entry file="jar:///usr/lib/jvm/java-11-openjdk/lib/src.zip!/java.desktop/java/awt/event/ActionListener.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="236">
<caret line="44" column="17" selection-start-line="44" selection-start-column="17" selection-end-line="44" selection-end-column="17" />
</state>
</provider>
</entry>
<entry file="jar:///usr/lib/jvm/java-11-openjdk/lib/src.zip!/java.desktop/javax/swing/JTextField.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="161">
<caret line="162" column="42" selection-start-line="162" selection-start-column="42" selection-end-line="162" selection-end-column="42" />
</state>
</provider>
</entry>
<entry file="jar:///usr/lib/jvm/java-11-openjdk/lib/src.zip!/java.desktop/javax/swing/text/JTextComponent.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="105">
<caret line="4327" column="47" selection-start-line="4327" selection-start-column="39" selection-end-line="4327" selection-end-column="47" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/danielcortes/xyz/controllers/EgresosController.java"> <entry file="file://$PROJECT_DIR$/src/danielcortes/xyz/controllers/EgresosController.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="115"> <state relative-caret-position="324">
<caret line="39" lean-forward="true" selection-start-line="39" selection-end-line="43" selection-end-column="3" /> <caret line="132" lean-forward="true" selection-start-line="132" selection-end-line="132" />
<folding> <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="method#EgresosController#0;class#EgresosController#0" />
<element signature="docComment;method#getEgresoDAO#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#getTipoEgresoDAO#0;class#EgresosController#0" />
@@ -1121,7 +1269,6 @@
<element signature="docComment;method#fillEgresosTable#0;class#EgresosController#0" /> <element signature="docComment;method#fillEgresosTable#0;class#EgresosController#0" />
<element signature="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="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="docComment;method#guardarActionListener#0;class#EgresosController#0" />
<element signature="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="docComment;method#eliminarActionListener#0;class#EgresosController#0" />
@@ -1138,6 +1285,7 @@
<element signature="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="docComment;method#validateInput#0;class#EgresosController#0" />
<element signature="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="method#validateNro#0;class#EgresosController#0" />
<element signature="docComment;method#validateDescripcion#0;class#EgresosController#0" /> <element signature="docComment;method#validateDescripcion#0;class#EgresosController#0" />
<element signature="method#validateDescripcion#0;class#EgresosController#0" /> <element signature="method#validateDescripcion#0;class#EgresosController#0" />
@@ -1147,21 +1295,26 @@
<element signature="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="docComment;method#validateCaja#0;class#EgresosController#0" />
<element signature="n#!!block;n#validateCaja#0;n#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="method#hideErrorMessages#0;class#EgresosController#0" />
<element signature="docComment;method#clearInputs#0;class#EgresosController#0" /> <element signature="docComment;method#clearInputs#0;class#EgresosController#0" />
<element signature="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="docComment;method#normalizeInputs#0;class#EgresosController#0" />
<element signature="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="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> </folding>
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/danielcortes/xyz/controllers/ArqueoController.java"> <entry file="file://$PROJECT_DIR$/src/danielcortes/xyz/controllers/ArqueoController.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="147"> <state relative-caret-position="-155">
<caret line="40" column="55" selection-start-line="40" selection-start-column="55" selection-end-line="40" selection-end-column="55" /> <caret line="197" column="35" lean-forward="true" selection-start-line="197" selection-start-column="35" selection-end-line="197" selection-end-column="35" />
<folding> <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="method#ArqueoController#0;class#ArqueoController#0" />
<element signature="docComment;method#updateCaja#0;class#ArqueoController#0" /> <element signature="docComment;method#updateCaja#0;class#ArqueoController#0" />
<element signature="method#updateCaja#0;class#ArqueoController#0" /> <element signature="method#updateCaja#0;class#ArqueoController#0" />
@@ -1182,20 +1335,33 @@
<element signature="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="docComment;method#updateResumenArqueo#0;class#ArqueoController#0" />
<element signature="method#updateResumenArqueo#0;class#ArqueoController#0" /> <element signature="method#updateResumenArqueo#0;class#ArqueoController#0" />
<element signature="e#7218#7303#1" />
<element signature="e#7307#7390#1" />
<element signature="docComment;method#setUpViewEvents#0;class#ArqueoController#0" /> <element signature="docComment;method#setUpViewEvents#0;class#ArqueoController#0" />
<element signature="method#setUpViewEvents#0;class#ArqueoController#0" /> <element signature="method#guardarEfectivoActionListener#0;class#ArqueoController#0" />
<element signature="method#guardarEfectivoActionListener#1;class#ArqueoController#0" />
<element signature="docComment;method#guardarEfectivo#0;class#ArqueoController#0" /> <element signature="docComment;method#guardarEfectivo#0;class#ArqueoController#0" />
<element signature="method#guardarEfectivo#0;class#ArqueoController#0" /> <element signature="method#guardarEfectivo#0;class#ArqueoController#0" />
<element signature="e#11243#11962#1" />
<element signature="docComment;method#guardarDocumentos#0;class#ArqueoController#0" /> <element signature="docComment;method#guardarDocumentos#0;class#ArqueoController#0" />
<element signature="method#guardarDocumentos#0;class#ArqueoController#0" /> <element signature="method#guardarDocumentos#0;class#ArqueoController#0" />
<element signature="e#12451#12742#1" />
<element signature="docComment;method#validateEfectivoInput#0;class#ArqueoController#0" /> <element signature="docComment;method#validateEfectivoInput#0;class#ArqueoController#0" />
<element signature="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="docComment;method#validateDocumentosInput#0;class#ArqueoController#0" />
<element signature="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="docComment;method#validateEfectivoMoneda#0;class#ArqueoController#0" />
<element signature="method#validateEfectivoMoneda#0;class#ArqueoController#0" /> <element signature="method#validateEfectivoMoneda#0;class#ArqueoController#0" />
<element signature="e#15134#15278#1" />
<element signature="e#15309#15442#1" />
<element signature="e#15501#15632#1" />
<element signature="e#15667#15819#1" />
<element signature="docComment;method#validateDocumentosValor#0;class#ArqueoController#0" /> <element signature="docComment;method#validateDocumentosValor#0;class#ArqueoController#0" />
<element signature="method#validateDocumentosValor#0;class#ArqueoController#0" /> <element signature="method#validateDocumentosValor#0;class#ArqueoController#0" />
<element signature="e#16338#16482#1" />
<element signature="e#16513#16646#1" />
<element signature="e#16705#16836#1" />
<element signature="e#16871#17023#1" />
<element signature="docComment;method#hiddeEfectivoErrorMessages#0;class#ArqueoController#0" /> <element signature="docComment;method#hiddeEfectivoErrorMessages#0;class#ArqueoController#0" />
<element signature="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="docComment;method#hiddeDocumentosErrorMessages#0;class#ArqueoController#0" />
@@ -1204,90 +1370,10 @@
<element signature="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="docComment;method#normalizeDocumentosInput#0;class#ArqueoController#0" />
<element signature="method#normalizeDocumentosInput#0;class#ArqueoController#0" /> <element signature="method#normalizeDocumentosInput#0;class#ArqueoController#0" />
</folding> <element signature="class#GuardarAction#0;class#ArqueoController#0" />
</state> <element signature="n#!!block;n#GuardarAction#0;n#GuardarAction#0;n#ArqueoController#0" />
</provider> <element signature="class#GuardarEfectivoAction#1;class#ArqueoController#0" />
</entry> <element signature="n#!!block;n#GuardarEfectivoAction#0;n#GuardarEfectivoAction#1;n#ArqueoController#0" />
<entry file="file://$PROJECT_DIR$/src/danielcortes/xyz/controllers/IngresosController.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="230">
<caret line="88" column="7" selection-start-line="88" selection-start-column="7" selection-end-line="88" selection-end-column="7" />
<folding>
<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="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="method#setupViewEvents#0;class#IngresosController#0" />
<element signature="docComment;method#guardarActionListener#0;class#IngresosController#0" />
<element signature="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="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="n#!!block;n#resetFocus#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="347">
<caret line="196" column="4" selection-start-line="196" selection-start-column="4" selection-end-line="196" selection-end-column="4" />
<folding>
<element signature="docComment;class#ManagerController#0" />
<element signature="docComment;method#ManagerController#0;class#ManagerController#0" />
<element signature="method#ManagerController#0;class#ManagerController#0" />
<element signature="docComment;method#setUpDate#0;class#ManagerController#0" />
<element signature="method#setUpDate#0;class#ManagerController#0" />
<element signature="docComment;method#setUpViewEvents#0;class#ManagerController#0" />
<element signature="method#setUpViewEvents#0;class#ManagerController#0" />
<element signature="e#4623#4784#0" />
<element signature="e#4843#5005#0" />
<element signature="e#5062#5274#0" />
<element signature="docComment;method#updateCaja#0;class#ManagerController#0" />
<element signature="method#updateCaja#0;class#ManagerController#0" />
<element signature="e#5546#5980#1" />
<element signature="docComment;method#loadCardContents#0;class#ManagerController#0" />
<element signature="method#loadCardContents#0;class#ManagerController#0" />
<element signature="docComment;method#loadIngresosView#0;class#ManagerController#0" />
<element signature="method#loadIngresosView#0;class#ManagerController#0" />
<element signature="docComment;method#loadEgresosView#0;class#ManagerController#0" />
<element signature="method#loadEgresosView#0;class#ManagerController#0" />
<element signature="docComment;method#loadArqueoView#0;class#ManagerController#0" />
<element signature="method#loadArqueoView#0;class#ManagerController#0" />
<element signature="docComment;method#pressInitialButton#0;class#ManagerController#0" />
</folding> </folding>
</state> </state>
</provider> </provider>

BIN
database.sqlite
View File

Binary file not shown.

1
src/danielcortes/xyz/Main.java
View File

@@ -99,6 +99,7 @@ public class Main {
JFrame frame = new JFrame("Caja"); JFrame frame = new JFrame("Caja");
frame.setContentPane(view.getContentPanel()); frame.setContentPane(view.getContentPanel());
frame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE); frame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
//frame.setSize(780, 450); //frame.setSize(780, 450);
frame.pack(); frame.pack();
frame.setLocationRelativeTo(null); frame.setLocationRelativeTo(null);

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

@@ -24,6 +24,7 @@
package danielcortes.xyz.controllers; package danielcortes.xyz.controllers;
import danielcortes.xyz.controllers.actions.NextAction;
import danielcortes.xyz.models.caja.Caja; import danielcortes.xyz.models.caja.Caja;
import danielcortes.xyz.models.documentos.Documentos; import danielcortes.xyz.models.documentos.Documentos;
import danielcortes.xyz.models.documentos.DocumentosDAO; import danielcortes.xyz.models.documentos.DocumentosDAO;
@@ -35,6 +36,7 @@ import danielcortes.xyz.views.ArqueoView;
import javax.swing.*; import javax.swing.*;
import java.awt.*; import java.awt.*;
import java.awt.event.ActionEvent;
/** /**
* Controlador destinado a la vista ArqueoView * Controlador destinado a la vista ArqueoView
@@ -191,19 +193,58 @@ public class ArqueoController {
} }
/** /**
* Setea los eventos de los botones de guardar * Setea los eventos de los fields de la vista
*/ */
private void setUpViewEvents() { private void setUpViewEvents() {
this.view.getGuardarEfectivoButton().addActionListener(e -> { this.view.getVeinteMilField().getInputMap(JComponent.WHEN_FOCUSED).put(KeyStroke.getKeyStroke("ENTER"),"nextField");
this.view.getDiezMilField().getInputMap(JComponent.WHEN_FOCUSED).put(KeyStroke.getKeyStroke("ENTER"),"nextField");
this.view.getCincoMilField().getInputMap(JComponent.WHEN_FOCUSED).put(KeyStroke.getKeyStroke("ENTER"),"nextField");
this.view.getDosMilField().getInputMap(JComponent.WHEN_FOCUSED).put(KeyStroke.getKeyStroke("ENTER"),"nextField");
this.view.getMilField().getInputMap(JComponent.WHEN_FOCUSED).put(KeyStroke.getKeyStroke("ENTER"),"nextField");
this.view.getQuinientosField().getInputMap(JComponent.WHEN_FOCUSED).put(KeyStroke.getKeyStroke("ENTER"),"nextField");
this.view.getCienField().getInputMap(JComponent.WHEN_FOCUSED).put(KeyStroke.getKeyStroke("ENTER"),"nextField");
this.view.getCincuentaField().getInputMap(JComponent.WHEN_FOCUSED).put(KeyStroke.getKeyStroke("ENTER"),"nextField");
this.view.getDiezField().getInputMap(JComponent.WHEN_FOCUSED).put(KeyStroke.getKeyStroke("ENTER"),"save");
this.view.getVeinteMilField().getActionMap().put("nextField", new NextAction(this.view.getDiezMilField()));
this.view.getDiezMilField().getActionMap().put("nextField", new NextAction(this.view.getCincoMilField()));
this.view.getCincoMilField().getActionMap().put("nextField", new NextAction(this.view.getDosMilField()));
this.view.getDosMilField().getActionMap().put("nextField", new NextAction(this.view.getMilField()));
this.view.getMilField().getActionMap().put("nextField", new NextAction(this.view.getQuinientosField()));
this.view.getQuinientosField().getActionMap().put("nextField", new NextAction(this.view.getCienField()));
this.view.getCienField().getActionMap().put("nextField", new NextAction(this.view.getCincuentaField()));
this.view.getCincuentaField().getActionMap().put("nextField", new NextAction(this.view.getDiezField()));
this.view.getDiezField().getActionMap().put("save", new GuardarEfectivoAction(this));
this.view.getChequesField().getInputMap(JComponent.WHEN_FOCUSED).put(KeyStroke.getKeyStroke("ENTER"),"nextField");
this.view.getTarjetasField().getInputMap(JComponent.WHEN_FOCUSED).put(KeyStroke.getKeyStroke("ENTER"),"save");
this.view.getChequesField().getActionMap().put("nextField", new NextAction(this.view.getTarjetasField()));
this.view.getTarjetasField().getActionMap().put("save", new GuardarDocumentosAction(this));
this.view.getGuardarEfectivoButton().addActionListener(e -> guardarEfectivoActionListener());
this.view.getGuardarDocumentosButton().addActionListener(e -> guardarDocumentosActionListener());
}
/**
* Llama a los metodos necesarios para guardar los campos de efectivo
* Primero llama a normalizar el input, luego a esconder los mensajes de error, para finalmente llamar a guardar el efectivo
*/
private void guardarEfectivoActionListener(){
this.normalizeEfectivoInput(); this.normalizeEfectivoInput();
this.hiddeEfectivoErrorMessages(); this.hiddeEfectivoErrorMessages();
this.guardarEfectivo(); this.guardarEfectivo();
}); }
this.view.getGuardarDocumentosButton().addActionListener(e -> {
/**
* Llama a los metodos necesarios para guardar los documentos
* Primero llama a normalizar el input, luego a esconder los mensajes de error y finalmente a guardar los documentos
*/
private void guardarDocumentosActionListener(){
this.normalizeDocumentosInput(); this.normalizeDocumentosInput();
this.hiddeDocumentosErrorMessages(); this.hiddeDocumentosErrorMessages();
this.guardarDocumentos(); this.guardarDocumentos();
});
} }
/** /**
@@ -408,4 +449,28 @@ public class ArqueoController {
this.view.getTarjetasField().setText(this.view.getTarjetasField().getText().trim()); this.view.getTarjetasField().setText(this.view.getTarjetasField().getText().trim());
} }
private class GuardarEfectivoAction extends AbstractAction{
ArqueoController controller;
GuardarEfectivoAction(ArqueoController controller){
this.controller = controller;
}
@Override
public void actionPerformed(ActionEvent e) {
this.controller.guardarEfectivoActionListener();
}
}
private class GuardarDocumentosAction extends AbstractAction{
ArqueoController controller;
GuardarDocumentosAction(ArqueoController controller){
this.controller = controller;
}
@Override
public void actionPerformed(ActionEvent e) {
this.controller.guardarDocumentosActionListener();
}
}
} }

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

@@ -24,6 +24,7 @@
package danielcortes.xyz.controllers; package danielcortes.xyz.controllers;
import danielcortes.xyz.controllers.actions.NextAction;
import danielcortes.xyz.models.caja.Caja; import danielcortes.xyz.models.caja.Caja;
import danielcortes.xyz.models.egreso.Egreso; import danielcortes.xyz.models.egreso.Egreso;
import danielcortes.xyz.models.egreso.EgresoDAO; import danielcortes.xyz.models.egreso.EgresoDAO;
@@ -33,10 +34,7 @@ import danielcortes.xyz.views.EgresosView;
import danielcortes.xyz.views.components.EgresosTableModel; import danielcortes.xyz.views.components.EgresosTableModel;
import javax.swing.*; import javax.swing.*;
import java.awt.event.KeyAdapter; import java.awt.event.*;
import java.awt.event.KeyEvent;
import java.awt.event.MouseAdapter;
import java.awt.event.MouseEvent;
/** /**
* Controlador el cual esta orientado a manejar la vista de EgresosView * Controlador el cual esta orientado a manejar la vista de EgresosView
@@ -123,21 +121,21 @@ public class EgresosController {
* - Cuando se selecciona una fila en la tabla se llama a updateButtonsEnabled * - Cuando se selecciona una fila en la tabla se llama a updateButtonsEnabled
*/ */
private void setUpViewEvents() { private void setUpViewEvents() {
this.view.getNroField().getInputMap(JComponent.WHEN_FOCUSED).put(KeyStroke.getKeyStroke("ENTER"), "nextField");
this.view.getValorField().getInputMap(JComponent.WHEN_FOCUSED).put(KeyStroke.getKeyStroke("ENTER"), "nextField");
this.view.getDescripcionField().getInputMap(JComponent.WHEN_FOCUSED).put(KeyStroke.getKeyStroke("ENTER"), "nextField");
this.view.getTipoCombo().getInputMap(JComponent.WHEN_FOCUSED).put(KeyStroke.getKeyStroke("ENTER"), "save");
this.view.getNroField().getActionMap().put("nextField", new NextAction(this.view.getDescripcionField()));
this.view.getDescripcionField().getActionMap().put("nextField", new NextAction(this.view.getValorField()));
this.view.getValorField().getActionMap().put("nextField", new NextAction(this.view.getTipoCombo()));
this.view.getTipoCombo().getActionMap().put("save", new GuardarAction(this));
this.view.getEgresosTable().getSelectionModel().addListSelectionListener(e -> updateButtonsEnabled()); this.view.getEgresosTable().getSelectionModel().addListSelectionListener(e -> updateButtonsEnabled());
this.view.getGuardarButton().addActionListener(e -> guardarActionListener()); this.view.getGuardarButton().addActionListener(e -> guardarActionListener());
this.view.getEliminarButton().addActionListener(e -> eliminarActionListener()); this.view.getEliminarButton().addActionListener(e -> eliminarActionListener());
this.view.getEditarButton().addActionListener(e -> editarActionListener()); this.view.getEditarButton().addActionListener(e -> editarActionListener());
this.view.getDescripcionField().addActionListener(e -> guardarActionListener());
this.view.getNroField().addActionListener(e -> guardarActionListener());
this.view.getValorField().addActionListener(e -> guardarActionListener());
this.view.getTipoCombo().addKeyListener(new KeyAdapter() {
@Override
public void keyPressed(KeyEvent e) {
if (e.getKeyCode() == KeyEvent.VK_ENTER) {
guardarActionListener();
}
}
});
this.view.getEgresosTable().addMouseListener(new MouseAdapter() { this.view.getEgresosTable().addMouseListener(new MouseAdapter() {
public void mouseClicked(MouseEvent mouseEvent) { public void mouseClicked(MouseEvent mouseEvent) {
JTable table = (JTable) mouseEvent.getSource(); JTable table = (JTable) mouseEvent.getSource();
@@ -430,4 +428,16 @@ public class EgresosController {
private void resetFocus() { private void resetFocus() {
this.view.getNroField().requestFocus(); this.view.getNroField().requestFocus();
} }
private class GuardarAction extends AbstractAction{
EgresosController controller;
GuardarAction(EgresosController controller){
this.controller = controller;
}
@Override
public void actionPerformed(ActionEvent e) {
this.controller.guardarActionListener();
}
}
} }

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

@@ -34,10 +34,7 @@ import danielcortes.xyz.views.components.IngresosTableModel;
import org.jetbrains.annotations.Contract; import org.jetbrains.annotations.Contract;
import javax.swing.*; import javax.swing.*;
import java.awt.event.KeyAdapter; import java.awt.event.*;
import java.awt.event.KeyEvent;
import java.awt.event.MouseAdapter;
import java.awt.event.MouseEvent;
/** /**
* Controlador el cual esta orientado a manejar la vista de IngresosView * Controlador el cual esta orientado a manejar la vista de IngresosView
@@ -123,23 +120,21 @@ public class IngresosController {
* - Cuando se presiona el boton de editar o se hace doble click sobre una fila de la tabla se llama a editarActionListener * - Cuando se presiona el boton de editar o se hace doble click sobre una fila de la tabla se llama a editarActionListener
*/ */
private void setupViewEvents() { private void setupViewEvents() {
this.view.getValorField().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.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));
this.view.getIngresosTable().getSelectionModel().addListSelectionListener(e -> updateButtonsEnabled()); this.view.getIngresosTable().getSelectionModel().addListSelectionListener(e -> updateButtonsEnabled());
this.view.getGuardarButton().addActionListener(e -> guardarActionListener()); this.view.getGuardarButton().addActionListener(e -> guardarActionListener());
this.view.getValorField().addActionListener(e -> guardarActionListener());
this.view.getNroInicialField().addActionListener(e -> guardarActionListener());
this.view.getNroFinalField().addActionListener(e -> guardarActionListener());
this.view.getEliminarButton().addActionListener(e -> eliminarActionListener()); this.view.getEliminarButton().addActionListener(e -> eliminarActionListener());
this.view.getEditarButton().addActionListener(e -> editarActionListener()); this.view.getEditarButton().addActionListener(e -> editarActionListener());
this.view.getTipoCombo().addKeyListener(new KeyAdapter() {
@Override
public void keyPressed(KeyEvent e) {
if(e.getKeyCode() == KeyEvent.VK_ENTER){
guardarActionListener();
}
}
});
this.view.getIngresosTable().addMouseListener(new MouseAdapter() { this.view.getIngresosTable().addMouseListener(new MouseAdapter() {
public void mouseClicked(MouseEvent mouseEvent) { public void mouseClicked(MouseEvent mouseEvent) {
JTable table = (JTable) mouseEvent.getSource(); JTable table = (JTable) mouseEvent.getSource();
@@ -431,6 +426,31 @@ public class IngresosController {
* Le pide focus al tipo combo * Le pide focus al tipo combo
*/ */
private void resetFocus(){ private void resetFocus(){
this.view.getTipoCombo().requestFocus(); this.view.getValorField().requestFocus();
}
private class NextAction extends AbstractAction{
JComponent next;
NextAction(JComponent next){
this.next = next;
}
@Override
public void actionPerformed(ActionEvent e) {
this.next.requestFocus();
}
}
private class GuardarAction extends AbstractAction{
IngresosController controller;
GuardarAction(IngresosController controller){
this.controller = controller;
}
@Override
public void actionPerformed(ActionEvent e) {
this.controller.guardarActionListener();
}
} }
} }

41
src/danielcortes/xyz/controllers/actions/NextAction.java Normal file
View File

@@ -0,0 +1,41 @@
/*
* MIT License
*
* Copyright (c) 2018 Daniel Cortes
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in all
* copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
* SOFTWARE.
*/
package danielcortes.xyz.controllers.actions;
import javax.swing.*;
import java.awt.event.ActionEvent;
public class NextAction extends AbstractAction {
private JComponent next;
public NextAction(JComponent next){
this.next = next;
}
@Override
public void actionPerformed(ActionEvent e) {
this.next.requestFocus();
}
}

15
src/danielcortes/xyz/views/ManagerView.form
View File

@@ -16,17 +16,17 @@
<border type="none"/> <border type="none"/>
<children/> <children/>
</grid> </grid>
<grid id="b2933" binding="controlsPanel" layout-manager="GridLayoutManager" row-count="1" column-count="4" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1"> <grid id="b2933" binding="controlsPanel" layout-manager="GridLayoutManager" row-count="1" column-count="5" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
<margin top="0" left="0" bottom="0" right="0"/> <margin top="0" left="0" bottom="0" right="0"/>
<constraints> <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="1" hsize-policy="3" anchor="1" fill="1" indent="0" use-parent-layout="false"/>
</constraints> </constraints>
<properties/> <properties/>
<border type="none"/> <border type="none"/>
<children> <children>
<component id="a853b" class="javax.swing.JToggleButton" binding="egresosButton"> <component id="a853b" class="javax.swing.JToggleButton" binding="egresosButton">
<constraints> <constraints>
<grid row="0" column="2" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="0" indent="0" use-parent-layout="false"> <grid row="0" column="3" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="0" indent="0" use-parent-layout="false">
<preferred-size width="200" height="-1"/> <preferred-size width="200" height="-1"/>
</grid> </grid>
</constraints> </constraints>
@@ -36,7 +36,7 @@
</component> </component>
<component id="a494c" class="javax.swing.JToggleButton" binding="ingresosButton"> <component id="a494c" class="javax.swing.JToggleButton" binding="ingresosButton">
<constraints> <constraints>
<grid row="0" column="1" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="0" indent="0" use-parent-layout="false"> <grid row="0" column="2" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="0" indent="0" use-parent-layout="false">
<preferred-size width="200" height="-1"/> <preferred-size width="200" height="-1"/>
</grid> </grid>
</constraints> </constraints>
@@ -46,7 +46,7 @@
</component> </component>
<component id="d23e2" class="javax.swing.JToggleButton" binding="arqueoButton"> <component id="d23e2" class="javax.swing.JToggleButton" binding="arqueoButton">
<constraints> <constraints>
<grid row="0" column="3" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="0" indent="0" use-parent-layout="false"> <grid row="0" column="4" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="0" indent="0" use-parent-layout="false">
<preferred-size width="200" height="-1"/> <preferred-size width="200" height="-1"/>
</grid> </grid>
</constraints> </constraints>
@@ -60,6 +60,11 @@
</constraints> </constraints>
<properties/> <properties/>
</component> </component>
<hspacer id="350b6">
<constraints>
<grid row="0" column="1" row-span="1" col-span="1" vsize-policy="1" hsize-policy="6" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
</constraints>
</hspacer>
</children> </children>
</grid> </grid>
</children> </children>

14
src/danielcortes/xyz/views/ManagerView.java
View File

@@ -27,6 +27,7 @@ package danielcortes.xyz.views;
import com.github.lgooddatepicker.components.DatePicker; import com.github.lgooddatepicker.components.DatePicker;
import com.intellij.uiDesigner.core.GridConstraints; import com.intellij.uiDesigner.core.GridConstraints;
import com.intellij.uiDesigner.core.GridLayoutManager; import com.intellij.uiDesigner.core.GridLayoutManager;
import com.intellij.uiDesigner.core.Spacer;
import javax.swing.*; import javax.swing.*;
import java.awt.*; import java.awt.*;
@@ -85,25 +86,27 @@ public class ManagerView {
cardPanel.setLayout(new CardLayout(0, 0)); cardPanel.setLayout(new CardLayout(0, 0));
contentPanel.add(cardPanel, new GridConstraints(1, 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)); contentPanel.add(cardPanel, new GridConstraints(1, 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));
controlsPanel = new JPanel(); controlsPanel = new JPanel();
controlsPanel.setLayout(new GridLayoutManager(1, 4, new Insets(0, 0, 0, 0), -1, -1)); controlsPanel.setLayout(new GridLayoutManager(1, 5, new Insets(0, 0, 0, 0), -1, -1));
contentPanel.add(controlsPanel, 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)); contentPanel.add(controlsPanel, new GridConstraints(0, 0, 1, 1, GridConstraints.ANCHOR_NORTH, GridConstraints.FILL_HORIZONTAL, GridConstraints.SIZEPOLICY_CAN_SHRINK | GridConstraints.SIZEPOLICY_CAN_GROW, 1, null, null, null, 0, false));
egresosButton = new JToggleButton(); egresosButton = new JToggleButton();
egresosButton.setText("Egresos"); egresosButton.setText("Egresos");
egresosButton.setMnemonic('E'); egresosButton.setMnemonic('E');
egresosButton.setDisplayedMnemonicIndex(0); egresosButton.setDisplayedMnemonicIndex(0);
controlsPanel.add(egresosButton, new GridConstraints(0, 2, 1, 1, GridConstraints.ANCHOR_CENTER, GridConstraints.FILL_NONE, GridConstraints.SIZEPOLICY_CAN_SHRINK | GridConstraints.SIZEPOLICY_CAN_GROW, GridConstraints.SIZEPOLICY_CAN_SHRINK | GridConstraints.SIZEPOLICY_CAN_GROW, null, new Dimension(200, -1), null, 0, false)); controlsPanel.add(egresosButton, new GridConstraints(0, 3, 1, 1, GridConstraints.ANCHOR_CENTER, GridConstraints.FILL_NONE, GridConstraints.SIZEPOLICY_CAN_SHRINK | GridConstraints.SIZEPOLICY_CAN_GROW, GridConstraints.SIZEPOLICY_CAN_SHRINK | GridConstraints.SIZEPOLICY_CAN_GROW, null, new Dimension(200, -1), null, 0, false));
ingresosButton = new JToggleButton(); ingresosButton = new JToggleButton();
ingresosButton.setText("Ingresos"); ingresosButton.setText("Ingresos");
ingresosButton.setMnemonic('I'); ingresosButton.setMnemonic('I');
ingresosButton.setDisplayedMnemonicIndex(0); ingresosButton.setDisplayedMnemonicIndex(0);
controlsPanel.add(ingresosButton, new GridConstraints(0, 1, 1, 1, GridConstraints.ANCHOR_CENTER, GridConstraints.FILL_NONE, GridConstraints.SIZEPOLICY_CAN_SHRINK | GridConstraints.SIZEPOLICY_CAN_GROW, GridConstraints.SIZEPOLICY_CAN_SHRINK | GridConstraints.SIZEPOLICY_CAN_GROW, null, new Dimension(200, -1), null, 0, false)); controlsPanel.add(ingresosButton, new GridConstraints(0, 2, 1, 1, GridConstraints.ANCHOR_CENTER, GridConstraints.FILL_NONE, GridConstraints.SIZEPOLICY_CAN_SHRINK | GridConstraints.SIZEPOLICY_CAN_GROW, GridConstraints.SIZEPOLICY_CAN_SHRINK | GridConstraints.SIZEPOLICY_CAN_GROW, null, new Dimension(200, -1), null, 0, false));
arqueoButton = new JToggleButton(); arqueoButton = new JToggleButton();
arqueoButton.setText("Arqueo"); arqueoButton.setText("Arqueo");
arqueoButton.setMnemonic('A'); arqueoButton.setMnemonic('A');
arqueoButton.setDisplayedMnemonicIndex(0); arqueoButton.setDisplayedMnemonicIndex(0);
controlsPanel.add(arqueoButton, new GridConstraints(0, 3, 1, 1, GridConstraints.ANCHOR_CENTER, GridConstraints.FILL_NONE, GridConstraints.SIZEPOLICY_CAN_SHRINK | GridConstraints.SIZEPOLICY_CAN_GROW, GridConstraints.SIZEPOLICY_CAN_SHRINK | GridConstraints.SIZEPOLICY_CAN_GROW, null, new Dimension(200, -1), null, 0, false)); controlsPanel.add(arqueoButton, new GridConstraints(0, 4, 1, 1, GridConstraints.ANCHOR_CENTER, GridConstraints.FILL_NONE, GridConstraints.SIZEPOLICY_CAN_SHRINK | GridConstraints.SIZEPOLICY_CAN_GROW, GridConstraints.SIZEPOLICY_CAN_SHRINK | GridConstraints.SIZEPOLICY_CAN_GROW, null, new Dimension(200, -1), null, 0, false));
datePicker = new DatePicker(); datePicker = new DatePicker();
controlsPanel.add(datePicker, new GridConstraints(0, 0, 1, 1, GridConstraints.ANCHOR_CENTER, GridConstraints.FILL_NONE, GridConstraints.SIZEPOLICY_CAN_SHRINK | GridConstraints.SIZEPOLICY_CAN_GROW, GridConstraints.SIZEPOLICY_CAN_SHRINK | GridConstraints.SIZEPOLICY_CAN_GROW, null, null, null, 0, false)); controlsPanel.add(datePicker, new GridConstraints(0, 0, 1, 1, GridConstraints.ANCHOR_CENTER, GridConstraints.FILL_NONE, GridConstraints.SIZEPOLICY_CAN_SHRINK | GridConstraints.SIZEPOLICY_CAN_GROW, GridConstraints.SIZEPOLICY_CAN_SHRINK | GridConstraints.SIZEPOLICY_CAN_GROW, null, null, null, 0, false));
final Spacer spacer1 = new Spacer();
controlsPanel.add(spacer1, new GridConstraints(0, 1, 1, 1, GridConstraints.ANCHOR_CENTER, GridConstraints.FILL_HORIZONTAL, GridConstraints.SIZEPOLICY_WANT_GROW, 1, null, null, null, 0, false));
ButtonGroup buttonGroup; ButtonGroup buttonGroup;
buttonGroup = new ButtonGroup(); buttonGroup = new ButtonGroup();
buttonGroup.add(egresosButton); buttonGroup.add(egresosButton);
@@ -117,4 +120,5 @@ public class ManagerView {
public JComponent $$$getRootComponent$$$() { public JComponent $$$getRootComponent$$$() {
return contentPanel; return contentPanel;
} }
} }