Compare commits
	
		
			2 Commits
		
	
	
		
			7bb1df123f
			...
			meetings
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
| 436ba59af1 | |||
| 82b4e24d03 | 
| @ -0,0 +1,9 @@ | ||||
| package ovh.herisson.Clyde.Tables.Msg; | ||||
|  | ||||
| public enum AppointmentStatus { | ||||
| 	WAITING_TEACHER, | ||||
| 	WAITING_STUDENT, | ||||
| 	CONFIRMED, | ||||
| 	REFUSED | ||||
| } | ||||
|  | ||||
| @ -0,0 +1,30 @@ | ||||
| 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,6 +20,7 @@ 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 | ||||
|  | ||||
| @ -20,6 +20,7 @@ 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
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										11
									
								
								frontend/src/Apps/Meetings.vue
									
									
									
									
									
										Normal file
									
								
							| @ -0,0 +1,11 @@ | ||||
| <template> | ||||
| </template> | ||||
|  | ||||
| <script setup> | ||||
| 	alert("Meetings page WIP") | ||||
| </script> | ||||
|  | ||||
| <style scoped> | ||||
|  | ||||
| </style> | ||||
|  | ||||
| @ -9,6 +9,7 @@ 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, | ||||
| @ -17,10 +18,12 @@ 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") }, | ||||
|  | ||||
		Reference in New Issue
	
	Block a user