separate labels for three winding transformers in expert filters (#541)

Signed-off-by: Etienne LESOT <[email protected]>

Author: EtienneLt

src/components/filter/expert/expert-filter-constants.ts

@@ -431,7 +431,7 @@ export const FIELDS_OPTIONS = {
     },
     CONNECTED_3: {
         name: FieldType.CONNECTED_3,
-        label: 'terminal3Connected',
+        label: 'terminal3ConnectedTwt',
         dataType: DataType.BOOLEAN,
         defaultValue: false,
         valueEditorType: 'switch',
@@ -448,7 +448,7 @@ export const FIELDS_OPTIONS = {
     },
     VOLTAGE_LEVEL_ID_3: {
         name: FieldType.VOLTAGE_LEVEL_ID_3,
-        label: 'voltageLevelId3',
+        label: 'voltageLevelId3Twt',
         dataType: DataType.STRING,
     },
     NOMINAL_VOLTAGE_1: {
@@ -465,13 +465,7 @@ export const FIELDS_OPTIONS = {
     },
     NOMINAL_VOLTAGE_3: {
         name: FieldType.NOMINAL_VOLTAGE_3,
-        label: 'nominalVoltage3KV',
-        dataType: DataType.NUMBER,
-        inputType: 'number',
-    },
-    RATED_VOLTAGE_0: {
-        name: FieldType.RATED_VOLTAGE_0,
-        label: 'ratedVoltage0KV',
+        label: 'nominalVoltage3KVTwt',
         dataType: DataType.NUMBER,
         inputType: 'number',
     },
@@ -487,9 +481,15 @@ export const FIELDS_OPTIONS = {
         dataType: DataType.NUMBER,
         inputType: 'number',
     },
+    RATED_VOLTAGE_0: {
+        name: FieldType.RATED_VOLTAGE_0,
+        label: 'ratedVoltage0KVTwt',
+        dataType: DataType.NUMBER,
+        inputType: 'number',
+    },
     RATED_VOLTAGE_3: {
         name: FieldType.RATED_VOLTAGE_3,
-        label: 'ratedVoltage3KV',
+        label: 'ratedVoltage3KVTwt',
         dataType: DataType.NUMBER,
         inputType: 'number',
     },
@@ -861,7 +861,7 @@ export const FIELDS_OPTIONS = {
     },
     SUBSTATION_PROPERTY_3: {
         name: FieldType.SUBSTATION_PROPERTY_3,
-        label: 'substationProperty3',
+        label: 'substationProperty3Twt',
         dataType: DataType.PROPERTY,
         valueEditorType: 'select',
         defaultValue: '',
@@ -889,7 +889,7 @@ export const FIELDS_OPTIONS = {
     },
     VOLTAGE_LEVEL_PROPERTY_3: {
         name: FieldType.VOLTAGE_LEVEL_PROPERTY_3,
-        label: 'voltageLevelProperty3',
+        label: 'voltageLevelProperty3Twt',
         dataType: DataType.PROPERTY,
         valueEditorType: 'select',
         defaultValue: '',
@@ -1115,18 +1115,42 @@ export const fields: Record<string, Field[]> = {
         FIELDS_OPTIONS.ID,
         FIELDS_OPTIONS.NAME,
         FIELDS_OPTIONS.COUNTRY,
-        FIELDS_OPTIONS.VOLTAGE_LEVEL_ID_1,
-        FIELDS_OPTIONS.VOLTAGE_LEVEL_ID_2,
+        {
+            ...FIELDS_OPTIONS.VOLTAGE_LEVEL_ID_1,
+            label: `${FIELDS_OPTIONS.VOLTAGE_LEVEL_ID_1.label}Twt`,
+        },
+        {
+            ...FIELDS_OPTIONS.VOLTAGE_LEVEL_ID_2,
+            label: `${FIELDS_OPTIONS.VOLTAGE_LEVEL_ID_2.label}Twt`,
+        },
         FIELDS_OPTIONS.VOLTAGE_LEVEL_ID_3,
-        FIELDS_OPTIONS.NOMINAL_VOLTAGE_1,
-        FIELDS_OPTIONS.NOMINAL_VOLTAGE_2,
+        {
+            ...FIELDS_OPTIONS.NOMINAL_VOLTAGE_1,
+            label: `${FIELDS_OPTIONS.NOMINAL_VOLTAGE_1.label}Twt`,
+        },
+        {
+            ...FIELDS_OPTIONS.NOMINAL_VOLTAGE_2,
+            label: `${FIELDS_OPTIONS.NOMINAL_VOLTAGE_2.label}Twt`,
+        },
         FIELDS_OPTIONS.NOMINAL_VOLTAGE_3,
-        FIELDS_OPTIONS.CONNECTED_1,
-        FIELDS_OPTIONS.CONNECTED_2,
+        {
+            ...FIELDS_OPTIONS.CONNECTED_1,
+            label: `${FIELDS_OPTIONS.CONNECTED_1.label}Twt`,
+        },
+        {
+            ...FIELDS_OPTIONS.CONNECTED_2,
+            label: `${FIELDS_OPTIONS.CONNECTED_2.label}Twt`,
+        },
         FIELDS_OPTIONS.CONNECTED_3,
         FIELDS_OPTIONS.RATED_VOLTAGE_0,
-        FIELDS_OPTIONS.RATED_VOLTAGE_1,
-        FIELDS_OPTIONS.RATED_VOLTAGE_2,
+        {
+            ...FIELDS_OPTIONS.RATED_VOLTAGE_1,
+            label: `${FIELDS_OPTIONS.RATED_VOLTAGE_1.label}Twt`,
+        },
+        {
+            ...FIELDS_OPTIONS.RATED_VOLTAGE_2,
+            label: `${FIELDS_OPTIONS.RATED_VOLTAGE_2.label}Twt`,
+        },
         FIELDS_OPTIONS.RATED_VOLTAGE_3,
         FIELDS_OPTIONS.RATED_S1,
         FIELDS_OPTIONS.RATED_S2,
@@ -1165,11 +1189,23 @@ export const fields: Record<string, Field[]> = {
         FIELDS_OPTIONS.PHASE_REGULATION_MODE_2,
         FIELDS_OPTIONS.PHASE_REGULATION_MODE_3,
         FIELDS_OPTIONS.PROPERTY,
-        FIELDS_OPTIONS.SUBSTATION_PROPERTY_1,
-        FIELDS_OPTIONS.SUBSTATION_PROPERTY_2,
+        {
+            ...FIELDS_OPTIONS.SUBSTATION_PROPERTY_1,
+            label: `${FIELDS_OPTIONS.SUBSTATION_PROPERTY_1.label}Twt`,
+        },
+        {
+            ...FIELDS_OPTIONS.SUBSTATION_PROPERTY_2,
+            label: `${FIELDS_OPTIONS.SUBSTATION_PROPERTY_2.label}Twt`,
+        },
         FIELDS_OPTIONS.SUBSTATION_PROPERTY_3,
-        FIELDS_OPTIONS.VOLTAGE_LEVEL_PROPERTY_1,
-        FIELDS_OPTIONS.VOLTAGE_LEVEL_PROPERTY_2,
+        {
+            ...FIELDS_OPTIONS.VOLTAGE_LEVEL_PROPERTY_1,
+            label: `${FIELDS_OPTIONS.VOLTAGE_LEVEL_PROPERTY_1.label}Twt`,
+        },
+        {
+            ...FIELDS_OPTIONS.VOLTAGE_LEVEL_PROPERTY_2,
+            label: `${FIELDS_OPTIONS.VOLTAGE_LEVEL_PROPERTY_2.label}Twt`,
+        },
         FIELDS_OPTIONS.VOLTAGE_LEVEL_PROPERTY_3,
     ],
     GENERATOR: [

src/components/translations/filter-expert-en.ts

@@ -96,27 +96,39 @@ const filterExpertEn = {
     substationProperty: 'Substation property',
     substationProperty1: 'Substation property 1',
     substationProperty2: 'Substation property 2',
-    substationProperty3: 'Substation property 3',
-    ratedVoltage0KV: 'Rated Voltage 0 (kV)',
+    substationProperty1Twt: 'Substation property 1',
+    substationProperty2Twt: 'Substation property 2',
+    substationProperty3Twt: 'Substation property 3',
     ratedVoltage1KV: 'Rated Voltage 1 (kV)',
     ratedVoltage2KV: 'Rated Voltage 2 (kV)',
-    ratedVoltage3KV: 'Rated Voltage 3 (kV)',
+    ratedVoltage0KVTwt: 'Rated Voltage 0 (kV)',
+    ratedVoltage1KVTwt: 'Rated Voltage 1 (kV)',
+    ratedVoltage2KVTwt: 'Rated Voltage 2 (kV)',
+    ratedVoltage3KVTwt: 'Rated Voltage 3 (kV)',
     nominalVoltage1: 'Nominal Voltage 1',
     nominalVoltage2: 'Nominal Voltage 2',
     nominalVoltage3: 'Nominal Voltage 3',
     nominalVoltage1KV: 'Nominal Voltage 1 (kV)',
     nominalVoltage2KV: 'Nominal Voltage 2 (kV)',
-    nominalVoltage3KV: 'Nominal Voltage 3 (kV)',
+    nominalVoltage1KVTwt: 'Nominal Voltage 1 (kV)',
+    nominalVoltage2KVTwt: 'Nominal Voltage 2 (kV)',
+    nominalVoltage3KVTwt: 'Nominal Voltage 3 (kV)',
     voltageLevelId1: 'Voltage level ID 1',
     voltageLevelId2: 'Voltage level ID 2',
-    voltageLevelId3: 'Voltage level ID 3',
+    voltageLevelId1Twt: 'Voltage level ID 1',
+    voltageLevelId2Twt: 'Voltage level ID 2',
+    voltageLevelId3Twt: 'Voltage level ID 3',
     terminal1Connected: 'Connected 1',
     terminal2Connected: 'Connected 2',
-    terminal3Connected: 'Connected 3',
+    terminal1ConnectedTwt: 'Connected 1',
+    terminal2ConnectedTwt: 'Connected 2',
+    terminal3ConnectedTwt: 'Connected 3',
     voltageLevelProperty: 'Voltage level property',
     voltageLevelProperty1: 'Voltage level property 1',
     voltageLevelProperty2: 'Voltage level property 2',
-    voltageLevelProperty3: 'Voltage level property 3',
+    voltageLevelProperty1Twt: 'Voltage level property 1',
+    voltageLevelProperty2Twt: 'Voltage level property 2',
+    voltageLevelProperty3Twt: 'Voltage level property 3',
     'maxQAtNominalV.svar': 'Q max at nominal voltage (MVar)',
     'minQAtNominalV.svar': 'Q min at nominal voltage (MVar)',
     'fixQAtNominalV.svar': 'Fixed part of Q at nominal voltage (MVar)',

src/components/translations/filter-expert-fr.ts

@@ -93,27 +93,39 @@ const filterExpertFr = {
     substationProperty: 'Propriété site',
     substationProperty1: 'Propriété site 1',
     substationProperty2: 'Propriété site 2',
-    substationProperty3: 'Propriété site 3',
-    ratedVoltage0KV: "Tension d'enroulement 0 (kV)",
+    substationProperty1Twt: 'Propriété site 1',
+    substationProperty2Twt: 'Propriété site 2',
+    substationProperty3Twt: 'Propriété site 3',
     ratedVoltage1KV: "Tension d'enroulement 1 (kV)",
     ratedVoltage2KV: "Tension d'enroulement 2 (kV)",
-    ratedVoltage3KV: "Tension d'enroulement 3 (kV)",
+    ratedVoltage0KVTwt: "Tension d'enroulement 0 (kV)",
+    ratedVoltage1KVTwt: "Tension d'enroulement 1 (kV)",
+    ratedVoltage2KVTwt: "Tension d'enroulement 2 (kV)",
+    ratedVoltage3KVTwt: "Tension d'enroulement 3 (kV)",
     nominalVoltage1: 'Tension nominale 1',
     nominalVoltage2: 'Tension nominale 2',
     nominalVoltage3: 'Tension nominale 3',
     voltageLevelId1: 'ID Poste 1',
     voltageLevelId2: 'ID Poste 2',
-    voltageLevelId3: 'ID Poste 3',
+    voltageLevelId1Twt: 'ID Poste 1',
+    voltageLevelId2Twt: 'ID Poste 2',
+    voltageLevelId3Twt: 'ID Poste 3',
     terminal1Connected: 'Connecté 1',
     terminal2Connected: 'Connecté 2',
-    terminal3Connected: 'Connecté 3',
+    terminal1ConnectedTwt: 'Connecté 1',
+    terminal2ConnectedTwt: 'Connecté 2',
+    terminal3ConnectedTwt: 'Connecté 3',
     nominalVoltage1KV: 'Tension nominale 1 (kV)',
     nominalVoltage2KV: 'Tension nominale 2 (kV)',
-    nominalVoltage3KV: 'Tension nominale 3 (kV)',
+    nominalVoltage1KVTwt: 'Tension nominale 1 (kV)',
+    nominalVoltage2KVTwt: 'Tension nominale 2 (kV)',
+    nominalVoltage3KVTwt: 'Tension nominale 3 (kV)',
     voltageLevelProperty: 'Propriété poste',
     voltageLevelProperty1: 'Propriété poste 1',
     voltageLevelProperty2: 'Propriété poste 2',
-    voltageLevelProperty3: 'Propriété poste 3',
+    voltageLevelProperty1Twt: 'Propriété poste 1',
+    voltageLevelProperty2Twt: 'Propriété poste 2',
+    voltageLevelProperty3Twt: 'Propriété poste 3',
     'maxQAtNominalV.svar': 'Q max à tension nominale (MVar)',
     'minQAtNominalV.svar': 'Q min à tension nominale (MVar)',
     'fixQAtNominalV.svar': 'Q fixe à tension nominale (MVar)',