Skip to content

Commit

Permalink
MONITOREO - Concepto Turneable: check agenda dinamica (#66)
Browse files Browse the repository at this point in the history
* feat(MONIT): agrega nuevo switch agenda dinamica

* fix(TURNEABLES): cambia name de text

---------

Co-authored-by: silviroa <silviroa@gmail.com>
  • Loading branch information
maring0019 and silviroa committed Apr 11, 2024
1 parent 410e5f5 commit 147fa9d
Show file tree
Hide file tree
Showing 6 changed files with 51 additions and 20 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,6 @@ export interface IConceptoTurneable {
semanticTag: string;
noNominalizada: boolean;
auditable: boolean;
agendaDinamica: boolean;
ambito: string[];
}
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ export class ConceptosTurneablesComponent implements OnInit, OnDestroy {
this.plex.confirm('Agregar concepto turneable "' + conceptoTurneable.term + '"', '¿Desea agregar?').then(confirmacion => {
if (confirmacion) {
this.conceptoTurneableService.post(conceptoTurneable).subscribe(resultado => {
this.plex.info('info', 'El concepto turneable fue agregado');
this.plex.info('success', 'El concepto turneable fue agregado');
this.toggleAgregar();
});
}
Expand All @@ -108,7 +108,7 @@ export class ConceptosTurneablesComponent implements OnInit, OnDestroy {

onEditarConceptoTurneable(cambios) {
this.conceptoTurneableService.patch(this.conceptoSeleccionado.id, cambios).subscribe(resultado => {
this.plex.info('info', 'El concepto turneable fue editado');
this.plex.info('success', 'El concepto turneable fue editado');
this.conceptoSeleccionado = resultado;
this.conceptosTurneables.forEach(concepto => {
if (concepto.id === resultado.id) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,55 +13,49 @@
<tbody>
<tr>
<td>
<strong>Concept ID:</strong>
<plex-text placeholder="Concept ID" name="usuario"
<plex-text placeholder="Concept ID" name="conceptId" label="Concept ID:"
[(ngModel)]="conceptoTurneable.conceptId" [disabled]="true">
</plex-text>
</td>
</tr>
<tr>
<td>
<strong>Term:</strong>
<plex-text placeholder="Term" name="usuario" [(ngModel)]="conceptoTurneable.term"
[disabled]="true">
<plex-text placeholder="Term" name="descripcion" label="Term:"
[(ngModel)]="conceptoTurneable.term" [disabled]="true">
</plex-text>
</td>
</tr>

<tr>
<td>
<strong>FSN:</strong>
<plex-text placeholder="fsn" name="usuario" [(ngModel)]="conceptoTurneable.fsn"
<plex-text placeholder="fsn" name="fsn" label="FSN:" [(ngModel)]="conceptoTurneable.fsn"
[disabled]="true">
</plex-text>
</td>
</tr>

<tr>
<td>
<strong>Semantic Tag:</strong>
<plex-text placeholder="Semantic Tag" name="usuario"
<plex-text placeholder="Semantic Tag" name="semantigTag" label="Semantic Tag:"
[(ngModel)]="conceptoTurneable.semanticTag" [disabled]="true">
</plex-text>
</td>
</tr>

<tr>
<td>
<strong>Ambito:</strong>
<plex-select [multiple]="true" [readonly]="!editable" [(ngModel)]="ambitoActual"
[data]="ambitos" label-field="nombre" placeholder="Seleccione los ambitos">
<plex-select [multiple]="true" [readonly]="!editable" label="Ambito:"
[(ngModel)]="ambitoActual" [data]="ambitos"
placeholder="Seleccione los ambitos">
</plex-select>
</td>
</tr>
<tr>
<td *ngIf="!editable">
<strong>Nominalizada:</strong>
<plex-text *ngIf="!conceptoTurneable.noNominalizada" [(ngModel)]="paraTrue"
name="usuario" [disabled]="true">
name="nominalizada" [disabled]="true">
</plex-text>
<plex-text *ngIf="conceptoTurneable.noNominalizada" [(ngModel)]="paraFalse"
name="usuario" [disabled]="true">
name="nominalizada" [disabled]="true">
</plex-text>
</td>
<td *ngIf="editable">
Expand All @@ -74,10 +68,10 @@
<tr>
<td *ngIf="!editable">
<strong>Auditable:</strong>
<plex-text *ngIf="!conceptoTurneable.auditable" [(ngModel)]="paraFalse" name="usuario"
<plex-text *ngIf="!conceptoTurneable.auditable" [(ngModel)]="paraFalse" name="auditable"
[disabled]="true">
</plex-text>
<plex-text *ngIf="conceptoTurneable.auditable" [(ngModel)]="paraTrue" name="usuario"
<plex-text *ngIf="conceptoTurneable.auditable" [(ngModel)]="paraTrue" name="auditable"
[disabled]="true">
</plex-text>
</td>
Expand All @@ -88,6 +82,23 @@
</plex-bool>
</td>
</tr>
<tr>
<td *ngIf="!editable">
<strong>Agenda dinámica:</strong>
<plex-text *ngIf="!conceptoTurneable.agendaDinamica" [(ngModel)]="paraFalse"
name="agendaDinamica" [disabled]="true">
</plex-text>
<plex-text *ngIf="conceptoTurneable.agendaDinamica" [(ngModel)]="paraTrue"
name="agendaDinamica" [disabled]="true">
</plex-text>
</td>
<td *ngIf="editable">
<strong>Agenda dinámica:</strong>
&nbsp;
<plex-bool [(ngModel)]="agendaDinamica" type="slide" name="agendaDinamica">
</plex-bool>
</td>
</tr>
</tbody>
</table>
</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ export class DetalleConceptoTurneableComponent implements OnInit, OnChanges {

auditable;
nominalizada;
agendaDinamica;
editable = false;
paraFalse = 'NO';
paraTrue = 'SI';
Expand Down Expand Up @@ -40,6 +41,7 @@ export class DetalleConceptoTurneableComponent implements OnInit, OnChanges {
const cambios = {
noNominalizada: !this.nominalizada,
auditable: this.auditable,
agendaDinamica: this.agendaDinamica,
ambito: this.objectSelect2array(this.ambitoActual),
};
this.toggleEdicion();
Expand All @@ -63,6 +65,13 @@ export class DetalleConceptoTurneableComponent implements OnInit, OnChanges {
} else {
this.auditable = false;
}

if (this.conceptoTurneable.agendaDinamica) {
this.agendaDinamica = true;
} else {
this.agendaDinamica = false;
}

// carga los posibles ambitos
this.ambitos = [
{
Expand Down Expand Up @@ -128,6 +137,7 @@ export class DetalleConceptoTurneableComponent implements OnInit, OnChanges {
return (
(this.conceptoTurneable.noNominalizada !== !this.nominalizada) ||
(this.conceptoTurneable.auditable !== this.auditable) ||
(this.conceptoTurneable.agendaDinamica !== this.agendaDinamica) ||
(!this.arrayEquals(this.conceptoTurneable.ambito, this.objectSelect2array(this.ambitoActual)))
);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,14 @@
</plex-bool>
</td>
</tr>
<tr>
<td>
<strong>Agenda dinámica:</strong>
&nbsp;
<plex-bool [(ngModel)]="agendaDinamica" type="slide" name="agendaDinamica">
</plex-bool>
</td>
</tr>
</tbody>
</table>
</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ export class NuevoConceptoTurneableComponent {
semanticTag: null,
noNominalizada: null,
auditable: null,
agendaDinamica: null,
ambito: null,
};
nominalizada = false;
Expand Down

0 comments on commit 147fa9d

Please sign in to comment.