Merge pull request #148 from Quantum-P3/qa

deploy

src/main/resources/i18n/messages.properties

@@ -68,7 +68,7 @@ email.deleteColaborator.text2=Saludos,
 
 email.receipt.title=Comprobante de pago
 email.receipt.user={0}
-email.receipt.fecha={0}
+email.receipt.fecha=Fecha de pago: {0}
 email.receipt.plantilla={0}
 email.receipt.precio=${0}
 

src/main/resources/templates/mail/facturaPayPalEmail.html

@@ -135,11 +135,9 @@
           <div class="page-content container">
             <div class="container px-0">
               <div class="row mt-4">
-                <div class="col-12 col-lg-10 offset-lg-1">
+                <div>
                   <!-- .row -->
 
-                  <hr class="row brc-default-l1 mx-n1 mb-4" />
-
                   <div class="row">
                     <div class="col-sm-6">
                       <div>
@@ -153,21 +151,44 @@
                     <!-- /.col -->
 
                     <div class="text-95 col-sm-6 align-self-start d-sm-flex justify-content-end">
-                      <hr class="d-sm-none" />
                       <div class="text-grey-m2">
                         <div class="my-2">
-                          <i class="fa fa-circle text-blue-m2 text-xs mr-1"></i>
+                          <i class="text-blue-m2 text-xs mr-1"></i>
                           <span class="text-600 text-90" th:text="#{email.receipt.fecha(${factura.getFecha()}, 'dd-MM-yyyy HH:mm' )}"
                             >Fecha:</span
                           >
                         </div>
                       </div>
                     </div>
+
+                    <hr class="d-sm-none" />
                     <!-- /.col -->
                   </div>
 
-                  <div class="mt-4">
+                  <div class="container">
-                    <div class="row text-600 text-white bgc-default-tp1 py-25">
+                    <div class="row">
+                      <div class="col-lg-10 mt-5 mb-5">
+                        <table class="table table-bordered" style="width: 100%">
+                          <thead>
+                            <tr class="text-uppercase font-weight-bold text-blue">
+                              <th>Plantilla</th>
+                              <th>Cantidad</th>
+                              <th>Precio</th>
+                            </tr>
+                          </thead>
+
+                          <tbody style="text-align: center">
+                            <tr class="text-95 text-secondary-d3">
+                              <td th:text="#{email.receipt.plantilla(${factura.getNombrePlantilla()})}"></td>
+                              <td>1</td>
+                              <td th:text="#{email.receipt.precio(${factura.getCosto()})}"></td>
+                            </tr>
+                          </tbody>
+                        </table>
+
+                        <hr />
+
+                        <!-- <div class="row text-600 text-white bgc-default-tp1 d-flex flex-row" >
                            <div class="col-9 col-sm-5">Plantilla</div>
                            <div class="d-none d-sm-block col-4 col-sm-2">Cantidad</div>
                            <div class="d-none d-sm-block col-sm-2">Precio</div>
@@ -179,13 +200,15 @@
                              <div class="d-none d-sm-block col-2">1</div>
                              <div class="d-none d-sm-block col-2 text-95" th:text="#{email.receipt.precio(${factura.getCosto()})}"></div>
                            </div>
+                         </div>-->
+                      </div>
                     </div>
                   </div>
 
                   <div class="row mt-3">
                     <div class="col-12 col-sm-5 text-grey text-90 order-first order-sm-last">
                       <div class="row my-2 align-items-center bgc-primary-l3 p-2">
-                        <div class="col-7 text-right">Monto total</div>
+                        <div class="col-7 text-600 text-110 text-blue text-right">Monto total:</div>
                         <div class="col-5">
                           <span class="text-150 text-success-d3 opacity-2" th:text="#{email.receipt.precio(${factura.getCosto()})}"></span>
                         </div>

src/main/webapp/app/entities/encuesta/complete/complete.component.ts

@@ -75,12 +75,7 @@ export class EncuestaCompleteComponent implements OnInit {
         this.cantidadCalificaciones = parseInt(this.encuesta!.calificacion!.toString().split('.')[1]);
         this.sumCalificacion = this.avgCalificacion * this.cantidadCalificaciones;
       }
