diff --git a/src/app/components/calculator-results/calculator-results.component.ts b/src/app/components/calculator-results/calculator-results.component.ts index 27fa0e7242bfa1067805b376823138c2043ddc00..8d6de93b5fc06972b4e406cd8995db4bb2a24c0c 100644 --- a/src/app/components/calculator-results/calculator-results.component.ts +++ b/src/app/components/calculator-results/calculator-results.component.ts @@ -20,7 +20,7 @@ export class CalculatorResultsComponent implements AfterViewChecked { @Inject(forwardRef(() => GenericCalculatorComponent)) private calculatorComponent: GenericCalculatorComponent ) { } - // @TODO this system is sh*tty ! + // @TODO @Input() ? public set formulaire(f: FormulaireDefinition) { this._formulaire = f; } @@ -33,10 +33,6 @@ export class CalculatorResultsComponent implements AfterViewChecked { return r; } - public updateView() { - console.log("UPDATE VIEW (disabled)"); - } - public ngAfterViewChecked() { this.afterViewChecked.emit(); } diff --git a/src/app/components/generic-calculator/calculator.component.ts b/src/app/components/generic-calculator/calculator.component.ts index 4951178b602694cc61ae2cb9e09ccba988f93b13..2be2d3286c8719405e0e49abf95123703941e3ab 100644 --- a/src/app/components/generic-calculator/calculator.component.ts +++ b/src/app/components/generic-calculator/calculator.component.ts @@ -388,10 +388,6 @@ export class GenericCalculatorComponent implements OnInit, DoCheck, AfterViewChe this.appComponent.showProgressBar = true; this._computeClicked = true; this.showPBInputData = false; - // send resetForm to clear log - this._formulaire.notifyObservers({ - "action": "resetForm", - }, this._formulaire); // calculate module setTimeout(() => { this._formulaire.doCompute(); @@ -443,22 +439,6 @@ export class GenericCalculatorComponent implements OnInit, DoCheck, AfterViewChe } } - private setForm(f: FormulaireDefinition) { - if (this._formulaire !== undefined) { - this._formulaire.removeObserver(this); - } - this._formulaire = f; - if (this._formulaire !== undefined) { - this._formulaire.addObserver(this); - } - } - - private updateFormulaireResults(uid: string) { - if (this._formulaire.uid === uid) { - this.resultsComponent.updateView(); - } - } - // interface Observer update(sender: any, data: any): void { @@ -466,22 +446,13 @@ export class GenericCalculatorComponent implements OnInit, DoCheck, AfterViewChe switch (data["action"]) { case "currentFormChanged": const uid: string = data["formId"]; - this.setForm(this.formulaireService.getFormulaireFromId(uid)); + this._formulaire = (this.formulaireService.getFormulaireFromId(uid)); this.resultsComponent.formulaire = this._formulaire; this._calculatorNameComponent.model = this._formulaire; // reload localisation in all cases (it does not eat bread) this.formulaireService.updateFormulaireLocalisation(this._formulaire); break; } - } else if (sender instanceof FormulaireDefinition) { - let f: FormulaireDefinition; - switch (data["action"]) { - case "resetForm": // réinitialisation du formulaire - case "resultsUpdated": - f = sender as FormulaireDefinition; - this.updateFormulaireResults(f.uid); - break; - } } } @@ -557,8 +528,6 @@ export class GenericCalculatorComponent implements OnInit, DoCheck, AfterViewChe */ public onInputChange(event: any) { this._formulaire.resetResults([], (event ? event.symbol : undefined)); - // to refresh log components, that are fed manually (!) - this.resultsComponent.updateView(); } /** @@ -604,8 +573,6 @@ export class GenericCalculatorComponent implements OnInit, DoCheck, AfterViewChe // show proper form (actually subform elements) or proper results, // depending on what was clicked (this._formulaire as FormulairePrebarrage).nodeSelected(event.node); - // refresh results component - this.resultsComponent.updateView(); } public openHelp() { diff --git a/src/app/components/pab-results/pab-results.component.ts b/src/app/components/pab-results/pab-results.component.ts index 011ba0bd17074c38566133612e5f8d3d2b230ffe..51371098001905ed0d11cda2e91adeb1adf745a6 100644 --- a/src/app/components/pab-results/pab-results.component.ts +++ b/src/app/components/pab-results/pab-results.component.ts @@ -37,7 +37,6 @@ export class PabResultsComponent extends ResultsComponentDirective { if (rs.length > 0 && rs[0] instanceof PabResults) { this._pabResults = rs[0] as PabResults; } - // this.updateView(); } private mergeGlobalLog(result: Result, log: cLog) { diff --git a/src/app/components/pb-results/pb-results.component.ts b/src/app/components/pb-results/pb-results.component.ts index 666257c7d494546daa0c7ba490bb28d79d683367..034f24e0c6b27b3a529a78b3c18875740e2d3ae1 100644 --- a/src/app/components/pb-results/pb-results.component.ts +++ b/src/app/components/pb-results/pb-results.component.ts @@ -30,7 +30,6 @@ export class PbResultsComponent { this._pbResults = r as PrebarrageResults; } } - // this.updateView(); } public get pbResults() { diff --git a/src/app/components/remous-results/remous-results.component.ts b/src/app/components/remous-results/remous-results.component.ts index 4a18b7fb94aef158b8383eaae7d2e4bec5d67886..5762459e1237b17cd318d6a9fea67fe77eecc158 100644 --- a/src/app/components/remous-results/remous-results.component.ts +++ b/src/app/components/remous-results/remous-results.component.ts @@ -146,7 +146,6 @@ export class RemousResultsComponent extends ResultsComponentDirective { } } } - // this.updateView(); } public get log(): cLog { diff --git a/src/app/components/section-results/section-results.component.ts b/src/app/components/section-results/section-results.component.ts index 5d6acdeee086e1e2400cf1d9d822759eea839802..8590e0248ef42731bae54049ecd048f853a28023 100644 --- a/src/app/components/section-results/section-results.component.ts +++ b/src/app/components/section-results/section-results.component.ts @@ -37,7 +37,6 @@ export class SectionResultsComponent extends ResultsComponentDirective { } } } - // this.updateView(); this.drawSectionCanvas(); } diff --git a/src/app/formulaire/definition/form-definition.ts b/src/app/formulaire/definition/form-definition.ts index eb1dc8ad519424fda4068d05b1c7d66908e9eea0..9ebc4348b874fd2cee9ba78a8747893747c17c64 100644 --- a/src/app/formulaire/definition/form-definition.ts +++ b/src/app/formulaire/definition/form-definition.ts @@ -317,12 +317,6 @@ export abstract class FormulaireDefinition extends FormulaireNode implements Obs } } - protected notifyReset() { - this.notifyObservers({ - "action": "resetForm" - }, this); - } - /** * Forwards Nub's progress updated notification. * Used by CalculatorComponent to update progress bar @@ -337,8 +331,6 @@ export abstract class FormulaireDefinition extends FormulaireNode implements Obs */ public reset() { this.resetResults([], undefined, true); - // prévenir les composants qu'il faut détecter les changements - this.notifyReset(); } /** @@ -499,10 +491,6 @@ export abstract class FormulaireDefinition extends FormulaireNode implements Obs public doCompute() { // calculate module this.compute(); - // refresh results - this.notifyObservers({ - "action": "resultsUpdated", - }, this); } public resetFormResults() {}