From 7d6a25303399741d448a905b62a41d1bccddf257 Mon Sep 17 00:00:00 2001
From: roche <roche@localhost>
Date: Wed, 13 Nov 2019 13:59:45 +0100
Subject: [PATCH] Soporte a fecha iniciado

---
 .classpath                                    |   2 ++
 bin/Logica/Gestion.class                      | Bin 1579 -> 1647 bytes
 bin/Logica/Transaccion.class                  | Bin 1484 -> 1593 bytes
 src/Logica/Gestion.java                       |   4 ++++
 src/Logica/Transaccion.java                   |   8 ++++---
 .../ControladorPanelLateral.java              |  17 +++++++++++----
 src/VistaControlador/Menu.java                |   1 +
 .../VistaAniadirVisualizar.java               |   8 +++++--
 src/VistaControlador/VistaPanelLateral.java   |  20 +++++++++++++++---
 9 files changed, 48 insertions(+), 12 deletions(-)

diff --git a/.classpath b/.classpath
index 79207fa..08f7d5d 100644
--- a/.classpath
+++ b/.classpath
@@ -4,5 +4,7 @@
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="lib" path="/home/roche/Descargas/jfreechart-1.5.0-javadoc.jar"/>
 	<classpathentry kind="lib" path="/home/roche/Descargas/jfreechart-1.5.0.jar"/>
