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
8a1f395c
Commit
8a1f395c
authored
4 months ago
by
Emmanuel Viennet
Browse files
Options
Downloads
Patches
Plain Diff
Conserve indice semestre sur page assoc. niveaux. Closes #1024
parent
66c9eb47
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/templates/but/parcour_formation.j2
+5
-4
5 additions, 4 deletions
app/templates/but/parcour_formation.j2
app/templates/pn/form_ues.j2
+1
-1
1 addition, 1 deletion
app/templates/pn/form_ues.j2
app/views/but_formation.py
+2
-0
2 additions, 0 deletions
app/views/but_formation.py
with
8 additions
and
5 deletions
app/templates/but/parcour_formation.j2
+
5
−
4
View file @
8a1f395c
...
...
@@ -52,7 +52,7 @@
<div class="parc {{'focus' if parcour and parc.id == parcour.id else ''}}">
<a href="{{
url_for('notes.parcour_formation', scodoc_dept=g.scodoc_dept,
parcour_id=parc.id, formation_id=formation.id )
parcour_id=parc.id, formation_id=formation.id
, semestre_idx=semestre_idx
)
}}">{{parc.code}}</a>
</div>
{% endfor %}
...
...
@@ -64,7 +64,7 @@
</div>
<div class="link"><a class="stdlink" href="{{
url_for('notes.ue_table',
scodoc_dept=g.scodoc_dept, formation_id=formation.id )
scodoc_dept=g.scodoc_dept, formation_id=formation.id
, semestre_idx=semestre_idx
)
}}">formation</a>
</div>
</div>
...
...
@@ -124,7 +124,7 @@ Choisissez un parcours...
</div>
{% endif %}
{% if current_user.is_administrator() %}
{% if current_user.is_administrator()
and parcour
%}
<div class="sco_box sco_dashed">
<b>Vous êtes super-administrateur.</b>
<div>
...
...
@@ -143,7 +143,8 @@ Choisissez un parcours...
du référentiel de compétence {{formation.referentiel_competence.specialite}}, et permet
d'associer à chaque semestre d'un niveau de compétence une UE de la formation
<a class="stdlink"
href="{{url_for('notes.ue_table', scodoc_dept=g.scodoc_dept, formation_id=formation.id )
href="{{url_for('notes.ue_table', scodoc_dept=g.scodoc_dept,
formation_id=formation.id, semestre_idx=semestre_idx )
}}">{{formation.html()|safe}}
</a>.</p>
...
...
This diff is collapsed.
Click to expand it.
app/templates/pn/form_ues.j2
+
1
−
1
View file @
8a1f395c
...
...
@@ -104,7 +104,7 @@
{% if editable and not ue_is_locked[0] %}
<a class="stdlink" href="{{
url_for('notes.parcour_formation', scodoc_dept=g.scodoc_dept,
formation_id=formation.id )
formation_id=formation.id
, semestre_idx=semestre_idx
)
}}">modifier associations</a>
{% endif %}
</div>
...
...
This diff is collapsed.
Click to expand it.
app/views/but_formation.py
+
2
−
0
View file @
8a1f395c
...
...
@@ -64,6 +64,7 @@ def parcour_formation(formation_id: int, parcour_id: int = None) -> str:
formation
:
Formation
=
Formation
.
query
.
filter_by
(
id
=
formation_id
,
dept_id
=
g
.
scodoc_dept_id
).
first_or_404
()
semestre_idx
=
request
.
args
.
get
(
"
semestre_idx
"
,
type
=
int
)
ref_comp
:
ApcReferentielCompetences
=
formation
.
referentiel_competence
if
ref_comp
is
None
:
return
"
pas de référentiel de compétences
"
...
...
@@ -87,6 +88,7 @@ def parcour_formation(formation_id: int, parcour_id: int = None) -> str:
parcour
=
parcour
,
competences_parcour
=
competences_parcour
,
sco
=
ScoData
(),
semestre_idx
=
semestre_idx
,
title
=
f
"
{
formation
.
acronyme
}
- Niveaux et UEs
"
,
)
...
...
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