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
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Jean-Marie Place
SCODOC_R6A06
Commits
1193364c
Commit
1193364c
authored
2 months ago
by
Emmanuel Viennet
Browse files
Options
Downloads
Patches
Plain Diff
Fix: sco_report when no admission data (continued)
parent
cc290487
No related branches found
No related tags found
No related merge requests found
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
app/models/etudiants.py
+15
-4
15 additions, 4 deletions
app/models/etudiants.py
app/scodoc/sco_report.py
+1
-1
1 addition, 1 deletion
app/scodoc/sco_report.py
app/scodoc/sco_synchro_etuds.py
+1
-4
1 addition, 4 deletions
app/scodoc/sco_synchro_etuds.py
sco_version.py
+1
-1
1 addition, 1 deletion
sco_version.py
with
18 additions
and
10 deletions
app/models/etudiants.py
+
15
−
4
View file @
1193364c
...
...
@@ -63,6 +63,7 @@ class Identite(models.ScoDocModel):
dept_naissance
=
db
.
Column
(
db
.
Text
())
nationalite
=
db
.
Column
(
db
.
Text
())
statut
=
db
.
Column
(
db
.
Text
())
"
champ libre inutilisé par ScoDoc, peut servir à filtrer dans les statistiques
"
boursier
=
db
.
Column
(
db
.
Boolean
(),
nullable
=
False
,
default
=
False
,
server_default
=
"
false
"
)
...
...
@@ -217,11 +218,15 @@ class Identite(models.ScoDocModel):
return
cls
.
query
.
filter_by
(
**
args
).
first_or_404
()
@classmethod
def
get_etud
(
cls
,
etudid
:
int
,
accept_none
=
False
)
->
"
Identite
"
:
def
get_etud
(
cls
,
etudid
:
int
,
accept_none
=
False
,
ensure_admission
=
False
)
->
"
Identite
"
:
"""
Etudiant ou 404 (ou None si accept_none),
cherche uniquement dans le département courant.
Si accept_none, return None si l
'
id est invalide ou ne correspond
pas à un étudiant.
Si ensure_admission: ajoute la relation
"
admission
"
si elle n
'
existe pas
déjà (cela entraîne un commit).
"""
if
not
isinstance
(
etudid
,
int
):
try
:
...
...
@@ -236,9 +241,15 @@ class Identite(models.ScoDocModel):
if
g
.
scodoc_dept
else
cls
.
query
.
filter_by
(
id
=
etudid
)
)
if
accept_none
:
return
query
.
first
()
return
query
.
first_or_404
()
etud
:
"
Identite
"
=
query
.
first
()
if
accept_none
else
query
.
first_or_404
()
if
etud
and
not
etud
.
admission
and
ensure_admission
:
# Si admission n'existe pas, on l'ajoute
etud
.
admission
=
Admission
()
db
.
session
.
add
(
etud
.
admission
)
db
.
session
.
commit
()
db
.
session
.
refresh
(
etud
)
log
(
f
"
get_etud: added Admission to etudid=
{
etudid
}
"
)
return
etud
@classmethod
def
create_etud
(
cls
,
**
args
)
->
"
Identite
"
:
...
...
This diff is collapsed.
Click to expand it.
app/scodoc/sco_report.py
+
1
−
1
View file @
1193364c
...
...
@@ -90,7 +90,7 @@ def formsemestre_etuds_stats(
etudid
=
t
[
-
1
]
if
etudids
and
etudid
not
in
etudids
:
continue
etud
=
Identite
.
get_etud
(
etudid
)
etud
=
Identite
.
get_etud
(
etudid
,
ensure_admission
=
True
)
e_dict
=
etud
.
to_dict_scodoc7
()
if
etud
.
admission
:
e_dict
|=
etud
.
admission
.
to_dict
()
...
...
This diff is collapsed.
Click to expand it.
app/scodoc/sco_synchro_etuds.py
+
1
−
4
View file @
1193364c
...
...
@@ -777,9 +777,6 @@ def do_import_etud_admission(etud: Identite, etud_data: dict, import_identite=Fa
"
codepostallycee
"
:
get_opt_str
(
etud_data
,
"
codepostal_lycee
"
),
"
boursier
"
:
get_opt_str
(
etud_data
,
"
bourse
"
),
}
if
etud
.
admission
is
None
:
etud
.
admission
=
Admission
()
db
.
session
.
add
(
etud
.
admission
)
args
=
{
k
:
v
for
k
,
v
in
args
.
items
()
if
v
not
in
(
""
,
None
)}
etud
.
admission
.
from_dict
(
args
)
...
...
@@ -873,7 +870,7 @@ def formsemestre_import_etud_admission(
for
i
in
ins
:
etudid
=
i
[
"
etudid
"
]
etud
:
Identite
=
Identite
.
get_
or_404
(
etudid
)
etud
:
Identite
=
Identite
.
get_
etud
(
etudid
,
ensure_admission
=
True
)
code_nip
=
etud
.
code_nip
if
not
code_nip
:
etuds_no_nip
.
append
(
etud
)
...
...
This diff is collapsed.
Click to expand it.
sco_version.py
+
1
−
1
View file @
1193364c
...
...
@@ -3,7 +3,7 @@
"
Infos sur version ScoDoc
"
SCOVERSION
=
"
9.7.7
4
"
SCOVERSION
=
"
9.7.7
5
"
SCONAME
=
"
ScoDoc
"
...
...
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