Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
V
ViaResto-website
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Aymeric Chaumont
ViaResto-website
Merge requests
!48
improve data collection
Code
Review changes
Check out branch
Download
Patches
Plain diff
Expand sidebar
Merged
improve data collection
improve_data_collection
into
main
Overview
0
Commits
3
Pipelines
6
Changes
7
Merged
improve data collection
Antoine Gaudron-Desjardins
requested to merge
improve_data_collection
into
main
Jul 20, 2022
Overview
0
Commits
3
Pipelines
6
Changes
7
0
0
Merge request reports
Compare
main
version 2
fc08db66
Jul 20, 2022
version 1
4abc0019
Jul 20, 2022
main (base)
and
latest version
latest version
51af8942
3 commits,
Jul 20, 2022
version 2
fc08db66
2 commits,
Jul 20, 2022
version 1
4abc0019
1 commit,
Jul 20, 2022
7 files
+
58
−
46
Inline
Compare changes
Side-by-side
Inline
Show whitespace changes
Show one file at a time
Files
7
backend/db/crud.py
+
6
−
1
View file @ 51af8942
Edit in single-file editor
Open in Web IDE
Show full file
@@ -490,7 +490,6 @@ def update_collaborative_record(user: schemas.User, db: Session):
if
last_record
.
date
>=
datetime
.
combine
(
date
,
time_slot
.
open_time
)
and
not
last_record
.
waiting_time
:
last_record
.
waiting_time
=
current_date
-
\
pytz
.
timezone
(
"
Europe/Paris
"
).
localize
(
last_record
.
date
)
print
(
last_record
.
waiting_time
)
db
.
add
(
last_record
)
db
.
commit
()
db
.
refresh
(
last_record
)
@@ -499,6 +498,12 @@ def update_collaborative_record(user: schemas.User, db: Session):
raise
HTTPException
(
status_code
=
406
,
detail
=
"
Client already registered
"
)
def
cancel_collaborative_record
(
user_id
:
int
,
db
:
Session
):
db
.
query
(
models
.
CollaborativeRecords
).
filter
(
models
.
CollaborativeRecords
.
user_id
==
user_id
).
delete
()
db
.
commit
()
return
def
delete_collaborative_record
(
id
:
int
,
db
:
Session
):
if
id
==
0
:
db
.
query
(
models
.
CollaborativeRecords
).
delete
()
Loading