diff --git a/dist/Programa Caja.jar b/dist/Programa Caja.jar index 99f313f..281554d 100644 Binary files a/dist/Programa Caja.jar and b/dist/Programa Caja.jar differ diff --git a/src/danielcortes/xyz/models/calculo_fondo/CalculoFondoDAO.java b/src/danielcortes/xyz/models/calculo_fondo/CalculoFondoDAO.java index 5f352e4..4d5f954 100644 --- a/src/danielcortes/xyz/models/calculo_fondo/CalculoFondoDAO.java +++ b/src/danielcortes/xyz/models/calculo_fondo/CalculoFondoDAO.java @@ -24,51 +24,23 @@ package danielcortes.xyz.models.calculo_fondo; -import danielcortes.xyz.data.ConnectionHolder; import danielcortes.xyz.models.caja.Caja; -import danielcortes.xyz.models.caja.SQLiteCajaDAO; -import java.sql.ResultSet; -import java.sql.SQLException; -import java.util.ArrayList; import java.util.List; -import java.util.logging.Level; -import java.util.logging.Logger; -public abstract class CalculoFondoDAO { +public interface CalculoFondoDAO { - private static final Logger LOGGER = Logger.getLogger(CalculoFondoDAO.class.getName()); + List findAll(); - protected ConnectionHolder connectionHolder; + List findByCaja(Caja caja); - public abstract List findAll(); + CalculoFondo findById(int id); - public abstract List findByCaja(Caja caja); + boolean insertCalculoFondo(CalculoFondo calculoFondo); - public abstract CalculoFondo findById(int id); + boolean updateCalculoFondo(CalculoFondo calculoFondo); - public abstract boolean insertCalculoFondo(CalculoFondo calculoFondo); + boolean deleteCalculoFondo(CalculoFondo calculoFondo); - public abstract boolean updateCalculoFondo(CalculoFondo calculoFondo); + int getTotalCalculoFondo(Caja caja); - public abstract boolean deleteCalculoFondo(CalculoFondo calculoFondo); - - public abstract int getTotalCalculoFondo(Caja caja); - - protected List calculoFondoFromResultSet(ResultSet rs) throws SQLException { - List calculoFondoList = new ArrayList<>(); - while (rs.next()) { - int caja_id = rs.getInt("caja_id"); - Caja caja = new SQLiteCajaDAO().getById(caja_id).get(); - CalculoFondo calculoFondo = new CalculoFondo(); - calculoFondo.setId(rs.getInt("id")); - calculoFondo.setValor(rs.getInt("valor")); - calculoFondo.setDescripcion(rs.getString("descripcion")); - calculoFondo.setCaja(caja); - calculoFondoList.add(calculoFondo); - - LOGGER.log(Level.FINER, "Se a creo: {0}", calculoFondo); - - } - return calculoFondoList; - } } diff --git a/src/danielcortes/xyz/models/calculo_fondo/SQLiteCalculoFondoDAO.java b/src/danielcortes/xyz/models/calculo_fondo/SQLiteCalculoFondoDAO.java index 06df325..26aeca6 100644 --- a/src/danielcortes/xyz/models/calculo_fondo/SQLiteCalculoFondoDAO.java +++ b/src/danielcortes/xyz/models/calculo_fondo/SQLiteCalculoFondoDAO.java @@ -24,6 +24,8 @@ package danielcortes.xyz.models.calculo_fondo; +import danielcortes.xyz.data.ConnectionHolder; +import danielcortes.xyz.data.DAOManager; import danielcortes.xyz.data.SQLiteConnectionHolder; import danielcortes.xyz.models.caja.Caja; import java.sql.Connection; @@ -35,10 +37,12 @@ import java.util.List; import java.util.logging.Level; import java.util.logging.Logger; -public class SQLiteCalculoFondoDAO extends CalculoFondoDAO { +public class SQLiteCalculoFondoDAO implements CalculoFondoDAO { private static final Logger LOGGER = Logger.getLogger(SQLiteCalculoFondoDAO.class.getName()); + private ConnectionHolder connectionHolder; + public SQLiteCalculoFondoDAO() { this.connectionHolder = new SQLiteConnectionHolder(); } @@ -52,6 +56,7 @@ public class SQLiteCalculoFondoDAO extends CalculoFondoDAO { try (ResultSet rs = ps.executeQuery()) { LOGGER.log(Level.FINE, "QUERY: {0}", query); + calculoFondoList = this.calculoFondoFromResultSet(rs); } } @@ -202,4 +207,22 @@ public class SQLiteCalculoFondoDAO extends CalculoFondoDAO { } return sum; } + + protected List calculoFondoFromResultSet(ResultSet rs) throws SQLException { + List calculoFondoList = new ArrayList<>(); + while (rs.next()) { + int caja_id = rs.getInt("caja_id"); + Caja caja = DAOManager.getCajaDAO().getById(caja_id).get(); + CalculoFondo calculoFondo = new CalculoFondo(); + calculoFondo.setId(rs.getInt("id")); + calculoFondo.setValor(rs.getInt("valor")); + calculoFondo.setDescripcion(rs.getString("descripcion")); + calculoFondo.setCaja(caja); + calculoFondoList.add(calculoFondo); + + LOGGER.log(Level.FINER, "Se a creo: {0}", calculoFondo); + + } + return calculoFondoList; + } }