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
b6211c80
Commit
b6211c80
authored
9 months ago
by
Emmanuel Viennet
Browse files
Options
Downloads
Patches
Plain Diff
Fix bilan_ues (UEs sans semestre_idx)
parent
2093a7f3
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/validations_view.py
+2
-1
2 additions, 1 deletion
app/but/validations_view.py
app/tables/bilan_ues.py
+4
-3
4 additions, 3 deletions
app/tables/bilan_ues.py
with
6 additions
and
4 deletions
app/but/validations_view.py
+
2
−
1
View file @
b6211c80
...
...
@@ -95,9 +95,10 @@ def get_ue_validation_by_niveau(
validation
.
ue
.
id
}
pas de niveau de competence
"""
)
continue
semestre_idx
=
validation
.
ue
.
guess_semestre_idx
()
key
=
(
validation
.
ue
.
niveau_competence
.
id
,
"
impair
"
if
validation
.
ue
.
semestre_idx
%
2
else
"
pair
"
,
"
impair
"
if
semestre_idx
%
2
else
"
pair
"
,
)
existing
=
ue_validation_by_niveau
.
get
(
key
,
None
)
if
(
not
existing
)
or
(
...
...
This diff is collapsed.
Click to expand it.
app/tables/bilan_ues.py
+
4
−
3
View file @
b6211c80
...
...
@@ -168,6 +168,7 @@ class RowEtudWithUEs(RowEtudWithInfos):
return
best_validation
=
_best_validation
(
validations
)
moy_ue
=
best_validation
.
moy_ue
ue_semestre_idx
=
best_validation
.
ue
.
guess_semestre_idx
()
note_class
=
""
if
moy_ue
is
None
:
moy_ue
=
scu
.
NO_NOTE_STR
...
...
@@ -181,10 +182,10 @@ class RowEtudWithUEs(RowEtudWithInfos):
raw_content
=
moy_ue
,
classes
=
[
note_class
],
column_classes
=
{
"
note_ue
"
},
group
=
f
"
col_s
{
best_validation
.
ue
.
semestre_idx
}
"
,
group
=
f
"
col_s
{
ue
_
semestre_idx
}
"
,
)
if
self
.
table
.
is_apc
:
class_cursus
=
f
"
cursus_BUT
{
(
best_validation
.
ue
.
semestre_idx
+
1
)
//
2
}
"
class_cursus
=
f
"
cursus_BUT
{
(
ue
_
semestre_idx
+
1
)
//
2
}
"
else
:
class_cursus
=
""
self
.
add_cell
(
...
...
@@ -192,5 +193,5 @@ class RowEtudWithUEs(RowEtudWithInfos):
self
.
table
.
ue_titles
[
key
],
best_validation
.
code
,
column_classes
=
{
"
code_ue
"
,
class_cursus
},
group
=
f
"
col_s
{
best_validation
.
ue
.
semestre_idx
}
"
,
group
=
f
"
col_s
{
ue
_
semestre_idx
}
"
,
)
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