Merge branch 'dev' into feat/user-cache

# Conflicts: # frontend/app_student/pubspec.yaml
B3-3iL-DLW · Mar 13, 2024 · 8540ad0 · 8540ad0
2 parents 3e6c61f + 8c97906
commit 8540ad0
Show file tree

Hide file tree

Showing 23 changed files with 280 additions and 205 deletions.
diff --git a/frontend/app_student/assets/fonts/arial.ttf b/frontend/app_student/assets/fonts/arial.ttf
diff --git a/frontend/app_student/assets/images/eating.svg b/frontend/app_student/assets/images/eating.svg
diff --git a/frontend/app_student/assets/images/microsoft-teams.svg b/frontend/app_student/assets/images/microsoft-teams.svg
diff --git a/frontend/app_student/assets/images/school.svg b/frontend/app_student/assets/images/school.svg
diff --git a/frontend/app_student/assets/images/teams.svg b/frontend/app_student/assets/images/teams.svg
diff --git a/frontend/app_student/lib/api/day_schedule/models/day_schedule_model.dart b/frontend/app_student/lib/api/day_schedule/models/day_schedule_model.dart
@@ -1,4 +1,4 @@
-import '../../events/entities/event_entity.dart';
+import 'package:app_student/api/events/models/event_model.dart';
 import '../entities/day_schedule_entity.dart';
 
 class DayScheduleModel {
@@ -10,7 +10,8 @@ class DayScheduleModel {
 
   int get jour => entity.jour;
 
-  List<EventEntity> get events => entity.events;
+  List<EventModel> get events =>
+      entity.events.map((e) => EventModel(entity: e)).toList();
 
   factory DayScheduleModel.fromEntity(DayScheduleEntity entity) {
     return DayScheduleModel(

diff --git a/frontend/app_student/lib/api/events/models/event_model.dart b/frontend/app_student/lib/api/events/models/event_model.dart
@@ -12,4 +12,5 @@ class EventModel {
   String get couleur => entity.couleur;
   EventHoursModel get horaires => EventHoursModel(entity: entity.horaires);
   String get salle => entity.salle;
+  bool get visio => entity.visio;
 }
diff --git a/frontend/app_student/lib/main_dev.dart b/frontend/app_student/lib/main_dev.dart
@@ -39,6 +39,7 @@ class MyApp extends StatelessWidget {
       theme: ThemeData(
         primarySwatch: Colors.blue,
         focusColor: const Color(0xffE84E0F),
+        fontFamily: 'Arial',
       ),
       routerConfig: router,
     );