Merge branch 'development' into feature-despliegue_docker

src/app/components/catalogs/companies/companies.component.html

@@ -1,21 +0,0 @@
-<h2 class="floating-title">{{ title }}</h2>
-
-<div class="main-content">
-  <div class="container-fluid">
-    <div class="col-12 align-right">
-      <div class="align-container">
-        <nav aria-label="breadcrumb">
-          <ol class="breadcrumb">
-            <li class="breadcrumb-item">
-              <a [routerLink]="['/']">Dashboard</a>
-            </li>
-            <li class="breadcrumb-item">Empresas</li>
-          </ol>
-        </nav>
-        <a class="btn btn-primary" [routerLink]="['/companies/new']">
-          Nuevo registro
-        </a>
-      </div>
-    </div>
-  </div>
-</div>

src/app/components/catalogs/companies/companies.component.ts

@@ -1,14 +0,0 @@
-import { Component, OnInit } from "@angular/core";
-
-@Component({
-  selector: "app-companies",
-  templateUrl: "./companies.component.html",
-  styleUrls: ["./companies.component.scss"]
-})
-export class CompaniesComponent implements OnInit {
-  title: string = "Empresas";
-
-  constructor() {}
-
-  ngOnInit() {}
-}

src/app/components/catalogs/companies/new-company/new-company.component.html

@@ -1,100 +0,0 @@
-<h2 class="floating-title">{{ title }}</h2>
-
-<div class="main-content">
-  <div class="container-fluid">
-    <div class="row">
-      <div class="col-12 align-right">
-        <div class="align-container">
-          <nav aria-label="breadcrumb">
-            <ol class="breadcrumb">
-              <li class="breadcrumb-item">
-                <a [routerLink]="['/']">Dashboard</a>
-              </li>
-              <li class="breadcrumb-item">
-                <a [routerLink]="['/companies']">
-                  Empresas
-                </a>
-              </li>
-              <li class="breadcrumb-item">Nuevo</li>
-            </ol>
-          </nav>
-        </div>
-      </div>
-      <br />
-    </div>
-    <br />
-    <div class="row justify-content-center">
-      <div class="col-12">
-        <div class="align-container">
-          <div class="card">
-            <div class="card-header card-header-icon card-header-rose">
-              <div class="card-icon"><i class="material-icons">map</i></div>
-              <h4 class="card-title">
-                Nueva Empresa
-                <small class="category">- Complete la información</small>
-              </h4>
-            </div>
-            <div class="card-body">
-              <div class="align-container">
-                <form
-                  class="form-auth-small ng-untouched ng-pristine ng-valid"
-                  [formGroup]="companyForm"
-                  (ngSubmit)="createCompany()"
-                >
-                  <div class="row">
-                    <div class=" col-sm-12">
-                      <div class="form-group">
-                        <label for="name">Nombre: </label>
-                        <input
-                          type="text"
-                          formControlName="name"
-                          class="form-control"
-                          [ngClass]="{
-                            'is-invalid': submitted && f.name.errors
-                          }"
-                        />
-                        <div
-                          *ngIf="submitted && f.name.errors"
-                          class="invalid-feedback"
-                        >
-                          <div *ngIf="f.name.errors.required">
-                            Campo requerido
-                          </div>
-                        </div>
-                      </div>
-
-                      <div class="form-group">
-                        <label for="description">Descripcion: </label>
-                        <input
-                          type="text"
-                          formControlName="description"
-                          class="form-control"
-                          [ngClass]="{
-                            'is-invalid': submitted && f.description.errors
-                          }"
-                        />
-                        <div
-                          *ngIf="submitted && f.description.errors"
-                          class="invalid-feedback"
-                        >
-                          <div *ngIf="f.description.errors.required">
-                            Campo requerido
-                          </div>
-                        </div>
-                      </div>
-                    </div>
-                  </div>
-                  <br />
-                  <button class="btn btn-primary">
-                    Guardar
-                  </button>
-                  <!--<div *ngIf="error" class="alert alert-danger mt-3 mb-0">{{error}}</div>-->
-                </form>
-              </div>
-            </div>
-          </div>
-        </div>
-      </div>
-    </div>
-  </div>
-</div>

src/app/components/catalogs/companies/new-company/new-company.component.ts

@@ -1,40 +0,0 @@
-import { Component, OnInit } from '@angular/core';
-import { FormBuilder, FormGroup, Validators } from "@angular/forms";
-
-@Component({
-  selector: 'app-new-company',
-  templateUrl: './new-company.component.html',
-  styleUrls: ['./new-company.component.scss']
-})
-export class NewCompanyComponent implements OnInit {
-
-
-  title: string = "Nueva empresa";
-  companyForm: FormGroup;
-  submitted: boolean = false;
-  role_number: any;
-
-  constructor(private formBuilder: FormBuilder) {}
-
-
-  ngOnInit() {
-    this.companyForm = this.formBuilder.group({
-      name: ["", Validators.required],
-      description: ["", Validators.required],
-    });
-  }
-
-  get f() {
-    return this.companyForm.controls;
-  }
-
-  createCompany(){
-    this.submitted = true;
-
-    // stop here if form is invalid
-    if (this.companyForm.invalid) {
-      return;
-    }
-    console.log("compania");
-  }
-}

src/app/components/catalogs/countries/countries.component.html

@@ -1,21 +0,0 @@
-<h2 class="floating-title">{{ title }}</h2>
-
-<div class="main-content">
-  <div class="container-fluid">
-    <div class="col-12 align-right">
-      <div class="align-container">
-        <nav aria-label="breadcrumb">
-          <ol class="breadcrumb">
-            <li class="breadcrumb-item">
-              <a [routerLink]="['/']">Dashboard</a>
-            </li>
-            <li class="breadcrumb-item">Paises</li>
-          </ol>
-        </nav>
-        <a class="btn btn-primary" [routerLink]="['/countries/new']">
-          Nuevo registro
-        </a>
-      </div>
-    </div>
-  </div>
-</div>

src/app/components/catalogs/countries/countries.component.spec.ts

