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

Filter and lists

Browse Source
This commit is contained in:
Wawilski
2024-04-11 15:47:56 +02:00
parent 95ef4023d6
commit adaa828810
6 changed files with 273 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
backend/src/main/java/ovh/herisson/Clyde/EndPoints/MockController.java
View File

@ -107,11 +107,11 @@ public class MockController {
//Schedule part
Lesson lesson_0_progra1 = new Lesson(progra1, "Mon Apr 01 2024 08:15", "Mon Apr 01 2024 10:15","rgb(0,50,100)","A0B2");
Lesson lesson_0_chemistry1 = new Lesson(chemistry1, "Wed Mar 27 2024 08:15", "Wed Mar 27 2024 09:15","rgb(100,50,0)","A0B2");
Lesson lesson_0_psycho1 = new Lesson(psycho1, "Sun Mar 24 2024 10:30 ","Sun Mar 24 2024 12:30 ","rgb(100,50,100)", "A0B2");
Lesson lesson_1_progra1 = new Lesson(progra1, "Mon Apr 02 2024 13:30", "Mon Apr 02 2024 15:30","rgb(0,50,100)","A0B2");
Lesson lesson_0_commun = new Lesson(commun, "Mon Apr 01 2024 10:30", "Mon Apr 01 2024 12:30","rgb(0,50,100)","A0B2");
Lesson lesson_0_progra1 = new Lesson(progra1, "Mon Apr 01 2024 08:15", "Mon Apr 01 2024 10:15","rgb(0,50,100)","A0B2","Course");
Lesson lesson_0_chemistry1 = new Lesson(chemistry1, "Wed Mar 27 2024 08:15", "Wed Mar 27 2024 09:15","rgb(100,50,0)","A0B2","TP");
Lesson lesson_0_psycho1 = new Lesson(psycho1, "Sun Mar 24 2024 10:30 ","Sun Mar 24 2024 12:30 ","rgb(100,50,100)", "A0B2","TD");
Lesson lesson_1_progra1 = new Lesson(progra1, "Mon Apr 02 2024 13:30", "Mon Apr 02 2024 15:30","rgb(0,50,100)","A0B2","TP");
Lesson lesson_0_commun = new Lesson(commun, "Mon Apr 01 2024 10:30", "Mon Apr 01 2024 12:30","rgb(0,50,100)","A0B2","Course");
Schedule infoBab1Schedule = new Schedule(infoBab1);
Schedule chemistryBab1Schedule = new Schedule(chemistryBab1);

3
backend/src/main/java/ovh/herisson/Clyde/EndPoints/UserController.java
View File

@ -103,9 +103,6 @@ public class UserController {
@GetMapping("/teachers")
public ResponseEntity<Iterable<HashMap<String,Object>>> getAllTeachers(@RequestHeader("Authorization") String token){
if (authServ.getUserFromToken(token) == null)
return new UnauthorizedResponse<>(null);
Iterable<User> teachers = userService.getAllTeachers();
return new ResponseEntity<>(ProtectionService.usersWithoutPasswords(teachers), HttpStatus.OK);

4
backend/src/main/java/ovh/herisson/Clyde/Services/LessonService.java
View File

@ -57,6 +57,10 @@ public class LessonService {
break;
case "local":
target.setLocal((String) entry.getValue());
break;
case "lessonType":
target.setLessonType((String) entry.getValue());
break;
}
}
lessonRepo.save(target);

1
backend/src/main/java/ovh/herisson/Clyde/Services/ProtectionService.java
View File

@ -82,6 +82,7 @@ public class ProtectionService {
toReturn.put("course",courseWithoutPassword(lesson.getCourse()));
toReturn.put("local",lesson.getLocal());
toReturn.put("color", lesson.getColor());
toReturn.put("lessonType",lesson.getLessonType());
return toReturn;
}

14
backend/src/main/java/ovh/herisson/Clyde/Tables/Lesson.java
View File

@ -16,16 +16,20 @@ public class Lesson {
private String lessonStart;
private String lessonEnd;
private String color;
private String lessonType;
private String local;
public Lesson(Course course,String start, String end ,String color,String local){
public Lesson(Course course,String start, String end ,String color,String local,String lessonType){
this.lessonEnd = end;
this.course = course;
this.lessonStart = start;
this.color = color;
this.local = local;
this.lessonType = lessonType;
}
public Lesson() {
@ -59,6 +63,10 @@ public class Lesson {
return local;
}
public String getLessonType(){
return lessonType;
}
public void setLessonStart(String start){
this.lessonStart = start;
}
@ -74,4 +82,8 @@ public class Lesson {
public void setLocal(String local){
this.local = local;
}
public void setLessonType(String lessonType){
this.lessonType = lessonType;
}
}