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
3335655a
Commit
3335655a
authored
2 years ago
by
Emmanuel Viennet
Browse files
Options
Downloads
Plain Diff
Merge branch 'master' of
https://scodoc.org/git/viennet/ScoDoc
into sco96
parents
8da2ccc5
2e5add1c
Branches
Branches containing commit
No related tags found
No related merge requests found
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
app/models/modules.py
+0
-1
0 additions, 1 deletion
app/models/modules.py
app/scodoc/sco_edit_matiere.py
+15
-7
15 additions, 7 deletions
app/scodoc/sco_edit_matiere.py
app/scodoc/sco_edit_module.py
+1
-0
1 addition, 0 deletions
app/scodoc/sco_edit_module.py
with
16 additions
and
8 deletions
app/models/modules.py
+
0
−
1
View file @
3335655a
"""
ScoDoc 9 models : Modules
"""
ScoDoc 9 models : Modules
"""
"""
from
operator
import
attrgetter
from
flask
import
current_app
from
flask
import
current_app
from
app
import
db
from
app
import
db
...
...
This diff is collapsed.
Click to expand it.
app/scodoc/sco_edit_matiere.py
+
15
−
7
View file @
3335655a
...
@@ -32,6 +32,7 @@ import flask
...
@@ -32,6 +32,7 @@ import flask
from
flask
import
g
,
url_for
,
request
from
flask
import
g
,
url_for
,
request
from
app.models.events
import
ScolarNews
from
app.models.events
import
ScolarNews
from
app.models.formations
import
Matiere
from
app.models.formations
import
Matiere
from
app.models.ues
import
UniteEns
import
app.scodoc.notesdb
as
ndb
import
app.scodoc.notesdb
as
ndb
import
app.scodoc.sco_utils
as
scu
import
app.scodoc.sco_utils
as
scu
...
@@ -100,13 +101,12 @@ def do_matiere_create(args):
...
@@ -100,13 +101,12 @@ def do_matiere_create(args):
def
matiere_create
(
ue_id
=
None
):
def
matiere_create
(
ue_id
=
None
):
"""
Creation d
'
une matiere
"""
"""
Creation d
'
une matiere
"""
from
app.scodoc
import
sco_edit_ue
ue
:
UniteEns
=
UniteEns
.
query
.
get_or_404
(
ue_id
)
default_numero
=
max
([
mat
.
numero
for
mat
in
ue
.
matieres
]
or
[
9
])
+
1
UE
=
sco_edit_ue
.
ue_list
(
args
=
{
"
ue_id
"
:
ue_id
})[
0
]
H
=
[
H
=
[
html_sco_header
.
sco_header
(
page_title
=
"
Création d
'
une matière
"
),
html_sco_header
.
sco_header
(
page_title
=
"
Création d
'
une matière
"
),
"""
<h2>Création d
'
une matière dans l
'
UE
%(
titre
)s (%(
acronyme
)s
)</h2>
"""
%
UE
,
f
"""
<h2>Création d
'
une matière dans l
'
UE
{
ue
.
titre
}
(
{
ue
.
acronyme
}
)</h2>
"""
<p class=
"
help
"
>Les matières sont des groupes de modules dans une UE
<p class=
"
help
"
>Les matières sont des groupes de modules dans une UE
d
'
une formation donnée. Les matières servent surtout pour la
d
'
une formation donnée. Les matières servent surtout pour la
présentation (bulletins, etc) mais <em>n
'
ont pas de rôle dans le calcul
présentation (bulletins, etc) mais <em>n
'
ont pas de rôle dans le calcul
des notes.</em>
des notes.</em>
...
@@ -126,13 +126,21 @@ associé.
...
@@ -126,13 +126,21 @@ associé.
scu
.
get_request_args
(),
scu
.
get_request_args
(),
(
(
(
"
ue_id
"
,
{
"
input_type
"
:
"
hidden
"
,
"
default
"
:
ue_id
}),
(
"
ue_id
"
,
{
"
input_type
"
:
"
hidden
"
,
"
default
"
:
ue_id
}),
(
"
titre
"
,
{
"
size
"
:
30
,
"
explanation
"
:
"
nom de la matière.
"
}),
(
"
titre
"
,
{
"
size
"
:
30
,
"
explanation
"
:
"
nom de la matière.
"
,
},
),
(
(
"
numero
"
,
"
numero
"
,
{
{
"
size
"
:
2
,
"
size
"
:
2
,
"
explanation
"
:
"
numéro (1,2,3,4...) pour affichage
"
,
"
explanation
"
:
"
numéro (1,2,3,4...) pour affichage
"
,
"
type
"
:
"
int
"
,
"
type
"
:
"
int
"
,
"
default
"
:
default_numero
,
"
allow_null
"
:
False
,
},
},
),
),
),
),
...
@@ -140,7 +148,7 @@ associé.
...
@@ -140,7 +148,7 @@ associé.
)
)
dest_url
=
url_for
(
dest_url
=
url_for
(
"
notes.ue_table
"
,
scodoc_dept
=
g
.
scodoc_dept
,
formation_id
=
UE
[
"
formation_id
"
]
"
notes.ue_table
"
,
scodoc_dept
=
g
.
scodoc_dept
,
formation_id
=
ue
.
formation_id
)
)
if
tf
[
0
]
==
0
:
if
tf
[
0
]
==
0
:
...
...
This diff is collapsed.
Click to expand it.
app/scodoc/sco_edit_module.py
+
1
−
0
View file @
3335655a
...
@@ -659,6 +659,7 @@ def module_edit(
...
@@ -659,6 +659,7 @@ def module_edit(
"
explanation
"
:
"
numéro (1, 2, 3, 4, ...) pour ordre d
'
affichage
"
,
"
explanation
"
:
"
numéro (1, 2, 3, 4, ...) pour ordre d
'
affichage
"
,
"
type
"
:
"
int
"
,
"
type
"
:
"
int
"
,
"
default
"
:
default_num
,
"
default
"
:
default_num
,
"
allow_null
"
:
False
,
},
},
),
),
]
]
...
...
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