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

Actualizado resumen de arqueo

Browse Source
This commit is contained in:
Daniel Cortes
2019-01-05 16:28:54 -03:00
parent 1647e6c9f4
commit 47e10ac3b8
5 changed files with 141 additions and 260 deletions
Download Patch File Download Diff File Expand all files Collapse all files

203
.idea/workspace.xml generated
View File

@@ -10,12 +10,9 @@
<bookmark url="file://$PROJECT_DIR$/src/danielcortes/xyz/views/ArqueoView.java" line="383" mnemonic="0" />
</component>
<component name="ChangeListManager">
<list default="true" id="a633d35a-56a6-4479-b4c4-f97198052fb7" name="Default Changelist" comment="Se me olvido agregar el jar XD">
<change afterPath="$PROJECT_DIR$/src/danielcortes/xyz/views/components/LimitDocumentFilter.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/danielcortes/xyz/views/components/NumberFormatFactory.java" afterDir="false" />
<list default="true" id="a633d35a-56a6-4479-b4c4-f97198052fb7" name="Default Changelist" comment="">
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/dist/caja.jar" beforeDir="false" afterPath="$PROJECT_DIR$/dist/caja.jar" afterDir="false" />
<change beforePath="$PROJECT_DIR$/dist/database.sqlite" beforeDir="false" afterPath="$PROJECT_DIR$/dist/database.sqlite" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/danielcortes/xyz/controllers/ArqueoController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/danielcortes/xyz/controllers/ArqueoController.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/danielcortes/xyz/views/ArqueoView.form" beforeDir="false" afterPath="$PROJECT_DIR$/src/danielcortes/xyz/views/ArqueoView.form" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/danielcortes/xyz/views/ArqueoView.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/danielcortes/xyz/views/ArqueoView.java" afterDir="false" />
@@ -74,101 +71,7 @@
<favorites_list name="caja" />
</component>
<component name="FileEditorManager">
<leaf>
<file pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/src/danielcortes/xyz/controllers/ArqueoController.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="75">
<caret line="93" column="68" selection-start-line="93" selection-start-column="68" selection-end-line="93" selection-end-column="68" />
<folding>
<element signature="docComment;class#ArqueoController#0" />
<element signature="docComment;method#ArqueoController#0;class#ArqueoController#0" />
<element signature="method#ArqueoController#0;class#ArqueoController#0" />
<element signature="docComment;method#updateCaja#0;class#ArqueoController#0" />
<element signature="method#updateCaja#0;class#ArqueoController#0" />
<element signature="docComment;method#updateResumen#0;class#ArqueoController#0" />
<element signature="docComment;method#fillEfectivo#0;class#ArqueoController#0" />
<element signature="docComment;method#fillDocumentos#0;class#ArqueoController#0" />
<element signature="method#fillDocumentos#0;class#ArqueoController#0" />
<element signature="docComment;method#fillResumen#0;class#ArqueoController#0" />
<element signature="method#fillResumen#0;class#ArqueoController#0" />
<element signature="docComment;method#updateResumenEfectivo#0;class#ArqueoController#0" />
<element signature="method#updateResumenEfectivo#0;class#ArqueoController#0" />
<element signature="docComment;method#updateResumenDocumentos#0;class#ArqueoController#0" />
<element signature="method#updateResumenDocumentos#0;class#ArqueoController#0" />
<element signature="docComment;method#updateResumenIngresos#0;class#ArqueoController#0" />
<element signature="method#updateResumenIngresos#0;class#ArqueoController#0" />
<element signature="docComment;method#updateResumenEgresos#0;class#ArqueoController#0" />
<element signature="method#updateResumenEgresos#0;class#ArqueoController#0" />
<element signature="docComment;method#updateResumenArqueo#0;class#ArqueoController#0" />
<element signature="method#updateResumenArqueo#0;class#ArqueoController#0" />
<element signature="e#7246#7335#1" />
<element signature="e#7339#7426#1" />
<element signature="docComment;method#setUpViewEvents#0;class#ArqueoController#0" />
<element signature="method#setUpViewEvents#0;class#ArqueoController#0" />
<element signature="docComment;method#guardarEfectivoActionListener#0;class#ArqueoController#0" />
<element signature="method#guardarEfectivoActionListener#0;class#ArqueoController#0" />
<element signature="docComment;method#guardarDocumentosActionListener#0;class#ArqueoController#0" />
<element signature="method#guardarDocumentosActionListener#0;class#ArqueoController#0" />
<element signature="docComment;method#guardarEfectivo#0;class#ArqueoController#0" />
<element signature="method#guardarEfectivo#0;class#ArqueoController#0" />
<element signature="docComment;method#guardarDocumentos#0;class#ArqueoController#0" />
<element signature="method#guardarDocumentos#0;class#ArqueoController#0" />
<element signature="e#13262#13553#1" />
<element signature="docComment;method#validateEfectivoInput#0;class#ArqueoController#0" />
<element signature="method#validateEfectivoInput#0;class#ArqueoController#0" />
<element signature="docComment;method#validateDocumentosInput#0;class#ArqueoController#0" />
<element signature="method#validateDocumentosInput#0;class#ArqueoController#0" />
<element signature="docComment;method#validateEfectivoMoneda#0;class#ArqueoController#0" />
<element signature="method#validateEfectivoMoneda#0;class#ArqueoController#0" />
<element signature="e#15945#16089#1" />
<element signature="e#16120#16253#1" />
<element signature="e#16312#16443#1" />
<element signature="e#16478#16630#1" />
<element signature="docComment;method#validateDocumentosValor#0;class#ArqueoController#0" />
<element signature="method#validateDocumentosValor#0;class#ArqueoController#0" />
<element signature="e#17149#17293#1" />
<element signature="e#17324#17457#1" />
<element signature="e#17516#17647#1" />
<element signature="e#17682#17834#1" />
<element signature="docComment;method#hiddeEfectivoErrorMessages#0;class#ArqueoController#0" />
<element signature="method#hiddeEfectivoErrorMessages#0;class#ArqueoController#0" />
<element signature="docComment;method#hiddeDocumentosErrorMessages#0;class#ArqueoController#0" />
<element signature="method#hiddeDocumentosErrorMessages#0;class#ArqueoController#0" />
<element signature="docComment;method#normalizeEfectivoInput#0;class#ArqueoController#0" />
<element signature="method#normalizeEfectivoInput#0;class#ArqueoController#0" />
<element signature="docComment;method#normalizeDocumentosInput#0;class#ArqueoController#0" />
<element signature="method#normalizeDocumentosInput#0;class#ArqueoController#0" />
<element signature="class#GuardarEfectivoAction#0;class#ArqueoController#0" />
<element signature="n#!!block;n#GuardarEfectivoAction#0;n#GuardarEfectivoAction#0;n#ArqueoController#0" />
<element signature="class#GuardarDocumentosAction#0;class#ArqueoController#0" />
<element signature="n#!!block;n#GuardarDocumentosAction#0;n#GuardarDocumentosAction#0;n#ArqueoController#0" />
</folding>
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/danielcortes/xyz/views/ArqueoView.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="170">
<caret line="459" column="31" selection-start-line="459" selection-start-column="31" selection-end-line="459" selection-end-column="31" />
<folding>
<element signature="e#6074#6254#0" />
<element signature="e#6074#26437#0" />
<element signature="e#26443#26479#0" />
<element signature="e#26443#27140#0" />
<element signature="e#26672#26731#1" />
<element signature="e#26737#27010#1" />
<element signature="e#26873#26927#1" />
<element signature="e#26933#27000#1" />
<element signature="e#27146#27182#0" />
</folding>
</state>
</provider>
</entry>
</file>
</leaf>
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300" />
</component>
<component name="FileTemplateManagerImpl">
<option name="RECENT_TEMPLATES">
@@ -233,8 +136,6 @@
<component name="IdeDocumentHistory">
<option name="CHANGED_PATHS">
<list>
<option value="$PROJECT_DIR$/src/main/java/danielcortes/xyz/Main.java" />
<option value="$PROJECT_DIR$/src/main/java/danielcortes/xyz/data/SQLiteConnectionHolder.java" />
<option value="$PROJECT_DIR$/pom.xml" />
<option value="$PROJECT_DIR$/conf.properties" />
<option value="$PROJECT_DIR$/src/main/java/danielcortes/xyz/models/caja/MysqlCajaDAO.java" />
@@ -281,6 +182,8 @@
<option value="$PROJECT_DIR$/src/danielcortes/xyz/views/components/NumberFormatFactory.java" />
<option value="$PROJECT_DIR$/src/danielcortes/xyz/views/components/LimitDocumentFilter.java" />
<option value="$PROJECT_DIR$/src/danielcortes/xyz/views/components/JLimitFormatedTextField.java" />
<option value="$PROJECT_DIR$/src/danielcortes/xyz/views/components/LimitedFormatedTextField.java" />
<option value="$PROJECT_DIR$/src/danielcortes/xyz/views/components/JLimitedFormatedTextField.java" />
<option value="$PROJECT_DIR$/src/danielcortes/xyz/views/ArqueoView.form" />
<option value="$PROJECT_DIR$/src/danielcortes/xyz/views/ArqueoView.java" />
<option value="$PROJECT_DIR$/src/danielcortes/xyz/controllers/ArqueoController.java" />
@@ -339,7 +242,6 @@
</navigator>
<panes>
<pane id="PackagesPane" />
<pane id="Scope" />
<pane id="ProjectPane">
<subPane>
<expand>
@@ -372,6 +274,14 @@
<item name="xyz" type="462c0819:PsiDirectoryNode" />
<item name="views" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="caja" type="b2602c69:ProjectViewProjectNode" />
<item name="caja" type="462c0819:PsiDirectoryNode" />
<item name="src" type="462c0819:PsiDirectoryNode" />
<item name="xyz" type="462c0819:PsiDirectoryNode" />
<item name="views" type="462c0819:PsiDirectoryNode" />
<item name="components" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="caja" type="b2602c69:ProjectViewProjectNode" />
<item name="caja" type="462c0819:PsiDirectoryNode" />
@@ -384,6 +294,7 @@
<select />
</subPane>
</pane>
<pane id="Scope" />
</panes>
</component>
<component name="PropertiesComponent">
@@ -397,7 +308,7 @@
<property name="UI_DESIGNER_EDITOR_MODE.UIDesignerToolWindowManager.STATE" value="ToolWindow" />
<property name="WebServerToolWindowFactoryState" value="false" />
<property name="aspect.path.notification.shown" value="true" />
<property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1546644040700" />
<property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1546715446110" />
<property name="com.intellij.ide.scratch.LRUPopupBuilder$1/Change SQL Dialect" value="SQLite" />
<property name="database.console.LAST_STATE" value="false" />
<property name="extract.method.default.visibility" value="private" />
@@ -583,6 +494,8 @@
<workItem from="1546637327660" duration="1114000" />
<workItem from="1546638522572" duration="2869000" />
<workItem from="1546641714073" duration="2208000" />
<workItem from="1546714948357" duration="442000" />
<workItem from="1546716296681" duration="202000" />
</task>
<task id="LOCAL-00001" summary="First!! :3 Existe una pequeña base de proyecto por ahora">
<created>1545280618093</created>
@@ -780,11 +693,18 @@
<option name="project" value="LOCAL" />
<updated>1546540666662</updated>
</task>
<option name="localTasksCounter" value="29" />
<task id="LOCAL-00029" summary="Cambiados fields de efectivo por JFormattedtextfields y son formateados como numeros">
<created>1546715070709</created>
<option name="number" value="00029" />
<option name="presentableId" value="LOCAL-00029" />
<option name="project" value="LOCAL" />
<updated>1546715070709</updated>
</task>
<option name="localTasksCounter" value="30" />
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="216497000" />
<option name="totallyTimeSpent" value="217059000" />
</component>
<component name="TodoView">
<todo-panel id="selected-file">
@@ -797,12 +717,11 @@
</component>
<component name="ToolWindowManager">
<frame x="0" y="-18" width="1366" height="765" extended-state="6" />
<editor active="true" />
<layout>
<window_info content_ui="combo" id="Project" order="0" sideWeight="0.49438202" visible="true" weight="0.20776255" />
<window_info active="true" content_ui="combo" id="Project" order="0" sideWeight="0.49438202" visible="true" weight="0.2108067" />
<window_info id="Image Layers" order="1" />
<window_info id="Designer" order="2" />
<window_info x="458" y="95" width="450" height="453" id="UI Designer" order="3" weight="0.32952815" />
<window_info x="458" y="95" width="450" height="453" id="UI Designer" order="3" weight="0.24505328" />
<window_info id="Capture Tool" order="4" />
<window_info id="Favorites" order="5" show_stripe_button="false" sideWeight="0.505618" side_tool="true" weight="0.17275494" />
<window_info id="simpleUML" order="6" weight="0.329429" />
@@ -828,7 +747,7 @@
<window_info anchor="right" id="Capture Analysis" order="6" />
<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="Version Control" order="9" weight="0.7435312" />
<window_info anchor="right" id="Version Control" order="9" weight="0.73135465" />
<window_info anchor="right" id="Structure" order="10" sideWeight="0.5008026" weight="0.2283105" />
</layout>
</component>
@@ -888,7 +807,6 @@
<component name="VcsManagerConfiguration">
<option name="CHECK_CODE_SMELLS_BEFORE_PROJECT_COMMIT" value="false" />
<option name="CHECK_NEW_TODO" value="false" />
<MESSAGE value="Creada ventana principal para mostrar el resto de ellas en un cardlayout!" />
<MESSAGE value="Cambiado el egresotablemodel para que acepte un egreso como modelo para llenar la tabla" />
<MESSAGE value="Ahora el modelo de egreso se autocarga con el objeto de tipo egreso en vez de con su id" />
<MESSAGE value="Validacion cuando se guarda un egreso desde la vista" />
@@ -913,14 +831,14 @@
<MESSAGE value="Comodidades!&#10;Arreglado el problema de index al ordenar las tablas" />
<MESSAGE value="Actualizada licencia al año 2019&#10;Ademas se cambio el output de la compilacion a la carpeta dist, donde se almacenaran todos los archivos necesarios para el funcionamiento del sistema" />
<MESSAGE value="Se me olvido agregar el jar XD" />
<option name="LAST_COMMIT_MESSAGE" value="Se me olvido agregar el jar XD" />
<MESSAGE value="Cambiados fields de efectivo por JFormattedtextfields y son formateados como numeros" />
<option name="LAST_COMMIT_MESSAGE" value="Cambiados fields de efectivo por JFormattedtextfields y son formateados como numeros" />
</component>
<component name="antWorkspaceConfiguration">
<option name="IS_AUTOSCROLL_TO_SOURCE" value="false" />
<option name="FILTER_TARGETS" value="false" />
</component>
<component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/src/main/java/danielcortes/xyz/models/tipo_egreso/SQLiteTipoEgresoDAO.java" />
<entry file="file://$PROJECT_DIR$/src/main/java/danielcortes/xyz/models/tipo_egreso/TipoEgresoDAO.java" />
<entry file="file://$PROJECT_DIR$/src/main/java/danielcortes/xyz/models/tipo_ingreso/SQLiteTipoIngresoDAO.java" />
<entry file="file://$PROJECT_DIR$/src/main/java/danielcortes/xyz/models/tipo_ingreso/TipoIngresoDAO.java" />
@@ -1357,9 +1275,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/danielcortes/xyz/views/ArqueoView.form">
<provider selected="true" editor-type-id="ui-designer" />
</entry>
<entry file="file://$PROJECT_DIR$/src/danielcortes/xyz/views/components/NumberFormatFactory.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-150">
@@ -1370,28 +1285,32 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/danielcortes/xyz/views/components/JLimitedFormatedTextField.java" />
<entry file="file://$PROJECT_DIR$/src/danielcortes/xyz/views/ArqueoView.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="170">
<caret line="459" column="31" selection-start-line="459" selection-start-column="31" selection-end-line="459" selection-end-column="31" />
<state relative-caret-position="174">
<caret line="151" selection-start-line="151" selection-end-line="151" />
<folding>
<element signature="e#6074#6254#0" />
<element signature="e#6074#26437#0" />
<element signature="e#26443#26479#0" />
<element signature="e#26443#27140#0" />
<element signature="e#26672#26731#1" />
<element signature="e#26737#27010#1" />
<element signature="e#26873#26927#1" />
<element signature="e#26933#27000#1" />
<element signature="e#27146#27182#0" />
<element signature="e#2937#3563#0" />
<element signature="e#6146#6326#0" />
<element signature="e#6146#26509#0" />
<element signature="e#26515#26551#0" />
<element signature="e#26515#27212#0" />
<element signature="e#26744#26803#1" />
<element signature="e#26809#27082#1" />
<element signature="e#26945#26999#1" />
<element signature="e#27005#27072#1" />
<element signature="e#27218#27254#0" />
<element signature="e#27344#27660#0" />
<element signature="e#27451#27654#1" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/danielcortes/xyz/controllers/ArqueoController.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="75">
<caret line="93" column="68" selection-start-line="93" selection-start-column="68" selection-end-line="93" selection-end-column="68" />
<state relative-caret-position="1058">
<caret line="164" column="39" selection-start-line="164" selection-start-column="39" selection-end-line="164" selection-end-column="39" />
<folding>
<element signature="docComment;class#ArqueoController#0" />
<element signature="docComment;method#ArqueoController#0;class#ArqueoController#0" />
@@ -1400,6 +1319,7 @@
<element signature="method#updateCaja#0;class#ArqueoController#0" />
<element signature="docComment;method#updateResumen#0;class#ArqueoController#0" />
<element signature="docComment;method#fillEfectivo#0;class#ArqueoController#0" />
<element signature="method#fillEfectivo#0;class#ArqueoController#0" />
<element signature="docComment;method#fillDocumentos#0;class#ArqueoController#0" />
<element signature="method#fillDocumentos#0;class#ArqueoController#0" />
<element signature="docComment;method#fillResumen#0;class#ArqueoController#0" />
@@ -1408,14 +1328,12 @@
<element signature="method#updateResumenEfectivo#0;class#ArqueoController#0" />
<element signature="docComment;method#updateResumenDocumentos#0;class#ArqueoController#0" />
<element signature="method#updateResumenDocumentos#0;class#ArqueoController#0" />
<element signature="docComment;method#updateResumenIngresos#0;class#ArqueoController#0" />
<element signature="method#updateResumenIngresos#0;class#ArqueoController#0" />
<element signature="docComment;method#updateResumenEgresos#0;class#ArqueoController#0" />
<element signature="method#updateResumenEgresos#0;class#ArqueoController#0" />
<element signature="docComment;method#updateResumenArqueo#0;class#ArqueoController#0" />
<element signature="method#updateResumenArqueo#0;class#ArqueoController#0" />
<element signature="e#7246#7335#1" />
<element signature="e#7339#7426#1" />
<element signature="e#7111#7200#1" />
<element signature="e#7204#7291#1" />
<element signature="docComment;method#setUpViewEvents#0;class#ArqueoController#0" />
<element signature="method#setUpViewEvents#0;class#ArqueoController#0" />
<element signature="docComment;method#guardarEfectivoActionListener#0;class#ArqueoController#0" />
@@ -1426,23 +1344,23 @@
<element signature="method#guardarEfectivo#0;class#ArqueoController#0" />
<element signature="docComment;method#guardarDocumentos#0;class#ArqueoController#0" />
<element signature="method#guardarDocumentos#0;class#ArqueoController#0" />
<element signature="e#13262#13553#1" />
<element signature="e#13055#13346#1" />
<element signature="docComment;method#validateEfectivoInput#0;class#ArqueoController#0" />
<element signature="method#validateEfectivoInput#0;class#ArqueoController#0" />
<element signature="docComment;method#validateDocumentosInput#0;class#ArqueoController#0" />
<element signature="method#validateDocumentosInput#0;class#ArqueoController#0" />
<element signature="docComment;method#validateEfectivoMoneda#0;class#ArqueoController#0" />
<element signature="method#validateEfectivoMoneda#0;class#ArqueoController#0" />
<element signature="e#15945#16089#1" />
<element signature="e#16120#16253#1" />
<element signature="e#16312#16443#1" />
<element signature="e#16478#16630#1" />
<element signature="e#15738#15882#1" />
<element signature="e#15913#16046#1" />
<element signature="e#16105#16236#1" />
<element signature="e#16271#16423#1" />
<element signature="docComment;method#validateDocumentosValor#0;class#ArqueoController#0" />
<element signature="method#validateDocumentosValor#0;class#ArqueoController#0" />
<element signature="e#17149#17293#1" />
<element signature="e#17324#17457#1" />
<element signature="e#17516#17647#1" />
<element signature="e#17682#17834#1" />
<element signature="e#16942#17086#1" />
<element signature="e#17117#17250#1" />
<element signature="e#17309#17440#1" />
<element signature="e#17475#17627#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" />
@@ -1459,6 +1377,9 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/danielcortes/xyz/views/ArqueoView.form">
<provider selected="true" editor-type-id="ui-designer" />
</entry>
</component>
<component name="masterDetails">
<states>