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

Se comienza a incluir logs en el programa, va a hacer falta en el momento que se haga deploy serio

Browse Source
This commit is contained in:
Daniel Cortes
2019-01-20 05:29:33 -03:00
parent 446f10e9f2
commit 6904f55c20
8 changed files with 279 additions and 217 deletions
Download Patch File Download Diff File Expand all files Collapse all files

316
.idea/workspace.xml generated
View File

@@ -10,10 +10,14 @@
</component>
<component name="ChangeListManager">
<list default="true" id="a633d35a-56a6-4479-b4c4-f97198052fb7" name="Default Changelist" comment="">
<change afterPath="$PROJECT_DIR$/dist/logging.properties" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/dist/conf.properties" beforeDir="false" afterPath="$PROJECT_DIR$/dist/conf.properties" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/danielcortes/xyz/data/ConnectionHolder.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/danielcortes/xyz/data/ConnectionHolder.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/dist/Programa Caja.jar" beforeDir="false" afterPath="$PROJECT_DIR$/dist/Programa Caja.jar" 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/data/Configuration.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/danielcortes/xyz/data/Configuration.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/danielcortes/xyz/data/SQLiteConnectionHolder.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/danielcortes/xyz/data/SQLiteConnectionHolder.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/danielcortes/xyz/models/caja/SQLiteCajaDAO.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/danielcortes/xyz/models/caja/SQLiteCajaDAO.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/danielcortes/xyz/models/calculo_fondo/SQLiteCalculoFondoDAO.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/danielcortes/xyz/models/calculo_fondo/SQLiteCalculoFondoDAO.java" afterDir="false" />
</list>
<ignored path="$PROJECT_DIR$/target/" />
<ignored path=".idea/" />
@@ -57,7 +61,7 @@
<favorites_list name="caja" />
</component>
<component name="FileEditorManager">
<leaf />
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300" />
</component>
<component name="FileTemplateManagerImpl">
<option name="RECENT_TEMPLATES">
@@ -126,8 +130,6 @@
<component name="IdeDocumentHistory">
<option name="CHANGED_PATHS">
<list>
<option value="$PROJECT_DIR$/src/danielcortes/xyz/models/caja/MysqlCajaDAO.java" />
<option value="$PROJECT_DIR$/src/danielcortes/xyz/models/calculo_fondo/SQLiteFondoDAO.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/views/CalcularEgresoView.form" />
@@ -153,9 +155,6 @@
<option value="$PROJECT_DIR$/src/danielcortes/xyz/models/efectivo/EfectivoDAO.java" />
<option value="$PROJECT_DIR$/src/danielcortes/xyz/models/ingreso/IngresoDAO.java" />
<option value="$PROJECT_DIR$/src/danielcortes/xyz/models/egreso/EgresoDAO.java" />
<option value="$PROJECT_DIR$/src/danielcortes/xyz/data/Configuration.java" />
<option value="$PROJECT_DIR$/src/danielcortes/xyz/models/caja/SQLiteCajaDAO.java" />
<option value="$PROJECT_DIR$/src/danielcortes/xyz/models/calculo_fondo/SQLiteCalculoFondoDAO.java" />
<option value="$PROJECT_DIR$/src/danielcortes/xyz/models/documentos/SQLiteDocumentosDAO.java" />
<option value="$PROJECT_DIR$/src/danielcortes/xyz/models/efectivo/SQLiteEfectivoDAO.java" />
<option value="$PROJECT_DIR$/src/danielcortes/xyz/models/egreso/SQLiteEgresoDAO.java" />
@@ -167,7 +166,6 @@
<option value="$PROJECT_DIR$/src/danielcortes/xyz/models/tipo_ingreso/SQLiteTipoIngresoDAO.java" />
<option value="$PROJECT_DIR$/src/danielcortes/xyz/data/DAOManager.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/CalcularFondoController.java" />
<option value="$PROJECT_DIR$/src/danielcortes/xyz/controllers/EgresosController.java" />
<option value="$PROJECT_DIR$/src/danielcortes/xyz/controllers/IngresosController.java" />
@@ -175,8 +173,14 @@
<option value="$PROJECT_DIR$/src/danielcortes/xyz/informes/InformeLibroDeVentas.java" />
<option value="$PROJECT_DIR$/src/danielcortes/xyz/models/informes/libro_de_ventas/SQLiteInformeLibroDeVentasContentDAO.java" />
<option value="$PROJECT_DIR$/src/danielcortes/xyz/data/ConnectionHolder.java" />
<option value="$PROJECT_DIR$/src/danielcortes/xyz/data/SQLiteConnectionHolder.java" />
<option value="$PROJECT_DIR$/dist/conf.properties" />
<option value="$PROJECT_DIR$/src/danielcortes/xyz/utils/Logger.java" />
<option value="$PROJECT_DIR$/src/danielcortes/xyz/data/Configuration.java" />
<option value="$PROJECT_DIR$/src/danielcortes/xyz/Main.java" />
<option value="$PROJECT_DIR$/src/danielcortes/xyz/data/SQLiteConnectionHolder.java" />
<option value="$PROJECT_DIR$/src/danielcortes/xyz/models/caja/SQLiteCajaDAO.java" />
<option value="$PROJECT_DIR$/src/danielcortes/xyz/models/calculo_fondo/SQLiteCalculoFondoDAO.java" />
<option value="$PROJECT_DIR$/dist/logging.properties" />
</list>
</option>
</component>
@@ -222,6 +226,7 @@
</navigator>
<panes>
<pane id="PackagesPane" />
<pane id="Scope" />
<pane id="ProjectPane">
<subPane>
<expand>
@@ -240,16 +245,10 @@
<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="dist" type="462c0819:PsiDirectoryNode" />
</path>
</expand>
<select />
</subPane>
</pane>
<pane id="Scope" />
</panes>
</component>
<component name="PropertiesComponent">
@@ -263,7 +262,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="1547963188090" />
<property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1547972559574" />
<property name="com.intellij.ide.scratch.LRUPopupBuilder$1/Change SQL Dialect" value="SQLite" />
<property name="com.intellij.testIntegration.createTest.CreateTestDialog.defaultLibrary" value="JUnit5" />
<property name="com.intellij.testIntegration.createTest.CreateTestDialog.defaultLibrarySuperClass.JUnit5" value="" />
@@ -276,11 +275,11 @@
<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="Problems" />
<property name="project.structure.last.edited" value="Libraries" />
<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="configurable.group.editor" />
<property name="settings.editor.selected.configurable" value="editor.preferences.appearance" />
</component>
<component name="RecentsManager">
<key name="CreateTestDialog.RecentsKey">
@@ -383,6 +382,7 @@
</configuration>
<configuration name="Launch Jar" type="JarApplication" factoryName="JAR Application">
<option name="JAR_PATH" value="$PROJECT_DIR$/dist/Programa Caja.jar" />
<option name="VM_PARAMETERS" value="-Djava.util.logging.config.file=&quot;logging.properties&quot; " />
<option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/dist/" />
<option name="ALTERNATIVE_JRE_PATH_ENABLED" value="true" />
<option name="ALTERNATIVE_JRE_PATH" value="11" />
@@ -517,14 +517,10 @@
<workItem from="1547878415974" duration="1068000" />
<workItem from="1547927651543" duration="3625000" />
<workItem from="1547931339438" duration="5895000" />
<workItem from="1547960032707" duration="3205000" />
</task>
<task id="LOCAL-00016" summary="Tecnicamente esta terminada la funcionalidad basica">
<created>1545982355969</created>
<option name="number" value="00016" />
<option name="presentableId" value="LOCAL-00016" />
<option name="project" value="LOCAL" />
<updated>1545982355969</updated>
<workItem from="1547960032707" duration="4038000" />
<workItem from="1547964496961" duration="2230000" />
<workItem from="1547967243163" duration="5346000" />
<workItem from="1547972719949" duration="249000" />
</task>
<task id="LOCAL-00017" summary="Cambio de nombre y agregado campo para mayor claridad en el arqueo">
<created>1546024676996</created>
@@ -862,7 +858,14 @@
<option name="project" value="LOCAL" />
<updated>1547962893611</updated>
</task>
<option name="localTasksCounter" value="65" />
<task id="LOCAL-00065" summary="Cambiada el nombre de la propiedad para la base de datos actual.&#10;Ademas ahora si no se pueda obtener el jdbc el programa simplemente se cerrara ya que es un estado en el cual no se puede continuar">
<created>1547963246363</created>
<option name="number" value="00065" />
<option name="presentableId" value="LOCAL-00065" />
<option name="project" value="LOCAL" />
<updated>1547963246364</updated>
</task>
<option name="localTasksCounter" value="66" />
<servers />
</component>
<component name="TestHistory">
@@ -898,7 +901,7 @@
</history-entry>
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="352633000" />
<option name="totallyTimeSpent" value="361291000" />
</component>
<component name="TodoView">
<todo-panel id="selected-file">
@@ -928,10 +931,10 @@
<window_info anchor="bottom" id="Docker" order="6" show_stripe_button="false" />
<window_info anchor="bottom" id="Database Changes" order="7" show_stripe_button="false" weight="0.32744783" />
<window_info anchor="bottom" id="Terminal" order="8" show_stripe_button="false" weight="0.32744783" />
<window_info anchor="bottom" id="Event Log" order="9" sideWeight="0.50293684" side_tool="true" weight="0.26497006" />
<window_info anchor="bottom" id="Event Log" order="9" sideWeight="0.50367105" side_tool="true" weight="0.2637037" />
<window_info anchor="bottom" id="Messages" order="10" weight="0.32592592" />
<window_info anchor="bottom" id="Database Console" order="11" weight="0.36597112" />
<window_info anchor="bottom" x="4" y="0" width="902" height="488" id="Run" order="12" sideWeight="0.49706313" weight="0.2637037" />
<window_info anchor="bottom" x="4" y="0" width="902" height="488" id="Run" order="12" sideWeight="0.49632892" visible="true" weight="0.26222223" />
<window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
<window_info anchor="right" id="Ant Build" order="1" show_stripe_button="false" weight="0.24961948" />
<window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.2496329" />
@@ -1038,7 +1041,6 @@
<component name="VcsManagerConfiguration">
<option name="CHECK_CODE_SMELLS_BEFORE_PROJECT_COMMIT" value="false" />
<option name="CHECK_NEW_TODO" value="false" />
<MESSAGE value="Solucionado bug que no generaba el ultimo dia del mes :3" />
<MESSAGE value="Informes mejorados, pensado para transcribirlo a un informe de ventas" />
<MESSAGE value="Corregido error en la generacion del informe, mucho se tuvo que cambiar del mismo para que voliera a funcionar&#10;Presentaba errores al intentar conseguir los numeros de las distintos numeros de boleta dado a la query que se estaba realizando, se corrige creando 2 querys separadas y se comprueba que los numeros de boleta sean minimos o maimos en el codigo" />
<MESSAGE value="Error en que los numeros de boletas eran comparados segun sus valor ascii y no de forma natural&#10;Se agrego una clase de otra persona que hace el trabajo, gracias buen hombre &lt;3" />
@@ -1063,96 +1065,14 @@
<MESSAGE value="se ejecuto limpieza del codigo, reformateo del codigo y optimizacion de los imports por parte del IDE" />
<MESSAGE value="Movida la necesidad de pasaar los objetos dao atravez de los constructores de las clases y se consiguen a travez de una clase estatica la que los crea previamente y simplemente los entrega a la clase que lo pide.&#10;Supongo que dara mayor flexibilidad a cuando se quiera cambiar a un orm o cambiar la conexion a otra base de datos" />
<MESSAGE value="Cambiada el nombre de la propiedad para la base de datos actual.&#10;Ademas ahora si no se pueda obtener el jdbc el programa simplemente se cerrara ya que es un estado en el cual no se puede continuar" />
<option name="LAST_COMMIT_MESSAGE" value="Cambiada el nombre de la propiedad para la base de datos actual.&#10;Ademas ahora si no se pueda obtener el jdbc el programa simplemente se cerrara ya que es un estado en el cual no se puede continuar" />
<MESSAGE value="Se comienza a incluir logs en el programa, va a hacer falta en el momento que se haga deploy serio" />
<option name="LAST_COMMIT_MESSAGE" value="Se comienza a incluir logs en el programa, va a hacer falta en el momento que se haga deploy serio" />
</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$/tests/danielcortes/xyz/utils/FileUtilsTest.java" />
<entry file="jar:///usr/lib/jvm/java-11-openjdk/lib/src.zip!/java.desktop/javax/swing/JFileChooser.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="216">
<caret line="486" column="63" lean-forward="true" selection-start-line="486" selection-start-column="63" selection-end-line="486" selection-end-column="63" />
</state>
</provider>
</entry>
<entry file="jar:///usr/lib/jvm/java-11-openjdk/lib/src.zip!/java.base/java/nio/file/FileSystem.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="215">
<caret line="294" column="25" selection-start-line="294" selection-start-column="25" selection-end-line="294" selection-end-column="25" />
</state>
</provider>
</entry>
<entry file="jar:///usr/lib/jvm/java-11-openjdk/lib/src.zip!/java.base/java/nio/file/Path.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="156">
<caret line="146" column="44" lean-forward="true" selection-start-line="146" selection-start-column="44" selection-end-line="146" selection-end-column="44" />
<folding>
<element signature="docComment;class#Path#0" />
<element signature="docComment;method#of#0;class#Path#0" />
<element signature="e#7225#7226#0" expanded="true" />
<element signature="e#7293#7294#0" expanded="true" />
<element signature="docComment;method#of#1;class#Path#0" />
<element signature="method#of#1;class#Path#0" />
<element signature="e#10070#10206#1" />
<element signature="e#10135#10196#1" />
<element signature="docComment;method#getFileSystem#0;class#Path#0" />
<element signature="docComment;method#isAbsolute#0;class#Path#0" />
<element signature="docComment;method#getRoot#0;class#Path#0" />
<element signature="docComment;method#getFileName#0;class#Path#0" />
<element signature="docComment;method#getParent#0;class#Path#0" />
<element signature="docComment;method#getNameCount#0;class#Path#0" />
<element signature="docComment;method#getName#0;class#Path#0" />
<element signature="docComment;method#subpath#0;class#Path#0" />
<element signature="docComment;method#startsWith#0;class#Path#0" />
<element signature="docComment;method#startsWith#1;class#Path#0" />
<element signature="docComment;method#endsWith#0;class#Path#0" />
<element signature="docComment;method#endsWith#1;class#Path#0" />
<element signature="docComment;method#normalize#0;class#Path#0" />
<element signature="docComment;method#resolve#0;class#Path#0" />
<element signature="docComment;method#resolve#1;class#Path#0" />
<element signature="docComment;method#resolveSibling#0;class#Path#0" />
<element signature="method#resolveSibling#0;class#Path#0" />
<element signature="docComment;method#resolveSibling#1;class#Path#0" />
<element signature="docComment;method#relativize#0;class#Path#0" />
<element signature="docComment;method#toUri#0;class#Path#0" />
<element signature="docComment;method#toAbsolutePath#0;class#Path#0" />
<element signature="docComment;method#toRealPath#0;class#Path#0" />
<element signature="docComment;method#toFile#0;class#Path#0" />
<element signature="method#toFile#0;class#Path#0" />
<element signature="e#34890#34942#1" />
<element signature="e#34948#35086#1" />
<element signature="docComment;method#register#0;class#Path#0" />
<element signature="docComment;method#register#1;class#Path#0" />
<element signature="method#register#1;class#Path#0" />
<element signature="docComment;method#iterator#0;class#Path#0" />
<element signature="method#iterator#0;class#Path#0" />
<element signature="class#41455:41948" />
<element signature="method#next#0;class#41455:41948" />
<element signature="e#41718#41843#1" />
<element signature="e#41849#41924#1" />
<element signature="docComment;method#compareTo#0;class#Path#0" />
<element signature="docComment;method#equals#0;class#Path#0" />
<element signature="docComment;method#hashCode#0;class#Path#0" />
<element signature="docComment;method#toString#0;class#Path#0" />
</folding>
</state>
</provider>
</entry>
<entry file="jar:///usr/lib/jvm/java-11-openjdk/lib/src.zip!/java.base/java/nio/file/Paths.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="494">
<caret line="67" column="25" selection-start-line="67" selection-start-column="25" selection-end-line="67" selection-end-column="25" />
<folding>
<element signature="e#2513#2514#0" expanded="true" />
<element signature="e#2556#2557#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/danielcortes/xyz/utils/FileUtils.java" />
<entry file="file://$PROJECT_DIR$/src/danielcortes/xyz/utils/Pair.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="300">
@@ -1271,42 +1191,7 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/danielcortes/xyz/data/MysqlConnectionHolder.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="108">
<caret line="31" column="66" selection-start-line="31" selection-start-column="66" selection-end-line="31" selection-end-column="66" />
<folding>
<element signature="e#1325#1326#0" expanded="true" />
<element signature="e#1415#1416#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/danielcortes/xyz/data/Configuration.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="72">
<caret line="30" column="22" lean-forward="true" selection-start-line="30" selection-start-column="22" selection-end-line="30" selection-end-column="22" />
<folding>
<element signature="e#1760#1761#0" expanded="true" />
<element signature="e#1806#1807#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/danielcortes/xyz/models/caja/SQLiteCajaDAO.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="242">
<caret line="111" column="20" lean-forward="true" selection-start-line="111" selection-start-column="20" selection-end-line="112" selection-end-column="64" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/danielcortes/xyz/models/calculo_fondo/SQLiteCalculoFondoDAO.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-1039">
<caret line="43" column="64" lean-forward="true" selection-start-line="43" selection-start-column="64" selection-end-line="44" selection-end-column="66" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/danielcortes/xyz/data/MysqlConnectionHolder.java" />
<entry file="file://$PROJECT_DIR$/src/danielcortes/xyz/models/documentos/SQLiteDocumentosDAO.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="132">
@@ -1551,13 +1436,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/danielcortes/xyz/Main.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="228">
<caret line="62" column="58" selection-start-line="62" selection-start-column="58" selection-end-line="62" selection-end-column="58" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/danielcortes/xyz/informes/InformeLibroDeVentas.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="255">
@@ -1651,9 +1529,17 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/dist/conf.properties">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="276">
<caret line="23" lean-forward="true" selection-start-line="23" selection-end-line="23" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/danielcortes/xyz/utils/Logger.java" />
<entry file="file://$PROJECT_DIR$/src/danielcortes/xyz/data/DAOManager.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="372">
<state relative-caret-position="273">
<caret line="72" column="40" selection-start-line="72" selection-start-column="40" selection-end-line="72" selection-end-column="40" />
<folding>
<element signature="e#3631#3632#0" expanded="true" />
@@ -1661,27 +1547,107 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/danielcortes/xyz/data/SQLiteConnectionHolder.java">
<entry file="file://$PROJECT_DIR$/src/danielcortes/xyz/data/Configuration.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="312">
<caret line="52" lean-forward="true" selection-start-line="52" selection-end-line="52" />
</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="120">
<caret line="32" lean-forward="true" selection-start-line="32" selection-end-line="32" />
<state relative-caret-position="109">
<caret line="33" selection-start-line="33" selection-end-line="34" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/dist/conf.properties">
<entry file="file://$PROJECT_DIR$/src/danielcortes/xyz/data/ConnectionHolder.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="276">
<caret line="23" lean-forward="true" selection-start-line="23" selection-end-line="23" />
<state relative-caret-position="96">
<caret line="30" column="15" selection-start-line="30" selection-start-column="15" selection-end-line="30" selection-end-column="15" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="jar:///usr/lib/jvm/java-11-openjdk/lib/src.zip!/java.logging/java/util/logging/Logger.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="48">
<caret line="27" column="7" lean-forward="true" selection-start-line="27" selection-start-column="7" selection-end-line="27" selection-end-column="7" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="jar:///usr/lib/jvm/java-11-openjdk/lib/src.zip!/java.logging/java/util/logging/Level.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-2151">
<caret line="77" column="13" selection-start-line="77" selection-start-column="13" selection-end-line="77" selection-end-column="13" />
</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="240">
<caret line="48" column="59" lean-forward="true" selection-start-line="48" selection-start-column="59" selection-end-line="48" selection-end-column="59" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/danielcortes/xyz/models/calculo_fondo/SQLiteCalculoFondoDAO.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1884">
<caret line="190" lean-forward="true" selection-start-line="190" selection-end-line="190" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/danielcortes/xyz/models/caja/SQLiteCajaDAO.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="362">
<caret line="188" column="25" selection-start-line="188" selection-start-column="25" selection-end-line="188" selection-end-column="25" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/dist/execution.log">
<provider editor-type-id="text-editor">
<state relative-caret-position="216">
<caret line="18" column="79" selection-start-line="18" selection-start-column="79" selection-end-line="18" selection-end-column="79" />
</state>
</provider>
<provider selected="true" editor-type-id="LogFileEditorProvider">
<state relative-caret-position="398">
<caret line="64" lean-forward="true" selection-start-line="64" selection-end-line="64" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/dist/logs.xml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="141">
<caret line="121" column="27" selection-start-line="121" selection-start-column="22" selection-end-line="121" selection-end-column="27" />
<folding>
<element signature="n#record#0;n#log#0;n#!!top" />
<element signature="n#record#1;n#log#0;n#!!top" />
<element signature="n#record#2;n#log#0;n#!!top" />
<element signature="n#record#3;n#log#0;n#!!top" />
<element signature="n#record#4;n#log#0;n#!!top" />
<element signature="n#record#5;n#log#0;n#!!top" />
<element signature="n#record#6;n#log#0;n#!!top" />
<element signature="n#record#7;n#log#0;n#!!top" />
<element signature="n#record#8;n#log#0;n#!!top" />
<element signature="n#record#10;n#log#0;n#!!top" />
<element signature="n#record#11;n#log#0;n#!!top" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/dist/logging.properties">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="326">
<caret line="28" column="48" selection-start-line="28" selection-start-column="48" selection-end-line="28" selection-end-column="48" />
</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="428">
<caret line="72" selection-start-line="72" selection-end-line="72" />
</state>
</provider>
</entry>
@@ -1703,9 +1669,9 @@
<settings>
<artifact-editor>
<show-content>
<type id="library" />
<type id="jpa-descriptors" />
<type id="javaee-facet-resources" />
<type id="library" />
<type id="artifact" />
</show-content>
</artifact-editor>
@@ -1782,7 +1748,7 @@
</state>
<state key="ProjectLibrariesConfigurable.UI">
<settings>
<last-edited>org.apache.poi:poi:4.0.1</last-edited>
<last-edited>forms_rt</last-edited>
<splitter-proportions>
<option name="proportions">
<list>

