From a00fa7b87ea9adcf7d213d61ff6ab2c64c700be0 Mon Sep 17 00:00:00 2001
From: Daniel Cortes <daniel.cortes.p159@gmail.com>
Date: Tue, 8 Jan 2019 17:50:39 -0300
Subject: [PATCH] Correccion con bug sobre seleccion de mes

---
 .idea/workspace.xml                           | 104 +++++++++---------
 dist/database.sqlite                          | Bin 32768 -> 32768 bytes
 .../SQLiteInformeMensualContentDAO.java       |   2 +-
 3 files changed, 52 insertions(+), 54 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 9f8fd85..c646ff2 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -11,27 +11,8 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="a633d35a-56a6-4479-b4c4-f97198052fb7" name="Default Changelist" comment="">
-      <change afterPath="$PROJECT_DIR$/src/danielcortes/xyz/controllers/InformesController.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/danielcortes/xyz/views/InformeMensualDialog.form" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/danielcortes/xyz/views/InformeMensualDialog.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/danielcortes/xyz/views/InformesView.form" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/danielcortes/xyz/views/InformesView.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/danielcortes/xyz/views/components/YearSpinnerModel.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/dataSources/6e2ee496-6ca2-4cc4-a2b0-4f122e6bfd50.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/dataSources/6e2ee496-6ca2-4cc4-a2b0-4f122e6bfd50.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/dist/caja.jar" beforeDir="false" afterPath="$PROJECT_DIR$/dist/caja.jar" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/dist/database.sqlite" beforeDir="false" afterPath="$PROJECT_DIR$/dist/database.sqlite" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/danielcortes/xyz/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/ManagerController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/danielcortes/xyz/controllers/ManagerController.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$/src/danielcortes/xyz/models/caja/CajaDAO.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/danielcortes/xyz/models/caja/CajaDAO.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/danielcortes/xyz/models/caja/MysqlCajaDAO.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/danielcortes/xyz/models/caja/MysqlCajaDAO.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/informe/InformeMensualContent.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/danielcortes/xyz/models/informe/InformeMensualContent.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" />
-      <change beforePath="$PROJECT_DIR$/src/danielcortes/xyz/views/ManagerView.form" beforeDir="false" afterPath="$PROJECT_DIR$/src/danielcortes/xyz/views/ManagerView.form" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/danielcortes/xyz/views/ManagerView.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/danielcortes/xyz/views/ManagerView.java" afterDir="false" />
     </list>
     <ignored path="$PROJECT_DIR$/target/" />
     <ignored path=".idea/" />
@@ -81,11 +62,23 @@
   </component>
   <component name="FileEditorManager">
     <leaf>
-      <file pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/src/danielcortes/xyz/views/InformeMensualDialog.form">
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/danielcortes/xyz/views/InformesView.form">
           <provider selected="true" editor-type-id="ui-designer" />
         </entry>
       </file>
+      <file pinned="false" current-in-tab="true">
+        <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="62" selection-start-line="57" selection-start-column="62" selection-end-line="57" selection-end-column="62" />
+              <folding>
+                <element signature="imports" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
     </leaf>
   </component>
   <component name="FileTemplateManagerImpl">
@@ -191,7 +184,6 @@
         <option value="$PROJECT_DIR$/src/danielcortes/xyz/controllers/ArqueoController.java" />
         <option value="$PROJECT_DIR$/src/danielcortes/xyz/views/ManagerView.form" />
         <option value="$PROJECT_DIR$/src/danielcortes/xyz/views/ManagerView.java" />
-        <option value="$PROJECT_DIR$/src/danielcortes/xyz/views/InformesView.form" />
         <option value="$PROJECT_DIR$/src/danielcortes/xyz/views/InformesView.java" />
         <option value="$PROJECT_DIR$/src/danielcortes/xyz/controllers/ManagerController.java" />
         <option value="$PROJECT_DIR$/src/danielcortes/xyz/views/components/YearSpinnerModel.java" />
@@ -200,6 +192,7 @@
         <option value="$PROJECT_DIR$/src/danielcortes/xyz/Main.java" />
         <option value="$PROJECT_DIR$/src/danielcortes/xyz/controllers/InformesController.java" />
         <option value="$PROJECT_DIR$/src/danielcortes/xyz/views/InformeMensualDialog.form" />
