Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/actualizadoBotonEjecutar'
Browse files Browse the repository at this point in the history
  • Loading branch information
jortilles committed Dec 16, 2024
2 parents ccd2371 + 81709f1 commit 5359b86
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 13 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -576,7 +576,7 @@ <h5 i18n="@@resumenFiltrosInformeH6">

<p-footer class="footer" appendTo="body" style="z-index: 10000;">
<div class="p-dialog-buttonpanel p-widget-content p-helper-clearfix text-right">
<button *ngIf="!hiddenButtonExecuter" type="button" pButton (click)="runManualQuery()" [disabled]="disableRunQuery()"
<button type="button" pButton (click)="runManualQuery()" [disabled]="disableRunQuery()"
icon="fa fa-flask" class="p-button-success ml-2" i18n-label="@@ejecutarBtn" label="Ejecutar">
</button>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -196,11 +196,6 @@ export class EdaBlankPanelComponent implements OnInit {
public copyConfigCrossTable: any = {};
public dragAndDropAvailable: boolean = false;



// Ocultar el boton de ejecutar
public hiddenButtonExecuter: boolean = false;

constructor(
private route: ActivatedRoute,
public queryBuilder: QueryBuilderService,
Expand Down Expand Up @@ -546,8 +541,6 @@ export class EdaBlankPanelComponent implements OnInit {
//not saved alert message
this.dashboardService._notSaved.next(true);

// Se mantiene en falso luego de guardar
this.hiddenButtonExecuter = false;
}

public initObjectQuery() {
Expand Down Expand Up @@ -938,8 +931,6 @@ export class EdaBlankPanelComponent implements OnInit {
this.display_v.chart = '';
this.display_v.page_dialog = false;

// Despues de cancelar, el valor regresa a falso
this.hiddenButtonExecuter = false
}

/**
Expand Down Expand Up @@ -1139,7 +1130,6 @@ export class EdaBlankPanelComponent implements OnInit {
}

public handleTabChange(event: any): void {
this.hiddenButtonExecuter = !this.hiddenButtonExecuter;

this.index = event.index;
if (this.index === 1) {
Expand Down Expand Up @@ -1230,8 +1220,6 @@ export class EdaBlankPanelComponent implements OnInit {
* Runs actual query when execute button is pressed to check for heavy queries
*/
public runManualQuery = () => {
this.hiddenButtonExecuter = true;
// Para adquirir los valores de ejecución
QueryUtils.runManualQuery(this)
};

Expand Down

0 comments on commit 5359b86

Please sign in to comment.