eduardo
/
datasurvey
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #102 from Quantum-P3/feature/US-33 

Add crear plantilla
This commit is contained in:
Eduardo Quiros 2021-08-01 19:55:15 +00:00 committed by GitHub
parent 1c2d8a3451 0943a984ca
commit b45524111e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
17 changed files with 1211 additions and 264 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/main/java/org/datasurvey/web/rest/PPreguntaCerradaOpcionResource.java
View File

@ -2,11 +2,14 @@ package org.datasurvey.web.rest;
import java.net.URI; import java.net.URI;
import java.net.URISyntaxException; import java.net.URISyntaxException;
import java.util.Arrays;
import java.util.List; import java.util.List;
import java.util.Objects; import java.util.Objects;
import java.util.Optional; import java.util.Optional;
import javax.validation.Valid; import javax.validation.Valid;
import javax.validation.constraints.NotNull; import javax.validation.constraints.NotNull;
import org.datasurvey.domain.EPreguntaCerrada;
import org.datasurvey.domain.PPreguntaCerrada;
import org.datasurvey.domain.PPreguntaCerradaOpcion; import org.datasurvey.domain.PPreguntaCerradaOpcion;
import org.datasurvey.repository.PPreguntaCerradaOpcionRepository; import org.datasurvey.repository.PPreguntaCerradaOpcionRepository;
import org.datasurvey.service.PPreguntaCerradaOpcionQueryService; import org.datasurvey.service.PPreguntaCerradaOpcionQueryService;
@ -58,10 +61,15 @@ public class PPreguntaCerradaOpcionResource {
* @return the {@link ResponseEntity} with status {@code 201 (Created)} and with body the new pPreguntaCerradaOpcion, or with status {@code 400 (Bad Request)} if the pPreguntaCerradaOpcion has already an ID. * @return the {@link ResponseEntity} with status {@code 201 (Created)} and with body the new pPreguntaCerradaOpcion, or with status {@code 400 (Bad Request)} if the pPreguntaCerradaOpcion has already an ID.
* @throws URISyntaxException if the Location URI syntax is incorrect. * @throws URISyntaxException if the Location URI syntax is incorrect.
*/ */
@PostMapping("/p-pregunta-cerrada-opcions") @PostMapping("/p-pregunta-cerrada-opcions/{id}")
public ResponseEntity<PPreguntaCerradaOpcion> createPPreguntaCerradaOpcion( public ResponseEntity<PPreguntaCerradaOpcion> createPPreguntaCerradaOpcion(
@Valid @RequestBody PPreguntaCerradaOpcion pPreguntaCerradaOpcion @Valid @RequestBody PPreguntaCerradaOpcion pPreguntaCerradaOpcion,
@PathVariable(value = "id", required = false) final Long id
) throws URISyntaxException { ) throws URISyntaxException {
PPreguntaCerrada pPreguntaCerrada = new PPreguntaCerrada();
pPreguntaCerrada.setId(id);
pPreguntaCerradaOpcion.setPPreguntaCerrada(pPreguntaCerrada);
log.debug("REST request to save PPreguntaCerradaOpcion : {}", pPreguntaCerradaOpcion); log.debug("REST request to save PPreguntaCerradaOpcion : {}", pPreguntaCerradaOpcion);
if (pPreguntaCerradaOpcion.getId() != null) { if (pPreguntaCerradaOpcion.getId() != null) {
throw new BadRequestAlertException("A new pPreguntaCerradaOpcion cannot already have an ID", ENTITY_NAME, "idexists"); throw new BadRequestAlertException("A new pPreguntaCerradaOpcion cannot already have an ID", ENTITY_NAME, "idexists");
@ -196,4 +204,15 @@ public class PPreguntaCerradaOpcionResource {
.headers(HeaderUtil.createEntityDeletionAlert(applicationName, true, ENTITY_NAME, id.toString())) .headers(HeaderUtil.createEntityDeletionAlert(applicationName, true, ENTITY_NAME, id.toString()))
.build(); .build();
} }
@PostMapping("/p-pregunta-cerrada-opcions/deleteMany")
public ResponseEntity<Void> deleteManyPPreguntaCerradaOpcion(@Valid @RequestBody int[] ids) {
for (int id : ids) {
pPreguntaCerradaOpcionService.delete((long) id);
}
return ResponseEntity
.noContent()
.headers(HeaderUtil.createEntityDeletionAlert(applicationName, true, ENTITY_NAME, Arrays.toString(ids)))
.build();
}
} }

71
src/main/java/org/datasurvey/web/rest/PlantillaResource.java
View File

@ -2,15 +2,17 @@ package org.datasurvey.web.rest;
import java.net.URI; import java.net.URI;
import java.net.URISyntaxException; import java.net.URISyntaxException;
import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.Objects; import java.util.Objects;
import java.util.Optional; import java.util.Optional;
import java.util.stream.Collectors;
import java.util.stream.Stream;
import javax.validation.Valid; import javax.validation.Valid;
import javax.validation.constraints.NotNull; import javax.validation.constraints.NotNull;
import org.datasurvey.domain.Plantilla; import org.datasurvey.domain.*;
import org.datasurvey.repository.PlantillaRepository; import org.datasurvey.repository.PlantillaRepository;
import org.datasurvey.service.PlantillaQueryService; import org.datasurvey.service.*;
import org.datasurvey.service.PlantillaService;
import org.datasurvey.service.criteria.PlantillaCriteria; import org.datasurvey.service.criteria.PlantillaCriteria;
import org.datasurvey.web.rest.errors.BadRequestAlertException; import org.datasurvey.web.rest.errors.BadRequestAlertException;
import org.slf4j.Logger; import org.slf4j.Logger;
@ -41,14 +43,26 @@ public class PlantillaResource {
private final PlantillaQueryService plantillaQueryService; private final PlantillaQueryService plantillaQueryService;
private final PPreguntaCerradaService pPreguntaCerradaService;
private final PPreguntaAbiertaService pPreguntaAbiertaService;
private final PPreguntaCerradaOpcionService pPreguntaCerradaOpcionService;
public PlantillaResource( public PlantillaResource(
PlantillaService plantillaService, PlantillaService plantillaService,
PlantillaRepository plantillaRepository, PlantillaRepository plantillaRepository,
PlantillaQueryService plantillaQueryService PlantillaQueryService plantillaQueryService,
PPreguntaCerradaService pPreguntaCerradaService,
PPreguntaAbiertaService pPreguntaAbiertaService,
PPreguntaCerradaOpcionService ePreguntaCerradaOpcionService
) { ) {
this.plantillaService = plantillaService; this.plantillaService = plantillaService;
this.plantillaRepository = plantillaRepository; this.plantillaRepository = plantillaRepository;
this.plantillaQueryService = plantillaQueryService; this.plantillaQueryService = plantillaQueryService;
this.pPreguntaCerradaService = pPreguntaCerradaService;
this.pPreguntaAbiertaService = pPreguntaAbiertaService;
this.pPreguntaCerradaOpcionService = ePreguntaCerradaOpcionService;
} }
/** /**
@ -154,6 +168,55 @@ public class PlantillaResource {
return ResponseEntity.ok().body(entityList); return ResponseEntity.ok().body(entityList);
} }
@GetMapping("/plantillas/preguntas/{id}")
public ResponseEntity<List<Object>> getPreguntasByIdPlantilla(@PathVariable Long id) {
List<PPreguntaCerrada> preguntasCerradas = pPreguntaCerradaService.findAll();
List<PPreguntaAbierta> preguntasAbiertas = pPreguntaAbiertaService.findAll();
List<Object> preguntas = Stream.concat(preguntasCerradas.stream(), preguntasAbiertas.stream()).collect(Collectors.toList());
List<Object> preguntasFiltered = new ArrayList<>();
for (Object obj : preguntas) {
if (obj.getClass() == PPreguntaCerrada.class) {
if (((PPreguntaCerrada) obj).getPlantilla() != null) {
if (((PPreguntaCerrada) obj).getPlantilla().getId().equals(id)) {
preguntasFiltered.add(obj);
}
}
} else if (obj.getClass() == PPreguntaAbierta.class) {
if (((PPreguntaAbierta) obj).getPlantilla() != null) {
if (((PPreguntaAbierta) obj).getPlantilla().getId().equals(id)) {
preguntasFiltered.add(obj);
}
}
}
}
return ResponseEntity.ok().body(preguntasFiltered);
}
@GetMapping("/plantillas/preguntas-opciones/{id}")
public ResponseEntity<List<List<PPreguntaCerradaOpcion>>> getPreguntaCerradaOpcionByIdPlantilla(@PathVariable Long id) {
List<List<PPreguntaCerradaOpcion>> res = new ArrayList<>();
List<PPreguntaCerrada> preguntasCerradas = pPreguntaCerradaService.findAll();
List<PPreguntaCerrada> preguntasCerradasFiltered = preguntasCerradas
.stream()
.filter(p -> Objects.nonNull(p.getPlantilla()))
.filter(p -> p.getPlantilla().getId().equals(id))
.collect(Collectors.toList());
List<PPreguntaCerradaOpcion> opciones = pPreguntaCerradaOpcionService.findAll();
for (PPreguntaCerrada pPreguntaCerrada : preguntasCerradasFiltered) {
long preguntaCerradaId = pPreguntaCerrada.getId();
List<PPreguntaCerradaOpcion> opcionesFiltered = opciones
.stream()
.filter(o -> Objects.nonNull(o.getPPreguntaCerrada()))
.filter(o -> o.getPPreguntaCerrada().getId().equals(preguntaCerradaId))
.collect(Collectors.toList());
res.add(opcionesFiltered);
}
return ResponseEntity.ok().body(res);
}
/** /**
* {@code GET /plantillas/count} : count all the plantillas. * {@code GET /plantillas/count} : count all the plantillas.
* *

8
src/main/webapp/app/entities/p-pregunta-cerrada-opcion/service/p-pregunta-cerrada-opcion.service.ts
View File

@ -16,8 +16,8 @@ export class PPreguntaCerradaOpcionService {
constructor(protected http: HttpClient, protected applicationConfigService: ApplicationConfigService) {} constructor(protected http: HttpClient, protected applicationConfigService: ApplicationConfigService) {}
create(pPreguntaCerradaOpcion: IPPreguntaCerradaOpcion): Observable<EntityResponseType> { create(pPreguntaCerradaOpcion: IPPreguntaCerradaOpcion, preguntaId?: number): Observable<EntityResponseType> {
return this.http.post<IPPreguntaCerradaOpcion>(this.resourceUrl, pPreguntaCerradaOpcion, { observe: 'response' }); return this.http.post<IPPreguntaCerradaOpcion>(`${this.resourceUrl}/${preguntaId}`, pPreguntaCerradaOpcion, { observe: 'response' });
} }
update(pPreguntaCerradaOpcion: IPPreguntaCerradaOpcion): Observable<EntityResponseType> { update(pPreguntaCerradaOpcion: IPPreguntaCerradaOpcion): Observable<EntityResponseType> {
@ -49,6 +49,10 @@ export class PPreguntaCerradaOpcionService {
return this.http.delete(`${this.resourceUrl}/${id}`, { observe: 'response' }); return this.http.delete(`${this.resourceUrl}/${id}`, { observe: 'response' });
} }
deleteMany(ids: number[]): Observable<EntityResponseType> {
return this.http.post<IPPreguntaCerradaOpcion>(`${this.resourceUrl}/deleteMany`, ids, { observe: 'response' });
}
addPPreguntaCerradaOpcionToCollectionIfMissing( addPPreguntaCerradaOpcionToCollectionIfMissing(
pPreguntaCerradaOpcionCollection: IPPreguntaCerradaOpcion[], pPreguntaCerradaOpcionCollection: IPPreguntaCerradaOpcion[],
...pPreguntaCerradaOpcionsToCheck: (IPPreguntaCerradaOpcion | null | undefined)[] ...pPreguntaCerradaOpcionsToCheck: (IPPreguntaCerradaOpcion | null | undefined)[]

196
src/main/webapp/app/entities/plantilla/list/plantilla.component.html
View File

@ -1,22 +1,28 @@
<div> <div>
<h2 id="page-heading" data-cy="PlantillaHeading"> <h2 id="page-heading" data-cy="PlantillaHeading">
<span jhiTranslate="dataSurveyApp.plantilla.home.title">Plantillas</span> <div class="d-flex flex-sm-row flex-column justify-content-between align-items-center">
<div>
<span class="ds-title" jhiTranslate="dataSurveyApp.plantilla.home.title">Encuestas</span>
<p class="ds-subtitle">Administre las plantillas comprables de la tienda</p>
</div>
<div class="d-flex justify-content-end"> <div>
<button class="ds-btn btn-info mr-2" (click)="loadAll()" [disabled]="isLoading"> <button class="ds-btn ds-btn--secondary" (click)="loadAll()" [disabled]="isLoading">
<fa-icon icon="sync" [spin]="isLoading"></fa-icon> <fa-icon icon="sync" [spin]="isLoading"></fa-icon>
<span jhiTranslate="dataSurveyApp.plantilla.home.refreshListLabel">Refresh List</span> <span jhiTranslate="dataSurveyApp.plantilla.home.refreshListLabel">Refresh List</span>
</button> </button>
<button <button
id="jh-create-entity" *ngIf="isAdmin() && isAuthenticated()"
data-cy="entityCreateButton" type="button"
class="ds-btn ds-btn--primary jh-create-entity create-plantilla" class="ds-btn ds-btn--primary"
[routerLink]="['/plantilla/new']" (click)="resetCreateTemplateForm()"
> data-toggle="modal"
<fa-icon icon="plus"></fa-icon> data-target="#crearPlantilla"
<span jhiTranslate="dataSurveyApp.plantilla.home.createLabel"> Create a new Template </span> >
</button> Crear plantilla
</button>
</div>
</div> </div>
</h2> </h2>
@ -34,7 +40,7 @@
<tr> <tr>
<th scope="col"><span jhiTranslate="dataSurveyApp.plantilla.nombre">Nombre</span></th> <th scope="col"><span jhiTranslate="dataSurveyApp.plantilla.nombre">Nombre</span></th>
<th scope="col"><span jhiTranslate="dataSurveyApp.plantilla.descripcion">Descripcion</span></th> <th scope="col"><span jhiTranslate="dataSurveyApp.plantilla.descripcion">Descripcion</span></th>
<th scope="col"><span jhiTranslate="dataSurveyApp.plantilla.fechaCreacion">Fecha Creacion</span></th> <!-- <th scope="col"><span jhiTranslate="dataSurveyApp.plantilla.fechaCreacion">Fecha Creacion</span></th> -->
<th scope="col"><span jhiTranslate="dataSurveyApp.plantilla.fechaPublicacionTienda">Fecha Publicacion Tienda</span></th> <th scope="col"><span jhiTranslate="dataSurveyApp.plantilla.fechaPublicacionTienda">Fecha Publicacion Tienda</span></th>
<th scope="col"><span jhiTranslate="dataSurveyApp.plantilla.estado">Estado</span></th> <th scope="col"><span jhiTranslate="dataSurveyApp.plantilla.estado">Estado</span></th>
<th scope="col"><span jhiTranslate="dataSurveyApp.plantilla.precio">Precio</span></th> <th scope="col"><span jhiTranslate="dataSurveyApp.plantilla.precio">Precio</span></th>
@ -46,25 +52,22 @@
<tr *ngFor="let plantilla of plantillas; trackBy: trackId" data-cy="entityTable"> <tr *ngFor="let plantilla of plantillas; trackBy: trackId" data-cy="entityTable">
<td>{{ plantilla.nombre }}</td> <td>{{ plantilla.nombre }}</td>
<td>{{ plantilla.descripcion }}</td> <td>{{ plantilla.descripcion }}</td>
<td>{{ plantilla.fechaCreacion | formatMediumDatetime }}</td> <!-- <td>{{ plantilla.fechaCreacion | formatMediumDatetime }}</td> -->
<td>{{ plantilla.fechaPublicacionTienda | formatMediumDatetime }}</td> <td *ngIf="plantilla.fechaPublicacionTienda">{{ plantilla.fechaPublicacionTienda | formatShortDatetime | titlecase }}</td>
<td *ngIf="!plantilla.fechaPublicacionTienda">No establecida</td>
<td jhiTranslate="{{ 'dataSurveyApp.EstadoPlantilla.' + plantilla.estado }}">{{ plantilla.estado }}</td> <td jhiTranslate="{{ 'dataSurveyApp.EstadoPlantilla.' + plantilla.estado }}">{{ plantilla.estado }}</td>
<td>{{ plantilla.precio }}</td> <td>{{ plantilla.precio | currency: 'USD':'symbol-narrow' }}</td>
<td> <td>{{ plantilla.categoria?.nombre }}</td>
<div *ngIf="plantilla.categoria">
<a [routerLink]="['/categoria', plantilla.categoria?.id, 'view']">{{ plantilla.categoria?.nombre }}</a>
</div>
</td>
<td class="text-right"> <td class="text-right">
<div class="btn-group"> <div class="btn-group">
<button <button
type="submit" type="submit"
[routerLink]="['/plantilla', plantilla.id, 'view']" [routerLink]="['/plantilla', plantilla.id, 'view']"
class="ds-btn btn-info btn-sm" class="ds-btn ds-btn--secondary btn-sm"
data-cy="entityDetailsButton" data-cy="entityDetailsButton"
> >
<fa-icon icon="eye"></fa-icon> <fa-icon icon="eye"></fa-icon>
<span class="d-none d-md-inline" jhiTranslate="entity.action.view">View</span> <span class="d-none d-md-inline">Vista previa</span>
</button> </button>
<button <button
@ -73,7 +76,6 @@
class="ds-btn ds-btn--primary btn-sm" class="ds-btn ds-btn--primary btn-sm"
data-cy="entityEditButton" data-cy="entityEditButton"
> >
<fa-icon icon="pencil-alt"></fa-icon>
<span class="d-none d-md-inline" jhiTranslate="entity.action.edit">Edit</span> <span class="d-none d-md-inline" jhiTranslate="entity.action.edit">Edit</span>
</button> </button>
@ -88,3 +90,143 @@
</table> </table>
</div> </div>
</div> </div>
<!-- Modal -->
<div
class="modal fade ds-modal"
id="crearPlantilla"
tabindex="-1"
role="dialog"
aria-labelledby="exampleModalCenterTitle"
aria-hidden="true"
>
<div class="modal-dialog modal-dialog-centered" role="document">
<div class="modal-content">
<form
autocomplete="off"
class="ds-form"
name="templateCreateForm"
role="form"
novalidate
(ngSubmit)="save()"
[formGroup]="templateCreateForm"
>
<div class="modal-header">
<h1 class="modal-title" id="exampleModalLongTitle">Crear Plantilla</h1>
</div>
<div class="modal-body">
<!-- Template Registration Modal -->
<div>
<div class="form-group">
<label class="form-control-label" jhiTranslate="dataSurveyApp.encuesta.nombre" for="field_nombre">Nombre</label>
<input type="text" class="form-control" name="nombre" id="field_nombre" data-cy="nombre" formControlName="nombre" />
<div
*ngIf="
templateCreateForm.get('nombre')!.invalid &&
(templateCreateForm.get('nombre')!.dirty || templateCreateForm.get('nombre')!.touched)
"
>
<small
class="form-text text-danger"
*ngIf="templateCreateForm.get('nombre')?.errors?.required"
jhiTranslate="entity.validation.required"
>
This field is required.
</small>
<small
class="form-text text-danger"
*ngIf="templateCreateForm.get('nombre')?.errors?.minlength"
jhiTranslate="entity.validation.minlength"
[translateValues]="{ min: 1 }"
>
This field is required to be at least 1 characters.
</small>
<small
class="form-text text-danger"
*ngIf="templateCreateForm.get('nombre')?.errors?.maxlength"
jhiTranslate="entity.validation.maxlength"
[translateValues]="{ max: 50 }"
>
This field cannot be longer than 50 characters.
</small>
</div>
</div>
<div class="form-group">
<label class="form-control-label" jhiTranslate="dataSurveyApp.encuesta.descripcion" for="field_descripcion"
>Descripcion</label
>
<input
type="text"
class="form-control"
name="descripcion"
id="field_descripcion"
data-cy="descripcion"
formControlName="descripcion"
/>
</div>
<div class="form-group">
<label class="form-control-label" jhiTranslate="dataSurveyApp.plantilla.precio" for="field_precio">Precio</label>
<input type="number" class="form-control" name="precio" id="field_precio" data-cy="precio" formControlName="precio" />
<div
*ngIf="
templateCreateForm.get('precio')!.invalid &&
(templateCreateForm.get('precio')!.dirty || templateCreateForm.get('precio')!.touched)
"
>
<small
class="form-text text-danger"
*ngIf="templateCreateForm.get('precio')?.errors?.required"
jhiTranslate="entity.validation.required"
>
This field is required.
</small>
<small
class="form-text text-danger"
[hidden]="!templateCreateForm.get('precio')?.errors?.number"
jhiTranslate="entity.validation.number"
>
This field should be a number.
</small>
</div>
</div>
<div class="form-group">
<label class="form-control-label" jhiTranslate="dataSurveyApp.plantilla.categoria" for="field_categoria">Categoria</label>
<select class="form-control" id="field_categoria" data-cy="categoria" name="categoria" formControlName="categoria">
<option [ngValue]="null"></option>
<option
[ngValue]="
categoriaOption.id === templateCreateForm.get('categoria')!.value?.id
? templateCreateForm.get('categoria')!.value
: categoriaOption
"
*ngFor="let categoriaOption of categoriasSharedCollection; trackBy: trackCategoriaById"
>
{{ categoriaOption.nombre }}
</option>
</select>
</div>
</div>
</div>
<div class="modal-footer">
<input id="createAnother" type="checkbox" (change)="createAnotherTemplateChange($event)" />
<label for="createAnother">Crear otra</label>
<button id="cancelBtn" type="button" class="ds-btn ds-btn--secondary" data-dismiss="modal">
<fa-icon icon="arrow-left"></fa-icon>&nbsp;&nbsp;<span jhiTranslate="entity.action.cancel">Cancel</span>
</button>
<button
type="submit"
id="save-entity"
data-cy="entityCreateSaveButton"
class="ds-btn ds-btn--primary"
[disabled]="templateCreateForm.invalid || isSaving"
>
<span jhiTranslate="entity.action.create">Create</span>
</button>
</div>
</form>
</div>
</div>
</div>

0
src/main/webapp/app/entities/plantilla/list/plantilla.component.spec.ts → src/main/webapp/app/entities/plantilla/list/plantilla.component.tmpSpec.ts
View File

122
src/main/webapp/app/entities/plantilla/list/plantilla.component.ts
View File

@ -1,11 +1,23 @@
import { Component, OnInit } from '@angular/core'; import { Component, OnInit } from '@angular/core';
import { HttpResponse } from '@angular/common/http'; import { HttpResponse } from '@angular/common/http';
import { NgbModal } from '@ng-bootstrap/ng-bootstrap'; import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
import { Observable } from 'rxjs';
import { finalize, map } from 'rxjs/operators';
import { IPlantilla } from '../plantilla.model'; import { IPlantilla, Plantilla } from '../plantilla.model';
import { PlantillaService } from '../service/plantilla.service'; import { PlantillaService } from '../service/plantilla.service';
import { PlantillaDeleteDialogComponent } from '../delete/plantilla-delete-dialog.component'; import { PlantillaDeleteDialogComponent } from '../delete/plantilla-delete-dialog.component';
import { AccountService } from 'app/core/auth/account.service';
import { Account } from 'app/core/auth/account.model';
import { FormBuilder, Validators } from '@angular/forms';
import { EstadoPlantilla } from 'app/entities/enumerations/estado-plantilla.model';
import { ICategoria } from 'app/entities/categoria/categoria.model';
import { CategoriaService } from 'app/entities/categoria/service/categoria.service';
import * as dayjs from 'dayjs';
import { DATE_TIME_FORMAT } from 'app/config/input.constants';
@Component({ @Component({
selector: 'jhi-plantilla', selector: 'jhi-plantilla',
templateUrl: './plantilla.component.html', templateUrl: './plantilla.component.html',
@ -13,8 +25,27 @@ import { PlantillaDeleteDialogComponent } from '../delete/plantilla-delete-dialo
export class PlantillaComponent implements OnInit { export class PlantillaComponent implements OnInit {
plantillas?: IPlantilla[]; plantillas?: IPlantilla[];
isLoading = false; isLoading = false;
isSaving = false;
createAnotherTemplate: Boolean = false;
constructor(protected plantillaService: PlantillaService, protected modalService: NgbModal) {} account: Account | null = null;
categoriasSharedCollection: ICategoria[] = [];
templateCreateForm = this.fb.group({
id: [],
nombre: [null, [Validators.minLength(1), Validators.maxLength(50)]],
descripcion: [],
precio: [null, [Validators.required]],
categoria: [],
});
constructor(
protected plantillaService: PlantillaService,
protected modalService: NgbModal,
protected accountService: AccountService,
protected fb: FormBuilder,
protected categoriaService: CategoriaService
) {}
loadAll(): void { loadAll(): void {
this.isLoading = true; this.isLoading = true;
@ -32,6 +63,7 @@ export class PlantillaComponent implements OnInit {
ngOnInit(): void { ngOnInit(): void {
this.loadAll(); this.loadAll();
this.loadRelationshipsOptions();
} }
trackId(_index: number, item: IPlantilla): number { trackId(_index: number, item: IPlantilla): number {
@ -48,4 +80,90 @@ export class PlantillaComponent implements OnInit {
} }
}); });
} }
isAdmin(): boolean {
return this.accountService.hasAnyAuthority('ROLE_ADMIN');
}
isAuthenticated(): boolean {
return this.accountService.isAuthenticated();
}
resetCreateTemplateForm(): void {
this.templateCreateForm.reset();
}
createAnotherTemplateChange(event: any): void {
// ID: #crearPlantilla
this.createAnotherTemplate = event.target.checked;
}
previousState(): void {
window.history.back();
}
save(): void {
this.isSaving = true;
const plantilla = this.createFromForm();
if (plantilla.id !== undefined) {
this.subscribeToSaveResponse(this.plantillaService.update(plantilla));
} else {
this.subscribeToSaveResponse(this.plantillaService.create(plantilla));
}
}
trackCategoriaById(index: number, item: ICategoria): number {
return item.id!;
}
protected subscribeToSaveResponse(result: Observable<HttpResponse<IPlantilla>>): void {
result.pipe(finalize(() => this.onSaveFinalize())).subscribe(
() => this.onSaveSuccess(),
() => this.onSaveError()
);
}
protected onSaveSuccess(): void {
this.templateCreateForm.reset();
this.plantillas = [];
this.loadAll();
if (!this.createAnotherTemplate) {
$('#cancelBtn').click();
}
}
protected onSaveError(): void {
// Api for inheritance.
}
protected onSaveFinalize(): void {
this.isSaving = false;
}
protected loadRelationshipsOptions(): void {
this.categoriaService
.query()
.pipe(map((res: HttpResponse<ICategoria[]>) => res.body ?? []))
.pipe(
map((categorias: ICategoria[]) =>
this.categoriaService.addCategoriaToCollectionIfMissing(categorias, this.templateCreateForm.get('categoria')!.value)
)
)
.subscribe((categorias: ICategoria[]) => (this.categoriasSharedCollection = categorias));
}
protected createFromForm(): IPlantilla {
const now = dayjs();
return {
...new Plantilla(),
id: undefined,
nombre: this.templateCreateForm.get(['nombre'])!.value,
descripcion: this.templateCreateForm.get(['descripcion'])!.value,
fechaCreacion: dayjs(now, DATE_TIME_FORMAT),
estado: EstadoPlantilla.DRAFT,
precio: this.templateCreateForm.get(['precio'])!.value,
categoria: this.templateCreateForm.get(['categoria'])!.value,
};
}
} }

24
src/main/webapp/app/entities/plantilla/plantilla-delete-option-dialog/plantilla-delete-option-dialog.component.html Normal file
View File

@ -0,0 +1,24 @@
<form class="ds-form" name="deleteForm" (ngSubmit)="confirmDelete()">
<div class="modal-header">
<!-- <h2 class="ds-title" data-cy="encuestaDeleteDialogHeading" jhiTranslate="entity.delete.title">Confirm delete operation</h2>
<button type="button" class="close" data-dismiss="modal" aria-hidden="true" (click)="cancel()">&times;</button>-->
</div>
<div class="modal-body">
<p class="ds-title--small">Eliminar opción</p>
<p class="ds-subtitle" id="jhi-delete-encuesta-heading" jhiTranslate="dataSurveyApp.encuesta.delete.deleteoption">
Are you sure you want to delete this option?
</p>
</div>
<div class="modal-footer">
<button type="button" class="ds-btn ds-btn--secondary" data-dismiss="modal" (click)="cancel()">
<fa-icon icon="arrow-left"></fa-icon>&nbsp;<span jhiTranslate="entity.action.cancel">Cancel</span>
</button>
<button id="jhi-confirm-delete-option" data-cy="entityConfirmDeleteButton" type="submit" class="ds-btn ds-btn--danger">
<fa-icon icon="times"></fa-icon>&nbsp;<span jhiTranslate="entity.action.delete">Delete</span>
</button>
</div>
</form>

17
src/main/webapp/app/entities/plantilla/plantilla-delete-option-dialog/plantilla-delete-option-dialog.component.ts Normal file
View File

@ -0,0 +1,17 @@
import { Component } from '@angular/core';
import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap';
@Component({
templateUrl: './plantilla-delete-option-dialog.component.html',
})
export class PlantillaDeleteOptionDialogComponent {
constructor(protected activeModal: NgbActiveModal) {}
cancel(): void {
this.activeModal.dismiss();
}
confirmDelete(): void {
this.activeModal.close('confirm');
}
}

24
src/main/webapp/app/entities/plantilla/plantilla-delete-question-dialog/plantilla-delete-question-dialog.component.html Normal file
View File

@ -0,0 +1,24 @@
<form class="ds-form" name="deleteForm" (ngSubmit)="confirmDelete()">
<div class="modal-header">
<!-- <h2 class="ds-title" data-cy="encuestaDeleteDialogHeading" jhiTranslate="entity.delete.title">Confirm delete operation</h2>
<button type="button" class="close" data-dismiss="modal" aria-hidden="true" (click)="cancel()">&times;</button>-->
</div>
<div class="modal-body">
<p class="ds-title--small">Eliminar pregunta</p>
<p class="ds-subtitle" id="jhi-delete-encuesta-heading" jhiTranslate="dataSurveyApp.encuesta.delete.deletequestion">
Are you sure you want to delete this question?
</p>
</div>
<div class="modal-footer">
<button type="button" class="ds-btn ds-btn--secondary" data-dismiss="modal" (click)="cancel()">
<fa-icon icon="arrow-left"></fa-icon>&nbsp;<span jhiTranslate="entity.action.cancel">Cancel</span>
</button>
<button id="jhi-confirm-delete-question" data-cy="entityConfirmDeleteButton" type="submit" class="ds-btn ds-btn--danger">
<fa-icon icon="times"></fa-icon>&nbsp;<span jhiTranslate="entity.action.delete">Delete</span>
</button>
</div>
</form>

17
src/main/webapp/app/entities/plantilla/plantilla-delete-question-dialog/plantilla-delete-question-dialog.component.ts Normal file
View File

@ -0,0 +1,17 @@
import { Component } from '@angular/core';
import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap';
@Component({
templateUrl: './plantilla-delete-question-dialog.component.html',
})
export class PlantillaDeleteQuestionDialogComponent {
constructor(protected activeModal: NgbActiveModal) {}
cancel(): void {
this.activeModal.dismiss();
}
confirmDelete(): void {
this.activeModal.close('confirm');
}
}

14
src/main/webapp/app/entities/plantilla/plantilla.module.ts
View File

@ -5,10 +5,20 @@ import { PlantillaDetailComponent } from './detail/plantilla-detail.component';
import { PlantillaUpdateComponent } from './update/plantilla-update.component'; import { PlantillaUpdateComponent } from './update/plantilla-update.component';
import { PlantillaDeleteDialogComponent } from './delete/plantilla-delete-dialog.component'; import { PlantillaDeleteDialogComponent } from './delete/plantilla-delete-dialog.component';
import { PlantillaRoutingModule } from './route/plantilla-routing.module'; import { PlantillaRoutingModule } from './route/plantilla-routing.module';
import { FontAwesomeModule } from '@fortawesome/angular-fontawesome';
import { PlantillaDeleteQuestionDialogComponent } from './plantilla-delete-question-dialog/plantilla-delete-question-dialog.component';
import { PlantillaDeleteOptionDialogComponent } from './plantilla-delete-option-dialog/plantilla-delete-option-dialog.component';
@NgModule({ @NgModule({
imports: [SharedModule, PlantillaRoutingModule], imports: [SharedModule, PlantillaRoutingModule, FontAwesomeModule],
declarations: [PlantillaComponent, PlantillaDetailComponent, PlantillaUpdateComponent, PlantillaDeleteDialogComponent], declarations: [
PlantillaComponent,
PlantillaDetailComponent,
PlantillaUpdateComponent,
PlantillaDeleteDialogComponent,
PlantillaDeleteQuestionDialogComponent,
PlantillaDeleteOptionDialogComponent,
],
entryComponents: [PlantillaDeleteDialogComponent], entryComponents: [PlantillaDeleteDialogComponent],
}) })
export class PlantillaModule {} export class PlantillaModule {}

16
src/main/webapp/app/entities/plantilla/service/plantilla.service.ts
View File

@ -45,6 +45,22 @@ export class PlantillaService {
.pipe(map((res: EntityResponseType) => this.convertDateFromServer(res))); .pipe(map((res: EntityResponseType) => this.convertDateFromServer(res)));
} }
findPlantilla(id: number): Observable<IPlantilla> {
return this.http.get<IPlantilla>(`${this.resourceUrl}/${id}`);
}
findQuestions(id: number): Observable<EntityResponseType> {
return this.http
.get<any>(`${this.resourceUrl}/preguntas/${id}`, { observe: 'response' })
.pipe(map((res: EntityResponseType) => this.convertDateFromServer(res)));
}
findQuestionsOptions(id: number): Observable<EntityResponseType> {
return this.http
.get<any>(`${this.resourceUrl}/preguntas-opciones/${id}`, { observe: 'response' })
.pipe(map((res: EntityResponseType) => this.convertDateFromServer(res)));
}
query(req?: any): Observable<EntityArrayResponseType> { query(req?: any): Observable<EntityArrayResponseType> {
const options = createRequestOption(req); const options = createRequestOption(req);
return this.http return this.http

498
src/main/webapp/app/entities/plantilla/update/plantilla-update.component.html
View File

@ -1,165 +1,355 @@
<div class="row justify-content-center"> <div>
<div class="col-8"> <h2 id="page-heading" data-cy="EPreguntaCerradaHeading">
<form name="editForm" role="form" novalidate (ngSubmit)="save()" [formGroup]="editForm"> <div class="d-flex align-items-center">
<h2 id="jhi-plantilla-heading" data-cy="PlantillaCreateUpdateHeading" jhiTranslate="dataSurveyApp.plantilla.home.createOrEditLabel"> <p class="ds-title ds-contenteditable" contenteditable="true" spellcheck="false" (blur)="updateTemplateName($event)">
Create or edit a Plantilla {{ plantilla!.nombre }}
</h2> </p>
</div>
<div> <p class="ds-subtitle">Creada el día {{ plantilla!.fechaCreacion | formatShortDatetime | lowercase }}</p>
<jhi-alert-error></jhi-alert-error>
<div class="form-group" [hidden]="editForm.get('id')!.value == null"> <div class="d-flex justify-content-end">
<label class="form-control-label" jhiTranslate="global.field.id" for="field_id">ID</label> <button type="button" class="ds-btn ds-btn--secondary" (click)="previousState()">
<input type="number" class="form-control" name="id" id="field_id" data-cy="id" formControlName="id" [readonly]="true" /> <fa-icon icon="arrow-left"></fa-icon>&nbsp;&nbsp;<span jhiTranslate="entity.action.back">Back</span>
</div> </button>
<button type="button" class="ds-btn ds-btn--secondary" (click)="loadAll()" [disabled]="isLoading">
<fa-icon icon="sync" [spin]="isLoading"></fa-icon>&nbsp;&nbsp;<span>Refrescar preguntas</span>
</button>
<div class="form-group"> <button
<label class="form-control-label" jhiTranslate="dataSurveyApp.plantilla.nombre" for="field_nombre">Nombre</label> type="button"
<input type="text" class="form-control" name="nombre" id="field_nombre" data-cy="nombre" formControlName="nombre" /> class="ds-btn ds-btn--primary"
<div *ngIf="editForm.get('nombre')!.invalid && (editForm.get('nombre')!.dirty || editForm.get('nombre')!.touched)"> (click)="createQuestion()"
<small [disabled]="isLoading"
class="form-text text-danger" data-toggle="modal"
*ngIf="editForm.get('nombre')?.errors?.minlength" data-target="#crearPregunta"
jhiTranslate="entity.validation.minlength" >
[translateValues]="{ min: 1 }" <fa-icon icon="sync" [icon]="faPlus"></fa-icon>&nbsp;&nbsp;<span>Crear pregunta</span>
> </button>
This field is required to be at least 1 characters. </div>
</small> </h2>
<small
class="form-text text-danger"
*ngIf="editForm.get('nombre')?.errors?.maxlength"
jhiTranslate="entity.validation.maxlength"
[translateValues]="{ max: 50 }"
>
This field cannot be longer than 50 characters.
</small>
</div>
</div>
<div class="form-group"> <jhi-alert-error></jhi-alert-error>
<label class="form-control-label" jhiTranslate="dataSurveyApp.plantilla.descripcion" for="field_descripcion">Descripcion</label>
<input
type="text"
class="form-control"
name="descripcion"
id="field_descripcion"
data-cy="descripcion"
formControlName="descripcion"
/>
</div>
<div class="form-group"> <!-- <jhi-alert></jhi-alert> -->
<label class="form-control-label" jhiTranslate="dataSurveyApp.plantilla.fechaCreacion" for="field_fechaCreacion"
>Fecha Creacion</label <!-- <div class="alert alert-warning" id="no-result" *ngIf="pPreguntas?.length === 0">
> <span>No se encontraron preguntas</span>
<div class="d-flex"> </div> -->
<input <!-- *ngIf="pPreguntas && pPreguntas.length > 0" -->
id="field_fechaCreacion" <div class="ds-survey" id="entities">
data-cy="fechaCreacion" <div class="ds-survey--all-question-wrapper">
type="datetime-local" <ng-container *ngIf="plantilla!.estado === 'ACTIVE'">
class="form-control" <p class="ds-title text-center">Plantilla en tienda</p>
name="fechaCreacion" <p class="ds-subtitle">No puede modificar la plantilla debido a que esta ya está en la tienda.</p>
formControlName="fechaCreacion" </ng-container>
placeholder="YYYY-MM-DD HH:mm" <ng-container *ngIf="plantilla!.estado === 'DRAFT' && pPreguntas && pPreguntas.length === 0">
/> <p class="ds-title text-center">Plantilla vacía</p>
</div> <p class="ds-subtitle">Inicie creando preguntas y opciones para la plantilla.</p>
</ng-container>
<ng-container *ngIf="plantilla!.estado === 'DRAFT'">
<div class="ds-survey--question-wrapper" *ngFor="let pPregunta of pPreguntas; let i = index; trackBy: trackId">
<div <div
*ngIf=" [attr.data-index]="pPregunta.id"
editForm.get('fechaCreacion')!.invalid && (editForm.get('fechaCreacion')!.dirty || editForm.get('fechaCreacion')!.touched) [attr.data-tipo]="pPregunta.tipo"
" [attr.data-opcional]="pPregunta.opcional"
class="ds-survey--question"
> >
<small <div class="ds-survey--titulo">
class="form-text text-danger" <span class="ds-survey--titulo--name">
*ngIf="editForm.get('fechaCreacion')?.errors?.required" <span>{{ i + 1 }}.</span>&nbsp;
jhiTranslate="entity.validation.required" <span
> class="ds-contenteditable"
This field is required. [attr.data-id]="pPregunta.id"
</small> [attr.data-tipo]="pPregunta.tipo"
<small contenteditable="true"
class="form-text text-danger" spellcheck="false"
[hidden]="!editForm.get('fechaCreacion')?.errors?.ZonedDateTimelocal" (blur)="updateQuestionName($event)"
jhiTranslate="entity.validation.ZonedDateTimelocal" >{{ pPregunta.nombre }}</span
> >
This field should be a date and time. </span>
</small> <fa-icon
*ngIf="plantilla!.estado === 'DRAFT'"
class="ds-survey--titulo--icon"
[icon]="faTimes"
(click)="deleteQuestion($event)"
[attr.data-id]="pPregunta.id"
[attr.data-type]="pPregunta.tipo"
></fa-icon>
</div>
<div>
<span *ngIf="pPregunta.tipo === 'SINGLE'" class="ds-subtitle"
>Pregunta de respuesta {{ 'dataSurveyApp.PreguntaCerradaTipo.SINGLE' | translate | lowercase }}
{{ pPregunta.opcional ? '(opcional)' : '' }}</span
>
<span *ngIf="pPregunta.tipo === 'MULTIPLE'" class="ds-subtitle"
>Pregunta de respuesta {{ 'dataSurveyApp.PreguntaCerradaTipo.MULTIPLE' | translate | lowercase }}
{{ pPregunta.opcional ? '(opcional)' : '' }}</span
>
<span *ngIf="!pPregunta.tipo" class="ds-subtitle"
>Pregunta de respuesta abierta {{ pPregunta.opcional ? '(opcional)' : '' }}</span
>
</div>
<ng-container *ngIf="pPregunta.tipo">
<ng-container *ngFor="let pPreguntaOpcion of pPreguntasOpciones; let j = index; trackBy: trackId">
<ng-container *ngFor="let pPreguntaOpcionFinal of pPreguntaOpcion">
<ng-container *ngIf="pPregunta.id === pPreguntaOpcionFinal.ppreguntaCerrada.id">
<div
class="ds-survey--option ds-survey--option--base ds-survey--closed-option can-delete"
[attr.data-id]="pPreguntaOpcionFinal.id"
>
<!-- <input class="ds-survey--checkbox" id="{{ pPregunta.id }}-{{ pPreguntaOpcionFinal.id }}" type="checkbox" disabled /> -->
<label for="{{ pPregunta.id }}-{{ pPreguntaOpcionFinal.id }}">{{ pPreguntaOpcionFinal.nombre }}</label>
<fa-icon
*ngIf="plantilla!.estado === 'DRAFT'"
class="ds-survey--titulo--icon ds-survey--titulo--icon--small"
[icon]="faTimes"
(click)="deleteOption($event)"
[attr.data-optionid]="pPreguntaOpcionFinal.id"
></fa-icon>
</div>
</ng-container>
</ng-container>
</ng-container>
<div
class="ds-survey--option ds-survey--option--add ds-survey--closed-option"
(click)="resetForm($event)"
data-toggle="modal"
data-target="#crearOpcion"
[attr.data-id]="pPregunta.id"
>
<fa-icon
class="ds-survey--add-option--icon"
[icon]="faPlus"
[attr.data-id]="pPregunta.id"
[attr.data-type]="pPregunta.tipo"
></fa-icon>
<span class="ds-survey--add-option">Añadir opción</span>
</div>
</ng-container>
<div class="ds-survey--option ds-survey--option--base ds-survey--open-option" *ngIf="!pPregunta.tipo">
<textarea name="" id="" cols="30" rows="10" disabled></textarea>
</div>
</div> </div>
</div> </div>
</ng-container>
<div class="form-group"> </div>
<label class="form-control-label" jhiTranslate="dataSurveyApp.plantilla.fechaPublicacionTienda" for="field_fechaPublicacionTienda" </div>
>Fecha Publicacion Tienda</label </div>
>
<div class="d-flex"> <!-- Create Option Modal -->
<input <div class="modal fade ds-modal" id="crearOpcion" tabindex="-1" role="dialog" aria-labelledby="exampleModalCenterTitle" aria-hidden="true">
id="field_fechaPublicacionTienda" <div class="modal-dialog modal-dialog-centered" role="document">
data-cy="fechaPublicacionTienda" <div class="modal-content">
type="datetime-local" <form autocomplete="off" class="ds-form" name="editForm" role="form" novalidate (ngSubmit)="save()" [formGroup]="editForm">
class="form-control" <div class="modal-header">
name="fechaPublicacionTienda" <h1 class="modal-title" id="exampleModalLongTitle">Crear Opción</h1>
formControlName="fechaPublicacionTienda" </div>
placeholder="YYYY-MM-DD HH:mm" <div class="modal-body">
/> <!-- Survey Closed Question Create Option Modal -->
</div> <div>
</div> <jhi-alert-error></jhi-alert-error>
<div class="form-group"> <div class="form-group">
<label class="form-control-label" jhiTranslate="dataSurveyApp.plantilla.estado" for="field_estado">Estado</label> <label class="form-control-label" jhiTranslate="dataSurveyApp.pPreguntaCerradaOpcion.nombre" for="field_nombre">Nombre</label>
<select class="form-control" name="estado" formControlName="estado" id="field_estado" data-cy="estado"> <input type="text" class="form-control" name="nombre" id="field_nombre" data-cy="nombre" formControlName="nombre" />
<option [ngValue]="null">{{ 'dataSurveyApp.EstadoPlantilla.null' | translate }}</option> <div *ngIf="editForm.get('nombre')!.invalid && (editForm.get('nombre')!.dirty || editForm.get('nombre')!.touched)">
<option value="DRAFT">{{ 'dataSurveyApp.EstadoPlantilla.DRAFT' | translate }}</option> <small
<option value="ACTIVE">{{ 'dataSurveyApp.EstadoPlantilla.ACTIVE' | translate }}</option> class="form-text text-danger"
<option value="DELETED">{{ 'dataSurveyApp.EstadoPlantilla.DELETED' | translate }}</option> *ngIf="editForm.get('nombre')?.errors?.required"
<option value="DISABLED">{{ 'dataSurveyApp.EstadoPlantilla.DISABLED' | translate }}</option> jhiTranslate="entity.validation.required"
</select> >
<div *ngIf="editForm.get('estado')!.invalid && (editForm.get('estado')!.dirty || editForm.get('estado')!.touched)"> This field is required.
<small class="form-text text-danger" *ngIf="editForm.get('estado')?.errors?.required" jhiTranslate="entity.validation.required"> </small>
This field is required. <small
</small> class="form-text text-danger"
</div> *ngIf="editForm.get('nombre')?.errors?.minlength"
</div> jhiTranslate="entity.validation.minlength"
[translateValues]="{ min: 1 }"
<div class="form-group"> >
<label class="form-control-label" jhiTranslate="dataSurveyApp.plantilla.precio" for="field_precio">Precio</label> This field is required to be at least 1 characters.
<input type="number" class="form-control" name="precio" id="field_precio" data-cy="precio" formControlName="precio" /> </small>
<div *ngIf="editForm.get('precio')!.invalid && (editForm.get('precio')!.dirty || editForm.get('precio')!.touched)"> <small
<small class="form-text text-danger" *ngIf="editForm.get('precio')?.errors?.required" jhiTranslate="entity.validation.required"> class="form-text text-danger"
This field is required. *ngIf="editForm.get('nombre')?.errors?.maxlength"
</small> jhiTranslate="entity.validation.maxlength"
<small class="form-text text-danger" [hidden]="!editForm.get('precio')?.errors?.number" jhiTranslate="entity.validation.number"> [translateValues]="{ max: 500 }"
This field should be a number. >
</small> This field cannot be longer than 500 characters.
</div> </small>
</div> </div>
</div>
<div class="form-group"> </div>
<label class="form-control-label" jhiTranslate="dataSurveyApp.plantilla.categoria" for="field_categoria">Categoria</label> </div>
<select class="form-control" id="field_categoria" data-cy="categoria" name="categoria" formControlName="categoria"> <div class="modal-footer">
<option [ngValue]="null"></option> <input id="createAnother" type="checkbox" (change)="createAnotherChange($event)" />
<option <label for="createAnother">Crear otra</label>
[ngValue]="categoriaOption.id === editForm.get('categoria')!.value?.id ? editForm.get('categoria')!.value : categoriaOption" <button id="cancelBtn" type="button" class="ds-btn ds-btn--secondary" data-dismiss="modal">
*ngFor="let categoriaOption of categoriasSharedCollection; trackBy: trackCategoriaById" <fa-icon icon="arrow-left"></fa-icon>&nbsp;&nbsp;<span jhiTranslate="entity.action.cancel">Cancel</span>
> </button>
{{ categoriaOption.nombre }} <button
</option> type="submit"
</select> id="save-entity"
</div> data-cy="entityCreateSaveButton"
</div> class="ds-btn ds-btn--primary"
[disabled]="editForm.invalid || isSaving"
<div> >
<button type="button" id="cancel-save" data-cy="entityCreateCancelButton" class="btn btn-secondary" (click)="previousState()"> <span jhiTranslate="entity.action.create">Create</span>
<fa-icon icon="ban"></fa-icon>&nbsp;<span jhiTranslate="entity.action.cancel">Cancel</span> </button>
</button> </div>
</form>
<button </div>
type="submit" </div>
id="save-entity" </div>
data-cy="entityCreateSaveButton"
[disabled]="editForm.invalid || isSaving" <!-- ------------------------------------------------------------------------------------------------- -->
class="btn btn-primary"
> <!-- Create Question Modal -->
<fa-icon icon="save"></fa-icon>&nbsp;<span jhiTranslate="entity.action.save">Save</span> <div
</button> class="modal fade ds-modal"
</div> id="crearPregunta"
</form> tabindex="-1"
role="dialog"
aria-labelledby="exampleModalCenterTitle"
aria-hidden="true"
>
<div class="modal-dialog modal-dialog-centered" role="document">
<div class="modal-content">
<form
autocomplete="off"
class="ds-form"
name="editFormQuestion"
role="form"
novalidate
(ngSubmit)="saveQuestion()"
[formGroup]="editFormQuestion"
>
<div class="modal-header">
<h1 class="modal-title" id="exampleModalLongTitle1">Crear Pregunta</h1>
</div>
<div class="modal-body">
<!-- Survey Create Question Modal -->
<div>
<jhi-alert-error></jhi-alert-error>
<div class="form-group">
<label class="form-control-label" for="field_nombre">Pregunta</label>
<input type="text" class="form-control" name="nombre" id="field_nombre2" data-cy="nombre" formControlName="nombre" />
<div
*ngIf="
editFormQuestion.get('nombre')!.invalid &&
(editFormQuestion.get('nombre')!.dirty || editFormQuestion.get('nombre')!.touched)
"
>
<small
class="form-text text-danger"
*ngIf="editFormQuestion.get('nombre')?.errors?.required"
jhiTranslate="entity.validation.required"
>
This field is required.
</small>
<small
class="form-text text-danger"
*ngIf="editFormQuestion.get('nombre')?.errors?.minlength"
jhiTranslate="entity.validation.minlength"
[translateValues]="{ min: 1 }"
>
This field is required to be at least 1 characters.
</small>
<small
class="form-text text-danger"
*ngIf="editFormQuestion.get('nombre')?.errors?.maxlength"
jhiTranslate="entity.validation.maxlength"
[translateValues]="{ max: 500 }"
>
This field cannot be longer than 500 characters.
</small>
</div>
</div>
<!-- Custom Form Group (Closed & Open Question Validation) -->
<div class="form-group">
<label class="form-control-label" for="field_tipo">Tipo de pregunta</label>
<select class="form-control" name="tipopregunta" formControlName="tipopregunta" id="field_tipo2" data-cy="tipopregunta">
<option selected value="CLOSED">Opción multiple</option>
<option value="OPEN">Respuesta abierta</option>
</select>
<div
*ngIf="
editFormQuestion.get('tipopregunta')!.invalid &&
(editFormQuestion.get('tipopregunta')!.dirty || editFormQuestion.get('tipopregunta')!.touched)
"
>
<small
class="form-text text-danger"
*ngIf="editFormQuestion.get('tipopregunta')?.errors?.required"
jhiTranslate="entity.validation.required"
>
This field is required.
</small>
</div>
</div>
<ng-container *ngIf="editFormQuestion.get('tipopregunta')!.value === 'CLOSED'">
<div class="form-group">
<label class="form-control-label" jhiTranslate="dataSurveyApp.ePreguntaCerrada.tiporespuesta" for="field_tipo">Tipo</label>
<select class="form-control" name="tipo" formControlName="tipo" id="field_tipo" data-cy="tipo">
<option selected value="SINGLE">{{ 'dataSurveyApp.PreguntaCerradaTipo.SINGLE' | translate }}</option>
<option value="MULTIPLE">{{ 'dataSurveyApp.PreguntaCerradaTipo.MULTIPLE' | translate }}</option>
</select>
<div
*ngIf="
editFormQuestion.get('tipo')!.invalid && (editFormQuestion.get('tipo')!.dirty || editFormQuestion.get('tipo')!.touched)
"
>
<small
class="form-text text-danger"
*ngIf="editFormQuestion.get('tipo')?.errors?.required"
jhiTranslate="entity.validation.required"
>
This field is required.
</small>
</div>
</div>
</ng-container>
<div class="form-group">
<label class="form-control-label" for="field_opcional">Opcional</label>
<input type="checkbox" class="form-check" name="opcional" id="field_opcional" data-cy="opcional" formControlName="opcional" />
<div
*ngIf="
editFormQuestion.get('opcional')!.invalid &&
(editFormQuestion.get('opcional')!.dirty || editFormQuestion.get('opcional')!.touched)
"
>
<small
class="form-text text-danger"
*ngIf="editFormQuestion.get('opcional')?.errors?.required"
jhiTranslate="entity.validation.required"
>
This field is required.
</small>
</div>
</div>
</div>
</div>
<div class="modal-footer">
<input id="createAnotherQuestion" type="checkbox" (change)="createAnotherQuestionChange($event)" />
<label for="createAnotherQuestion">Crear otra</label>
<button id="cancelBtnQuestion" type="button" class="ds-btn ds-btn--secondary" data-dismiss="modal">
<fa-icon icon="arrow-left"></fa-icon>&nbsp;&nbsp;<span jhiTranslate="entity.action.cancel">Cancel</span>
</button>
<button
type="submit"
id="save-question"
data-cy="entityCreateSaveButton"
class="ds-btn ds-btn--primary"
[disabled]="editFormQuestion.invalid || isSaving"
>
<span jhiTranslate="entity.action.create">Create</span>
</button>
</div>
</form>
</div>
</div> </div>
</div> </div>

0
src/main/webapp/app/entities/plantilla/update/plantilla-update.component.spec.ts → src/main/webapp/app/entities/plantilla/update/plantilla-update.component.tmpSpec.ts
View File

437
src/main/webapp/app/entities/plantilla/update/plantilla-update.component.ts
View File

@ -1,4 +1,9 @@
import { Component, OnInit } from '@angular/core'; import { PPreguntaAbierta, IPPreguntaAbierta } from './../../p-pregunta-abierta/p-pregunta-abierta.model';
import { PPreguntaCerrada } from './../../p-pregunta-cerrada/p-pregunta-cerrada.model';
import { PPreguntaCerradaOpcion, IPPreguntaCerradaOpcion } from './../../p-pregunta-cerrada-opcion/p-pregunta-cerrada-opcion.model';
import { PPreguntaAbiertaService } from './../../p-pregunta-abierta/service/p-pregunta-abierta.service';
import { PPreguntaCerradaOpcionService } from './../../p-pregunta-cerrada-opcion/service/p-pregunta-cerrada-opcion.service';
import { AfterViewChecked, Component, OnInit } from '@angular/core';
import { HttpResponse } from '@angular/common/http'; import { HttpResponse } from '@angular/common/http';
import { FormBuilder, Validators } from '@angular/forms'; import { FormBuilder, Validators } from '@angular/forms';
import { ActivatedRoute } from '@angular/router'; import { ActivatedRoute } from '@angular/router';
@ -12,67 +17,258 @@ import { IPlantilla, Plantilla } from '../plantilla.model';
import { PlantillaService } from '../service/plantilla.service'; import { PlantillaService } from '../service/plantilla.service';
import { ICategoria } from 'app/entities/categoria/categoria.model'; import { ICategoria } from 'app/entities/categoria/categoria.model';
import { CategoriaService } from 'app/entities/categoria/service/categoria.service'; import { CategoriaService } from 'app/entities/categoria/service/categoria.service';
import { IUsuarioExtra } from 'app/entities/usuario-extra/usuario-extra.model';
import { UsuarioExtraService } from 'app/entities/usuario-extra/service/usuario-extra.service';
import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
import { IPPreguntaCerrada } from 'app/entities/p-pregunta-cerrada/p-pregunta-cerrada.model';
import { PPreguntaCerradaService } from 'app/entities/p-pregunta-cerrada/service/p-pregunta-cerrada.service';
import { PPreguntaCerradaDeleteDialogComponent } from 'app/entities/p-pregunta-cerrada/delete/p-pregunta-cerrada-delete-dialog.component';
import { faTimes, faPlus, faQuestion, faPollH, faEye } from '@fortawesome/free-solid-svg-icons';
import { PreguntaCerradaTipo } from 'app/entities/enumerations/pregunta-cerrada-tipo.model';
import { PlantillaDeleteQuestionDialogComponent } from '../plantilla-delete-question-dialog/plantilla-delete-question-dialog.component';
import { PlantillaDeleteOptionDialogComponent } from '../plantilla-delete-option-dialog/plantilla-delete-option-dialog.component';
import { ParametroAplicacionService } from './../../parametro-aplicacion/service/parametro-aplicacion.service';
import { IParametroAplicacion } from './../../parametro-aplicacion/parametro-aplicacion.model';
import { Router } from '@angular/router';
@Component({ @Component({
selector: 'jhi-plantilla-update', selector: 'jhi-plantilla-update',
templateUrl: './plantilla-update.component.html', templateUrl: './plantilla-update.component.html',
}) })
export class PlantillaUpdateComponent implements OnInit { export class PlantillaUpdateComponent implements OnInit, AfterViewChecked {
faTimes = faTimes;
faPlus = faPlus;
faPollH = faPollH;
faQuestion = faQuestion;
faEye = faEye;
isSaving = false; isSaving = false;
isSavingQuestion = false;
categoriasSharedCollection: ICategoria[] = []; categoriasSharedCollection: ICategoria[] = [];
usuarioExtrasSharedCollection: IUsuarioExtra[] = [];
editForm = this.fb.group({ editForm = this.fb.group({
id: [], id: [],
nombre: [null, [Validators.minLength(1), Validators.maxLength(50)]], nombre: [null, [Validators.required, Validators.minLength(1), Validators.maxLength(500)]],
descripcion: [],
fechaCreacion: [null, [Validators.required]],
fechaPublicacionTienda: [],
estado: [null, [Validators.required]],
precio: [null, [Validators.required]],
categoria: [],
}); });
editFormQuestion = this.fb.group({
id: [],
nombre: [null, [Validators.required, Validators.minLength(1), Validators.maxLength(500)]],
tipo: [PreguntaCerradaTipo.SINGLE],
opcional: [false],
tipopregunta: ['CLOSED'],
});
pPreguntas?: any[];
pPreguntasOpciones?: any[];
plantilla: Plantilla | null = null;
parametrosAplicacion?: IParametroAplicacion | null = null;
isLoading = false;
createAnother: Boolean = false;
createAnotherQuestion: Boolean = false;
selectedQuestionToCreateOption: IPPreguntaCerrada | null = null;
constructor( constructor(
protected plantillaService: PlantillaService, protected plantillaService: PlantillaService,
protected categoriaService: CategoriaService, protected categoriaService: CategoriaService,
protected usuarioExtraService: UsuarioExtraService,
protected activatedRoute: ActivatedRoute, protected activatedRoute: ActivatedRoute,
protected fb: FormBuilder protected fb: FormBuilder,
protected modalService: NgbModal,
protected pPreguntaCerradaService: PPreguntaCerradaService,
protected pPreguntaCerradaOpcionService: PPreguntaCerradaOpcionService,
protected parametroAplicacionService: ParametroAplicacionService,
protected pPreguntaAbiertaService: PPreguntaAbiertaService,
protected router: Router
) {} ) {}
loadAll(): void {
this.isLoading = true;
this.plantillaService.findQuestions(this.plantilla?.id!).subscribe(
(res: any) => {
this.isLoading = false;
this.pPreguntas = res.body ?? [];
},
() => {
this.isLoading = false;
}
);
this.plantillaService.findQuestionsOptions(this.plantilla?.id!).subscribe(
(res: any) => {
this.isLoading = false;
this.pPreguntasOpciones = res.body ?? [];
},
() => {
this.isLoading = false;
}
);
}
async loadAplicationParameters(): Promise<void> {
const params = await this.parametroAplicacionService.find(1).toPromise();
this.parametrosAplicacion = params.body;
}
ngOnInit(): void { ngOnInit(): void {
this.activatedRoute.data.subscribe(({ plantilla }) => { this.activatedRoute.data.subscribe(({ plantilla }) => {
if (plantilla.id === undefined) { if (plantilla.id === undefined) {
const today = dayjs().startOf('day'); const today = dayjs().startOf('day');
plantilla.fechaCreacion = today; plantilla.fechaCreacion = today;
plantilla.fechaPublicacionTienda = today; plantilla.fechaPublicacion = today;
plantilla.fechaFinalizar = today;
plantilla.fechaFinalizada = today;
} else {
this.plantilla = plantilla;
this.loadAll();
this.loadAplicationParameters();
} }
this.updateForm(plantilla); // this.updateForm(plantilla);
this.loadRelationshipsOptions(); // this.loadRelationshipsOptions();
}); });
} }
ngAfterViewChecked(): void {
// this.initListeners();
}
trackId(index: number, item: IPPreguntaCerrada): number {
return item.id!;
}
delete(pPreguntaCerrada: IPPreguntaCerrada): void {
const modalRef = this.modalService.open(PPreguntaCerradaDeleteDialogComponent, { size: 'lg', backdrop: 'static' });
modalRef.componentInstance.pPreguntaCerrada = pPreguntaCerrada;
// unsubscribe not needed because closed completes on modal close
modalRef.closed.subscribe(reason => {
if (reason === 'deleted') {
this.loadAll();
}
});
}
// initListeners(): void {
// const checkboxes = document.getElementsByClassName('ds-survey--checkbox');
// for (let i = 0; i < checkboxes.length; i++) {
// checkboxes[i].addEventListener('click', e => {
// if ((e.target as HTMLInputElement).checked) {
// (e.target as HTMLElement).offsetParent!.classList.add('ds-survey--closed-option--active');
// } else {
// (e.target as HTMLElement).offsetParent!.classList.remove('ds-survey--closed-option--active');
// }
// });
// }
// }
previousState(): void { previousState(): void {
window.history.back(); window.history.back();
} }
save(): void { publishSurvey(): void {}
this.isSaving = true;
const plantilla = this.createFromForm(); finishSurvey(): void {}
if (plantilla.id !== undefined) {
this.subscribeToSaveResponse(this.plantillaService.update(plantilla)); addOption(event: any): void {}
} else {
this.subscribeToSaveResponse(this.plantillaService.create(plantilla)); openPreview() {
const surveyId = this.plantilla?.id;
this.router.navigate(['/plantilla', surveyId, 'preview']);
}
resetForm(event: any): void {
this.editForm.reset();
if (event !== null) {
const id = event.target.dataset.id;
this.pPreguntaCerradaService.find(id).subscribe(e => {
this.selectedQuestionToCreateOption = e.body;
});
} }
} }
trackCategoriaById(index: number, item: ICategoria): number { deleteQuestion(event: any) {
const modalRef = this.modalService.open(PlantillaDeleteQuestionDialogComponent, { size: 'lg', backdrop: 'static' });
modalRef.closed.subscribe(reason => {
if (reason === 'confirm') {
const id = event.target.dataset.id;
if (event.target.dataset.type) {
// Delete closed question
const questionElement = (event.target as HTMLElement).parentElement?.parentElement;
const optionIdsToDelete: number[] = [];
// Get options IDs
questionElement?.childNodes.forEach((e, i) => {
if (e.nodeName !== 'DIV') return;
if (i === 0) return;
if ((e as HTMLElement).dataset.id === undefined) return;
if (!(e as HTMLElement).classList.contains('can-delete')) return;
let optionId = (e as HTMLElement).dataset.id;
optionIdsToDelete.push(+optionId!);
});
if (optionIdsToDelete.length === 0) {
this.pPreguntaCerradaService.delete(id).subscribe(e => {
this.loadAll();
});
} else {
// Delete question options
this.pPreguntaCerradaOpcionService.deleteMany(optionIdsToDelete).subscribe(e => {
// Delete question
this.pPreguntaCerradaService.delete(id).subscribe(e => {
this.loadAll();
});
});
}
} else {
// Delete open question
this.pPreguntaAbiertaService.delete(id).subscribe(e => {
this.loadAll();
});
}
}
});
}
deleteOption(event: any): void {
const modalRef = this.modalService.open(PlantillaDeleteOptionDialogComponent, { size: 'lg', backdrop: 'static' });
modalRef.closed.subscribe(reason => {
if (reason === 'confirm') {
const id = event.target.dataset.optionid;
this.pPreguntaCerradaOpcionService.delete(id).subscribe(e => {
this.pPreguntas = [];
this.pPreguntasOpciones = [];
this.loadAll();
});
}
});
}
save(): void {
this.isSaving = true;
const pPreguntaCerradaOpcion = this.createFromForm();
if (pPreguntaCerradaOpcion.id !== undefined) {
this.subscribeToSaveResponse(this.pPreguntaCerradaOpcionService.update(pPreguntaCerradaOpcion));
} else {
this.subscribeToSaveResponse(
this.pPreguntaCerradaOpcionService.create(pPreguntaCerradaOpcion, this.selectedQuestionToCreateOption?.id!)
);
}
}
trackPPreguntaCerradaById(index: number, item: IPPreguntaCerrada): number {
return item.id!; return item.id!;
} }
protected subscribeToSaveResponse(result: Observable<HttpResponse<IPlantilla>>): void { protected subscribeToSaveResponse(result: Observable<HttpResponse<IPPreguntaCerradaOpcion>>): void {
result.pipe(finalize(() => this.onSaveFinalize())).subscribe( result.pipe(finalize(() => this.onSaveFinalize())).subscribe(
() => this.onSaveSuccess(), () => this.onSaveSuccess(),
() => this.onSaveError() () => this.onSaveError()
@ -80,7 +276,14 @@ export class PlantillaUpdateComponent implements OnInit {
} }
protected onSaveSuccess(): void { protected onSaveSuccess(): void {
this.previousState(); // this.previousState();
this.resetForm(null);
this.pPreguntas = [];
this.pPreguntasOpciones = [];
this.loadAll();
if (!this.createAnother) {
$('#cancelBtn').click();
}
} }
protected onSaveError(): void { protected onSaveError(): void {
@ -91,51 +294,159 @@ export class PlantillaUpdateComponent implements OnInit {
this.isSaving = false; this.isSaving = false;
} }
protected updateForm(plantilla: IPlantilla): void { protected createFromForm(): IPPreguntaCerradaOpcion {
this.editForm.patchValue({ return {
id: plantilla.id, ...new PPreguntaCerradaOpcion(),
nombre: plantilla.nombre, id: undefined,
descripcion: plantilla.descripcion, nombre: this.editForm.get(['nombre'])!.value,
fechaCreacion: plantilla.fechaCreacion ? plantilla.fechaCreacion.format(DATE_TIME_FORMAT) : null, orden: 10,
fechaPublicacionTienda: plantilla.fechaPublicacionTienda ? plantilla.fechaPublicacionTienda.format(DATE_TIME_FORMAT) : null, pPreguntaCerrada: this.selectedQuestionToCreateOption,
estado: plantilla.estado, };
precio: plantilla.precio, }
categoria: plantilla.categoria,
});
this.categoriasSharedCollection = this.categoriaService.addCategoriaToCollectionIfMissing( createAnotherChange(event: any) {
this.categoriasSharedCollection, this.createAnother = event.target.checked;
plantilla.categoria }
createQuestion(): void {
const surveyId = this.plantilla?.id;
}
protected createFromFormClosedQuestion(): IPPreguntaCerrada {
return {
// ...new PPreguntaCerrada(),
id: undefined,
nombre: this.editFormQuestion.get(['nombre'])!.value,
tipo: this.editFormQuestion.get(['tipo'])!.value,
opcional: this.editFormQuestion.get(['opcional'])!.value,
orden: 10,
plantilla: this.plantilla,
};
}
protected createFromFormOpenQuestion(): IPPreguntaAbierta {
return {
// ...new PPreguntaAbierta(),
id: undefined,
nombre: this.editFormQuestion.get(['nombre'])!.value,
opcional: this.editFormQuestion.get(['opcional'])!.value,
orden: 10,
plantilla: this.plantilla,
};
}
createAnotherQuestionChange(event: any) {
this.createAnotherQuestion = event.target.checked;
}
saveQuestion(): void {
this.isSavingQuestion = true;
const tipoPregunta = this.editFormQuestion.get(['tipopregunta'])!.value;
if (tipoPregunta === 'CLOSED') {
const pPreguntaCerrada = this.createFromFormClosedQuestion();
if (pPreguntaCerrada.id !== undefined) {
this.subscribeToSaveResponseQuestionClosed(this.pPreguntaCerradaService.update(pPreguntaCerrada));
} else {
this.subscribeToSaveResponseQuestionClosed(this.pPreguntaCerradaService.create(pPreguntaCerrada));
}
} else if (tipoPregunta === 'OPEN') {
const pPreguntaAbierta = this.createFromFormOpenQuestion();
if (pPreguntaAbierta.id !== undefined) {
this.subscribeToSaveResponseQuestionOpen(this.pPreguntaAbiertaService.update(pPreguntaAbierta));
} else {
this.subscribeToSaveResponseQuestionOpen(this.pPreguntaAbiertaService.create(pPreguntaAbierta));
}
}
}
protected subscribeToSaveResponseQuestionClosed(result: Observable<HttpResponse<IPPreguntaCerrada>>): void {
result.pipe(finalize(() => this.onSaveFinalizeQuestion())).subscribe(
() => this.onSaveSuccessQuestion(),
() => this.onSaveErrorQuestion()
); );
} }
protected loadRelationshipsOptions(): void { protected subscribeToSaveResponseQuestionOpen(result: Observable<HttpResponse<IPPreguntaAbierta>>): void {
this.categoriaService result.pipe(finalize(() => this.onSaveFinalizeQuestion())).subscribe(
.query() () => this.onSaveSuccessQuestion(),
.pipe(map((res: HttpResponse<ICategoria[]>) => res.body ?? [])) () => this.onSaveErrorQuestion()
.pipe( );
map((categorias: ICategoria[]) =>
this.categoriaService.addCategoriaToCollectionIfMissing(categorias, this.editForm.get('categoria')!.value)
)
)
.subscribe((categorias: ICategoria[]) => (this.categoriasSharedCollection = categorias));
} }
protected createFromForm(): IPlantilla { protected onSaveSuccessQuestion(): void {
return { this.editFormQuestion.reset({ tipo: PreguntaCerradaTipo.SINGLE, tipopregunta: 'CLOSED', opcional: false });
...new Plantilla(), this.editForm.reset();
id: this.editForm.get(['id'])!.value, this.pPreguntas = [];
nombre: this.editForm.get(['nombre'])!.value, this.pPreguntasOpciones = [];
descripcion: this.editForm.get(['descripcion'])!.value, this.loadAll();
fechaCreacion: this.editForm.get(['fechaCreacion'])!.value if (!this.createAnotherQuestion) {
? dayjs(this.editForm.get(['fechaCreacion'])!.value, DATE_TIME_FORMAT) $('#cancelBtnQuestion').click();
: undefined, }
fechaPublicacionTienda: this.editForm.get(['fechaPublicacionTienda'])!.value }
? dayjs(this.editForm.get(['fechaPublicacionTienda'])!.value, DATE_TIME_FORMAT)
: undefined, protected onSaveErrorQuestion(): void {
estado: this.editForm.get(['estado'])!.value, // Api for inheritance.
precio: this.editForm.get(['precio'])!.value, }
categoria: this.editForm.get(['categoria'])!.value,
}; protected onSaveFinalizeQuestion(): void {
this.isSavingQuestion = false;
}
updateTemplateName(event: any) {
const updatedSurveyName = event.target.innerText;
if (updatedSurveyName !== this.plantilla?.nombre) {
const survey = { ...this.plantilla };
survey.nombre = updatedSurveyName;
this.plantillaService.update(survey).subscribe(res => {});
}
}
updateQuestionName(event: any): void {
const questionType = event.target.dataset.tipo;
const questionId = event.target.dataset.id;
const questionName = event.target.innerText;
if (questionType) {
// Closed question
this.pPreguntaCerradaService.find(questionId).subscribe(res => {
const pPreguntaCerrada: PPreguntaCerrada | null = res.body ?? null;
const updatedPPreguntaCerrada = { ...pPreguntaCerrada };
if (questionName !== pPreguntaCerrada?.nombre && pPreguntaCerrada !== null) {
updatedPPreguntaCerrada.nombre = questionName;
this.pPreguntaCerradaService.update(updatedPPreguntaCerrada).subscribe(updatedQuestion => {
console.log(updatedQuestion);
});
}
});
} else {
// Open question
// Closed question
this.pPreguntaAbiertaService.find(questionId).subscribe(res => {
const pPreguntaAbierta: PPreguntaAbierta | null = res.body ?? null;
const updatedPPreguntaAbierta = { ...pPreguntaAbierta };
if (questionName !== pPreguntaAbierta?.nombre && pPreguntaAbierta !== null) {
updatedPPreguntaAbierta.nombre = questionName;
this.pPreguntaAbiertaService.update(updatedPPreguntaAbierta).subscribe(updatedQuestion => {
console.log(updatedQuestion);
});
}
});
}
// const questionId = event.target.dataset.id;
// const survey = { ...this.plantilla };
// survey.nombre = updatedQuestionName;
// // Prevent user update by setting to null
// survey.usuarioExtra!.user = null;
// this.plantillaService.updateSurvey(survey).subscribe(res => {});
}
trackCategoriaById(index: number, item: ICategoria): number {
return item.id!;
}
trackUsuarioExtraById(index: number, item: IUsuarioExtra): number {
return item.id!;
} }
} }

7
src/main/webapp/app/login/login.component.ts
View File

@ -94,7 +94,6 @@ export class LoginComponent implements OnInit, AfterViewInit {
} }
}, },
response => { response => {
debugger;
if (response.status == 401 && response.error.detail == 'Bad credentials') { if (response.status == 401 && response.error.detail == 'Bad credentials') {
this.activateGoogle(); this.activateGoogle();
} else { } else {
@ -109,7 +108,6 @@ export class LoginComponent implements OnInit, AfterViewInit {
} }
processError(response: HttpErrorResponse): void { processError(response: HttpErrorResponse): void {
debugger;
if (response.status === 400 && response.error.type === LOGIN_ALREADY_USED_TYPE) { if (response.status === 400 && response.error.type === LOGIN_ALREADY_USED_TYPE) {
this.errorUserExists = true; this.errorUserExists = true;
} else if (response.status === 400 && response.error.type === EMAIL_ALREADY_USED_TYPE) { } else if (response.status === 400 && response.error.type === EMAIL_ALREADY_USED_TYPE) {
@ -153,7 +151,6 @@ export class LoginComponent implements OnInit, AfterViewInit {
login(): void { login(): void {
this.error = false; this.error = false;
this.userSuspended = false; this.userSuspended = false;
debugger;
this.loginService this.loginService
.login({ .login({
username: this.loginForm.get('username')!.value, username: this.loginForm.get('username')!.value,
@ -162,9 +159,6 @@ export class LoginComponent implements OnInit, AfterViewInit {
}) })
.subscribe( .subscribe(
value => { value => {
debugger;
console.log(value);
/*if (value?.activated == false){ /*if (value?.activated == false){
this.userSuspended = true; this.userSuspended = true;
@ -178,7 +172,6 @@ export class LoginComponent implements OnInit, AfterViewInit {
// } // }
}, },
response => { response => {
debugger;
if (response.status == 401 && response.error.detail == 'Bad credentials') { if (response.status == 401 && response.error.detail == 'Bad credentials') {
this.error = true; this.error = true;
} else { } else {

1
src/main/webapp/app/login/login.service.ts
View File

@ -12,7 +12,6 @@ export class LoginService {
constructor(private accountService: AccountService, private authServerProvider: AuthServerProvider) {} constructor(private accountService: AccountService, private authServerProvider: AuthServerProvider) {}
login(credentials: Login): Observable<Account | null> { login(credentials: Login): Observable<Account | null> {
debugger;
return this.authServerProvider.login(credentials).pipe(mergeMap(() => this.accountService.identity(true))); return this.authServerProvider.login(credentials).pipe(mergeMap(() => this.accountService.identity(true)));
} }