+        <option value="$PROJECT_DIR$/src/danielcortes/xyz/views/InformesView.form" />
       </list>
     </option>
   </component>
@@ -278,14 +271,6 @@
               <item name="xyz" type="462c0819:PsiDirectoryNode" />
               <item name="views" type="462c0819:PsiDirectoryNode" />
             </path>
-            <path>
-              <item name="caja" type="b2602c69:ProjectViewProjectNode" />
-              <item name="caja" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="xyz" type="462c0819:PsiDirectoryNode" />
-              <item name="views" type="462c0819:PsiDirectoryNode" />
-              <item name="InformeMensualDialog" type="e9f4de52:FormNode" />
-            </path>
             <path>
               <item name="caja" type="b2602c69:ProjectViewProjectNode" />
               <item name="Scratches and Consoles" type="1a2a3e82:ScratchProjectViewPane$MyProjectNode" />
@@ -318,7 +303,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="1546979816344" />
+    <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1546980618974" />
     <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" />
@@ -525,7 +510,7 @@
       <workItem from="1546913305144" duration="3160000" />
       <workItem from="1546964533822" duration="3016000" />
       <workItem from="1546968089184" duration="170000" />
-      <workItem from="1546968296762" duration="8349000" />
+      <workItem from="1546968296762" duration="8643000" />
     </task>
     <task id="LOCAL-00001" summary="First!! :3 Existe una pequeña base de proyecto por ahora">
       <created>1545280618093</created>
@@ -779,11 +764,25 @@
       <option name="project" value="LOCAL" />
       <updated>1546900333240</updated>
     </task>
-    <option name="localTasksCounter" value="37" />
+    <task id="LOCAL-00037" summary="Generacion de informes desde la interfaz :3">
+      <created>1546980323786</created>
+      <option name="number" value="00037" />
+      <option name="presentableId" value="LOCAL-00037" />
+      <option name="project" value="LOCAL" />
+      <updated>1546980323786</updated>
+    </task>
+    <task id="LOCAL-00038" summary="Eliminados botones innesesarios en la vista de informes">
+      <created>1546980519704</created>
+      <option name="number" value="00038" />
+      <option name="presentableId" value="LOCAL-00038" />
+      <option name="project" value="LOCAL" />
+      <updated>1546980519704</updated>
+    </task>
+    <option name="localTasksCounter" value="39" />
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="264665000" />
+    <option name="totallyTimeSpent" value="264959000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -796,18 +795,17 @@
   </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" weight="0.21841705" />
       <window_info id="Image Layers" order="1" />
       <window_info id="Designer" order="2" />
-      <window_info active="true" x="458" y="95" width="450" height="453" id="UI Designer" order="3" visible="true" weight="0.20243531" />
+      <window_info x="458" y="95" width="450" height="453" id="UI Designer" order="3" weight="0.20243531" />
       <window_info id="Capture Tool" order="4" />
       <window_info id="Favorites" order="5" show_stripe_button="false" sideWeight="0.505618" side_tool="true" weight="0.17275494" />
       <window_info id="simpleUML" order="6" weight="0.329429" />
       <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 active="true" anchor="bottom" x="4" y="0" width="902" height="488" id="Run" order="2" sideWeight="0.49923897" visible="true" weight="0.3130016" />
       <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" />
@@ -888,8 +886,6 @@
   <component name="VcsManagerConfiguration">
     <option name="CHECK_CODE_SMELLS_BEFORE_PROJECT_COMMIT" value="false" />
     <option name="CHECK_NEW_TODO" value="false" />
-    <MESSAGE value="Creo que esta funciona jajaja, inclusion de cajas en Egresos" />
-    <MESSAGE value="Funcionalidad de guardar el efectivo de una caja!! :3" />
     <MESSAGE value="Funcionalidad de ingresar documentos en el arqueo!" />
     <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" />
@@ -913,7 +909,9 @@
     <MESSAGE value="NumberFormatedTextField ahora calcula la operacion matematica ingresada en su campo" />
     <MESSAGE value="Arreglado horrible error con el parseo matematico" />
     <MESSAGE value="Correccion de cosas .w. No estoy seguro que e hecho" />
