correcciones

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

@@ -50,7 +50,12 @@
                       {{ projectionRes.tipo_instrumento }}
                     </div>
                   </div>
-
+                  <div class="col-lg-3 col-md-4 col-sm-6">
+                    <h4>Estado:</h4>
+                    <div class="field">
+                      {{ projectionRes.estado }}
+                    </div>
+                  </div>
                   <div class="col-lg-3 col-md-4 col-sm-6">
                     <h4>Capital:</h4>
                     <div class="field">
@@ -80,272 +85,284 @@
 
               <br />
               <br />
-              <h4 class="card-title">
-                Formulario para ingreso
-              </h4>
+              <div *ngIf="!has_conciliate">
+                <h4 class="card-title">
+                  Formulario para ingreso
+                </h4>
 
-              <div class="align-container">
-                <form
-                  class="form-auth-small ng-untouched ng-pristine ng-valid"
-                  [formGroup]="investmentProposalForm"
-                >
-                  <div class="row">
-                    <!-- Valor nominal -->
-                    <div class="col-lg-6 col-sm-12 pr-xl-3">
-                      <div class="form-group">
-                        <label for="capital">Capital: </label>
-                        <div class="input-box-container">
-                          <p>
-                            <i class="fas fa-dollar-sign"></i>
-                          </p>
-                          <input
-                            type="text"
-                            formControlName="capital"
-                            class="form-control"
-                            [ngClass]="{
-                              'is-invalid': submitted && f.capital.errors
-                            }"
-                          />
-                          <div
-                            *ngIf="submitted && f.capital.errors"
-                            class="invalid-feedback"
-                          >
-                            <div *ngIf="f.capital.errors.required">
-                              Campo requerido
-                            </div>
-                            <div *ngIf="f.capital.errors.pattern">
-                              Debe ingresar una cifra válida
+                <div class="align-container">
+                  <form
+                    class="form-auth-small ng-untouched ng-pristine ng-valid"
+                    [formGroup]="investmentProposalForm"
+                  >
+                    <div class="row">
+                      <!-- Valor nominal -->
+                      <div class="col-lg-6 col-sm-12 pr-xl-3">
+                        <div class="form-group">
+                          <label for="capital">Capital: </label>
+                          <div class="input-box-container">
+                            <p>
+                              <i class="fas fa-dollar-sign"></i>
+                            </p>
+                            <input
+                              type="text"
+                              formControlName="capital"
+                              class="form-control"
+                              [ngClass]="{
+                                'is-invalid': submitted && f.capital.errors
+                              }"
+                            />
+                            <div
+                              *ngIf="submitted && f.capital.errors"
+                              class="invalid-feedback"
+                            >
+                              <div *ngIf="f.capital.errors.required">
+                                Campo requerido
+                              </div>
+                              <div *ngIf="f.capital.errors.pattern">
+                                Debe ingresar una cifra válida
+                              </div>
                             </div>
                           </div>
                         </div>
                       </div>
-                    </div>
 
-                    <!-- Valor nominal -->
-                    <div class="col-lg-6 col-sm-12 pr-xl-3">
-                      <div class="form-group">
-                        <label for="ingreso_bruto">Ingreso bruto: </label>
-                        <div class="input-box-container">
-                          <p>
-                            <i class="fas fa-dollar-sign"></i>
-                          </p>
-                          <input
-                            type="text"
-                            formControlName="ingreso_bruto"
-                            class="form-control"
-                            [ngClass]="{
-                              'is-invalid': submitted && f.ingreso_bruto.errors
-                            }"
-                          />
-                          <div
-                            *ngIf="submitted && f.ingreso_bruto.errors"
-                            class="invalid-feedback"
-                          >
-                            <div *ngIf="f.ingreso_bruto.errors.required">
-                              Campo requerido
-                            </div>
-                            <div *ngIf="f.ingreso_bruto.errors.pattern">
-                              Debe ingresar una cifra válida
+                      <!-- Valor nominal -->
+                      <div class="col-lg-6 col-sm-12 pr-xl-3">
+                        <div class="form-group">
+                          <label for="ingreso_bruto">Ingreso bruto: </label>
+                          <div class="input-box-container">
+                            <p>
+                              <i class="fas fa-dollar-sign"></i>
+                            </p>
+                            <input
+                              type="text"
+                              formControlName="ingreso_bruto"
+                              class="form-control"
+                              [ngClass]="{
+                                'is-invalid':
+                                  submitted && f.ingreso_bruto.errors
+                              }"
+                            />
+                            <div
+                              *ngIf="submitted && f.ingreso_bruto.errors"
+                              class="invalid-feedback"
+                            >
+                              <div *ngIf="f.ingreso_bruto.errors.required">
+                                Campo requerido
+                              </div>
+                              <div *ngIf="f.ingreso_bruto.errors.pattern">
+                                Debe ingresar una cifra válida
+                              </div>
                             </div>
                           </div>
                         </div>
                       </div>
