Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: changement des indicateurs nationaux pour les établissements tm-292 #3285

Merged
merged 3 commits into from
Oct 13, 2023
Merged

fix: changement des indicateurs nationaux pour les établissements tm-292 #3285

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
610ae3f
fix: changement des indicateurs nationaux pour les établissements tm-292
rap2hpoutre Oct 13, 2023
44d6f77
chore: fix tests
rap2hpoutre Oct 13, 2023
65b51f2
chore: up
rap2hpoutre Oct 13, 2023
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: 3 additions & 0 deletions server/src/common/actions/indicateurs/indicateurs-national.actions.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,9 @@ export async function getIndicateursOrganismesNature(filters: OrganismesFilters)
{
fiabilisation_statut: "FIABLE",
ferme: false,
last_transmission_date: {
$gte: new Date(new Date().getFullYear(), 7, 1),
Comment on lines +53 to +54
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

1/7 c'est bien le 1er aout ?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

on pourrait presque utiliser une constante car ya plusieurs endroits ds le code il me semble ou l'on utilise cette date pour la bascule des années.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oui le JS compte à partir de 0 pour les mois 🤦
Je suis désolé la PR est en speed je pense qu'il faudra l'améliorer ensuite : mettre une constante ou des vrais trucs de date

},
},
],
},
Expand Down
3 changes: 2 additions & 1 deletion ui/pages/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -451,7 +451,7 @@ function SectionApercuChiffresCles() {
{formatNumber(indicateursNational?.indicateursOrganismes?.total)}
</Text>
<Text fontSize="zeta" fontWeight="700" lineHeight="1em" color="bluefrance">
organismes de formation en apprentissage
organismes de formation en apprentissage transmettent leurs données
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

transmettant ?

<Tooltip
background="bluefrance"
color="white"
Expand All @@ -468,6 +468,7 @@ function SectionApercuChiffresCles() {
(base des Carif-Oref)&nbsp;;
</ListItem>
<ListItem>identifiés par un SIRET (ouvert) et un UAI valable&nbsp;;</ListItem>
<ListItem>ayant envoyé des données depuis le premier août&nbsp;;</ListItem>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

le premier août ;
=>
le premier août.

</UnorderedList>
<Text as="p">
Ce nombre inclut&nbsp;: les OFA «&nbsp;historiques&nbsp;», les OFA académiques et
Expand Down
Loading