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

Creando documentacion basica

Browse Source
This commit is contained in:
Daniel Cortes
2018-12-29 02:01:28 -03:00
parent 7e94207da3
commit aa7876563f
7 changed files with 369 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
.idea/artifacts/caja_jar.xml generated
View File

@@ -3,11 +3,11 @@
<output-path>$PROJECT_DIR$/out/artifacts/caja_jar</output-path>
<root id="archive" name="caja.jar">
<element id="module-output" name="caja" />
<element id="extracted-dir" path="$APPLICATION_HOME_DIR$/redist/forms_rt.jar" path-in-jar="/" />
<element id="extracted-dir" path="$MAVEN_REPOSITORY$/com/github/lgooddatepicker/LGoodDatePicker/10.3.1/LGoodDatePicker-10.3.1.jar" path-in-jar="/" />
<element id="extracted-dir" path="$MAVEN_REPOSITORY$/com/google/code/gson/gson/2.8.5/gson-2.8.5.jar" path-in-jar="/" />
<element id="extracted-dir" path="$MAVEN_REPOSITORY$/com/google/protobuf/protobuf-java/3.6.1/protobuf-java-3.6.1.jar" path-in-jar="/" />
<element id="extracted-dir" path="$MAVEN_REPOSITORY$/com/google/code/gson/gson/2.8.5/gson-2.8.5.jar" path-in-jar="/" />
<element id="extracted-dir" path="$MAVEN_REPOSITORY$/mysql/mysql-connector-java/8.0.13/mysql-connector-java-8.0.13.jar" path-in-jar="/" />
<element id="extracted-dir" path="$APPLICATION_HOME_DIR$/redist/forms_rt.jar" path-in-jar="/" />
<element id="extracted-dir" path="$MAVEN_REPOSITORY$/org/xerial/sqlite-jdbc/3.25.2/sqlite-jdbc-3.25.2.jar" path-in-jar="/" />
</root>
</artifact>

327
.idea/workspace.xml generated
View File

