Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +5,16 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/

import { percentageTextField } from '../dialog-utils';
import { useWatch } from 'react-hook-form';
import { DROOP, FREQUENCY_REGULATION } from 'components/utils/field-constants';
import { useMemo } from 'react';
import { FloatInput, SwitchInput } from '@gridsuite/commons-ui';
import { FormattedMessage, useIntl } from 'react-intl';
import CheckboxNullableInput from 'components/utils/rhf-inputs/boolean-nullable-input';
import { Box } from '@mui/material';
import { Box, Tooltip } from '@mui/material';
import GridItem from '../commons/grid-item';
import { ActivePowerControlInfos } from './active-power-control.type';
import { InfoOutlined } from '@mui/icons-material';

export interface ActivePowerControlFormProps {
isEquipmentModification?: boolean;
Expand Down Expand Up @@ -60,12 +60,20 @@ export function ActivePowerControlForm({
<FloatInput
name={DROOP}
label={'Droop'}
adornment={percentageTextField}
previousValue={Number.isNaN(previousValues?.droop) ? undefined : (previousValues?.droop ?? undefined)}
clearable={true}
/>
);

const descriptionTooltip = useMemo(
() => (
<Tooltip title={intl.formatMessage({ id: 'activePowerControlTooltip' })}>
<InfoOutlined color="info" fontSize="medium" />
</Tooltip>
),
[intl]
);

return (
<>
{isEquipmentModification ? (
Expand All @@ -79,6 +87,7 @@ export function ActivePowerControlForm({
<GridItem size={4}>{frequencyRegulationField}</GridItem>
)}
<GridItem size={4}>{droopField}</GridItem>
<GridItem size={4}>{descriptionTooltip}</GridItem>
</>
);
}
Original file line number Diff line number Diff line change
Expand Up @@ -166,9 +166,7 @@ export default function GeneratorCreationForm({

{/* Short Circuit part */}
<GridSection title="ShortCircuit" />
<Grid container spacing={2}>
<ShortCircuitForm />
</Grid>
<ShortCircuitForm />

{/* Cost of start part */}
<GridSection title="GenerationDispatch" />
Expand Down
5 changes: 4 additions & 1 deletion src/translations/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -1670,6 +1670,9 @@
"renameWorkspace": "Rename Workspace",
"workspaceName": "Workspace Name",
"manageWorkspaces": "Manage workspaces",
"window": "window",
"windows": "windows",
"reset": "Reset",
"history": "History"
"history": "History",
"activePowerControlTooltip": "Slack bus active power repartition key: maxP/droop, default drop = 4 (used if balanceType is PROPORTIONAL_TO_GENERATION_P_MAX)"
}
5 changes: 3 additions & 2 deletions src/translations/fr.json
Original file line number Diff line number Diff line change
Expand Up @@ -709,7 +709,7 @@
"stepUpTransformerX": "Réactance du transformateur (Ω)",
"TransformerReactanceForm": "Réactance du transformateur",
"FrequencyRegulation": "Compensation",
"Droop": "Participation",
"Droop": "Statisme",
"PlannedActivePowerSetPointForm": "Puissance imposée",
"plannedActivePowerSetPoint": "P imposée (MW)",
"MarginalCost": "Coût de démarrage",
Expand Down Expand Up @@ -1667,5 +1667,6 @@
"workspaceName": "Nom de l'espace de travail",
"manageWorkspaces": "Gérer les espaces de travail",
"reset": "Réinitialiser",
"history": "Historique"
"history": "Historique",
"activePowerControlTooltip": "Clé de distribution de la puissance au nœud bilan : maxP/Statisme, statisme par défaut = 4 (valable pour le mode compensation proportionnel à la puissance maximale des groupes)"
}
Loading