Cambiada el nombre de la propiedad para la base de datos actual.
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
This commit is contained in:
Daniel Cortes
155
.idea/workspace.xml
generated
155
.idea/workspace.xml
generated
@@ -10,17 +10,10 @@
|
||||
</component>
|
||||
<component name="ChangeListManager">
|
||||
<list default="true" id="a633d35a-56a6-4479-b4c4-f97198052fb7" name="Default Changelist" comment="">
|
||||
<change afterPath="$PROJECT_DIR$/src/danielcortes/xyz/data/DAOManager.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" 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/controllers/ArqueoController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/danielcortes/xyz/controllers/ArqueoController.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/src/danielcortes/xyz/controllers/CalcularFondoController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/danielcortes/xyz/controllers/CalcularFondoController.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/src/danielcortes/xyz/controllers/EgresosController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/danielcortes/xyz/controllers/EgresosController.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/src/danielcortes/xyz/controllers/IngresosController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/danielcortes/xyz/controllers/IngresosController.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/src/danielcortes/xyz/controllers/ManagerController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/danielcortes/xyz/controllers/ManagerController.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/src/danielcortes/xyz/informes/InformeLibroDeVentas.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/danielcortes/xyz/informes/InformeLibroDeVentas.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/src/danielcortes/xyz/models/informes/libro_de_ventas/SQLiteInformeLibroDeVentasContentDAO.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/danielcortes/xyz/models/informes/libro_de_ventas/SQLiteInformeLibroDeVentasContentDAO.java" 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$/src/danielcortes/xyz/data/SQLiteConnectionHolder.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/danielcortes/xyz/data/SQLiteConnectionHolder.java" afterDir="false" />
|
||||
</list>
|
||||
<ignored path="$PROJECT_DIR$/target/" />
|
||||
<ignored path=".idea/" />
|
||||
@@ -64,30 +57,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/models/informes/libro_de_ventas/SQLiteInformeLibroDeVentasContentDAO.java">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="120">
|
||||
<caret line="67" column="61" selection-start-line="67" selection-start-column="61" selection-end-line="67" selection-end-column="61" />
|
||||
<folding>
|
||||
<element signature="method#fillTotalesFromResultSet#0;class#SQLiteInformeLibroDeVentasContentDAO#0" />
|
||||
<element signature="method#fillBoletasFromResultSet#0;class#SQLiteInformeLibroDeVentasContentDAO#0" />
|
||||
</folding>
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
</file>
|
||||
<file pinned="false" current-in-tab="false">
|
||||
<entry file="file://$PROJECT_DIR$/src/danielcortes/xyz/models/informes/libro_de_ventas/InformeLibroDeVentasContentDAO.java">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="84">
|
||||
<caret line="56" column="31" selection-start-line="56" selection-start-column="31" selection-end-line="56" selection-end-column="31" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
</file>
|
||||
</leaf>
|
||||
<leaf />
|
||||
</component>
|
||||
<component name="FileTemplateManagerImpl">
|
||||
<option name="RECENT_TEMPLATES">
|
||||
@@ -156,7 +126,6 @@
|
||||
<component name="IdeDocumentHistory">
|
||||
<option name="CHANGED_PATHS">
|
||||
<list>
|
||||
<option value="$PROJECT_DIR$/database/sqlite.sql" />
|
||||
<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" />
|
||||
@@ -184,9 +153,7 @@
|
||||
<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$/dist/conf.properties" />
|
||||
<option value="$PROJECT_DIR$/src/danielcortes/xyz/data/Configuration.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$/src/danielcortes/xyz/models/documentos/SQLiteDocumentosDAO.java" />
|
||||
@@ -207,6 +174,9 @@
|
||||
<option value="$PROJECT_DIR$/src/danielcortes/xyz/controllers/ArqueoController.java" />
|
||||
<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" />
|
||||
</list>
|
||||
</option>
|
||||
</component>
|
||||
@@ -270,20 +240,6 @@
|
||||
<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>
|
||||
<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="data" type="462c0819:PsiDirectoryNode" />
|
||||
</path>
|
||||
<path>
|
||||
<item name="caja" type="b2602c69:ProjectViewProjectNode" />
|
||||
<item name="caja" type="462c0819:PsiDirectoryNode" />
|
||||
@@ -307,7 +263,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="1547962806519" />
|
||||
<property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1547963188090" />
|
||||
<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="" />
|
||||
@@ -561,14 +517,7 @@
|
||||
<workItem from="1547878415974" duration="1068000" />
|
||||
<workItem from="1547927651543" duration="3625000" />
|
||||
<workItem from="1547931339438" duration="5895000" />
|
||||
<workItem from="1547960032707" duration="2667000" />
|
||||
</task>
|
||||
<task id="LOCAL-00015" summary="Calculo de Arqueo done!!! Siguiente paso deben ser los informes, o tal vez mejorar el codigo Q_Q">
|
||||
<created>1545974148415</created>
|
||||
<option name="number" value="00015" />
|
||||
<option name="presentableId" value="LOCAL-00015" />
|
||||
<option name="project" value="LOCAL" />
|
||||
<updated>1545974148415</updated>
|
||||
<workItem from="1547960032707" duration="3205000" />
|
||||
</task>
|
||||
<task id="LOCAL-00016" summary="Tecnicamente esta terminada la funcionalidad basica">
|
||||
<created>1545982355969</created>
|
||||
@@ -906,7 +855,14 @@
|
||||
<option name="project" value="LOCAL" />
|
||||
<updated>1547961420802</updated>
|
||||
</task>
|
||||
<option name="localTasksCounter" value="64" />
|
||||
<task id="LOCAL-00064" summary="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. Supongo que dara mayor flexibilidad a cuando se quiera cambiar a un orm o cambiar la conexion a otra base de datos">
|
||||
<created>1547962893611</created>
|
||||
<option name="number" value="00064" />
|
||||
<option name="presentableId" value="LOCAL-00064" />
|
||||
<option name="project" value="LOCAL" />
|
||||
<updated>1547962893611</updated>
|
||||
</task>
|
||||
<option name="localTasksCounter" value="65" />
|
||||
<servers />
|
||||
</component>
|
||||
<component name="TestHistory">
|
||||
@@ -942,7 +898,7 @@
|
||||
</history-entry>
|
||||
</component>
|
||||
<component name="TimeTrackingManager">
|
||||
<option name="totallyTimeSpent" value="352095000" />
|
||||
<option name="totallyTimeSpent" value="352633000" />
|
||||
</component>
|
||||
<component name="TodoView">
|
||||
<todo-panel id="selected-file">
|
||||
@@ -955,7 +911,6 @@
|
||||
</component>
|
||||
<component name="ToolWindowManager">
|
||||
<frame x="0" y="-18" width="1366" height="765" extended-state="6" />
|
||||
<editor active="true" />
|
||||
<layout>
|
||||
<window_info active="true" content_ui="combo" id="Project" order="0" sideWeight="0.49438202" visible="true" weight="0.15785609" />
|
||||
<window_info id="Image Layers" order="1" />
|
||||
@@ -976,7 +931,7 @@
|
||||
<window_info anchor="bottom" id="Event Log" order="9" sideWeight="0.50293684" side_tool="true" weight="0.26497006" />
|
||||
<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" visible="true" weight="0.2637037" />
|
||||
<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="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" />
|
||||
@@ -1083,8 +1038,6 @@
|
||||
<component name="VcsManagerConfiguration">
|
||||
<option name="CHECK_CODE_SMELLS_BEFORE_PROJECT_COMMIT" value="false" />
|
||||
<option name="CHECK_NEW_TODO" value="false" />
|
||||
<MESSAGE value="Correccion con bug sobre seleccion de mes" />
|
||||
<MESSAGE value="Mensaje de confirmacion al generarse el informe" />
|
||||
<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 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" />
|
||||
@@ -1108,7 +1061,9 @@
|
||||
<MESSAGE value="Probando a agregar tests xD" />
|
||||
<MESSAGE value="Mejorado el manejo del archivo properties respecto como se carga y lee en el resto de clases la clase responsable cambio de nombre a configuration y ahora tiene un bloque estatico que inicializa el objeto properties y expone el get de este objeto" />
|
||||
<MESSAGE value="se ejecuto limpieza del codigo, reformateo del codigo y optimizacion de los imports por parte del IDE" />
|
||||
<option name="LAST_COMMIT_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. 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. 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. 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" />
|
||||
</component>
|
||||
<component name="antWorkspaceConfiguration">
|
||||
<option name="IS_AUTOSCROLL_TO_SOURCE" value="false" />
|
||||
@@ -1316,13 +1271,6 @@
|
||||
</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/data/MysqlConnectionHolder.java">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="108">
|
||||
@@ -1484,13 +1432,6 @@
|
||||
</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="72">
|
||||
<caret line="28" column="17" selection-start-line="28" selection-start-column="17" selection-end-line="28" selection-end-column="17" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/src/danielcortes/xyz/controllers/EgresosController.java">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="185">
|
||||
@@ -1692,24 +1633,13 @@
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/src/danielcortes/xyz/data/SQLiteConnectionHolder.java">
|
||||
<entry file="file://$PROJECT_DIR$/src/danielcortes/xyz/models/informes/libro_de_ventas/SQLiteInformeLibroDeVentasContentDAO.java">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="144">
|
||||
<caret line="38" column="58" selection-start-line="38" selection-start-column="58" selection-end-line="38" selection-end-column="58" />
|
||||
<state relative-caret-position="120">
|
||||
<caret line="67" column="61" selection-start-line="67" selection-start-column="61" selection-end-line="67" selection-end-column="61" />
|
||||
<folding>
|
||||
<element signature="method#getConnection#0;class#SQLiteConnectionHolder#0" />
|
||||
<element signature="e#1556#1613#0" />
|
||||
<element signature="e#1647#1691#0" />
|
||||
</folding>
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/src/danielcortes/xyz/data/DAOManager.java">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="115">
|
||||
<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" />
|
||||
<element signature="method#fillTotalesFromResultSet#0;class#SQLiteInformeLibroDeVentasContentDAO#0" />
|
||||
<element signature="method#fillBoletasFromResultSet#0;class#SQLiteInformeLibroDeVentasContentDAO#0" />
|
||||
</folding>
|
||||
</state>
|
||||
</provider>
|
||||
@@ -1721,17 +1651,40 @@
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/src/danielcortes/xyz/models/informes/libro_de_ventas/SQLiteInformeLibroDeVentasContentDAO.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">
|
||||
<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" />
|
||||
</folding>
|
||||
</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="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="67" column="61" selection-start-line="67" selection-start-column="61" selection-end-line="67" selection-end-column="61" />
|
||||
<caret line="32" lean-forward="true" selection-start-line="32" selection-end-line="32" />
|
||||
<folding>
|
||||
<element signature="method#fillTotalesFromResultSet#0;class#SQLiteInformeLibroDeVentasContentDAO#0" />
|
||||
<element signature="method#fillBoletasFromResultSet#0;class#SQLiteInformeLibroDeVentasContentDAO#0" />
|
||||
<element signature="imports" expanded="true" />
|
||||
</folding>
|
||||
</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>
|
||||
</component>
|
||||
<component name="masterDetails">
|
||||
<states>
|
||||
|
||||
Reference in New Issue
Block a user