+	<classpathentry kind="lib" path="/home/roche/Descargas/LGoodDatePicker-10.4.1-javadoc.jar"/>
+	<classpathentry kind="lib" path="/home/roche/Descargas/LGoodDatePicker-10.4.1.jar"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/bin/Logica/Gestion.class b/bin/Logica/Gestion.class
index 84ca809d39d821111a6af1683ce83e6808677f2b..6d6d95b29a88e960726e509958124cc1d872c050 100644
GIT binary patch
literal 1647
zcmZ`&U2hXd6g}hEIB}MI;UrGNH<bDV;-=-Z34s<!6v@ycM=pV<vAr<^_AXkF^V~nc
zLm&AAMZ6$rAxK3cJoA^3P|wV+!6D|sJ9qBP+;i?Z*B?Ip_YS~WtR@i?7%BM;Rg=Y4
zx2=`$B@q`Gdmy)Du_?Vq@we&&x26S#8sWLy7MLj6^Nv={Vuh!Eu*eH#)$pY51g=1K
z&xNH@1hXDUuPtjeLM<-yS-jn8Ndd7UkkG!CO@V=y0T~Z#Xw`CyH+@gvH<zWSeA4SV
z+Hj>o-?yYZrI-0Qo2&5RHNWnrFo3j!F^nfM)orSWbPAJ54?$qYK?3_sH0NLlDH9!X
zFpQMIXi0hQtxl`z2J5ogWOEZGzb2a%87Q-ll5u@sk@Q%%%}7l$bI4iNRj?}Cn%t+e
z-7CFH<SK^DcMeYBd-fpfb%Du9#U2|Lb9Yn7p^!x0^03DB)NybcXRKHHI%x;QqaG{f
zP0_&*SP)35_V0dMX|)v|-W3?uUpx^=_v0t9zpQ2L;Z6A{YB<?&b=g`s$Y?!u&S7|?
z>9$-?`&1*H&FvWkDw6M${^op4$fkA!8B|nTRaH~fC8ddH*FwcEJ6OgQc1d8P*jfbG
ztC{Kk7YDzZ?t80kb*l}!5oM0y8Wk%0ouKBfC}Xx0898qz9>+Ks1N`qK5Hl0QU6Q*P
z2KnRMFix4Nv8#jqb{)YeS96zx$nOMqWmXYfXYy}wApaJV8*ecE8kzj?Ys?P+i-RwD
z7{g(Hrw9a=io+BdMVe(YEOdlfCoF=aBnHOEaUueEOn?}37xJ%=DQx59ANh?}m}Qi$
z5`yde6O8|ZgEm9Jrx=NLn-Tngg+FXNOtZU5QklXbOe0GI1<c?)<}8h=5GtZUQ2dCW
zNaQRD#1Si`7@xzLh+2`W={-Sev(FiXeHwv4$S-{*qJl#N>OMYcZ?P=Ne*N~ieQUZF
zq;QdSLvt=!$$MclFTR33)dyDKXDqT5{SphN55Czka?WjI={<7WxcUV5tgO4TR^VM3
zN<BxuyK>p875&kkypjJY?)0g<N#l0a=vy~@pV?E_;F+lkZ9Q*?GtW6H(9YAiM1^l*
z9=B1%CKjM*;h!||FPiu_&3i@<-tm@kC$xL#v)wzmhU*l{*gc5&N8FyilIH#f_c5&e
E4<+PF0{{R3

literal 1579
zcmZ`(TT@a|7+o7s5RZz8s9Ba~3YgLTrrBM`8M-()bbH#sk#-@cIUIcM5A@Juf1sw9
zri+)En#rE~OU*Q`eK;y8J;3?)-e<41zO_F1{rCG%0OxT#2%kWA#ww|TOfQ&KM_H91
z0s@g2a!sbovQkPv$iFZPjzCALer{F;q8azR=BRQy$5YFm;R{(+sz|41n*xagFU)2<
znq^y7s<KcZ)yy2P1*)}GDIn$r+8oP~Wr6ltRZ-5IfIpGU@r~P7(G0_nhyep#K}2^1
zHV6o#7m*GK^c!eHyRHTdbRev&Ap@NV3-n}E#k^lz&71bJ%$F%Nnz0J9oRhZFYi~2)
zJXh>8vLo4ZhGGp_QL?D)1zB}0G9-3hY3wSQ(_%&qjNv$Yki{ZZd5$z#I+J`F#tBRY
zG2!ZPLukM;kU-M)-MK^AHu>nsyuLGK;3TF6!m9evswzjV)eoNvbUJ(f3dCCJ6X?o1
zvhebreC0J9ESXN$jUmKpxt@Z-@^0B&H7kxqH)4t8fl%p4s>SwyvyRHLW7^WrsjAAW
zvMNei6G$x99lK)SDhTN(v36|HBW(0ccYn>mobJ96ZEXiFWO|Z0Qj2sbYt`(6Ij?ls
zh8N^1J-ry^VEFkv@WZDkhN~b~K7{z;+^`Poso_(faq#%v%~h5+1fN5xE%c;*p!dlZ
z`Zf?tb#5Tu`3-|#c<93+e#Z$6f&~cEL$DZO1_?CGU84?y!#Ki~zzB|d1aDkPz@^kW
zVpE$q_9*pa9dTCUc~bD1dWYVx7<6|?_yOJCYQ>}XyYwS&M-d9>rIaX%`Z!ZDOraka
zG2qIGQ!1%E8M-=!G=-ezZUDZiFzYi&deZcX?!ArD;-6U5`_u-3lzV-(d4L@_yL)-u
zeT%RZyZ`Qpdsj;lILE&xpBKgj*YZZ%*ynw;V=ZU}`@2La<|WSPK6qza+c~_6%fE19
z6SME|%(b;?*EP6lhgJ_$Z`0m*-ZlNzfqiZN2Rv?pyTag_Fk0f)?++fp)qHxY>akwr
z1OXEab&_!=aD@)vM+!>}b_LT=jPNx>e9I8uGrW(?;3qCL#J#;6_cpHM2945jhY<LK
OrGe`)u5WVf!>xaW;W*d;

diff --git a/bin/Logica/Transaccion.class b/bin/Logica/Transaccion.class
index 908129278669a8ba523ade7090adc9db02b4ab7a..64091466153377f6048ab5e0debe5fa9afe6d2df 100644
GIT binary patch
delta 787
zcmZvY-%b-j7{$+QcP%U<6lk}#NNEc~nNk;}_^&F8h(H=H^ol#H5`w`tF%4dLLE;-U
z^BP`YVhf7#0gP|qt-gZs4BH54Hk-`Ow|ma{otd8lU!?ov@7M1D%GhYR4KGoBUE8nu
z&D}TKezozkwzpDiZdY3GUp#d&hVdva3yg+HBr=!~h}0YJ1d@f>(3pM*<Rk_l&2F;w
zyQ=02fpV`_-|?R{-|p6TDyyMpy(wnwIfm=!Rx<12D(0i`1!AXd&iN&-;krH)i+x3u
zB?hsm|A_R^O#wk$5w|7oprSpiLcu*V+}B%Hj>7|qSt$L%`gX7n3lUyRRvlqj72Alb
zsWv=iw~<oENVoZi`}`+rEKG6DAj(z3#zpj#I*1{RB8D`EF@X_WF=;_2rZL0G%nmN_
zD$Fj5J|+qJ3K04vGQE^nC1QFBaS{?FcvL1yNZ}Hn3^|5SW+KQVL1*pK0nfwC7{9HN
zZAh6D6t~o8#E(%r!otXn4sLPuI=I`x(jgVWd4gW!r>Qb<c6$pv#Bw*)=i8(@j7WX#
zG3SspodUP>-~9;7`j@RH&8@klfs7dco@o<Z?TVgv#v+fgsyChVE29ru`RBA}xlck{
P<$GH#gqqhFZejf&-yU*a

delta 687
zcmZut+e#Zj82)C>nz*hSHHoX)#8Xz|*cj7#sKz#)5CdKag5YID5KB=I@m73*(#l*5
zK7bb%ns~$q5MROv=qr?dlNFWV%|HJ?^PT>=wjUd<hkrNs0LHL*V(l5Cc=B_zr2ztQ
z8;!7amrx60ML6o0h=`)P7K36yJqb6Nh74jzApEU#Sjv7c?QUn+4)%9;w`~mLgNhsD
zIS(T?nvoTVrdMiV`Jwd?asr~qf`?BwGmNWaBj4m<QV*X6-1L$<Gu)7eX&e1WslUeE
z(E$w9F>+E~qE!x;5s|4fVlq&Mqf3`A?r$OtBsC5}Rto_x)Bv5Q3GJ*7T97~(-F)rw
z6?yh@(i{`@+}&q~s3gefV+|`ANEKX}pi!+y8$H_T5g|6pE{0BYP|K-$j8PNp=%IcD
zGDqA;>+x=x?p3c_cpLH$B3Br^M5b-Df{z?y6--nxbwQ-Rk)JGHRkeMlR^_`u9y8CX
zS)N+eq=a)`L+(b0-rHxJFYGUvQLCox*Z*eG4gB>mbG~Au&)Bc()Qr~^Fsp9Ot}TuC
YQ)S*@Uv=l+P36|6%DqdTr?`QI|EG#jZvX%Q

diff --git a/src/Logica/Gestion.java b/src/Logica/Gestion.java
index 2183cfb..b8ec119 100644
--- a/src/Logica/Gestion.java
+++ b/src/Logica/Gestion.java
@@ -1,10 +1,14 @@
 package Logica;
+import java.time.Month;
+import java.time.Year;
 import java.util.Vector;
 
 public class Gestion{
 	private Vector<Transaccion> gestiones;
 	private float suma;
 	private static float total;
+	private static Month mes;
+	private static Year anio;
 	
 	public Gestion() {
 		this.gestiones=new Vector<Transaccion>();
diff --git a/src/Logica/Transaccion.java b/src/Logica/Transaccion.java
index a40c8f8..2e05623 100644
--- a/src/Logica/Transaccion.java
+++ b/src/Logica/Transaccion.java
@@ -1,21 +1,23 @@
 package Logica;
 
+import java.time.LocalDate;
+
 public class Transaccion {
 	private String nombre;
 	private float dinero;
 	private boolean visible;
-	private int dia;
+	private LocalDate dia;
 	private boolean positivo;
 	
 	public Transaccion(String nombre, float dinero){
 		this.nombre=nombre;
 		this.dinero=dinero;
 		this.visible=true;
-		this.dia=1;
+		this.dia=LocalDate.now();
 		this.positivo=true;
 	}
 	
-	public Transaccion(String nombre, float dinero, int dia, boolean positivo){
+	public Transaccion(String nombre, float dinero, LocalDate dia, boolean positivo){
 		this.nombre=nombre;
 		this.dinero=dinero;
 		this.visible=true;
diff --git a/src/VistaControlador/ControladorPanelLateral.java b/src/VistaControlador/ControladorPanelLateral.java
index e55d6f6..3703441 100644
--- a/src/VistaControlador/ControladorPanelLateral.java
+++ b/src/VistaControlador/ControladorPanelLateral.java
@@ -1,12 +1,20 @@
 package VistaControlador;
 
+import java.awt.Frame;
+import java.awt.GridBagConstraints;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
+
+import javax.swing.JFrame;
+
 import org.jfree.chart.ChartFactory;
 import org.jfree.chart.ChartFrame;
 import org.jfree.chart.JFreeChart;
 import org.jfree.data.xy.XYSeries;
 import org.jfree.data.xy.XYSeriesCollection;
+
+import com.github.lgooddatepicker.components.DatePicker;
+import com.github.lgooddatepicker.zinternaltools.DemoPanel;
 public class ControladorPanelLateral implements ActionListener{
 	private VistaPanelLateral vista;
 	
@@ -27,17 +35,18 @@ public class ControladorPanelLateral implements ActionListener{
 			ChartFrame frame=new ChartFrame("Estadisricas", chart);
 			frame.setVisible(true);
 			frame.setSize(700,500);
-		}else if(e.getActionCommand().equals(this.vista.elegirMes.getActionCommand())){
-			
 		}
+		//}else if(e.getActionCommand().equals(this.vista.elegirMes.getActionCommand())){
+			
+		//}
 		
 	}
 	
 	private void aniadirElementos() {
 		this.vista.mostrarEstadisticas.addActionListener(this);
 		this.vista.mostrarEstadisticas.setActionCommand("Mostrar estadisticas");
-		this.vista.elegirMes.addActionListener(this);
-		this.vista.elegirMes.setActionCommand("Elegir mes");
+		//this.vista.elegirMes.addActionListener(this);
+		//this.vista.elegirMes.setActionCommand("Elegir mes");
 	}
 
 }
diff --git a/src/VistaControlador/Menu.java b/src/VistaControlador/Menu.java
index a20baeb..e80c6b5 100644
--- a/src/VistaControlador/Menu.java
+++ b/src/VistaControlador/Menu.java
@@ -23,6 +23,7 @@ public class Menu extends JFrame{
 	protected Gestion datosGastos;
 	protected Gestion datosIngresos;
 	public Menu() {
+		VistaAniadirVisualizar.setPanelLateral(panel);
 		this.datosGastos=new Gestion();
 		this.datosIngresos=new Gestion();
 		this.setLayout(new GridBagLayout());
diff --git a/src/VistaControlador/VistaAniadirVisualizar.java b/src/VistaControlador/VistaAniadirVisualizar.java
index 5ab4343..e001dec 100644
--- a/src/VistaControlador/VistaAniadirVisualizar.java
+++ b/src/VistaControlador/VistaAniadirVisualizar.java
@@ -21,7 +21,7 @@ public class VistaAniadirVisualizar extends JPanel{
 	JScrollPane panel;
 	Menu menu;
 	boolean positivo;
-	
+	static VistaPanelLateral panelLateral;
 	public VistaAniadirVisualizar(Menu menu, Gestion gestion,boolean positivo) {
 		this.positivo=positivo;
 		this.gestiones=gestion;
@@ -41,8 +41,12 @@ public class VistaAniadirVisualizar extends JPanel{
 		this.add(panel);
 	}
 	
+	public static void setPanelLateral(VistaPanelLateral panel) {
+		VistaAniadirVisualizar.panelLateral=panel;
+	}
+	
 	public void aniadirElemento(String nombre, float dinero, ControladorAniadirVisualizar controlador) {
-		Transaccion transaccion=new Transaccion(nombre, dinero,1,this.positivo);
+		Transaccion transaccion=new Transaccion(nombre, dinero,panelLateral.getDate(),this.positivo);
 		this.gestiones.aniadirGasto(transaccion);
 		JCheckBox check=new JCheckBox(transaccion.toString());
 		check.setSelected(true);
diff --git a/src/VistaControlador/VistaPanelLateral.java b/src/VistaControlador/VistaPanelLateral.java
index 4fcf7b4..8999f45 100644
--- a/src/VistaControlador/VistaPanelLateral.java
+++ b/src/VistaControlador/VistaPanelLateral.java
@@ -2,30 +2,34 @@ package VistaControlador;
 
 import java.awt.Dimension;
 import java.awt.GridBagConstraints;
+import java.time.LocalDate;
+import java.util.Date;
 
 import javax.swing.JButton;
 import javax.swing.JPanel;
 import javax.swing.JTextArea;
 
+import com.github.lgooddatepicker.components.DatePicker;
+
 import Logica.Gestion;
 
 public class VistaPanelLateral extends JPanel{
 	protected JTextArea total;
 	protected JTextArea gastoEnvio;
-	protected JButton elegirMes;
+	//protected JButton elegirMes;
+	protected static DatePicker elegirMes=inicializarCalendario();
 	protected JButton mostrarEstadisticas;
 	
 	VistaPanelLateral(GridBagConstraints constrain){
 		this.setPreferredSize(new Dimension(200,200));
 		this.total=new JTextArea();
 		this.gastoEnvio=new JTextArea();
-		this.elegirMes=new JButton("Elegir mes");
 		this.mostrarEstadisticas=new JButton("Mostrar grafico del mes");
 		this.add(this.mostrarEstadisticas);
 		constrain.gridx=1;
 		constrain.gridy=0;
 		constrain.weightx=2;
-		this.add(this.elegirMes);
+		this.add(VistaPanelLateral.elegirMes);
 		constrain.gridx=1;
 		constrain.gridy=1;
 		constrain.weightx=2;
@@ -41,4 +45,14 @@ public class VistaPanelLateral extends JPanel{
 		this.gastoEnvio.setText("Suma: "+String.valueOf(gestion.getSuma())+"€");
 	}
 	
+	static LocalDate getDate() {
+		return elegirMes.getDate();
+	}
+	
+	static DatePicker inicializarCalendario() {
+		DatePicker ret=new DatePicker();
+		ret.setDate(LocalDate.now());
+		return ret;
+	}
+	
 }