Skip to content

feat: bachelor branch type #153

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

Merged
tuturd merged 1 commit into from
Aug 24, 2026
Merged

feat: bachelor branch type #153

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 8 additions & 2 deletions backend/src/services/team.service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@
return updatedTeam[0];
};

export const getTeamUsers = async (teamId: any) => {

Check warning on line 149 in backend/src/services/team.service.ts

View workflow job for this annotation

GitHub Actions / lint-api 

Unexpected any. Specify a different type
const users = await db
.select({
userId: userSchema.id,
Expand Down Expand Up @@ -221,7 +221,7 @@
return Array.from(teamsMap.values());
};

export const getTeamFaction = async (teamId: any) => {

Check warning on line 224 in backend/src/services/team.service.ts

View workflow job for this annotation

GitHub Actions / lint-api 

Unexpected any. Specify a different type
const teamFactionId = await db
.select({ faction_id: teamFactionSchema.faction_id })
.from(teamFactionSchema)
Expand Down Expand Up @@ -298,7 +298,7 @@

// Filtrer les utilisateurs en fonction de la spécialité
const tcStudents: StudentRow[] = filteredStudents
.filter((student) => student.branch === 'TC')
.filter((student) => student.branch === 'TC' || student.branch === 'IA_BACH')
.map((student) => ({
userId: student.userId,
email: student.email,
Expand All @@ -324,7 +324,13 @@
}));

const otherStudents: StudentRow[] = filteredStudents
.filter((student) => student.branch !== 'TC' && student.branch !== 'RI' && student.branch !== 'MM')
.filter(
(student) =>
student.branch !== 'TC' &&
student.branch !== 'RI' &&
student.branch !== 'MM' &&
student.branch !== 'IA_BACH',
)
.map((student) => ({
userId: student.userId,
email: student.email,
Expand Down
1 change: 1 addition & 0 deletions frontend/src/components/Admin/adminUser.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ const branchOptions = [
{ value: 'GM_APPR', label: 'Génie Mécanique en Apprentissage' },
{ value: 'SN_APPR', label: 'Système Numérique en Apprentissage' },
{ value: 'Branch', label: 'Branche' },
{ value: 'IA_BACH', label: 'Intelligence Artificielle en bachelor' },
{ value: 'MM', label: 'Mécanique et Matériaux' },
{ value: 'MA', label: 'Master' },
{ value: 'RI', label: 'Ressources Internationales' },
Expand Down
1 change: 1 addition & 0 deletions frontend/src/components/profil/profilForm.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ const branchOptions = [
{ value: 'GM_APPR', label: 'Génie Mécanique en Apprentissage' },
{ value: 'SN_APPR', label: 'Systeme Numérique en Apprentissage' },
{ value: 'Branch', label: 'Branche' },
{ value: 'IA_BACH', label: 'Intelligence Artificielle en bachelor' },
{ value: 'MM', label: 'Mécanique et Matériaux' },
{ value: 'Master', label: 'Master' },
{ value: 'RI', label: 'Ressources International' },
Expand Down
Loading