Merge branch '538-prebarrage-puissance-dissipee-negative' into 'devel'

Resolve "Prébarrage : puissance dissipée négative"

Closes #538

See merge request !189

e2e/predam-log.e2e-spec.ts

+import { browser, by, element } from "protractor";
+import { CalculatorPage } from "./calculator.po";
+import { ListPage } from "./list.po";
+import { Navbar } from "./navbar.po";
+import { PreferencesPage } from "./preferences.po"
+
+describe("check that low iteration count leads to log messages", () => {
+    let listPage: ListPage;
+    let prefPage: PreferencesPage;
+    let navBar: Navbar;
+    let calcPage: CalculatorPage;
+
+    beforeEach(async () => {
+        prefPage = new PreferencesPage();
+        listPage = new ListPage();
+        navBar = new Navbar();
+        calcPage = new CalculatorPage();
+
+        // disable evil option "empty fields on module creation"
+        await prefPage.navigateTo();
+        await browser.sleep(200);
+        await prefPage.disableEvilEmptyFields();
+        await browser.sleep(100);
+    });
+
+    it("", async () => {
+        browser.manage().window().setPosition(2000, 30);
+
+        // set low iteration count
+        await prefPage.setIterationCount(5);
+
+        // open predam calculator
+        await navBar.clickNewCalculatorButton();
+        await listPage.clickMenuEntryForCalcType(30);
+        await browser.sleep(200);
+
+        // run calculation
+        const calcButton = calcPage.getCalculateButton();
+        await calcButton.click();
+
+        // check log messages presence
+        expect(calcPage.hasLog()).toBe(true);
+    });
+});

e2e/preferences.po.ts

@@ -64,4 +64,10 @@ export class PreferencesPage {
             await cb.click();
         }
     }
+
+    async setIterationCount(n: number) {
+        const input = this.getInputFromName("nmi");
+        input.clear();
+        await input.sendKeys(n.toString());
+    }
 }

jalhyd_branch

-333-remous-renommer-la-ligne-d-eau-en-z-et-fournir-le-tirant-d-eau-d-apres-celle-ci
+330-prebarrage-puissance-dissipee-negative

scripts/check-translations.js

@@ -38,8 +38,14 @@ jm = jm.replace(/\n/g, "");
 // split on ","
 const messages = jm.split(",");
 
-// remove import on 1st line (wtf) @clodo
-messages[0] = messages[0].substring(24);
+// remove imports
+const firstLine = messages[0].split(";");
+while (firstLine.length > 1) {
+    if (firstLine[0].indexOf("import") !== -1) {
+        firstLine.splice(0, 1);
+    }
+}
+messages[0] = firstLine[firstLine.length - 1];
 
 // read every language file
 const localePath = "src/locale";