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
916edb72
Commit
916edb72
authored
2 years ago
by
Emmanuel Viennet
Committed by
iziram
2 years ago
Browse files
Options
Downloads
Patches
Plain Diff
N'affiche pas les niveaux inexistants sur le résumé parcours
parent
449c1f0c
No related branches found
No related tags found
No related merge requests found
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
app/but/cursus_but.py
+6
-0
6 additions, 0 deletions
app/but/cursus_but.py
app/static/css/cursus_but.css
+4
-0
4 additions, 0 deletions
app/static/css/cursus_but.css
app/templates/but/cursus_etud.j2
+3
-2
3 additions, 2 deletions
app/templates/but/cursus_etud.j2
with
13 additions
and
2 deletions
app/but/cursus_but.py
+
6
−
0
View file @
916edb72
...
@@ -71,6 +71,7 @@ class SituationEtudCursusBUT(sco_cursus_dut.SituationEtudCursusClassic):
...
@@ -71,6 +71,7 @@ class SituationEtudCursusBUT(sco_cursus_dut.SituationEtudCursusClassic):
class
EtudCursusBUT
:
class
EtudCursusBUT
:
"""
L
'
état de l
'
étudiant dans son cursus BUT
"""
L
'
état de l
'
étudiant dans son cursus BUT
Liste des niveaux validés/à valider
Liste des niveaux validés/à valider
(utilisé pour le résumé sur la fiche étudiant)
"""
"""
def
__init__
(
self
,
etud
:
Identite
,
formation
:
Formation
):
def
__init__
(
self
,
etud
:
Identite
,
formation
:
Formation
):
...
@@ -190,6 +191,11 @@ class EtudCursusBUT:
...
@@ -190,6 +191,11 @@ class EtudCursusBUT:
)
)
return
d
return
d
def
competence_annee_has_niveau
(
self
,
competence_id
:
int
,
annee
:
str
)
->
bool
:
"
vrai si la compétence à un niveau dans cette annee (
'
BUT1
'
) pour le parcour de cet etud
"
# slow, utile pour affichage fiche
return
annee
in
[
n
.
annee
for
n
in
self
.
competences
[
competence_id
].
niveaux
]
def
load_validation_by_niveau
(
self
)
->
dict
[
int
,
list
[
ApcValidationRCUE
]]:
def
load_validation_by_niveau
(
self
)
->
dict
[
int
,
list
[
ApcValidationRCUE
]]:
"""
Cherche les validations de jury enregistrées pour chaque niveau
"""
Cherche les validations de jury enregistrées pour chaque niveau
Résultat: { niveau_id : [ ApcValidationRCUE ] }
Résultat: { niveau_id : [ ApcValidationRCUE ] }
...
...
This diff is collapsed.
Click to expand it.
app/static/css/cursus_but.css
+
4
−
0
View file @
916edb72
...
@@ -40,6 +40,10 @@ div.code_rcue {
...
@@ -40,6 +40,10 @@ div.code_rcue {
position
:
relative
;
position
:
relative
;
}
}
div
.no_niveau
{
background-color
:
rgb
(
245
,
237
,
200
);
}
div
.code_jury
{
div
.code_jury
{
padding-right
:
4px
;
padding-right
:
4px
;
padding-left
:
4px
;
padding-left
:
4px
;
...
...
This diff is collapsed.
Click to expand it.
app/templates/but/cursus_etud.j2
+
3
−
2
View file @
916edb72
...
@@ -9,7 +9,8 @@
...
@@ -9,7 +9,8 @@
<div class="cb_titre_competence">{{ cursus.competences[competence_id].titre }}</div>
<div class="cb_titre_competence">{{ cursus.competences[competence_id].titre }}</div>
{% for annee in ('BUT1', 'BUT2', 'BUT3') %}
{% for annee in ('BUT1', 'BUT2', 'BUT3') %}
{% set validation = cursus.validation_par_competence_et_annee.get(competence_id, {}).get(annee) %}
{% set validation = cursus.validation_par_competence_et_annee.get(competence_id, {}).get(annee) %}
<div>
{% set has_niveau = cursus.competence_annee_has_niveau(competence_id, annee) %}
<div class="{{ '' if has_niveau else 'no_niveau' }}">
{% if validation %}
{% if validation %}
<div class="code_rcue with_scoplement">
<div class="code_rcue with_scoplement">
<div class="code_jury">{{validation.code}}</div>
<div class="code_jury">{{validation.code}}</div>
...
@@ -23,7 +24,7 @@
...
@@ -23,7 +24,7 @@
</div>
</div>
{% else %}
{% else %}
<div class="code_rcue">
<div class="code_rcue">
<div class="code_jury">
-
</div>
<div class="code_jury">
{{'-' if has_niveau else ''}}
</div>
</div>
</div>
{%endif%}
{%endif%}
</div>
</div>
...
...
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