Kaynağa Gözat

Formato input fin

ahernandez 5 yıl önce
ebeveyn
işleme
5fecc3e6ee

+ 0 - 0
src/app/components/investments/extras/convert.dec.pipe.ts → src/app/components/extras/convert.dec.pipe.ts


+ 6 - 0
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

+ 34 - 7
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,

+ 2 - 0
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
                         }"

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

@@ -192,7 +192,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],
@@ -220,6 +221,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);
@@ -228,6 +248,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;
     }

+ 1 - 1
src/app/layouts/admin/admin.module.ts

@@ -62,7 +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/investments/extras/convert.dec.pipe";
+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";