diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 2fe32d3..081e05b 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -12,9 +12,13 @@
+
-
+
+
+
+
@@ -25,6 +29,12 @@
+
+
+
+
+
+
@@ -64,12 +74,36 @@
-
+
-
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -87,8 +121,6 @@
- tipo_id
- getEliminarB
onSelec
timezone
efect
@@ -117,6 +149,8 @@
formula
setS
or
+ s
+ getSub
2018 Daniel Cortes
@@ -137,13 +171,11 @@
@@ -232,7 +266,6 @@
-
@@ -252,6 +285,13 @@
cellIterator = this.sheet.getRow(0).cellIterator();
+ while (cellIterator.hasNext()) {
+ Cell cell = cellIterator.next();
+ cell.setCellStyle(this.styles.get("header"));
}
+ cellIterator = this.sheet.getRow(1).cellIterator();
+ while (cellIterator.hasNext()) {
+ Cell cell = cellIterator.next();
+ cell.setCellStyle(this.styles.get("header"));
+ }
- for(int x = this.dataStartRow; x < informe.size() + this.dataStartRow; x++){
+ //Estilos para las celdas de los datos
+ for (int x = 2; x < informe.size() + 2; x++) {
Row row = this.sheet.getRow(x);
- row.getCell(this.columnStart).setCellStyle(this.styles.get("borders"));
- row.getCell(this.columnStart + 1).setCellStyle(this.styles.get("date"));
- row.getCell(this.columnStart + 2).setCellStyle(this.styles.get("money"));
- row.getCell(this.columnStart + 3).setCellStyle(this.styles.get("money"));
- row.getCell(this.columnStart + 4).setCellStyle(this.styles.get("money"));
- row.getCell(this.columnStart + 5).setCellStyle(this.styles.get("money"));
- row.getCell(this.columnStart + 6).setCellStyle(this.styles.get("money"));
- row.getCell(this.columnStart + 7).setCellStyle(this.styles.get("money"));
+ int y = 0;
+
+ //Primeras Celdas
+ row.getCell(y++).setCellStyle(this.styles.get("dia"));
+ row.getCell(y++).setCellStyle(this.styles.get("date"));
+
+ //Boletas Manuales
+ row.getCell(y++).setCellStyle(this.styles.get("regular"));
+ row.getCell(y++).setCellStyle(this.styles.get("regular"));
+ row.getCell(y++).setCellStyle(this.styles.get("money"));
+
+ //Boletas Fiscales
+ row.getCell(y++).setCellStyle(this.styles.get("regular"));
+ row.getCell(y++).setCellStyle(this.styles.get("regular"));
+ row.getCell(y++).setCellStyle(this.styles.get("regular"));
+ row.getCell(y++).setCellStyle(this.styles.get("regular"));
+ row.getCell(y++).setCellStyle(this.styles.get("money"));
+
+ //Boletas Exentas
+ row.getCell(y++).setCellStyle(this.styles.get("regular"));
+ row.getCell(y++).setCellStyle(this.styles.get("regular"));
+ row.getCell(y++).setCellStyle(this.styles.get("money"));
+
+ //Sub Total
+ row.getCell(y++).setCellStyle(this.styles.get("money"));
+
+ //Facturas
+ row.getCell(y++).setCellStyle(this.styles.get("regular"));
+ row.getCell(y++).setCellStyle(this.styles.get("regular"));
+ row.getCell(y++).setCellStyle(this.styles.get("money"));
+
+ //Guias
+ row.getCell(y++).setCellStyle(this.styles.get("regular"));
+ row.getCell(y++).setCellStyle(this.styles.get("regular"));
+ row.getCell(y++).setCellStyle(this.styles.get("money"));
+
+ //Estadisticas
+ row.getCell(y++).setCellStyle(this.styles.get("money"));
+ row.getCell(y).setCellStyle(this.styles.get("money"));
}
- for(int x = this.columnStart; x <= this.totalColumns + this.columnStart; x++){
+
+ //Estilos para los totales del footer
+ Row footerRow = this.sheet.getRow(33);
+ for (int x = 0; x < 23; x++) {
+ footerRow.getCell(x, Row.MissingCellPolicy.CREATE_NULL_AS_BLANK).setCellStyle(this.styles.get("footer"));
+ }
+ footerRow.getCell(4).setCellStyle(this.styles.get("footer_money"));
+ footerRow.getCell(9).setCellStyle(this.styles.get("footer_money"));
+ footerRow.getCell(12).setCellStyle(this.styles.get("footer_money"));
+ footerRow.getCell(16).setCellStyle(this.styles.get("footer_money"));
+ footerRow.getCell(19).setCellStyle(this.styles.get("footer_money"));
+
+ //Setea la altura para todas las filas
+ this.sheet.getRow(0).setHeightInPoints(20);
+ this.sheet.getRow(1).setHeightInPoints(30);
+ this.sheet.getRow(33).setHeightInPoints(20);
+
+ for (int x = 2; x < 32; x++) {
+ this.sheet.getRow(x).setHeightInPoints(15);
+ }
+
+ //Coloca el ancho como automatico en todas las columnas
+ for (int x = 0; x <= 23; x++) {
sheet.autoSizeColumn(x);
}
}
- public File generarInforme(){
+ public File generarInforme() {
fillData();
fillHeaders();
+ fillTotales();
+ joinCells();
+ freezeCells();
setStyles();
+ addBorders();
try (OutputStream fileOut = new FileOutputStream(this.saveFile)) {
wb.write(fileOut);
@@ -147,40 +311,50 @@ public class InformeMensual {
return null;
}
+ private HashMap generateStyles() {
+ Font font = this.wb.createFont();
+ font.setBold(true);
+ font.setColor(IndexedColors.WHITE.getIndex());
- private HashMap generateStyles(){
- CellStyle bordersStyle = this.wb.createCellStyle();
- bordersStyle.setBorderBottom(BorderStyle.THIN);
- bordersStyle.setBorderTop(BorderStyle.THIN);
- bordersStyle.setBorderLeft(BorderStyle.THIN);
- bordersStyle.setBorderRight(BorderStyle.THIN);
+ CellStyle regularStyle = this.wb.createCellStyle();
+
+ CellStyle grayStyle = this.wb.createCellStyle();
+ grayStyle.setFont(font);
+ grayStyle.setFillForegroundColor(IndexedColors.GREY_50_PERCENT.getIndex());
+ grayStyle.setFillPattern(FillPatternType.SOLID_FOREGROUND);
+
+ CellStyle diaStyle = this.wb.createCellStyle();
+ diaStyle.cloneStyleFrom(grayStyle);
CellStyle dateStyle = this.wb.createCellStyle();
- dateStyle.cloneStyleFrom(bordersStyle);
+ dateStyle.cloneStyleFrom(grayStyle);
dateStyle.setDataFormat(this.createHelper.createDataFormat().getFormat("dd/mm/yyyy"));
CellStyle moneyStyle = this.wb.createCellStyle();
- moneyStyle.cloneStyleFrom(bordersStyle);
moneyStyle.setDataFormat(this.createHelper.createDataFormat().getFormat("\"$\"#,##0_);(\"$\"#,##0)"));
- Font headerFont = this.wb.createFont();
- headerFont.setColor(IndexedColors.WHITE.getIndex());
-
CellStyle headerStyle = this.wb.createCellStyle();
- headerStyle.cloneStyleFrom(bordersStyle);
- headerStyle.setFont(headerFont);
+ headerStyle.cloneStyleFrom(grayStyle);
headerStyle.setVerticalAlignment(VerticalAlignment.CENTER);
- headerStyle.setFillForegroundColor(IndexedColors.GREY_50_PERCENT.getIndex());
- headerStyle.setFillPattern(FillPatternType.SOLID_FOREGROUND);
+ headerStyle.setAlignment(HorizontalAlignment.CENTER);
+
+ CellStyle footerStyle = this.wb.createCellStyle();
+ footerStyle.cloneStyleFrom(grayStyle);
+ footerStyle.setVerticalAlignment(VerticalAlignment.CENTER);
+
+ CellStyle footerMoneyStyle = this.wb.createCellStyle();
+ footerMoneyStyle.cloneStyleFrom(footerStyle);
+ footerMoneyStyle.setDataFormat(this.createHelper.createDataFormat().getFormat("\"$\"#,##0_);(\"$\"#,##0)"));
HashMap styles = new HashMap<>();
+ styles.put("regular", regularStyle);
styles.put("date", dateStyle);
+ styles.put("dia", diaStyle);
styles.put("money", moneyStyle);
styles.put("header", headerStyle);
- styles.put("borders", bordersStyle);
+ styles.put("footer", footerStyle);
+ styles.put("footer_money", footerMoneyStyle);
return styles;
}
-
-
}
diff --git a/src/danielcortes/xyz/models/informe/InformeMensualContent.java b/src/danielcortes/xyz/models/informe/InformeMensualContent.java
index 1249c71..2027cf9 100644
--- a/src/danielcortes/xyz/models/informe/InformeMensualContent.java
+++ b/src/danielcortes/xyz/models/informe/InformeMensualContent.java
@@ -29,14 +29,28 @@ import java.time.LocalDate;
public class InformeMensualContent {
private int dia;
private LocalDate fecha;
- private int fiscales;
+ private String manualesInicial;
+ private String manualesFinal;
private int manuales;
+ private String fiscalesZInicial;
+ private String fiscalesZFinal;
+ private String fiscalesInicial;
+ private String fiscalesFinal;
+ private int fiscales;
+ private String exentasInicial;
+ private String exentasFinal;
+ private int exentas;
+ private int subTotal;
+ private String facturasInicial;
+ private String facturasFinal;
private int facturas;
+ private String guiasInicial;
+ private String guiasFinal;
private int guias;
private int total;
public int getDia() {
- return this.dia;
+ return dia;
}
public void setDia(int dia) {
@@ -51,12 +65,20 @@ public class InformeMensualContent {
this.fecha = fecha;
}
- public int getFiscales() {
- return fiscales;
+ public String getManualesInicial() {
+ return manualesInicial;
}
- public void setFiscales(int fiscales) {
- this.fiscales = fiscales;
+ public void setManualesInicial(String manualesInicial) {
+ this.manualesInicial = manualesInicial;
+ }
+
+ public String getManualesFinal() {
+ return manualesFinal;
+ }
+
+ public void setManualesFinal(String manualesFinal) {
+ this.manualesFinal = manualesFinal;
}
public int getManuales() {
@@ -67,6 +89,94 @@ public class InformeMensualContent {
this.manuales = manuales;
}
+ public String getFiscalesZInicial() {
+ return fiscalesZInicial;
+ }
+
+ public void setFiscalesZInicial(String fiscalesZInicial) {
+ this.fiscalesZInicial = fiscalesZInicial;
+ }
+
+ public String getFiscalesZFinal() {
+ return fiscalesZFinal;
+ }
+
+ public void setFiscalesZFinal(String fiscalesZFinal) {
+ this.fiscalesZFinal = fiscalesZFinal;
+ }
+
+ public String getFiscalesInicial() {
+ return fiscalesInicial;
+ }
+
+ public void setFiscalesInicial(String fiscalesInicial) {
+ this.fiscalesInicial = fiscalesInicial;
+ }
+
+ public String getFiscalesFinal() {
+ return fiscalesFinal;
+ }
+
+ public void setFiscalesFinal(String fiscalesFinal) {
+ this.fiscalesFinal = fiscalesFinal;
+ }
+
+ public int getFiscales() {
+ return fiscales;
+ }
+
+ public void setFiscales(int fiscales) {
+ this.fiscales = fiscales;
+ }
+
+ public String getExentasInicial() {
+ return exentasInicial;
+ }
+
+ public void setExentasInicial(String exentasInicial) {
+ this.exentasInicial = exentasInicial;
+ }
+
+ public String getExentasFinal() {
+ return exentasFinal;
+ }
+
+ public void setExentasFinal(String exentasFinal) {
+ this.exentasFinal = exentasFinal;
+ }
+
+ public int getExentas() {
+ return exentas;
+ }
+
+ public void setExentas(int exentas) {
+ this.exentas = exentas;
+ }
+
+ public int getSubTotal() {
+ return subTotal;
+ }
+
+ public void setSubTotal(int sub_total) {
+ this.subTotal = sub_total;
+ }
+
+ public String getFacturasInicial() {
+ return facturasInicial;
+ }
+
+ public void setFacturasInicial(String facturasInicial) {
+ this.facturasInicial = facturasInicial;
+ }
+
+ public String getFacturasFinal() {
+ return facturasFinal;
+ }
+
+ public void setFacturasFinal(String facturasFinal) {
+ this.facturasFinal = facturasFinal;
+ }
+
public int getFacturas() {
return facturas;
}
@@ -75,6 +185,22 @@ public class InformeMensualContent {
this.facturas = facturas;
}
+ public String getGuiasInicial() {
+ return guiasInicial;
+ }
+
+ public void setGuiasInicial(String guiasInicial) {
+ this.guiasInicial = guiasInicial;
+ }
+
+ public String getGuiasFinal() {
+ return guiasFinal;
+ }
+
+ public void setGuiasFinal(String guiasFinal) {
+ this.guiasFinal = guiasFinal;
+ }
+
public int getGuias() {
return guias;
}
@@ -96,9 +222,17 @@ public class InformeMensualContent {
return "InformeMensualContent{" +
"dia=" + dia +
", fecha=" + fecha +
+ ", fiscalesInicial='" + fiscalesInicial + '\'' +
+ ", fiscalesFinal='" + fiscalesFinal + '\'' +
", fiscales=" + fiscales +
+ ", manualesInicial='" + manualesInicial + '\'' +
+ ", manualesFinal='" + manualesFinal + '\'' +
", manuales=" + manuales +
+ ", facturasInicial='" + facturasInicial + '\'' +
+ ", facturasFinal='" + facturasFinal + '\'' +
", facturas=" + facturas +
+ ", guiasInicial='" + guiasInicial + '\'' +
+ ", guiasFinal='" + guiasFinal + '\'' +
", guias=" + guias +
", total=" + total +
'}';
diff --git a/src/danielcortes/xyz/models/informe/SQLiteInformeMensualContentDAO.java b/src/danielcortes/xyz/models/informe/SQLiteInformeMensualContentDAO.java
index ed58b83..38aefa7 100644
--- a/src/danielcortes/xyz/models/informe/SQLiteInformeMensualContentDAO.java
+++ b/src/danielcortes/xyz/models/informe/SQLiteInformeMensualContentDAO.java
@@ -40,17 +40,34 @@ public class SQLiteInformeMensualContentDAO extends InformeMensualContentDAO {
ArrayList list = new ArrayList<>();
try {
Connection conn = new SQLiteConnectionHolder().getConnection();
- String query = "select strftime(\"%w\", caja.fecha) \"dia\"," +
- "caja.fecha \"fecha\"," +
- "sum(case when ingresos.tipo_ingreso_id = 1 then ingresos.valor else 0 end) as \"fiscales\"," +
- "sum(case when ingresos.tipo_ingreso_id = 2 then ingresos.valor else 0 end) as \"manuales\"," +
- "sum(case when ingresos.tipo_ingreso_id = 3 then ingresos.valor else 0 end) as \"facturas\"," +
- "sum(case when ingresos.tipo_ingreso_id = 4 then ingresos.valor else 0 end) as \"guias\"," +
- "sum(case when ingresos.valor not null then ingresos.valor else 0 end) \"total\" " +
- "from caja left join ingresos on (caja.id = ingresos.caja_id) " +
- "where caja.fecha between date(?) and date(?) " +
- "group by caja.fecha " +
- "order by caja.fecha ";
+ String query =
+ "select\n" +
+ "strftime(\"%w\", caja.fecha) as \"dia\",\n" +
+ "caja.fecha as \"fecha\",\n" +
+ "min(case when ingresos.tipo_ingreso_id = 2 and ingresos.valor > 0 then ingresos.nro_inicial else 0 end) as \"manuales_inicial\",\n" +
+ "max(case when ingresos.tipo_ingreso_id = 2 and ingresos.valor > 0 then ingresos.nro_final else 0 end) as \"manuales_final\",\n" +
+ "sum(case when ingresos.tipo_ingreso_id = 2 then ingresos.valor else 0 end) as \"manuales\",\n" +
+ "min(case when ingresos.tipo_ingreso_id = 1 and ingresos.valor > 0 then ingresos.nro_inicial else 0 end) as \"fiscales_inicial\",\n" +
+ "max(case when ingresos.tipo_ingreso_id = 1 and ingresos.valor > 0 then ingresos.nro_final else 0 end) as \"fiscales_final\",\n" +
+ "min(case when ingresos.tipo_ingreso_id = 1 and ingresos.valor > 0 then ingresos.nro_z_inicial else 0 end) as \"fiscales_z_inicial\",\n" +
+ "max(case when ingresos.tipo_ingreso_id = 1 and ingresos.valor > 0 then ingresos.nro_z_final else 0 end) as \"fiscales_z_final\",\n" +
+ "sum(case when ingresos.tipo_ingreso_id = 1 then ingresos.valor else 0 end) as \"fiscales\",\n" +
+ "min(case when ingresos.tipo_ingreso_id = 5 and ingresos.valor > 0 then ingresos.nro_inicial else 0 end) as \"exentas_inicial\",\n" +
+ "max(case when ingresos.tipo_ingreso_id = 5 and ingresos.valor > 0 then ingresos.nro_final else 0 end) as \"exentas_final\",\n" +
+ "sum(case when ingresos.tipo_ingreso_id = 5 then ingresos.valor else 0 end) as \"exentas\",\n" +
+ "sum(case when ingresos.tipo_ingreso_id in (2, 1, 5) then ingresos.valor else 0 end ) as \"sub_total\",\n" +
+ "min(case when ingresos.tipo_ingreso_id = 3 and ingresos.valor > 0 then ingresos.nro_inicial else 0 end) as \"facturas_inicial\",\n" +
+ "max(case when ingresos.tipo_ingreso_id = 3 and ingresos.valor > 0 then ingresos.nro_final else 0 end) as \"facturas_final\",\n" +
+ "sum(case when ingresos.tipo_ingreso_id = 3 then ingresos.valor else 0 end) as \"facturas\",\n" +
+ "min(case when ingresos.tipo_ingreso_id = 4 and ingresos.valor > 0 then ingresos.nro_inicial else 0 end) as \"guias_inicial\",\n" +
+ "max(case when ingresos.tipo_ingreso_id = 4 and ingresos.valor > 0 then ingresos.nro_final else 0 end) as \"guias_final\",\n" +
+ "sum(case when ingresos.tipo_ingreso_id = 4 then ingresos.valor else 0 end) as \"guias\",\n" +
+ "sum(case when ingresos.valor not null then ingresos.valor else 0 end) as \"total\"\n" +
+ "from caja\n" +
+ "left join ingresos on (caja.id = ingresos.caja_id)\n" +
+ "where caja.fecha between date(?) and date(?)\n" +
+ "group by caja.fecha\n" +
+ "order by caja.fecha\n";
PreparedStatement ps = conn.prepareStatement(query);
@@ -63,9 +80,24 @@ public class SQLiteInformeMensualContentDAO extends InformeMensualContentDAO {
InformeMensualContent informeMensualContent = new InformeMensualContent();
informeMensualContent.setDia(rs.getInt("dia"));
informeMensualContent.setFecha(LocalDate.parse(rs.getString("fecha")));
- informeMensualContent.setFiscales(rs.getInt("fiscales"));
+ informeMensualContent.setManualesInicial(rs.getString("manuales_inicial"));
+ informeMensualContent.setManualesFinal(rs.getString("manuales_final"));
informeMensualContent.setManuales(rs.getInt("manuales"));
+ informeMensualContent.setFiscalesZInicial(rs.getString("fiscales_z_inicial"));
+ informeMensualContent.setFiscalesZFinal(rs.getString("fiscales_z_final"));
+ informeMensualContent.setFiscalesInicial(rs.getString("fiscales_inicial"));
+ informeMensualContent.setFiscalesFinal(rs.getString("fiscales_final"));
+ informeMensualContent.setFiscales(rs.getInt("fiscales"));
+ informeMensualContent.setExentasInicial(rs.getString("exentas_inicial"));
+ informeMensualContent.setExentasFinal(rs.getString("exentas_final"));
+ informeMensualContent.setExentas(rs.getInt("exentas"));
+ informeMensualContent.setSubTotal(rs.getInt("sub_total"));
+ informeMensualContent.setFiscales(rs.getInt("fiscales"));
+ informeMensualContent.setFacturasInicial(rs.getString("facturas_inicial"));
+ informeMensualContent.setFacturasFinal(rs.getString("facturas_final"));
informeMensualContent.setFacturas(rs.getInt("facturas"));
+ informeMensualContent.setGuiasInicial(rs.getString("guias_inicial"));
+ informeMensualContent.setGuiasFinal(rs.getString("guias_final"));
informeMensualContent.setGuias(rs.getInt("guias"));
informeMensualContent.setTotal(rs.getInt("total"));
|