-                    </div>
 
-                    <!-- Valor nominal -->
-                    <div class="col-lg-6 col-sm-12 pr-xl-3">
-                      <div class="form-group">
-                        <label for="ingreso_neto">Ingreso neto: </label>
-                        <div class="input-box-container">
-                          <p>
-                            <i class="fas fa-dollar-sign"></i>
-                          </p>
-                          <input
-                            type="text"
-                            formControlName="ingreso_neto"
-                            class="form-control"
-                            [ngClass]="{
-                              'is-invalid': submitted && f.ingreso_neto.errors
-                            }"
-                          />
-                          <div
-                            *ngIf="submitted && f.ingreso_neto.errors"
-                            class="invalid-feedback"
-                          >
-                            <div *ngIf="f.ingreso_neto.errors.required">
-                              Campo requerido
-                            </div>
-                            <div *ngIf="f.ingreso_neto.errors.pattern">
-                              Debe ingresar una cifra válida
+                      <!-- Valor nominal -->
+                      <div class="col-lg-6 col-sm-12 pr-xl-3">
+                        <div class="form-group">
+                          <label for="ingreso_neto">Ingreso neto: </label>
+                          <div class="input-box-container">
+                            <p>
+                              <i class="fas fa-dollar-sign"></i>
+                            </p>
+                            <input
+                              type="text"
+                              formControlName="ingreso_neto"
+                              class="form-control"
+                              [ngClass]="{
+                                'is-invalid': submitted && f.ingreso_neto.errors
+                              }"
+                            />
+                            <div
+                              *ngIf="submitted && f.ingreso_neto.errors"
+                              class="invalid-feedback"
+                            >
+                              <div *ngIf="f.ingreso_neto.errors.required">
+                                Campo requerido
+                              </div>
+                              <div *ngIf="f.ingreso_neto.errors.pattern">
+                                Debe ingresar una cifra válida
+                              </div>
                             </div>
                           </div>
                         </div>
                       </div>
                     </div>
-                  </div>
-                  <br />
-                  <div class="row">
-                    <div class="col-12">
-                      <div class="custom-control custom-switch">
-                        <input
-                          type="checkbox"
-                          class="custom-control-input"
-                          id="customSwitch1"
-                          (click)="toggle()"
-                        />
-                        <label class="custom-control-label" for="customSwitch1"
-                          >Ingreso parcial</label
-                        >
+                    <br />
+                    <div class="row">
+                      <div class="col-12">
+                        <div class="custom-control custom-switch">
+                          <input
+                            type="checkbox"
+                            class="custom-control-input"
+                            id="customSwitch1"
+                            (click)="toggle()"
+                          />
+                          <label
+                            class="custom-control-label"
+                            for="customSwitch1"
+                            >Ingreso parcial</label
+                          >
+                        </div>
                       </div>
-                    </div>
-                    <div class="col-lg-6 col-sm-12 pr-xl-3" *ngIf="partial">
-                      <div class="form-group">
-                        <label for="fecha_inicio">Fecha inicio: </label>
+                      <div class="col-lg-6 col-sm-12 pr-xl-3" *ngIf="partial">
+                        <div class="form-group">
+                          <label for="fecha_inicio">Fecha inicio: </label>
 
-                        <div class="input-box-container">
-                          <div>
-                            <p>
-                              <i class="far fa-calendar" aria-hidden="true"></i>
-                            </p>
-                            <input
-                              class="input-box form-control"
-                              placeholder="Seleccione una fecha"
-                              angular-mydatepicker
-                              formControlName="fecha_inicio"
-                              (click)="dp0.toggleCalendar()"
-                              [options]="myDpOptions"
-                              #dp0="angular-mydatepicker"
-                            />
+                          <div class="input-box-container">
+                            <div>
+                              <p>
+                                <i
+                                  class="far fa-calendar"
+                                  aria-hidden="true"
+                                ></i>
+                              </p>
+                              <input
+                                class="input-box form-control"
+                                placeholder="Seleccione una fecha"
+                                angular-mydatepicker
+                                formControlName="fecha_inicio"
+                                (click)="dp0.toggleCalendar()"
+                                [options]="myDpOptions"
+                                #dp0="angular-mydatepicker"
+                              />
+                            </div>
                           </div>
                         </div>
                       </div>