-      this.isLocked = this.verifyPassword();
+      this.verifyPassword();
-      if (this.isLocked) {
-        this.previousState();
-      } else {
-        this.loadAll();
-      }
     });
     for (let pregunta of this.ePreguntas!) {
       if (pregunta.tipo && pregunta.tipo === PreguntaCerradaTipo.SINGLE) {
@@ -89,17 +84,22 @@ export class EncuestaCompleteComponent implements OnInit {
     }
   }
 
-  verifyPassword(): boolean {
+  verifyPassword(): void {
     if (this.encuesta!.acceso === AccesoEncuesta.PUBLIC) {
-      return false;
+      this.loadAll();
+      this.isLocked = false;
     } else {
       const modalRef = this.modalService.open(EncuestaPasswordDialogComponent, { size: 'lg', backdrop: 'static' });
       modalRef.componentInstance.encuesta = this.encuesta;
       modalRef.closed.subscribe(reason => {
-        return reason === 'success';
+        this.isLocked = reason != 'success';
+        if (this.isLocked) {
+          this.previousState();
+        } else {
+          this.loadAll();
+        }
       });
     }
-    return true;
   }
 
   ngAfterViewChecked(): void {
@@ -194,7 +194,6 @@ export class EncuestaCompleteComponent implements OnInit {
     this.getOpenQuestionAnswers();
     this.registerOpenQuestionAnswers();
     this.updateEncuestaRating();
-
     this.previousState();
   }
 

src/main/webapp/app/entities/encuesta/encuesta-password-dialog/encuesta-password-dialog.component.html

@@ -1,12 +1,12 @@
-<form class="ds-form" [formGroup]="passwordForm" name="deleteForm" (ngSubmit)="submitPassword()">
+<form class="ds-form" name="deleteForm">
-  <div *ngIf="this.isWrong">
-    <p>Contraseña incorrecta</p>
-  </div>
   <div class="modal-body">
     <p class="ds-title--small" jhiTranslate="dataSurveyApp.encuesta.password.title">Enter password</p>
     <p class="ds-subtitle" id="jhi-delete-encuesta-heading" jhiTranslate="dataSurveyApp.encuesta.password.text">
       This survey is marked as private, please enter the password
     </p>
+    <div class="alert alert-danger" *ngIf="this.isWrong">
+      <p>Contraseña incorrecta</p>
+    </div>
     <input [(ngModel)]="passwordInput" type="password" name="passwordInput" id="passwordInput" placeholder="qwerty..." />
   </div>
 
@@ -15,13 +15,7 @@
       <fa-icon icon="arrow-left"></fa-icon>&nbsp;<span jhiTranslate="entity.action.cancel">Cancel</span>
     </button>
 
-    <button
+    <button class="ds-btn ds-btn--primary" (click)="submitPassword()">
-      id="jhi-confirm-delete-option"
-      data-cy="submit"
-      type="submit"
-      class="ds-btn ds-btn--primary"
-      [disabled]="passwordForm.get('password')!.invalid"
-    >
       <span jhiTranslate="entity.action.submit">Submit</span>
     </button>
   </div>

src/main/webapp/app/entities/encuesta/encuesta-password-dialog/encuesta-password-dialog.component.ts

@@ -1,5 +1,4 @@
 import { Component, OnInit } from '@angular/core';
-import { FormBuilder, Validators } from '@angular/forms';
 import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap';
 import { IEncuesta } from '../encuesta.model';
 
@@ -9,21 +8,16 @@ import { IEncuesta } from '../encuesta.model';
   styleUrls: ['./encuesta-password-dialog.component.scss'],
 })
 export class EncuestaPasswordDialogComponent implements OnInit {
-  passwordForm = this.fb.group({
-    password: [null, [Validators.required]],
-  });
   encuesta?: IEncuesta;
   isWrong?: boolean;
   passwordInput?: string;
 
-  constructor(protected activeModal: NgbActiveModal, protected fb: FormBuilder) {}
+  constructor(protected activeModal: NgbActiveModal) {}
 
   ngOnInit(): void {}
 
   submitPassword() {
-    const password = this.passwordForm.get(['password'])!.value;
+    if (this.passwordInput != undefined && this.passwordInput === this.encuesta!.contrasenna) {
-
-    if (this.passwordForm.valid && password === this.encuesta!.contrasenna) {
       this.activeModal.close('success');
     } else {
       this.isWrong = true;

src/main/webapp/app/entities/encuesta/update/encuesta-update.component.html

@@ -58,7 +58,7 @@
         [disabled]="isLoading"
         data-toggle="modal"
         data-target="#crearPregunta"
-        *ngIf="encuesta!.estado !== 'FINISHED' && (isAutor() || isEscritor())"
+        *ngIf="encuesta!.estado !== 'ACTIVE' && encuesta!.estado !== 'FINISHED' && (isAutor() || isEscritor())"
       >
         <fa-icon icon="sync" [icon]="faPlus"></fa-icon>&nbsp;&nbsp;<span>Crear pregunta</span>
       </button>