@@ -6,7 +6,15 @@
</artifacts-to-build>
</component>
<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 beforePath="$PROJECT_DIR$/.idea/artifacts/caja_jar.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/artifacts/caja_jar.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/caja.iml" beforeDir="false" afterPath="$PROJECT_DIR$/caja.iml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/danielcortes/xyz/Main.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/danielcortes/xyz/Main.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/danielcortes/xyz/controllers/ArqueoController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/danielcortes/xyz/controllers/ArqueoController.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/danielcortes/xyz/views/ArqueoView.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/danielcortes/xyz/views/ArqueoView.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/danielcortes/xyz/views/IngresosView.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/danielcortes/xyz/views/IngresosView.java" afterDir="false" />
</list>
<ignored path="$PROJECT_DIR$/target/" />
<ignored path=".idea/" />
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
@@ -61,17 +69,7 @@
<favorites_list name="caja" />
</component>
<component name="FileEditorManager">
<leaf>
<file pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/caja-intellij.iml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="138">
<caret line="6" column="10" selection-start-line="6" selection-start-column="10" selection-end-line="6" selection-end-column="10" />
</state>
</provider>
</entry>
</file>
</leaf>
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300" />
</component>
<component name="FileTemplateManagerImpl">
<option name="RECENT_TEMPLATES">
@@ -131,13 +129,6 @@
<component name="IdeDocumentHistory">
<option name="CHANGED_PATHS">
<list>
<option value="$PROJECT_DIR$/src/main/java/danielcortes/xyz/models/caja/Caja.java" />
<option value="$PROJECT_DIR$/src/main/java/danielcortes/xyz/models/egreso/Egreso.java" />
<option value="$PROJECT_DIR$/src/main/java/danielcortes/xyz/views/components/EgresosTableModel.java" />
<option value="$PROJECT_DIR$/src/main/java/danielcortes/xyz/models/efectivo/Efectivo.java" />
<option value="$PROJECT_DIR$/src/main/java/danielcortes/xyz/views/EgresosView.java" />
<option value="$PROJECT_DIR$/src/main/java/danielcortes/xyz/views/ManagerView.java" />
<option value="$PROJECT_DIR$/src/main/java/danielcortes/xyz/controllers/EgresosController.java" />
<option value="$PROJECT_DIR$/src/main/java/danielcortes/xyz/models/documentos/Documentos.java" />
<option value="$PROJECT_DIR$/database/create.sql" />
<option value="$PROJECT_DIR$/src/main/java/danielcortes/xyz/models/ingreso/Ingreso.java" />
@@ -182,6 +173,13 @@
<option value="$PROJECT_DIR$/src/main/java/danielcortes/xyz/models/tipo_ingreso/SQLiteTipoIngresoDAO.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$/.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/ArqueoView.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/controllers/ArqueoController.java" />
</list>
</option>
</component>
@@ -237,7 +235,35 @@
</navigator>
<panes>
<pane id="Scope" />
<pane id="ProjectPane" />
<pane id="ProjectPane">
<subPane>
<expand>
<path>
<item name="caja" type="b2602c69:ProjectViewProjectNode" />
<item name="caja" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="caja" type="b2602c69:ProjectViewProjectNode" />
<item name="caja" type="462c0819:PsiDirectoryNode" />
<item name="src" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="caja" type="b2602c69:ProjectViewProjectNode" />
<item name="caja" type="462c0819:PsiDirectoryNode" />
<item name="src" type="462c0819:PsiDirectoryNode" />
<item name="xyz" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="caja" type="b2602c69:ProjectViewProjectNode" />
<item name="caja" type="462c0819:PsiDirectoryNode" />
<item name="src" type="462c0819:PsiDirectoryNode" />
<item name="xyz" type="462c0819:PsiDirectoryNode" />
<item name="controllers" type="462c0819:PsiDirectoryNode" />
</path>
</expand>
<select />
</subPane>
</pane>
<pane id="PackagesPane" />
</panes>
</component>
@@ -248,20 +274,20 @@
<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="1546056909588" />
<property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1546059668578" />
<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" />
<property name="jdk.selected.JAVA_MODULE" value="11" />
<property name="last_opened_file_path" value="$PROJECT_DIR$" />
<property name="last_opened_file_path" value="$APPLICATION_HOME_DIR$/redist/forms_rt.jar!/" />
<property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
<property name="nodejs_npm_path_reset_for_default_project" value="true" />
<property name="nodejs_package_manager_path" value="npm" />
<property name="project.structure.last.edited" value="Modules" />
<property name="project.structure.last.edited" value="Artifacts" />
<property name="project.structure.proportion" value="0.15" />
<property name="project.structure.side.proportion" value="0.2" />
<property name="restartRequiresConfirmation" value="false" />
<property name="settings.editor.selected.configurable" value="SQL Dialects" />
<property name="settings.editor.selected.configurable" value="template.copyright.formatting" />
</component>
<component name="RecentsManager">
<key name="MoveClassesOrPackagesDialog.RECENTS_KEY">
@@ -412,6 +438,7 @@
<workItem from="1546055337313" duration="51000" />
<workItem from="1546056688278" duration="4000" />
<workItem from="1546056706584" duration="30000" />
<workItem from="1546056798270" duration="2649000" />
</task>
<task id="LOCAL-00001" summary="First!! :3 Existe una pequeña base de proyecto por ahora">
<created>1545280618093</created>
@@ -557,7 +584,7 @@
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="166487000" />
<option name="totallyTimeSpent" value="169136000" />
</component>
<component name="TodoView">
<todo-panel id="selected-file">
@@ -571,7 +598,7 @@
<component name="ToolWindowManager">
<frame x="0" y="-18" width="1366" height="765" extended-state="6" />
<layout>
<window_info active="true" content_ui="combo" id="Project" order="0" sideWeight="0.49438202" visible="true" weight="0.2800609" />
<window_info active="true" content_ui="combo" id="Project" order="0" sideWeight="0.49438202" visible="true" weight="0.17199391" />
<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" />
@@ -596,12 +623,12 @@
<window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
<window_info anchor="right" id="Palette" order="3" />
<window_info anchor="right" id="Theme Preview" order="4" />
<window_info anchor="right" id="Maven" order="5" weight="0.32876712" />
<window_info anchor="right" id="Maven" order="5" show_stripe_button="false" weight="0.32876712" />
<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="Structure" order="10" sideWeight="0.5008026" weight="0.2283105" />
<window_info anchor="right" id="Structure" order="10" show_stripe_button="false" sideWeight="0.5008026" weight="0.2283105" />
</layout>
</component>
<component name="TypeScriptGeneratedFilesManager">
@@ -685,29 +712,6 @@
<option name="FILTER_TARGETS" value="false" />
</component>
<component name="editorHistoryManager">
<entry file="das://ddc47f43-aee6-477e-9abc-9a07c78c8f9d/schema/caja/table/efectivos">
<provider selected="true" editor-type-id="com.intellij.database.editor.DatabaseTableFileEditorProvider">
<state>
<filtering enabled="true" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/danielcortes/xyz/models/documentos/Documentos.java" />
<entry file="file://$PROJECT_DIR$/src/main/java/danielcortes/xyz/models/ingreso/Ingreso.java" />
<entry file="file://$PROJECT_DIR$/src/main/java/danielcortes/xyz/views/EgresosView.form" />
<entry file="file://$PROJECT_DIR$/src/main/java/danielcortes/xyz/views/EgresosView.java" />
<entry file="file://$PROJECT_DIR$/src/main/java/danielcortes/xyz/views/IngresosView.form" />
<entry file="file://$PROJECT_DIR$/src/main/java/danielcortes/xyz/views/ManagerView.java" />
<entry file="file://$PROJECT_DIR$/src/main/java/danielcortes/xyz/views/IngresosView.java" />
<entry file="das://ddc47f43-aee6-477e-9abc-9a07c78c8f9d/schema/caja/table/ingresos">
<provider selected="true" editor-type-id="com.intellij.database.editor.DatabaseTableFileEditorProvider">
<state>
<filtering enabled="true" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/danielcortes/xyz/views/components/IngresosTableModel.java" />
<entry file="file://$PROJECT_DIR$/src/main/java/danielcortes/xyz/views/ArqueoView.java" />
<entry file="file://$PROJECT_DIR$/src/main/java/danielcortes/xyz/views/ArqueoView.form" />
<entry file="file://$PROJECT_DIR$/src/main/java/danielcortes/xyz/data/MysqlConnectionHolder.java" />
<entry file="file://$PROJECT_DIR$/src/main/java/danielcortes/xyz/data/Properties.java" />
@@ -754,13 +758,6 @@
<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/data/SQLiteConnectionHolder.java" />
<entry file="file://$PROJECT_DIR$/conf.properties">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="529">
<caret line="21" selection-start-line="21" selection-end-line="21" />
</state>
</provider>
</entry>
<entry file="uml://JAVA/danielcortes.xyz">
<provider selected="true" editor-type-id="UmlEditorProvider">
<state>
@@ -849,6 +846,215 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/conf.properties">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="529">
<caret line="21" selection-start-line="21" selection-end-line="21" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/caja.iml">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/.gitignore">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="23">
<caret line="1" lean-forward="true" selection-start-line="1" selection-end-line="1" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/META-INF/MANIFEST.MF">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/src/danielcortes/xyz/views/EgresosView.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="92">
<caret line="26" selection-start-line="26" selection-end-line="26" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/danielcortes/xyz/views/ArqueoView.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="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">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="92">
<caret line="26" column="56" selection-start-line="26" selection-start-column="56" selection-end-line="26" selection-end-column="56" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/danielcortes/xyz/views/IngresosView.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="69">
<caret line="25" selection-start-line="25" selection-end-line="25" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/danielcortes/xyz/Main.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-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">
<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/models/tipo_ingreso/MysqlTipoIngresoDAO.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="138">
<caret line="35" column="13" selection-start-line="35" selection-start-column="13" selection-end-line="35" selection-end-column="13" />
</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="807">
<caret line="403" column="4" selection-start-line="403" selection-start-column="4" selection-end-line="403" selection-end-column="4" />
<folding>
<element signature="docComment;method#ArqueoController#0;class#ArqueoController#0" />
<element signature="method#ArqueoController#0;class#ArqueoController#0" />
<element signature="docComment;method#updateCaja#0;class#ArqueoController#0" />
<element signature="method#updateCaja#0;class#ArqueoController#0" />
<element signature="docComment;method#updateResumen#0;class#ArqueoController#0" />
<element signature="docComment;method#fillEfectivo#0;class#ArqueoController#0" />
<element signature="method#fillEfectivo#0;class#ArqueoController#0" />
<element signature="docComment;method#fillDocumentos#0;class#ArqueoController#0" />
<element signature="method#fillDocumentos#0;class#ArqueoController#0" />
<element signature="docComment;method#fillResumen#0;class#ArqueoController#0" />
<element signature="method#fillResumen#0;class#ArqueoController#0" />
<element signature="docComment;method#updateResumenEfectivo#0;class#ArqueoController#0" />
<element signature="method#updateResumenEfectivo#0;class#ArqueoController#0" />
<element signature="docComment;method#updateResumenDocumentos#0;class#ArqueoController#0" />
<element signature="method#updateResumenDocumentos#0;class#ArqueoController#0" />
<element signature="docComment;method#updateResumenIngresos#0;class#ArqueoController#0" />
<element signature="method#updateResumenIngresos#0;class#ArqueoController#0" />
<element signature="docComment;method#updateResumenEgresos#0;class#ArqueoController#0" />
<element signature="method#updateResumenEgresos#0;class#ArqueoController#0" />
<element signature="docComment;method#updateResumenArqueo#0;class#ArqueoController#0" />
<element signature="method#updateResumenArqueo#0;class#ArqueoController#0" />
<element signature="e#5856#5941#1" />
<element signature="e#5945#6028#1" />
<element signature="docComment;method#setUpViewEvents#0;class#ArqueoController#0" />
<element signature="method#setUpViewEvents#0;class#ArqueoController#0" />
<element signature="e#6137#6232#0" />
<element signature="e#6300#6399#0" />
<element signature="docComment;method#guardarEfectivo#0;class#ArqueoController#0" />
<element signature="method#guardarEfectivo#0;class#ArqueoController#0" />
<element signature="e#7135#7854#1" />
<element signature="docComment;method#guardarDocumentos#0;class#ArqueoController#0" />
<element signature="method#guardarDocumentos#0;class#ArqueoController#0" />
<element signature="e#8093#8384#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#10196#10340#1" />
<element signature="e#10371#10504#1" />
<element signature="e#10563#10694#1" />
<element signature="e#10729#10881#1" />
<element signature="docComment;method#validateDocumentosValor#0;class#ArqueoController#0" />
<element signature="method#validateDocumentosValor#0;class#ArqueoController#0" />
<element signature="e#11018#11162#1" />
<element signature="e#11193#11326#1" />
<element signature="e#11385#11516#1" />
<element signature="e#11551#11703#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" />
</folding>
</state>
</provider>
</entry>
</component>
<component name="masterDetails">
<states>
@@ -867,10 +1073,10 @@
<settings>
<artifact-editor>
<show-content>
<type id="javaee-facet-resources" />
<type id="artifact" />
<type id="jpa-descriptors" />
<type id="library" />
<type id="javaee-facet-resources" />
</show-content>
</artifact-editor>
<last-edited>caja:jar</last-edited>
@@ -938,7 +1144,6 @@
<option name="proportions">
<list>
<option value="0.2" />
<option value="0.6" />
</list>
</option>
</splitter-proportions>
@@ -946,7 +1151,7 @@
</state>
<state key="ProjectLibrariesConfigurable.UI">
<settings>
<last-edited>Maven: org.xerial:sqlite-jdbc:3.25.2</last-edited>
<last-edited>forms_rt</last-edited>
<splitter-proportions>
<option name="proportions">
<list>