-                    </div>
-                    <div class="col-lg-6 col-sm-12 pr-xl-3" *ngIf="partial">
-                      <div class="form-group">
-                        <label for="fecha_vencimiento"
-                          >Fecha vencimiento:
-                        </label>
+                      <div class="col-lg-6 col-sm-12 pr-xl-3" *ngIf="partial">
+                        <div class="form-group">
+                          <label for="fecha_vencimiento"
+                            >Fecha vencimiento:
+                          </label>
 
-                        <div class="input-box-container">
-                          <div>
-                            <p>
-                              <i class="far fa-calendar" aria-hidden="true"></i>
-                            </p>
-                            <input
-                              class="input-box form-control"
-                              placeholder="Seleccione una fecha"
-                              angular-mydatepicker
-                              formControlName="fecha_vencimiento"
-                              (click)="dp0.toggleCalendar()"
-                              [options]="myDpOptions"
-                              #dp0="angular-mydatepicker"
-                            />
+                          <div class="input-box-container">
+                            <div>
+                              <p>
+                                <i
+                                  class="far fa-calendar"
+                                  aria-hidden="true"
+                                ></i>
+                              </p>
+                              <input
+                                class="input-box form-control"
+                                placeholder="Seleccione una fecha"
+                                angular-mydatepicker
+                                formControlName="fecha_vencimiento"
+                                (click)="dp0.toggleCalendar()"
+                                [options]="myDpOptions"
+                                #dp0="angular-mydatepicker"
+                              />
+                            </div>
                           </div>
                         </div>
                       </div>
                     </div>
-                  </div>
-                  <div class="row">
-                    <div class="col-lg-6 col-sm-12 pr-xl-3">
-                      <div class="form-group">
-                        <label for="payment_types">Tipo pago: </label>
+                    <div class="row">
+                      <div class="col-lg-6 col-sm-12 pr-xl-3">
+                        <div class="form-group">
+                          <label for="payment_types">Tipo pago: </label>
 
-                        <select
-                          class="custom-select"
-                          formControlName="tipo_pago"
-                          [ngClass]="{
-                            'is-invalid': submitted && f.tipo_pago.errors
-                          }"
-                        >
-                          <option
-                            *ngFor="let item of payment_types"
-                            [value]="item.id_tipo_pago"
+                          <select
+                            class="custom-select"
+                            formControlName="tipo_pago"
+                            [ngClass]="{
+                              'is-invalid': submitted && f.tipo_pago.errors
+                            }"
                           >
-                            {{ item.nombre }}</option
+                            <option
+                              *ngFor="let item of payment_types"
+                              [value]="item.id_tipo_pago"
+                            >
+                              {{ item.nombre }}</option
+                            >
+                          </select>
+                          <div
+                            *ngIf="submitted && f.tipo_pago.errors"
+                            class="invalid-feedback"
                           >
-                        </select>
-                        <div
-                          *ngIf="submitted && f.tipo_pago.errors"
-                          class="invalid-feedback"
-                        >
-                          <div *ngIf="f.tipo_pago.errors.required">
-                            Campo requerido
+                            <div *ngIf="f.tipo_pago.errors.required">
+                              Campo requerido
+                            </div>
                           </div>
                         </div>
                       </div>
-                    </div>
 
-                    <div class="col-lg-6 col-sm-12 pr-xl-3">
-                      <div class="form-group">
-                        <label for="cuenta_bancaria">Cuenta bancaria: </label>
+                      <div class="col-lg-6 col-sm-12 pr-xl-3">
+                        <div class="form-group">
+                          <label for="cuenta_bancaria">Cuenta bancaria: </label>
 
-                        <select
-                          class="custom-select"
-                          formControlName="cuenta_bancaria"
-                          [ngClass]="{
-                            'is-invalid': submitted && f.cuenta_bancaria.errors
-                          }"
-                        >
-                          <option
-                            *ngFor="let item of accounts"
-                            [value]="item.id_cuenta_bancaria"
+                          <select
+                            class="custom-select"
+                            formControlName="cuenta_bancaria"
+                            [ngClass]="{
+                              'is-invalid':
+                                submitted && f.cuenta_bancaria.errors
+                            }"
                           >
-                            {{ nameBankAccounts(item.id_banco) }} -
-                            {{ item.nombre }}</option
+                            <option
+                              *ngFor="let item of accounts"
+                              [value]="item.id_cuenta_bancaria"
+                            >
+                              {{ nameBankAccounts(item.id_banco) }} -
+                              {{ item.nombre }}</option
+                            >
+                          </select>
+                          <div
+                            *ngIf="submitted && f.cuenta_bancaria.errors"
+                            class="invalid-feedback"
                           >