@@ -1,37 +0,0 @@
-import { async, ComponentFixture, TestBed } from "@angular/core/testing";
-import { CountriesComponent } from "./countries.component";
-import { RouterTestingModule } from "@angular/router/testing";
-import { AuthService } from "@app/services/auth2.service";
-import { By } from "@angular/platform-browser";
-import { RouterLinkWithHref, Router } from "@angular/router";
-import { HttpClientModule } from "@angular/common/http";
-import { ReactiveFormsModule, FormsModule } from "@angular/forms";
-
-describe("CountriesComponent", () => {
-  let component: CountriesComponent;
-  let fixture: ComponentFixture<CountriesComponent>;
-
-  beforeEach(async(() => {
-    TestBed.configureTestingModule({
-      declarations: [CountriesComponent],
-      imports: [
-        RouterTestingModule,
-        HttpClientModule,
-        ReactiveFormsModule,
-        FormsModule
-      ],
-      providers: [AuthService]
-    }).compileComponents();
-  }));
-
-  beforeEach(() => {
-    fixture = TestBed.createComponent(CountriesComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-    component.ngOnInit();
-  });
-
-  it("should create", () => {
-    expect(component).toBeTruthy();
-  });
-});

src/app/components/catalogs/countries/countries.component.ts

@@ -1,15 +0,0 @@
-import { Component, OnInit } from '@angular/core';
-
-@Component({
-  selector: 'app-countries',
-  templateUrl: './countries.component.html',
-  styleUrls: ['./countries.component.scss']
-})
-export class CountriesComponent implements OnInit {
-  title: string = "Paises";
-  constructor() { }
-
-  ngOnInit() {
-  }
-
-}

src/app/components/catalogs/countries/new-country/new-country.component.html

@@ -1,100 +0,0 @@
-<h2 class="floating-title">{{ title }}</h2>
-
-<div class="main-content">
-  <div class="container-fluid">
-    <div class="row">
-      <div class="col-12 align-right">
-        <div class="align-container">
-          <nav aria-label="breadcrumb">
-            <ol class="breadcrumb">
-              <li class="breadcrumb-item">
-                <a [routerLink]="['/']">Dashboard</a>
-              </li>
-              <li class="breadcrumb-item">
-                <a [routerLink]="['/countries']">
-                  Paises
-                </a>
-              </li>
-              <li class="breadcrumb-item">Nuevo</li>
-            </ol>
-          </nav>
-        </div>
-      </div>
-      <br />
-    </div>
-    <br />
-    <div class="row justify-content-center">
-      <div class="col-12">
-        <div class="align-container">
-          <div class="card">
-            <div class="card-header card-header-icon card-header-rose">
-              <div class="card-icon"><i class="material-icons">map</i></div>
-              <h4 class="card-title">
-                Nuevo País
-                <small class="category">- Complete la información</small>
-              </h4>
-            </div>
-            <div class="card-body">
-              <div class="align-container">
-                <form
-                  class="form-auth-small ng-untouched ng-pristine ng-valid"
-                  [formGroup]="countryForm"
-                  (ngSubmit)="createCountry()"
-                >
-                  <div class="row">
-                    <div class=" col-sm-12">
-                      <div class="form-group">
-                        <label for="name">Nombre: </label>
-                        <input
-                          type="text"
-                          formControlName="name"
-                          class="form-control"
-                          [ngClass]="{
-                            'is-invalid': submitted && f.name.errors
-                          }"
-                        />
-                        <div
-                          *ngIf="submitted && f.name.errors"
-                          class="invalid-feedback"
-                        >
-                          <div *ngIf="f.name.errors.required">
-                            Campo requerido
-                          </div>
-                        </div>
-                      </div>
-
-                      <div class="form-group">
-                        <label for="description">Descripcion: </label>
-                        <input
-                          type="text"
-                          formControlName="description"
-                          class="form-control"
-                          [ngClass]="{
-                            'is-invalid': submitted && f.description.errors
-                          }"
-                        />
-                        <div
-                          *ngIf="submitted && f.description.errors"
-                          class="invalid-feedback"
-                        >
-                          <div *ngIf="f.description.errors.required">
-                            Campo requerido
-                          </div>
-                        </div>
-                      </div>
-                    </div>
-                  </div>
-                  <br />
-                  <button class="btn btn-primary">
-                    Guardar
-                  </button>
-                  <!--<div *ngIf="error" class="alert alert-danger mt-3 mb-0">{{error}}</div>-->
-                </form>
-              </div>
-            </div>
-          </div>
-        </div>
-      </div>
-    </div>
-  </div>
-</div>

src/app/components/catalogs/countries/new-country/new-country.component.spec.ts

