tonitch/Clyde
1
0
Fork 0
forked from PGL/Clyde
Code Pull Requests Activity

Compare commits

base: tonitch:meetings
Branches Tags
tonitch:master
tonitch:meetings
PGL:master
PGL:tonitch/fix/scrollIsue
PGL:tonitch/max/front/fix/vue
PGL:Schedule/master
PGL:wal/front/temp
tonitch:jalonA
PGL:JalonB
PGL:jalonA
..
compare: tonitch:master
Branches Tags
tonitch:meetings
tonitch:master
PGL:master
PGL:tonitch/fix/scrollIsue
PGL:tonitch/max/front/fix/vue
PGL:Schedule/master
PGL:wal/front/temp
tonitch:jalonA
PGL:JalonB
PGL:jalonA

No commits in common. "meetings" and "master" have entirely different histories.
meetings ... master

6 changed files with 0 additions and 55 deletions
Show Stats Expand all files Collapse all files

9
backend/src/main/java/ovh/herisson/Clyde/Tables/Msg/AppointmentStatus.java
View File

@ -1,9 +0,0 @@
package ovh.herisson.Clyde.Tables.Msg;
public enum AppointmentStatus {
WAITING_TEACHER,
WAITING_STUDENT,
CONFIRMED,
REFUSED
}

30
backend/src/main/java/ovh/herisson/Clyde/Tables/Msg/Appointments.java
View File

@ -1,30 +0,0 @@
package ovh.herisson.Clyde.Tables.Msg;
import java.util.Date;
import jakarta.persistence.Entity;
import jakarta.persistence.EnumType;
import jakarta.persistence.Enumerated;
import jakarta.persistence.GeneratedValue;
import jakarta.persistence.GenerationType;
import jakarta.persistence.Id;
import jakarta.persistence.ManyToOne;
import ovh.herisson.Clyde.Tables.User;
@Entity
public class Appointments {
@Id
@GeneratedValue(strategy = GenerationType.AUTO)
private int id;
@ManyToOne
private User teacher, student;
private Date planned;
@Enumerated(EnumType.STRING)
private AppointmentStatus status;
}

1
frontend/public/i18n/EN.txt
View File

@ -20,7 +20,6 @@ app.login=Login
app.notifications=Notifications
app.settings=Settings
app.messages=Messages
app.meetings=Meetings
app.forum=Forum
app.schedules=Schedules
app.inscription.requests=Inscription Requests

1
frontend/public/i18n/FR.txt
View File

@ -20,7 +20,6 @@ app.login=Se connecter
app.notifications=Notifications
app.settings=Options
app.messages=Messages
app.meetings=Rendez-vous
app.forum=Forum
app.schedules=Horaires
app.inscription.requests=Demandes d'Inscription

11
frontend/src/Apps/Meetings.vue
View File

@ -1,11 +0,0 @@
<template>
</template>
<script setup>
alert("Meetings page WIP")
</script>
<style scoped>
</style>

3
frontend/src/rest/apps.js
View File

@ -9,7 +9,6 @@ import Profil from "@/Apps/Profil.vue"
import Courses from "@/Apps/ManageCourses.vue"
import Users from "@/Apps/UsersList.vue"
import Students from "@/Apps/StudentsList.vue"
import Meetings from "@/Apps/Meetings.vue"
const apps = {
'/login': LoginPage,
@ -18,12 +17,10 @@ const apps = {
'/manage-courses' : Courses,
'/users-list' : Users,
'/students-list' : Students,
'/meetings' : Meetings,
}
const appsList = {
'Msg': { path: '#/msg', icon: 'fa-comment', text: i18n("app.messages") },
'Meetings': { path: '#/meetings', icon: 'fa-handshake', text: i18n("app.meetings") },
'Notification': { path: '#/notifs', icon: 'fa-bell', text: i18n("app.notifications") },
'Forum': { path: '#/forum', icon: 'fa-envelope', text: i18n("app.forum") },
'Schedule': { path: '#/schedule', icon: 'fa-calendar-days', text: i18n("app.schedules") },