improve front

Les modifications consistent en une mise en forme du front, pour l'instant il manque une partie du back pour que ce soit totalement fonctionnel mais ça peut être testé en local sans problème

backend/db/crud.py

@@ -13,14 +13,38 @@ from db import models, schemas
 
 def get_waiting_time(place: str, db: Session):
     """ Get the last estimated waiting time for the given place """
-    db_record = db.query(models.Records).filter(models.Records.place == place).order_by(models.Records.date.desc()).first()
-    if db_record.waiting_time is not None:
-        return db_record.waiting_time
-    else:
-        raise Exception
+    date = datetime.now(tz=pytz.timezone("Europe/Paris"))
+    weekday, current_time = date.weekday(), date.time()
+    first_timeslot = get_timeslot(place, weekday, True, db)
+    if first_timeslot and current_time < first_timeslot[0]:
+        return first_timeslot[0].hour, first_timeslot[0].minute
+    elif first_timeslot and current_time <= first_timeslot[1]:
+        waiting_time = db.query(
+            models.Records.waiting_time
+        ).filter(
+            models.Records.place == place
+        ).order_by(
+            models.Records.date.desc()
+        ).first()
+        waiting_time_minutes = round(waiting_time[0].total_seconds() / 60)
+        return waiting_time_minutes, None
+    second_timeslot = get_timeslot(place, weekday, False, db)
+    if second_timeslot and current_time < second_timeslot[0]:
+        return second_timeslot[0].hour, second_timeslot[0].minute
+    elif second_timeslot and current_time <= second_timeslot[1]:
+        waiting_time = db.query(
+            models.Records.waiting_time
+        ).filter(
+            models.Records.place == place
+        ).order_by(
+            models.Records.date.desc()
+        ).first()
+        waiting_time_minutes = round(waiting_time[0].total_seconds() / 60)
+        return waiting_time_minutes, None
+    return None, None
 
 
-def get_stats(place: str, weekday: int, min_time_hour: int, min_time_mn: int, max_time_hour: int, max_time_mn: int, interval: timedelta, db: Session):
+def get_stats(place: str, weekday: int, min_time: time, max_time: time, interval: timedelta, db: Session):
     """ Get the average waiting time for each interval between two time steps """
 
     def shift_time(t: time, delta: timedelta):
@@ -54,7 +78,6 @@ def get_stats(place: str, weekday: int, min_time_hour: int, min_time_mn: int, ma
             name = f'{start_time.hour:02}h{start_time.minute:02}'
             slots_list.append({'name': name, 'time': average_waiting_time})
 
-    min_time, max_time = time(min_time_hour, min_time_mn), time(max_time_hour, max_time_mn)
     stats = []
     start_time, end_time = min_time, shift_time(min_time, interval)
     while start_time < max_time:
@@ -135,27 +158,34 @@ def delete_news(id: int, db: Session):
 def get_opening_hours(place: str, db: Session):
     """ Get the opening hours for the given place """
     opening_hours = db.query(
-        models.OpeningHours
-        ).filter(
-            models.OpeningHours.place == place
-        ).order_by(
-            models.OpeningHours.day, models.OpeningHours.timeslot.desc()
-        ).all()
+        models.OpeningHours.day,
+        models.OpeningHours.timeslot,
+        models.OpeningHours.open_time,
+        models.OpeningHours.close_time,
+    ).filter(
+        models.OpeningHours.place == place
+    ).order_by(
+        models.OpeningHours.day, models.OpeningHours.timeslot.desc()
+    ).all()
     return opening_hours
 
 
 def get_timeslot(place: str, day: int, timeslot: bool, db: Session):
     """ Get the opening hours for the given place and timeslot"""
-    opening_hours = db.query(models.OpeningHours).filter(
+    opening_hours = db.query(
+        models.OpeningHours.open_time,
+        models.OpeningHours.close_time,
+    ).filter(
         models.OpeningHours.place == place,
         models.OpeningHours.day == day,
-        models.OpeningHours.timeslot == timeslot).first()
+        models.OpeningHours.timeslot == timeslot
+    ).first()
     return opening_hours
 
 
 def create_opening_hours(new_opening_hours: schemas.OpeningHoursBase, db: Session):
     """ Add opening hours to the database """
-    db_opening_hours = models.News(**new_opening_hours.dict())
+    db_opening_hours = models.OpeningHours(**new_opening_hours.dict())
     db.add(db_opening_hours)
     db.commit()
     db.refresh(db_opening_hours)