-    <option name="LAST_COMMIT_MESSAGE" value="Correccion de cosas .w. No estoy seguro que e hecho" />
+    <MESSAGE value="Generacion de informes desde la interfaz :3" />
+    <MESSAGE value="Eliminados botones innesesarios en la vista de informes" />
+    <option name="LAST_COMMIT_MESSAGE" value="Eliminados botones innesesarios en la vista de informes" />
   </component>
   <component name="antWorkspaceConfiguration">
     <option name="IS_AUTOSCROLL_TO_SOURCE" value="false" />
@@ -1075,16 +1073,6 @@
         </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="115">
-          <caret line="49" column="36" selection-start-line="49" selection-start-column="36" selection-end-line="49" selection-end-column="36" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
-        </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">
@@ -1351,9 +1339,6 @@
         </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/views/InformesView.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="209">
@@ -1479,6 +1464,19 @@
     <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/views/InformesView.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="62" selection-start-line="57" selection-start-column="62" selection-end-line="57" selection-end-column="62" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
   </component>
   <component name="masterDetails">
     <states>
diff --git a/dist/database.sqlite b/dist/database.sqlite
index 20f6a622d9f0d9115ce0a943149a56b260b7068e..674b26c4c6424df993e9725493aa8c614f0243c3 100644
GIT binary patch
delta 1274
zcmYk*J7^Sf5XbS{9ZmxNe`6vk0!DLt@5k=#<L>rubH0LBA_2iBLBYa8A%%sYpt4tp
zf><cgfM6NHfQ?*03oDhRu~F12g+lBE1?|md5@ELa?uRKBW|@9J-S4L#97wG{oIH_Q
ze|cefUnVjui^HQwLUuXJW1PkxY~l;n@CwiI1ov<Q3pkHi9D@f7`;jq!%@6a{tee+n
zWpHNHH8G;hkQI1-<amJ-bkNld(a~%p)NG-x*+fe-KvUC4py|OE#ycPOBY0};cj0Pw
z(9jIwXtrT%woun>qNW+3su}yJXnQCtdJ#&RT@*DtC}@VrYqpWoY{AlOBD>9r-OYOe
zru5h!96hvVWqLfmIDC92<W1h-&-{Vk^BZ2}7re|*`4Qje+kBI+@&aGvb9|Oh^GQC;
zEw;J9lRTdM;U&b>+cPvWl8R_r+NDU^p{_Kfj<ijov_)-clUmY%no^$vsYkxlB~RKQ
zSL#qhYLg?alP#UAQC(iDRFhVyDlJn*TB5SFNF`~3iqbq4q&dn<Ey_u=WJ#w6KW8VB
z6`A?P;VUyCzTqR@Vt{2l#vNS4CCuRzda!X2Z2p<w=DYc1-kDYN%q*F^=DN9T=93j|
z?2XYg$%=NLRD@~GE+Wn3L^P8V(M(Q6GdU5><U}-+6A{KcUrr@AqQ}XNXu9w;8*nup
zG&F5EnswNkHPkiZDr(vlR5i<}XqHgcETW`YKv6S~f@ThRO$)hgPW<0|7M31Q4SwAk
GOK$=Dcc=FN

delta 73
zcmZo@U}|V!njp<sHc`fzv20_)5`JbmKD){60=AnK6@Kw<wv#)i$gIHkW-_~jBT!@s
a-{v=d5<n5&_mkNRKqAX|H@~kHWC8$HuNU6{

diff --git a/src/danielcortes/xyz/models/informe/SQLiteInformeMensualContentDAO.java b/src/danielcortes/xyz/models/informe/SQLiteInformeMensualContentDAO.java
index a495108..7f8e8f7 100644
--- a/src/danielcortes/xyz/models/informe/SQLiteInformeMensualContentDAO.java
+++ b/src/danielcortes/xyz/models/informe/SQLiteInformeMensualContentDAO.java
@@ -55,7 +55,7 @@ public class SQLiteInformeMensualContentDAO extends InformeMensualContentDAO {
             PreparedStatement ps = conn.prepareStatement(query);
 
             ps.setString(1, date.withDayOfMonth(1).toString());
-            ps.setString(2, date.withDayOfMonth(LocalDate.now().lengthOfMonth()).toString());
+            ps.setString(2, date.withDayOfMonth(date.lengthOfMonth()).toString());
 
             ResultSet rs = ps.executeQuery();
             while (rs.next()) {