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

Jump to bottom

ed: various fixes & enhancements part 2 #296

Merged
merged 8 commits into from
Oct 28, 2024
Merged

ed: various fixes & enhancements part 2 #296

merged 8 commits into from
Oct 28, 2024

Conversation

imyanice
Copy link
Contributor

@imyanice imyanice commented Oct 18, 2024 •
edited
Loading

various fixes & enhancements part 2

  • enables chats as a page, shows placeholder screen if account.service != ecoledirecte
  • added sanctions to timetable and attendance
  • updated pawdirecte

@Louis454545
Copy link
Contributor

Ca a été fait exprès car l'interface n'est pas encore finie, à close.

@Kgeek33
Copy link
Contributor

Kgeek33 commented Oct 18, 2024

Non, faut pas closed
Il faut juste changer pour que ça redirige vers la page normale des messages uniquement pour les comptes École Directe. Sinon, les autres comptes, redirige vers la page de construction

@Kgeek33
Copy link
Contributor

Kgeek33 commented Oct 18, 2024

Après, à intégrer, jspas comment faire
@imyanice faut juste ajouter une condition

@Kgeek33
Copy link
Contributor

Kgeek33 commented Oct 18, 2024

Genre account.service === École directe ? Placeholderscreen : Messages

@imyanice
Copy link
Contributor Author

C'est déjà dans Messages.tsx...

@imyanice
Copy link
Contributor Author

https://github.com/PapillonApp/Papillon/blob/main/src/views/account/Chat/Messages.tsx#L62

@Kgeek33
Copy link
Contributor

Kgeek33 commented Oct 19, 2024

Je l'avais même pas vu dans ta pr sur école directe 😅

Kgeek33
Kgeek33 approved these changes Oct 19, 2024
View reviewed changes
Copy link
Contributor

@Kgeek33 Kgeek33 left a comment

Choose a reason for hiding this comment

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

Dans ce cas, LGTM 👍

@imyanice
Copy link
Contributor Author

je mets à jour pawdirecte également car j'ai oublié

@imyanice imyanice changed the title fix: enabled chats fix: enabled chats & update pawdirecte Oct 19, 2024
@Louis454545
Copy link
Contributor

Non, faut pas closed
Il faut juste changer pour que ça redirige vers la page normale des messages uniquement pour les comptes École Directe. Sinon, les autres comptes, redirige vers la page de construction.

L'interface est finie pour l'école directe, j'ai rien compris.

@Kgeek33
Copy link
Contributor

Kgeek33 commented Oct 19, 2024

PR #288 -> intégration messagerie École Directe

Était prévu dans la pr la page indisponible pour les autres comptes :

https://github.com/PapillonApp/Papillon/blob/main/src/views/account/Chat/Messages.tsx#L62

Voilà

@Louis454545
Copy link
Contributor

ah deso je croyais que l'interface pour les messages etait pas finit

@Kgeek33
Copy link
Contributor

Kgeek33 commented Oct 19, 2024

ah deso je croyais que l'interface pour les messages etait pas finit

C'est celle de pronote qui n'est pas encore terminée

@yannouuuu yannouuuu added ✨ enhancement New feature or request 🔌 ENT / services This issue is linked with Pawnote or a school/external service labels Oct 26, 2024
@imyanice imyanice changed the title fix: enabled chats & update pawdirecte ed: various fixes & enhancements part 2 Oct 28, 2024
Vexcited
Vexcited requested changes Oct 28, 2024
View reviewed changes
Copy link
Member

@Vexcited Vexcited left a comment

Choose a reason for hiding this comment

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

Juste un console.log à enlever, sinon tout est OK

@imyanice @Vexcited
remove debug log
c606bf5 
Co-authored-by: Mikkel ALMONTE--RINGAUD <[email protected]>
@tryon-dev tryon-dev merged commit 17a75a8 into PapillonApp:main Oct 28, 2024
1 check failed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Kgeek33 Kgeek33 Kgeek33 approved these changes

@Louis454545 Louis454545 Louis454545 approved these changes

@tryon-dev tryon-dev tryon-dev approved these changes

@Vexcited Vexcited Vexcited approved these changes

Assignees
No one assigned
Labels
✨ enhancement New feature or request 🔌 ENT / services This issue is linked with Pawnote or a school/external service
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@imyanice @Louis454545 @Kgeek33 @Vexcited @tryon-dev @yannouuuu