Merge branch 'development' into feature-general_fixes

angular.json

@@ -23,7 +23,10 @@
             "polyfills": "src/polyfills.ts",
             "tsConfig": "tsconfig.app.json",
             "aot": false,
-            "assets": ["src/favicon.ico", "src/assets"],
+            "assets": [
+              "src/favicon.ico",
+              "src/assets"
+            ],
             "styles": [
               "./node_modules/@angular/material/prebuilt-themes/indigo-pink.css",
               "node_modules/perfect-scrollbar/css/perfect-scrollbar.css",
@@ -98,7 +101,10 @@
             "polyfills": "src/polyfills.ts",
             "tsConfig": "tsconfig.spec.json",
             "karmaConfig": "karma.conf.js",
-            "assets": ["src/favicon.ico", "src/assets"],
+            "assets": [
+              "src/favicon.ico",
+              "src/assets"
+            ],
             "styles": [
               "./node_modules/@angular/material/prebuilt-themes/indigo-pink.css",
               "node_modules/perfect-scrollbar/css/perfect-scrollbar.css",
@@ -126,7 +132,9 @@
               "tsconfig.spec.json",
               "e2e/tsconfig.json"
             ],
-            "exclude": ["**/node_modules/**"]
+            "exclude": [
+              "**/node_modules/**"
+            ]
           }
         },
         "e2e": {
@@ -144,5 +152,8 @@
       }
     }
   },
-  "defaultProject": "frontend-inversiones"
-}
+  "defaultProject": "frontend-inversiones",
+  "cli": {
+    "analytics": false
+  }
+}

package.json

