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
9bf505ff
You need to sign in or sign up before continuing.
Commit
9bf505ff
authored
2 years ago
by
Emmanuel Viennet
Browse files
Options
Downloads
Patches
Plain Diff
Table jury BUT: boutons 'Competences' et 'RCUEs'
parent
998820e6
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_pv_dict.py
+6
-1
6 additions, 1 deletion
app/scodoc/sco_pv_dict.py
app/scodoc/sco_pv_lettres_inviduelles.py
+13
-12
13 additions, 12 deletions
app/scodoc/sco_pv_lettres_inviduelles.py
app/static/js/table_recap.js
+15
-1
15 additions, 1 deletion
app/static/js/table_recap.js
with
34 additions
and
14 deletions
app/scodoc/sco_pv_dict.py
+
6
−
1
View file @
9bf505ff
...
@@ -308,7 +308,12 @@ def _descr_decision_sem(etat, decision_sem):
...
@@ -308,7 +308,12 @@ def _descr_decision_sem(etat, decision_sem):
else
:
else
:
if
decision_sem
:
if
decision_sem
:
cod
=
decision_sem
[
"
code
"
]
cod
=
decision_sem
[
"
code
"
]
decision
=
codes_cursus
.
CODES_EXPL
.
get
(
cod
,
""
)
# + ' (%s)' % cod
decision
=
(
# exception pour AJ afin de ne pas mentionner le BUT
codes_cursus
.
CODES_EXPL
.
get
(
cod
,
""
)
if
cod
!=
"
AJ
"
else
"
Ajourné
"
)
else
:
else
:
decision
=
""
decision
=
""
return
decision
return
decision
...
...
This diff is collapsed.
Click to expand it.
app/scodoc/sco_pv_lettres_inviduelles.py
+
13
−
12
View file @
9bf505ff
...
@@ -183,9 +183,10 @@ def pdf_lettre_individuelle(sem, decision, etud: Identite, params, signature=Non
...
@@ -183,9 +183,10 @@ def pdf_lettre_individuelle(sem, decision, etud: Identite, params, signature=Non
#
#
formsemestre_id
=
sem
[
"
formsemestre_id
"
]
formsemestre_id
=
sem
[
"
formsemestre_id
"
]
formsemestre
=
FormSemestre
.
query
.
get
(
formsemestre_id
)
formsemestre
=
FormSemestre
.
query
.
get
(
formsemestre_id
)
Se
:
SituationEtudCursus
=
decision
[
"
Se
"
]
situation_etud
:
SituationEtudCursus
=
decision
[
"
Se
"
]
t
,
s
=
jury_titres
(
titre_jury
,
titre_jury_court
=
jury_titres
(
formsemestre
,
Se
.
parcours_validated
()
or
not
Se
.
semestre_non_terminal
formsemestre
,
situation_etud
.
parcours_validated
()
or
not
situation_etud
.
semestre_non_terminal
,
)
)
objects
=
[]
objects
=
[]
style
=
reportlab
.
lib
.
styles
.
ParagraphStyle
({})
style
=
reportlab
.
lib
.
styles
.
ParagraphStyle
({})
...
@@ -196,8 +197,8 @@ def pdf_lettre_individuelle(sem, decision, etud: Identite, params, signature=Non
...
@@ -196,8 +197,8 @@ def pdf_lettre_individuelle(sem, decision, etud: Identite, params, signature=Non
params
[
"
semestre_id
"
]
=
formsemestre
.
semestre_id
params
[
"
semestre_id
"
]
=
formsemestre
.
semestre_id
params
[
"
decision_sem_descr
"
]
=
decision
[
"
decision_sem_descr
"
]
params
[
"
decision_sem_descr
"
]
=
decision
[
"
decision_sem_descr
"
]
params
[
"
type_jury
"
]
=
t
# type de jury (passage ou delivrance)
params
[
"
type_jury
"
]
=
t
itre_jury
# type de jury (passage ou delivrance)
params
[
"
type_jury_abbrv
"
]
=
s
# idem, abbrégé
params
[
"
type_jury_abbrv
"
]
=
titre_jury_court
# idem, abbrégé
params
[
"
decisions_ue_descr
"
]
=
decision
[
"
decisions_ue_descr
"
]
params
[
"
decisions_ue_descr
"
]
=
decision
[
"
decisions_ue_descr
"
]
if
decision
[
"
decisions_ue_nb
"
]
>
1
:
if
decision
[
"
decisions_ue_nb
"
]
>
1
:
params
[
"
decisions_ue_descr_plural
"
]
=
"
s
"
params
[
"
decisions_ue_descr_plural
"
]
=
"
s
"
...
@@ -237,23 +238,23 @@ def pdf_lettre_individuelle(sem, decision, etud: Identite, params, signature=Non
...
@@ -237,23 +238,23 @@ def pdf_lettre_individuelle(sem, decision, etud: Identite, params, signature=Non
else
:
else
:
params
[
"
observation_txt
"
]
=
""
params
[
"
observation_txt
"
]
=
""
# Autorisations de passage
# Autorisations de passage
if
decision
[
"
autorisations
"
]
and
not
Se
.
parcours_validated
():
if
decision
[
"
autorisations
"
]
and
not
situation_etud
.
parcours_validated
():
if
len
(
decision
[
"
autorisations
"
])
>
1
:
if
len
(
decision
[
"
autorisations
"
])
>
1
:
s
=
"
s
"
titre_jury_court
=
"
s
"
else
:
else
:
s
=
""
titre_jury_court
=
""
params
[
params
[
"
autorisations_txt
"
"
autorisations_txt
"
]
=
"""
Vous êtes autorisé%s à continuer dans le%s semestre%s : <b>%s</b>
"""
%
(
]
=
"""
Vous êtes autorisé%s à continuer dans le%s semestre%s : <b>%s</b>
"""
%
(
etud
.
e
,
etud
.
e
,
s
,
titre_jury_court
,
s
,
titre_jury_court
,
decision
[
"
autorisations_descr
"
],
decision
[
"
autorisations_descr
"
],
)
)
else
:
else
:
params
[
"
autorisations_txt
"
]
=
""
params
[
"
autorisations_txt
"
]
=
""
if
decision
[
"
decision_sem
"
]
and
Se
.
parcours_validated
():
if
decision
[
"
decision_sem
"
]
and
situation_etud
.
parcours_validated
():
params
[
"
diplome_txt
"
]
=
(
params
[
"
diplome_txt
"
]
=
(
"""
Vous avez donc obtenu le diplôme : <b>%(titre_formation)s</b>
"""
%
params
"""
Vous avez donc obtenu le diplôme : <b>%(titre_formation)s</b>
"""
%
params
)
)
...
@@ -279,7 +280,7 @@ def pdf_lettre_individuelle(sem, decision, etud: Identite, params, signature=Non
...
@@ -279,7 +280,7 @@ def pdf_lettre_individuelle(sem, decision, etud: Identite, params, signature=Non
# Signature:
# Signature:
# nota: si semestre terminal, signature par directeur IUT, sinon, signature par
# nota: si semestre terminal, signature par directeur IUT, sinon, signature par
# chef de département.
# chef de département.
if
Se
.
semestre_non_terminal
:
if
situation_etud
.
semestre_non_terminal
:
sig
=
(
sig
=
(
sco_preferences
.
get_preference
(
sco_preferences
.
get_preference
(
"
PV_LETTER_PASSAGE_SIGNATURE
"
,
formsemestre_id
"
PV_LETTER_PASSAGE_SIGNATURE
"
,
formsemestre_id
...
...
This diff is collapsed.
Click to expand it.
app/static/js/table_recap.js
+
15
−
1
View file @
9bf505ff
...
@@ -116,12 +116,26 @@ $(function () {
...
@@ -116,12 +116,26 @@ $(function () {
];
// fin des boutons communs à toutes les tables recap
];
// fin des boutons communs à toutes les tables recap
if
(
$
(
'
table.table_recap
'
).
hasClass
(
"
jury
"
))
{
if
(
$
(
'
table.table_recap
'
).
hasClass
(
"
jury
"
))
{
// table jury: avec ou sans codes enregistrés
// Table JURY:
// avec ou sans codes enregistrés
buttons
.
push
(
buttons
.
push
(
{
{
text
:
'
<span data-group="recorded_code">Codes jury</span>
'
,
text
:
'
<span data-group="recorded_code">Codes jury</span>
'
,
action
:
toggle_col_but_visibility
,
action
:
toggle_col_but_visibility
,
});
});
if
(
$
(
'
table.table_recap
'
).
hasClass
(
"
apc
"
))
{
// Boutons spécifiques à la table JURY BUT
buttons
.
push
(
{
text
:
'
<span data-group="cursus_but">Compétences</span>
'
,
action
:
toggle_col_but_visibility
,
});
buttons
.
push
(
{
text
:
'
<span data-group="col_rcue">RCUEs</span>
'
,
action
:
toggle_col_but_visibility
,
});
}
}
else
{
}
else
{
// BOUTONS SPECIFIQUES A LA TABLE RECAP NON JURY
// BOUTONS SPECIFIQUES A LA TABLE RECAP NON JURY
buttons
.
push
(
buttons
.
push
(
...
...
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