From 6afe1af5a1cdd78dc630189dcb91c91341d5f9d0 Mon Sep 17 00:00:00 2001 From: roche Date: Tue, 26 Nov 2019 22:40:15 +0100 Subject: [PATCH] Aniadidas opciones varias y corregidos bugs --- .config | 4 +- .mes | Bin 580 -> 588 bytes bin/.gitignore | 1 + bin/Logica/Gestion.class | Bin 3126 -> 3759 bytes bin/Logica/Transaccion.class | Bin 1922 -> 2147 bytes src/Logica/Gestion.java | 19 +++++++++ src/Logica/Transaccion.java | 9 ++++ .../ControladorPanelModificar.java | 10 ++++- src/VistaControlador/Menu.java | 1 + .../VistaAniadirVisualizar.java | 40 +++++++++++++++++- src/VistaControlador/VistaPanelModificar.java | 20 ++++++++- 11 files changed, 98 insertions(+), 6 deletions(-) diff --git a/.config b/.config index aa35193..243ca9f 100644 --- a/.config +++ b/.config @@ -1,4 +1,4 @@ #Configuracion general -#Fri Nov 22 12:55:58 CET 2019 -tema=0 +#Tue Nov 26 22:32:47 CET 2019 +tema=2 ruta=.mes diff --git a/.mes b/.mes index 1a24fde2135f079667aba213bd1bdc1a9a131ea0..e58bf97a284fd02f41f6e481fab0a3cbb5c99a88 100644 GIT binary patch delta 119 zcmX@Ya)xEXWG1JAiBmOYBrA%G82Ehh(=(G3_1sg7OEUBGmhvvYlfUEY)QPtO*&G-c z7#tWT8!~RwWl1bfOe`*BsAFJoDqvt>1T$I7*_jy_*dKFCRe<^IV7WsDlew9+d07&3 O((_9gSPN2%it+(3q9gDC delta 111 zcmX@Za)f2VWG0uYiBmOY#43u582Ehh(=(G3_1sg7OEUBGE-&Yn@BNYLHSty;n@be~ zgG<$9L&j|?Y<~HZrf!Q0b6OYLP4Mw6%;iQ;*(f|HjxlTz-V0CMYfh!+FC_XF7?h$ zJc8i$(Zm-;aJ^s*&ph}8OnmSs=nqh5TO~2x_F;C;ocZSaX6ERHPu#1F)kXhI1FwOG`z20Il7AOFM(`T}7krBo-iF10!k3o4NYC8^f0Z;=S! zDMLe;!J1H$KQM*fzvMFr9oe$>KW11EWhnTa%cU~>uCPH<bFp-YGUZ3t+}7adM}u{5!r8APkKlKIJNVEZ%Y57riYD{-`;1npRl z!-Q)k)KR|MHf2|c^*BlqL?uG-LZO-`_!nC<>)=DS?FUcHIL)tdh~e(Hk2CaQmZ6-i z3nJMtVNVh^Lf9_Ch6#HL6?EgH&OjWM6g9qDs-FiMCwV6k;SR~;=%U%~0g5ObBN(G0 z08co#RrRgY(ftqJ1o0+`_cYZ{5krD_d;ZIN8Zu0T%%cg^Q6Ke0XNTz+Y`~b{<})~(mB-4dFB9QreRC)(($TYktvW7DJJgmBAV}2Ci(HepI7)sYXeTlWNrExc1#3%|q1ZFztQ>evG0KV>pI! zn(8f_1IGYvV+s?vheQgtkR_&%u?U|{83Kj-hse8(rs0*aQP*!6Q4)NQ2rPh v^4&VdfBI!QZtJ)csCq^%n=*@EL4yPClYKxB@F8C*ug;yytd`Vq#LzRFtRnL3zldCzOo3U8IUY#SJRMyy zFq+ETQkg3m)VKA>FS9;a;9;40BtOk&qab!*(6D48&>N57V?TR|>WLAjng$NgLXCV6 z^chW(2%hmD#7|PL2j}9QggBy_qc|KRMVd~IbBc`o4)z({av{`hoRihiS>vL73ysA3 zb>?N77@(ais_&tluN0BEu39e+HI%qZ?9|U4UNwkE%zJ$^#|>^ zF)XvTliyM0Jyq?0DsQ%Te^V_hNh+SiR-9rVMO|)MLz$t6S$Z|-9P|2F3(73Aq-TQ? z&sgRaE3&PI6H-&vIyssBKw+Tc9e3YS)Pnl9*va0s-=-SDuQeS9Qm(yQ@$KJiQKZx9fJOBUy diff --git a/bin/Logica/Transaccion.class b/bin/Logica/Transaccion.class index 5a3811a76e844526514e5e7806763722e16f3181..a8e1d0418f3f0b7035c57018ef7bb094383f9801 100644 GIT binary patch delta 356 zcmZqTe=NXt>ff$?3=9k=46z%zJ}|p;6sMNBr6y-2GBQYL_+%xPCF+-C=BDcVTQ zxFnXOT5E0?*^ff$?3=9k=4B;EOJ}^&qW=Uq`n!KFFMN*7`g+ZKwlR<)kk3o__m_Z82 zl4g)&keSTFTFWRuxrx<=QDgFcRv%VF1_1`6$pUO)jMhND=;RtUbw(F3YbTpFt2YA& sgU{rbY&MJ`U@>cUb;ejQtAbsFHIadpA!+hQcJax3*tu947?>Es0Cl$`F#rGn diff --git a/src/Logica/Gestion.java b/src/Logica/Gestion.java index 20f0f5b..0b34f2a 100644 --- a/src/Logica/Gestion.java +++ b/src/Logica/Gestion.java @@ -1,5 +1,6 @@ package Logica; import java.io.Serializable; +import java.time.LocalDate; import java.util.Vector; public class Gestion implements Serializable{ @@ -101,6 +102,24 @@ public class Gestion implements Serializable{ } } + public void editarTransaccionFecha(String nombreViejo, LocalDate fecha) { + for(Transaccion elemento:this.gestiones) { + if(elemento.getNombre().equals(nombreViejo)) { + elemento.setFecha(fecha); + return; + } + } + } + + public void editarTransaccionDiero(String nombreViejo, float dinero) { + for(Transaccion elemento:this.gestiones) { + if(elemento.getNombre().equals(nombreViejo)) { + elemento.setPrecio(dinero); + return; + } + } + } + /** * Devuelve verdadero si es un ingerso y falso si es un gasto * diff --git a/src/Logica/Transaccion.java b/src/Logica/Transaccion.java index 7c4e483..20bf61b 100644 --- a/src/Logica/Transaccion.java +++ b/src/Logica/Transaccion.java @@ -1,6 +1,7 @@ package Logica; import java.io.Serializable; +import java.sql.Date; import java.time.LocalDate; public class Transaccion implements Serializable{ @@ -96,4 +97,12 @@ public class Transaccion implements Serializable{ public void setName(String nombre) { this.nombre = nombre; } + + public void setFecha(LocalDate fecha) { + this.dia = fecha; + } + + public void setPrecio(float nuevo) { + this.dinero = nuevo; + } } diff --git a/src/VistaControlador/ControladorPanelModificar.java b/src/VistaControlador/ControladorPanelModificar.java index d7af8c3..870a6a7 100644 --- a/src/VistaControlador/ControladorPanelModificar.java +++ b/src/VistaControlador/ControladorPanelModificar.java @@ -31,7 +31,15 @@ public class ControladorPanelModificar implements ActionListener{ break; } case "Editar transaccion":{ - this.menu.pestanias.get(this.menu.pestania.getSelectedIndex()).editarTransaccion(this.vista.viejoEditar.getText(), this.vista.nuevoEditar.getText()); + if(!this.vista.nuevoEditar.getText().equals("")) { + this.menu.pestanias.get(this.menu.pestania.getSelectedIndex()).editarTransaccion(this.vista.viejoEditar.getText(), this.vista.nuevoEditar.getText()); + + } + if(!this.vista.dineroEditar.getText().equals("")) { + float dinero = Float.parseFloat(this.vista.dineroEditar.getText()); + this.menu.pestanias.get(this.menu.pestania.getSelectedIndex()).editarTransaccionDinero(this.vista.viejoEditar.getText(), dinero); + } + this.menu.pestanias.get(this.menu.pestania.getSelectedIndex()).editarTransaccionFecha(this.vista.viejoEditar.getText(), this.menu.elegirMes.getDate()); break; } } diff --git a/src/VistaControlador/Menu.java b/src/VistaControlador/Menu.java index 59647e1..47077ce 100644 --- a/src/VistaControlador/Menu.java +++ b/src/VistaControlador/Menu.java @@ -252,6 +252,7 @@ public class Menu extends JFrame{ this.pestanias.add(vista); this.controladores.add(new ControladorAniadirVisualizar(vista)); this.pestania.addTab(vista.getName(),vista); + this.meses.getGestionesActuales().add(gestion); } /** diff --git a/src/VistaControlador/VistaAniadirVisualizar.java b/src/VistaControlador/VistaAniadirVisualizar.java index ffff2f1..bb4618b 100644 --- a/src/VistaControlador/VistaAniadirVisualizar.java +++ b/src/VistaControlador/VistaAniadirVisualizar.java @@ -1,6 +1,7 @@ package VistaControlador; import java.awt.Dimension; +import java.time.LocalDate; import java.util.LinkedList; import javax.swing.JButton; @@ -123,7 +124,44 @@ public class VistaAniadirVisualizar extends JPanel{ } } } - + } + + void editarTransaccionDinero(String nombreViejo, float dinero){ + for(Transaccion transaccion:this.gestiones.getElementos()) { + if(transaccion.getNombre().equals(nombreViejo)) { + for(JCheckBox check:this.transacciones) { + if(check.getText().equals(transaccion.toString())) { + transaccion.setPrecio(dinero); + check.setText(transaccion.toString()); + check.revalidate(); + check.repaint(); + //this.gestiones.editarTransaccion(nombreViejo, nombreNuevo); + this.menu.panelGestion.actualizarDatos(this.gestiones); + this.cuadro.revalidate(); + this.cuadro.repaint(); + } + } + } + } + } + + void editarTransaccionFecha(String nombreViejo, LocalDate fecha){ + for(Transaccion transaccion:this.gestiones.getElementos()) { + if(transaccion.getNombre().equals(nombreViejo)) { + for(JCheckBox check:this.transacciones) { + if(check.getText().equals(transaccion.toString())) { + transaccion.setFecha(fecha); + check.setText(transaccion.toString()); + check.revalidate(); + check.repaint(); + //this.gestiones.editarTransaccion(nombreViejo, nombreNuevo); + this.menu.panelGestion.actualizarDatos(this.gestiones); + this.cuadro.revalidate(); + this.cuadro.repaint(); + } + } + } + } } /** diff --git a/src/VistaControlador/VistaPanelModificar.java b/src/VistaControlador/VistaPanelModificar.java index 4ff39a0..8787d7c 100644 --- a/src/VistaControlador/VistaPanelModificar.java +++ b/src/VistaControlador/VistaPanelModificar.java @@ -8,10 +8,12 @@ import javax.swing.JButton; import javax.swing.JTextField; public class VistaPanelModificar extends VistaPanel{ - JTextField viejoNombre; - JTextField nuevoNombre; + private JTextField viejoNombre; + private JTextField nuevoNombre; JTextField viejoEditar; JTextField nuevoEditar; + private JTextField dineroPanel; + JTextField dineroEditar; JButton editarTransaccion; JButton editarGestion; VistaPanelModificar() { @@ -53,5 +55,19 @@ public class VistaPanelModificar extends VistaPanel{ constrain.gridx = 1; constrain.gridy = 2; this.add(this.editarTransaccion, constrain); + + this.dineroPanel = new JTextField("Dinero"); + this.dineroPanel.setEditable(false); + constrain.gridx = 0; + constrain.gridy = 3; + this.add(this.dineroPanel, constrain); + + this.dineroEditar = new JTextField(); + constrain.gridx = 1; + constrain.gridy = 3; + this.dineroEditar.setPreferredSize(new Dimension(80, 17)); + this.add(this.dineroEditar, constrain); + + } }