Merge branch 'features-a' of onunez/frontend-inversiones into development

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

@@ -166,7 +166,7 @@
   <div class="form-group text-center space-20">
     <button
       class="btn btn-primary center-component margin-right"
-      (click)="goToNext(personalForm)"
+      (click)="goToNext(investmentProposalForm)"
     >
       Siguiente
     </button>

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

@@ -3,6 +3,8 @@ import { InstrumentComponent } from "@app/components/investment-proposals/instru
 import { FormBuilder, FormGroup, Validators } from "@angular/forms";
 import { IAngularMyDpOptions, IMyDateModel } from "angular-mydatepicker";
 import { formatDate, DatePipe } from "@angular/common";
+import { Router } from "@angular/router";
+import { FormInvestmentProposalService } from "@app/services/form-investment-proposal.service";
 
 @Component({
   selector: "app-anc",
@@ -47,7 +49,11 @@ export class ANCComponent implements InstrumentComponent {
   myDateInit: boolean = true;
   model: IMyDateModel = null;
 
-  constructor(private formBuilder: FormBuilder) {
+  constructor(
+    private formBuilder: FormBuilder,
+    private router: Router,
+    private formDataService: FormInvestmentProposalService
+  ) {
     console.log("init");
 
     this.investmentProposalForm = this.formBuilder.group({
@@ -59,4 +65,20 @@ export class ANCComponent implements InstrumentComponent {
       fecha_vencimiento: ["", Validators.required]
     });
   }
+
+  save(form: any): boolean {
+    /*if (!form.valid) {
+      return false;
+    }*/
+    this.formDataService.setWork(this.investmentProposalForm.value);
+    return true;
+  }
+
+  goToNext(form: any) {
+    if (this.save(form)) {
+      console.log("all good");
+      // Navigate to the work page
+      this.router.navigate(["/address"]);
+    }
+  }
 }

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

@@ -166,7 +166,7 @@
   <div class="form-group text-center space-20">
     <button
       class="btn btn-primary center-component margin-right"
-      (click)="goToNext(personalForm)"
+      (click)="goToNext(investmentProposalForm)"
     >
       Siguiente
     </button>

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

@@ -3,6 +3,8 @@ import { InstrumentComponent } from "@app/components/investment-proposals/instru
 import { FormBuilder, FormGroup, Validators } from "@angular/forms";
 import { IAngularMyDpOptions, IMyDateModel } from "angular-mydatepicker";
 import { formatDate, DatePipe } from "@angular/common";
+import { Router } from "@angular/router";
+import { FormInvestmentProposalService } from "@app/services/form-investment-proposal.service";
 
 @Component({
   selector: "app-apn",
@@ -47,7 +49,11 @@ export class APNComponent implements InstrumentComponent {
   myDateInit: boolean = true;
   model: IMyDateModel = null;
 
-  constructor(private formBuilder: FormBuilder) {
+  constructor(
+    private formBuilder: FormBuilder,
+    private router: Router,
+    private formDataService: FormInvestmentProposalService
+  ) {
     console.log("init");
 
     this.investmentProposalForm = this.formBuilder.group({
@@ -59,4 +65,22 @@ export class APNComponent implements InstrumentComponent {
       fecha_vencimiento: ["", Validators.required]
     });
   }
+
+  save(form: any): boolean {
+    /*if (!form.valid) {
+      return false;
+    }*/
+    console.log(this.investmentProposalForm.value);
+    this.formDataService.setWork(this.investmentProposalForm.value);
+    return true;
+  }
+
+  goToNext(form: any) {
+    if (this.save(form)) {
+      console.log("all good");
+      // Navigate to the work page
+      console.log(this.formDataService.getWork());
+      this.router.navigate(["/address"]);
+    }
+  }
 }

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

@@ -283,7 +283,7 @@ BONOS FORM
   <div class="form-group text-center space-20">
     <button
       class="btn btn-primary center-component margin-right"
-      (click)="goToNext(personalForm)"
+      (click)="goToNext(investmentProposalForm)"
     >
       Siguiente
     </button>

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

@@ -3,6 +3,8 @@ import { InstrumentComponent } from "@app/components/investment-proposals/instru
 import { FormBuilder, FormGroup, Validators } from "@angular/forms";
 import { IAngularMyDpOptions, IMyDateModel } from "angular-mydatepicker";
 import { formatDate, DatePipe } from "@angular/common";
+import { Router } from "@angular/router";
+import { FormInvestmentProposalService } from "@app/services/form-investment-proposal.service";
 
 @Component({
   selector: "app-bonos",
@@ -47,7 +49,11 @@ export class BonosComponent implements InstrumentComponent {
   myDateInit: boolean = true;
   model: IMyDateModel = null;
 
-  constructor(private formBuilder: FormBuilder) {
+  constructor(
+    private formBuilder: FormBuilder,
+    private router: Router,
+    private formDataService: FormInvestmentProposalService
+  ) {
     console.log("init");
 
     this.investmentProposalForm = this.formBuilder.group({
@@ -64,4 +70,20 @@ export class BonosComponent implements InstrumentComponent {
       costos_transferencia: ["", Validators.required]
     });
   }
+
+  save(form: any): boolean {
+    /*if (!form.valid) {
+      return false;
+    }*/
+    this.formDataService.setWork(this.investmentProposalForm.value);
+    return true;
+  }
+
+  goToNext(form: any) {
+    if (this.save(form)) {
+      console.log("all good");
+      // Navigate to the work page
+      this.router.navigate(["/address"]);
+    }
+  }
 }

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

@@ -288,7 +288,7 @@
   <div class="form-group text-center space-20">
     <button
       class="btn btn-primary center-component margin-right"
-      (click)="goToNext(personalForm)"
+      (click)="goToNext(investmentProposalForm)"
     >
       Siguiente
     </button>

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

@@ -3,6 +3,8 @@ import { InstrumentComponent } from "@app/components/investment-proposals/instru
 import { FormBuilder, FormGroup, Validators } from "@angular/forms";
 import { IAngularMyDpOptions, IMyDateModel } from "angular-mydatepicker";
 import { formatDate, DatePipe } from "@angular/common";
+import { Router } from "@angular/router";
+import { FormInvestmentProposalService } from "@app/services/form-investment-proposal.service";
 
 @Component({
   selector: "app-cete",
@@ -48,7 +50,11 @@ export class CeteComponent implements InstrumentComponent {
   myDateInit: boolean = true;
   model: IMyDateModel = null;
 
-  constructor(private formBuilder: FormBuilder) {
+  constructor(
+    private formBuilder: FormBuilder,
+    private router: Router,
+    private formDataService: FormInvestmentProposalService
+  ) {
     this.investmentProposalForm = this.formBuilder.group({
       valor_nominal: ["", Validators.required],
       plazo_dias: ["", Validators.required],
@@ -63,4 +69,20 @@ export class CeteComponent implements InstrumentComponent {
       otros_costos: ["", Validators.required]
     });
   }
+
+  save(form: any): boolean {
+    /*if (!form.valid) {
+      return false;
+    }*/
+    this.formDataService.setWork(this.investmentProposalForm.value);
+    return true;
+  }
+
+  goToNext(form: any) {
+    if (this.save(form)) {
+      console.log("all good");
+      // Navigate to the work page
+      this.router.navigate(["/address"]);
+    }
+  }
 }

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

@@ -124,7 +124,6 @@
             name="fecha_operacion"
             (click)="dp.toggleCalendar()"
             [options]="myDpOptions"
-            (dateChanged)="onDateChanged($event)"
             #dp="angular-mydatepicker"
             [ngClass]="{
               'is-invalid': submitted && f.fecha_operacion.errors
@@ -159,7 +158,6 @@
               name="fecha_vencimiento"
               (click)="dp2.toggleCalendar()"
               [options]="myDpOptions"
-              (dateChanged)="onDateChanged($event)"
               #dp2="angular-mydatepicker"
               [ngClass]="{
                 'is-invalid': submitted && f.fecha_vencimiento.errors
@@ -188,7 +186,7 @@
   <div class="form-group text-center space-20">
     <button
       class="btn btn-primary center-component margin-right"
-      (click)="goToNext(personalForm)"
+      (click)="goToNext(investmentProposalForm)"
     >
       Siguiente
     </button>

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

@@ -3,6 +3,8 @@ import { InstrumentComponent } from "@app/components/investment-proposals/instru
 import { FormBuilder, FormGroup, Validators } from "@angular/forms";
 import { IAngularMyDpOptions, IMyDateModel } from "angular-mydatepicker";
 import { formatDate, DatePipe } from "@angular/common";
+import { Router } from "@angular/router";
+import { FormInvestmentProposalService } from "@app/services/form-investment-proposal.service";
 
 @Component({
   selector: "app-depositos",
@@ -47,9 +49,11 @@ export class DepositosComponent implements InstrumentComponent {
   myDateInit: boolean = true;
   model: IMyDateModel = null;
 
-  constructor(private formBuilder: FormBuilder) {
-    console.log("init");
-
+  constructor(
+    private formBuilder: FormBuilder,
+    private router: Router,
+    private formDataService: FormInvestmentProposalService
+  ) {
     this.investmentProposalForm = this.formBuilder.group({
       monto_inversion: ["", Validators.required],
       plazo_dias: ["", Validators.required],
@@ -61,4 +65,22 @@ export class DepositosComponent implements InstrumentComponent {
       fecha_vencimiento: ["", Validators.required]
     });
   }
+
+  save(form: any): boolean {
+    /*if (!form.valid) {
+      return false;
+    }*/
+    console.log(this.investmentProposalForm.value);
+    this.formDataService.setWork(this.investmentProposalForm.value);
+    return true;
+  }
+
+  goToNext(form: any) {
+    if (this.save(form)) {
+      console.log("all good");
+      // Navigate to the work page
+      //console.log(this.formDataService.getInstrumentData());
+      this.router.navigate(["/address"]);
+    }
+  }
 }

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

@@ -198,7 +198,7 @@
   <div class="form-group text-center space-20">
     <button
       class="btn btn-primary center-component margin-right"
-      (click)="goToNext(personalForm)"
+      (click)="goToNext(investmentProposalForm)"
     >
       Siguiente
     </button>

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

@@ -3,6 +3,8 @@ import { InstrumentComponent } from "@app/components/investment-proposals/instru
 import { FormBuilder, FormGroup, Validators } from "@angular/forms";
 import { IAngularMyDpOptions, IMyDateModel } from "angular-mydatepicker";
 import { formatDate, DatePipe } from "@angular/common";
+import { Router } from "@angular/router";
+import { FormInvestmentProposalService } from "@app/services/form-investment-proposal.service";
 
 @Component({
   selector: "app-lete",
@@ -47,7 +49,11 @@ export class LeteComponent implements InstrumentComponent {
   myDateInit: boolean = true;
   model: IMyDateModel = null;
 
-  constructor(private formBuilder: FormBuilder) {
+  constructor(
+    private formBuilder: FormBuilder,
+    private router: Router,
+    private formDataService: FormInvestmentProposalService
+  ) {
     console.log("init");
 
     this.investmentProposalForm = this.formBuilder.group({
@@ -60,4 +66,20 @@ export class LeteComponent implements InstrumentComponent {
       fecha_rendencion: ["", Validators.required]
     });
   }
+
+  save(form: any): boolean {
+    /*if (!form.valid) {
+      return false;
+    }*/
+    this.formDataService.setWork(this.investmentProposalForm.value);
+    return true;
+  }
+
+  goToNext(form: any) {
+    if (this.save(form)) {
+      console.log("all good");
+      // Navigate to the work page
+      this.router.navigate(["/address"]);
+    }
+  }
 }

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

@@ -3,6 +3,8 @@ import { InstrumentComponent } from "@app/components/investment-proposals/instru
 import { FormBuilder, FormGroup, Validators } from "@angular/forms";
 import { IAngularMyDpOptions, IMyDateModel } from "angular-mydatepicker";
 import { formatDate, DatePipe } from "@angular/common";
+import { Router } from "@angular/router";
+import { FormInvestmentProposalService } from "@app/services/form-investment-proposal.service";
 
 @Component({
   selector: "app-vcn",
@@ -48,7 +50,11 @@ export class VCNComponent implements InstrumentComponent {
   myDateInit: boolean = true;
   model: IMyDateModel = null;
 
-  constructor(private formBuilder: FormBuilder) {
+  constructor(
+    private formBuilder: FormBuilder,
+    private router: Router,
+    private formDataService: FormInvestmentProposalService
+  ) {
     console.log("init");
 
     this.investmentProposalForm = this.formBuilder.group({
@@ -65,4 +71,20 @@ export class VCNComponent implements InstrumentComponent {
       otros_costos: ["", Validators.required]
     });
   }
+
+  save(form: any): boolean {
+    /*if (!form.valid) {
+      return false;
+    }*/
+    this.formDataService.setWork(this.investmentProposalForm.value);
+    return true;
+  }
+
+  goToNext(form: any) {
+    if (this.save(form)) {
+      console.log("all good");
+      // Navigate to the work page
+      this.router.navigate(["/address"]);
+    }
+  }
 }

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

@@ -217,7 +217,7 @@
                     </button>
                     <button
                       class="btn btn-primary center-component margin-right"
-                      (click)="goToNext(personalForm)"
+                      (click)="goToNext(investmentProposalForm)"
                     >
                       Siguiente
                     </button>

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

@@ -39,9 +39,9 @@ export class AddressComponent implements OnInit {
   }
 
   save(form: any): boolean {
-    if (!form.valid) {
+    /* if (!form.valid) {
       return false;
-    }
+    }*/
 
     this.formDataService.setAddress(this.address);
     return true;
@@ -50,7 +50,7 @@ export class AddressComponent implements OnInit {
   goToPrevious(form: any) {
     if (this.save(form)) {
       // Navigate to the work page
-      this.router.navigate(["/work"]);
+      this.router.navigate(["/result"]);
     }
   }
 

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

@@ -22,6 +22,16 @@ export class ResultComponent implements OnInit {
 
   submit() {
     alert("Excellent Job!");
+    let general = this.formDataService.getPersonal();
+    let instrument = this.formDataService.getWork();
+    let address = this.formDataService.getAddress();
+
+    let final = {};
+
+    Object.assign(final, general, instrument, address);
+
+    console.log(final);
+
     this.formData = this.formDataService.resetFormData();
     this.isFormValid = false;
   }

src/app/services/form-investment-proposal.service.ts

@@ -13,6 +13,7 @@ import { STEPS } from "@app/models/investment-proposal-workflow";
 })
 export class FormInvestmentProposalService {
   private formData: InvestmentProposalForm = new InvestmentProposalForm();
+  private instrumentData: any;
   private isPersonalFormValid: boolean = false;
   private isWorkFormValid: boolean = false;
   private isAddressFormValid: boolean = false;
@@ -54,13 +55,14 @@ export class FormInvestmentProposalService {
 
   getWork(): string {
     // Return the work type
-    return this.formData.work;
+    return this.instrumentData;
   }
 
-  setWork(data: string) {
+  setWork(data: any) {
     // Update the work type only when the Work Form had been validated successfully
     this.isWorkFormValid = true;
-    this.formData.work = data;
+    //this.formData.work = data;
+    this.instrumentData = data;
     // Validate Work Step in Workflow
     this.workflowService.validateStep(STEPS.work);
   }