Develop

.settings/org.eclipse.core.resources.prefs

@@ -0,0 +1,7 @@
+eclipse.preferences.version=1
+encoding//src/application/reports/ControlStock.jrxml=UTF-8
+encoding//src/application/reports/DatosOrganizacion.jrxml=UTF-8
+encoding//src/application/reports/DetalleLiquidacion.jrxml=UTF-8
+encoding//src/application/reports/ReciboSueldo.jrxml=UTF-8
+encoding//src/application/reports/RecibosPorLiquidacion.jrxml=UTF-8
+encoding//target/classes/application/reports/DatosOrganizacion.jrxml=UTF-8

LogiservStudio.iml

@@ -19,7 +19,6 @@
     <orderEntry type="library" name="org.eclipse.fx.ide.jdt.core.JAVAFX_CONTAINER" level="application" />
     <orderEntry type="library" name="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER" level="application" />
     <orderEntry type="library" name="com.google.maps:google-maps-services:0.2.5" level="project" />
-    <orderEntry type="library" name="Maven: commons-codec:commons-codec:1.11" level="project" />
     <orderEntry type="library" name="Maven: mysql:mysql-connector-java:5.1.13" level="project" />
     <orderEntry type="library" name="Maven: org.controlsfx:controlsfx:8.0.6_20" level="project" />
     <orderEntry type="library" name="Maven: com.google.maps:google-maps-services:0.2.5" level="project" />
@@ -31,5 +30,34 @@
     <orderEntry type="library" name="Maven: org.slf4j:slf4j-nop:1.7.25" level="project" />
     <orderEntry type="library" name="Maven: org.apache.commons:commons-lang3:3.5" level="project" />
     <orderEntry type="library" name="Maven: commons-codec:commons-codec:1.11" level="project" />
+    <orderEntry type="library" name="Maven: net.sf.jasperreports:jasperreports:6.5.1" level="project" />
+    <orderEntry type="library" name="Maven: commons-beanutils:commons-beanutils:1.9.3" level="project" />
+    <orderEntry type="library" name="Maven: commons-collections:commons-collections:3.2.2" level="project" />
+    <orderEntry type="library" name="Maven: commons-digester:commons-digester:2.1" level="project" />
+    <orderEntry type="library" name="Maven: commons-logging:commons-logging:1.1.1" level="project" />
+    <orderEntry type="library" name="Maven: com.lowagie:itext:2.1.7.js6" level="project" />
+    <orderEntry type="library" name="Maven: org.bouncycastle:bcprov-jdk15on:1.52" level="project" />
+    <orderEntry type="library" name="Maven: org.jfree:jcommon:1.0.23" level="project" />
+    <orderEntry type="library" name="Maven: org.jfree:jfreechart:1.0.19" level="project" />
+    <orderEntry type="library" name="Maven: org.eclipse.jdt.core.compiler:ecj:4.4.2" level="project" />
+    <orderEntry type="library" name="Maven: org.codehaus.castor:castor-xml:1.3.3" level="project" />
+    <orderEntry type="library" name="Maven: org.codehaus.castor:castor-core:1.3.3" level="project" />
+    <orderEntry type="library" name="Maven: commons-lang:commons-lang:2.6" level="project" />
+    <orderEntry type="library" name="Maven: javax.inject:javax.inject:1" level="project" />
+    <orderEntry type="library" name="Maven: stax:stax:1.2.0" level="project" />
+    <orderEntry type="library" name="Maven: stax:stax-api:1.0.1" level="project" />
+    <orderEntry type="library" name="Maven: javax.xml.stream:stax-api:1.0-2" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-core:2.1.4" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.1.4" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.1.4" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.lucene:lucene-core:4.5.1" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.lucene:lucene-analyzers-common:4.5.1" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.lucene:lucene-queryparser:4.5.1" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.lucene:lucene-queries:4.5.1" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.lucene:lucene-sandbox:4.5.1" level="project" />
+    <orderEntry type="library" name="Maven: jakarta-regexp:jakarta-regexp:1.4" level="project" />
+    <orderEntry type="library" name="Maven: org.olap4j:olap4j:0.9.7.309-JS-3" level="project" />
+    <orderEntry type="library" name="Maven: com.google.zxing:core:3.2.1" level="project" />
+    <orderEntry type="library" name="Maven: com.ibm.icu:icu4j:57.1" level="project" />
   </component>
 </module>

