Primer commit

parent 8abedcb7
Pipeline #62 failed with stages
name: Build
on:
push:
branches:
- main
pull_request:
types: [opened, synchronize, reopened]
jobs:
build:
name: Build
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
with:
fetch-depth: 0 # Shallow clones should be disabled for a better relevancy of analysis
- name: Set up JDK 11
uses: actions/setup-java@v1
with:
java-version: 11
- name: Cache SonarCloud packages
uses: actions/cache@v1
with:
path: ~/.sonar/cache
key: ${{ runner.os }}-sonar
restore-keys: ${{ runner.os }}-sonar
- name: Cache Maven packages
uses: actions/cache@v1
with:
path: ~/.m2
key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
restore-keys: ${{ runner.os }}-m2
- name: Build and analyze
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # Needed to get PR information, if any
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
run: mvn -B verify org.sonarsource.scanner.maven:sonar-maven-plugin:sonar -Dsonar.projectKey=Patomon_dda-front
8e2f58dea055b35f07cca677397cd78d3982235b PRESUPUESTO_ESTABLE_21_JULIO_2016
19e214099658915823fa9addd72498216b77e4fd NO_MAS_PRESUPUESTO_ESTABLE_21_JULIO_2016
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>integration-services</name>
<comment></comment>
<projects>
</projects>
<buildSpec>
<buildCommand>
<name>org.eclipse.m2e.core.maven2Builder</name>
<arguments>
</arguments>
</buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.m2e.core.maven2Nature</nature>
</natures>
</projectDescription>
activeProfiles=
eclipse.preferences.version=1
resolveWorkspaceProjects=true
version=1
# dda-integration
Proyecto de integración de Derechos de autor
CATALINA_HOME=/opt/servers/tomcat/apache-tomcat-7.0.67
#CATALINA_HOME=/home/montieln/Desktop/tmp/wars
SEVICIOS_WAR=rest-services
mvn clean install -Dmaven.test.skip=true -P production
echo "cp ${SEVICIOS_WAR}/target/*.war ${CATALINA_HOME}/webapps/"
cp ${SEVICIOS_WAR}/target/*.war ${CATALINA_HOME}/webapps/
#cp ${SEVICIOS_WAR}/target/*.war ${CATALINA_HOME}
#Si se quiere instalar se requiere hacer lo siguiente
#mvn -P production -Dmaven.test.skip=true tomcat7:redeploy
#mvn -P production -Dmaven.test.skip=true tomcat7:deploy
#mvn -P production -Dmaven.test.skip=true tomcat7:undeploy
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" output="target/classes" path="src/main/java">
<attributes>
<attribute name="optional" value="true"/>
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="src" output="target/test-classes" path="src/test/java">
<attributes>
<attribute name="optional" value="true"/>
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7">
<attributes>
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
<attributes>
<attribute name="maven.pomderived" value="true"/>
<attribute name="org.eclipse.jst.component.nondependency" value=""/>
</attributes>
</classpathentry>
<classpathentry kind="output" path="target/classes"/>
</classpath>
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>domain-model</name>
<comment></comment>
<projects>
</projects>
<buildSpec>
<buildCommand>
<name>org.eclipse.wst.common.project.facet.core.builder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.jdt.core.javabuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.springframework.ide.eclipse.core.springbuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.springframework.ide.eclipse.boot.validation.springbootbuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.wst.validation.validationbuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.m2e.core.maven2Builder</name>
<arguments>
</arguments>
</buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
<nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>
<nature>org.springframework.ide.eclipse.core.springnature</nature>
<nature>org.eclipse.jdt.core.javanature</nature>
<nature>org.eclipse.m2e.core.maven2Nature</nature>
<nature>org.eclipse.wst.common.project.facet.core.nature</nature>
</natures>
</projectDescription>
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
org.eclipse.jdt.core.compiler.compliance=1.7
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
org.eclipse.jdt.core.compiler.source=1.7
activeProfiles=
eclipse.preferences.version=1
resolveWorkspaceProjects=true
version=1
<?xml version="1.0" encoding="UTF-8"?><project-modules id="moduleCoreId" project-version="1.5.0">
<wb-module deploy-name="domain-model">
<wb-resource deploy-path="/" source-path="/src/main/java"/>
</wb-module>
</project-modules>
<?xml version="1.0" encoding="UTF-8"?>
<faceted-project>
<installed facet="java" version="1.7"/>
<installed facet="jst.utility" version="1.0"/>
</faceted-project>
disabled=06target
eclipse.preferences.version=1
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>com.mx.dla</groupId>
<artifactId>integration-services</artifactId>
<version>0.0.1-SNAPSHOT</version>
</parent>
<artifactId>domain-model</artifactId>
<name>domain-model-integration</name>
<dependencies>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
</dependency>
</dependencies>
</project>
\ No newline at end of file
package com.dla.dda.domain.constants;
public enum CorreoAutorizacionTypes {
AVISO, NOTIFICACION, REPORTE, OTRO
}
package com.dla.dda.domain.constants;
public enum ErrorCodes {
INFRASTRUCTURE("NO_OK", "Ocurrio un error con la base de datos [ERROR]"),
UNKNOW_ERROR("NO_OK", "Ocurrio un error en el sistema [ERROR]"),
DATA_ERROR("NO_OK", "Error al realizar la validacion [{ERROR}]"),
DATA_NOT_EXIST("NO_OK", "Error : [ERROR]"),
UNEXPECTED_EROR("NO_OK","Error al validar el presupuesto, pongase en contacto con el Admon del sistema"),
BUSSINES_ERROR("NO_OK", "El presupuesto disponible no es suficiente para cubrir el contrato"),
BUSSINES_DATE_ERROR("NO_OK", "La fecha de inicio del contrato es mayor a la sincronizacion con sap"),
SUCCESS("OK", "El contrato si se encuentra dentro del presupuesto"),
SUCCESS_PROCESS("OK", "Procedimiento ejecutado correctamente"),
FAIL("NO_OK", "Existen errores al procesar la peticion, verificar con el administrador del sistema");
private String detail;
private String code;
private ErrorCodes(String code, String detail) {
this.detail = detail;
this.code = code;
}
public String getDetail() {
return detail;
}
public void setDetail(String detail) {
this.detail = detail;
}
public String getCode() {
return code;
}
}
\ No newline at end of file
package com.dla.dda.domain.constants;
public enum EstatusContrato {
EN_REGISTRO(1),
NOTIFICACION_SAP(4),
VIGENTE(5);
private int id;
EstatusContrato(int id){
this.id = id;
}
public int getId() {
return id;
}
}
package com.dla.dda.domain.constants;
/**
* @see Estatus del estudio en DDA
* @author montieln
*
*/
public enum EstatusEstudio {
UNKNOW, //En los filtros se trata para traer todos
AUTORIZADO, // aplica cuando id_sap !=null
VIRTUAL; //Aplica cuando id_sap = null
}
package com.dla.dda.domain.constants;
/**
* @see representa el tipo de FEES
* @author montieln
*
*/
public enum FeesType {
UNKNOW(""), SUSCRIPCION("ESCALA"), FLAT("FLAT"), NO_APLICA("NO_APLICA");
private String nombre;
private FeesType() {
}
private FeesType(String nombre) {
this.nombre = nombre;
}
/**
* @see Obtiene el tipo de FEES
* @param nombre
* @return
*/
public static FeesType getType(String nombre) {
FeesType resultado = FeesType.UNKNOW;
FeesType[] fees = FeesType.values();
for (FeesType fee : fees) {
if (fee.nombre.equals(nombre)) {
resultado = fee;
break;
}
}
return resultado;
}
}
package com.dla.dda.domain.constants;
public enum Modulo {
PRESUPUESTO, AMORTIZACION
}
package com.dla.dda.domain.constants;
public enum Operacion {
CONTRATO,
FEES,
TITULOS,
MINIMO,
MATERIALES,
PRESUPUESTOS,
NOAUTORIZA,
CREACION_CONTRATO,
RECORDATORIO,
FINALIZO_AUTORIZACION
}
package com.dla.dda.domain.constants;
public enum OrigenCodes {
UNKNOW(0), REAL(1), ESPEJO(2);
private int code;
OrigenCodes(int code) {
this.code = code;
}
public int getCode() {
return code;
}
public OrigenCodes getOrigen(int code) {
OrigenCodes[] origenList = OrigenCodes.values();
for (OrigenCodes origen : origenList) {
if (origen.getCode() == code) {
return origen;
}
}
return UNKNOW;
}
}
package com.dla.dda.domain.constants;
import java.io.Serializable;
/**
* @see Metodo de consulta para identificar el objeto a consultar por filtro
* @author montieln
*
*/
public class QueryRequest implements Serializable {
private static final long serialVersionUID = 1L;
private EstatusEstudio estatus;
private String pattern;
public EstatusEstudio getEstatus() {
return estatus;
}
public void setEstatus(EstatusEstudio estatus) {
this.estatus = estatus;
}
public String getPattern() {
return pattern;
}
public void setPattern(String pattern) {
this.pattern = pattern;
}
}
package com.dla.dda.domain.constants;
public enum TipoContrato {
SUSCRIPCION(1);
private int id;
TipoContrato(int id) {
this.id = id;
}
public int getId() {
return id;
}
}
package com.dla.dda.domain.contrato;
import java.io.Serializable;
import java.util.Date;
import java.util.List;
import java.util.Map;
public class BonoFees implements Serializable {
private static final long serialVersionUID = 1L;
private Map<String, List<Rango>> rangos;
public Map<String, List<Rango>> getRangos() {
return rangos;
}
public void setRangos(Map<String, List<Rango>> rangos) {
this.rangos = rangos;
}
}
package com.dla.dda.domain.contrato;
import java.io.Serializable;
import java.util.List;
public class ContratoDDA implements Serializable {
private static final long serialVersionUID = 1L;
private String numeroContrato;
private Integer tipoContrato;
private Long idEstudio;
private String fechaInicio;
private String fechaFin;
private Long idApartado;
private String fechaDDA;
// Este contrato es el que viene de DDA
private Long idCtoDDA;
private Long idContratoOriginal;
private Integer pctjeInflacion;
private FeesDDA feesDDA;
private List<TituloDDA> tituloDDA;
public String getNumeroContrato() {
return numeroContrato;
}
public void setNumeroContrato(String numeroContrato) {
this.numeroContrato = numeroContrato;
}
public Integer getTipoContrato() {
return tipoContrato;
}
public void setTipoContrato(Integer tipoContrato) {
this.tipoContrato = tipoContrato;
}
public Long getIdEstudio() {
return idEstudio;
}
public void setIdEstudio(Long idEstudio) {
this.idEstudio = idEstudio;
}
public String getFechaInicio() {
return fechaInicio;
}
public void setFechaInicio(String fechaInicio) {
this.fechaInicio = fechaInicio;
}
public String getFechaFin() {
return fechaFin;
}
public void setFechaFin(String fechaFin) {
this.fechaFin = fechaFin;
}
public Long getIdApartado() {
return idApartado;
}
public void setIdApartado(Long idApartado) {
this.idApartado = idApartado;
}
public Long getIdCtoDDA() {
return idCtoDDA;
}
public void setIdCtoDDA(Long idCtoDDA) {
this.idCtoDDA = idCtoDDA;
}
public Integer getPctjeInflacion() {
return pctjeInflacion;
}
public void setPctjeInflacion(Integer pctjeInflacion) {
this.pctjeInflacion = pctjeInflacion;
}
public FeesDDA getFeesDDA() {
return feesDDA;
}
public void setFeesDDA(FeesDDA feesDDA) {
this.feesDDA = feesDDA;
}
public List<TituloDDA> getTituloDDA() {
return tituloDDA;
}
public void setTituloDDA(List<TituloDDA> tituloDDA) {
this.tituloDDA = tituloDDA;
}
public Long getIdContratoOriginal() {
return idContratoOriginal;
}
public void setIdContratoOriginal(Long idContratoOriginal) {
this.idContratoOriginal = idContratoOriginal;
}
public String getFechaDDA() {
return fechaDDA;
}
public void setFechaDDA(String fechaDDA) {
this.fechaDDA = fechaDDA;
}
@Override
public String toString() {
return "ContratoDDA [numeroContrato=" + numeroContrato
+ ", tipoContrato=" + tipoContrato + ", idEstudio=" + idEstudio
+ ", fechaInicio=" + fechaInicio + ", fechaFin=" + fechaFin
+ ", idApartado=" + idApartado + ", fechaDDA=" + fechaDDA
+ ", idCtoDDA=" + idCtoDDA + ", idContratoOriginal="
+ idContratoOriginal + ", pctjeInflacion=" + pctjeInflacion
+ ", feesDDA=" + feesDDA + ", tituloDDA=" + tituloDDA + "]";
}
}
package com.dla.dda.domain.contrato;
import java.io.Serializable;
import java.util.List;
public class FeesDDA implements Serializable {
private static final long serialVersionUID = 1L;
//TODO poner el tipo que trae
private List<FeesSuscriptor> suscriptor;
private FeesFlat flat;
private BonoFees bono;
public List<FeesSuscriptor> getSuscriptor() {
return suscriptor;
}
public void setSuscriptor(List<FeesSuscriptor> suscriptor) {
this.suscriptor = suscriptor;
}
public FeesFlat getFlat() {
return flat;
}
public void setFlat(FeesFlat flat) {
this.flat = flat;
}
public BonoFees getBono() {
return bono;
}
public void setBono(BonoFees bono) {
this.bono = bono;
}
}
package com.dla.dda.domain.contrato;
import java.io.Serializable;
import java.util.List;
import java.util.Map;
public class FeesFlat implements Serializable{
private static final long serialVersionUID = 1L;
private Map<String, List<PeriodoFlat>> periodos;
public Map<String, List<PeriodoFlat>> getPeriodos() {
return periodos;
}
public void setPeriodos(Map<String, List<PeriodoFlat>> periodos) {
this.periodos = periodos;
}
@Override
public String toString() {
return "FeesFlat [periodos=" + periodos + "]";
}
}
package com.dla.dda.domain.contrato;
import java.io.Serializable;
import java.util.Date;
import java.util.List;
import java.util.Map;
public class FeesSuscriptor implements Serializable {
private static final long serialVersionUID = 1L;
private Date fechaInicio;
private Date fechaFin;
private Integer idTipoSuscriptor;
private Map<String, List<Rango>> periodos;
public FeesSuscriptor() {
super();
}
public FeesSuscriptor(Date fechaInicio, Date fechaFin, Integer idTipoSuscriptor,
Map<String, List<Rango>> periodos) {
super();
this.fechaInicio = fechaInicio;
this.fechaFin = fechaFin;
this.idTipoSuscriptor = idTipoSuscriptor;
this.periodos = periodos;
}
public Date getFechaInicio() {
return fechaInicio;
}
public void setFechaInicio(Date fechaInicio) {
this.fechaInicio = fechaInicio;
}
public Date getFechaFin() {
return fechaFin;
}
public void setFechaFin(Date fechaFin) {
this.fechaFin = fechaFin;
}
public Integer getIdTipoSuscriptor() {
return idTipoSuscriptor;
}
public void setIdTipoSuscriptor(Integer idTipoSuscriptor) {
this.idTipoSuscriptor = idTipoSuscriptor;
}
public Map<String, List<Rango>> getPeriodos() {
return periodos;
}
public void setPeriodos(Map<String, List<Rango>> periodos) {
this.periodos = periodos;
}
@Override
public String toString() {
return "FeesSuscriptor [fechaInicio=" + fechaInicio + ", fechaFin="
+ fechaFin + ", idTipoSuscriptor=" + idTipoSuscriptor
+ ", periodos=" + periodos + "]";
}
}
package com.dla.dda.domain.contrato;
import java.io.Serializable;
import java.util.Date;
public class PeriodoFlat implements Serializable {
private static final long serialVersionUID = 1L;
private Date fechaInicio;
private Date fechaFin;
private Double valor;
public Date getFechaInicio() {
return fechaInicio;
}
public void setFechaInicio(Date fechaInicio) {
this.fechaInicio = fechaInicio;
}
public Date getFechaFin() {
return fechaFin;
}
public void setFechaFin(Date fechaFin) {
this.fechaFin = fechaFin;
}
public Double getValor() {
return valor;
}
public void setValor(Double valor) {
this.valor = valor;
}
@Override
public String toString() {
return "PeriodoFlat [fechaInicio=" + fechaInicio + ", fechaFin=" + fechaFin + ", valor=" + valor + "]";
}
}
package com.dla.dda.domain.contrato;
import java.io.Serializable;
public class Rango implements Serializable {
private static final long serialVersionUID = 1L;
private Integer desde;
private Integer hasta;
private Double valor;
public Rango() {
super();
}
public Rango(Integer desde, Integer hasta, Double valor) {
super();
this.desde = desde;
this.hasta = hasta;
this.valor = valor;
}
public Integer getDesde() {
return desde;
}
public void setDesde(Integer desde) {
this.desde = desde;
}
public Integer getHasta() {
return hasta;
}
public void setHasta(Integer hasta) {
this.hasta = hasta;
}
public Double getValor() {
return valor;
}
public void setValor(Double valor) {
this.valor = valor;
}
@Override
public String toString() {
return "Rango [desde=" + desde + ", hasta=" + hasta + ", valor=" + valor + "]";
}
}
package com.dla.dda.domain.contrato;
import java.io.Serializable;
import java.util.Date;
public class TituloDDA implements Serializable {
private static final long serialVersionUID = 1L;
private String nombre;
private Date fechaInicioExhibicion;
private Date fechaFinExhibicion;
private String categoriaTarifa;
private String clasificacion;
private String episodio;
private String temporada;
private String tipo;
private Long idCtoOrig;
private Double costo;
private String idBroadview;
private String idCategoria;
public String getNombre() {
return nombre;
}
public void setNombre(String nombre) {
this.nombre = nombre;
}
public Date getFechaInicioExhibicion() {
return fechaInicioExhibicion;
}
public void setFechaInicioExhibicion(Date fechaInicioExhibicion) {
this.fechaInicioExhibicion = fechaInicioExhibicion;
}
public Date getFechaFinExhibicion() {
return fechaFinExhibicion;
}
public void setFechaFinExhibicion(Date fechaFinExhibicion) {
this.fechaFinExhibicion = fechaFinExhibicion;
}
public String getCategoriaTarifa() {
return categoriaTarifa;
}
public void setCategoriaTarifa(String categoriaTarifa) {
this.categoriaTarifa = categoriaTarifa;
}
public String getClasificacion() {
return clasificacion;
}
public void setClasificacion(String clasificacion) {
this.clasificacion = clasificacion;
}
public String getEpisodio() {
return episodio;
}
public void setEpisodio(String episodio) {
this.episodio = episodio;
}
public String getTemporada() {
return temporada;
}
public void setTemporada(String temporada) {
this.temporada = temporada;
}
public String getTipo() {
return tipo;
}
public void setTipo(String tipo) {
this.tipo = tipo;
}
public Long getIdCtoOrig() {
return idCtoOrig;
}
public void setIdCtoOrig(Long idCtoOrig) {
this.idCtoOrig = idCtoOrig;
}
public Double getCosto() {
return costo;
}
public void setCosto(Double costo) {
this.costo = costo;
}
public String getIdBroadview() {
return idBroadview;
}
public void setIdBroadview(String idBroadview) {
this.idBroadview = idBroadview;
}
public String getIdCategoria() {
return idCategoria;
}
public void setIdCategoria(String idCategoria) {
this.idCategoria = idCategoria;
}
@Override
public String toString() {
return "TituloDDA [nombre=" + nombre + ", fechaInicioExhibicion=" + fechaInicioExhibicion
+ ", fechaFinExhibicion=" + fechaFinExhibicion + ", categoriaTarifa=" + categoriaTarifa
+ ", clasificacion=" + clasificacion + ", episodio=" + episodio + ", temporada=" + temporada + ", tipo="
+ tipo + ", idCtoOrig=" + idCtoOrig + ", costo=" + costo + ", idBroadview=" + idBroadview + ", idCategoria=" + idCategoria + "]";
}
}
package com.dla.dda.domain.exceptions;
import com.dla.dda.domain.constants.ErrorCodes;
/**
* @see interface para manejar los diferentes tipos de error del siste,a
* @author montieln
*
*/
public class DLAIntegrationException extends Exception {
private static final long serialVersionUID = 1L;
private ErrorCodes error;
public DLAIntegrationException(ErrorCodes error) {
super();
this.error = error;
}
public ErrorCodes getError() {
return error;
}
@Override
public String getMessage() {
String messageError = "[" + error + "][" + error.getCode() + "]" + "[" + error.getDetail() + "]";
return messageError + "[" + super.getMessage() + "]";
}
}
package com.dla.dda.domain.exceptions.utils;
import org.apache.commons.lang3.StringUtils;
import com.dla.dda.domain.constants.ErrorCodes;
/**
* @see Utileria para setear los msg de error
* @author montieln
*
*/
public class ErrorUtils {
/**
* @see Sustituye el valor del toket por el msg de exception
* @param sucess
* @param saldo
*/
public static void setMessage(ErrorCodes error, String messages) {
final String error_token = "ERROR";
String message = error.getDetail();
message = StringUtils.replace(message, error_token, messages);
error.setDetail(message);
}
}
package com.dla.dda.domain.model;
import java.io.Serializable;
import java.util.HashMap;
import java.util.Map;
public class ContratoTitulosAmortizacion implements Serializable {
private static final long serialVersionUID = 1L;
private Map<Integer, Double> monto = new HashMap<>();
public Map<Integer, Double> getMonto() {
return monto;
}
public void setMonto(Map<Integer, Double> monto) {
this.monto = monto;
}
public void addMonto(Integer anio, Double montoDouble) {
monto.put(anio, montoDouble);
}
}
package com.dla.dda.domain.model;
import java.io.Serializable;
/**
* @see Pojo que representa el detalle del titulo anual
* @author montieln
*
*/
public class TitulosMonto implements Serializable {
private static final long serialVersionUID = 1L;
private String idTitulo;
private Double monto;
public TitulosMonto() {
super();
}
public TitulosMonto(String idTitulo, Double monto) {
super();
this.idTitulo = idTitulo;
this.monto = monto;
}
public String getIdTitulo() {
return idTitulo;
}
public void setIdTitulo(String idTitulo) {
this.idTitulo = idTitulo;
}
public Double getMonto() {
return monto;
}
public void setMonto(Double monto) {
this.monto = monto;
}
}
package com.dla.dda.domain.model;
import java.io.Serializable;
public class UserInfo implements Serializable {
/**
*
*/
private static final long serialVersionUID = -2863406968544329790L;
private String nombreCompleto;
private String area;
private String empresa;
private String email;
private String username;
private String materno;
private String nombre;
private String paterno;
public String getNombreCompleto() {
return nombreCompleto;
}
public void setNombreCompleto(String nombreCompleto) {
this.nombreCompleto = nombreCompleto;
}
public String getArea() {
return area;
}
public void setArea(String area) {
this.area = area;
}
public String getEmpresa() {
return empresa;
}
public void setEmpresa(String empresa) {
this.empresa = empresa;
}
public String getEmail() {
return email;
}
public void setEmail(String email) {
this.email = email;
}
public String getUsername() {
return username;
}
public void setUsername(String username) {
this.username = username;
}
public String getMaterno() {
return materno;
}
public void setMaterno(String materno) {
this.materno = materno;
}
public String getNombre() {
return nombre;
}
public void setNombre(String nombre) {
this.nombre = nombre;
}
public String getPaterno() {
return paterno;
}
public void setPaterno(String paterno) {
this.paterno = paterno;
}
@Override
public String toString() {
return "UserInfo [nombreCompleto=" + nombreCompleto + ", area=" + area
+ ", empresa=" + empresa + ", email=" + email + ", username="
+ username + ", materno=" + materno + ", nombre=" + nombre
+ ", paterno=" + paterno + "]";
}
}
package com.dla.dda.domain.model.email;
import java.io.Serializable;
public class DetalleCorreoVO implements Serializable {
private static final long serialVersionUID = 1L;
private String numeroContrato;
private String descripcionEstudio;
private String vigencia;
private String noTitulos;
private String monto;
private String motivo;
private String lineaFinal;
private Long idDocumento;
public String getNumeroContrato() {
return numeroContrato;
}
public void setNumeroContrato(String numeroContrato) {
this.numeroContrato = numeroContrato;
}
public String getDescripcionEstudio() {
return descripcionEstudio;
}
public void setDescripcionEstudio(String descripcionEstudio) {
this.descripcionEstudio = descripcionEstudio;
}
public String getVigencia() {
return vigencia;
}
public void setVigencia(String vigencia) {
this.vigencia = vigencia;
}
public String getNoTitulos() {
return noTitulos;
}
public void setNoTitulos(String noTitulos) {
this.noTitulos = noTitulos;
}
public String getMonto() {
return monto;
}
public void setMonto(String monto) {
this.monto = monto;
}
public void setMotivo(String motivo) {
this.motivo = motivo;
}
public String getMotivo() {
return motivo;
}
public String getLineaFinal() {
return lineaFinal;
}
public void setLineaFinal(String lineaFinal) {
this.lineaFinal = lineaFinal;
}
public Long getIdDocumento() {
return idDocumento;
}
public void setIdDocumento(Long idDocumento) {
this.idDocumento = idDocumento;
}
@Override
public String toString() {
return "DetalleCorreoVO [numeroContrato=" + numeroContrato + ", descripcionEstudio=" + descripcionEstudio
+ ", vigencia=" + vigencia + ", noTitulos=" + noTitulos + ", monto=" + monto + ", motivo=" + motivo
+ ", lineaFinal=" + lineaFinal + ", idDocumento=" + idDocumento + "]";
}
}
/**
* Omnitracs - HITSS
*
* Proyecto MAYA
*
* AlertEmailDTO.java - Nov 20, 2013
*/
package com.dla.dda.domain.model.email;
import java.io.Serializable;
import com.dla.dda.domain.model.request.EmailRequest;
/**
*
* @see VO de prueba para mandar correos, este tipo de objetos debe representar
* los datos a sustituir
* @author nmontielh
* @version 1.0
*/
public class EmailModelVO implements Serializable {
private static final long serialVersionUID = -1390706851236321412L;
private EmailRequest request;
private DetalleCorreoVO autorizacion;
public EmailRequest getRequest() {
return request;
}
public void setRequest(EmailRequest request) {
this.request = request;
}
public DetalleCorreoVO getAutorizacion() {
return autorizacion;
}
public void setAutorizacion(DetalleCorreoVO autorizacion) {
this.autorizacion = autorizacion;
}
@Override
public String toString() {
return "EmailModelVO [request=" + request + ", autorizacion=" + autorizacion + "]";
}
}
package com.dla.dda.domain.model.email;
import java.io.Serializable;
import java.util.Arrays;
import org.springframework.core.io.InputStreamSource;
/**
* @see Objeto para mandar un correo electronico con attachment
* @modified se agregan 2 attachments
* @author nmontielh
* @version 1.0
*/
public class MessageAttachment implements Serializable {
private static final long serialVersionUID = 1L;
private String[] toAddres;
private String fromAdddres;
private InputStreamSource ios;
private String contentType;
private String attachmentFilename;
private String texto;
private String subject;
public MessageAttachment(String[] toAddres, String fromAdddres, String texto) {
super();
this.toAddres = toAddres;
this.fromAdddres = fromAdddres;
this.texto = texto;
}
public MessageAttachment() {
super();
}
public String getTexto() {
return texto;
}
public void setTexto(String texto) {
this.texto = texto;
}
public String getAttachmentFilename() {
return attachmentFilename;
}
public void setAttachmentFilename(String attachmentFilename) {
this.attachmentFilename = attachmentFilename;
}
public String[] getToAddres() {
return toAddres;
}
public void setToAddres(String[] toAddres) {
this.toAddres = toAddres;
}
public InputStreamSource getIos() {
return ios;
}
public void setIos(InputStreamSource is) {
ios = is;
}
public String getContentType() {
return contentType;
}
public void setContentType(String contentType) {
this.contentType = contentType;
}
public String getFromAdddres() {
return fromAdddres;
}
public void setFromAdddres(String fromAdddres) {
this.fromAdddres = fromAdddres;
}
public String getSubject() {
return subject;
}
public void setSubject(String subject) {
this.subject = subject;
}
@Override
public String toString() {
return "MessageAttachment [toAddres=" + Arrays.toString(toAddres) + ", fromAdddres=" + fromAdddres
+ ", contentType=" + contentType + ", attachmentFilename=" + attachmentFilename + ", texto=" + texto
+ ", subject=" + subject + "]";
}
}
package com.dla.dda.domain.model.email;
public class PresupuestoApartadoDTO {
private Double monto;
private String annio;
private String fechaSap;
public Double getMonto() {
return monto;
}
public void setMonto(Double monto) {
this.monto = monto;
}
public String getAnnio() {
return annio;
}
public void setAnnio(String annio) {
this.annio = annio;
}
public String getFechaSap() {
return fechaSap;
}
public void setFechaSap(String fechaSap) {
this.fechaSap = fechaSap;
}
@Override
public String toString() {
return "PresupuestoApartadoDTO [monto=" + monto + ", annio=" + annio
+ ", fechaSap=" + fechaSap + "]";
}
}
package com.dla.dda.domain.model.request;
import java.io.Serializable;
/**
* @see Request para todos los objetos relacionados a contratos
* @author montieln
*
*/
public class ContratoRequest implements Serializable {
private static final long serialVersionUID = 1L;
private Integer idEstudio;
private Long idContrato;
public Long getIdContrato() {
return idContrato;
}
public void setIdContrato(Long idContrato) {
this.idContrato = idContrato;
}
public Integer getIdEstudio() {
return idEstudio;
}
public void setIdEstudio(Integer idEstudio) {
this.idEstudio = idEstudio;
}
@Override
public String toString() {
return "ContratoRequest [idEstudio=" + idEstudio + "]";
}
}
package com.dla.dda.domain.model.request;
import java.util.Arrays;
import com.dla.dda.domain.constants.CorreoAutorizacionTypes;
public class EmailAutorizacionRequest extends EmailRequest {
private static final long serialVersionUID = 5264647653876342650L;
private String aprobacionUsuario;
private String notificaUsuario;
private String nombreProyecto;
private String fechaAutorizacion;
private CorreoAutorizacionTypes tipoCorreo;
public String getAprobacionUsuario() {
return aprobacionUsuario;
}
public void setAprobacionUsuario(String aprobacionUsuario) {
this.aprobacionUsuario = aprobacionUsuario;
}
public String getNotificaUsuario() {
return notificaUsuario;
}
public void setNotificaUsuario(String notificaUsuario) {
this.notificaUsuario = notificaUsuario;
}
public String getNombreProyecto() {
return nombreProyecto;
}
public void setNombreProyecto(String nombreProyecto) {
this.nombreProyecto = nombreProyecto;
}
public String getFechaAutorizacion() {
return fechaAutorizacion;
}
public void setFechaAutorizacion(String fechaAutorizacion) {
this.fechaAutorizacion = fechaAutorizacion;
}
public CorreoAutorizacionTypes getTipoCorreo() {
return tipoCorreo;
}
public void setTipoCorreo(CorreoAutorizacionTypes tipoCorreo) {
this.tipoCorreo = tipoCorreo;
}
@Override
public String toString() {
return "EmailAutorizacionRequest [aprobacionUsuario="
+ aprobacionUsuario + ", notificaUsuario=" + notificaUsuario
+ ", nombreProyecto=" + nombreProyecto + ", fechaAutorizacion="
+ fechaAutorizacion + ", tipoCorreo=" + tipoCorreo
+ ", getEtiqueta()=" + getEtiqueta() + ", getBody()="
+ getBody() + ", getDestinatarios()="
+ Arrays.toString(getDestinatarios()) + ", getName()="
+ getName() + ", getDate()=" + getDate() + ", getUserName()="
+ getUserName() + ", getToCompany()=" + getToCompany()
+ ", getSubject()=" + getSubject() + ", getOperacion()="
+ getOperacion() + ", getIos()=" + getIos()
+ ", getContentType()=" + getContentType()
+ ", getAttachmentFilename()=" + getAttachmentFilename() + "]";
}
}
package com.dla.dda.domain.model.request;
import java.io.Serializable;
import java.util.Arrays;
import org.springframework.core.io.InputStreamSource;
import com.dla.dda.domain.constants.Operacion;
public class EmailRequest implements Serializable {
/**
*
*/
private static final long serialVersionUID = 1L;
/**
* poner atributos con susana
*/
private String[] destinatarios;
private String body;
private String name;
private String date;
private String userName;
private String toCompany;
private String subject;
private Operacion operacion;
private String etiqueta;
private InputStreamSource ios;
private String contentType;
private String attachmentFilename;
public String getEtiqueta() {
return etiqueta;
}
public void setEtiqueta(String etiqueta) {
this.etiqueta = etiqueta;
}
public String getBody() {
return body;
}
public void setBody(String body) {
this.body = body;
}
public String[] getDestinatarios() {
return destinatarios;
}
public void setDestinatarios(String[] destinatarios) {
this.destinatarios = destinatarios;
}
public String getName() {
return name;
}
public void setName(String name) {
this.name = name;
}
public String getDate() {
return date;
}
public void setDate(String date) {
this.date = date;
}
public String getUserName() {
return userName;
}
public void setUserName(String userName) {
this.userName = userName;
}
public String getToCompany() {
return toCompany;
}
public void setToCompany(String toCompany) {
this.toCompany = toCompany;
}
public String getSubject() {
return subject;
}
public void setSubject(String subject) {
this.subject = subject;
}
public Operacion getOperacion() {
return operacion;
}
public void setOperacion(Operacion operacion) {
this.operacion = operacion;
}
public InputStreamSource getIos() {
return ios;
}
public void setIos(InputStreamSource ios) {
this.ios = ios;
}
public String getContentType() {
return contentType;
}
public void setContentType(String contentType) {
this.contentType = contentType;
}
public String getAttachmentFilename() {
return attachmentFilename;
}
public void setAttachmentFilename(String attachmentFilename) {
this.attachmentFilename = attachmentFilename;
}
@Override
public String toString() {
return "EmailRequest [destinatarios=" + Arrays.toString(destinatarios)
+ ", body=" + body + ", name=" + name + ", date=" + date
+ ", userName=" + userName + ", toCompany=" + toCompany
+ ", subject=" + subject + ", operacion=" + operacion
+ ", etiqueta=" + etiqueta + "]";
}
}
package com.dla.dda.domain.model.request;
import java.io.Serializable;
import java.util.Set;
/**
* @see Modelo Que representa el request para la validacion del presupuesto
* @author montieln
*
*/
public class PresupuestoRequest implements Serializable {
private static final long serialVersionUID = 1L;
private long contrato;
private int anio;
private String origenTitulos;
private Boolean parcial;
private Set<Long> idTitulos;
public PresupuestoRequest() {
super();
}
public PresupuestoRequest(long contrato, int anio, String origenTitulos) {
super();
this.contrato = contrato;
this.anio = anio;
this.origenTitulos = origenTitulos;
}
public long getContrato() {
return contrato;
}
public void setContrato(long contrato) {
this.contrato = contrato;
}
public int getAnio() {
return anio;
}
public void setAnio(int anio) {
this.anio = anio;
}
public String getOrigenTitulos() {
return origenTitulos;
}
public void setOrigenTitulos(String origenTitulos) {
this.origenTitulos = origenTitulos;
}
public Boolean getParcial() {
return parcial;
}
public void setParcial(Boolean parcial) {
this.parcial = parcial;
}
public Set<Long> getIdTitulos() {
return idTitulos;
}
public void setIdTitulos(Set<Long> idTitulos) {
this.idTitulos = idTitulos;
}
@Override
public String toString() {
return "PresupuestoRequest [contrato=" + contrato + ", anio=" + anio + ", origenTitulos=" + origenTitulos + "]";
}
}
package com.dla.dda.domain.model.request;
public class ProyectoAutorizacionRequest {
private Long idProyecto;
private String autorizadorActualExp;
public Long getIdProyecto() {
return idProyecto;
}
public void setIdProyecto(Long idProyecto) {
this.idProyecto = idProyecto;
}
public String getAutorizadorActualExp() {
return autorizadorActualExp;
}
public void setAutorizadorActualExp(String autorizadorActualExp) {
this.autorizadorActualExp = autorizadorActualExp;
}
}
package com.dla.dda.domain.model.request;
import java.io.Serializable;
public class SecurityRequest implements Serializable {
private static final long serialVersionUID = 1L;
private String user;
private String password;
public String getUser() {
return user;
}
public void setUser(String user) {
this.user = user;
}
public String getPassword() {
return password;
}
public void setPassword(String password) {
this.password = password;
}
}
package com.dla.dda.domain.model.response;
import java.io.Serializable;
import java.util.ArrayList;
import java.util.List;
import com.dla.dda.domain.constants.ErrorCodes;
/**
* @see Modelo que representa la respuesta al proceso de la generacion de la
* amortizacion
* @author montieln
*
*/
public class AmortizacionResponse implements Serializable {
private static final long serialVersionUID = 1L;
private String responseCode;
private String detail;
private List<ErrorCodes> error = new ArrayList<>();
public AmortizacionResponse() {
super();
}
public List<ErrorCodes> getError() {
return error;
}
public void setError(List<ErrorCodes> error) {
this.error = error;
}
public String getResponseCode() {
return responseCode;
}
public void setResponseCode(String responseCode) {
this.responseCode = responseCode;
}
public String getDetail() {
return detail;
}
public void setDetail(String detail) {
this.detail = detail;
}
@Override
public String toString() {
return "AmortizacionResponse [responseCode=" + responseCode + ", detail=" + detail + ", error=" + error + "]";
}
}
package com.dla.dda.domain.model.response;
import java.io.Serializable;
import java.util.List;
import com.dla.dda.domain.constants.ErrorCodes;
import com.dla.dda.domain.contrato.ContratoDDA;
/**
* @see Representacion de los objetos de contrato de DDA
* @author montieln
*
*/
public class ContratoResponse implements Serializable {
private static final long serialVersionUID = 1L;
private List<ContratoDDA> contratos;
private ErrorCodes responseCode;
public List<ContratoDDA> getContratos() {
return contratos;
}
public void setContratos(List<ContratoDDA> contratos) {
this.contratos = contratos;
}
public ErrorCodes getResponseCode() {
return responseCode;
}
public void setResponseCode(ErrorCodes responseCode) {
this.responseCode = responseCode;
}
@Override
public String toString() {
return "ContratoResponse [contratos=" + contratos + ", responseCode=" + responseCode + "]";
}
}
package com.dla.dda.domain.model.response;
import java.io.Serializable;
import java.util.ArrayList;
import java.util.List;
import com.dla.dda.domain.constants.ErrorCodes;
public class EmailResponse implements Serializable {
/**
*
*/
private static final long serialVersionUID = 1L;
// TODO: preguntarle a susana que atributos lleva
private String respuesta;
private List<ErrorCodes> error = new ArrayList<>();
public String getRespuesta() {
return respuesta;
}
public void setRespuesta(String respuesta) {
this.respuesta = respuesta;
}
public List<ErrorCodes> getError() {
return error;
}
public void setError(List<ErrorCodes> error) {
this.error = error;
}
@Override
public String toString() {
return "EmailResponse [respuesta=" + respuesta + ", error=" + error + "]";
}
}
package com.dla.dda.domain.model.response;
import java.io.Serializable;
/**
* @see Clase que representa los estudios de DDA
* @author montieln
*
*/
public class EstudioDDA implements Serializable {
private static final long serialVersionUID = 1L;
private Long idEstudio;
private String idSap;
private String descEstudio;
private String moneda;
private String codigoPais;
private String nombrePais;
private String sociedad;
private String siglaDada;
private Integer orden;
public Long getIdEstudio() {
return idEstudio;
}
public void setIdEstudio(Long idEstudio) {
this.idEstudio = idEstudio;
}
public String getIdSap() {
return idSap;
}
public void setIdSap(String idSap) {
this.idSap = idSap;
}
public String getDescEstudio() {
return descEstudio;
}
public void setDescEstudio(String descEstudio) {
this.descEstudio = descEstudio;
}
public String getMoneda() {
return moneda;
}
public void setMoneda(String moneda) {
this.moneda = moneda;
}
public String getCodigoPais() {
return codigoPais;
}
public void setCodigoPais(String codigoPais) {
this.codigoPais = codigoPais;
}
public String getNombrePais() {
return nombrePais;
}
public void setNombrePais(String nombrePais) {
this.nombrePais = nombrePais;
}
public String getSociedad() {
return sociedad;
}
public void setSociedad(String sociedad) {
this.sociedad = sociedad;
}
public String getSiglaDada() {
return siglaDada;
}
public void setSiglaDada(String siglaDada) {
this.siglaDada = siglaDada;
}
public Integer getOrden() {
return orden;
}
public void setOrden(Integer orden) {
this.orden = orden;
}
}
\ No newline at end of file
package com.dla.dda.domain.model.response;
import java.io.Serializable;
import java.util.List;
/**
* @see Clase que representa un estudio en DDA
* @author montieln
*
*/
public class EstudiosResponse implements Serializable {
private static final long serialVersionUID = 1L;
private List<EstudioDDA> estudios;
public List<EstudioDDA> getEstudios() {
return estudios;
}
public void setEstudios(List<EstudioDDA> estudios) {
this.estudios = estudios;
}
}
package com.dla.dda.domain.model.response;
import java.io.Serializable;
import java.util.ArrayList;
import java.util.List;
import com.dla.dda.domain.constants.ErrorCodes;
import com.dla.dda.domain.model.TitulosMonto;
/**
* @see Modelo que representa al presupuesto
* @author montieln
*
*/
public class PresupuestoResponse implements Serializable {
private static final long serialVersionUID = 1L;
private Double amortizable;
private Double contratado;
private Double disponible;
// Solo traer el del contrato que me consultaron
private Double amortizableEstudio;
// contratado Estudio
private Double contratoEstudio;
// la resta que en el disponible anterior
private Double disponibleEstudio;
//
private Double valorContrato;
private List<TitulosMonto> listaTitulos;// Titulo y valor en ese año
private String estatus;
private String msg;
private List<ErrorCodes> error = new ArrayList<>();
public PresupuestoResponse() {
super();
}
public PresupuestoResponse(double amortizable, double contratado, double disponible, double amortizableEstudio,
double contratoEstudio, double disponibleEstudio, double valorContrato, List<TitulosMonto> listaTitulos,
String estatus, String msg) {
super();
this.amortizable = amortizable;
this.contratado = contratado;
this.disponible = disponible;
this.amortizableEstudio = amortizableEstudio;
this.contratoEstudio = contratoEstudio;
this.disponibleEstudio = disponibleEstudio;
this.valorContrato = valorContrato;
this.listaTitulos = listaTitulos;
this.estatus = estatus;
this.msg = msg;
}
public Double getAmortizable() {
return amortizable;
}
public void setAmortizable(Double amortizable) {
this.amortizable = amortizable;
}
public Double getContratado() {
return contratado;
}
public void setContratado(Double contratado) {
this.contratado = contratado;
}
public Double getDisponible() {
return disponible;
}
public void setDisponible(Double disponible) {
this.disponible = disponible;
}
public Double getAmortizableEstudio() {
return amortizableEstudio;
}
public void setAmortizableEstudio(Double amortizableEstudio) {
this.amortizableEstudio = amortizableEstudio;
}
public Double getContratoEstudio() {
return contratoEstudio;
}
public void setContratoEstudio(Double contratoEstudio) {
this.contratoEstudio = contratoEstudio;
}
public Double getDisponibleEstudio() {
return disponibleEstudio;
}
public void setDisponibleEstudio(Double disponibleEstudio) {
this.disponibleEstudio = disponibleEstudio;
}
public Double getValorContrato() {
return valorContrato;
}
public void setValorContrato(Double valorContrato) {
this.valorContrato = valorContrato;
}
public List<TitulosMonto> getListaTitulos() {
return listaTitulos;
}
public void setListaTitulos(List<TitulosMonto> listaTitulos) {
this.listaTitulos = listaTitulos;
}
public String getEstatus() {
return estatus;
}
public void setEstatus(String estatus) {
this.estatus = estatus;
}
public String getMsg() {
return msg;
}
public void setMsg(String msg) {
this.msg = msg;
}
public List<ErrorCodes> getError() {
return error;
}
public void setError(List<ErrorCodes> error) {
this.error = error;
}
@Override
public String toString() {
return "PresupuestoResponse [amortizable=" + amortizable + ", contratado=" + contratado + ", disponible="
+ disponible + ", amortizableEstudio=" + amortizableEstudio + ", contratoEstudio=" + contratoEstudio
+ ", disponibleEstudio=" + disponibleEstudio + ", valorContrato=" + valorContrato + ", estatus="
+ estatus + ", msg=" + msg + ", error=" + error + "]";
}
}
package com.dla.dda.domain.model.response;
import java.io.Serializable;
import java.util.List;
import com.dla.dda.domain.model.UserInfo;
/**
* @see Respuesta para las peticiones de seguridad
* @author montieln
*
*/
public class SecurityResponse implements Serializable {
private static final long serialVersionUID = 1L;
private String username;
private Boolean enabled;
private List<String> perfil;
private String detail;
private UserInfo user;
public SecurityResponse() {
super();
}
public SecurityResponse(String expediente, Boolean enabled, List<String> perfil, String detail) {
super();
this.username = expediente;
this.enabled = enabled;
this.perfil = perfil;
this.detail = detail;
}
public String getUsername() {
return username;
}
public void setUsername(String username) {
this.username = username;
}
public Boolean getEnabled() {
return enabled;
}
public void setEnabled(Boolean enabled) {
this.enabled = enabled;
}
public List<String> getPerfil() {
return perfil;
}
public void setPerfil(List<String> perfil) {
this.perfil = perfil;
}
public String getDetail() {
return detail;
}
public void setDetail(String detail) {
this.detail = detail;
}
public UserInfo getUser() {
return user;
}
public void setUser(UserInfo user) {
this.user = user;
}
@Override
public String toString() {
return "SecurityResponse [username=" + username + ", enabled=" + enabled + ", perfil=" + perfil
+ ", detail=" + detail + ", user=" + user + "]";
}
}
package com.dla.dda.domain.model.response;
import java.io.Serializable;
import java.util.List;
import com.dla.dda.domain.model.UserInfo;
public class UsuariosResponse implements Serializable {
private static final long serialVersionUID = -336316341767220626L;
private List<UserInfo> usuarios;
public List<UserInfo> getUsuarios() {
return usuarios;
}
public void setUsuarios(List<UserInfo> usuarios) {
this.usuarios = usuarios;
}
}
<project name="maven-antrun-" default="main" >
<target name="main">
<property name="serverUrl" value="${server.url}"/>
<property name="serverId" value="${server.id}"/>
<echo message="parametros deployment: ${serverUrl}, ${serverId}, domain-model-0.0.1-SNAPSHOT"/>
</target>
</project>
\ No newline at end of file
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment