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

Solucionado bug que no generaba el ultimo dia del mes :3

Browse Source
This commit is contained in:
Daniel Cortes
2019-01-09 15:19:27 -03:00
parent 6d44fb7ddd
commit 6c2cf1ce5d
5 changed files with 77 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

148
.idea/workspace.xml generated
View File

@@ -13,8 +13,9 @@
<list default="true" id="a633d35a-56a6-4479-b4c4-f97198052fb7" name="Default Changelist" comment="">
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/dist/caja.jar" beforeDir="false" afterPath="$PROJECT_DIR$/dist/caja.jar" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/danielcortes/xyz/controllers/InformesController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/danielcortes/xyz/controllers/InformesController.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/danielcortes/xyz/informes/InformeMensual.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/danielcortes/xyz/informes/InformeMensual.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/dist/database.sqlite" beforeDir="false" afterPath="$PROJECT_DIR$/dist/database.sqlite" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/danielcortes/xyz/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/informe/SQLiteInformeMensualContentDAO.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/danielcortes/xyz/models/informe/SQLiteInformeMensualContentDAO.java" afterDir="false" />
</list>
<ignored path="$PROJECT_DIR$/target/" />
<ignored path=".idea/" />
@@ -63,30 +64,12 @@
<favorites_list name="caja" />
</component>
<component name="FileEditorManager">
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
<leaf>
<file pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/src/danielcortes/xyz/controllers/InformesController.java">
<entry file="file://$PROJECT_DIR$/src/danielcortes/xyz/models/caja/SQLiteCajaDAO.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="485">
<caret line="110" column="11" lean-forward="true" selection-start-line="106" selection-start-column="15" selection-end-line="110" selection-end-column="11" />
<folding>
<element signature="method#InformesController#0;class#InformesController#0" />
<element signature="method#setupViewEvents#0;class#InformesController#0" />
<element signature="method#askForMonth#0;class#InformesController#0" />
</folding>
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/danielcortes/xyz/informes/InformeMensual.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="2461">
<caret line="146" column="20" selection-start-line="146" selection-start-column="20" selection-end-line="146" selection-end-column="20" />
<folding>
<element signature="imports" expanded="true" />
<element signature="method#generateStyles#0;class#InformeMensual#0" />
</folding>
<state relative-caret-position="94">
<caret line="162" column="19" lean-forward="true" selection-start-line="162" selection-start-column="19" selection-end-line="162" selection-end-column="19" />
</state>
</provider>
</entry>
@@ -189,7 +172,6 @@
<option value="$PROJECT_DIR$/src/danielcortes/xyz/models/informe/InformeMensualContent.java" />
<option value="$APPLICATION_CONFIG_DIR$/consoles/db/6e2ee496-6ca2-4cc4-a2b0-4f122e6bfd50/console.sql" />
<option value="$PROJECT_DIR$/src/danielcortes/xyz/models/caja/CajaDAO.java" />
<option value="$PROJECT_DIR$/src/danielcortes/xyz/models/caja/SQLiteCajaDAO.java" />
<option value="$PROJECT_DIR$/src/danielcortes/xyz/models/caja/MysqlCajaDAO.java" />
<option value="$PROJECT_DIR$/src/danielcortes/xyz/controllers/InformeController.java" />
<option value="$PROJECT_DIR$/src/danielcortes/xyz/controllers/ArqueoController.java" />
@@ -202,9 +184,10 @@
<option value="$PROJECT_DIR$/src/danielcortes/xyz/Main.java" />
<option value="$PROJECT_DIR$/src/danielcortes/xyz/views/InformeMensualDialog.form" />
<option value="$PROJECT_DIR$/src/danielcortes/xyz/views/InformesView.form" />
<option value="$PROJECT_DIR$/src/danielcortes/xyz/models/informe/SQLiteInformeMensualContentDAO.java" />
<option value="$PROJECT_DIR$/src/danielcortes/xyz/informes/InformeMensual.java" />
<option value="$PROJECT_DIR$/src/danielcortes/xyz/controllers/InformesController.java" />
<option value="$PROJECT_DIR$/src/danielcortes/xyz/models/informe/SQLiteInformeMensualContentDAO.java" />
<option value="$PROJECT_DIR$/src/danielcortes/xyz/models/caja/SQLiteCajaDAO.java" />
</list>
</option>
</component>
@@ -250,6 +233,7 @@
</navigator>
<panes>
<pane id="Scope" />
<pane id="PackagesPane" />
<pane id="ProjectPane">
<subPane>
<expand>
@@ -273,14 +257,15 @@
<item name="caja" type="462c0819:PsiDirectoryNode" />
<item name="src" type="462c0819:PsiDirectoryNode" />
<item name="xyz" type="462c0819:PsiDirectoryNode" />
<item name="controllers" type="462c0819:PsiDirectoryNode" />
<item name="models" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="caja" type="b2602c69:ProjectViewProjectNode" />
<item name="caja" type="462c0819:PsiDirectoryNode" />
<item name="src" type="462c0819:PsiDirectoryNode" />
<item name="xyz" type="462c0819:PsiDirectoryNode" />
<item name="views" type="462c0819:PsiDirectoryNode" />
<item name="models" type="462c0819:PsiDirectoryNode" />
<item name="caja" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="caja" type="b2602c69:ProjectViewProjectNode" />
@@ -301,7 +286,6 @@
<select />
</subPane>
</pane>
<pane id="PackagesPane" />
</panes>
</component>
<component name="PropertiesComponent">
@@ -315,7 +299,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="1546982340496" />
<property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1547057852492" />
<property name="com.intellij.ide.scratch.LRUPopupBuilder$1/Change SQL Dialect" value="SQLite" />
<property name="database.console.LAST_STATE" value="false" />
<property name="database.data.extractors.current.id" value="Tab-separated (TSV)_id" />
@@ -523,7 +507,8 @@
<workItem from="1546964533822" duration="3016000" />
<workItem from="1546968089184" duration="170000" />
<workItem from="1546968296762" duration="9932000" />
<workItem from="1546982620530" duration="234000" />
<workItem from="1546982620530" duration="468000" />
<workItem from="1547056862751" duration="901000" />
</task>
<task id="LOCAL-00001" summary="First!! :3 Existe una pequeña base de proyecto por ahora">
<created>1545280618093</created>
@@ -798,11 +783,18 @@
<option name="project" value="LOCAL" />
<updated>1546980639033</updated>
</task>
<option name="localTasksCounter" value="40" />
<task id="LOCAL-00040" summary="Mensaje de confirmacion al generarse el informe">
<created>1546983008762</created>
<option name="number" value="00040" />
<option name="presentableId" value="LOCAL-00040" />
<option name="project" value="LOCAL" />
<updated>1546983008762</updated>
</task>
<option name="localTasksCounter" value="41" />
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="266482000" />
<option name="totallyTimeSpent" value="267617000" />
</component>
<component name="TodoView">
<todo-panel id="selected-file">
@@ -815,9 +807,8 @@
</component>
<component name="ToolWindowManager">
<frame x="0" y="-18" width="1366" height="765" extended-state="6" />
<editor active="true" />
<layout>
<window_info content_ui="combo" id="Project" order="0" sideWeight="0.49438202" visible="true" weight="0.22222222" />
<window_info active="true" content_ui="combo" id="Project" order="0" sideWeight="0.49438202" visible="true" weight="0.2260274" />
<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.20243531" />
@@ -826,7 +817,7 @@
<window_info id="simpleUML" order="6" weight="0.329429" />
<window_info anchor="bottom" id="Message" order="0" />
<window_info anchor="bottom" id="Find" order="1" weight="0.32744783" />
<window_info anchor="bottom" x="4" y="0" width="902" height="488" id="Run" order="2" sideWeight="0.49923897" weight="0.3130016" />
<window_info anchor="bottom" x="4" y="0" width="902" height="488" id="Run" order="2" sideWeight="0.49923897" weight="0.30658105" />
<window_info anchor="bottom" id="Debug" order="3" weight="0.39967898" />
<window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
<window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
@@ -907,7 +898,6 @@
<component name="VcsManagerConfiguration">
<option name="CHECK_CODE_SMELLS_BEFORE_PROJECT_COMMIT" value="false" />
<option name="CHECK_NEW_TODO" value="false" />
<MESSAGE value="No deberia ser editable" />
<MESSAGE value="Calculo de Arqueo done!!! &#10;Siguiente paso deben ser los informes, o tal vez mejorar el codigo Q_Q" />
<MESSAGE value="Tecnicamente esta terminada la funcionalidad basica" />
<MESSAGE value="Agregadas clases para compatibilidad con sqlite" />
@@ -932,7 +922,8 @@
<MESSAGE value="Generacion de informes desde la interfaz :3" />
<MESSAGE value="Eliminados botones innesesarios en la vista de informes" />
<MESSAGE value="Correccion con bug sobre seleccion de mes" />
<option name="LAST_COMMIT_MESSAGE" value="Correccion con bug sobre seleccion de mes" />
<MESSAGE value="Mensaje de confirmacion al generarse el informe" />
<option name="LAST_COMMIT_MESSAGE" value="Mensaje de confirmacion al generarse el informe" />
</component>
<component name="antWorkspaceConfiguration">
<option name="IS_AUTOSCROLL_TO_SOURCE" value="false" />
@@ -1087,13 +1078,6 @@
</state>
</provider>
</entry>
<entry file="file://$APPLICATION_CONFIG_DIR$/consoles/db/6e2ee496-6ca2-4cc4-a2b0-4f122e6bfd50/console.sql">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="103">
<caret line="6" column="75" selection-start-line="6" selection-start-column="11" selection-end-line="6" selection-end-column="75" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/danielcortes/xyz/models/caja/CajaDAO.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="232">
@@ -1104,13 +1088,6 @@
</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="189">
<caret line="160" lean-forward="true" selection-start-line="160" selection-end-line="189" selection-end-column="5" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/danielcortes/xyz/models/caja/MysqlCajaDAO.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="212">
@@ -1290,13 +1267,6 @@
</state>
</provider>
</entry>
<entry file="das://6e2ee496-6ca2-4cc4-a2b0-4f122e6bfd50/schema/main/table/caja">
<provider selected="true" editor-type-id="com.intellij.database.editor.DatabaseTableFileEditorProvider">
<state>
<filtering enabled="true" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/danielcortes/xyz/models/efectivo/SQLiteEfectivoDAO.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="150">
@@ -1461,35 +1431,43 @@
<entry file="file://$PROJECT_DIR$/src/danielcortes/xyz/views/InformeMensualDialog.form">
<provider selected="true" editor-type-id="ui-designer" />
</entry>
<entry file="file://$PROJECT_DIR$/src/danielcortes/xyz/models/informe/SQLiteInformeMensualContentDAO.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="266">
<caret line="57" column="52" selection-start-line="57" selection-start-column="52" selection-end-line="57" selection-end-column="52" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/danielcortes/xyz/views/InformesView.form">
<provider selected="true" editor-type-id="ui-designer" />
</entry>
<entry file="file://$PROJECT_DIR$/src/danielcortes/xyz/controllers/InformesController.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="485">
<caret line="110" column="11" lean-forward="true" selection-start-line="106" selection-start-column="15" selection-end-line="110" selection-end-column="11" />
<state relative-caret-position="258">
<caret line="64" column="53" lean-forward="true" selection-start-line="64" selection-start-column="53" selection-end-line="64" selection-end-column="53" />
<folding>
<element signature="method#InformesController#0;class#InformesController#0" />
<element signature="method#setupViewEvents#0;class#InformesController#0" />
<element signature="e#1991#2022#1" />
<element signature="e#2351#2382#1" />
<element signature="method#askForMonth#0;class#InformesController#0" />
<element signature="e#2768#2831#1" />
<element signature="e#2837#2873#1" />
<element signature="method#askForFile#0;class#InformesController#0" />
<element signature="e#3284#3483#1" />
<element signature="e#3489#3525#1" />
<element signature="method#showConfirmation#0;class#InformesController#0" />
<element signature="e#3920#4063#1" />
<element signature="e#3945#4001#0" />
<element signature="e#4024#4068#0" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$APPLICATION_CONFIG_DIR$/consoles/db/6e2ee496-6ca2-4cc4-a2b0-4f122e6bfd50/console.sql">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="138">
<caret line="6" column="75" selection-start-line="6" selection-start-column="11" selection-end-line="6" selection-end-column="75" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/danielcortes/xyz/informes/InformeMensual.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="2461">
<caret line="146" column="20" selection-start-line="146" selection-start-column="20" selection-end-line="146" selection-end-column="20" />
<state relative-caret-position="23">
<caret line="66" column="68" selection-start-line="66" selection-start-column="68" selection-end-line="66" selection-end-column="68" />
<folding>
<element signature="imports" expanded="true" />
<element signature="method#generateStyles#0;class#InformeMensual#0" />
@@ -1497,6 +1475,30 @@
</state>
</provider>
</entry>
<entry file="das://6e2ee496-6ca2-4cc4-a2b0-4f122e6bfd50/schema/main/table/caja">
<provider selected="true" editor-type-id="com.intellij.database.editor.DatabaseTableFileEditorProvider">
<state>
<filtering enabled="true" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/danielcortes/xyz/models/informe/SQLiteInformeMensualContentDAO.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="673">
<caret line="58" column="83" selection-start-line="58" selection-start-column="83" selection-end-line="58" selection-end-column="83" />
<folding>
<element signature="imports" 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="94">
<caret line="162" column="19" lean-forward="true" selection-start-line="162" selection-start-column="19" selection-end-line="162" selection-end-column="19" />
</state>
</provider>
</entry>
</component>
<component name="masterDetails">
<states>

BIN
dist/caja.jar vendored
View File

Binary file not shown.

BIN
dist/database.sqlite vendored
View File

Binary file not shown.

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

@@ -162,7 +162,7 @@ public class SQLiteCajaDAO extends CajaDAO {
@Override
public void createCajasForMonth(LocalDate month) {
LocalDate date = month.withDayOfMonth(1);
LocalDate endDate = date.withDayOfMonth(date.lengthOfMonth());
LocalDate endDate = date.withDayOfMonth(date.lengthOfMonth()).plusDays(1);
while(date.isBefore(endDate)) {
if(this.findByFecha(date) != null){

1
src/danielcortes/xyz/models/informe/SQLiteInformeMensualContentDAO.java
View File

@@ -57,6 +57,7 @@ public class SQLiteInformeMensualContentDAO extends InformeMensualContentDAO {
ps.setString(1, date.withDayOfMonth(1).toString());
ps.setString(2, date.withDayOfMonth(date.lengthOfMonth()).toString());
ResultSet rs = ps.executeQuery();
while (rs.next()) {
InformeMensualContent informeMensualContent = new InformeMensualContent();