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.

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

Ajout du nouveau label "Cours à la maison" #159

Merged
merged 3 commits into from Nov 8, 2020
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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 6 additions & 0 deletions index.d.ts
Expand Up @@ -631,6 +631,11 @@ export interface Lesson
*/
hasDuplicate: boolean,

/**
* Si c'est un cours qui se déroulera en distanciel, à la maison.
*/
remoteLesson: boolean;

/**
* Matière du cours si disponible (pas le cas pour une retenue)
* Peut avoir comme valeur 'Non défini' si l'api reçoit un null
Expand Down Expand Up @@ -1755,6 +1760,7 @@ export interface PronoteLesson extends PronoteObject
hasHomework: boolean, // AvecTafPublie
isCancelled: boolean, // estAnnule
isDetention: boolean // estRetenue
remoteLesson: boolean; // dispenseEleve.maison
}

export interface PronoteTimetableDaysAndWeeks
Expand Down
6 changes: 4 additions & 2 deletions src/fetch/pronote/timetable.js
Expand Up @@ -38,7 +38,8 @@ async function getTimetable(session, user, week)
hasCancelledLessons: timetable.avecCoursAnnule,
iCalURL,
lessons: timetable.ListeCours.map(o => fromPronote(o, ({
place, duree, DateDuCours, CouleurFond, ListeContenus, AvecTafPublie, Statut, estAnnule, estRetenue
place, duree, DateDuCours, CouleurFond, ListeContenus, AvecTafPublie, Statut, estAnnule, estRetenue,
dispenseEleve
}) => ({
position: place,
duration: duree,
Expand All @@ -48,7 +49,8 @@ async function getTimetable(session, user, week)
content: parse(ListeContenus),
hasHomework: AvecTafPublie,
isCancelled: !!estAnnule,
isDetention: !!estRetenue
isDetention: !!estRetenue,
remoteLesson: !!dispenseEleve && dispenseEleve.V.maison
}))),
// I was unable to witness a filled "absences.joursCycle", so didn't include it
breaks: parse(timetable.recreations, ({ place }) => ({
Expand Down
1 change: 1 addition & 0 deletions src/fetch/timetable.js
Expand Up @@ -54,6 +54,7 @@ function getTimetableWeek(session, table) {
from,
to,
isDetention: lesson.isDetention,
remoteLesson: lesson.remoteLesson,
status: lesson.status,
hasDuplicate: !!table.lessons.find(l => l.date.getTime() === from.getTime() && l !== lesson)
};
Expand Down
1 change: 1 addition & 0 deletions src/server/schemas/common.graphql
Expand Up @@ -30,6 +30,7 @@ type Lesson {
isAway: Boolean
isCancelled: Boolean
color: String
remoteLesson: Boolean
}

type Marks {
Expand Down