Skip to content
Snippets Groups Projects
Commit 16f1e3cd authored by Antoine Gaudron-Desjardins's avatar Antoine Gaudron-Desjardins
Browse files

fix

parent 00e0db6e
No related branches found
No related tags found
1 merge request!35readyfix
Pipeline #44008 passed
...@@ -21,14 +21,15 @@ def get_waiting_time(place: str, db: Session): ...@@ -21,14 +21,15 @@ def get_waiting_time(place: str, db: Session):
data["next_timetable"] = "{:d}h{:02d}".format(first_timeslot[0].hour, first_timeslot[0].minute) data["next_timetable"] = "{:d}h{:02d}".format(first_timeslot[0].hour, first_timeslot[0].minute)
return data return data
elif first_timeslot and current_time <= first_timeslot[1]: elif first_timeslot and current_time <= first_timeslot[1]:
waiting_time = db.query( last_record = db.query(
models.Records.waiting_time models.Records.waiting_time
).filter( ).filter(
models.Records.place == place models.Records.place == place
).order_by( ).order_by(
models.Records.date.desc() models.Records.date.desc()
).first() ).first()
if waiting_time: if last_record:
waiting_time = last_record.waiting_time
waiting_time = round(waiting_time.total_seconds() / 60) waiting_time = round(waiting_time.total_seconds() / 60)
data["status"] = True data["status"] = True
data["waiting_time"] = waiting_time data["waiting_time"] = waiting_time
...@@ -38,14 +39,15 @@ def get_waiting_time(place: str, db: Session): ...@@ -38,14 +39,15 @@ def get_waiting_time(place: str, db: Session):
data["next_timetable"] = "{:d}h{:02d}".format(second_timeslot[0].hour, second_timeslot[0].minute) data["next_timetable"] = "{:d}h{:02d}".format(second_timeslot[0].hour, second_timeslot[0].minute)
return data return data
elif second_timeslot and current_time <= second_timeslot[1]: elif second_timeslot and current_time <= second_timeslot[1]:
waiting_time = db.query( last_record = db.query(
models.Records.waiting_time models.Records.waiting_time
).filter( ).filter(
models.Records.place == place models.Records.place == place
).order_by( ).order_by(
models.Records.date.desc() models.Records.date.desc()
).first() ).first()
if waiting_time: if last_record:
waiting_time = last_record.waiting_time
waiting_time = round(waiting_time.total_seconds() / 60) waiting_time = round(waiting_time.total_seconds() / 60)
data["status"] = True data["status"] = True
data["waiting_time"] = waiting_time data["waiting_time"] = waiting_time
...@@ -317,14 +319,15 @@ def get_restaurants(db: Session): ...@@ -317,14 +319,15 @@ def get_restaurants(db: Session):
restaurant["timeslot"] = "-" restaurant["timeslot"] = "-"
if restaurant["status"]: if restaurant["status"]:
waiting_time = db.query( last_record = db.query(
models.Records.waiting_time models.Records
).filter( ).filter(
models.Records.place == name models.Records.place == name
).order_by( ).order_by(
models.Records.date.desc() models.Records.date.desc()
).first() ).first()
if waiting_time: if last_record:
waiting_time = last_record.waiting_time
restaurant["waiting_time"] = round(waiting_time.total_seconds() / 60) restaurant["waiting_time"] = round(waiting_time.total_seconds() / 60)
else: else:
restaurant["waiting_time"] = None restaurant["waiting_time"] = None
......
...@@ -43,7 +43,7 @@ app.include_router(news.router) ...@@ -43,7 +43,7 @@ app.include_router(news.router)
@app.get('/api/records', response_model=List[schemas.Record]) @app.get('/api/records', response_model=List[schemas.Record])
async def get_records(place: str, db: Session = Depends(get_db)): async def get_records(place: str, db: Session = Depends(get_db)):
return db.query(models.Records).filter(models.Records == place).order_by(models.Records.date.desc()).all() return db.query(models.Records).filter(models.Records.place == place).order_by(models.Records.date.desc()).all()
@app.post('/api/records', response_model=schemas.Record) @app.post('/api/records', response_model=schemas.Record)
...@@ -56,7 +56,7 @@ async def stats(record: schemas.RecordBase, db: Session = Depends(get_db)): ...@@ -56,7 +56,7 @@ async def stats(record: schemas.RecordBase, db: Session = Depends(get_db)):
@app.delete('/api/records', response_model=None) @app.delete('/api/records', response_model=None)
async def stats(id: str, db: Session = Depends(get_db)): async def stats(id: int, db: Session = Depends(get_db)):
if id == 0: if id == 0:
db.query(models.Records).delete() db.query(models.Records).delete()
else: else:
......
...@@ -17,7 +17,7 @@ export default function WaitingTime({ place }) { ...@@ -17,7 +17,7 @@ export default function WaitingTime({ place }) {
return ( return (
<div id="waiting-time-parent"> <div id="waiting-time-parent">
{data.status ? ( {data.status ? (
data.waiting_time ? ( data.waiting_time || data.waiting_time == 0 ? (
<div id="waiting-time-display"> <div id="waiting-time-display">
Le temps d&apos;attente est estimé à Le temps d&apos;attente est estimé à
<div className="waiting-time-minutes"> <div className="waiting-time-minutes">
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment