Compare commits
No commits in common. "meetings" and "master" have entirely different histories.
@ -1,9 +0,0 @@
|
|||||||
package ovh.herisson.Clyde.Tables.Msg;
|
|
||||||
|
|
||||||
public enum AppointmentStatus {
|
|
||||||
WAITING_TEACHER,
|
|
||||||
WAITING_STUDENT,
|
|
||||||
CONFIRMED,
|
|
||||||
REFUSED
|
|
||||||
}
|
|
||||||
|
|
@ -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;
|
|
||||||
|
|
||||||
}
|
|
@ -20,7 +20,6 @@ app.login=Login
|
|||||||
app.notifications=Notifications
|
app.notifications=Notifications
|
||||||
app.settings=Settings
|
app.settings=Settings
|
||||||
app.messages=Messages
|
app.messages=Messages
|
||||||
app.meetings=Meetings
|
|
||||||
app.forum=Forum
|
app.forum=Forum
|
||||||
app.schedules=Schedules
|
app.schedules=Schedules
|
||||||
app.inscription.requests=Inscription Requests
|
app.inscription.requests=Inscription Requests
|
||||||
|
@ -20,7 +20,6 @@ app.login=Se connecter
|
|||||||
app.notifications=Notifications
|
app.notifications=Notifications
|
||||||
app.settings=Options
|
app.settings=Options
|
||||||
app.messages=Messages
|
app.messages=Messages
|
||||||
app.meetings=Rendez-vous
|
|
||||||
app.forum=Forum
|
app.forum=Forum
|
||||||
app.schedules=Horaires
|
app.schedules=Horaires
|
||||||
app.inscription.requests=Demandes d'Inscription
|
app.inscription.requests=Demandes d'Inscription
|
||||||
|
@ -1,11 +0,0 @@
|
|||||||
<template>
|
|
||||||
</template>
|
|
||||||
|
|
||||||
<script setup>
|
|
||||||
alert("Meetings page WIP")
|
|
||||||
</script>
|
|
||||||
|
|
||||||
<style scoped>
|
|
||||||
|
|
||||||
</style>
|
|
||||||
|
|
@ -9,7 +9,6 @@ import Profil from "@/Apps/Profil.vue"
|
|||||||
import Courses from "@/Apps/ManageCourses.vue"
|
import Courses from "@/Apps/ManageCourses.vue"
|
||||||
import Users from "@/Apps/UsersList.vue"
|
import Users from "@/Apps/UsersList.vue"
|
||||||
import Students from "@/Apps/StudentsList.vue"
|
import Students from "@/Apps/StudentsList.vue"
|
||||||
import Meetings from "@/Apps/Meetings.vue"
|
|
||||||
|
|
||||||
const apps = {
|
const apps = {
|
||||||
'/login': LoginPage,
|
'/login': LoginPage,
|
||||||
@ -18,12 +17,10 @@ const apps = {
|
|||||||
'/manage-courses' : Courses,
|
'/manage-courses' : Courses,
|
||||||
'/users-list' : Users,
|
'/users-list' : Users,
|
||||||
'/students-list' : Students,
|
'/students-list' : Students,
|
||||||
'/meetings' : Meetings,
|
|
||||||
}
|
}
|
||||||
|
|
||||||
const appsList = {
|
const appsList = {
|
||||||
'Msg': { path: '#/msg', icon: 'fa-comment', text: i18n("app.messages") },
|
'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") },
|
'Notification': { path: '#/notifs', icon: 'fa-bell', text: i18n("app.notifications") },
|
||||||
'Forum': { path: '#/forum', icon: 'fa-envelope', text: i18n("app.forum") },
|
'Forum': { path: '#/forum', icon: 'fa-envelope', text: i18n("app.forum") },
|
||||||
'Schedule': { path: '#/schedule', icon: 'fa-calendar-days', text: i18n("app.schedules") },
|
'Schedule': { path: '#/schedule', icon: 'fa-calendar-days', text: i18n("app.schedules") },
|
||||||
|
Loading…
x
Reference in New Issue
Block a user