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

@@ -316,15 +316,10 @@
                 {{
                   row.tasa_porcentaje == "" || row.tasa_porcentaje == undefined
                     ? "0"
-                    : row.tasa_porcentaje | number: "1.2-4"
-                }}%
-              </td>
-              <td mat-footer-cell *matFooterCellDef>
-                {{
-                  consolidado_proyeccion.total_tasa_porcentaje
-                    | number: "1.2-4"
+                    : (row.tasa_porcentaje | number: "1.2-4")
                 }}%
               </td>
+              <td mat-footer-cell *matFooterCellDef></td>
             </ng-container>
 
             <ng-container matColumnDef="ingreso_bruto">
@@ -333,7 +328,7 @@
                 ${{
                   row.ingreso_bruto == "" || row.ingreso_bruto == undefined
                     ? "0"
-                    : row.ingreso_bruto | number: "1.2-4"
+                    : (row.ingreso_bruto | number: "1.2-4")
                 }}
               </td>
               <td mat-footer-cell *matFooterCellDef>
@@ -349,7 +344,7 @@
                 ${{
                   row.ingreso_neto == "" || row.ingreso_neto == undefined
                     ? "0"
-                    : row.ingreso_neto | number: "1.2-4"
+                    : (row.ingreso_neto | number: "1.2-4")
                 }}
               </td>
               <td mat-footer-cell *matFooterCellDef>
@@ -362,7 +357,11 @@
             <ng-container matColumnDef="iva">
               <th mat-header-cell *matHeaderCellDef>IVA</th>
               <td mat-cell *matCellDef="let row">
-                ${{ row.iva == "" || row.iva == undefined ? "0" : row.iva | number: "1.2-4"}}
+                ${{
+                  row.iva == "" || row.iva == undefined
+                    ? "0"
+                    : (row.iva | number: "1.2-4")
+                }}
               </td>
               <td mat-footer-cell *matFooterCellDef>
                 ${{ consolidado_proyeccion.total_iva | number: "1.2-4" }}
@@ -393,7 +392,7 @@
                 ${{
                   row.monto_recibir == "" || row.monto_recibir == undefined
                     ? "0"
-                    : row.monto_recibir | number: "1.2-4"
+                    : (row.monto_recibir | number: "1.2-4")
                 }}
               </td>
               <td mat-footer-cell *matFooterCellDef>
@@ -404,13 +403,13 @@
             </ng-container>
 
             <ng-container matColumnDef="capital_restante">
-              <th mat-header-cell *matHeaderCellDef>Monto a recibir</th>
+              <th mat-header-cell *matHeaderCellDef>Capital restante</th>
               <td mat-cell *matCellDef="let row">
                 ${{
                   row.capital_restante == "" ||
                   row.capital_restante == undefined
                     ? "0"
-                    : row.capital_restante | number: "1.2-4"
+                    : (row.capital_restante | number: "1.2-4")
                 }}
               </td>
               <td mat-footer-cell *matFooterCellDef>
@@ -557,7 +556,7 @@
                 {{
                   row.tasa_porcentaje == "" || row.tasa_porcentaje == undefined
                     ? "0"
-                    : row.tasa_porcentaje | number: "1.2-4"
+                    : (row.tasa_porcentaje | number: "1.2-4")
                 }}%
               </td>
               <td mat-footer-cell *matFooterCellDef></td>
@@ -569,7 +568,7 @@
                 ${{
                   row.ingreso_bruto == "" || row.ingreso_bruto == undefined
                     ? "0"
-                    : row.ingreso_bruto | number: "1.2-4"
+                    : (row.ingreso_bruto | number: "1.2-4")
                 }}
               </td>
               <td mat-footer-cell *matFooterCellDef>
@@ -585,7 +584,7 @@
                 ${{
                   row.ingreso_neto == "" || row.ingreso_neto == undefined
                     ? "0"
-                    : row.ingreso_neto | number: "1.2-4"
+                    : (row.ingreso_neto | number: "1.2-4")
                 }}
               </td>
               <td mat-footer-cell *matFooterCellDef>
@@ -598,7 +597,11 @@
             <ng-container matColumnDef="iva">
               <th mat-header-cell *matHeaderCellDef>IVA</th>
               <td mat-cell *matCellDef="let row">
