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
3 changes: 2 additions & 1 deletion src/i18n/locales/fr/fr.json
Original file line number Diff line number Diff line change
Expand Up @@ -300,7 +300,8 @@
"and": " et ",
"end-alert": " se chevauchent.",
"info": "Indiquez vos différentes occupations de la journée. Par défaut, votre première activité débute à 4h du matin.",
"lock": "Verrouiller le carnet"
"lock": "Verrouiller le carnet",
"locked-info": "Le carnet est verrouillé. Vous ne pouvez plus le modifier."
},
"secondary-activity": {
"info-light": "Discuter, écouter de la musique, lire un article, regarder la télévision, manger, etc...",
Expand Down
20 changes: 12 additions & 8 deletions src/pages/activity/activity-summary/ActivitySummary.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import {
makeStylesEdt,
TooltipInfo,
} from "@inseefrlab/lunatic-edt";
import { Box, Button, Divider, Switch, Typography } from "@mui/material";
import { Box, Button, Divider, Switch, Tooltip, Typography } from "@mui/material";
import { PDFDownloadLink } from "@react-pdf/renderer";
import ErrorIcon from "../../../assets/illustration/error/activity.svg?react";
import InfoAlertIcon from "../../../assets/illustration/info-alert.svg?react";
Expand Down Expand Up @@ -603,13 +603,17 @@ const ActivitySummaryPage = () => {
))}
</Box>
<FlexCenter className={classes.addActivityOrRouteButtonBox}>
<Button
variant="contained"
onClick={onOpenAddActivityOrRoute}
disabled={!modifiable}
>
{t("page.activity-summary.add-activity-or-route")}
</Button>
<Tooltip title={!modifiable ? t("page.activity-planner.locked-info") : ""}>
<span>
<Button
variant="contained"
onClick={onOpenAddActivityOrRoute}
disabled={!modifiable}
>
{t("page.activity-summary.add-activity-or-route")}
</Button>
</span>
</Tooltip>
</FlexCenter>
<Divider variant="middle" flexItem />
{isSummaryEdited ? (
Expand Down
8 changes: 4 additions & 4 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -1202,10 +1202,10 @@
dependencies:
antlr4 "4.8.0"

"@inseefrlab/lunatic-edt@^0.14.6":
version "0.14.6"
resolved "https://registry.yarnpkg.com/@inseefrlab/lunatic-edt/-/lunatic-edt-0.14.6.tgz#1994526ed7d699137cd6e19c740eb53cc796b6b2"
integrity sha512-1abnuK4IK9WMMw+t27d6SBYqHP02D8ewwq8BSD7RmxXDd1KiZZzs09lD1UVLGVEXPOP2yQ2hsKRk5lrsTRB5jQ==
"@inseefrlab/lunatic-edt@^0.14.8":
version "0.14.8"
resolved "https://registry.yarnpkg.com/@inseefrlab/lunatic-edt/-/lunatic-edt-0.14.8.tgz#f3c07bf1bb9ca2fd04f4362980c54185fddab733"
integrity sha512-VKWgeMF0ZIvlrirWEWf3YeZkrEHYCO8qQTyxh2eRMy3IrGk+1RC7aSTwZ5s2+ZF5SfP2i7ZcJ2kjpltMDZ7Veg==
dependencies:
"@date-io/dayjs" "^2.16.0"
"@emotion/react" "^11.10.4"
Expand Down