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
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Paul Milleville
SCODOC_R6A06
Commits
699f6419
Commit
699f6419
authored
2 years ago
by
Emmanuel Viennet
Browse files
Options
Downloads
Patches
Plain Diff
Améliore signalement des sem. verrouillés sur page édition programme
parent
8768f243
No related branches found
No related tags found
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
app/scodoc/sco_edit_ue.py
+10
-2
10 additions, 2 deletions
app/scodoc/sco_edit_ue.py
app/scodoc/sco_synchro_etuds.py
+1
-1
1 addition, 1 deletion
app/scodoc/sco_synchro_etuds.py
app/static/css/scodoc.css
+10
-1
10 additions, 1 deletion
app/static/css/scodoc.css
with
21 additions
and
4 deletions
app/scodoc/sco_edit_ue.py
+
10
−
2
View file @
699f6419
...
@@ -775,11 +775,19 @@ du programme" (menu "Semestre") si vous avez un semestre en cours);
...
@@ -775,11 +775,19 @@ du programme" (menu "Semestre") si vous avez un semestre en cours);
# Formation APC (BUT) ?
# Formation APC (BUT) ?
if
is_apc
:
if
is_apc
:
lock_info
=
(
"""
<span class=
"
lock_info
"
>verrouillé (voir liste des semestres utilisateurs
en bas de page)</span>
"""
if
locked
else
""
)
H
.
append
(
H
.
append
(
f
"""
<div class=
"
formation_apc_infos
"
>
f
"""
<div class=
"
formation_apc_infos
"
>
<div class=
"
ue_list_tit
"
>Formation par compétences (BUT)
<div class=
"
ue_list_tit
"
>Formation par compétences (BUT)
-
Semestre
{
_html_select_semestre_idx
(
formation_id
,
semestre_ids
,
semestre_idx
)
}
-
{
_html_select_semestre_idx
(
formation_id
,
semestre_ids
,
semestre_idx
)
}
</form>
</form>
{
lock_info
}
</div>
</div>
"""
"""
)
)
...
@@ -985,7 +993,7 @@ du programme" (menu "Semestre") si vous avez un semestre en cours);
...
@@ -985,7 +993,7 @@ du programme" (menu "Semestre") si vous avez un semestre en cours);
def
_html_select_semestre_idx
(
formation_id
,
semestre_ids
,
semestre_idx
):
def
_html_select_semestre_idx
(
formation_id
,
semestre_ids
,
semestre_idx
):
htm
=
"""
<form method=
"
get
"
>Semestre:
htm
=
"""
<form method=
"
get
"
>Semestre:
<select onchange=
"
this.form.submit()
"
name=
"
semestre_idx
"
id=
"
semestre_idx
"
>
<select onchange=
"
this.form.submit()
"
name=
"
semestre_idx
"
id=
"
semestre_idx
"
>
"""
"""
for
i
in
list
(
semestre_ids
)
+
[
"
all
"
]:
for
i
in
list
(
semestre_ids
)
+
[
"
all
"
]:
...
...
This diff is collapsed.
Click to expand it.
app/scodoc/sco_synchro_etuds.py
+
1
−
1
View file @
699f6419
...
@@ -414,7 +414,7 @@ def list_synch(sem, anneeapogee=None):
...
@@ -414,7 +414,7 @@ def list_synch(sem, anneeapogee=None):
etudid
=
key2etudid
[
key
]
etudid
=
key2etudid
[
key
]
etuds
=
sco_etud
.
identite_list
(
cnx
,
{
"
etudid
"
:
etudid
})
etuds
=
sco_etud
.
identite_list
(
cnx
,
{
"
etudid
"
:
etudid
})
if
not
etuds
:
# ? cela ne devrait pas arriver XXX
if
not
etuds
:
# ? cela ne devrait pas arriver XXX
log
(
f
"
XXX key2etud etudid={
{
etudid}
}
, type
{
{type(etudid)}
}
"
)
log
(
f
"
XXX key2etud etudid=
{
etudid
}
, type
{
type
(
etudid
)
}
"
)
etud
=
etuds
[
0
]
etud
=
etuds
[
0
]
etud
[
"
inscrit
"
]
=
is_inscrit
# checkbox state
etud
[
"
inscrit
"
]
=
is_inscrit
# checkbox state
etud
[
etud
[
...
...
This diff is collapsed.
Click to expand it.
app/static/css/scodoc.css
+
10
−
1
View file @
699f6419
...
@@ -2239,7 +2239,16 @@ span.notes_module_list_buts {
...
@@ -2239,7 +2239,16 @@ span.notes_module_list_buts {
div
.ue_list_tit
{
div
.ue_list_tit
{
font-weight
:
bold
;
font-weight
:
bold
;
margin-top
:
5px
;
margin-top
:
8px
;
}
div
.ue_list_tit
form
{
display
:
inline-block
;
}
div
.ue_list_tit
span
.lock_info
{
color
:
red
;
margin-left
:
8px
;
}
}
ul
.apc_ue_list
{
ul
.apc_ue_list
{
...
...
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