9
caja.iml
View File

@@ -7,10 +7,11 @@
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" name="com.google.code.gson:gson:2.8.5" level="project" />
<orderEntry type="library" name="mysql:mysql-connector-java:8.0.13" level="project" />
<orderEntry type="library" name="org.xerial:sqlite-jdbc:3.25.2" level="project" />
<orderEntry type="library" name="com.github.lgooddatepicker:LGoodDatePicker:10.3.1" level="project" />
<orderEntry type="library" name="Maven: com.github.lgooddatepicker:LGoodDatePicker:10.3.1" level="project" />
<orderEntry type="library" name="Maven: com.google.code.gson:gson:2.8.5" level="project" />
<orderEntry type="library" name="Maven: com.google.protobuf:protobuf-java:3.6.1" level="project" />
<orderEntry type="library" name="Maven: mysql:mysql-connector-java:8.0.13" level="project" />
<orderEntry type="library" name="Maven: org.xerial:sqlite-jdbc:3.25.2" level="project" />
<orderEntry type="library" name="forms_rt" level="project" />
</component>
</module>

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

@@ -54,7 +54,7 @@ import java.sql.SQLException;
import java.util.Locale;
public class Main {
public static void main(String[] args) throws SQLException {
public static void main(String[] args) {
System.setProperty("awt.useSystemAAFontSettings", "on");
System.setProperty("swing.aatext", "true");

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

@@ -48,6 +48,14 @@ public class ArqueoController {
private IngresoDAO ingresoDAO;
private EgresoDAO egresoDAO;
/**
* Crea el controlador y ejecuta el metodo que genera los eventos para su vista.
* @param view Vista del arqueo
* @param efectivoDAO Data access object para el manejo de efectivo
* @param documentosDAO Data access object para el manejo de documentos
* @param ingresoDAO Data access object para el manejo de los ingresos
* @param egresoDAO Data access object para el manejo de los egresos
*/
public ArqueoController(ArqueoView view, EfectivoDAO efectivoDAO, DocumentosDAO documentosDAO, IngresoDAO ingresoDAO, EgresoDAO egresoDAO) {
this.view = view;
this.efectivoDAO = efectivoDAO;
@@ -58,17 +66,27 @@ public class ArqueoController {
this.setUpViewEvents();
}
/**
* Actualiza los campos de documentos, efectivo y resumen con los datos de la caja.
* @param caja Caja para la cual se seleccionaran los datos a mostrar
*/
public void updateCaja(Caja caja) {
this.caja = caja;
fillDocumentos();
fillEfectivo();
fillResumen();
this.fillDocumentos();
this.fillEfectivo();
this.fillResumen();
}
/**
* Acceso publico para rellenar el resumen
*/
public void updateResumen() {
this.fillResumen();
}
/**
* Rellena los campos del efectivo con la instancia de efectivo que pertenece a la caja
*/
private void fillEfectivo() {
this.efectivo = this.efectivoDAO.findByCaja(this.caja);
this.view.getVeinteMilField().setText(String.valueOf(efectivo.getVeinteMil()));
@@ -82,12 +100,18 @@ public class ArqueoController {
this.view.getDiezField().setText(String.valueOf(efectivo.getDiez()));
}
/**
* Rellea los campos de documentos con la instancia de documentos que pertenece a la caja
*/
private void fillDocumentos() {
this.documentos = this.documentosDAO.findByCaja(caja);
this.view.getTarjetasField().setText(String.valueOf(documentos.getTarjetas()));
this.view.getChequesField().setText(String.valueOf(documentos.getCheques()));
}
/**
* Llama a todos los metodos que llenan y calculan los campos de resumen
*/
private void fillResumen() {
this.updateResumenEfectivo();
this.updateResumenDocumentos();
@@ -96,6 +120,9 @@ public class ArqueoController {
this.updateResumenArqueo();
}
/**
* Calcula el total de efectivo y lo muestra en el efectivoField
*/
private void updateResumenEfectivo() {
JTextField efectivoField = this.view.getEfectivoField();
int total = 0;
@@ -112,6 +139,9 @@ public class ArqueoController {
efectivoField.setText(String.valueOf(total));
}
/**
* Calcula el total de documentos y lo muestra en el documentosField
*/
private void updateResumenDocumentos() {
JTextField documentosField = this.view.getDocumentosField();
int total = 0;
@@ -121,16 +151,25 @@ public class ArqueoController {
documentosField.setText(String.valueOf(total));
}
/**
* Obtiene el total de ingresos para la caja y lo muestra en el campo ingresosField
*/
private void updateResumenIngresos() {
int total = this.ingresoDAO.getTotalIngreso(this.caja);
this.view.getIngresosField().setText(String.valueOf(total));
}
/**
* Obtiene el total de egresos y lo muestra en el campo de egresosField
*/
private void updateResumenEgresos() {
int total = this.egresoDAO.getTotalEgreso(this.caja);
this.view.getEgresosField().setText(String.valueOf(total));
}
/**
* Calcula los datos de arqueo, rendido y ajuste y los muestra en sus campos correspondientes
*/
private void updateResumenArqueo() {
int totalEfectivo = Integer.parseInt(this.view.getEfectivoField().getText());
int totalDocumentos = Integer.parseInt(this.view.getDocumentosField().getText());
@@ -152,17 +191,26 @@ public class ArqueoController {
}
/**
* Setea los eventos de los botones de guardar
*/
private void setUpViewEvents() {
this.view.getGuardarEfectivoButton().addActionListener(e -> {
this.normalizeEfectivoInput();
this.hiddeEfectivoErrorMessages();
this.guardarEfectivo();
});
this.view.getGuardarDocumentosButton().addActionListener(e -> {
this.normalizeDocumentosInput();
this.hiddeDocumentosErrorMessages();
this.guardarDocumentos();
});
}
/**
* Guarda los datos del detalle de efectivo solo despues de que los campos sean validados, luego de guardar
* llama a updateResumenEfectivo y updateResumenArqueo para actualizar los datos en efectivoField y arqueoField
*/
private void guardarEfectivo() {
String diez = this.view.getDiezField().getText();
String cincuenta = this.view.getCincuentaField().getText();
@@ -191,6 +239,10 @@ public class ArqueoController {
}
}
/**
* Guarda los datos del detalle de documentos solo despues de que los campos sean validados, luego de guardar
* llama a updateResumenDocumentos y updateResumenArqueo para actualizar los datos de documentosField y arqueoField
*/
private void guardarDocumentos() {
String tarjetas = this.view.getTarjetasField().getText();
String cheques = this.view.getChequesField().getText();
@@ -205,8 +257,11 @@ public class ArqueoController {
}
}
/**
* Llama a las validaciones necesarias para el input de Efectivo
* @return si es que paso todas las validaciones.
*/
private boolean validateEfectivoInput(String diez, String cincuenta, String cien, String quinientos, String mil, String dosMil, String cincoMil, String diezMil, String veinteMil) {
this.hiddeEfectivoErrorMessages();
boolean diezValidation = validateEfectivoMoneda(diez, this.view.getErrorDiez());
boolean cincuentaValidation = validateEfectivoMoneda(cincuenta, this.view.getErrorCincuenta());
@@ -221,8 +276,11 @@ public class ArqueoController {
return diezValidation && cincuentaValidation && cienValidation && quinientosValidation && milValidation && dosMilValidation && cincoMilValidation && diezMilValidation && veinteMilValidation;
}
/**
* Llama a las validaciones necesarias el input de Documentos
* @return si es que todas las validaciones fueron correctas
*/
private boolean validateDocumentosInput(String tarjetas, String cheques) {
this.hiddeDocumentosErrorMessages();
boolean tarjetasValidation = validateDocumentosValor(tarjetas, this.view.getErrorTarjetas());
boolean chequesValidation = validateDocumentosValor(cheques, this.view.getErrorCheques());
@@ -230,6 +288,15 @@ public class ArqueoController {
return tarjetasValidation && chequesValidation;
}
/**
* Valida el valor entregado contra las siguientes pruebas
* - Es null
* - Esta vacio
* - Los caracteres no son solamente digitos
* - El largo es mayor que diez
* Setea un mensaje de error correspondiente en el errorLabel entregado.
* @return cuando cualquiera de los casos anteriores sea true se retorna falso, si no retorna true.
*/
private boolean validateEfectivoMoneda(String valor, JLabel errorLabel) {
if (valor == null) {
errorLabel.setText("Hubo un problema con los datos");
@@ -258,6 +325,15 @@ public class ArqueoController {
return true;
}
/**
* Valida el valor entregado contra las siguientes pruebas
* - Es null
* - Esta vacio
* - Los caracteres no son solamente digitos
* - El largo es mayor que diez
* Setea un mensaje de error correspondiente en el errorLabel entregado.
* @return cuando cualquiera de los casos anteriores sea true se retorna falso, si no retorna true.
*/
private boolean validateDocumentosValor(String valor, JLabel errorLabel) {
if (valor == null) {
@@ -287,6 +363,9 @@ public class ArqueoController {
return true;
}
/**
* Esconde los mensajes de error de los campos de efectivo
*/
private void hiddeEfectivoErrorMessages() {
this.view.getErrorDiez().setVisible(false);
this.view.getErrorCincuenta().setVisible(false);
@@ -299,11 +378,17 @@ public class ArqueoController {
this.view.getErrorVeinteMil().setVisible(false);
}
/**
* Esconde los mensajes de error en los campos de documentos
*/
private void hiddeDocumentosErrorMessages(){
this.view.getErrorTarjetas().setVisible(false);
this.view.getErrorCheques().setVisible(false);
}
/**
* Ejecuta trim sobre todos los campos de efectivo
*/
private void normalizeEfectivoInput() {
this.view.getDiezField().setText(this.view.getDiezField().getText().trim());
this.view.getCincuentaField().setText(this.view.getCincuentaField().getText().trim());
@@ -316,6 +401,9 @@ public class ArqueoController {
this.view.getVeinteMilField().setText(this.view.getVeinteMilField().getText().trim());
}
/**
* Ejecuta trim sobre todos los campos de documentos
*/
private void normalizeDocumentosInput() {
this.view.getChequesField().setText(this.view.getChequesField().getText().trim());
this.view.getTarjetasField().setText(this.view.getTarjetasField().getText().trim());

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

@@ -24,6 +24,7 @@
package danielcortes.xyz.views;
import com.intellij.uiDesigner.core.GridConstraints;
import com.intellij.uiDesigner.core.GridLayoutManager;
import com.intellij.uiDesigner.core.Spacer;

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

@@ -122,6 +122,7 @@ public class IngresosView {
return ingresosTableModel;
}
{
// GUI initializer generated by IntelliJ IDEA GUI Designer
// >>> IMPORTANT!! <<<