@@ -1,37 +0,0 @@
-import { async, ComponentFixture, TestBed } from "@angular/core/testing";
-import { NewCountryComponent } from "./new-country.component";
-import { RouterTestingModule } from "@angular/router/testing";
-import { AuthService } from "@app/services/auth2.service";
-import { By } from "@angular/platform-browser";
-import { RouterLinkWithHref, Router } from "@angular/router";
-import { HttpClientModule } from "@angular/common/http";
-import { ReactiveFormsModule, FormsModule } from "@angular/forms";
-
-describe("NewEmitterComponent", () => {
-  let component: NewCountryComponent;
-  let fixture: ComponentFixture<NewCountryComponent>;
-
-  beforeEach(async(() => {
-    TestBed.configureTestingModule({
-      declarations: [NewCountryComponent],
-      imports: [
-        RouterTestingModule,
-        HttpClientModule,
-        ReactiveFormsModule,
-        FormsModule
-      ],
-      providers: [AuthService]
-    }).compileComponents();
-  }));
-
-  beforeEach(() => {
-    fixture = TestBed.createComponent(NewCountryComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-    component.ngOnInit();
-  });
-
-  it("should create", () => {
-    expect(component).toBeTruthy();
-  });
-});

src/app/components/catalogs/countries/new-country/new-country.component.ts

@@ -1,36 +0,0 @@
-import { Component, OnInit } from "@angular/core";
-import { FormBuilder, FormGroup, Validators } from "@angular/forms";
-
-@Component({
-  selector: "app-new-country",
-  templateUrl: "./new-country.component.html"
-})
-export class NewCountryComponent implements OnInit {
-  title: string = "Nuevo país";
-  countryForm: FormGroup;
-  submitted: boolean = false;
-  role_number: any;
-
-  constructor(private formBuilder: FormBuilder) {}
-
-  ngOnInit() {
-    this.countryForm = this.formBuilder.group({
-      name: ["", Validators.required],
-      description: ["", Validators.required]
-    });
-  }
-
-  get f() {
-    return this.countryForm.controls;
-  }
-
-  createCountry() {
-    this.submitted = true;
-
-    // stop here if form is invalid
-    if (this.countryForm.invalid) {
-      return;
-    }
-    console.log("país");
-  }
-}

src/app/components/catalogs/emitters/emitters.component.html

@@ -1,21 +0,0 @@
-<h2 class="floating-title">{{ title }}</h2>
-
-<div class="main-content">
-  <div class="container-fluid">
-    <div class="col-12 align-right">
-      <div class="align-container">
-        <nav aria-label="breadcrumb">
-          <ol class="breadcrumb">
-            <li class="breadcrumb-item">
-              <a [routerLink]="['/']">Dashboard</a>
-            </li>
-            <li class="breadcrumb-item">Emisores</li>
-          </ol>
-        </nav>
-        <a class="btn btn-primary" [routerLink]="['/emitters/new']">
-          Nuevo registro
-        </a>
-      </div>
-    </div>
-  </div>
-</div>

src/app/components/catalogs/emitters/emitters.component.spec.ts

@@ -1,37 +0,0 @@
-import { async, ComponentFixture, TestBed } from "@angular/core/testing";
-import { EmittersComponent } from "./emitters.component";
-import { RouterTestingModule } from "@angular/router/testing";
-import { AuthService } from "@app/services/auth2.service";
-import { By } from "@angular/platform-browser";
-import { RouterLinkWithHref, Router } from "@angular/router";
-import { HttpClientModule } from "@angular/common/http";
-import { ReactiveFormsModule, FormsModule } from "@angular/forms";
-
-describe("EmittersComponent", () => {
-  let component: EmittersComponent;
-  let fixture: ComponentFixture<EmittersComponent>;
-
-  beforeEach(async(() => {
-    TestBed.configureTestingModule({
-      declarations: [EmittersComponent],
-      imports: [
-        RouterTestingModule,
-        HttpClientModule,
-        ReactiveFormsModule,
-        FormsModule
-      ],
-      providers: [AuthService]
-    }).compileComponents();
-  }));
-
-  beforeEach(() => {
-    fixture = TestBed.createComponent(EmittersComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-    component.ngOnInit();
-  });
-
-  it("should create", () => {
-    expect(component).toBeTruthy();
-  });
-});

src/app/components/catalogs/emitters/emitters.component.ts

@@ -1,12 +0,0 @@
-import { Component, OnInit } from "@angular/core";
-
-@Component({
-  selector: "app-emitters",
-  templateUrl: "./emitters.component.html"
-})
-export class EmittersComponent implements OnInit {
-  title: string = "Emisores";
-  constructor() {}
-
-  ngOnInit() {}
-}

src/app/components/catalogs/emitters/new-emitter/new-emitter.component.html

@@ -1,100 +0,0 @@
-<h2 class="floating-title">{{ title }}</h2>
-
-<div class="main-content">
-  <div class="container-fluid">
-    <div class="row">
-      <div class="col-12 align-right">
-        <div class="align-container">
-          <nav aria-label="breadcrumb">
-            <ol class="breadcrumb">
-              <li class="breadcrumb-item">
-                <a [routerLink]="['/']">Dashboard</a>
-              </li>
-              <li class="breadcrumb-item">
-                <a [routerLink]="['/emitters']">
-                  Emisores
-                </a>
-              </li>
-              <li class="breadcrumb-item">Nuevo</li>
-            </ol>
-          </nav>
-        </div>
-      </div>
-      <br />
-    </div>
-    <br />
-    <div class="row justify-content-center">
-      <div class="col-12">
-        <div class="align-container">
-          <div class="card">
-            <div class="card-header card-header-icon card-header-rose">
-              <div class="card-icon"><i class="material-icons">map</i></div>
-              <h4 class="card-title">
-                Nuevo Emisor
-                <small class="category">- Complete la información</small>
-              </h4>
-            </div>
-            <div class="card-body">
-              <div class="align-container">
-                <form
-                  class="form-auth-small ng-untouched ng-pristine ng-valid"
-                  [formGroup]="emitterForm"
-                  (ngSubmit)="createEmitter()"
-                >
-                  <div class="row">
-                    <div class=" col-sm-12">
-                      <div class="form-group">
-                        <label for="name">Nombre: </label>
-                        <input
-                          type="text"
-                          formControlName="name"
-                          class="form-control"
-                          [ngClass]="{
-                            'is-invalid': submitted && f.name.errors
-                          }"
-                        />
-                        <div
-                          *ngIf="submitted && f.name.errors"
-                          class="invalid-feedback"
-                        >
-                          <div *ngIf="f.name.errors.required">
-                            Campo requerido
-                          </div>
-                        </div>
-                      </div>
-
-                      <div class="form-group">
-                        <label for="description">Descripcion: </label>
-                        <input
-                          type="text"
-                          formControlName="description"
-                          class="form-control"
-                          [ngClass]="{
-                            'is-invalid': submitted && f.description.errors
-                          }"
-                        />
-                        <div
-                          *ngIf="submitted && f.description.errors"
-                          class="invalid-feedback"
-                        >
-                          <div *ngIf="f.description.errors.required">
-                            Campo requerido
-                          </div>
-                        </div>
-                      </div>
-                    </div>
-                  </div>
-                  <br />
-                  <button class="btn btn-primary">
-                    Guardar
-                  </button>
-                  <!--<div *ngIf="error" class="alert alert-danger mt-3 mb-0">{{error}}</div>-->
-                </form>
-              </div>
-            </div>
-          </div>
-        </div>
-      </div>
-    </div>
-  </div>
-</div>

