diff --git a/dashboard/src/assets/icons/description-icon.svg b/dashboard/src/assets/icons/description-icon.svg new file mode 100644 index 000000000..ae9d79271 --- /dev/null +++ b/dashboard/src/assets/icons/description-icon.svg @@ -0,0 +1,14 @@ + + + + + + + + + \ No newline at end of file diff --git a/dashboard/src/components/ActionsCalendar.js b/dashboard/src/components/ActionsCalendar.js index 88aa3ef04..6b5923a4e 100644 --- a/dashboard/src/components/ActionsCalendar.js +++ b/dashboard/src/components/ActionsCalendar.js @@ -14,6 +14,7 @@ import { CANCEL, DONE, sortActionsOrConsultations } from '../recoil/actions'; import TagTeam from './TagTeam'; import { useLocalStorage } from '../services/useLocalStorage'; import TabsNav from './tailwind/TabsNav'; +import DescriptionIcon from './DescriptionIcon'; const ActionsCalendar = ({ actions, isNightSession, columns = ['Heure', 'Nom', 'Personne suivie', 'Créée le', 'Statut', 'Équipe(s) en charge'] }) => { const history = useHistory(); @@ -118,6 +119,7 @@ const ActionsCalendar = ({ actions, isNightSession, columns = ['Heure', 'Nom', ' return (
{!!actionOrConsult.urgent && } + {!!actionOrConsult.description && } {!!organisation.groupsEnabled && !!actionOrConsult.group && ( 👪 diff --git a/dashboard/src/components/ActionsSortableList.js b/dashboard/src/components/ActionsSortableList.js index 98a511de1..4db18e821 100644 --- a/dashboard/src/components/ActionsSortableList.js +++ b/dashboard/src/components/ActionsSortableList.js @@ -17,6 +17,7 @@ import TagTeam from './TagTeam'; import { useLocalStorage } from '../services/useLocalStorage'; import Page from './pagination'; import useSearchParamState from '../services/useSearchParamState'; +import DescriptionIcon from './DescriptionIcon'; const ActionsSortableList = ({ data, limit }) => { useTitle('Agenda'); @@ -72,6 +73,7 @@ const ActionsSortableList = ({ data, limit }) => { return (
{!!actionOrConsult.urgent && } + {!!actionOrConsult.description && } {!!organisation.groupsEnabled && !!actionOrConsult.group && ( 👪 diff --git a/dashboard/src/components/ActionsWeekly.js b/dashboard/src/components/ActionsWeekly.js index e2f8a0ef4..db73b25f3 100644 --- a/dashboard/src/components/ActionsWeekly.js +++ b/dashboard/src/components/ActionsWeekly.js @@ -12,6 +12,7 @@ import { organisationState, userState } from '../recoil/auth'; import TagTeam from './TagTeam'; import useSearchParamState from '../services/useSearchParamState'; import { disableConsultationRow } from '../recoil/consultations'; +import DescriptionIcon from './DescriptionIcon'; // TODO: remove inline style when UI is stabilized. diff --git a/dashboard/src/components/DescriptionIcon.js b/dashboard/src/components/DescriptionIcon.js new file mode 100644 index 000000000..5267d0558 --- /dev/null +++ b/dashboard/src/components/DescriptionIcon.js @@ -0,0 +1,8 @@ +import React from 'react'; +import openNewWindow from '../assets/icons/description-icon.svg'; + +const DescriptionIcon = () => ( +
+); + +export default DescriptionIcon; diff --git a/dashboard/src/components/PersonName.js b/dashboard/src/components/PersonName.js index 7791b8207..e926c3b43 100644 --- a/dashboard/src/components/PersonName.js +++ b/dashboard/src/components/PersonName.js @@ -6,7 +6,7 @@ import { personsObjectSelector } from '../recoil/selectors'; export default function PersonName({ item, onClick = null, redirectToTab = 'Résumé' }) { const history = useHistory(); const persons = useRecoilValue(personsObjectSelector); - const personName = item?.personPopulated?.name || persons[item.person]?.name; + const person = item?.personPopulated ?? persons[item.person]; return ( { history.push(`?${searchParams.toString()}`); }}>
-
- {action.urgent ? : null} {`${date}${time}`} +
+ {action.urgent ? : null} + {action.description ? : null} + {`${date}${time}`}
diff --git a/dashboard/src/scenes/person/components/Consultations.js b/dashboard/src/scenes/person/components/Consultations.js index f08373b59..01f37013a 100644 --- a/dashboard/src/scenes/person/components/Consultations.js +++ b/dashboard/src/scenes/person/components/Consultations.js @@ -15,6 +15,7 @@ import { AgendaMutedIcon } from './AgendaMutedIcon'; import { disableConsultationRow } from '../../../recoil/consultations'; import { FullScreenIcon } from './FullScreenIcon'; import UserName from '../../../components/UserName'; +import DescriptionIcon from '../../../components/DescriptionIcon'; export const Consultations = ({ person }) => { const [fullScreen, setFullScreen] = useState(false); @@ -184,7 +185,10 @@ const ConsultationsTable = ({ filteredData, person }) => { history.push(`?${searchParams.toString()}`); }}>
-
{`${date}${time}`}
+
+ {!!consultation.description && } + {`${date}${time}`} +
diff --git a/dashboard/src/scenes/report/view.js b/dashboard/src/scenes/report/view.js index fd0dc0d8c..d5472bf3e 100644 --- a/dashboard/src/scenes/report/view.js +++ b/dashboard/src/scenes/report/view.js @@ -57,6 +57,7 @@ import { useLocalStorage } from '../../services/useLocalStorage'; import { arrayOfitemsGroupedByActionSelector, arrayOfitemsGroupedByConsultationSelector, personsObjectSelector } from '../../recoil/selectors'; import { treatmentsState } from '../../recoil/treatments'; import { medicalFileState } from '../../recoil/medicalFiles'; +import DescriptionIcon from '../../components/DescriptionIcon'; const getPeriodTitle = (date, nightSession) => { if (!nightSession) return `Journée du ${formatDateWithNameOfDay(date)}`; @@ -1108,6 +1109,7 @@ const ActionCompletedAt = ({ date, status, actions, setSortOrder, setSortBy, sor return (
{!!action.urgent && } + {!!action.description && } {!!organisation.groupsEnabled && !!action.group && ( 👪 @@ -1150,7 +1152,7 @@ const ActionCompletedAt = ({ date, status, actions, setSortOrder, setSortBy, sor onSortBy: setSortBy, sortBy, sortOrder, - render: (action) => , + render: (action) => , }, { title: 'Statut', @@ -1214,6 +1216,7 @@ const ActionCreatedAt = ({ date, actions, setSortOrder, setSortBy, sortBy, sortO return (
{!!action.urgent && } + {!!action.description && } {!!organisation.groupsEnabled && !!action.group && ( 👪 @@ -1256,7 +1259,7 @@ const ActionCreatedAt = ({ date, actions, setSortOrder, setSortBy, sortBy, sortO onSortBy: setSortBy, sortBy, sortOrder, - render: (action) => , + render: (action) => , }, { title: 'Statut', @@ -1358,7 +1361,7 @@ const Consultations = ({ date, status, consultations, setSortOrder, setSortBy, s onSortBy: setSortBy, sortBy, sortOrder, - render: (consultation) => , + render: (consultation) => , }, { title: 'Statut', @@ -1423,7 +1426,7 @@ const ConsultationsCreatedAt = ({ date, consultations }) => { { title: 'Personne suivie', dataKey: 'person', - render: (action) => , + render: (action) => , }, { title: 'Statut', dataKey: 'status', render: (action) => }, ]} @@ -1643,7 +1646,7 @@ const PassagesCreatedAt = ({ date, passages, selectedTeams }) => { title: 'Personne suivie', dataKey: 'person', render: (passage) => - passage.person ? : Anonyme, + passage.person ? : Anonyme, }, { title: 'Enregistré par', @@ -1723,7 +1726,11 @@ const RencontresCreatedAt = ({ date, rencontres, selectedTeams }) => { title: 'Personne suivie', dataKey: 'person', render: (rencontre) => - rencontre.person ? : Anonyme, + rencontre.person ? ( + + ) : ( + Anonyme + ), }, { title: 'Enregistrée par', diff --git a/dashboard/src/scenes/search/index.js b/dashboard/src/scenes/search/index.js index 7d86a03ed..daff52535 100644 --- a/dashboard/src/scenes/search/index.js +++ b/dashboard/src/scenes/search/index.js @@ -29,6 +29,7 @@ import ConsultationButton from '../../components/ConsultationButton'; import { useLocalStorage } from '../../services/useLocalStorage'; import { territoryObservationsState } from '../../recoil/territoryObservations'; import TabsNav from '../../components/tailwind/TabsNav'; +import DescriptionIcon from '../../components/DescriptionIcon'; const personsWithFormattedBirthDateSelector = selector({ key: 'personsWithFormattedBirthDateSelector', @@ -271,6 +272,7 @@ const Actions = ({ actions }) => { return (
{!!actionOrConsult.urgent && } + {!!actionOrConsult.description && } {!!organisation.groupsEnabled && !!actionOrConsult.group && ( 👪