-                ${{ row.iva == "" || row.iva == undefined ? "0" : row.iva | number: "1.2-4"}}
+                ${{
+                  row.iva == "" || row.iva == undefined
+                    ? "0"
+                    : (row.iva | number: "1.2-4")
+                }}
               </td>
               <td mat-footer-cell *matFooterCellDef>
                 ${{ consolidado_proyeccion.total_iva | number: "1.2-4" }}
@@ -629,7 +632,7 @@
                 ${{
                   row.monto_recibir == "" || row.monto_recibir == undefined
                     ? "0"
-                    : row.monto_recibir | number: "1.2-4"
+                    : (row.monto_recibir | number: "1.2-4")
                 }}
               </td>
               <td mat-footer-cell *matFooterCellDef>
@@ -640,13 +643,13 @@
             </ng-container>
 
             <ng-container matColumnDef="capital_restante">
-              <th mat-header-cell *matHeaderCellDef>Monto a recibir</th>
+              <th mat-header-cell *matHeaderCellDef>Capital restante</th>
               <td mat-cell *matCellDef="let row">
                 ${{
                   row.capital_restante == "" ||
                   row.capital_restante == undefined
                     ? "0"
-                    : row.capital_restante | number: "1.2-4"
+                    : (row.capital_restante | number: "1.2-4")
                 }}
               </td>
               <td mat-footer-cell *matFooterCellDef>

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

@@ -151,9 +151,6 @@
               *ngIf="submitted && f.pago_seguro_dano.errors"
               class="invalid-feedback"
             >
-              <div *ngIf="f.pago_seguro_dano.errors.required">
-                Campo requerido
-              </div>
               <div *ngIf="f.pago_seguro_dano.errors.pattern">
                 Debe ingresar una cifra válida
               </div>
@@ -182,9 +179,6 @@
               *ngIf="submitted && f.pago_seguro_vivienda.errors"
               class="invalid-feedback"
             >
-              <div *ngIf="f.pago_seguro_vivienda.errors.required">
-                Campo requerido
-              </div>
               <div *ngIf="f.pago_seguro_vivienda.errors.pattern">
                 Debe ingresar una cifra válida
               </div>
@@ -193,8 +187,6 @@
         </div>
       </div>
 
-
-
       <!-- Total de cuotas mensuales -->
       <div class="col-lg-6 col-sm-12 pr-xl-3">
         <div class="form-group">
@@ -666,8 +658,6 @@
         </div>
       </div>
 
-
-
       <div class="col-lg-3 col-md-4 col-sm-6">
         <h4>IVA (%):</h4>
         <div class="field">

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

