diff --git a/.classpath b/.classpath
index 79207fa..08f7d5d 100644
--- a/.classpath
+++ b/.classpath
@@ -4,5 +4,7 @@
+
+
diff --git a/bin/Logica/Gestion.class b/bin/Logica/Gestion.class
index 84ca809..6d6d95b 100644
Binary files a/bin/Logica/Gestion.class and b/bin/Logica/Gestion.class differ
diff --git a/bin/Logica/Transaccion.class b/bin/Logica/Transaccion.class
index 9081292..6409146 100644
Binary files a/bin/Logica/Transaccion.class and b/bin/Logica/Transaccion.class differ
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 gestiones;
private float suma;
private static float total;
+ private static Month mes;
+ private static Year anio;
public Gestion() {
this.gestiones=new Vector();
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;
+ }
+
}