-                        </select>
-                        <div
-                          *ngIf="submitted && f.cuenta_bancaria.errors"
-                          class="invalid-feedback"
-                        >
-                          <div *ngIf="f.cuenta_bancaria.errors.required">
-                            Campo requerido
+                            <div *ngIf="f.cuenta_bancaria.errors.required">
+                              Campo requerido
+                            </div>
                           </div>
                         </div>
                       </div>
-                    </div>
 
-                    <div class="col-lg-6 col-sm-12 pr-xl-3">
-                      <div class="form-group">
-                        <label for="comentario">Comentarios: </label>
+                      <div class="col-lg-6 col-sm-12 pr-xl-3">
+                        <div class="form-group">
+                          <label for="comentario">Comentarios: </label>
 
-                        <textarea
-                          rows="2"
-                          class="form-control"
-                          formControlName="comentario"
-                        ></textarea>
-                        <div
-                          *ngIf="submitted && f.comentario.errors"
-                          class="invalid-feedback"
-                        >
-                          <div *ngIf="f.comentario.errors.required">
-                            Campo requerido
+                          <textarea
+                            rows="2"
+                            class="form-control"
+                            formControlName="comentario"
+                          ></textarea>
+                          <div
+                            *ngIf="submitted && f.comentario.errors"
+                            class="invalid-feedback"
+                          >
+                            <div *ngIf="f.comentario.errors.required">
+                              Campo requerido
+                            </div>
                           </div>
                         </div>
                       </div>
-                    </div>
 
-                    <div class="col-lg-12 col-sm-12 pr-xl-12">
-                      <br />
-                      <button
-                        class="btn btn-primary center-component float-left"
-                        type="button"
-                        [disabled]="cantConciliate"
-                        (click)="conciliateIncome()"
-                      >
-                        Conciliar ingreso
-                      </button>
-                      <button
-                        class="btn btn-success center-component float-right"
-                        type="submit"
-                        (click)="submitIncome(investmentProposalForm)"
-                      >
-                        Guardar información de ingreso
-                      </button>
+                      <div class="col-lg-12 col-sm-12 pr-xl-12">
+                        <br />
+                        <button
+                          class="btn btn-primary center-component float-left"
+                          type="button"
+                          [disabled]="cantConciliate"
+                          (click)="conciliateIncome()"
+                        >
+                          Conciliar ingreso
+                        </button>
+                        <button
+                          class="btn btn-success center-component float-right"
+                          type="submit"
+                          (click)="submitIncome(investmentProposalForm)"
+                        >
+                          Guardar información de ingreso
+                        </button>
+                      </div>
                     </div>
-                  </div>
-                </form>
-                <br />
+                  </form>
+                  <br />
+                </div>
               </div>
             </div>
           </div>

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

