ScoDoc/ScoDoc
ScoDoc
/
ScoDoc
8
2
Fork 15
Code Issues 146 Pull Requests 1 Projects 3 Releases 130 Wiki Activity

Edition tag sur modules

This commit is contained in:
Emmanuel Viennet 2022-05-02 10:54:52 +02:00
parent 72dc72d286
commit c11fccab02
4 changed files with 29 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/scodoc/sco_edit_module.py
View File

@ -866,6 +866,7 @@ def module_edit(
{ {
"input_type": "checkbox", "input_type": "checkbox",
"vertical": True, "vertical": True,
"dom_id": "tf_module_parcours",
"labels": [parcour.libelle for parcour in ref_comp.parcours], "labels": [parcour.libelle for parcour in ref_comp.parcours],
"allowed_values": [ "allowed_values": [
str(parcour.id) for parcour in ref_comp.parcours str(parcour.id) for parcour in ref_comp.parcours
@ -904,9 +905,11 @@ def module_edit(
request.base_url, request.base_url,
scu.get_request_args(), scu.get_request_args(),
descr, descr,
html_foot_markup="""<div style="width: 90%;"><span class="sco_tag_edit"><textarea data-module_id="{}" class="module_tag_editor">{}</textarea></span></div>""".format( html_foot_markup="""<div class="sco_tag_module_edit"><span class="sco_tag_edit"><textarea data-module_id="{}" class="module_tag_editor">{}</textarea></span></div>""".format(
module_id, ",".join(sco_tag_module.module_tag_list(module_id)) module_id, ",".join(sco_tag_module.module_tag_list(module_id))
), )
if not create
else "",
initvalues=module_dict if module else {}, initvalues=module_dict if module else {},
submitlabel="Modifier ce module" if module else "Créer ce module", submitlabel="Modifier ce module" if module else "Créer ce module",
cancelbutton="Annuler", cancelbutton="Annuler",

4
app/scodoc/sco_tag_module.py
View File

@ -235,7 +235,7 @@ def module_tag_list(module_id=""):
def module_tag_set(module_id="", taglist=None): def module_tag_set(module_id="", taglist=None):
"""taglist may either be: """taglist may either be:
a string with tag names separated by commas ("un;deux") a string with tag names separated by commas ("un,deux")
or a list of strings (["un", "deux"]) or a list of strings (["un", "deux"])
""" """
if not taglist: if not taglist:
@ -243,7 +243,7 @@ def module_tag_set(module_id="", taglist=None):
elif isinstance(taglist, str): elif isinstance(taglist, str):
taglist = taglist.split(",") taglist = taglist.split(",")
taglist = [t.strip() for t in taglist] taglist = [t.strip() for t in taglist]
# log("module_tag_set: module_id=%s taglist=%s" % (module_id, taglist)) log("module_tag_set: module_id=%s taglist=%s" % (module_id, taglist))
# Sanity check: # Sanity check:
Mod = sco_edit_module.module_list(args={"module_id": module_id}) Mod = sco_edit_module.module_list(args={"module_id": module_id})
if not Mod: if not Mod:

11
app/static/css/scodoc.css
View File

@ -2267,6 +2267,10 @@ span.missing_value {
color: red; color: red;
} }
tr#tf_module_parcours>td {
background-color: rgb(229, 229, 229);
}
/* tableau recap notes */ /* tableau recap notes */
table.notes_recapcomplet { table.notes_recapcomplet {
border: 2px solid blue; border: 2px solid blue;
@ -3635,6 +3639,13 @@ span.sco_tag_edit .tag-editor {
margin-top: 2px; margin-top: 2px;
} }
div.sco_tag_module_edit span.sco_tag_edit .tag-editor {
background-color: rgb(210, 210, 210);
border: 0px;
margin-left: 0px;
margin-top: 2px;
}
span.sco_tag_edit .tag-editor-delete { span.sco_tag_edit .tag-editor-delete {
height: 20px; height: 20px;
} }

17
app/views/notes.py
View File

@ -543,12 +543,17 @@ sco_publish(
) )
sco_publish("/module_list", sco_edit_module.module_table, Permission.ScoView) sco_publish("/module_list", sco_edit_module.module_table, Permission.ScoView)
sco_publish("/module_tag_search", sco_tag_module.module_tag_search, Permission.ScoView) sco_publish("/module_tag_search", sco_tag_module.module_tag_search, Permission.ScoView)
sco_publish(
"/module_tag_set",
sco_tag_module.module_tag_set, @bp.route("/module_tag_set", methods=["POST"])
Permission.ScoEditFormationTags, @scodoc
methods=["GET", "POST"], @permission_required(Permission.ScoEditFormationTags)
) def module_tag_set():
"""Set tags on module"""
module_id = int(request.form.get("module_id"))
taglist = request.form.get("taglist")
return sco_tag_module.module_tag_set(module_id, taglist)
# #
@bp.route("/") @bp.route("/")