Skip to content

Commit 5f5920f

Browse files
EtienneLtthangqp
EtienneLt
and
thangqp
authored
add dangling lines to expert filters (#525)
Signed-off-by: Etienne LESOT <[email protected]> Co-authored-by: Thang PHAM <[email protected]>
1 parent dc140d6 commit 5f5920f

File tree

4 files changed

+109
-65
lines changed

4 files changed

+109
-65
lines changed

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

Lines changed: 106 additions & 65 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,10 @@ export const EXPERT_FILTER_EQUIPMENTS = {
6565
id: 'HVDC_LINE',
6666
label: 'Hvdc',
6767
},
68+
DANGLING_LINE: {
69+
id: 'DANGLING_LINE',
70+
label: 'DanglingLines',
71+
},
6872
};
6973

7074
export const ENERGY_SOURCE_OPTIONS = [
@@ -980,6 +984,25 @@ export const FIELDS_OPTIONS = {
980984
dataType: DataType.NUMBER,
981985
inputType: 'number',
982986
},
987+
SHUNT_SUSCEPTANCE: {
988+
name: FieldType.SHUNT_SUSCEPTANCE,
989+
label: 'shuntSusceptance',
990+
dataType: DataType.NUMBER,
991+
inputType: 'number',
992+
},
993+
SHUNT_CONDUCTANCE: {
994+
name: FieldType.SHUNT_CONDUCTANCE,
995+
label: 'shuntConductance',
996+
dataType: DataType.NUMBER,
997+
inputType: 'number',
998+
},
999+
PAIRED: {
1000+
name: FieldType.PAIRED,
1001+
label: 'paired',
1002+
dataType: DataType.BOOLEAN,
1003+
defaultValue: false,
1004+
valueEditorType: 'switch',
1005+
},
9831006
CONVERTER_STATION_ID_1: {
9841007
name: FieldType.CONVERTER_STATION_ID_1,
9851008
label: 'converterStationId1',
@@ -1088,6 +1111,67 @@ export const fields: Record<string, Field[]> = {
10881111
FIELDS_OPTIONS.VOLTAGE_LEVEL_PROPERTY_1,
10891112
FIELDS_OPTIONS.VOLTAGE_LEVEL_PROPERTY_2,
10901113
],
1114+
THREE_WINDINGS_TRANSFORMER: [
1115+
FIELDS_OPTIONS.ID,
1116+
FIELDS_OPTIONS.NAME,
1117+
FIELDS_OPTIONS.COUNTRY,
1118+
FIELDS_OPTIONS.VOLTAGE_LEVEL_ID_1,
1119+
FIELDS_OPTIONS.VOLTAGE_LEVEL_ID_2,
1120+
FIELDS_OPTIONS.VOLTAGE_LEVEL_ID_3,
1121+
FIELDS_OPTIONS.NOMINAL_VOLTAGE_1,
1122+
FIELDS_OPTIONS.NOMINAL_VOLTAGE_2,
1123+
FIELDS_OPTIONS.NOMINAL_VOLTAGE_3,
1124+
FIELDS_OPTIONS.CONNECTED_1,
1125+
FIELDS_OPTIONS.CONNECTED_2,
1126+
FIELDS_OPTIONS.CONNECTED_3,
1127+
FIELDS_OPTIONS.RATED_VOLTAGE_0,
1128+
FIELDS_OPTIONS.RATED_VOLTAGE_1,
1129+
FIELDS_OPTIONS.RATED_VOLTAGE_2,
1130+
FIELDS_OPTIONS.RATED_VOLTAGE_3,
1131+
FIELDS_OPTIONS.RATED_S1,
1132+
FIELDS_OPTIONS.RATED_S2,
1133+
FIELDS_OPTIONS.RATED_S3,
1134+
FIELDS_OPTIONS.SERIE_RESISTANCE_1,
1135+
FIELDS_OPTIONS.SERIE_RESISTANCE_2,
1136+
FIELDS_OPTIONS.SERIE_RESISTANCE_3,
1137+
FIELDS_OPTIONS.SERIE_REACTANCE_1,
1138+
FIELDS_OPTIONS.SERIE_REACTANCE_2,
1139+
FIELDS_OPTIONS.SERIE_REACTANCE_3,
1140+
FIELDS_OPTIONS.MAGNETIZING_CONDUCTANCE_1,
1141+
FIELDS_OPTIONS.MAGNETIZING_CONDUCTANCE_2,
1142+
FIELDS_OPTIONS.MAGNETIZING_CONDUCTANCE_3,
1143+
FIELDS_OPTIONS.MAGNETIZING_SUSCEPTANCE_1,
1144+
FIELDS_OPTIONS.MAGNETIZING_SUSCEPTANCE_2,
1145+
FIELDS_OPTIONS.MAGNETIZING_SUSCEPTANCE_3,
1146+
FIELDS_OPTIONS.HAS_RATIO_TAP_CHANGER_1,
1147+
FIELDS_OPTIONS.HAS_RATIO_TAP_CHANGER_2,
1148+
FIELDS_OPTIONS.HAS_RATIO_TAP_CHANGER_3,
1149+
FIELDS_OPTIONS.LOAD_TAP_CHANGING_CAPABILITIES_1,
1150+
FIELDS_OPTIONS.LOAD_TAP_CHANGING_CAPABILITIES_2,
1151+
FIELDS_OPTIONS.LOAD_TAP_CHANGING_CAPABILITIES_3,
1152+
FIELDS_OPTIONS.RATIO_TARGET_V1,
1153+
FIELDS_OPTIONS.RATIO_TARGET_V2,
1154+
FIELDS_OPTIONS.RATIO_TARGET_V3,
1155+
FIELDS_OPTIONS.RATIO_REGULATION_MODE_1,
1156+
FIELDS_OPTIONS.RATIO_REGULATION_MODE_2,
1157+
FIELDS_OPTIONS.RATIO_REGULATION_MODE_3,
1158+
FIELDS_OPTIONS.HAS_PHASE_TAP_CHANGER_1,
1159+
FIELDS_OPTIONS.HAS_PHASE_TAP_CHANGER_2,
1160+
FIELDS_OPTIONS.HAS_PHASE_TAP_CHANGER_3,
1161+
FIELDS_OPTIONS.PHASE_REGULATION_VALUE_1,
1162+
FIELDS_OPTIONS.PHASE_REGULATION_VALUE_2,
1163+
FIELDS_OPTIONS.PHASE_REGULATION_VALUE_3,
1164+
FIELDS_OPTIONS.PHASE_REGULATION_MODE_1,
1165+
FIELDS_OPTIONS.PHASE_REGULATION_MODE_2,
1166+
FIELDS_OPTIONS.PHASE_REGULATION_MODE_3,
1167+
FIELDS_OPTIONS.PROPERTY,
1168+
FIELDS_OPTIONS.SUBSTATION_PROPERTY_1,
1169+
FIELDS_OPTIONS.SUBSTATION_PROPERTY_2,
1170+
FIELDS_OPTIONS.SUBSTATION_PROPERTY_3,
1171+
FIELDS_OPTIONS.VOLTAGE_LEVEL_PROPERTY_1,
1172+
FIELDS_OPTIONS.VOLTAGE_LEVEL_PROPERTY_2,
1173+
FIELDS_OPTIONS.VOLTAGE_LEVEL_PROPERTY_3,
1174+
],
10911175
GENERATOR: [
10921176
FIELDS_OPTIONS.ID,
10931177
FIELDS_OPTIONS.NAME,
@@ -1111,31 +1195,31 @@ export const fields: Record<string, Field[]> = {
11111195
FIELDS_OPTIONS.SUBSTATION_PROPERTY,
11121196
FIELDS_OPTIONS.VOLTAGE_LEVEL_PROPERTY,
11131197
],
1114-
LOAD: [
1198+
BATTERY: [
11151199
FIELDS_OPTIONS.ID,
11161200
FIELDS_OPTIONS.NAME,
1117-
FIELDS_OPTIONS.LOAD_TYPE,
11181201
FIELDS_OPTIONS.COUNTRY,
11191202
FIELDS_OPTIONS.VOLTAGE_LEVEL_ID,
11201203
FIELDS_OPTIONS.NOMINAL_VOLTAGE,
11211204
FIELDS_OPTIONS.CONNECTED,
1122-
FIELDS_OPTIONS.P0,
1123-
FIELDS_OPTIONS.Q0,
1205+
FIELDS_OPTIONS.MIN_P,
1206+
FIELDS_OPTIONS.MAX_P,
1207+
FIELDS_OPTIONS.TARGET_P,
1208+
FIELDS_OPTIONS.TARGET_Q,
11241209
FIELDS_OPTIONS.PROPERTY,
11251210
FIELDS_OPTIONS.SUBSTATION_PROPERTY,
11261211
FIELDS_OPTIONS.VOLTAGE_LEVEL_PROPERTY,
11271212
],
1128-
BATTERY: [
1213+
LOAD: [
11291214
FIELDS_OPTIONS.ID,
11301215
FIELDS_OPTIONS.NAME,
1216+
FIELDS_OPTIONS.LOAD_TYPE,
11311217
FIELDS_OPTIONS.COUNTRY,
11321218
FIELDS_OPTIONS.VOLTAGE_LEVEL_ID,
11331219
FIELDS_OPTIONS.NOMINAL_VOLTAGE,
11341220
FIELDS_OPTIONS.CONNECTED,
1135-
FIELDS_OPTIONS.MIN_P,
1136-
FIELDS_OPTIONS.MAX_P,
1137-
FIELDS_OPTIONS.TARGET_P,
1138-
FIELDS_OPTIONS.TARGET_Q,
1221+
FIELDS_OPTIONS.P0,
1222+
FIELDS_OPTIONS.Q0,
11391223
FIELDS_OPTIONS.PROPERTY,
11401224
FIELDS_OPTIONS.SUBSTATION_PROPERTY,
11411225
FIELDS_OPTIONS.VOLTAGE_LEVEL_PROPERTY,
@@ -1226,65 +1310,22 @@ export const fields: Record<string, Field[]> = {
12261310
FIELDS_OPTIONS.VOLTAGE_LEVEL_PROPERTY_1,
12271311
FIELDS_OPTIONS.VOLTAGE_LEVEL_PROPERTY_2,
12281312
],
1229-
THREE_WINDINGS_TRANSFORMER: [
1313+
DANGLING_LINE: [
12301314
FIELDS_OPTIONS.ID,
12311315
FIELDS_OPTIONS.NAME,
12321316
FIELDS_OPTIONS.COUNTRY,
1233-
FIELDS_OPTIONS.VOLTAGE_LEVEL_ID_1,
1234-
FIELDS_OPTIONS.VOLTAGE_LEVEL_ID_2,
1235-
FIELDS_OPTIONS.VOLTAGE_LEVEL_ID_3,
1236-
FIELDS_OPTIONS.NOMINAL_VOLTAGE_1,
1237-
FIELDS_OPTIONS.NOMINAL_VOLTAGE_2,
1238-
FIELDS_OPTIONS.NOMINAL_VOLTAGE_3,
1239-
FIELDS_OPTIONS.CONNECTED_1,
1240-
FIELDS_OPTIONS.CONNECTED_2,
1241-
FIELDS_OPTIONS.CONNECTED_3,
1242-
FIELDS_OPTIONS.RATED_VOLTAGE_0,
1243-
FIELDS_OPTIONS.RATED_VOLTAGE_1,
1244-
FIELDS_OPTIONS.RATED_VOLTAGE_2,
1245-
FIELDS_OPTIONS.RATED_VOLTAGE_3,
1246-
FIELDS_OPTIONS.RATED_S1,
1247-
FIELDS_OPTIONS.RATED_S2,
1248-
FIELDS_OPTIONS.RATED_S3,
1249-
FIELDS_OPTIONS.SERIE_RESISTANCE_1,
1250-
FIELDS_OPTIONS.SERIE_RESISTANCE_2,
1251-
FIELDS_OPTIONS.SERIE_RESISTANCE_3,
1252-
FIELDS_OPTIONS.SERIE_REACTANCE_1,
1253-
FIELDS_OPTIONS.SERIE_REACTANCE_2,
1254-
FIELDS_OPTIONS.SERIE_REACTANCE_3,
1255-
FIELDS_OPTIONS.MAGNETIZING_CONDUCTANCE_1,
1256-
FIELDS_OPTIONS.MAGNETIZING_CONDUCTANCE_2,
1257-
FIELDS_OPTIONS.MAGNETIZING_CONDUCTANCE_3,
1258-
FIELDS_OPTIONS.MAGNETIZING_SUSCEPTANCE_1,
1259-
FIELDS_OPTIONS.MAGNETIZING_SUSCEPTANCE_2,
1260-
FIELDS_OPTIONS.MAGNETIZING_SUSCEPTANCE_3,
1261-
FIELDS_OPTIONS.HAS_RATIO_TAP_CHANGER_1,
1262-
FIELDS_OPTIONS.HAS_RATIO_TAP_CHANGER_2,
1263-
FIELDS_OPTIONS.HAS_RATIO_TAP_CHANGER_3,
1264-
FIELDS_OPTIONS.LOAD_TAP_CHANGING_CAPABILITIES_1,
1265-
FIELDS_OPTIONS.LOAD_TAP_CHANGING_CAPABILITIES_2,
1266-
FIELDS_OPTIONS.LOAD_TAP_CHANGING_CAPABILITIES_3,
1267-
FIELDS_OPTIONS.RATIO_TARGET_V1,
1268-
FIELDS_OPTIONS.RATIO_TARGET_V2,
1269-
FIELDS_OPTIONS.RATIO_TARGET_V3,
1270-
FIELDS_OPTIONS.RATIO_REGULATION_MODE_1,
1271-
FIELDS_OPTIONS.RATIO_REGULATION_MODE_2,
1272-
FIELDS_OPTIONS.RATIO_REGULATION_MODE_3,
1273-
FIELDS_OPTIONS.HAS_PHASE_TAP_CHANGER_1,
1274-
FIELDS_OPTIONS.HAS_PHASE_TAP_CHANGER_2,
1275-
FIELDS_OPTIONS.HAS_PHASE_TAP_CHANGER_3,
1276-
FIELDS_OPTIONS.PHASE_REGULATION_VALUE_1,
1277-
FIELDS_OPTIONS.PHASE_REGULATION_VALUE_2,
1278-
FIELDS_OPTIONS.PHASE_REGULATION_VALUE_3,
1279-
FIELDS_OPTIONS.PHASE_REGULATION_MODE_1,
1280-
FIELDS_OPTIONS.PHASE_REGULATION_MODE_2,
1281-
FIELDS_OPTIONS.PHASE_REGULATION_MODE_3,
1317+
FIELDS_OPTIONS.VOLTAGE_LEVEL_ID,
1318+
FIELDS_OPTIONS.NOMINAL_VOLTAGE,
1319+
FIELDS_OPTIONS.CONNECTED,
1320+
FIELDS_OPTIONS.P0,
1321+
FIELDS_OPTIONS.Q0,
1322+
FIELDS_OPTIONS.SERIE_RESISTANCE,
1323+
FIELDS_OPTIONS.SERIE_REACTANCE,
1324+
FIELDS_OPTIONS.SHUNT_SUSCEPTANCE,
1325+
FIELDS_OPTIONS.SHUNT_CONDUCTANCE,
1326+
FIELDS_OPTIONS.PAIRED,
12821327
FIELDS_OPTIONS.PROPERTY,
1283-
FIELDS_OPTIONS.SUBSTATION_PROPERTY_1,
1284-
FIELDS_OPTIONS.SUBSTATION_PROPERTY_2,
1285-
FIELDS_OPTIONS.SUBSTATION_PROPERTY_3,
1286-
FIELDS_OPTIONS.VOLTAGE_LEVEL_PROPERTY_1,
1287-
FIELDS_OPTIONS.VOLTAGE_LEVEL_PROPERTY_2,
1288-
FIELDS_OPTIONS.VOLTAGE_LEVEL_PROPERTY_3,
1328+
FIELDS_OPTIONS.SUBSTATION_PROPERTY,
1329+
FIELDS_OPTIONS.VOLTAGE_LEVEL_PROPERTY,
12891330
],
12901331
};

‎src/components/filter/expert/expert-filter.type.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -156,6 +156,7 @@ export enum FieldType {
156156
LOW_VOLTAGE_THRESHOLD = 'LOW_VOLTAGE_THRESHOLD',
157157
HIGH_VOLTAGE_THRESHOLD = 'HIGH_VOLTAGE_THRESHOLD',
158158
SUSCEPTANCE_FIX = 'SUSCEPTANCE_FIX',
159+
PAIRED = 'PAIRED',
159160
CONVERTERS_MODE = 'CONVERTERS_MODE',
160161
CONVERTER_STATION_ID_1 = 'CONVERTER_STATION_ID_1',
161162
CONVERTER_STATION_ID_2 = 'CONVERTER_STATION_ID_2',

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -141,6 +141,7 @@ const filterExpertEn = {
141141
lowVoltageThreshold: 'Low voltage threshold',
142142
highVoltageThreshold: 'High voltage threshold',
143143
susceptanceFix: 'Fixed part of susceptance ',
144+
paired: 'Paired',
144145
converterStationId1: 'Converter station 1 ID',
145146
converterStationId2: 'Converter station 2 ID',
146147
convertersMode: 'Converters mode',

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -138,6 +138,7 @@ const filterExpertFr = {
138138
lowVoltageThreshold: 'U activation bas',
139139
highVoltageThreshold: 'U activation haut',
140140
susceptanceFix: 'Susceptance fixe',
141+
paired: 'Appareillé',
141142
converterStationId1: 'ID de la station de conversion 1',
142143
converterStationId2: 'ID de la station de conversion 2',
143144
convertersMode: 'Mode de conversion',

0 commit comments

Comments
 (0)