Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
S
SCODOC_R6A06
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
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
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Paul Milleville
SCODOC_R6A06
Commits
c983d0ae
Commit
c983d0ae
authored
3 months ago
by
Emmanuel Viennet
Browse files
Options
Downloads
Patches
Plain Diff
Fix small bug in assiduite error handling
parent
c7dc6934
No related branches found
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
app/api/tools.py
+6
-11
6 additions, 11 deletions
app/api/tools.py
with
6 additions
and
11 deletions
app/api/tools.py
+
6
−
11
View file @
c983d0ae
...
@@ -10,14 +10,14 @@ from flask_login import current_user
...
@@ -10,14 +10,14 @@ from flask_login import current_user
from
sqlalchemy
import
desc
,
or_
from
sqlalchemy
import
desc
,
or_
from
app
import
models
from
app
import
models
from
app.scodoc.sco_utils
import
json_error
from
app.models
import
Departement
,
Identite
,
Admission
from
app.models
import
Departement
,
Identite
,
Admission
from
app.scodoc.sco_exceptions
import
ScoValueError
from
app.scodoc.sco_permissions
import
Permission
from
app.scodoc.sco_permissions
import
Permission
def
get_etud
(
def
get_etud
(
etudid
:
int
|
None
=
None
,
nip
:
str
|
None
=
None
,
ine
:
str
|
None
=
None
etudid
:
int
|
None
=
None
,
nip
:
str
|
None
=
None
,
ine
:
str
|
None
=
None
)
->
models
.
Identite
:
)
->
models
.
Identite
|
None
:
"""
"""
L
'
instance d
'
étudiant la plus récente en fonction de l
'
etudid,
L
'
instance d
'
étudiant la plus récente en fonction de l
'
etudid,
ou du code nip ou code ine.
ou du code nip ou code ine.
...
@@ -33,21 +33,16 @@ def get_etud(
...
@@ -33,21 +33,16 @@ def get_etud(
if
etudid
is
not
None
:
if
etudid
is
not
None
:
try
:
try
:
etudid
=
int
(
etudid
)
etudid
=
int
(
etudid
)
except
ValueError
:
except
ValueError
as
exc
:
return
json_error
(
raise
ScoValueError
(
"
etudid invalide
"
)
from
exc
404
,
message
=
"
etudid invalide
"
,
)
query
:
Identite
=
Identite
.
query
.
filter_by
(
id
=
etudid
)
query
:
Identite
=
Identite
.
query
.
filter_by
(
id
=
etudid
)
elif
nip
is
not
None
:
elif
nip
is
not
None
:
query
=
Identite
.
query
.
filter_by
(
code_nip
=
nip
)
query
=
Identite
.
query
.
filter_by
(
code_nip
=
nip
)
elif
ine
is
not
None
:
elif
ine
is
not
None
:
query
=
Identite
.
query
.
filter_by
(
code_ine
=
ine
)
query
=
Identite
.
query
.
filter_by
(
code_ine
=
ine
)
else
:
else
:
return
json_error
(
raise
ScoValueError
(
"
parametre manquant
"
)
404
,
message
=
"
parametre manquant
"
,
)
if
None
not
in
allowed_depts
:
if
None
not
in
allowed_depts
:
# restreint aux départements autorisés:
# restreint aux départements autorisés:
query
=
query
.
join
(
Departement
).
filter
(
query
=
query
.
join
(
Departement
).
filter
(
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment