Skip to content

Commit fd82aae

Browse files
carlosbackdevcarlosbackdev
committed
cambiado beneficios sin iva e iciono de app
1 parent 5bbb40d commit fd82aae

20 files changed

+46
-8
lines changed

‎src/electricity_bills_system/BillSearch.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ public class BillSearch extends JFrame implements ActionListener {
2020
BillSearch(String NIF,String ID_USER){
2121
this.NIF=NIF;
2222
this.ID_USER=ID_USER;
23+
setIconImage(new ImageIcon(getClass().getClassLoader().getResource("images/icono_app.png")).getImage());
2324

2425
setContentPane(new BackgroundPanel("images/Fichas3.png"));
2526
setLayout(new BorderLayout());

‎src/electricity_bills_system/CalculateProject.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,8 @@ public class CalculateProject extends JFrame implements ActionListener {
3737
this.NIF = NIF;
3838
this.ID_USER = ID_USER;
3939
this.PROYECTO = PROYECTO;
40-
setContentPane(new BackgroundPanel("images/Fichas3.png"));
40+
setContentPane(new BackgroundPanel("images/Fichas3.png"));
41+
setIconImage(new ImageIcon(getClass().getClassLoader().getResource("images/icono_app.png")).getImage());
4142

4243
JPanel panel = new JPanel(new GridBagLayout());
4344
panel.setOpaque(false);

‎src/electricity_bills_system/ClientSearch.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ public class ClientSearch extends JFrame implements ActionListener{
4141
setLayout(new BorderLayout());
4242
this.NIF=NIF;
4343
this.ID_USER=ID_USER;
44+
setIconImage(new ImageIcon(getClass().getClassLoader().getResource("images/icono_app.png")).getImage());
4445

4546

4647
JPanel inputPanel = new JPanel(new GridBagLayout());

‎src/electricity_bills_system/ClientUpdate.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ public class ClientUpdate extends JFrame implements ActionListener{
2626
ClientUpdate(String NIF, String ID_USER){
2727
this.NIF=NIF;
2828
this.ID_USER=ID_USER;
29+
setIconImage(new ImageIcon(getClass().getClassLoader().getResource("images/icono_app.png")).getImage());
2930

3031
setContentPane(new BackgroundPanel("images/Fichas3.png"));
3132

‎src/electricity_bills_system/Finance.java

Lines changed: 23 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,9 @@
44
import java.awt.event.*;
55
import java.sql.*;
66
import java.text.SimpleDateFormat;
7+
import java.text.DecimalFormat;
8+
import java.text.DecimalFormatSymbols;
9+
import java.util.Locale;
710
import java.util.Date;
811
import javax.swing.*;
912
import javax.swing.border.TitledBorder;
@@ -16,6 +19,7 @@
1619
import org.jfree.chart.renderer.category.BarRenderer;
1720
import org.jfree.data.category.DefaultCategoryDataset;
1821
import org.jfree.data.general.DefaultPieDataset;
22+
1923

2024
public class Finance extends JFrame implements ActionListener {
2125

@@ -25,11 +29,13 @@ public class Finance extends JFrame implements ActionListener {
2529
String NIF,ID_USER;
2630
String beneficios,horas,factura_pendiente,factura_pagada,gastos;
2731
SimpleDateFormat dateFormat;
32+
double IVA;
2833

2934
Finance(String NIF, String ID_USER) {
3035
dateFormat = new SimpleDateFormat("MM-yyyy");
3136
Date fechaActual = new Date();
3237
String fecha = dateFormat.format(fechaActual);
38+
setIconImage(new ImageIcon(getClass().getClassLoader().getResource("images/icono_app.png")).getImage());
3339

3440
try{
3541
Connect c= new Connect();
@@ -55,11 +61,25 @@ public class Finance extends JFrame implements ActionListener {
5561
ResultSet rs3 = c.s.executeQuery(query3);
5662
while(rs3.next()){
5763
gastos= rs3.getString("GASTOS");
58-
}
64+
}
65+
String query5="SELECT IVA FROM setup_bill WHERE NIF='"+NIF+"'";
66+
ResultSet rs5 = c.s.executeQuery(query5);
67+
while(rs5.next()){
68+
String ivas= rs5.getString("IVA");
69+
IVA=Integer.parseInt(ivas);
70+
}
5971

6072
}catch (Exception e){
6173
e.printStackTrace();
6274
}
75+
double beneficios_int2=Double.parseDouble(beneficios);
76+
beneficios_int2=beneficios_int2-(beneficios_int2*(IVA/100));
77+
DecimalFormatSymbols symbols = new DecimalFormatSymbols(Locale.US);
78+
symbols.setDecimalSeparator('.');
79+
DecimalFormat df = new DecimalFormat("#.00", symbols);
80+
String beneficiosFormateados = df.format(beneficios_int2);
81+
double beneficios_int=Double.parseDouble(beneficiosFormateados);
82+
double gastos_int=Double.parseDouble(gastos);
6383

6484
this.NIF=NIF;
6585
this.ID_USER=ID_USER;
@@ -95,7 +115,7 @@ public class Finance extends JFrame implements ActionListener {
95115
dataPanel.add(benefitsLabel);
96116

97117
dataPanel.add(new JLabel("Beneficios Totales:", SwingConstants.RIGHT));
98-
benefitsLabel = new JLabel(beneficios+" €", SwingConstants.LEFT);
118+
benefitsLabel = new JLabel(beneficios_int+" €", SwingConstants.LEFT);
99119
dataPanel.add(benefitsLabel);
100120

101121
dataPanel.add(new JLabel("Gastos Totales:", SwingConstants.RIGHT));
@@ -118,9 +138,7 @@ public class Finance extends JFrame implements ActionListener {
118138
dataPanel.add(new JLabel("", SwingConstants.RIGHT));
119139
benefitsLabel = new JLabel("", SwingConstants.LEFT);
120140
dataPanel.add(benefitsLabel);
121-
122-
double beneficios_int=Double.parseDouble(beneficios);
123-
double gastos_int=Double.parseDouble(gastos);
141+
124142
int horas_int=Integer.parseInt(horas);
125143
int facturas_pendientes_int=Integer.parseInt(factura_pendiente);
126144
int facturas_pagadas_int=Integer.parseInt(factura_pagada);

‎src/electricity_bills_system/GraphClient.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -169,6 +169,8 @@ public class GraphClient extends JFrame implements ActionListener {
169169
mainPanel.add(chartPanel, BorderLayout.CENTER);
170170

171171
JPanel bottomPanel = new JPanel(new FlowLayout(FlowLayout.CENTER));
172+
173+
setIconImage(new ImageIcon(getClass().getClassLoader().getResource("images/icono_app.png")).getImage());
172174

173175
updateButton = new RoundedButton("Actualizar Datos");
174176
updateButton.setFont(new Font("Roboto", Font.BOLD, 16));

‎src/electricity_bills_system/Login.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -98,6 +98,7 @@ public class Login extends JFrame implements ActionListener{
9898
super("Inicio Sesion Usuario");
9999
setContentPane(new BackgroundPanel("images/inicio.jpg"));
100100
setLayout(new BorderLayout());
101+
setIconImage(new ImageIcon(getClass().getClassLoader().getResource("images/icono_app.png")).getImage());
101102

102103
JPanel panel = new JPanel(new GridBagLayout());
103104
panel.setOpaque(false);

‎src/electricity_bills_system/MaterialFrame.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ public MaterialFrame(String ID_info, String client_info,String NIF,String ID_USE
3939
this.Clase = Clase;
4040
this.PROYECTO = PROYECTO;
4141
Color gris=new Color(210,210,210);
42+
setIconImage(new ImageIcon(getClass().getClassLoader().getResource("images/icono_app.png")).getImage());
4243

4344
JPanel inputPanel = new JPanel(new GridBagLayout());
4445
GridBagConstraints gbc = new GridBagConstraints();

‎src/electricity_bills_system/PayBill.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@ public class PayBill extends JFrame implements ActionListener {
4646
setLayout(new BorderLayout());
4747
this.NIF=NIF;
4848
this.ID_USER=ID_USER;
49+
setIconImage(new ImageIcon(getClass().getClassLoader().getResource("images/icono_app.png")).getImage());
4950

5051

5152
JPanel inputPanel = new JPanel(new GridBagLayout());

‎src/electricity_bills_system/Project.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,8 @@ public class Project extends JFrame implements ActionListener{
1414

1515
Project(String NIF, String ID_USER){
1616
this.NIF=NIF;
17-
this.ID_USER=ID_USER;
17+
this.ID_USER=ID_USER;
18+
setIconImage(new ImageIcon(getClass().getClassLoader().getResource("images/icono_app.png")).getImage());
1819

1920

2021
setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);

0 commit comments

Comments
 (0)