@@ -144,8 +144,6 @@ export class PPER implements InstrumentComponent {
     }
 
     this.investmentProposalForm = this.formBuilder.group({
-
-
       monto_prestamo: [
         this.instrument_exists ? "" : this.instrument_work.monto_prestamo,
         [
@@ -175,18 +173,12 @@ export class PPER implements InstrumentComponent {
         ]
       ],
       pago_seguro_dano: [
-        this.instrument_exists ? "" : this.instrument_work.pago_seguro_dano,
-        [
-          Validators.required,
-          Validators.pattern(/^[+]?([0-9]+(?:[\.][0-9]*)?|\.[0-9]+)$/)
-        ]
+        this.instrument_exists ? 0 : this.instrument_work.pago_seguro_dano,
+        [Validators.pattern(/^[+]?([0-9]+(?:[\.][0-9]*)?|\.[0-9]+)$/)]
       ],
       pago_seguro_vivienda: [
-        this.instrument_exists ? "" : this.instrument_work.pago_seguro_vivienda,
-        [
-          Validators.required,
-          Validators.pattern(/^[+]?([0-9]+(?:[\.][0-9]*)?|\.[0-9]+)$/)
-        ]
+        this.instrument_exists ? 0 : this.instrument_work.pago_seguro_vivienda,
+        [Validators.pattern(/^[+]?([0-9]+(?:[\.][0-9]*)?|\.[0-9]+)$/)]
       ],
       total_cuotas_mensuales: [
         this.instrument_exists

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

@@ -437,7 +437,7 @@ export class InvestmentProposalsComponent implements OnInit {
     this.reviewProposal = undefined;
     (async () => {
       Swal.fire({
-        title: `<h3>Finalizar propuesta de inversión: ${investmentCode}</h3>`,
+        title: `<h3>Finalizar inversión: ${investmentCode}</h3>`,
         icon: "info",
         input: "textarea",
         html: `<p style="text-align:left;">Comentario:</p>`,
@@ -462,7 +462,7 @@ export class InvestmentProposalsComponent implements OnInit {
           return false;
         }
         Swal.fire({
-          title: `<h3>Finalizar propuesta de inversión ${investmentCode}</h3>`,
+          title: `<h3>Finalizar inversión ${investmentCode}</h3>`,
           icon: "info",
           html: `${this.test}`,
           confirmButtonText: "Finalizar",
@@ -511,7 +511,7 @@ export class InvestmentProposalsComponent implements OnInit {
                     icon: "success",
                     showCancelButton: false,
                     title: "Exito",
-                    confirmButtonText: "La propuesta ha sido finalizada"
+                    confirmButtonText: "La inversión ha sido finalizada"
                   }).then(result => {
                     Swal.close();
                     window.location.reload();
@@ -522,7 +522,7 @@ export class InvestmentProposalsComponent implements OnInit {
                 if (err.code == 405) {
                   Swal.fire({
                     icon: "error",
-                    title: "Operacion no permitida",
+                    title: "Operación no permitida",
                     text: err.message
                   }).then(result => {
                     Swal.close();

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

@@ -30,7 +30,7 @@
           <div class="card borderless">
             <div class="card-header card-header-icon card-header-rose">
               <h4 class="card-title">
-                Resumen de la propuesta
+                Resumen de la inversión
               </h4>
             </div>
             <div class="card-body">
@@ -95,7 +95,7 @@
                       <div class="timeline-body">
                         <div class="row">
                           <div class="col-sm-6">
-                            <h4>Código de la propuesta de inversión:</h4>
+                            <h4>Código de la inversión:</h4>
                             <div class="field">{{ codigo_inversion }}</div>
                           </div>
                           <div class="col-sm-6">

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

@@ -23,7 +23,7 @@ import { InvestmentsService } from "@app/services/investments.service";
   styleUrls: ["./payment-approval.component.scss"]
 })
 export class PaymentApprovalComponent implements OnInit {
-  title = "Aprobación de propuesta";
+  title = "Aprobación de inversión";
   @Input() ads: Instrument[];
   @Input() formData: InvestmentProposalForm;
   @ViewChild(InstrumentDirective, { static: true })

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

@@ -107,14 +107,24 @@
                           type="file"
                           name="evidencia"
                           (change)="fileProgress($event)"
+                          [ngClass]="{
+                            'is-invalid': submitted && fileData == null
+                          }"
                         />
+                        <div
+                          *ngIf="submitted && fileData == null"
+                          class="invalid-feedback"
+                        >
+                          <div>
+                            Archivo requerido
+                          </div>
+                        </div>
                       </div>
-                      <br />
                       <div *ngIf="fileUploadProgress">
                         Progreso: {{ fileUploadProgress }}
                       </div>
                       <div class="image-preview mb-3" *ngIf="previewUrl">
-                        <img [src]="previewUrl" height="300" />
+                        <img [src]="previewUrl" height="300" width="300" />
                       </div>
 
                       <div class="mb-3" *ngIf="uploadedFilePath">
@@ -141,14 +151,13 @@
                               'is-invalid': submitted && f.fecha_pago.errors
                             }"
                           />
-                        </div>
-
-                        <div
-                          *ngIf="submitted && f.fecha_pago.errors"
-                          class="invalid-feedback"
-                        >
-                          <div *ngIf="f.fecha_pago.errors.required">
-                            Campo requerido
+                          <div
+                            *ngIf="submitted && f.fecha_pago.errors"
+                            class="invalid-feedback"
+                          >
+                            <div>
+                              Campo requerido
+                            </div>
                           </div>
                         </div>
                       </div>

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

@@ -197,7 +197,8 @@ export class PaymentRequirementComponent implements OnInit {
 
   onSubmit(form: any) {
     this.submitted = true;
-    if (!form.valid) {
+
+    if (!form.valid && this.fileData == null) {
       return false;
     }