diff --git a/src/app/app.component.ts b/src/app/app.component.ts
index 551d100ec9b2b23e98623647b15683070b8cfab0..6ecece466844187453151c5f754370e16e978af0 100644
--- a/src/app/app.component.ts
+++ b/src/app/app.component.ts
@@ -7,7 +7,6 @@ import { CdkDragDrop, moveItemInArray } from "@angular/cdk/drag-drop";
import { Observer, jalhydDateRev, jalhydVersion, CalculatorType, Session } from "jalhyd";
-import { environment } from "../environments/environment";
import { I18nService } from "./services/internationalisation.service";
import { FormulaireService } from "./services/formulaire.service";
import { FormulaireDefinition } from "./formulaire/definition/form-definition";
@@ -830,7 +829,7 @@ export class AppComponent implements OnInit, OnDestroy, Observer {
const existingNotes = Session.getInstance().documentation;
// load
try {
- const data = await this.formulaireService.loadSession(f, info)
+ const data = await this.formulaireService.loadSession(f, info);
if (data.hasErrors) {
this.notificationsService.notify(this.intlService.localizeText("ERROR_PROBLEM_LOADING_SESSION"), 3500);
} else {
@@ -851,7 +850,7 @@ export class AppComponent implements OnInit, OnDestroy, Observer {
}
}
}
- } catch(err) {
+ } catch (err) {
this.notificationsService.notify(this.intlService.localizeText("ERROR_LOADING_SESSION"), 3500);
console.error("error loading session - ", err);
// rollback to ensure session is clean
@@ -980,17 +979,16 @@ export class AppComponent implements OnInit, OnDestroy, Observer {
return runningPlatform;
}
- /**
- * détection de la fermeture de la page/navigateur et demande de confirmation
- */
- @HostListener("window:beforeunload", ["$event"]) confirmExit($event) {
- if (
- this.appSetupService.warnBeforeTabClose
- && environment.production // otherwise prevents dev server to reload app after recompiling
- ) {
- // affecter une valeur différente de null provoque l'affichage d'un dialogue de confirmation, mais le texte n'est pas affiché
- $event.returnValue = "Your data will be lost !";
- }
+ /**
+ * détection de la fermeture de la page/navigateur et demande de confirmation
+ */
+ @HostListener("window:beforeunload", [ "$event" ]) confirmExit($event) {
+ if (
+ this.appSetupService.warnBeforeTabClose
+ && ! isDevMode() // otherwise prevents dev server to reload app after recompiling
+ ) {
+ // affecter une valeur différente de null provoque l'affichage d'un dialogue de confirmation, mais le texte n'est pas affiché
+ $event.returnValue = "Your data will be lost !";
}
@HostListener("keydown", ["$event"]) onKeydown(event: any) {
diff --git a/src/app/app.module.ts b/src/app/app.module.ts
index 6c36ede63b3c31276206d3fbde2f054e8a09cdd7..a6f375b494be9832db1f7c25fb32ef0575dfb14f 100644
--- a/src/app/app.module.ts
+++ b/src/app/app.module.ts
@@ -86,7 +86,7 @@ import { LogDrawerComponent } from "./components/log-drawer/log-drawer.component
import { ParamLinkComponent } from "./components/param-link/param-link.component";
import { PabProfileChartComponent } from "./components/pab-profile-chart/pab-profile-chart.component";
import { PabTableComponent } from "./components/pab-table/pab-table.component";
-import { PbSchemaComponent } from './components/pb-schema/pb-schema.component';
+import { PbSchemaComponent } from "./components/pb-schema/pb-schema.component";
import { VariableResultsSelectorComponent } from "./components/variable-results-selector/variable-results-selector.component";
import { QuicknavComponent } from "./components/quicknav/quicknav.component";
import { ModulesDiagramComponent } from "./components/modules-diagram/modules-diagram.component";
diff --git a/src/app/components/calculator-list/calculator-list.component.ts b/src/app/components/calculator-list/calculator-list.component.ts
index 2c23ba423ef39139bd34ccbfc7168b75bfb3e73a..8a6b1c52831eb48cb9ab67c42f71c06f60bdb641 100644
--- a/src/app/components/calculator-list/calculator-list.component.ts
+++ b/src/app/components/calculator-list/calculator-list.component.ts
@@ -282,7 +282,7 @@ export class CalculatorListComponent implements OnInit {
const d = await this.httpService.httpGetBlobRequestPromise(realPath);
const f: any = new Blob([d], { type: "application/json" });
this.appComponent.loadSessionFile(f);
- } catch(e) {
+ } catch (e) {
console.error("could not load session file", e);
}
}
diff --git a/src/app/components/dialog-load-session/dialog-load-session.component.ts b/src/app/components/dialog-load-session/dialog-load-session.component.ts
index 02473fe41ccec8feb2ea36bbc47cdeb77bb3f111..409358f0af530c744b02d079c4697bfc4f930c9c 100644
--- a/src/app/components/dialog-load-session/dialog-load-session.component.ts
+++ b/src/app/components/dialog-load-session/dialog-load-session.component.ts
@@ -161,7 +161,7 @@ export class DialogLoadSessionComponent {
}
}
this.loadingComplete = true;
- } catch(err) {
+ } catch (err) {
console.error(err);
this.loadingError = true;
}
diff --git a/src/app/components/dialog-new-pb-cloison/dialog-new-pb-cloison.component.ts b/src/app/components/dialog-new-pb-cloison/dialog-new-pb-cloison.component.ts
index 7798238d6a4bcacc3c0a6e0a69f0062a096032ed..a249ca8149f3b335e8acfc01ef0d9178a54ffd44 100644
--- a/src/app/components/dialog-new-pb-cloison/dialog-new-pb-cloison.component.ts
+++ b/src/app/components/dialog-new-pb-cloison/dialog-new-pb-cloison.component.ts
@@ -33,7 +33,7 @@ export class DialogNewPbCloisonComponent implements OnInit {
public get availableUpstreamIndexes(): number[] {
// add river upstream as "0"
- let ab: number[] = [ 0 ];
+ const ab: number[] = [ 0 ];
for (let i = 0; i < this.availableBasins.length; i++) {
ab.push(i + 1);
}
@@ -41,7 +41,7 @@ export class DialogNewPbCloisonComponent implements OnInit {
}
public get availableDownstreamIndexes(): number[] {
- let ab: number[] = [ ];
+ const ab: number[] = [ ];
for (let i = 0; i < this.availableBasins.length; i++) {
ab.push(i + 1);
}
@@ -58,9 +58,9 @@ export class DialogNewPbCloisonComponent implements OnInit {
*/
public basinIsSelectable(index: number, downstream: boolean = false): boolean {
if (downstream) {
- return (this.upstreamIndex === 0 || index > this.upstreamIndex)
+ return (this.upstreamIndex === 0 || index > this.upstreamIndex);
} else {
- return (this.downstreamIndex === 0 || index < this.downstreamIndex)
+ return (this.downstreamIndex === 0 || index < this.downstreamIndex);
}
}
@@ -117,7 +117,7 @@ export class DialogNewPbCloisonComponent implements OnInit {
public get uitextValidate() {
return this.i18nService.localizeText("INFO_OPTION_VALIDATE");
}
-
+
public get uitextCancel() {
return this.i18nService.localizeText("INFO_OPTION_CANCEL");
}
diff --git a/src/app/formulaire/elements/select-field.ts b/src/app/formulaire/elements/select-field.ts
index ac9525f2c14b6dc2c5bd6ca7f555dc1b743fa703..0cd055aeac0862e1f3199751ccc110a73b511fe3 100644
--- a/src/app/formulaire/elements/select-field.ts
+++ b/src/app/formulaire/elements/select-field.ts
@@ -220,8 +220,6 @@ export class SelectField extends Field {
const loiDebit = child.properties.getPropValue("loiDebit");
const stCode = StructureProperties.findCompatibleStructure(loiDebit, nub as ParallelStructure);
const stName = StructureType[stCode];
- // console.log(`__device_loi_debit__ : child=${child.constructor.name}, loiDebit=${loiDebit}, stCode=${stCode}, stName=${stName}`);
- // console.log("(child.properties)", child.properties.props);
for (const ld of la[stName]) {
const e: SelectEntry = new SelectEntry(this._entriesBaseId + LoiDebit[ld], ld);
this.addEntry(e);
diff --git a/src/app/services/app-setup.service.ts b/src/app/services/app-setup.service.ts
index 7a2d2a30b9f4d8f14ddbf019cab78397211b92c1..e31d1e37b4ae50b9320f0733fba3734eb327f26f 100644
--- a/src/app/services/app-setup.service.ts
+++ b/src/app/services/app-setup.service.ts
@@ -115,7 +115,7 @@ export class ApplicationSetupService extends Observable {
* Restore configuration values
*/
public async restoreDefaultValues(): Promise<any> {
- await this.readValuesFromConfig()
+ await this.readValuesFromConfig();
// notify I18nService
this.notifyObservers({
action: "languagePreferenceChanged",