diff --git a/ui/src/backoffice/components/anonymous/components/AvisStats.jsx b/ui/src/backoffice/components/anonymous/components/AvisStats.jsx index 0c3971c57..28bbd7ffc 100644 --- a/ui/src/backoffice/components/anonymous/components/AvisStats.jsx +++ b/ui/src/backoffice/components/anonymous/components/AvisStats.jsx @@ -21,14 +21,14 @@ export default class AvisStats extends React.Component { return (
-

+

Avis {debut ? " (depuis le: "+new Date(debut).toLocaleDateString() : '(depuis le: 01/01/2018 -' /*getFullYear*/} {fin ? " jusqu'au: "+new Date(fin).toLocaleDateString()+")" : "jusqu'à: Aujourd'hui)"} -

+
Total avis déposés
diff --git a/ui/src/backoffice/components/anonymous/components/FormationStats.jsx b/ui/src/backoffice/components/anonymous/components/FormationStats.jsx index 95795a976..dce4b42ab 100644 --- a/ui/src/backoffice/components/anonymous/components/FormationStats.jsx +++ b/ui/src/backoffice/components/anonymous/components/FormationStats.jsx @@ -21,7 +21,7 @@ export default class FormationStats extends React.Component { return (
-

+

Formations @@ -31,7 +31,7 @@ export default class FormationStats extends React.Component {
(source Intercarif)
-

+
Formations en ligne
diff --git a/ui/src/backoffice/components/anonymous/components/ModerationStats.jsx b/ui/src/backoffice/components/anonymous/components/ModerationStats.jsx index 869c75327..ac732a78d 100644 --- a/ui/src/backoffice/components/anonymous/components/ModerationStats.jsx +++ b/ui/src/backoffice/components/anonymous/components/ModerationStats.jsx @@ -20,14 +20,14 @@ export default class ModerationStats extends React.Component { return (
-

+

Modération {'(depuis le: 01/01/2018 -'} {fin ? " jusqu'au: "+new Date(fin).toLocaleDateString()+")" : "jusqu'à: Aujourd'hui)"} -

+
Avis à modérer
diff --git a/ui/src/backoffice/components/anonymous/components/OrganismeStats.jsx b/ui/src/backoffice/components/anonymous/components/OrganismeStats.jsx index d3e81eb57..7a8788867 100644 --- a/ui/src/backoffice/components/anonymous/components/OrganismeStats.jsx +++ b/ui/src/backoffice/components/anonymous/components/OrganismeStats.jsx @@ -20,14 +20,14 @@ export default class OrganismeStats extends React.Component { return (
-

+

Organismes {'(depuis le: 01/01/2018 -'} {fin ? " jusqu'au: "+new Date(fin).toLocaleDateString()+")" : "jusqu'à: Aujourd'hui)"} -

+
Organismes actifs
diff --git a/ui/src/backoffice/components/anonymous/components/StagiairesStats.jsx b/ui/src/backoffice/components/anonymous/components/StagiairesStats.jsx index c6bf0ae72..1b9f9dab4 100644 --- a/ui/src/backoffice/components/anonymous/components/StagiairesStats.jsx +++ b/ui/src/backoffice/components/anonymous/components/StagiairesStats.jsx @@ -30,14 +30,14 @@ export default class StagiairesStats extends React.Component {
-

+

Stagiaires {debut ? " (depuis le: "+new Date(debut).toLocaleDateString() : '(depuis le: 01/01/2018 -' /*getFullYear*/} {fin ? " jusqu'au: "+new Date(fin).toLocaleDateString()+")" : "jusqu'à: aujourd'hui)"} -

+
Nombre de stagiaires contactés
diff --git a/ui/src/backoffice/components/anonymous/components/StatsForm.jsx b/ui/src/backoffice/components/anonymous/components/StatsForm.jsx index a92ce3bac..63c96b526 100644 --- a/ui/src/backoffice/components/anonymous/components/StatsForm.jsx +++ b/ui/src/backoffice/components/anonymous/components/StatsForm.jsx @@ -73,21 +73,20 @@ export default class StatsForm extends React.Component {
+ + this.setState({ codeRegion: option ? option.codeRegion : null })} - /> - -
- + Période -

Commentaire {index}

+

Commentaire {index}

{message && await this.state.propagateChanges()} /> } diff --git a/ui/src/backoffice/components/common/header/Header.jsx b/ui/src/backoffice/components/common/header/Header.jsx index 585fd2166..c1354ea4e 100644 --- a/ui/src/backoffice/components/common/header/Header.jsx +++ b/ui/src/backoffice/components/common/header/Header.jsx @@ -25,9 +25,13 @@ const Header = ({ items, defaultPath, onLogout }) => {
- - Anotéa - + {account.profile === 'anonymous' ? + + Anotéa accueil + : + Anotéa accueil backoffice + + } {items} diff --git a/ui/src/backoffice/components/common/page/form/CenteredForm.scss b/ui/src/backoffice/components/common/page/form/CenteredForm.scss index df8a1e25f..0895071ae 100644 --- a/ui/src/backoffice/components/common/page/form/CenteredForm.scss +++ b/ui/src/backoffice/components/common/page/form/CenteredForm.scss @@ -2,6 +2,11 @@ .Backoffice .CenteredForm { + legend { + font-size: 1rem; + font-weight: $font-weight-bold; + } + label { font-size: 1rem; font-weight: $font-weight-bold; @@ -23,7 +28,7 @@ .contactez-nous { color: $color-blue; - text-decoration: underline; + text-decoration: underline; } } } diff --git a/ui/src/backoffice/components/common/page/form/Form.scss b/ui/src/backoffice/components/common/page/form/Form.scss index 5d97f6a98..f2b43409e 100644 --- a/ui/src/backoffice/components/common/page/form/Form.scss +++ b/ui/src/backoffice/components/common/page/form/Form.scss @@ -4,6 +4,11 @@ @include box(); + legend { + font-size: 1.125rem; + font-weight: $font-weight-bold; + } + label { font-size: 1.125rem; font-weight: $font-weight-bold; diff --git a/ui/src/backoffice/components/common/page/form/Periode.jsx b/ui/src/backoffice/components/common/page/form/Periode.jsx index 2c43a8d59..2bbd526c9 100644 --- a/ui/src/backoffice/components/common/page/form/Periode.jsx +++ b/ui/src/backoffice/components/common/page/form/Periode.jsx @@ -34,21 +34,22 @@ export default class Periode extends React.Component { return (
- de this.onDateChange('debut', date)} + label="date de début" /> - à + this.onDateChange('fin', date)} + label="date de fin" /> this.onReset()}> - +
); } diff --git a/ui/src/backoffice/components/common/page/panel/Panel.jsx b/ui/src/backoffice/components/common/page/panel/Panel.jsx index 08ee57d36..0b46b684c 100644 --- a/ui/src/backoffice/components/common/page/panel/Panel.jsx +++ b/ui/src/backoffice/components/common/page/panel/Panel.jsx @@ -21,6 +21,7 @@ const Panel = props => { {props.loading ? :
+ {props.pagination ?

Liste des avis

: ''}
{props.summary}
diff --git a/ui/src/backoffice/components/common/page/panel/filters/Filters.jsx b/ui/src/backoffice/components/common/page/panel/filters/Filters.jsx index e104c1690..cea3fd3aa 100644 --- a/ui/src/backoffice/components/common/page/panel/filters/Filters.jsx +++ b/ui/src/backoffice/components/common/page/panel/filters/Filters.jsx @@ -7,7 +7,7 @@ export const Filters = ({ children }) => { return (
-
diff --git a/ui/src/backoffice/components/common/page/tabs/Tab.jsx b/ui/src/backoffice/components/common/page/tabs/Tab.jsx index 2e2df2e0f..0c4391c06 100644 --- a/ui/src/backoffice/components/common/page/tabs/Tab.jsx +++ b/ui/src/backoffice/components/common/page/tabs/Tab.jsx @@ -10,10 +10,11 @@ const Tab = ({ label, isActive, onClick, isDisabled = () => false }) => { return (
  • { - e.preventDefault(); - trackClick(label); - onClick(e); - }}> + e.preventDefault(); + trackClick(label); + onClick(e); + }} + aria-current={isActive() ? 'true' : 'false'}> {label}
  • diff --git a/ui/src/backoffice/components/common/page/tabs/Tabs.jsx b/ui/src/backoffice/components/common/page/tabs/Tabs.jsx index eb7e20461..9c22b3b11 100644 --- a/ui/src/backoffice/components/common/page/tabs/Tabs.jsx +++ b/ui/src/backoffice/components/common/page/tabs/Tabs.jsx @@ -6,7 +6,7 @@ export { default as Tab } from './Tab'; export const Tabs = ({ children }) => { return (
    -
    diff --git a/ui/src/backoffice/components/financeur/FinanceurHeaderItems.jsx b/ui/src/backoffice/components/financeur/FinanceurHeaderItems.jsx index 888e96f1f..487e3cb90 100644 --- a/ui/src/backoffice/components/financeur/FinanceurHeaderItems.jsx +++ b/ui/src/backoffice/components/financeur/FinanceurHeaderItems.jsx @@ -4,6 +4,7 @@ import Link from '../common/header/Link'; export default function FinanceurHeaderItems() { return ( + ); } diff --git a/ui/src/backoffice/components/financeur/components/FinanceurAvisPanel.jsx b/ui/src/backoffice/components/financeur/components/FinanceurAvisPanel.jsx index 3e220f83c..1b3f5ab34 100644 --- a/ui/src/backoffice/components/financeur/components/FinanceurAvisPanel.jsx +++ b/ui/src/backoffice/components/financeur/components/FinanceurAvisPanel.jsx @@ -131,7 +131,7 @@ export default class FinanceurAvisPanel extends React.Component { } + renderAvis={(avis, index) => } /> } pagination={ diff --git a/ui/src/backoffice/components/financeur/components/FinanceurForm.jsx b/ui/src/backoffice/components/financeur/components/FinanceurForm.jsx index 25c702e05..c492e1da5 100644 --- a/ui/src/backoffice/components/financeur/components/FinanceurForm.jsx +++ b/ui/src/backoffice/components/financeur/components/FinanceurForm.jsx @@ -95,7 +95,7 @@ export default class FinanceurForm extends React.Component {
    - + Période
    {this.mustShowCodeRegionFilter() ? ( -
    - + <> + this.setState({ departement: option ? option.code : null })} /> -
    + )}
    -
    - - } - reset={() => this.setState({ siret: '', siren: null, numeroFormation: null })} - onChange={(event = {}) => { - const nouveauSIRET = event.target.value; - const nouveauSIREN = store.sirens.find(s => s.siren === nouveauSIRET.substring(0, 9)); - this.setState( - { - siret: nouveauSIRET, - siren: nouveauSIREN?.siren, - numeroFormation: null - }, - () => { - if (nouveauSIREN) { - loadFormations(nouveauSIREN.siren); - } + + } + reset={() => this.setState({ siret: '', siren: null, numeroFormation: null })} + onChange={(event = {}) => { + const nouveauSIRET = event.target.value; + const nouveauSIREN = store.sirens.find(s => s.siren === nouveauSIRET.substring(0, 9)); + this.setState( + { + siret: nouveauSIRET, + siren: nouveauSIREN?.siren, + numeroFormation: null + }, + () => { + if (nouveauSIREN) { + loadFormations(nouveauSIREN.siren); } - ); - }} - /> -
    + } + ); + }} + />
    -
    - - { + this.setState({ siren: option ? option.siren : null, numeroFormation: null, siret: '' }, () => { + if (option) { + loadFormations(option.siren); + } + }); + }} + />
    {this.state.siren && (
    -
    - - this.setState({ numeroFormation: option ? option.numeroFormation : null })} + />
    )} {this.mustShowFinanceurFilter() && ( <>
    -
    - - this.setState({ codeFinanceur: option ? option.code : null })} + />
    -
    - - this.setState({ dispositifFinancement: option ? option.code : null })} + />
    )} diff --git a/ui/src/backoffice/components/financeur/components/FinanceurForm.scss b/ui/src/backoffice/components/financeur/components/FinanceurForm.scss index d02d7e17c..c23ae2b32 100644 --- a/ui/src/backoffice/components/financeur/components/FinanceurForm.scss +++ b/ui/src/backoffice/components/financeur/components/FinanceurForm.scss @@ -1,9 +1,8 @@ @import 'src/common/styles/variables'; .champ-texte { - background-color: $color-grey-25; box-shadow: unset; - border: 1px solid $color-grey-25; + border: 1px solid $color-black; border-radius: 6px; padding: 0.1rem; diff --git a/ui/src/backoffice/components/moderateur/ModerateurHeaderItems.jsx b/ui/src/backoffice/components/moderateur/ModerateurHeaderItems.jsx index a9cff3a08..40783d2f5 100644 --- a/ui/src/backoffice/components/moderateur/ModerateurHeaderItems.jsx +++ b/ui/src/backoffice/components/moderateur/ModerateurHeaderItems.jsx @@ -39,6 +39,7 @@ export default class ModerateurHeaderItems extends React.Component { let isEmailsPreview = router.isActive('/backoffice/moderateur/emails'); return ( + ); } diff --git a/ui/src/backoffice/components/organisme/OrganismeHeaderItems.jsx b/ui/src/backoffice/components/organisme/OrganismeHeaderItems.jsx index 3a8b44a11..0d58a25d4 100644 --- a/ui/src/backoffice/components/organisme/OrganismeHeaderItems.jsx +++ b/ui/src/backoffice/components/organisme/OrganismeHeaderItems.jsx @@ -4,6 +4,7 @@ import Link from '../common/header/Link'; export default function OrganismeHeaderItems() { return ( + ); } diff --git a/ui/src/backoffice/components/organisme/components/OrganismeAvisPanel.jsx b/ui/src/backoffice/components/organisme/components/OrganismeAvisPanel.jsx index 975ee6982..1ae1601e0 100644 --- a/ui/src/backoffice/components/organisme/components/OrganismeAvisPanel.jsx +++ b/ui/src/backoffice/components/organisme/components/OrganismeAvisPanel.jsx @@ -168,11 +168,12 @@ export default class OrganismeAvisPanel extends React.Component { { + renderAvis={(avis, index) => { const compteConnecteEstLeSirenFormateur = avis.formation.action.organisme_formateur.siret && this.context.account.siret && avis.formation.action.organisme_formateur.siret.substring(0, 9) === this.context.account.siret.substring(0, 9); return { diff --git a/ui/src/backoffice/components/organisme/components/OrganismeForm.jsx b/ui/src/backoffice/components/organisme/components/OrganismeForm.jsx index 858ab223b..d00d19786 100644 --- a/ui/src/backoffice/components/organisme/components/OrganismeForm.jsx +++ b/ui/src/backoffice/components/organisme/components/OrganismeForm.jsx @@ -76,7 +76,7 @@ export default class OrganismeForm extends React.Component {
    - + Période