pom.xml

@@ -56,5 +56,10 @@
           <artifactId>commons-codec</artifactId>
           <version>1.11</version>
       </dependency>
+      <dependency>
+          <groupId>net.sf.jasperreports</groupId>
+          <artifactId>jasperreports</artifactId>
+          <version>6.5.1</version>
+      </dependency>
   </dependencies>
 </project>

src/application/Main.java

@@ -1,14 +1,16 @@
 package application;
 
-import application.view.*;
-import java.io.IOException;
 import application.database.JDBCConnection;
+import application.view.LoginController;
 import javafx.application.Application;
 import javafx.fxml.FXMLLoader;
 import javafx.scene.Scene;
+import javafx.scene.image.Image;
 import javafx.scene.layout.BorderPane;
 import javafx.stage.Stage;
 
+import java.io.IOException;
+
 public class Main extends Application {
 	private Stage primaryStage;
     private BorderPane rootLayout;
@@ -17,6 +19,9 @@ public class Main extends Application {
     public void start(Stage primaryStage) {
         this.primaryStage = primaryStage;
         this.primaryStage.setTitle("Logiserv Studio");
+        // Set the application icon.
+        this.primaryStage.getIcons().add(new Image("resources/logiserv-icon.png"));
+
         JDBCConnection.getInstanceConnection();
         initRootLayout();
     }

src/application/comunes/Alerta.java

@@ -11,15 +11,15 @@ protected Alerta(){
 
     }
     public static void alertaInfo(String titulo, String contenido){
-        Alert alert = new Alert(Alert.AlertType.WARNING);
+        Alert alert = new Alert(Alert.AlertType.INFORMATION);
         alert.setTitle(titulo);
         alert.setContentText(contenido);
         alert.initStyle(StageStyle.UNDECORATED);
         alert.showAndWait();
 
     }
     public static void alertaInfo(String titulo, String header, String contenido){
-        Alert alert = new Alert(Alert.AlertType.WARNING);
+        Alert alert = new Alert(Alert.AlertType.INFORMATION);
         alert.setTitle(titulo);
         alert.setHeaderText(header);
         alert.setContentText(contenido);

src/application/model/calculo/Acoplado.java

@@ -9,6 +9,19 @@ public class Acoplado {
     private IntegerProperty id;
     private StringProperty marca;
     private StringProperty patente;
+    private StringProperty chasisNumero;
+
+    public String getChasisNumero() {
+        return chasisNumero.get();
+    }
+
+    public StringProperty chasisNumeroProperty() {
+        return chasisNumero;
+    }
+
+    public void setChasisNumero(String chasisNumero) {
+        this.chasisNumero.set(chasisNumero);
+    }
 
     public int getId() {
         return id.get();
@@ -46,13 +59,14 @@ public void setPatente(String patente) {
         this.patente.set(patente);
     }
 
-    public Acoplado(Integer id, String marca, String patente) {
+    public Acoplado(Integer id, String marca, String patente, String chasisNumero) {
         this.id = new SimpleIntegerProperty(id);
         this.marca = new SimpleStringProperty(marca);
         this.patente = new SimpleStringProperty(patente);
+        this.chasisNumero = new SimpleStringProperty(chasisNumero);
     }
 
     public Acoplado() {
-        this(0,null,null);
+        this(0,null,null,null);
     }
 }

src/application/model/calculo/Camion.java

@@ -10,6 +10,32 @@ public class Camion {
     private StringProperty marca;
     private StringProperty modelo;
     private StringProperty patente;
+    private StringProperty motor;
+    private StringProperty chasis;
+
+    public String getMotor() {
+        return motor.get();
+    }
+
+    public StringProperty motorProperty() {
+        return motor;
+    }
+
+    public void setMotor(String motor) {
+        this.motor.set(motor);
+    }
+
+    public String getChasis() {
+        return chasis.get();
+    }
+
+    public StringProperty chasisProperty() {
+        return chasis;
+    }
+
+    public void setChasis(String chasis) {
+        this.chasis.set(chasis);
+    }
 
     public int getId() {
         return id.get();
@@ -59,14 +85,16 @@ public void setPatente(String patente) {
         this.patente.set(patente);
     }
 
-    public Camion(Integer id, String marca, String modelo, String patente) {
+    public Camion(Integer id, String marca, String modelo, String patente, String motor, String chasis) {
         this.id = new SimpleIntegerProperty(id);
         this.marca = new SimpleStringProperty(marca);
         this.modelo = new SimpleStringProperty(modelo);
         this.patente = new SimpleStringProperty(patente);
+        this.motor = new SimpleStringProperty(motor);
+        this.chasis = new SimpleStringProperty(chasis);
     }
 
     public Camion() {
-        this(0,null,null,null);
+        this(0,null,null,null, null,null);
     }
 }

src/application/model/calculo/Ingenio.java

@@ -97,4 +97,8 @@ public Ingenio() {
         this(0,0.0,0.0,null,0.0,0.0);
     }
 
+    @Override
+    public String toString() {
+        return getNombre();
+    }
 }

src/application/model/compra/DetalleCompra.java

@@ -4,8 +4,6 @@
 import javafx.beans.property.IntegerProperty;
 import javafx.beans.property.SimpleFloatProperty;
 import javafx.beans.property.SimpleIntegerProperty;
-import javafx.beans.property.SimpleStringProperty;
-import javafx.beans.property.StringProperty;
 
 public class DetalleCompra {
 

src/application/model/compra/FacturaCompra.java

@@ -1,11 +1,6 @@
 	package application.model.compra;
 
-import javafx.beans.property.DoubleProperty;
-import javafx.beans.property.IntegerProperty;
-import javafx.beans.property.SimpleDoubleProperty;
-import javafx.beans.property.SimpleIntegerProperty;
-import javafx.beans.property.SimpleStringProperty;
-import javafx.beans.property.StringProperty;
+    import javafx.beans.property.*;
 
 public class FacturaCompra {
 

src/application/model/info/CategoriaEmpleado.java

@@ -1,6 +1,9 @@
 package application.model.info;
 
-import javafx.beans.property.*;
+import javafx.beans.property.IntegerProperty;
+import javafx.beans.property.SimpleIntegerProperty;
+import javafx.beans.property.SimpleStringProperty;
+import javafx.beans.property.StringProperty;
 import javafx.scene.control.CheckBox;
 
 public class CategoriaEmpleado {

src/application/model/info/Domicilio.java

@@ -5,7 +5,6 @@
 import javafx.beans.property.SimpleIntegerProperty;
 import javafx.beans.property.SimpleStringProperty;
 import javafx.beans.property.StringProperty;
-import application.repository.info.LocalidadRepository;
 
 public class Domicilio {
 

src/application/model/info/Empleado.java

@@ -5,7 +5,6 @@
 import javafx.beans.property.SimpleIntegerProperty;
 import javafx.beans.property.SimpleStringProperty;
 import javafx.beans.property.StringProperty;
-import application.repository.info.DomicilioRepository;
 
 
 public class Empleado {

src/application/model/sueldo/ConceptoCalculado.java

@@ -46,4 +46,11 @@ private void calcularMontoCalculado(){
                 break;
         }
     }
+
+    @Override
+    public String toString() {
+        return "ConceptoCalculado{" +
+                "montoCalculado=" + montoCalculado + "\n"+ super.toString()+
+                '}';
+    }
 }

src/application/model/sueldo/ConceptoSueldo.java

@@ -107,4 +107,16 @@ public ConceptoSueldo(){
     	this(0, null, 0f, null, null, 1.0);
     }
 
+    @Override
+    public String toString() {
+        return "ConceptoSueldo{" +
+                "idConceptoSueldo=" + idConceptoSueldo +
+                ", descripcion=" + descripcion +
+                ", cantidad=" + cantidad +
+                ", tipoConcepto=" + tipoConcepto +
+                ", tipoCantidad=" + tipoCantidad +
+                ", select=" + select +
+                ", factor=" + factor +
+                '}';
+    }
 }

src/application/model/sueldo/Liquidaciones.java → src/application/model/sueldo/Liquidacion.java

@@ -2,22 +2,24 @@
 
 import javafx.beans.property.*;
 
+import java.util.ArrayList;
 import java.util.List;
 
-public class Liquidaciones {
+public class Liquidacion {
     private IntegerProperty id;
     private StringProperty fechaLiquidacion;
     private DoubleProperty totalHaberesRemunerativos;
     private DoubleProperty totalHaberesNoRemunerativos;
     private DoubleProperty totalRetenciones;
+    private List<LiquidacionEmpleado> liquidacionesEmpleados = new ArrayList<>();
 
-    public Liquidaciones() {
+    public Liquidacion() {
         this(0,null,0.0,
                 0.0,0.0);
     }
 
-    public Liquidaciones(Integer id, String fechaLiquidacion, Double totalHaberesRemunerativos, Double totalHaberesNoRemunerativos,
-                         Double totalRetenciones) {
+    public Liquidacion(Integer id, String fechaLiquidacion, Double totalHaberesRemunerativos, Double totalHaberesNoRemunerativos,
+                       Double totalRetenciones) {
         this.id = new SimpleIntegerProperty(id);
         this.fechaLiquidacion = new SimpleStringProperty(fechaLiquidacion);
 
@@ -88,4 +90,11 @@ public void setTotalRetenciones(double totalRetenciones) {
         this.totalRetenciones.set(totalRetenciones);
     }
 
+    public List<LiquidacionEmpleado> getLiquidacionesEmpleados() {
+        return liquidacionesEmpleados;
+    }
+
+    public void setLiquidacionesEmpleados(List<LiquidacionEmpleado> liquidacionesEmpleados) {
+        this.liquidacionesEmpleados = liquidacionesEmpleados;
+    }
 }

src/application/model/sueldo/LiquidacionEmpleado.java

@@ -2,7 +2,6 @@
 
 import application.model.info.Empleado;
 import javafx.beans.property.*;
-import javafx.collections.ObservableList;
 
 import java.util.List;
 

src/application/model/venta/Cliente.java

@@ -1,7 +1,6 @@
 package application.model.venta;
 
 import application.model.info.Domicilio;
-import application.model.info.Localidad;
 import javafx.beans.property.IntegerProperty;
 import javafx.beans.property.SimpleIntegerProperty;
 import javafx.beans.property.SimpleStringProperty;

src/application/model/venta/FacturaVenta.java

@@ -116,16 +116,17 @@ public void setOrganizacion(Organizacion organizacion) {
 
 
     public FacturaVenta(Integer idFacturaVenta, String cuit, String nombreEmpresa,
-                        String fechaEmision, String nombreCliente, String cuitCliente) {
+                        String fechaEmision, String nombreCliente, String cuitCliente, Double montoTotal) {
         this.idFacturaVenta = new SimpleIntegerProperty(idFacturaVenta);
         this.cuit = new SimpleStringProperty(cuit);
         this.nombreEmpresa = new SimpleStringProperty(nombreEmpresa);
         this.fechaEmision = new SimpleStringProperty(fechaEmision);
         this.nombreCliente = new SimpleStringProperty(nombreCliente);
         this.cuitCliente = new SimpleStringProperty(cuitCliente);
+        this.montoFactura = new SimpleDoubleProperty(montoTotal);
     }
 
     public FacturaVenta() {
-        this(0,null,null,null,null,null);
+        this(0,null,null,null,null,null,0.0);
     }
-}
+}

src/application/model/venta/Viaje.java

@@ -7,8 +7,6 @@
 import javafx.beans.property.*;
 import javafx.scene.control.CheckBox;
 
-import java.math.BigDecimal;
-
 public class Viaje {
 
     private IntegerProperty idRemito;
@@ -228,6 +226,7 @@ public Viaje(Integer idRemito, String fecha, String horaEntrada,
         this.ingenioDestino = new SimpleStringProperty(ingenioDestino);
         this.camionNombre = new SimpleStringProperty(camionNombre);
         this.facturaVenta = new SimpleStringProperty(facturaVenta);
+        this.monto = new SimpleDoubleProperty();
         this.conductor = conductor;
         this.ingenio = new Ingenio();
         this.conductor = new Empleado();
@@ -241,5 +240,6 @@ public Viaje() {
         this.setDistanciaRecorrida("0");
         this.setBruto(0);
         this.setTara(0);
+        this.setMonto(0);
     }
 }