@@ -59,13 +59,13 @@
     "zone.js": "~0.9.1"
   },
   "devDependencies": {
-    "@angular-devkit/build-angular": "~0.803.21",
+    "@angular-devkit/build-angular": "^0.803.29",
     "@angular/cli": "~8.3.21",
     "@angular/compiler-cli": "~8.2.14",
     "@angular/language-service": "~8.2.14",
-    "@types/node": "~8.9.4",
     "@types/jasmine": "~3.3.8",
     "@types/jasminewd2": "~2.0.3",
+    "@types/node": "~8.9.4",
     "codelyzer": "^5.0.0",
     "jasmine-core": "~3.4.0",
     "jasmine-spec-reporter": "~4.2.1",

src/app/app.module.ts

@@ -30,6 +30,7 @@ import { LoginComponent } from "./components/login/login.component";
 import { TokenInterceptor } from "@app/services/token.interceptor";
 import { MatPasswordStrengthModule } from "@angular-material-extensions/password-strength";
 
+
 @NgModule({
   declarations: [AppComponent, AdminComponent, LoginComponent],
   imports: [

src/app/components/extras/convert.dec.pipe.ts

@@ -0,0 +1,35 @@
+import { Pipe, PipeTransform } from '@angular/core';
+
+@Pipe({
+  name: 'numberPipe'
+})
+export class NumberPipePipe implements PipeTransform {
+
+  transform(val) {
+    if(val){
+
+    val = this.format_number(val.toString(), '');
+    }
+    return val;
+  }
+
+  format_number(number, prefix) {
+    let thousand_separator = ',',
+      decimal_separator = '.',
+      regex = new RegExp('[^' + decimal_separator + '\\d]', 'g'),
+      number_string = number.replace(regex, '').toString(),
+      split = number_string.split(decimal_separator),
+      rest = split[0].length % 3,
+      result = split[0].substr(0, rest),
+      thousands = split[0].substr(rest).match(/\d{3}/g);
+
+    if (thousands) {
+      let separator = rest ? thousand_separator : '';
+      result += separator + thousands.join(thousand_separator);
+    }
+    result = split[1] != undefined ? result + decimal_separator + split[1] : result;
+
+    return prefix == undefined ? result : (result ? prefix + result : '');
+  };
+
+}

src/app/components/incomes/general-form/general-form.component.html

@@ -112,6 +112,8 @@
                               type="text"
                               formControlName="capital"
                               class="form-control"
+                              [value]="investmentProposalForm.get('capital').value | numberPipe" 
+                              (input)="inputValidator($event)"
                               [ngClass]="{
                                 'is-invalid': submitted && f.capital.errors
                               }"
@@ -142,6 +144,8 @@
                             <input
                               type="text"
                               formControlName="ingreso_bruto"
+                              [value]="investmentProposalForm.get('ingreso_bruto').value | numberPipe" 
+                              (input)="inputValidator($event)"
                               class="form-control"
                               [ngClass]="{
                                 'is-invalid':
@@ -174,6 +178,8 @@
                             <input
                               type="text"
                               formControlName="ingreso_neto"
+                              [value]="investmentProposalForm.get('ingreso_neto').value | numberPipe" 
+                              (input)="inputValidator($event)"
                               class="form-control"
                               [ngClass]="{
                                 'is-invalid': submitted && f.ingreso_neto.errors

src/app/components/incomes/general-form/general-form.component.ts

@@ -227,28 +227,32 @@ export class GeneralIncomeFormComponent implements OnInit {
         "",
         [
           Validators.required,
-          Validators.pattern(/^[+]?([0-9]+(?:[\.][0-9]*)?|\.[0-9]+)$/)
+          //Validators.pattern(/^[+]?([0-9]+(?:[\.][0-9]*)?|\.[0-9]+)$/)
+          Validators.pattern("^[0-9,.]+$")
         ]
       ],
       ingreso_bruto: [
         "",
         [
           Validators.required,
-          Validators.pattern(/^[+]?([0-9]+(?:[\.][0-9]*)?|\.[0-9]+)$/)
+          //Validators.pattern(/^[+]?([0-9]+(?:[\.][0-9]*)?|\.[0-9]+)$/)
+          Validators.pattern("^[0-9,.]+$")
         ]
       ],
       renta: [
         "",
         [
           Validators.required,
-          Validators.pattern(/^[+]?([0-9]+(?:[\.][0-9]*)?|\.[0-9]+)$/)
+          //Validators.pattern(/^[+]?([0-9]+(?:[\.][0-9]*)?|\.[0-9]+)$/)
+          Validators.pattern("^[0-9,.]+$")
         ]
       ],
       ingreso_neto: [
         "",
         [
           Validators.required,
-          Validators.pattern(/^[+]?([0-9]+(?:[\.][0-9]*)?|\.[0-9]+)$/)
+          //Validators.pattern(/^[+]?([0-9]+(?:[\.][0-9]*)?|\.[0-9]+)$/)
+          Validators.pattern("^[0-9,.]+$")
         ]
       ],
       tipo_pago: ["", Validators.required],
@@ -274,7 +278,12 @@ export class GeneralIncomeFormComponent implements OnInit {
 
   submitIncome(form: any) {
     this.submitted = true;
+    let inversionCapital = this.clearValor(form.value.capital,"decimal")
+    let inversionBruto = this.clearValor(form.value.ingreso_bruto,"decimal")
+    let inversionNeto = this.clearValor(form.value.ingreso_neto,"decimal")
     console.log(form);
+    console.log(form.value.ingreso_bruto)
+    console.log(inversionBruto)
     if (!form.valid) {
       return false;
     }
@@ -284,10 +293,10 @@ export class GeneralIncomeFormComponent implements OnInit {
       id_proyeccion_ingreso_instrumento: this.idInstrumentIncome,
       fecha_proyeccion_pago: this.projectionDate,
 
-      capital: form.value.capital,
-      ingreso_bruto: form.value.ingreso_bruto,
+      capital: inversionCapital,
+      ingreso_bruto: inversionBruto,
       renta: form.value.renta,
-      ingreso_neto: form.value.ingreso_neto,
+      ingreso_neto: inversionNeto,
       id_cuenta_bancaria: form.value.cuenta_bancaria,
       id_tipo_pago: form.value.tipo_pago,
       comentario: form.value.comentario
@@ -335,7 +344,25 @@ export class GeneralIncomeFormComponent implements OnInit {
       }
     );
   }
+  
+clearValor(value,tipoDato){
+    value = parseFloat(value.toString().replace(",",""))        
+return value;
+}
+
+public inputValidator(event: any) {
+  //console.log(event.target.value);
+  const pattern = /^[0-9]*$/;   
+  //let inputChar = String.fromCharCode(event.charCode)
+  
+  if (!pattern.test(event.target.value)) {
+
+    event.target.value = event.target.value.replace(/[^\d,.]+/g, '');
+    // invalid character, prevent input
 
+  }
+  
+}
   conciliateIncome() {
     this.conciliateObject = {
       id_inversion_instrumento: this.projectionRes.id_inversion_instrumento,

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

@@ -1113,10 +1113,10 @@
             <ng-container matColumnDef="ingreso_bruto">
               <th mat-header-cell *matHeaderCellDef>Ingreso bruto</th>
               <td mat-cell *matCellDef="let row">
-                {{
+                ${{
                   row.ingreso_bruto == "" || row.ingreso_bruto == undefined
                     ? "-"
-                    : row.ingreso_bruto
+                    : row.ingreso_bruto | number: "1.2-4"
                 }}
               </td>
               <td mat-footer-cell *matFooterCellDef>
@@ -1128,10 +1128,10 @@
             <ng-container matColumnDef="ingreso_neto">
               <th mat-header-cell *matHeaderCellDef>Ingreso neto</th>
               <td mat-cell *matCellDef="let row">
-                {{
+                ${{
                   row.ingreso_neto == "" || row.ingreso_neto == undefined
                     ? "-"
-                    : row.ingreso_neto
+                    : row.ingreso_neto | number: "1.2-4"
                 }}
               </td>
               <td mat-footer-cell *matFooterCellDef>
@@ -1144,12 +1144,12 @@
             <ng-container matColumnDef="renta">
               <th mat-header-cell *matHeaderCellDef>Renta ($)</th>
               <td mat-cell *matCellDef="let row">
-                {{
-                  row.renta == "" || row.renta == undefined ? "-" : row.renta
+                ${{
+                  row.renta == "" || row.renta == undefined ? "-" : row.renta  | number: "1.2-4"
                 }}
               </td>
               <td mat-footer-cell *matFooterCellDef>
-                {{ consolidado_proyeccion.total_renta | number: "1.2-4" }}
+                ${{ consolidado_proyeccion.total_renta | number: "1.2-4" }}
               </td>
             </ng-container>
 
@@ -1696,10 +1696,10 @@
             <ng-container matColumnDef="ingreso_bruto">
               <th mat-header-cell *matHeaderCellDef>Ingreso bruto</th>
               <td mat-cell *matCellDef="let row">
-                {{
+                ${{
                   row.ingreso_bruto == "" || row.ingreso_bruto == undefined
                     ? "-"
-                    : row.ingreso_bruto
+                    : row.ingreso_bruto | number: "1.2-4"
                 }}
               </td>
               <td mat-footer-cell *matFooterCellDef>
@@ -1712,10 +1712,10 @@
             <ng-container matColumnDef="ingreso_neto">
               <th mat-header-cell *matHeaderCellDef>Ingreso neto</th>
               <td mat-cell *matCellDef="let row">
-                {{
+                ${{
                   row.ingreso_neto == "" || row.ingreso_neto == undefined
                     ? "-"
-                    : row.ingreso_neto
+                    : row.ingreso_neto | number: "1.2-4"
                 }}
               </td>
               <td mat-footer-cell *matFooterCellDef>
@@ -1729,7 +1729,7 @@
               <th mat-header-cell *matHeaderCellDef>Renta ($)</th>
               <td mat-cell *matCellDef="let row">
                 ${{
-                  row.renta == "" || row.renta == undefined ? "-" : row.renta
+                  row.renta == "" || row.renta == undefined ? "-" : row.renta | number: "1.2-4"
                 }}
               </td>
               <td mat-footer-cell *matFooterCellDef>

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

@@ -1113,10 +1113,10 @@
             <ng-container matColumnDef="ingreso_bruto">
               <th mat-header-cell *matHeaderCellDef>Ingreso bruto</th>
               <td mat-cell *matCellDef="let row">
-                {{
+                ${{
                   row.ingreso_bruto == "" || row.ingreso_bruto == undefined
                     ? "-"
-                    : row.ingreso_bruto
+                    : row.ingreso_bruto | number: "1.2-4"
                 }}
               </td>
               <td mat-footer-cell *matFooterCellDef>
@@ -1128,10 +1128,10 @@
             <ng-container matColumnDef="ingreso_neto">
               <th mat-header-cell *matHeaderCellDef>Ingreso neto</th>
               <td mat-cell *matCellDef="let row">
-                {{
+                ${{
                   row.ingreso_neto == "" || row.ingreso_neto == undefined
                     ? "-"
-                    : row.ingreso_neto
+                    : row.ingreso_neto | number: "1.2-4"
                 }}
               </td>
               <td mat-footer-cell *matFooterCellDef>
@@ -1144,12 +1144,12 @@
             <ng-container matColumnDef="renta">
               <th mat-header-cell *matHeaderCellDef>Renta ($)</th>
               <td mat-cell *matCellDef="let row">
-                {{
-                  row.renta == "" || row.renta == undefined ? "-" : row.renta
+                ${{
+                  row.renta == "" || row.renta == undefined ? "-" : row.renta | number: "1.2-4"
                 }}
               </td>
               <td mat-footer-cell *matFooterCellDef>
-                {{ consolidado_proyeccion.total_renta | number: "1.2-4" }}
+                ${{ consolidado_proyeccion.total_renta | number: "1.2-4" }}
               </td>
             </ng-container>
 
@@ -1696,10 +1696,10 @@
             <ng-container matColumnDef="ingreso_bruto">
               <th mat-header-cell *matHeaderCellDef>Ingreso bruto</th>
               <td mat-cell *matCellDef="let row">
-                {{
+                ${{
                   row.ingreso_bruto == "" || row.ingreso_bruto == undefined
                     ? "-"
-                    : row.ingreso_bruto
+                    : row.ingreso_bruto | number: "1.2-4"
                 }}
               </td>
               <td mat-footer-cell *matFooterCellDef>
@@ -1712,10 +1712,10 @@
             <ng-container matColumnDef="ingreso_neto">
               <th mat-header-cell *matHeaderCellDef>Ingreso neto</th>
               <td mat-cell *matCellDef="let row">
-                {{
+                ${{
                   row.ingreso_neto == "" || row.ingreso_neto == undefined
                     ? "-"
-                    : row.ingreso_neto
+                    : row.ingreso_neto | number: "1.2-4"
                 }}
               </td>
               <td mat-footer-cell *matFooterCellDef>
@@ -1729,7 +1729,7 @@
               <th mat-header-cell *matHeaderCellDef>Renta ($)</th>
               <td mat-cell *matCellDef="let row">
                 ${{
-                  row.renta == "" || row.renta == undefined ? "-" : row.renta
+                  row.renta == "" || row.renta == undefined ? "-" : row.renta | number: "1.2-4"
                 }}
               </td>
               <td mat-footer-cell *matFooterCellDef>

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

@@ -428,15 +428,16 @@
             <ng-container matColumnDef="ingreso_bruto">
               <th mat-header-cell *matHeaderCellDef>Ingreso bruto</th>
               <td mat-cell *matCellDef="let row">
-                {{
+                
+                ${{
                   row.ingreso_bruto == "" || row.ingreso_bruto == undefined
                     ? "-"
-                    : row.ingreso_bruto
+                    : row.ingreso_bruto | number: "1.2-4"
                 }}
               </td>
               <td mat-footer-cell *matFooterCellDef>
-                $USD
-                {{
+                
+                ${{
                   consolidado_proyeccion.total_ingreso_bruto | number: "1.2-4"
                 }}
               </td>
@@ -445,15 +446,16 @@
             <ng-container matColumnDef="ingreso_neto">
               <th mat-header-cell *matHeaderCellDef>Ingreso neto</th>
               <td mat-cell *matCellDef="let row">
-                {{
+                
+                ${{
                   row.ingreso_neto == "" || row.ingreso_neto == undefined
                     ? "-"
-                    : row.ingreso_neto
+                    : row.ingreso_neto | number: "1.2-4"
                 }}
               </td>
               <td mat-footer-cell *matFooterCellDef>
-                $USD
-                {{
+                
+                ${{
                   consolidado_proyeccion.total_ingreso_neto | number: "1.2-4"
                 }}
               </td>
@@ -661,15 +663,16 @@
             <ng-container matColumnDef="ingreso_bruto">
               <th mat-header-cell *matHeaderCellDef>Ingreso bruto</th>
               <td mat-cell *matCellDef="let row">
-                {{
+                
+                ${{
                   row.ingreso_bruto == "" || row.ingreso_bruto == undefined
                     ? "-"
-                    : row.ingreso_bruto
+                    : row.ingreso_bruto | number: "1.2-4"
                 }}
               </td>
               <td mat-footer-cell *matFooterCellDef>
-                $USD
-                {{
+                
+                ${{
                   consolidado_proyeccion.total_ingreso_bruto | number: "1.2-4"
                 }}
               </td>
@@ -678,15 +681,16 @@
             <ng-container matColumnDef="ingreso_neto">
               <th mat-header-cell *matHeaderCellDef>Ingreso neto</th>
               <td mat-cell *matCellDef="let row">
-                {{
+                
+                ${{
                   row.ingreso_neto == "" || row.ingreso_neto == undefined
                     ? "-"
-                    : row.ingreso_neto
+                    : row.ingreso_neto | number: "1.2-4"
                 }}
               </td>
               <td mat-footer-cell *matFooterCellDef>
-                $USD
-                {{
+                
+                ${{
                   consolidado_proyeccion.total_ingreso_neto | number: "1.2-4"
                 }}
               </td>

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

@@ -218,11 +218,15 @@
 
         <div class="col-sm-6">
           <h4>Rendimiento bruto:</h4>
-          <div class="field">{{ rendimiento_bruto | number: "1.2-4" }}</div>
+          <div class="field">
+          $USD 
+          {{ rendimiento_bruto | number: "1.2-4" }}
+          </div>
         </div>
         <div class="col-sm-6">
           <h4>Rendimiento neto:</h4>
           <div class="field">
+            $USD 
             {{ rendimiento_neto | number: "1.2-4" }}
           </div>
         </div>
@@ -281,16 +285,16 @@
             <ng-container matColumnDef="ingreso_bruto">
               <th mat-header-cell *matHeaderCellDef>Ingreso bruto</th>
               <td mat-cell *matCellDef="let row">
-                $USD
-                {{
+                
+                ${{
                   row.ingreso_bruto == "" || row.ingreso_bruto == undefined
                     ? "-"
                     : (row.ingreso_bruto | number: "1.2-4")
                 }}
               </td>
               <td mat-footer-cell *matFooterCellDef>
-                $USD
-                {{
+                
+                ${{
                   consolidado_proyeccion.total_ingreso_bruto | number: "1.2-4"
                 }}
               </td>
@@ -298,30 +302,30 @@
             <ng-container matColumnDef="renta">
               <th mat-header-cell *matHeaderCellDef>Renta</th>
               <td mat-cell *matCellDef="let row">
-                $USD
-                {{
+                
+                ${{
                   row.renta == "" || row.renta == undefined
                     ? "-"
                     : (row.renta | number: "1.2-4")
                 }}
               </td>
               <td mat-footer-cell *matFooterCellDef>
-                $USD {{ consolidado_proyeccion.total_renta | number: "1.2-4" }}
+                ${{ consolidado_proyeccion.total_renta | number: "1.2-4" }}
               </td>
             </ng-container>
             <ng-container matColumnDef="ingreso_neto">
               <th mat-header-cell *matHeaderCellDef>Ingreso neto</th>
               <td mat-cell *matCellDef="let row">
-                $USD
-                {{
+                
+                ${{
                   row.ingreso_neto == "" || row.ingreso_neto == undefined
                     ? "-"
                     : (row.ingreso_neto | number: "1.2-4")
                 }}
               </td>
               <td mat-footer-cell *matFooterCellDef>
-                $USD
-                {{
+                
+                ${{
                   consolidado_proyeccion.total_ingreso_neto | number: "1.2-4"
                 }}
               </td>
@@ -495,16 +499,16 @@
             <ng-container matColumnDef="ingreso_bruto">
               <th mat-header-cell *matHeaderCellDef>Ingreso bruto</th>
               <td mat-cell *matCellDef="let row">
-                $USD
-                {{
+                
+                ${{
                   row.ingreso_bruto == "" || row.ingreso_bruto == undefined
                     ? "-"
                     : (row.ingreso_bruto | number: "1.2-4")
                 }}
               </td>
               <td mat-footer-cell *matFooterCellDef>
-                $USD
-                {{
+                
+                ${{
                   consolidado_proyeccion.total_ingreso_bruto | number: "1.2-4"
                 }}
               </td>
@@ -512,30 +516,30 @@
             <ng-container matColumnDef="renta">
               <th mat-header-cell *matHeaderCellDef>Renta</th>
               <td mat-cell *matCellDef="let row">
-                $USD
-                {{
+                
+                ${{
                   row.renta == "" || row.renta == undefined
                     ? "-"
                     : (row.renta | number: "1.2-4")
                 }}
               </td>
               <td mat-footer-cell *matFooterCellDef>
-                $USD {{ consolidado_proyeccion.total_renta | number: "1.2-4" }}
+                ${{ consolidado_proyeccion.total_renta | number: "1.2-4" }}
               </td>
             </ng-container>
             <ng-container matColumnDef="ingreso_neto">
               <th mat-header-cell *matHeaderCellDef>Ingreso neto</th>
               <td mat-cell *matCellDef="let row">
-                $USD
-                {{
+                
+                ${{
                   row.ingreso_neto == "" || row.ingreso_neto == undefined
                     ? "-"
                     : (row.ingreso_neto | number: "1.2-4")
                 }}
               </td>
               <td mat-footer-cell *matFooterCellDef>
-                $USD
-                {{
+                
+                ${{
                   consolidado_proyeccion.total_ingreso_neto | number: "1.2-4"
                 }}
               </td>

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

@@ -1113,10 +1113,10 @@
             <ng-container matColumnDef="ingreso_bruto">
               <th mat-header-cell *matHeaderCellDef>Ingreso bruto</th>
               <td mat-cell *matCellDef="let row">
-                {{
+                ${{
                   row.ingreso_bruto == "" || row.ingreso_bruto == undefined
                     ? "-"
-                    : row.ingreso_bruto
+                    : row.ingreso_bruto | number: "1.2-4"
                 }}
               </td>
               <td mat-footer-cell *matFooterCellDef>
@@ -1128,10 +1128,10 @@
             <ng-container matColumnDef="ingreso_neto">
               <th mat-header-cell *matHeaderCellDef>Ingreso neto</th>
               <td mat-cell *matCellDef="let row">
-                {{
+                ${{
                   row.ingreso_neto == "" || row.ingreso_neto == undefined
                     ? "-"
-                    : row.ingreso_neto
+                    : row.ingreso_neto | number: "1.2-4"
                 }}
               </td>
               <td mat-footer-cell *matFooterCellDef>
@@ -1144,12 +1144,12 @@
             <ng-container matColumnDef="renta">
               <th mat-header-cell *matHeaderCellDef>Renta ($)</th>
               <td mat-cell *matCellDef="let row">
-                {{
-                  row.renta == "" || row.renta == undefined ? "-" : row.renta
+                ${{
+                  row.renta == "" || row.renta == undefined ? "-" : row.renta | number: "1.2-4"
                 }}
               </td>
               <td mat-footer-cell *matFooterCellDef>
-                {{ consolidado_proyeccion.total_renta | number: "1.2-4" }}
+                ${{ consolidado_proyeccion.total_renta | number: "1.2-4" }}
               </td>
             </ng-container>
 
@@ -1696,10 +1696,10 @@
             <ng-container matColumnDef="ingreso_bruto">
               <th mat-header-cell *matHeaderCellDef>Ingreso bruto</th>
               <td mat-cell *matCellDef="let row">
-                {{
+                ${{
                   row.ingreso_bruto == "" || row.ingreso_bruto == undefined
                     ? "-"
-                    : row.ingreso_bruto
+                    : row.ingreso_bruto | number: "1.2-4"
                 }}
               </td>
               <td mat-footer-cell *matFooterCellDef>
@@ -1712,10 +1712,10 @@
             <ng-container matColumnDef="ingreso_neto">
               <th mat-header-cell *matHeaderCellDef>Ingreso neto</th>
               <td mat-cell *matCellDef="let row">
-                {{
+                ${{
                   row.ingreso_neto == "" || row.ingreso_neto == undefined
                     ? "-"
-                    : row.ingreso_neto
+                    : row.ingreso_neto | number: "1.2-4"
                 }}
               </td>
               <td mat-footer-cell *matFooterCellDef>
@@ -1729,7 +1729,7 @@
               <th mat-header-cell *matHeaderCellDef>Renta ($)</th>
               <td mat-cell *matCellDef="let row">
                 ${{
-                  row.renta == "" || row.renta == undefined ? "-" : row.renta
+                  row.renta == "" || row.renta == undefined ? "-" : row.renta | number: "1.2-4"
                 }}
               </td>
               <td mat-footer-cell *matFooterCellDef>

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

@@ -493,16 +493,16 @@
             <ng-container matColumnDef="ingreso_bruto">
               <th mat-header-cell *matHeaderCellDef>Ingreso bruto</th>
               <td mat-cell *matCellDef="let row">
-                $USD
-                {{
+                
+                ${{
                   row.ingreso_bruto == "" || row.ingreso_bruto == undefined
                     ? "-"
                     : (row.ingreso_bruto | number: "1.2-4")
                 }}
               </td>
               <td mat-footer-cell *matFooterCellDef>
-                $USD
-                {{
+                
+                ${{
                   consolidado_proyeccion.total_ingreso_bruto | number: "1.2-4"
                 }}
               </td>
@@ -510,15 +510,16 @@
             <ng-container matColumnDef="ingreso_neto">
               <th mat-header-cell *matHeaderCellDef>Ingreso neto</th>
               <td mat-cell *matCellDef="let row">
-                {{
+                
+                ${{
                   row.ingreso_neto == "" || row.ingreso_neto == undefined
                     ? "-"
                     : (row.ingreso_neto | number: "1.2-4")
                 }}
               </td>
               <td mat-footer-cell *matFooterCellDef>
-                $USD
-                {{
+                
+                ${{
                   consolidado_proyeccion.total_ingreso_neto | number: "1.2-4"
                 }}
               </td>
@@ -560,16 +561,16 @@
             <ng-container matColumnDef="rendimiento">
               <th mat-header-cell *matHeaderCellDef>Rendimiento ($)</th>
               <td mat-cell *matCellDef="let row">
-                $USD
-                {{
+                
+                ${{
                   row.rendimiento == "" || row.rendimiento == undefined
                     ? "-"
                     : (row.rendimiento | number: "1.2-4")
                 }}
               </td>
               <td mat-footer-cell *matFooterCellDef>
-                $USD
-                {{ consolidado_proyeccion.total_rendimiento | number: "1.2-4" }}
+                
+                ${{ consolidado_proyeccion.total_rendimiento | number: "1.2-4" }}
               </td>
             </ng-container>
 
@@ -767,16 +768,16 @@
             <ng-container matColumnDef="ingreso_bruto">
               <th mat-header-cell *matHeaderCellDef>Ingreso bruto</th>
               <td mat-cell *matCellDef="let row">
-                $USD
-                {{
+                
+                ${{
                   row.ingreso_bruto == "" || row.ingreso_bruto == undefined
                     ? "-"
                     : (row.ingreso_bruto | number: "1.2-4")
                 }}
               </td>
               <td mat-footer-cell *matFooterCellDef>
-                $USD
-                {{
+                
+                ${{
                   consolidado_proyeccion.total_ingreso_bruto | number: "1.2-4"
                 }}
               </td>
@@ -784,16 +785,16 @@
             <ng-container matColumnDef="ingreso_neto">
               <th mat-header-cell *matHeaderCellDef>Ingreso neto</th>
               <td mat-cell *matCellDef="let row">
-                $USD
-                {{
+                
+                ${{
                   row.ingreso_neto == "" || row.ingreso_neto == undefined
                     ? "-"
                     : (row.ingreso_neto | number: "1.2-4")
                 }}
               </td>
               <td mat-footer-cell *matFooterCellDef>
-                $USD
-                {{
+                
+                ${{
                   consolidado_proyeccion.total_ingreso_neto | number: "1.2-4"
                 }}
               </td>
@@ -835,15 +836,16 @@
             <ng-container matColumnDef="rendimiento">
               <th mat-header-cell *matHeaderCellDef>Rendimiento ($)</th>
               <td mat-cell *matCellDef="let row">
-                {{
+                
+                ${{
                   row.rendimiento == "" || row.rendimiento == undefined
                     ? "-"
                     : (row.rendimiento | number: "1.2-4")
                 }}
               </td>
               <td mat-footer-cell *matFooterCellDef>
-                $USD
-                {{ consolidado_proyeccion.total_rendimiento | number: "1.2-4" }}
+                
+                ${{ consolidado_proyeccion.total_rendimiento | number: "1.2-4" }}
               </td>
             </ng-container>
 

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

@@ -444,15 +444,16 @@
             <ng-container matColumnDef="ingreso_bruto">
               <th mat-header-cell *matHeaderCellDef>Ingreso bruto</th>
               <td mat-cell *matCellDef="let row">
-                {{
+                
+                ${{
                   row.ingreso_bruto == "" || row.ingreso_bruto == undefined
                     ? "-"
                     : (row.ingreso_bruto | number: "1.2-4")
                 }}
               </td>
               <td mat-footer-cell *matFooterCellDef>
-                $USD $USD
-                {{
+                
+                ${{
                   consolidado_proyeccion.total_ingreso_bruto | number: "1.2-4"
                 }}
               </td>
@@ -460,15 +461,16 @@
             <ng-container matColumnDef="ingreso_neto">
               <th mat-header-cell *matHeaderCellDef>Ingreso neto</th>
               <td mat-cell *matCellDef="let row">
-                {{
+                
+                ${{
                   row.ingreso_neto == "" || row.ingreso_neto == undefined
                     ? "-"
                     : (row.ingreso_neto | number: "1.2-4")
                 }}
               </td>
               <td mat-footer-cell *matFooterCellDef>
-                $USD $USD
-                {{
+                
+                ${{
                   consolidado_proyeccion.total_ingreso_neto | number: "1.2-4"
                 }}
               </td>
@@ -476,11 +478,12 @@
             <ng-container matColumnDef="costo_cedeval">
               <th mat-header-cell *matHeaderCellDef>Costo CEDEVAL</th>
               <td mat-cell *matCellDef="let row">
-                {{ row.costo_cedeval | number: "1.2-4" }}
+                
+                ${{ row.costo_cedeval | number: "1.2-4" }}
               </td>
               <td mat-footer-cell *matFooterCellDef>
-                $USD $USD
-                {{
+                
+                ${{
                   consolidado_proyeccion.total_costo_cedeval | number: "1.2-4"
                 }}
               </td>
@@ -488,20 +491,22 @@
             <ng-container matColumnDef="renta">
               <th mat-header-cell *matHeaderCellDef>Renta</th>
               <td mat-cell *matCellDef="let row">
-                {{ row.renta | number: "1.2-4" }}
+                
+                ${{ row.renta | number: "1.2-4" }}
               </td>
               <td mat-footer-cell *matFooterCellDef>
-                $USD {{ consolidado_proyeccion.total_renta | number: "1.2-4" }}
+                ${{ consolidado_proyeccion.total_renta | number: "1.2-4" }}
               </td>
             </ng-container>
             <ng-container matColumnDef="costo_transferencia">
               <th mat-header-cell *matHeaderCellDef>Costo transferencia</th>
               <td mat-cell *matCellDef="let row">
-                {{ row.costo_transferencia | number: "1.2-4" }}
+                
+                ${{ row.costo_transferencia | number: "1.2-4" }}
               </td>
               <td mat-footer-cell *matFooterCellDef>
-                $USD $USD
-                {{
+                
+                ${{
                   consolidado_proyeccion.total_costo_transferencia
                     | number: "1.2-4"
                 }}
@@ -510,21 +515,23 @@
             <ng-container matColumnDef="costo_banco">
               <th mat-header-cell *matHeaderCellDef>Costo banco</th>
               <td mat-cell *matCellDef="let row">
-                {{ row.costo_banco | number: "1.2-4" }}
+                
+                ${{ row.costo_banco | number: "1.2-4" }}
               </td>
               <td mat-footer-cell *matFooterCellDef>
-                $USD
-                {{ consolidado_proyeccion.total_costo_banco | number: "1.2-4" }}
+                
+                ${{ consolidado_proyeccion.total_costo_banco | number: "1.2-4" }}
               </td>
             </ng-container>
             <ng-container matColumnDef="otros_costos">
               <th mat-header-cell *matHeaderCellDef>Otros costos</th>
               <td mat-cell *matCellDef="let row">
-                {{ row.otros_costos | number: "1.2-4" }}
+                
+                ${{ row.otros_costos | number: "1.2-4" }}
               </td>
               <td mat-footer-cell *matFooterCellDef>
-                $USD $USD
-                {{
+                
+                ${{
                   consolidado_proyeccion.total_otros_costos | number: "1.2-4"
                 }}
               </td>
@@ -737,15 +744,16 @@
             <ng-container matColumnDef="ingreso_bruto">
               <th mat-header-cell *matHeaderCellDef>Ingreso bruto</th>
               <td mat-cell *matCellDef="let row">
-                {{
+                
+                ${{
                   row.ingreso_bruto == "" || row.ingreso_bruto == undefined
                     ? "-"
                     : (row.ingreso_bruto | number: "1.2-4")
                 }}
               </td>
               <td mat-footer-cell *matFooterCellDef>
-                $USD
-                {{
+                
+                ${{
                   consolidado_proyeccion.total_ingreso_bruto | number: "1.2-4"
                 }}
               </td>
@@ -753,15 +761,16 @@
             <ng-container matColumnDef="ingreso_neto">
               <th mat-header-cell *matHeaderCellDef>Ingreso neto</th>
               <td mat-cell *matCellDef="let row">
-                {{
+                
+                ${{
                   row.ingreso_neto == "" || row.ingreso_neto == undefined
                     ? "-"
                     : (row.ingreso_neto | number: "1.2-4")
                 }}
               </td>
               <td mat-footer-cell *matFooterCellDef>
-                $USD
-                {{
+                
+                ${{
                   consolidado_proyeccion.total_ingreso_neto | number: "1.2-4"
                 }}
               </td>
@@ -769,11 +778,12 @@
             <ng-container matColumnDef="costo_cedeval">
               <th mat-header-cell *matHeaderCellDef>Costo CEDEVAL</th>
               <td mat-cell *matCellDef="let row">
-                {{ row.costo_cedeval | number: "1.2-4" }}
+                
+                ${{ row.costo_cedeval | number: "1.2-4" }}
               </td>
               <td mat-footer-cell *matFooterCellDef>
-                $USD
-                {{
+                
+                ${{
                   consolidado_proyeccion.total_costo_cedeval | number: "1.2-4"
                 }}
               </td>
@@ -781,20 +791,22 @@
             <ng-container matColumnDef="renta">
               <th mat-header-cell *matHeaderCellDef>Renta</th>
               <td mat-cell *matCellDef="let row">
-                {{ row.renta | number: "1.2-4" }}
+                
+                ${{ row.renta | number: "1.2-4" }}
               </td>
               <td mat-footer-cell *matFooterCellDef>
-                $USD {{ consolidado_proyeccion.total_renta | number: "1.2-4" }}
+                ${{ consolidado_proyeccion.total_renta | number: "1.2-4" }}
               </td>
             </ng-container>
             <ng-container matColumnDef="costo_transferencia">
               <th mat-header-cell *matHeaderCellDef>Costo transferencia</th>
               <td mat-cell *matCellDef="let row">
-                {{ row.costo_transferencia | number: "1.2-4" }}
+                
+                ${{ row.costo_transferencia | number: "1.2-4" }}
               </td>
               <td mat-footer-cell *matFooterCellDef>
-                $USD
-                {{
+                
+                ${{
                   consolidado_proyeccion.total_costo_transferencia
                     | number: "1.2-4"
                 }}
@@ -803,21 +815,23 @@
             <ng-container matColumnDef="costo_banco">
               <th mat-header-cell *matHeaderCellDef>Costo banco</th>
               <td mat-cell *matCellDef="let row">
-                {{ row.costo_banco | number: "1.2-4" }}
+                
+                ${{ row.costo_banco | number: "1.2-4" }}
               </td>
               <td mat-footer-cell *matFooterCellDef>
-                $USD
-                {{ consolidado_proyeccion.total_costo_banco | number: "1.2-4" }}
+                
+                ${{ consolidado_proyeccion.total_costo_banco | number: "1.2-4" }}
               </td>
             </ng-container>
             <ng-container matColumnDef="otros_costos">
               <th mat-header-cell *matHeaderCellDef>Otros costos</th>
               <td mat-cell *matCellDef="let row">
-                {{ row.otros_costos | number: "1.2-4" }}
+                
+                ${{ row.otros_costos | number: "1.2-4" }}
               </td>
               <td mat-footer-cell *matFooterCellDef>
-                $USD
-                {{
+                
+                ${{
                   consolidado_proyeccion.total_otros_costos | number: "1.2-4"
                 }}
               </td>

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

@@ -461,7 +461,7 @@
             <ng-container matColumnDef="ingreso_neto">
               <th mat-header-cell *matHeaderCellDef>Ingreso neto</th>
               <td mat-cell *matCellDef="let row">
-                {{
+                ${{
                   row.ingreso_neto == "" || row.ingreso_neto == undefined
                     ? "0"
                     : (row.ingreso_neto | number: "1.2-4")
@@ -819,7 +819,7 @@
             <ng-container matColumnDef="ingreso_neto">
               <th mat-header-cell *matHeaderCellDef>Ingreso neto</th>
               <td mat-cell *matCellDef="let row">
-                {{
+                ${{
                   row.ingreso_neto == "" || row.ingreso_neto == undefined
                     ? "0"
                     : (row.ingreso_neto | number: "1.2-4")

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

@@ -1098,14 +1098,14 @@
             <ng-container matColumnDef="cuota">
               <th mat-header-cell *matHeaderCellDef>Cuota</th>
               <td mat-cell *matCellDef="let row">
-                {{
+                ${{
                   row.cuota == "" || row.cuota == undefined
                     ? "-"
                     : (row.cuota | number: "1.2-4")
                 }}
               </td>
               <td mat-footer-cell *matFooterCellDef>
-                $USD {{ consolidado_proyeccion.total_cuota | number: "1.2-4" }}
+                ${{ consolidado_proyeccion.total_cuota | number: "1.2-4" }}
               </td>
             </ng-container>
             <ng-container matColumnDef="amortizacion_porcentaje">
@@ -1116,7 +1116,7 @@
                   row.amortizacion_porcentaje == undefined
                     ? "-"
                     : (row.amortizacion_porcentaje | number: "1.2-4")
-                }}
+                }}%
               </td>
               <td mat-footer-cell *matFooterCellDef>
                 {{
@@ -1128,7 +1128,7 @@
             <ng-container matColumnDef="amortizacion_capital">
               <th mat-header-cell *matHeaderCellDef>Amortización capital</th>
               <td mat-cell *matCellDef="let row">
-                {{
+                ${{
                   row.amortizacion_capital == "" ||
                   row.amortizacion_capital == undefined
                     ? "-"
@@ -1136,8 +1136,8 @@
                 }}
               </td>
               <td mat-footer-cell *matFooterCellDef>
-                $USD
-                {{
+                
+                ${{
                   consolidado_proyeccion.total_amortizacion_capital
                     | number: "1.2-4"
                 }}
@@ -1146,15 +1146,15 @@
             <ng-container matColumnDef="ingreso_bruto">
               <th mat-header-cell *matHeaderCellDef>Ingreso bruto</th>
               <td mat-cell *matCellDef="let row">
-                {{
+                ${{
                   row.ingreso_bruto == "" || row.ingreso_bruto == undefined
                     ? "-"
                     : (row.ingreso_bruto | number: "1.2-4")
                 }}
               </td>
               <td mat-footer-cell *matFooterCellDef>
-                $USD
-                {{
+                
+                ${{
                   consolidado_proyeccion.total_ingreso_bruto | number: "1.2-4"
                 }}
               </td>
@@ -1162,29 +1162,29 @@
             <ng-container matColumnDef="renta">
               <th mat-header-cell *matHeaderCellDef>Renta</th>
               <td mat-cell *matCellDef="let row">
-                {{
+                ${{
                   row.renta == "" || row.renta == undefined
                     ? "-"
                     : (row.renta | number: "1.2-4")
                 }}
               </td>
               <td mat-footer-cell *matFooterCellDef>
-                $USD
-                {{ consolidado_proyeccion.total_renta | number: "1.2-4" }}
+                
+                ${{ consolidado_proyeccion.total_renta | number: "1.2-4" }}
               </td>
             </ng-container>
             <ng-container matColumnDef="ingreso_neto">
               <th mat-header-cell *matHeaderCellDef>Ingreso neto</th>
               <td mat-cell *matCellDef="let row">
-                {{
+                ${{
                   row.ingreso_neto == "" || row.ingreso_neto == undefined
                     ? "-"
                     : (row.ingreso_neto | number: "1.2-4")
                 }}
               </td>
               <td mat-footer-cell *matFooterCellDef>
-                $USD
-                {{
+                
+                ${{
                   consolidado_proyeccion.total_ingreso_neto | number: "1.2-4"
                 }}
               </td>
@@ -1193,14 +1193,14 @@
             <ng-container matColumnDef="saldo">
               <th mat-header-cell *matHeaderCellDef>Saldo</th>
               <td mat-cell *matCellDef="let row">
-                {{
+                ${{
                   row.saldo == "" || row.saldo == undefined
                     ? "-"
                     : (row.saldo | number: "1.2-4")
                 }}
               </td>
               <td mat-footer-cell *matFooterCellDef>
-                $USD {{ consolidado_proyeccion.total_saldo | number: "1.2-4" }}
+                ${{ consolidado_proyeccion.total_saldo | number: "1.2-4" }}
               </td>
             </ng-container>
 
@@ -1728,14 +1728,14 @@
             <ng-container matColumnDef="cuota">
               <th mat-header-cell *matHeaderCellDef>Cuota</th>
               <td mat-cell *matCellDef="let row">
-                {{
+                ${{
                   row.cuota == "" || row.cuota == undefined
                     ? "-"
                     : (row.cuota | number: "1.2-4")
                 }}
               </td>
               <td mat-footer-cell *matFooterCellDef>
-                $USD {{ consolidado_proyeccion.total_cuota | number: "1.2-4" }}
+                ${{ consolidado_proyeccion.total_cuota | number: "1.2-4" }}
               </td>
             </ng-container>
             <ng-container matColumnDef="amortizacion_porcentaje">
@@ -1746,7 +1746,7 @@
                   row.amortizacion_porcentaje == undefined
                     ? "-"
                     : (row.amortizacion_porcentaje | number: "1.2-4")
-                }}
+                }}%
               </td>
               <td mat-footer-cell *matFooterCellDef>
                 {{
@@ -1758,7 +1758,7 @@
             <ng-container matColumnDef="amortizacion_capital">
               <th mat-header-cell *matHeaderCellDef>Amortización capital</th>
               <td mat-cell *matCellDef="let row">
-                {{
+                ${{
                   row.amortizacion_capital == "" ||
                   row.amortizacion_capital == undefined
                     ? "-"
@@ -1766,7 +1766,7 @@
                 }}
               </td>
               <td mat-footer-cell *matFooterCellDef>
-                $USD{{
+                ${{
                   consolidado_proyeccion.total_amortizacion_capital
                     | number: "1.2-4"
                 }}
@@ -1775,14 +1775,14 @@
             <ng-container matColumnDef="ingreso_bruto">
               <th mat-header-cell *matHeaderCellDef>Ingreso bruto</th>
               <td mat-cell *matCellDef="let row">
-                {{
+                ${{
                   row.ingreso_bruto == "" || row.ingreso_bruto == undefined
                     ? "-"
                     : (row.ingreso_bruto | number: "1.2-4")
                 }}
               </td>
               <td mat-footer-cell *matFooterCellDef>
-                $USD{{
+                ${{
                   consolidado_proyeccion.total_ingreso_bruto | number: "1.2-4"
                 }}
               </td>
@@ -1790,27 +1790,27 @@
             <ng-container matColumnDef="renta">
               <th mat-header-cell *matHeaderCellDef>Renta</th>
               <td mat-cell *matCellDef="let row">
-                {{
+                ${{
                   row.renta == "" || row.renta == undefined
                     ? "-"
                     : (row.renta | number: "1.2-4")
                 }}
               </td>
               <td mat-footer-cell *matFooterCellDef>
-                $USD{{ consolidado_proyeccion.total_renta | number: "1.2-4" }}
+                ${{ consolidado_proyeccion.total_renta | number: "1.2-4" }}
               </td>
             </ng-container>
             <ng-container matColumnDef="ingreso_neto">
               <th mat-header-cell *matHeaderCellDef>Ingreso neto</th>
               <td mat-cell *matCellDef="let row">
-                {{
+                ${{
                   row.ingreso_neto == "" || row.ingreso_neto == undefined
                     ? "-"
                     : (row.ingreso_neto | number: "1.2-4")
                 }}
               </td>
               <td mat-footer-cell *matFooterCellDef>
-                $USD{{
+                ${{
                   consolidado_proyeccion.total_ingreso_neto | number: "1.2-4"
                 }}
               </td>
@@ -1819,14 +1819,14 @@
             <ng-container matColumnDef="saldo">
               <th mat-header-cell *matHeaderCellDef>Saldo</th>
               <td mat-cell *matCellDef="let row">
-                {{
+                ${{
                   row.saldo == "" || row.saldo == undefined
                     ? "-"
                     : (row.saldo | number: "1.2-4")
                 }}
               </td>
               <td mat-footer-cell *matFooterCellDef>
-                $USD{{ consolidado_proyeccion.total_saldo | number: "1.2-4" }}
+                ${{ consolidado_proyeccion.total_saldo | number: "1.2-4" }}
               </td>
             </ng-container>
 

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

@@ -456,15 +456,16 @@
             <ng-container matColumnDef="ingreso_bruto">
               <th mat-header-cell *matHeaderCellDef>Ingreso bruto</th>
               <td mat-cell *matCellDef="let row">
-                {{
+                
+                ${{
                   row.ingreso_bruto == "" || row.ingreso_bruto == undefined
                     ? "-"
                     : (row.ingreso_bruto | number: "1.2-4")
                 }}
               </td>
               <td mat-footer-cell *matFooterCellDef>
-                $USD
-                {{
+                
+                ${{
                   consolidado_proyeccion.total_ingreso_bruto | number: "1.2-4"
                 }}
               </td>
@@ -472,15 +473,16 @@
             <ng-container matColumnDef="ingreso_neto">
               <th mat-header-cell *matHeaderCellDef>Ingreso neto</th>
               <td mat-cell *matCellDef="let row">
-                {{
+                
+                ${{
                   row.ingreso_neto == "" || row.ingreso_neto == undefined
                     ? "-"
                     : (row.ingreso_neto | number: "1.2-4")
                 }}
               </td>
               <td mat-footer-cell *matFooterCellDef>
-                $USD
-                {{
+                
+                ${{
                   consolidado_proyeccion.total_ingreso_neto | number: "1.2-4"
                 }}
               </td>
@@ -488,11 +490,12 @@
             <ng-container matColumnDef="costo_cedeval">
               <th mat-header-cell *matHeaderCellDef>Costo CEDEVAL</th>
               <td mat-cell *matCellDef="let row">
-                {{ row.costo_cedeval | number: "1.2-4" }}
+                
+                ${{ row.costo_cedeval | number: "1.2-4" }}
               </td>
               <td mat-footer-cell *matFooterCellDef>
-                $USD
-                {{
+                
+                ${{
                   consolidado_proyeccion.total_costo_cedeval | number: "1.2-4"
                 }}
               </td>
@@ -500,20 +503,22 @@
             <ng-container matColumnDef="renta">
               <th mat-header-cell *matHeaderCellDef>Renta</th>
               <td mat-cell *matCellDef="let row">
-                {{ row.renta | number: "1.2-4" }}
+                
+                ${{ row.renta | number: "1.2-4" }}
               </td>
               <td mat-footer-cell *matFooterCellDef>
-                $USD {{ consolidado_proyeccion.total_renta | number: "1.2-4" }}
+                ${{ consolidado_proyeccion.total_renta | number: "1.2-4" }}
               </td>
             </ng-container>
             <ng-container matColumnDef="costo_transferencia">
               <th mat-header-cell *matHeaderCellDef>Costo transferencia</th>
               <td mat-cell *matCellDef="let row">
-                {{ row.costo_transferencia | number: "1.2-4" }}
+                
+                ${{ row.costo_transferencia | number: "1.2-4" }}
               </td>
               <td mat-footer-cell *matFooterCellDef>
-                $USD
-                {{
+                
+                ${{
                   consolidado_proyeccion.total_costo_transferencia
                     | number: "1.2-4"
                 }}
@@ -522,21 +527,23 @@
             <ng-container matColumnDef="costo_banco">
               <th mat-header-cell *matHeaderCellDef>Costo banco</th>
               <td mat-cell *matCellDef="let row">
-                {{ row.costo_banco | number: "1.2-4" }}
+                
+                ${{ row.costo_banco | number: "1.2-4" }}
               </td>
               <td mat-footer-cell *matFooterCellDef>
-                $USD
-                {{ consolidado_proyeccion.total_costo_banco | number: "1.2-4" }}
+                
+                ${{ consolidado_proyeccion.total_costo_banco | number: "1.2-4" }}
               </td>
             </ng-container>
             <ng-container matColumnDef="otros_costos">
               <th mat-header-cell *matHeaderCellDef>Otros costos</th>
               <td mat-cell *matCellDef="let row">
-                {{ row.otros_costos | number: "1.2-4" }}
+                
+                ${{ row.otros_costos | number: "1.2-4" }}
               </td>
               <td mat-footer-cell *matFooterCellDef>
-                $USD
-                {{
+                
+                ${{
                   consolidado_proyeccion.total_otros_costos | number: "1.2-4"
                 }}
               </td>
@@ -748,15 +755,16 @@
             <ng-container matColumnDef="ingreso_bruto">
               <th mat-header-cell *matHeaderCellDef>Ingreso bruto</th>
               <td mat-cell *matCellDef="let row">
-                {{
+                
+                ${{
                   row.ingreso_bruto == "" || row.ingreso_bruto == undefined
                     ? "-"
                     : (row.ingreso_bruto | number: "1.2-4")
                 }}
               </td>
               <td mat-footer-cell *matFooterCellDef>
-                $USD
-                {{
+                
+                ${{
                   consolidado_proyeccion.total_ingreso_bruto | number: "1.2-4"
                 }}
               </td>
@@ -764,15 +772,16 @@
             <ng-container matColumnDef="ingreso_neto">
               <th mat-header-cell *matHeaderCellDef>Ingreso neto</th>
               <td mat-cell *matCellDef="let row">
-                {{
+                
+                ${{
                   row.ingreso_neto == "" || row.ingreso_neto == undefined
                     ? "-"
                     : (row.ingreso_neto | number: "1.2-4")
                 }}
               </td>
               <td mat-footer-cell *matFooterCellDef>
-                $USD
-                {{
+                
+                ${{
                   consolidado_proyeccion.total_ingreso_neto | number: "1.2-4"
                 }}
               </td>
@@ -780,11 +789,12 @@
             <ng-container matColumnDef="costo_cedeval">
               <th mat-header-cell *matHeaderCellDef>Costo CEDEVAL</th>
               <td mat-cell *matCellDef="let row">
-                {{ row.costo_cedeval | number: "1.2-4" }}
+                
+                ${{ row.costo_cedeval | number: "1.2-4" }}
               </td>
               <td mat-footer-cell *matFooterCellDef>
-                $USD
-                {{
+                
+                ${{
                   consolidado_proyeccion.total_costo_cedeval | number: "1.2-4"
                 }}
               </td>
@@ -792,20 +802,22 @@
             <ng-container matColumnDef="renta">
               <th mat-header-cell *matHeaderCellDef>Renta</th>
               <td mat-cell *matCellDef="let row">
-                {{ row.renta | number: "1.2-4" }}
+                
+                ${{ row.renta | number: "1.2-4" }}
               </td>
               <td mat-footer-cell *matFooterCellDef>
-                $USD {{ consolidado_proyeccion.total_renta | number: "1.2-4" }}
+                ${{ consolidado_proyeccion.total_renta | number: "1.2-4" }}
               </td>
             </ng-container>
             <ng-container matColumnDef="costo_transferencia">
               <th mat-header-cell *matHeaderCellDef>Costo transferencia</th>
               <td mat-cell *matCellDef="let row">
-                {{ row.costo_transferencia | number: "1.2-4" }}
+                
+                ${{ row.costo_transferencia | number: "1.2-4" }}
               </td>
               <td mat-footer-cell *matFooterCellDef>
-                $USD
-                {{
+                
+                ${{
                   consolidado_proyeccion.total_costo_transferencia
                     | number: "1.2-4"
                 }}
@@ -814,21 +826,23 @@
             <ng-container matColumnDef="costo_banco">
               <th mat-header-cell *matHeaderCellDef>Costo banco</th>
               <td mat-cell *matCellDef="let row">
-                {{ row.costo_banco | number: "1.2-4" }}
+                
+                ${{ row.costo_banco | number: "1.2-4" }}
               </td>
               <td mat-footer-cell *matFooterCellDef>
-                $USD
-                {{ consolidado_proyeccion.total_costo_banco | number: "1.2-4" }}
+                
+                ${{ consolidado_proyeccion.total_costo_banco | number: "1.2-4" }}
               </td>
             </ng-container>
             <ng-container matColumnDef="otros_costos">
               <th mat-header-cell *matHeaderCellDef>Otros costos</th>
               <td mat-cell *matCellDef="let row">
-                {{ row.otros_costos | number: "1.2-4" }}
+                
+                ${{ row.otros_costos | number: "1.2-4" }}
               </td>
               <td mat-footer-cell *matFooterCellDef>
-                $USD
-                {{
+                
+                ${{
                   consolidado_proyeccion.total_otros_costos | number: "1.2-4"
                 }}
               </td>

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

@@ -50,7 +50,9 @@
                       <input
                         type="text"
                         formControlName="monto"
+                        [value]="investmentProposalForm.get('monto').value | numberPipe" 
                         class="form-control"
+                        (input)="inputValidator($event)"
                         [ngClass]="{
                           'is-invalid': submitted && f.monto.errors
                         }"

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

@@ -209,7 +209,8 @@ export class PaymentInfoComponent implements OnInit {
         this.inversionAmount,
         [
           Validators.required,
-          Validators.pattern(/^[+]?([0-9]+(?:[\.][0-9]*)?|\.[0-9]+)$/)
+          //Validators.pattern(/^[+]?([0-9]+(?:[\.][0-9]*)?|\.[0-9]+)$/)
+          Validators.pattern("^[0-9,.]+$")
         ]
       ],
       tipo_pago: ["", Validators.required],
@@ -237,6 +238,25 @@ export class PaymentInfoComponent implements OnInit {
     return this.investmentProposalForm.controls;
   }
 
+  clearValor(value,tipoDato){
+       value = parseFloat(value.toString().replace(",",""))        
+   return value;
+   }
+ 
+   public inputValidator(event: any) {
+     //console.log(event.target.value);
+     const pattern = /^[0-9]*$/;   
+     //let inputChar = String.fromCharCode(event.charCode)
+     
+     if (!pattern.test(event.target.value)) {
+ 
+       event.target.value = event.target.value.replace(/[^\d,.]+/g, '');
+       // invalid character, prevent input
+ 
+     }
+     
+   }
+
   nameBankAccounts(id: string) {
     let bank;
     bank = this.banks.find(e => e.id_banco == id);
@@ -245,6 +265,10 @@ export class PaymentInfoComponent implements OnInit {
 
   sendPaymentInfo(form: any) {
     this.submitted = true;
+
+    console.log(this.inversionAmount)
+    this.inversionAmount = this.clearValor(this.inversionAmount,"decimal")
+    console.log(this.inversionAmount)
     if (!form.valid) {
       return false;
     }

src/app/components/investments/costs/fondos/fondos.costs.component.html

@@ -249,6 +249,7 @@
                               <input
                                 type="text"
                                 formControlName="ingreso_bruto"
+                                [value]="group.get('ingreso_bruto').value | number: '1.2-4'"
                                 class="form-control"
                                 readonly
                               />
@@ -268,6 +269,7 @@
                               <input
                                 type="text"
                                 formControlName="ingreso_neto"
+                                [value]="group.get('ingreso_neto').value | number: '1.2-4'"
                                 class="form-control"
                                 readonly
                               />
@@ -288,9 +290,11 @@
                                 <i class="fas fa-percent"></i>
                               </p>
                               <input
-                                type="number"
+                                type="text"  
                                 formControlName="dividendo_porcentaje"
+                                [value]="group.get('dividendo_porcentaje').value | numberPipe" 
                                 class="form-control"
+                                (input)="inputValidator($event)"
                               />
                             </div>
                           </div>
@@ -299,7 +303,7 @@
                       <div class="costs-input-normal-container">
                         <div class="form-group">
                           <label for="rendimiento_porcentaje"
-                            >Rendimiento:
+                            >Rendimiento (%):
                           </label>
 
                           <div class="input-box-container">
@@ -308,9 +312,11 @@
                                 <i class="fas fa-percent"></i>
                               </p>
                               <input
-                                type="number"
+                                type="text"  
                                 formControlName="rendimiento_porcentaje"
+                                [value]="group.get('rendimiento_porcentaje').value | numberPipe" 
                                 class="form-control"
+                                (input)="inputValidator($event)"
                               />
                             </div>
                           </div>
@@ -328,6 +334,7 @@
                               <input
                                 type="number"
                                 formControlName="rendimiento"
+                                [value]="group.get('rendimiento').value | number: '1.2-4'"
                                 class="form-control"
                                 readonly
                               />

src/app/components/investments/costs/fondos/fondos.costs.component.ts

@@ -140,9 +140,43 @@ export class FINVCostsComponent implements OnInit {
       Swal.close();
     }, 1200);
   }
-
+  clearProyeccion(proyecciones,nombres,tipoDato){
+    let clearPro = []  
+ 
+     proyecciones.forEach(createNewProyeccion); 
+   
+    function createNewProyeccion(arrFila, index) {
+     nombres.forEach(loopNombres);
+    
+     function loopNombres(nombre, index) {
+ 
+       arrFila[nombre] = parseFloat(arrFila[nombre].toString().replace(",",""))        
+       } 
+       clearPro.push(arrFila)
+       
+     } 
+ 
+   return clearPro;
+   }
+ 
+   public inputValidator(event: any) {
+     //console.log(event.target.value);
+     const pattern = /^[0-9]*$/;   
+     //let inputChar = String.fromCharCode(event.charCode)
+     
+     if (!pattern.test(event.target.value)) {
+ 
+       event.target.value = event.target.value.replace(/[^\d,.]+/g, '');
+       // invalid character, prevent input
+ 
+     }
+     
+   }
   recalculateProjectionChanges() {
-    let objProjection = { proyecciones: this.form.value };
+    let nombresProyecciones = ["dividendo_porcentaje",
+                                "rendimiento_porcentaje"]
+    let clearPro = this.clearProyeccion(this.form.value,nombresProyecciones,"decimal")
+    let objProjection = { proyecciones: clearPro };
     Swal.fire({
       allowOutsideClick: false,
       icon: "info",

src/app/components/investments/costs/pbur/pbur.costs.component.html

@@ -231,6 +231,7 @@
                               <input
                                 type="text"
                                 formControlName="ingreso_bruto"
+                                [value]="group.get('ingreso_bruto').value | number: '1.2-4'"
                                 class="form-control"
                                 readonly
                               />
@@ -248,9 +249,11 @@
                                 <i class="fas fa-dollar-sign"></i>
                               </p>
                               <input
-                                type="number"
+                                type="text"   
                                 formControlName="costo_cedeval"
+                                [value]="group.get('costo_cedeval').value | numberPipe" 
                                 class="form-control"
+                                (input)="inputValidator($event)"
                               />
                             </div>
                           </div>
@@ -268,9 +271,11 @@
                                 <i class="fas fa-dollar-sign"></i>
                               </p>
                               <input
-                                type="number"
+                                type="text"   
                                 formControlName="costo_transferencia"
+                                [value]="group.get('costo_transferencia').value | numberPipe" 
                                 class="form-control"
+                                (input)="inputValidator($event)"
                               />
                             </div>
                           </div>
@@ -286,9 +291,11 @@
                                 <i class="fas fa-dollar-sign"></i>
                               </p>
                               <input
-                                type="number"
+                                type="text"   
                                 formControlName="costo_banco"
+                                [value]="group.get('costo_banco').value | numberPipe" 
                                 class="form-control"
+                                (input)="inputValidator($event)"
                               />
                             </div>
                           </div>
@@ -305,9 +312,11 @@
                                 <i class="fas fa-dollar-sign"></i>
                               </p>
                               <input
-                                type="number"
+                                type="text"   
                                 formControlName="otros_costos"
+                                [value]="group.get('otros_costos').value | numberPipe" 
                                 class="form-control"
+                                (input)="inputValidator($event)"
                               />
                             </div>
                           </div>
@@ -326,6 +335,7 @@
                                 type="text"
                                 formControlName="renta"
                                 class="form-control"
+                                [value]="group.get('renta').value | number: '1.2-4'"
                                 readonly
                               />
                             </div>
@@ -344,6 +354,7 @@
                               <input
                                 type="text"
                                 formControlName="ingreso_neto"
+                                [value]="group.get('ingreso_neto').value | number: '1.2-4'"
                                 class="form-control"
                                 readonly
                               />

src/app/components/investments/costs/pbur/pbur.costs.component.ts

@@ -229,9 +229,45 @@ export class PBURCostsComponent implements OnInit {
       Swal.close();
     }, 1200);
   }
-
+  clearProyeccion(proyecciones,nombres,tipoDato){
+    let clearPro = []  
+ 
+     proyecciones.forEach(createNewProyeccion); 
+   
+    function createNewProyeccion(arrFila, index) {
+     nombres.forEach(loopNombres);
+    
+     function loopNombres(nombre, index) {
+ 
+       arrFila[nombre] = parseFloat(arrFila[nombre].toString().replace(",",""))        
+       } 
+       clearPro.push(arrFila)
+       
+     } 
+ 
+   return clearPro;
+   }
+ 
+   public inputValidator(event: any) {
+     //console.log(event.target.value);
+     const pattern = /^[0-9]*$/;   
+     //let inputChar = String.fromCharCode(event.charCode)
+     
+     if (!pattern.test(event.target.value)) {
+ 
+       event.target.value = event.target.value.replace(/[^\d,.]+/g, '');
+       // invalid character, prevent input
+ 
+     }
+     
+   }
   recalculateProjectionChanges() {
-    let objProjection = { proyecciones: this.form.value };
+    let nombresProyecciones = ["costo_transferencia",
+                                "costo_cedeval",
+                                "costo_banco",
+                                "otros_costos"]
+    let clearPro = this.clearProyeccion(this.form.value,nombresProyecciones,"decimal")
+    let objProjection = { proyecciones: clearPro };
     Swal.fire({
       allowOutsideClick: false,
       icon: "info",

src/app/components/investments/costs/vcn/vcn.costs.component.html

@@ -47,6 +47,8 @@
                           {{ instrument_work.valor_nominal | number: "1.2-4" }}
                         </div>
                       </div>
+
+                      
                       <div class="col-lg-3 col-md-4 col-sm-6">
                         <h4>Valor transado:</h4>
                         <div class="field">
@@ -231,8 +233,10 @@
                               <input
                                 type="text"
                                 formControlName="ingreso_bruto"
+                                [value]="group.get('ingreso_bruto').value | number: '1.2-4'"
                                 class="form-control"
                                 readonly
+                               
                               />
                             </div>
                           </div>
@@ -248,9 +252,11 @@
                                 <i class="fas fa-dollar-sign"></i>
                               </p>
                               <input
-                                type="number"
+                                type="text" 
                                 formControlName="costo_cedeval"
+                                [value]="group.get('costo_cedeval').value | numberPipe" 
                                 class="form-control"
+                                (input)="inputValidator($event)"
                               />
                             </div>
                           </div>
@@ -268,10 +274,15 @@
                                 <i class="fas fa-dollar-sign"></i>
                               </p>
                               <input
-                                type="number"
+                                type="text"
+                               
                                 formControlName="costo_transferencia"
+                                [value]="group.get('costo_transferencia').value | numberPipe" 
                                 class="form-control"
+                                (input)="inputValidator($event)"
+                               
                               />
+                              
                             </div>
                           </div>
                         </div>
@@ -286,9 +297,11 @@
                                 <i class="fas fa-dollar-sign"></i>
                               </p>
                               <input
-                                type="number"
+                                type="text" 
                                 formControlName="costo_banco"
+                                [value]="group.get('costo_banco').value | numberPipe" 
                                 class="form-control"
+                                (input)="inputValidator($event)"
                               />
                             </div>
                           </div>
@@ -305,9 +318,11 @@
                                 <i class="fas fa-dollar-sign"></i>
                               </p>
                               <input
-                                type="number"
+                                type="text" 
                                 formControlName="otros_costos"
+                                [value]="group.get('otros_costos').value | numberPipe" 
                                 class="form-control"
+                                (input)="inputValidator($event)"
                               />
                             </div>
                           </div>
@@ -325,6 +340,7 @@
                               <input
                                 type="text"
                                 formControlName="renta"
+                                [value]="group.get('renta').value | number: '1.2-4'"
                                 class="form-control"
                                 readonly
                               />
@@ -344,6 +360,7 @@
                               <input
                                 type="text"
                                 formControlName="ingreso_neto"
+                                 [value]="group.get('ingreso_neto').value | number: '1.2-4'"
                                 class="form-control"
                                 readonly
                               />

src/app/components/investments/costs/vcn/vcn.costs.component.ts

@@ -28,7 +28,8 @@ import {
 })
 export class VCNCostsComponent implements OnInit {
   helper = new JwtHelperService();
-
+  price:string;
+  value:any;
   title: string = "Costos para valores comerciales";
 
   displayedColumns: string[] = [
@@ -229,9 +230,47 @@ export class VCNCostsComponent implements OnInit {
       Swal.close();
     }, 1200);
   }
+  clearProyeccion(proyecciones,nombres,tipoDato){
+   let clearPro = []  
+
+    proyecciones.forEach(createNewProyeccion); 
+  
+   function createNewProyeccion(arrFila, index) {
+    nombres.forEach(loopNombres);
+   
+    function loopNombres(nombre, index) {
+
+      arrFila[nombre] = parseFloat(arrFila[nombre].toString().replace(",",""))        
+      } 
+      clearPro.push(arrFila)
+      
+    } 
+
+  return clearPro;
+  }
+
+  public inputValidator(event: any) {
+    //console.log(event.target.value);
+    const pattern = /^[0-9]*$/;   
+    //let inputChar = String.fromCharCode(event.charCode)
+    
+    if (!pattern.test(event.target.value)) {
+
+      event.target.value = event.target.value.replace(/[^\d,.]+/g, '');
+      // invalid character, prevent input
+
+    }
+    
+  }
 
   recalculateProjectionChanges() {
-    let objProjection = { proyecciones: this.form.value };
+    let nombresProyecciones = ["costo_transferencia",
+                                "costo_cedeval",
+                                "costo_banco",
+                                "otros_costos"]
+    let clearPro = this.clearProyeccion(this.form.value,nombresProyecciones,"decimal")
+    let objProjection = { proyecciones: clearPro };
+    
     Swal.fire({
       allowOutsideClick: false,
       icon: "info",
@@ -253,6 +292,7 @@ export class VCNCostsComponent implements OnInit {
           this.proyecciones.pop();
           this.form.clear();
           this.form = new FormArray(this.buildForm(this.proyecciones));
+
           Swal.close();
           //window.location.reload();
         },
@@ -265,7 +305,7 @@ export class VCNCostsComponent implements OnInit {
         }
       );
   }
-
+ 
   saveProjection() {
     let objProjection = { proyecciones: this.form.value };
     Swal.fire({

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

@@ -62,6 +62,7 @@ import { InvestmentProposalDetailComponent } from "@app/components/investment-pr
 import { InvestmentProposalApproveComponent } from "@app/components/investment-proposals/approve/approve.component";
 import { DAPCostsComponent } from "@app/components/investments/costs/dap/dap.costs.component";
 import { VCNCostsComponent } from "@app/components/investments/costs/vcn/vcn.costs.component";
+import { NumberPipePipe } from "@app/components/extras/convert.dec.pipe";
 import { PBURCostsComponent } from "@app/components/investments/costs/pbur/pbur.costs.component";
 import { IncomesComponent } from "@app/components/incomes/incomes.component";
 
@@ -166,7 +167,8 @@ import { PPERCostsComponent } from "@app/components/investments/costs/pper/pper.
     GeneralIncomeFormComponent,
     PaymentApprovalComponent,
     UploadLiquidationComponent,
-    InvestmentPrint
+    InvestmentPrint,
+    NumberPipePipe
   ],
   entryComponents: [
     LETE,