BIN
dist/Programa Caja.jar vendored
View File

Binary file not shown.

35
dist/logging.properties vendored Normal file
View File

@@ -0,0 +1,35 @@
#
# MIT License
#
# Copyright (c) 2018-2019 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.
#
#handlers= java.util.logging.ConsoleHandler
handlers= java.util.logging.FileHandler
java.util.logging.FileHandler.level = ALL
java.util.logging.FileHandler.pattern = logs.xml
java.util.logging.FileHandler.formatter = java.util.logging.XMLFormatter
#java.util.logging.ConsoleHandler.level = ALL
#java.util.logging.ConsoleHandler.formatter=java.util.logging.SimpleFormatter
danielcortes.level= FINE

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

@@ -29,7 +29,9 @@ import danielcortes.xyz.data.Configuration;
import danielcortes.xyz.views.ManagerView;
import javax.swing.*;
import java.util.Arrays;
import java.util.Locale;
import java.util.logging.*;
public class Main {
public static void main(String[] args) {
@@ -37,7 +39,7 @@ public class Main {
}
private static void run() {
setSystemProperties();
setUpSystemProperties();
ManagerView view = new ManagerView();
ManagerController managerController = new ManagerController(view);
@@ -56,7 +58,7 @@ public class Main {
}
private static void setSystemProperties() {
private static void setUpSystemProperties() {
System.setProperty("awt.useSystemAAFontSettings", "on");
System.setProperty("swing.aatext", "true");
@@ -67,8 +69,6 @@ public class Main {
}
Locale.setDefault(new Locale("es"));
}
}

14
src/danielcortes/xyz/data/Configuration.java
View File

@@ -27,21 +27,29 @@ package danielcortes.xyz.data;
import java.io.FileInputStream;
import java.io.IOException;
import java.util.Properties;
import java.util.logging.Level;
import java.util.logging.Logger;
public class Configuration {
private static final Logger LOGGER = Logger.getLogger( Configuration.class.getName() );
private static final Properties config;
static {
config = new Properties();
try {
LOGGER.log(Level.INFO, "Leyendo y llenando el objeto de properties");
FileInputStream in = new FileInputStream("conf.properties");
config.load(in);
in.close();
} catch (IOException e) {
System.err.println("Couldn't load properties! The application will close");
e.printStackTrace();
LOGGER.log(Level.INFO, "El objeto de properties se a llenado correctamente");
} catch (IOException e) {
LOGGER.log(Level.SEVERE, e.toString(), e);
System.exit(1);
}
}

8
src/danielcortes/xyz/data/SQLiteConnectionHolder.java
View File

@@ -27,8 +27,13 @@ package danielcortes.xyz.data;
import java.sql.Connection;
import java.sql.DriverManager;
import java.sql.SQLException;
import java.util.logging.Level;
import java.util.logging.Logger;
public class SQLiteConnectionHolder implements ConnectionHolder {
private static final Logger LOGGER = Logger.getLogger( Configuration.class.getName() );
private String databaseURI;
public SQLiteConnectionHolder() {
@@ -42,8 +47,9 @@ public class SQLiteConnectionHolder implements ConnectionHolder {
try {
Class.forName("org.sqlite.JDBC");
con = DriverManager.getConnection(databaseURI);
LOGGER.log(Level.FINER, "Creada conexion a base de datos SQLITE");
} catch (ClassNotFoundException e) {
e.printStackTrace();
LOGGER.log(Level.SEVERE, e.toString(), e);
System.exit(133);
}

56
src/danielcortes/xyz/models/caja/SQLiteCajaDAO.java
View File

@@ -24,6 +24,7 @@
package danielcortes.xyz.models.caja;
import danielcortes.xyz.data.Configuration;
import danielcortes.xyz.data.SQLiteConnectionHolder;
import danielcortes.xyz.models.documentos.Documentos;
import danielcortes.xyz.models.documentos.DocumentosDAO;
@@ -39,8 +40,12 @@ import java.sql.SQLException;
import java.time.LocalDate;
import java.util.ArrayList;
import java.util.List;
import java.util.logging.Level;
import java.util.logging.Logger;
public class SQLiteCajaDAO extends CajaDAO {
private static final Logger LOGGER = Logger.getLogger( Configuration.class.getName() );
public SQLiteCajaDAO() {
this.connectionHolder = new SQLiteConnectionHolder();
}
@@ -49,15 +54,18 @@ public class SQLiteCajaDAO extends CajaDAO {
public List<Caja> findAll() {
List<Caja> cajaList = new ArrayList<>();
try (Connection conn = connectionHolder.getConnection()) {
String query = "select * from caja";
PreparedStatement ps = conn.prepareStatement("select * from caja");
ResultSet rs = ps.executeQuery();
LOGGER.log(Level.FINE, "Se ejecuta query: {0}", query);
cajaList = this.cajasFromResultSet(rs);
rs.close();
ps.close();
} catch (SQLException e) {
e.printStackTrace();
LOGGER.log(Level.SEVERE, e.toString(), e);
}
return cajaList;
@@ -67,18 +75,19 @@ public class SQLiteCajaDAO extends CajaDAO {
public Caja findById(int id) {
Caja caja = null;
try (Connection conn = connectionHolder.getConnection()) {
PreparedStatement ps = conn.prepareStatement("select * from caja where id = ?");
String query = "select * from caja where id = ?";
PreparedStatement ps = conn.prepareStatement(query);
ps.setInt(1, id);
ResultSet rs = ps.executeQuery();
LOGGER.log(Level.FINE, "Se ejecuta query: {0}, con id = {1}", new Object[]{query, id});
caja = this.cajasFromResultSet(rs).get(0);
rs.close();
ps.close();
} catch (SQLException e) {
e.printStackTrace();
LOGGER.log(Level.SEVERE, e.toString(), e);
}
return caja;
}
@@ -87,12 +96,14 @@ public class SQLiteCajaDAO extends CajaDAO {
public Caja findByFecha(LocalDate fecha) {
Caja caja = null;
try (Connection conn = connectionHolder.getConnection()) {
PreparedStatement ps = conn.prepareStatement("select * from caja where fecha = ?");
String query = "select * from caja where fecha = ?";
PreparedStatement ps = conn.prepareStatement(query);
ps.setString(1, fecha.toString());
ResultSet rs = ps.executeQuery();
LOGGER.log(Level.FINE, "Se ejecuta query: {0}, con fecha = {1}", new Object[]{query, fecha});
List<Caja> cajaList = this.cajasFromResultSet(rs);
if (cajaList.size() > 0) {
@@ -102,7 +113,7 @@ public class SQLiteCajaDAO extends CajaDAO {
rs.close();
ps.close();
} catch (SQLException e) {
e.printStackTrace();
LOGGER.log(Level.SEVERE, e.toString(), e);
}
return caja;
}
@@ -111,22 +122,30 @@ public class SQLiteCajaDAO extends CajaDAO {
public boolean insertCaja(Caja caja) {
int updates;
try (Connection conn = connectionHolder.getConnection()) {
PreparedStatement ps = conn.prepareStatement("insert into caja (fecha) values (?)");
String query = "insert into caja (fecha) values (?)";
PreparedStatement ps = conn.prepareStatement(query);
ps.setString(1, caja.getFecha().toString());
updates = ps.executeUpdate();
LOGGER.log(Level.FINE, "Se ejecuta query: {0}, con fecha = {1}", new Object[]{query, caja.getFecha().toString()});
ps.close();
query = "select last_insert_rowid()";
ps = conn.prepareStatement("select last_insert_rowid()");
ResultSet rs = ps.executeQuery();
LOGGER.log(Level.FINE, "Se ejecuta query: {0}", new Object[]{query});
rs.next();
caja.setId(rs.getInt(1));
rs.close();
ps.close();
} catch (SQLException e) {
e.printStackTrace();
LOGGER.log(Level.SEVERE, e.toString(), e);
return false;
}
return updates > 0;
@@ -136,15 +155,17 @@ public class SQLiteCajaDAO extends CajaDAO {
public boolean updateCaja(Caja caja) {
int updates;
try (Connection conn = connectionHolder.getConnection()) {
PreparedStatement ps = conn.prepareStatement("update caja set fecha = ? where id = ?");
String query = "update caja set fecha = ? where id = ?";
PreparedStatement ps = conn.prepareStatement(query);
ps.setString(1, caja.getFecha().toString());
ps.setInt(2, caja.getId());
updates = ps.executeUpdate();
LOGGER.log(Level.FINE, "Se ejecuta query: {0}, con fecha = {1} y id = {2}", new Object[]{query, caja.getFecha(), caja.getId()});
ps.close();
} catch (SQLException e) {
e.printStackTrace();
} catch (SQLException e) {
LOGGER.log(Level.SEVERE, e.toString(), e);
return false;
}
return updates > 0;
@@ -155,6 +176,8 @@ public class SQLiteCajaDAO extends CajaDAO {
LocalDate date = month.withDayOfMonth(1);
LocalDate endDate = date.withDayOfMonth(date.lengthOfMonth()).plusDays(1);
LOGGER.log(Level.FINE, "Se intentara crear las cajas para un mes para las fechas entre {0} y {1}", new Object[]{date, endDate});
while (date.isBefore(endDate)) {
if (this.findByFecha(date) != null) {
date = date.plusDays(1);
@@ -177,6 +200,5 @@ public class SQLiteCajaDAO extends CajaDAO {
date = date.plusDays(1);
}
}
}

59
src/danielcortes/xyz/models/calculo_fondo/SQLiteCalculoFondoDAO.java
View File

@@ -24,6 +24,7 @@
package danielcortes.xyz.models.calculo_fondo;
import danielcortes.xyz.data.Configuration;
import danielcortes.xyz.data.SQLiteConnectionHolder;
import danielcortes.xyz.models.caja.Caja;
@@ -33,8 +34,12 @@ import java.sql.ResultSet;
import java.sql.SQLException;
import java.util.ArrayList;
import java.util.List;
import java.util.logging.Level;
import java.util.logging.Logger;
public class SQLiteCalculoFondoDAO extends CalculoFondoDAO {
private static final Logger LOGGER = Logger.getLogger(Configuration.class.getName());
public SQLiteCalculoFondoDAO() {
this.connectionHolder = new SQLiteConnectionHolder();
}
@@ -43,15 +48,18 @@ public class SQLiteCalculoFondoDAO extends CalculoFondoDAO {
public List<CalculoFondo> findAll() {
List<CalculoFondo> calculoFondoList = new ArrayList<>();
try (Connection conn = connectionHolder.getConnection()) {
PreparedStatement ps = conn.prepareStatement("select * from calculo_fondo");
String query = "select * from calculo_fondo";
PreparedStatement ps = conn.prepareStatement(query);
ResultSet rs = ps.executeQuery();
LOGGER.log(Level.FINE, "Se ejecuta query: {0}", query);
calculoFondoList = this.cajasFromResultSet(rs);
rs.close();
ps.close();
} catch (SQLException e) {
e.printStackTrace();
LOGGER.log(Level.SEVERE, e.toString(), e);
}
return calculoFondoList;
}
@@ -60,17 +68,19 @@ public class SQLiteCalculoFondoDAO extends CalculoFondoDAO {
public List<CalculoFondo> findByCaja(Caja caja) {
List<CalculoFondo> calculoFondoList = new ArrayList<>();
try (Connection conn = connectionHolder.getConnection()) {
PreparedStatement ps = conn.prepareStatement("select * from calculo_fondo where caja_id = ?");
String query = "select * from calculo_fondo where caja_id = ?";
PreparedStatement ps = conn.prepareStatement(query);
ps.setInt(1, caja.getId());
ResultSet rs = ps.executeQuery();
LOGGER.log(Level.FINE, "Se ejecuta query: {0} con caja_id = {1}", new Object[]{query, caja.getId()});
calculoFondoList = this.cajasFromResultSet(rs);
rs.close();
ps.close();
} catch (SQLException e) {
e.printStackTrace();
LOGGER.log(Level.SEVERE, e.toString(), e);
}
return calculoFondoList;
}
@@ -79,16 +89,19 @@ public class SQLiteCalculoFondoDAO extends CalculoFondoDAO {
public CalculoFondo findById(int id) {
CalculoFondo calculoFondo = null;
try (Connection conn = connectionHolder.getConnection()) {
PreparedStatement ps = conn.prepareStatement("select * from calculo_fondo where id = ?");
String query = "select * from calculo_fondo where id = ?";
PreparedStatement ps = conn.prepareStatement(query);
ps.setInt(1, id);
ResultSet rs = ps.executeQuery();
LOGGER.log(Level.FINE, "Se ejecuta query: {0} con id = {1}", new Object[]{query, id});
calculoFondo = this.cajasFromResultSet(rs).get(0);
rs.close();
ps.close();
} catch (SQLException e) {
e.printStackTrace();
LOGGER.log(Level.SEVERE, e.toString(), e);
}
return calculoFondo;
}
@@ -97,23 +110,28 @@ public class SQLiteCalculoFondoDAO extends CalculoFondoDAO {
public boolean insertCalculoFondo(CalculoFondo calculoFondo) {
int updates;
try (Connection conn = connectionHolder.getConnection()) {
PreparedStatement ps = conn.prepareStatement("insert into calculo_fondo (valor, descripcion, caja_id) values (?, ?, ?)");
String query = "insert into calculo_fondo (valor, descripcion, caja_id) values (?, ?, ?)";
PreparedStatement ps = conn.prepareStatement(query);
ps.setInt(1, calculoFondo.getValor());
ps.setString(2, calculoFondo.getDescripcion());
ps.setInt(3, calculoFondo.getCaja().getId());
updates = ps.executeUpdate();
LOGGER.log(Level.FINE, "Se ejecuta query: {0} con valor = {1}, descripcion = {2}, caja_id = {3}. se realizaron {4} updates", new Object[]{query, calculoFondo.getValor(), calculoFondo.getDescripcion(), calculoFondo.getCaja().getId(), updates});
ps.close();
ps = conn.prepareStatement("select last_insert_rowid()");
ResultSet rs = ps.executeQuery();
LOGGER.log(Level.FINE, "Se ejecuta query: {0}", query);
rs.next();
calculoFondo.setId(rs.getInt(1));
rs.close();
ps.close();
} catch (SQLException e) {
e.printStackTrace();
LOGGER.log(Level.SEVERE, e.toString(), e);
return false;
}
return updates > 0;
@@ -123,17 +141,19 @@ public class SQLiteCalculoFondoDAO extends CalculoFondoDAO {
public boolean updateCalculoFondo(CalculoFondo calculoFondo) {
int updates;
try (Connection conn = connectionHolder.getConnection()) {
PreparedStatement ps = conn.prepareStatement("update calculo_fondo set valor = ?, descripcion = ?, caja_id = ? where id = ?");
String query = "update calculo_fondo set valor = ?, descripcion = ?, caja_id = ? where id = ?";
PreparedStatement ps = conn.prepareStatement(query);
ps.setInt(1, calculoFondo.getValor());
ps.setString(2, calculoFondo.getDescripcion());
ps.setInt(3, calculoFondo.getCaja().getId());
ps.setInt(4, calculoFondo.getId());
updates = ps.executeUpdate();
LOGGER.log(Level.FINE, "Se ejecuta query: {0} con valor = {1}, descripcion = {2}, caja_id = {3}, id = {4}. se realizaron {5} updates", new Object[]{query, calculoFondo.getValor(), calculoFondo.getDescripcion(), calculoFondo.getCaja().getId(), calculoFondo.getId(), updates});
ps.close();
} catch (SQLException e) {
e.printStackTrace();
LOGGER.log(Level.SEVERE, e.toString(), e);
return false;
}
return updates > 0;
@@ -143,14 +163,16 @@ public class SQLiteCalculoFondoDAO extends CalculoFondoDAO {
public boolean deleteCalculoFondo(CalculoFondo calculoFondo) {
int updates;
try (Connection conn = connectionHolder.getConnection()) {
PreparedStatement ps = conn.prepareStatement("delete from calculo_fondo where id = ?");
String query = "delete from calculo_fondo where id = ?";
PreparedStatement ps = conn.prepareStatement(query);
ps.setInt(1, calculoFondo.getId());
updates = ps.executeUpdate();
LOGGER.log(Level.FINE, "Se ejecuta query: {0} con id = {1}. Se realizaron {2} updates", new Object[]{query, calculoFondo.getId(), updates});
ps.close();
} catch (SQLException e) {
e.printStackTrace();
LOGGER.log(Level.SEVERE, e.toString(), e);
return false;
}
return updates > 0;
@@ -160,16 +182,19 @@ public class SQLiteCalculoFondoDAO extends CalculoFondoDAO {
public int getTotalCalculoFondo(Caja caja) {
int sum = 0;
try (Connection conn = connectionHolder.getConnection()) {
PreparedStatement ps = conn.prepareStatement("select sum(valor) from calculo_fondo where caja_id = ?");
String query = "select sum(valor) from calculo_fondo where caja_id = ?";
PreparedStatement ps = conn.prepareStatement(query);
ps.setInt(1, caja.getId());
ResultSet rs = ps.executeQuery();
LOGGER.log(Level.FINE, "Se ejecuta query: {0} con caja_id = {1}", new Object[]{query, caja.getId()});
rs.next();
sum = rs.getInt(1);
ps.close();
} catch (SQLException e) {
e.printStackTrace();
LOGGER.log(Level.SEVERE, e.toString(), e);
}
return sum;
}