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
7dada615
Commit
7dada615
authored
11 months ago
by
Emmanuel Viennet
Browse files
Options
Downloads
Patches
Plain Diff
Fix fiche etud et bulletin BUT en cas de pb de config formation APC. Closes #965
parent
22245002
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/scodoc/sco_page_etud.py
+5
-2
5 additions, 2 deletions
app/scodoc/sco_page_etud.py
app/static/css/scodoc.css
+5
-0
5 additions, 0 deletions
app/static/css/scodoc.css
app/static/js/releve-but.js
+1
-1
1 addition, 1 deletion
app/static/js/releve-but.js
with
11 additions
and
3 deletions
app/scodoc/sco_page_etud.py
+
5
−
2
View file @
7dada615
...
...
@@ -462,7 +462,10 @@ def fiche_etud(etudid=None):
# Liens vers compétences BUT
if
last_formsemestre
and
last_formsemestre
.
formation
.
is_apc
():
try
:
but_cursus
=
cursus_but
.
EtudCursusBUT
(
etud
,
last_formsemestre
.
formation
)
except
ScoValueError
:
but_cursus
=
None
refcomp
=
last_formsemestre
.
formation
.
referentiel_competence
if
refcomp
:
ue_validation_by_niveau
=
validations_view
.
get_ue_validation_by_niveau
(
...
...
@@ -494,7 +497,7 @@ def fiche_etud(etudid=None):
cursus
=
but_cursus
,
scu
=
scu
,
validation_dut120_html
=
validation_dut120_html
,
)
}
)
if
but_cursus
else
'
<span class=
"
pb-config
"
>problème configuration formation BUT</span>
'
}
<div class=
"
fiche_but_col2
"
>
<div class=
"
link_validation_rcues
"
>
<a class=
"
stdlink
"
href=
"
{
url_for
(
"
notes.validation_rcues
"
,
...
...
This diff is collapsed.
Click to expand it.
app/static/css/scodoc.css
+
5
−
0
View file @
7dada615
...
...
@@ -963,6 +963,11 @@ div.section_but {
justify-content
:
space-evenly
;
}
div
.section_but
.pb-config
{
font-style
:
italic
;
color
:
red
;
}
div
.fiche_but_col2
{
display
:
flex
;
flex-direction
:
column
;
...
...
This diff is collapsed.
Click to expand it.
app/static/js/releve-but.js
+
1
−
1
View file @
7dada615
...
...
@@ -276,7 +276,7 @@ class releveBUT extends HTMLElement {
${(()
=>
{
let
output
=
""
;
data
.
semestre
.
decision_rcue
.
forEach
((
competence
)
=>
{
output
+=
`<div class=competence>
${
competence
.
niveau
.
competence
.
titre
}
</div><div>
${
competence
.
code
}
</div>`
;
output
+=
`<div class=competence>
${
competence
.
niveau
?
.
competence
?
.
titre
||
'
?
'
}
</div><div>
${
competence
.
code
}
</div>`
;
});
return
output
;
})()}
...
...
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