src/app/components/catalogs/emitters/new-emitter/new-emitter.component.spec.ts

@@ -1,37 +0,0 @@
-import { async, ComponentFixture, TestBed } from "@angular/core/testing";
-import { NewEmitterComponent } from "./new-emitter.component";
-import { RouterTestingModule } from "@angular/router/testing";
-import { AuthService } from "@app/services/auth2.service";
-import { By } from "@angular/platform-browser";
-import { RouterLinkWithHref, Router } from "@angular/router";
-import { HttpClientModule } from "@angular/common/http";
-import { ReactiveFormsModule, FormsModule } from "@angular/forms";
-
-describe("NewEmitterComponent", () => {
-  let component: NewEmitterComponent;
-  let fixture: ComponentFixture<NewEmitterComponent>;
-
-  beforeEach(async(() => {
-    TestBed.configureTestingModule({
-      declarations: [NewEmitterComponent],
-      imports: [
-        RouterTestingModule,
-        HttpClientModule,
-        ReactiveFormsModule,
-        FormsModule
-      ],
-      providers: [AuthService]
-    }).compileComponents();
-  }));
-
-  beforeEach(() => {
-    fixture = TestBed.createComponent(NewEmitterComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-    component.ngOnInit();
-  });
-
-  it("should create", () => {
-    expect(component).toBeTruthy();
-  });
-});

src/app/components/catalogs/emitters/new-emitter/new-emitter.component.ts

@@ -1,40 +0,0 @@
-import { Component, OnInit } from '@angular/core';
-import { FormBuilder, FormGroup, Validators } from "@angular/forms";
-
-@Component({
-  selector: 'app-new-emitter',
-  templateUrl: './new-emitter.component.html',
-  styleUrls: ['./new-emitter.component.scss']
-})
-export class NewEmitterComponent implements OnInit {
-
-  title: string = "Nuevo emisor";
-  emitterForm: FormGroup;
-  submitted: boolean = false;
-  role_number: any;
-
-  constructor(private formBuilder: FormBuilder) {}
-
-
-  ngOnInit() {
-    this.emitterForm = this.formBuilder.group({
-      name: ["", Validators.required],
-      description: ["", Validators.required],
-    });
-  }
-
-  get f() {
-    return this.emitterForm.controls;
-  }
-
-  createEmitter(){
-    this.submitted = true;
-
-    // stop here if form is invalid
-    if (this.emitterForm.invalid) {
-      return;
-    }
-    console.log("emisor");
-  }
-
-}

src/app/components/instruments/anc/anc.component.html

@@ -1,6 +1,7 @@
 <h4 class="card-title">
   ACCIONES NACIONALES
 </h4>
+<!--
 <form
   class="form-auth-small ng-untouched ng-pristine ng-valid"
   [formGroup]="investmentProposalForm"
@@ -158,10 +159,6 @@
     </div>
   </div>
 
-  <!---->
-
-  <!---->
-
   <br />
   <div class="form-group text-center space-20">
     <button
@@ -172,6 +169,6 @@
     </button>
   </div>
 
-  <!-- [disabled]="!investmentProposalForm.valid"
-                        <div *ngIf="error" class="alert alert-danger mt-3 mb-0">{{error}}</div>-->
+
 </form>
+-->

src/app/components/instruments/apn/apn.component.html

@@ -1,6 +1,8 @@
 <h4 class="card-title">
   ACCIONES PREFERENTES NACIONALES
 </h4>
+
+<!--
 <form
   class="form-auth-small ng-untouched ng-pristine ng-valid"
   [formGroup]="investmentProposalForm"
@@ -158,10 +160,6 @@
     </div>
   </div>
 
-  <!---->
-
-  <!---->
-
   <br />
   <div class="form-group text-center space-20">
     <button
@@ -172,6 +170,5 @@
     </button>
   </div>
 
-  <!-- [disabled]="!investmentProposalForm.valid"
-                          <div *ngIf="error" class="alert alert-danger mt-3 mb-0">{{error}}</div>-->
 </form>
+-->

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

@@ -2,6 +2,7 @@ BONOS FORM
 <h4 class="card-title">
   BONO
 </h4>
+<!--
 <form
   class="form-auth-small ng-untouched ng-pristine ng-valid"
   [formGroup]="investmentProposalForm"
@@ -190,11 +191,6 @@ BONOS FORM
     </div>
   </div>
 
-  <!---->
-
-  <!---->
-
-  <br />
 
   <div class="row">
     <div class="col-lg-6 col-sm-12 pr-xl-5">
@@ -289,6 +285,5 @@ BONOS FORM
     </button>
   </div>
 
-  <!-- [disabled]="!investmentProposalForm.valid"
-                        <div *ngIf="error" class="alert alert-danger mt-3 mb-0">{{error}}</div>-->
 </form>
+-->

src/app/components/instruments/cete/cete.component.html

@@ -361,7 +361,7 @@
           <br />
           <button
             class="btn btn-success center-component"
-            (click)="getCalculations(investmentProposalForm)"
+            (click)="getCalculations(investmentProposalForm, false)"
           >
             Realizar cálculos
           </button>
@@ -483,7 +483,7 @@
     <div class="form-group text-center space-20">
       <button
         class="btn btn-default center-component margin-right"
-        (click)="goToPrevious(workForm)"
+        (click)="goToPrevious()"
       >
         Anterior
       </button>

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

@@ -220,28 +220,12 @@ export class CETE implements InstrumentComponent {
     if (!form.valid) {
       return false;
     }
-    this.ceteObject = {
-      valor_nominal: this.investmentProposalForm.value.valor_nominal,
-      plazo: this.investmentProposalForm.value.plazo,
-      comision_casa_porcentaje: this.investmentProposalForm.value
-        .comision_casa_porcentaje,
-      comision_bolsa_porcentaje: this.investmentProposalForm.value
-        .comision_bolsa_porcentaje,
-      rendimiento_bruto: this.investmentProposalForm.value.rendimiento_bruto,
-      otros_costos: this.f.otros_costos.value,
-      //renta_porcentaje: this.f.renta_porcentaje.value,
-      //id_formato_ingreso: this.f.formato_ingreso.value,
-      fecha_operacion: this.f.fecha_operacion.value.singleDate.formatted,
-      fecha_liquidacion: this.f.fecha_liquidacion.value.singleDate.formatted,
-      fecha_ultima_cupon: this.f.fecha_ultima_cupon.value.singleDate.formatted,
-      fecha_vencimiento: this.f.fecha_vencimiento.value.singleDate.formatted
-    };
 
     this.formDataService.setWork(this.ceteObject);
     return true;
   }
 
-  getCalculations(form: any) {
+  getCalculations(form: any, saveForm: boolean) {
     this.submitted = true;
     if (!form.valid) {
       return false;
@@ -292,7 +276,47 @@ export class CETE implements InstrumentComponent {
           this.dataSource.paginator = this.paginator;
           this.dataSource.sort = this.sort;
 
+          this.ceteObject = {
+            valor_nominal: this.investmentProposalForm.value.valor_nominal,
+            plazo: this.investmentProposalForm.value.plazo,
+            comision_casa_porcentaje: this.investmentProposalForm.value
+              .comision_casa_porcentaje,
+            comision_bolsa_porcentaje: this.investmentProposalForm.value
+              .comision_bolsa_porcentaje,
+            rendimiento_bruto: this.investmentProposalForm.value
+              .rendimiento_bruto,
+            otros_costos: this.f.otros_costos.value,
+            //renta_porcentaje: this.f.renta_porcentaje.value,
+            //id_formato_ingreso: this.f.formato_ingreso.value,
+            fecha_operacion: this.f.fecha_operacion.value.singleDate.formatted,
+            fecha_liquidacion: this.f.fecha_liquidacion.value.singleDate
+              .formatted,
+            fecha_ultima_cupon: this.f.fecha_ultima_cupon.value.singleDate
+              .formatted,
+            fecha_vencimiento: this.f.fecha_vencimiento.value.singleDate
+              .formatted,
+            ingreso_bruto: this.ingreso_bruto,
+            ingreso_neto: this.ingreso_neto,
+            valor_transado: this.valor_transado,
+            precio_porcentaje: this.precio_porcentaje,
+            rendimiento_neto: this.rendimiento_neto,
+            total_pagar: this.total_pagar,
+            comision_bolsa: this.comision_bolsa,
+            comision_casa: this.comision_casa,
+            proyecciones: this.proyecciones
+          };
+
+          this.formDataService.setWork(this.ceteObject);
           Swal.close();
+          if (saveForm == true) {
+            if (this.investmentID != undefined) {
+              this.router.navigate(["/investment-proposal/complement-info"], {
+                queryParams: { id: this.investmentID }
+              });
+            } else {
+              this.router.navigate(["/investment-proposal/complement-info"]);
+            }
+          }
         },
         err => {
           Swal.fire({
@@ -300,11 +324,12 @@ export class CETE implements InstrumentComponent {
             title: "Error en el servidor",
             text: "No su pudo obtener la informacion"
           });
+          return false;
         }
       );
   }
 
-  goToPrevious(form: any) {
+  goToPrevious() {
     this.submitted = true;
     if (this.investmentID != undefined) {
       this.router.navigate(["/investment-proposal/general-info"], {
@@ -316,17 +341,6 @@ export class CETE implements InstrumentComponent {
   }
 
   goToNext(form: any) {
-    this.submitted = true;
-
-    if (this.save(form)) {
-      if (this.investmentID != undefined) {
-        console.log("paramsID");
-        this.router.navigate(["/investment-proposal/complement-info"], {
-          queryParams: { id: this.investmentID }
-        });
-      } else {
-        this.router.navigate(["/investment-proposal/complement-info"]);
-      }
-    }
+    this.getCalculations(form, true);
   }
 }

src/app/components/instruments/dap/dap.component.html

@@ -199,7 +199,7 @@
           <br />
           <button
             class="btn btn-success center-component"
-            (click)="getCalculations(investmentProposalForm)"
+            (click)="getCalculations(investmentProposalForm, false)"
           >
             Realizar cálculos
           </button>
@@ -335,7 +335,7 @@
     <div class="form-group text-center space-20">
       <button
         class="btn btn-default center-component margin-right"
-        (click)="goToPrevious(workForm)"
+        (click)="goToPrevious()"
       >
         Anterior
       </button>

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

@@ -175,26 +175,11 @@ export class DAP implements InstrumentComponent {
     if (!form.valid) {
       return false;
     }
-    this.dapObject = {
-      monto_inversion: this.investmentProposalForm.value.monto_inversion,
-      renta_porcentaje: this.investmentProposalForm.value.renta_porcentaje,
-      tasa_porcentaje: this.investmentProposalForm.value.tasa_porcentaje,
-      plazo: +this.investmentProposalForm.value.plazo,
 
-      fecha_operacion: this.investmentProposalForm.value.fecha_operacion
-        .singleDate.formatted,
-      fecha_vencimiento:
-        this.investmentProposalForm.value.fecha_vencimiento != undefined
-          ? this.investmentProposalForm.value.fecha_vencimiento.singleDate
-              .formatted
-          : ""
-    };
-
-    this.formDataService.setWork(this.dapObject);
     return true;
   }
 
-  getCalculations(form: any) {
+  getCalculations(form: any, saveForm: boolean) {
     this.submitted = true;
     if (!form.valid) {
       return false;
@@ -239,8 +224,40 @@ export class DAP implements InstrumentComponent {
           this.dataSource.data = this.proyecciones;
           this.dataSource.paginator = this.paginator;
           this.dataSource.sort = this.sort;
-          console.log(ans);
+
+          this.dapObject = {
+            monto_inversion: this.investmentProposalForm.value.monto_inversion,
+            renta_porcentaje: this.investmentProposalForm.value
+              .renta_porcentaje,
+            tasa_porcentaje: this.investmentProposalForm.value.tasa_porcentaje,
+            plazo: +this.investmentProposalForm.value.plazo,
+            ingreso_bruto: this.ingreso_bruto,
+            ingreso_neto: this.ingreso_neto,
+            rendimiento_bruto: this.rendimiento_bruto,
+            rendimiento_neto: this.rendimiento_neto,
+            fecha_inicio_vigencia: this.fecha_inicio_vigencia,
+            renta: this.renta,
+            proyecciones: this.proyecciones,
+
+            fecha_operacion: this.investmentProposalForm.value.fecha_operacion
+              .singleDate.formatted,
+            fecha_vencimiento:
+              this.investmentProposalForm.value.fecha_vencimiento != undefined
+                ? this.investmentProposalForm.value.fecha_vencimiento.singleDate
+                    .formatted
+                : ""
+          };
+          this.formDataService.setWork(this.dapObject);
           Swal.close();
+          if (saveForm == true) {
+            if (this.investmentID != undefined) {
+              this.router.navigate(["/investment-proposal/complement-info"], {
+                queryParams: { id: this.investmentID }
+              });
+            } else {
+              this.router.navigate(["/investment-proposal/complement-info"]);
+            }
+          }
         },
         err => {
           Swal.fire({
@@ -248,11 +265,12 @@ export class DAP implements InstrumentComponent {
             title: "Error en el servidor",
             text: "No su pudo obtener la informacion"
           });
+          return false;
         }
       );
   }
 
-  goToPrevious(form: any) {
+  goToPrevious() {
     this.submitted = true;
     if (this.investmentID != undefined) {
       this.router.navigate(["/investment-proposal/general-info"], {
@@ -264,17 +282,6 @@ export class DAP implements InstrumentComponent {
   }
 
   goToNext(form: any) {
-    this.submitted = true;
-
-    if (this.save(form)) {
-      if (this.investmentID != undefined) {
-        console.log("paramsID");
-        this.router.navigate(["/investment-proposal/complement-info"], {
-          queryParams: { id: this.investmentID }
-        });
-      } else {
-        this.router.navigate(["/investment-proposal/complement-info"]);
-      }
-    }
+    this.getCalculations(form, true);
   }
 }

src/app/components/instruments/lete/lete.component.html

@@ -315,7 +315,7 @@
     <div class="form-group text-center space-20">
       <button
         class="btn btn-default center-component margin-right"
-        (click)="goToPrevious(workForm)"
+        (click)="goToPrevious()"
       >
         Anterior
       </button>

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

@@ -225,7 +225,6 @@ export class LETE implements InstrumentComponent {
       )
       .subscribe(
         ans => {
-          console.log(ans);
           this.ingreso_bruto = ans["result"]["ingreso_bruto"];
           this.ingreso_neto = ans["result"]["ingreso_neto"];
           this.valor_transado = ans["result"]["valor_transado"];
@@ -275,7 +274,6 @@ export class LETE implements InstrumentComponent {
           Swal.close();
           if (saveForm == true) {
             if (this.investmentID != undefined) {
-              console.log("paramsID");
               this.router.navigate(["/investment-proposal/complement-info"], {
                 queryParams: { id: this.investmentID }
               });
@@ -295,7 +293,7 @@ export class LETE implements InstrumentComponent {
       );
   }
 
-  goToPrevious(form: any) {
+  goToPrevious() {
     this.submitted = true;
     if (this.investmentID != undefined) {
       this.router.navigate(["/investment-proposal/general-info"], {

src/app/components/instruments/pbur/pbur.component.html

@@ -417,7 +417,7 @@
     <div class="form-group text-center space-20">
       <button
         class="btn btn-default center-component margin-right"
-        (click)="goToPrevious(workForm)"
+        (click)="goToPrevious()"
       >
         Anterior
       </button>

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

@@ -318,7 +318,6 @@ export class PBUR implements InstrumentComponent {
           Swal.close();
           if (saveForm == true) {
             if (this.investmentID != undefined) {
-              console.log("paramsID");
               this.router.navigate(["/investment-proposal/complement-info"], {
                 queryParams: { id: this.investmentID }
               });
@@ -338,7 +337,7 @@ export class PBUR implements InstrumentComponent {
       );
   }
 
-  goToPrevious(form: any) {
+  goToPrevious() {
     this.submitted = true;
     if (this.investmentID != undefined) {
       this.router.navigate(["/investment-proposal/general-info"], {

src/app/components/instruments/vcn/vcn.component.html

@@ -419,7 +419,7 @@
     <div class="form-group text-center space-20">
       <button
         class="btn btn-default center-component margin-right"
-        (click)="goToPrevious(workForm)"
+        (click)="goToPrevious()"
       >
         Anterior
       </button>

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

@@ -317,7 +317,6 @@ export class VCN implements InstrumentComponent {
           Swal.close();
           if (saveForm == true) {
             if (this.investmentID != undefined) {
-              console.log("paramsID");
               this.router.navigate(["/investment-proposal/complement-info"], {
                 queryParams: { id: this.investmentID }
               });
@@ -337,7 +336,7 @@ export class VCN implements InstrumentComponent {
       );
   }
 
-  goToPrevious(form: any) {
+  goToPrevious() {
     this.submitted = true;
     if (this.investmentID != undefined) {
       this.router.navigate(["/investment-proposal/general-info"], {
@@ -349,17 +348,6 @@ export class VCN implements InstrumentComponent {
   }
 
   goToNext(form: any) {
-    this.submitted = true;
-
-    if (this.save(form)) {
-      if (this.investmentID != undefined) {
-        console.log("paramsID");
-        this.router.navigate(["/investment-proposal/complement-info"], {
-          queryParams: { id: this.investmentID }
-        });
-      } else {
-        this.router.navigate(["/investment-proposal/complement-info"]);
-      }
-    }
+    this.getCalculations(form, true);
   }
 }

src/app/components/investment-proposals/complement-info/complement-info.component.html

@@ -384,7 +384,7 @@
                   <div class="form-group text-center space-20">
                     <button
                       class="btn btn-default center-component margin-right"
-                      (click)="goToPrevious(workForm)"
+                      (click)="goToPrevious()"
                     >
                       Anterior
                     </button>

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

@@ -168,7 +168,7 @@ export class ComplementInfoComponent implements OnInit {
     return true;
   }
 
-  goToPrevious(form: any) {
+  goToPrevious() {
     this.submitted = true;
     if (this.investmentProposalID != undefined) {
       this.router.navigate(["/investment-proposal/instrument-work"], {

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

@@ -5,6 +5,6 @@
 }
 
 .btn-custom-small {
-  padding: 7px 14px 7px 18px;
+  padding: 7px 12px 5px 13px;
   margin: 0 4px;
 }

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

@@ -119,7 +119,11 @@ export class InvestmentProposalsComponent implements OnInit {
 
   view_investment_proposal(id: string) {
     this.formInvestmentProposal.resetFormData();
-
+    Swal.fire({
+      allowOutsideClick: false,
+      icon: "info",
+      text: "Espere por favor..."
+    });
     setTimeout(() => {
       this.router.navigate([`/investment-proposal/${id}`]);
     }, 1000);

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

@@ -59,7 +59,7 @@ export class PaymentInfoComponent implements OnInit {
   rate_agencies: any;
   scores: any;
   investmentProposalID: string;
-  countries: any;
+  funds: any;
   companies: any;
   format_incomes: any;
   operations: any;
@@ -106,7 +106,7 @@ export class PaymentInfoComponent implements OnInit {
       console.log(this.payment_types);
     });
     this.catalogService.getCountries().subscribe(res => {
-      this.countries = res;
+      this.funds = res;
     });
 
     this.investmentProposalForm = this.formBuilder.group({

src/app/components/investment-proposals/payment-requirement/payment-requirement.component.html

@@ -49,10 +49,7 @@
                     />
                   </div>
                   <div class="review-buttons">
-                    <button
-                      class="btn btn-success"
-                      (click)="approve_proposal()"
-                    >
+                    <button class="btn btn-success">
                       Guardar requisición de pago
                     </button>
                   </div>

src/app/components/investment-proposals/result/result.component.html

@@ -198,7 +198,7 @@
                     href="#/investment-proposals"
                   >
                     Ir a listado
-                </a>
+                  </a>
 
                   <button
                     class="btn btn-primary center-component float-right"
@@ -213,11 +213,11 @@
                     Guardar propuesta
                   </button>
                   <button
-                      class="btn btn-default center-component margin-right float-right"
-                      (click)="goToPrevious(workForm)"
-                    >
-                      Anterior
-                    </button>
+                    class="btn btn-default center-component margin-right float-right"
+                    (click)="goToPrevious()"
+                  >
+                    Anterior
+                  </button>
                 </div>
               </div>
             </div>

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

@@ -239,6 +239,15 @@ export class ResultComponent implements OnInit {
       },
       info_instrumento: this.instrument
     };
+
+    if (
+      (this.inversion["codigo_instrumento"] == "CETE" ||
+        this.inversion["codigo_instrumento"] == "DAP") &&
+      (this.instrument["proyecciones"] != undefined ||
+        this.instrument["proyecciones"] != "")
+    ) {
+      this.inversion["proyecciones"] = this.instrument["proyecciones"];
+    }
   }
 
   loadComponent() {
@@ -368,7 +377,7 @@ export class ResultComponent implements OnInit {
         }
       );
   }
-  goToPrevious(form: any) {
+  goToPrevious() {
     this.submitted = true;
     if (this.investmentProposalID != undefined) {
       this.router.navigate(["/investment-proposal/complement-info"], {

src/app/components/plugins/input-directives/numbers-only.directive.ts

@@ -1,180 +0,0 @@
-import { Directive, ElementRef, HostListener, Input } from "@angular/core";
-
-@Directive({ selector: "[numbersOnly]" })
-export class NumbersOnly {
-  @Input() allowDecimals: boolean = true;
-  @Input() allowSign: boolean = false;
-  @Input() decimalSeparator: string = ".";
-
-  previousValue: string = "";
-
-  // --------------------------------------
-  //  Regular expressions
-  integerUnsigned: string = "^[0-9]*$";
-  integerSigned: string = "^-?[0-9]+$";
-  decimalUnsigned: string = "^[0-9]+(.[0-9]+)?$";
-  decimalSigned: string = "^-?[0-9]+(.[0-9]+)?$";
-
-  /**
-   * Class constructor
-   * @param hostElement
-   */
-  constructor(private hostElement: ElementRef) {}
-
-  /**
-   * Event handler for host's change event
-   * @param e
-   */
-  @HostListener("change", ["$event"]) onChange(e) {
-    this.validateValue(this.hostElement.nativeElement.value);
-  }
-
-  /**
-   * Event handler for host's paste event
-   * @param e
-   */
-  @HostListener("paste", ["$event"]) onPaste(e) {
-    // get and validate data from clipboard
-    let value = e.clipboardData.getData("text/plain");
-    this.validateValue(value);
-    e.preventDefault();
-  }
-
-  /**
-   * Event handler for host's keydown event
-   * @param event
-   */
-  @HostListener("keydown", ["$event"]) onKeyDown(e: KeyboardEvent) {
-    let cursorPosition: number = e.target["selectionStart"];
-    let originalValue: string = e.target["value"];
-    let key: string = this.getName(e);
-    let controlOrCommand = e.ctrlKey === true || e.metaKey === true;
-    let signExists = originalValue.includes("-");
-    let separatorExists = originalValue.includes(this.decimalSeparator);
-
-    // allowed keys apart from numeric characters
-    let allowedKeys = ["Backspace", "ArrowLeft", "ArrowRight", "Escape", "Tab"];
-
-    // when decimals are allowed, add
-    // decimal separator to allowed codes when
-    // its position is not close to the the sign (-. and .-)
-    let separatorIsCloseToSign = signExists && cursorPosition <= 1;
-    if (this.allowDecimals && !separatorIsCloseToSign && !separatorExists) {
-      if (this.decimalSeparator == ".") allowedKeys.push(".");
-      else allowedKeys.push(",");
-    }
-
-    // when minus sign is allowed, add its
-    // key to allowed key only when the
-    // cursor is in the first position, and
-    // first character is different from
-    // decimal separator
-    let firstCharacterIsSeparator =
-      originalValue.charAt(0) != this.decimalSeparator;
-    if (
-      this.allowSign &&
-      !signExists &&
-      firstCharacterIsSeparator &&
-      cursorPosition == 0
-    ) {
-      allowedKeys.push("-");
-    }
-
-    /*
-    // allow some non-numeric characters
-    if (
-      allowedKeys.indexOf(key) != -1 ||
-      // Allow: Ctrl+A and Command+A
-      (key == "a" && controlOrCommand) ||
-      // Allow: Ctrl+C and Command+C
-      (key == "c" && controlOrCommand) ||
-      // Allow: Ctrl+V and Command+V
-      (key == "v" && controlOrCommand) ||
-      // Allow: Ctrl+X and Command+X
-      (key == "x" && controlOrCommand)
-    ) {
-      // let it happen, don't do anything
-      return;
-    }*/
-
-    // save value before keydown event
-    this.previousValue = originalValue;
-
-    // allow number characters only
-    let isNumber = new RegExp(this.integerUnsigned).test(key);
-    if (isNumber) {
-      console.log(isNumber);
-      return;
-    } else {
-      console.log("WTF");
-      e.preventDefault();
-    }
-    this.validateValue(this.hostElement.nativeElement.value);
-  }
-
-  /**
-   * Test whether value is a valid number or not
-   * @param value
-   */
-  validateValue(value: string): void {
-    // choose the appropiate regular expression
-    let regex: string;
-    if (!this.allowDecimals && !this.allowSign) regex = this.integerUnsigned;
-    if (!this.allowDecimals && this.allowSign) regex = this.integerSigned;
-    if (this.allowDecimals && !this.allowSign) regex = this.decimalUnsigned;
-    if (this.allowDecimals && this.allowSign) regex = this.decimalSigned;
-
-    // when a numbers begins with a decimal separator,
-    // fix it adding a zero in the beginning
-    let firstCharacter = value.charAt(0);
-    if (firstCharacter == this.decimalSeparator) value = 0 + value;
-
-    // when a numbers ends with a decimal separator,
-    // fix it adding a zero in the end
-    let lastCharacter = value.charAt(value.length - 1);
-    if (lastCharacter == this.decimalSeparator) value = value + 0;
-
-    // test number with regular expression, when
-    // number is invalid, replace it with a zero
-    let valid: boolean = new RegExp(regex).test(value);
-    this.hostElement.nativeElement["value"] = valid ? value : 0;
-  }
-
-  /**
-   * Get key's name
-   * @param e
-   */
-  getName(e): string {
-    if (e.key) {
-      return e.key;
-    } else {
-      // for old browsers
-      if (e.keyCode && String.fromCharCode) {
-        switch (e.keyCode) {
-          case 8:
-            return "Backspace";
-          case 9:
-            return "Tab";
-          case 27:
-            return "Escape";
-          case 37:
-            return "ArrowLeft";
-          case 39:
-            return "ArrowRight";
-          case 188:
-            return ",";
-          case 190:
-            return ".";
-          case 109:
-            return "-"; // minus in numbpad
-          case 173:
-            return "-"; // minus in alphabet keyboard in firefox
-          case 189:
-            return "-"; // minus in alphabet keyboard in chrome
-          default:
-            return String.fromCharCode(e.keyCode);
-        }
-      }
-    }
-  }
-}

src/app/layouts/admin/admin.module.ts

@@ -44,12 +44,6 @@ import { InvestmentProposalGeneralInfoComponent } from "@app/components/investme
 import { InvestmentsComponent } from "@app/components/investments/investments.component";
 import { ArbitrationsComponent } from "@app/components/arbitrations/arbitrations.component";
 import { PerformancesComponent } from "@app/components/performances/performances.component";
-
-/*
-import { CountriesComponent } from "@app/components/catalogs/countries/countries.component";
-import { CompaniesComponent } from "@app/components/catalogs/companies/companies.component";
-import { NewCompanyComponent } from "@app/components/catalogs/companies/new-company/new-company.component"; */
-/* Shared Service */
 import { FormInvestmentProposalService } from "@app/services/form-investment-proposal.service";
 import { InvestmentProposalWorkflowService } from "@app/services/investment-proposal-workflow.service";
 import { ComplementInfoComponent } from "@app/components/investment-proposals/complement-info/complement-info.component";
@@ -74,7 +68,7 @@ import { ChangeHistoryComponent } from "@app/components/investment-proposals/cha
 
 import { PaymentRequirementComponent } from "@app/components/investment-proposals/payment-requirement/payment-requirement.component";
 import { PaymentInfoComponent } from "@app/components/investment-proposals/payment-info/payment-info.component";
-import { InvestmentProposalDetailComponent } from "@app/components/investment-proposals/proposal-detail/review/proposal-detail.component";
+import { InvestmentProposalDetailComponent } from "@app/components/investment-proposals/proposal-detail/proposal-detail.component";
 
 // This array defines which "componentId" maps to which lazy-loaded module.
 

src/app/layouts/admin/admin.routing.ts

@@ -20,7 +20,7 @@ import { ChangeHistoryComponent } from "@app/components/investment-proposals/cha
 import { PaymentInfoComponent } from "@app/components/investment-proposals/payment-info/payment-info.component";
 
 import { PaymentRequirementComponent } from "@app/components/investment-proposals/payment-requirement/payment-requirement.component";
-import { InvestmentProposalDetailComponent } from "@app/components/investment-proposals/proposal-detail/review/proposal-detail.component";
+import { InvestmentProposalDetailComponent } from "@app/components/investment-proposals/proposal-detail/proposal-detail.component";
 
 import { NgModule } from "@angular/core";
 import { from } from "rxjs";