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
Paul Milleville
SCODOC_R6A06
Commits
797686cf
Commit
797686cf
authored
2 years ago
by
Emmanuel Viennet
Browse files
Options
Downloads
Patches
Plain Diff
Fix #571 cursus BUT avec validation antérieure
parent
16b0ad43
No related branches found
No related tags found
No related merge requests found
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
app/but/cursus_but.py
+1
-1
1 addition, 1 deletion
app/but/cursus_but.py
app/models/but_validations.py
+5
-0
5 additions, 0 deletions
app/models/but_validations.py
with
6 additions
and
1 deletion
app/but/cursus_but.py
+
1
−
1
View file @
797686cf
...
...
@@ -142,7 +142,7 @@ class EtudCursusBUT:
self
.
validation_par_competence_et_annee
[
niveau
.
competence
.
id
]
=
{}
previous_validation
=
self
.
validation_par_competence_et_annee
.
get
(
niveau
.
competence
.
id
)
)
.
get
(
validation_rcue
.
annee
())
# prend la "meilleure" validation
if
(
not
previous_validation
)
or
(
sco_codes
.
BUT_CODES_ORDERED
[
validation_rcue
.
code
]
...
...
This diff is collapsed.
Click to expand it.
app/models/but_validations.py
+
5
−
0
View file @
797686cf
...
...
@@ -71,6 +71,11 @@ class ApcValidationRCUE(db.Model):
<em>enregistrée le
{
self
.
date
.
strftime
(
"
%d/%m/%Y
"
)
}
à
{
self
.
date
.
strftime
(
"
%Hh%M
"
)
}
</em>
"""
def
annee
(
self
)
->
str
:
"""
l
'
année BUT concernée:
"
BUT1
"
,
"
BUT2
"
ou
"
BUT3
"
"""
niveau
=
self
.
niveau
()
return
niveau
.
annee
if
niveau
else
None
def
niveau
(
self
)
->
ApcNiveau
:
"""
Le niveau de compétence associé à cet RCUE.
"""
# Par convention, il est donné par la seconde UE
...
...
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