@@ -116,6 +116,7 @@ export class GeneralIncomeFormComponent implements OnInit {
   idProjection: any;
   cantConciliate: boolean = true;
   conciliateObject: any;
+  has_conciliate: boolean;
 
   constructor(
     private catalogService: CatalogsService,
@@ -171,12 +172,14 @@ export class GeneralIncomeFormComponent implements OnInit {
           this.projection_exists = true;
           this.projectionRes = res["result"][0];
 
+          if (this.projectionRes.estado == "CONCILIADO") {
+            this.has_conciliate = true;
+          }
+
           if (this.projectionRes.estado == "NO CONCILIADO") {
             this.cantConciliate = false;
           }
 
-          console.log("proyeccion");
-          console.log(this.projectionRes);
           this.investmentProposalForm.setValue({
             capital: this.projectionRes.capital,
             ingreso_bruto: this.projectionRes.ingreso_bruto,
@@ -265,8 +268,6 @@ export class GeneralIncomeFormComponent implements OnInit {
 
   submitIncome(form: any) {
     this.submitted = true;
-    console.log(form);
-    console.log(this.idProjection);
     if (!form.valid) {
       return false;
     }
@@ -284,7 +285,6 @@ export class GeneralIncomeFormComponent implements OnInit {
       id_tipo_pago: form.value.tipo_pago,
       comentario: form.value.comentario
     };
-    console.log("test");
 
     if (this.idProjection != undefined) {
       this.incomeObject["id_proyeccion_ingreso"] = this.idProjection;

src/app/components/incomes/incomes.component.ts

@@ -171,7 +171,7 @@ export class IncomesComponent implements OnInit {
 
     let active = event.target.value;
 
-    this.incomesService.getProjectionsIncomeList(active).subscribe(
+    this.incomesService.getProjectionsIncomeList(active, "0").subscribe(
       ans => {
         this.listProposals = ans["result"];
         this.dataSource.data = this.listProposals;

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

@@ -189,6 +189,7 @@
                                 type="text"
                                 formControlName="plazo"
                                 class="form-control"
+                                readonly
                               />
                             </div>
                           </div>
@@ -211,6 +212,7 @@
                                 type="text"
                                 formControlName="fecha_pago"
                                 class="form-control"
+                                readonly
                               />
                             </div>
                           </div>
@@ -219,7 +221,7 @@
 
                       <div class="costs-input-normal-container">
                         <div class="form-group">
-                          <label for="monto">Monto: </label>
+                          <label for="ingreso_bruto">Ingreso bruto: </label>
 
                           <div class="input-box-container">
                             <div>
@@ -228,8 +230,9 @@
                               </p>
                               <input
                                 type="text"
-                                formControlName="monto"
+                                formControlName="ingreso_bruto"
                                 class="form-control"
+                                readonly
                               />
                             </div>
                           </div>
@@ -245,7 +248,7 @@
                                 <i class="fas fa-dollar-sign"></i>
                               </p>
                               <input
-                                type="text"
+                                type="number"
                                 formControlName="costo_cedeval"
                                 class="form-control"
                               />
@@ -265,7 +268,7 @@
                                 <i class="fas fa-dollar-sign"></i>
                               </p>
                               <input
-                                type="text"
+                                type="number"
                                 formControlName="costo_transferencia"
                                 class="form-control"
                               />
@@ -283,7 +286,7 @@
                                 <i class="fas fa-dollar-sign"></i>
                               </p>
                               <input
-                                type="text"
+                                type="number"
                                 formControlName="costo_banco"
                                 class="form-control"
                               />
@@ -302,7 +305,7 @@
                                 <i class="fas fa-dollar-sign"></i>
                               </p>
                               <input
-                                type="text"
+                                type="number"
                                 formControlName="otros_costos"
                                 class="form-control"
                               />
@@ -323,6 +326,7 @@
                                 type="text"
                                 formControlName="renta"
                                 class="form-control"
+                                readonly
                               />
                             </div>
                           </div>
@@ -341,6 +345,7 @@
                                 type="text"
                                 formControlName="ingreso_neto"
                                 class="form-control"
+                                readonly
                               />
                             </div>
                           </div>

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

@@ -189,6 +189,7 @@
                                 type="text"
                                 formControlName="plazo"
                                 class="form-control"
+                                readonly
                               />
                             </div>
                           </div>
@@ -211,6 +212,7 @@
                                 type="text"
                                 formControlName="fecha_pago"
                                 class="form-control"
+                                readonly
                               />
                             </div>
                           </div>
@@ -219,7 +221,7 @@
 
                       <div class="costs-input-normal-container">
                         <div class="form-group">
-                          <label for="monto">Monto: </label>
+                          <label for="ingreso_bruto">Ingreso bruto: </label>
 
                           <div class="input-box-container">
                             <div>
@@ -228,8 +230,9 @@
                               </p>
                               <input
                                 type="text"
-                                formControlName="monto"
+                                formControlName="ingreso_bruto"
                                 class="form-control"
+                                readonly
                               />
                             </div>
                           </div>
@@ -245,7 +248,7 @@
                                 <i class="fas fa-dollar-sign"></i>
                               </p>
                               <input
-                                type="text"
+                                type="number"
                                 formControlName="costo_cedeval"
                                 class="form-control"
                               />
@@ -265,7 +268,7 @@
                                 <i class="fas fa-dollar-sign"></i>
                               </p>
                               <input
-                                type="text"
+                                type="number"
                                 formControlName="costo_transferencia"
                                 class="form-control"
                               />
@@ -283,7 +286,7 @@
                                 <i class="fas fa-dollar-sign"></i>
                               </p>
                               <input
-                                type="text"
+                                type="number"
                                 formControlName="costo_banco"
                                 class="form-control"
                               />
@@ -302,7 +305,7 @@
                                 <i class="fas fa-dollar-sign"></i>
                               </p>
                               <input
-                                type="text"
+                                type="number"
                                 formControlName="otros_costos"
                                 class="form-control"
                               />
@@ -323,6 +326,7 @@
                                 type="text"
                                 formControlName="renta"
                                 class="form-control"
+                                readonly
                               />
                             </div>
                           </div>
@@ -341,6 +345,7 @@
                                 type="text"
                                 formControlName="ingreso_neto"
                                 class="form-control"
+                                readonly
                               />
                             </div>
                           </div>