Merge branch 'development' of onunez/frontend-inversiones into test

src/app/components/instruments/bonos/bonos.component.ts

@@ -168,6 +168,13 @@ export class BONO implements InstrumentComponent {
     }
 
     this.investmentProposalForm = this.formBuilder.group({
+      costo_cedeval: [
+        this.instrument_exists ? "" : this.instrument_work.costo_cedeval,
+        [
+          Validators.required,
+          Validators.pattern(/^[+]?([0-9]+(?:[\.][0-9]*)?|\.[0-9]+)$/)
+        ]
+      ],
       costo_transferencia: [
         this.instrument_exists ? "" : this.instrument_work.costo_transferencia,
         [
@@ -419,6 +426,7 @@ export class BONO implements InstrumentComponent {
           id_periodicidad: +this.general.periodicidad
         },
         {
+          costo_cedeval: +this.f.costo_cedeval.value,
           costo_transferencia: +this.f.costo_transferencia.value,
           valor_nominal_compra: +this.f.valor_nominal_compra.value,
           precio_compra: +this.f.precio_compra.value,
@@ -560,6 +568,7 @@ export class BONO implements InstrumentComponent {
           this.dataSource.sort = this.sort;
 
           this.bonosObject = {
+            costo_cedeval: this.investmentProposalForm.value.costo_cedeval,
             costo_transferencia: this.investmentProposalForm.value
               .costo_transferencia,
             valor_nominal_compra: this.investmentProposalForm.value

src/app/components/instruments/certificados/certificados.component.ts

@@ -168,6 +168,13 @@ export class CINV implements InstrumentComponent {
     }
 
     this.investmentProposalForm = this.formBuilder.group({
+      costo_cedeval: [
+        this.instrument_exists ? "" : this.instrument_work.costo_cedeval,
+        [
+          Validators.required,
+          Validators.pattern(/^[+]?([0-9]+(?:[\.][0-9]*)?|\.[0-9]+)$/)
+        ]
+      ],
       costo_transferencia: [
         this.instrument_exists ? "" : this.instrument_work.costo_transferencia,
         [
@@ -419,6 +426,7 @@ export class CINV implements InstrumentComponent {
           id_periodicidad: +this.general.periodicidad
         },
         {
+          costo_cedeval: +this.f.costo_cedeval.value,
           costo_transferencia: +this.f.costo_transferencia.value,
           valor_nominal_compra: +this.f.valor_nominal_compra.value,
           precio_compra: +this.f.precio_compra.value,
@@ -564,6 +572,7 @@ export class CINV implements InstrumentComponent {
 
           // Obj
           this.bonosObject = {
+            costo_cedeval: this.investmentProposalForm.value.costo_cedeval,
             costo_transferencia: this.investmentProposalForm.value
               .costo_transferencia,
             valor_nominal_compra: this.investmentProposalForm.value

src/app/components/instruments/eurobonos/eurobonos.component.ts

@@ -168,6 +168,13 @@ export class EURB implements InstrumentComponent {
     }
 
     this.investmentProposalForm = this.formBuilder.group({
+      costo_cedeval: [
+        this.instrument_exists ? "" : this.instrument_work.costo_cedeval,
+        [
+          Validators.required,
+          Validators.pattern(/^[+]?([0-9]+(?:[\.][0-9]*)?|\.[0-9]+)$/)
+        ]
+      ],
       costo_transferencia: [
         this.instrument_exists ? "" : this.instrument_work.costo_transferencia,
         [
@@ -419,6 +426,7 @@ export class EURB implements InstrumentComponent {
           id_periodicidad: +this.general.periodicidad
         },
         {
+          costo_cedeval: +this.f.costo_cedeval.value,
           costo_transferencia: +this.f.costo_transferencia.value,
           valor_nominal_compra: +this.f.valor_nominal_compra.value,
           precio_compra: +this.f.precio_compra.value,
@@ -561,6 +569,7 @@ export class EURB implements InstrumentComponent {
           this.dataSource.sort = this.sort;
 
           this.bonosObject = {
+            costo_cedeval: this.investmentProposalForm.value.costo_cedeval,
             costo_transferencia: this.investmentProposalForm.value
               .costo_transferencia,
             valor_nominal_compra: this.investmentProposalForm.value

src/app/components/instruments/titulos/titulos.component.ts

@@ -516,6 +516,7 @@ export class TIT implements InstrumentComponent {
           fecha_liquidacion_venta: this.f.fecha_liquidacion_venta.value
             .singleDate.formatted,
           fecha_emision: this.f.fecha_emision.value.singleDate.formatted,
+          costo_cedeval: this.f.costo_cedeval.value,
           amortizacion_porcentajes: this.amortizaciones
         }
       )
@@ -722,6 +723,7 @@ export class TIT implements InstrumentComponent {
 
             amortizacion_porcentajes: this.amortizaciones,-**/
             // Proyecciones
+            costo_cedeval: this.f.costo_cedeval.value,
             proyecciones: this.proyecciones
           };
 

src/app/components/investment-proposals/investment-proposals.component.ts

@@ -109,6 +109,7 @@ export class InvestmentProposalsComponent implements OnInit {
         this.dataSource.data = this.listProposals;
         this.dataSource.paginator = this.paginator;
         this.dataSource.sort = this.sort;
+        Swal.close();
       },
       err => {
         Swal.fire({
@@ -118,10 +119,6 @@ export class InvestmentProposalsComponent implements OnInit {
         });
       }
     );
-
-    setTimeout(() => {
-      Swal.close();
-    }, 2000);
   }
 
   applyFilter(event: Event) {

src/app/services/instrument-calculations.service.ts

@@ -84,6 +84,7 @@ export class InstrumentCalculations {
       id_formato_ingreso: number;
     },
     info_instrumento: {
+      costo_cedeval: number;
       comision_casa_porcentaje_compra: number;
       comision_bolsa_porcentaje_compra: number;
       cupon_porcentaje_compra: number;
@@ -147,6 +148,7 @@ export class InstrumentCalculations {
       fecha_liquidacion_venta: string;
       fecha_vencimiento_venta: string;
       fecha_emision: string;
+      costo_cedeval: number;
       amortizacion_porcentajes: any;
     }
   ): Observable<boolean> {

src/assets/scss/material-dashboard.scss

@@ -54,6 +54,10 @@
 
 // Defaults
 
+h5 {
+  margin-top: 15px;
+}
+
 .sky-skin {
   background-color: $palette-blue;
   border-color: #0b2338 !important;