Etudiants sans groupe" +
+ " (" +
+ this.nbetuds +
+ ")";
+ this.sortList(); // maintient toujours la liste triee
+ },
+ // Tri de la boite par nom
+ sortList: function () {
+ if (!this.sorting) return;
+ var newRows = new Array();
+ for (var i = 1; i < this.groupBox.childNodes.length; i++) {
+ // 1 car div titre
+ newRows[i - 1] = this.groupBox.childNodes[i];
+ }
+ var sortfn = function (a, b) {
+ // recupere les noms qui sont dans un span
+ var nom_a = a.childNodes[1].childNodes[0].nodeValue;
+ var nom_b = b.childNodes[1].childNodes[0].nodeValue;
+ // console.log( 'comp( %s, %s )', nom_a, nom_b );
+ if (nom_a == nom_b) return 0;
+ if (nom_a < nom_b) return -1;
+ return 1;
+ };
+ newRows.sort(sortfn);
+ for (var i = 0; i < newRows.length; i++) {
+ this.groupBox.appendChild(newRows[i]);
+ newRows[i].style.backgroundColor = EtudColors[EtudColorsIdx];
+ EtudColorsIdx = (EtudColorsIdx + 1) % EtudColors.length;
+ }
+ },
});
-
function suppressGroup(group_id) {
- // 1- associate all members to group _none_
- if (!groupBoxes['_none_']) {
- // create group _none_
- var gbox = new CGroupBox('_none_', 'Etudiants sans groupe', true);
- }
- var dst_group_id = groupBoxes['_none_'].group_id;
- var src_box_etuds = groupBoxes[group_id].etuds;
- for (var etudid in src_box_etuds) {
- var etud = src_box_etuds[etudid];
- etud.changeGroup(group_id, dst_group_id);
- groupBoxes['_none_'].groupBox.appendChild(etud.htmlElement);
- }
- groupBoxes['_none_'].updateTitle();
- // 2- add group to list of groups to be removed (unless it's a new group)
- if (!groupBoxes[group_id].isNew)
- groupsToDelete[group_id] = true;
- // 3- delete objects and remove from DOM
- var div = document.getElementById(group_id);
- div.remove();
- delete groupBoxes[group_id];
- groups_unsaved = true;
- updateginfo();
+ // 1- associate all members to group _none_
+ if (!groupBoxes["_none_"]) {
+ // create group _none_
+ var gbox = new CGroupBox("_none_", "Etudiants sans groupe", true);
+ }
+ var dst_group_id = groupBoxes["_none_"].group_id;
+ var src_box_etuds = groupBoxes[group_id].etuds;
+ for (var etudid in src_box_etuds) {
+ var etud = src_box_etuds[etudid];
+ etud.changeGroup(group_id, dst_group_id);
+ groupBoxes["_none_"].groupBox.appendChild(etud.htmlElement);
+ }
+ groupBoxes["_none_"].updateTitle();
+ // 2- add group to list of groups to be removed (unless it's a new group)
+ if (!groupBoxes[group_id].isNew) groupsToDelete[group_id] = true;
+ // 3- delete objects and remove from DOM
+ var div = document.getElementById(group_id);
+ div.remove();
+ delete groupBoxes[group_id];
+ groups_unsaved = true;
+ updateginfo();
}
-
function renameGroup(group_id) {
- // 1-- save modifications
- if (groups_unsaved) {
- alert("Enregistrez ou annulez vos changement avant !");
- } else {
- // 2- form rename
- document.location = 'group_rename?group_id=' + group_id;
- }
+ // 1-- save modifications
+ if (groups_unsaved) {
+ alert("Enregistrez ou annulez vos changement avant !");
+ } else {
+ // 2- form rename
+ document.location = "group_rename?group_id=" + group_id;
+ }
}
var createdGroupId = 0;
function newGroupId() {
- var gid;
- do {
- gid = 'NG' + createdGroupId.toString();
- createdGroupId += 1;
- } while (gid in groupBoxes);
- return gid;
+ var gid;
+ do {
+ gid = "NG" + createdGroupId.toString();
+ createdGroupId += 1;
+ } while (gid in groupBoxes);
+ return gid;
}
// Creation d'un groupe
function createGroup() {
- var group_name = document.formGroup.groupName.value.trim();
- if (!group_name) {
- alert("Nom de groupe vide !");
+ var group_name = document.formGroup.groupName.value.trim();
+ if (!group_name) {
+ alert("Nom de groupe vide !");
+ return false;
+ }
+ if (group_name.length >= 32) {
+ // SHORT_STR_LEN
+ alert("Nom de groupe trop long !");
+ return false;
+ }
+ // check name:
+ for (var group_id in groupBoxes) {
+ if (group_id != "extend") {
+ if (groupBoxes[group_id].group_name == group_name) {
+ alert("Nom de groupe déja existant !");
return false;
+ }
}
- if (group_name.length >= 32) { // SHORT_STR_LEN
- alert("Nom de groupe trop long !");
- return false;
- }
- // check name:
- for (var group_id in groupBoxes) {
- if (group_id != 'extend') {
- if (groupBoxes[group_id].group_name == group_name) {
- alert("Nom de groupe déja existant !");
- return false;
- }
- }
- }
- var group_id = newGroupId();
- groups_unsaved = true;
- var gbox = new CGroupBox(group_id, group_name, true);
- gbox.isNew = true;
- gbox.updateTitle();
- return true;
+ }
+ var group_id = newGroupId();
+ groups_unsaved = true;
+ var gbox = new CGroupBox(group_id, group_name, true);
+ gbox.isNew = true;
+ gbox.updateTitle();
+ return true;
}
/* --- Etudiant draggable --- */
var CDraggableEtud = function (nom, prenom, sexe, origin, etudid) {
- this.type = 'Custom';
- this.name = etudid;
- this.etudid = etudid;
- this.nom = nom;
- this.prenom = prenom;
- this.sexe = sexe;
- this.origin = origin;
- this.createNode();
- ETUDS[etudid] = this;
- NbEtuds++;
-}
+ this.type = "Custom";
+ this.name = etudid;
+ this.etudid = etudid;
+ this.nom = nom;
+ this.prenom = prenom;
+ this.sexe = sexe;
+ this.origin = origin;
+ this.createNode();
+ ETUDS[etudid] = this;
+ NbEtuds++;
+};
$.extend(CDraggableEtud.prototype, {
- repr: function () {
- return this.sexe + ' ' + this.prenom + ' ' + this.nom + ' ' + '' + this.origin + '';
- },
- createNode: function () {
- // Create DOM element for student
- var e = document.createElement("div");
- this.htmlElement = e;
- e.className = "box";
- e.id = this.etudid;
- // e.style.backgroundColor = EtudColors[EtudColorsIdx];
- // EtudColorsIdx = (EtudColorsIdx + 1) % EtudColors.length;
- //var txtNode = document.createTextNode( this.repr() );
- //e.appendChild(txtNode);
- e.innerHTML = this.repr();
- // declare as draggable
- $(e).draggable({
- cursor: 'move',
- stack: '#groups div',
- containment: '#groups',
- revert: 'invalid'
- });
- },
- endDrag: function () {
- var el = this.htmlElement;
- var p = el.parentNode;
- // alert("endDrag: [" + this.name +"] " + p.id );
- this.changeGroup(this.group_id, p.id);
- this.htmlElement.style.fontStyle = 'italic'; // italic pour les etudiants deplaces
- },
- // Move a student from a group to another
- changeGroup: function (oldGroupName, newGroupName) {
- if (oldGroupName == newGroupName) {
- // drop on original group, just sort
- groupBoxes[oldGroupName].updateTitle();
- return;
- }
- var oldGroupBox = null;
- if (oldGroupName) {
- oldGroupBox = groupBoxes[oldGroupName];
- }
- var newGroupBox = groupBoxes[newGroupName];
- newGroupBox.addEtudToGroup(this);
- if (oldGroupBox)
- oldGroupBox.removeEtud(this);
- groups_unsaved = true;
- updatesavedinfo();
+ repr: function () {
+ return (
+ this.sexe +
+ " " +
+ this.prenom +
+ ' ' +
+ this.nom +
+ " " +
+ "" +
+ this.origin +
+ ""
+ );
+ },
+ createNode: function () {
+ // Create DOM element for student
+ var e = document.createElement("div");
+ this.htmlElement = e;
+ e.className = "box";
+ e.id = this.etudid;
+ // e.style.backgroundColor = EtudColors[EtudColorsIdx];
+ // EtudColorsIdx = (EtudColorsIdx + 1) % EtudColors.length;
+ //var txtNode = document.createTextNode( this.repr() );
+ //e.appendChild(txtNode);
+ e.innerHTML = this.repr();
+ // declare as draggable
+ $(e).draggable({
+ cursor: "move",
+ stack: "#groups div",
+ containment: "#groups",
+ revert: "invalid",
+ });
+ },
+ endDrag: function () {
+ var el = this.htmlElement;
+ var p = el.parentNode;
+ // alert("endDrag: [" + this.name +"] " + p.id );
+ this.changeGroup(this.group_id, p.id);
+ this.htmlElement.style.fontStyle = "italic"; // italic pour les etudiants deplaces
+ },
+ // Move a student from a group to another
+ changeGroup: function (oldGroupName, newGroupName) {
+ if (oldGroupName == newGroupName) {
+ // drop on original group, just sort
+ groupBoxes[oldGroupName].updateTitle();
+ return;
}
+ var oldGroupBox = null;
+ if (oldGroupName) {
+ oldGroupBox = groupBoxes[oldGroupName];
+ }
+ var newGroupBox = groupBoxes[newGroupName];
+ newGroupBox.addEtudToGroup(this);
+ if (oldGroupBox) oldGroupBox.removeEtud(this);
+ groups_unsaved = true;
+ updatesavedinfo();
+ },
});
-
/* --- Upload du resultat --- */
function processResponse(value) {
- location.reload(); // necessaire pour reinitialiser les id des groupes créés
+ location.reload(); // necessaire pour reinitialiser les id des groupes créés
}
function handleError(msg) {
- alert('Error: ' + msg);
- console.log('Error: ' + msg);
+ alert("Error: " + msg);
+ console.log("Error: " + msg);
}
function submitGroups() {
- var url = SCO_URL + '/setGroups';
- // build post request body: groupname \n etudid; ...
- var groupsLists = '';
- var groupsToCreate = '';
- for (var group_id in groupBoxes) {
- if (group_id != 'extend') { // je ne sais pas ce dont il s'agit ???
- if (group_id != '_none_') { // ne renvoie pas le groupe des sans-groupes
- groupBox = groupBoxes[group_id];
- if (groupBox.isNew) {
- groupsToCreate += groupBox.group_name + ';';
- for (var etudid in groupBox.etuds) {
- if (etudid != 'extend')
- groupsToCreate += etudid + ';';
- }
- groupsToCreate += '\n';
- groupBox.isNew = false; // is no more new !
- } else {
- groupsLists += group_id + ';';
- for (var etudid in groupBox.etuds) {
- if (etudid != 'extend')
- groupsLists += etudid + ';';
- }
- groupsLists += '\n';
- }
- }
+ var url = SCO_URL + "/setGroups";
+ // build post request body: groupname \n etudid; ...
+ var groupsLists = "";
+ var groupsToCreate = "";
+ for (var group_id in groupBoxes) {
+ if (group_id != "extend") {
+ // je ne sais pas ce dont il s'agit ???
+ if (group_id != "_none_") {
+ // ne renvoie pas le groupe des sans-groupes
+ groupBox = groupBoxes[group_id];
+ if (groupBox.isNew) {
+ groupsToCreate += groupBox.group_name + ";";
+ for (var etudid in groupBox.etuds) {
+ if (etudid != "extend") groupsToCreate += etudid + ";";
+ }
+ groupsToCreate += "\n";
+ groupBox.isNew = false; // is no more new !
+ } else {
+ groupsLists += group_id + ";";
+ for (var etudid in groupBox.etuds) {
+ if (etudid != "extend") groupsLists += etudid + ";";
+ }
+ groupsLists += "\n";
}
+ }
}
- var todel = '';
- for (var group_id in groupsToDelete) {
- todel += group_id + ';';
- }
- groupsToDelete = new Object(); // empty
- var partition_id = document.formGroup.partition_id.value;
- // Send to server
- $.post(url, {
- groupsLists: groupsLists,
- partition_id: partition_id,
- groupsToDelete: todel,
- groupsToCreate: groupsToCreate
+ }
+ var todel = "";
+ for (var group_id in groupsToDelete) {
+ todel += group_id + ";";
+ }
+ groupsToDelete = new Object(); // empty
+ var partition_id = document.formGroup.partition_id.value;
+ // Send to server
+ $.post(url, {
+ groupsLists: groupsLists,
+ partition_id: partition_id,
+ groupsToDelete: todel,
+ groupsToCreate: groupsToCreate,
+ })
+ .done(function (data) {
+ processResponse(data);
})
- .done(function (data) {
- processResponse(data);
- })
- .fail(function (xhr, status, error) {
- let msg = "inconnue";
- if (xhr.responseXML.childNodes.length > 0) {
- msg = xhr.responseXML.childNodes[0].innerHTML;
- }
- handleError("Erreur lors de l'enregistrement de groupes: " + msg);
- });
+ .fail(function (xhr, status, error) {
+ let msg = "inconnue";
+ if (xhr.responseXML.childNodes.length > 0) {
+ msg = xhr.responseXML.childNodes[0].innerHTML;
+ }
+ handleError("Erreur lors de l'enregistrement de groupes: " + msg);
+ });
}
// Move to another partition (specified by menu)
function GotoAnother() {
- if (groups_unsaved) {
- alert("Enregistrez ou annulez vos changement avant !");
- } else
- document.location = SCO_URL + '/affect_groups?partition_id=' + document.formGroup.other_partition_id.value;
+ if (groups_unsaved) {
+ alert("Enregistrez ou annulez vos changement avant !");
+ } else
+ document.location =
+ SCO_URL +
+ "/affect_groups?partition_id=" +
+ document.formGroup.other_partition_id.value;
}
-
-// Boite information haut de page
+// Boite information haut de page
function updateginfo() {
- var g = document.getElementById('ginfo');
- var group_names = new Array();
- for (var group_id in groupBoxes) {
- if ((group_id != 'extend') && (groupBoxes[group_id].group_name)) {
- group_names.push(groupBoxes[group_id].group_name);
- }
+ var g = document.getElementById("ginfo");
+ var group_names = new Array();
+ for (var group_id in groupBoxes) {
+ if (group_id != "extend" && groupBoxes[group_id].group_name) {
+ group_names.push(groupBoxes[group_id].group_name);
}
- g.innerHTML = 'Groupes définis: ' + group_names.join(', ') + '
'
- + "Nombre d'etudiants: " + NbEtuds + '';
+ }
+ g.innerHTML =
+ "Groupes définis: " +
+ group_names.join(", ") +
+ "
" +
+ "Nombre d'etudiants: " +
+ NbEtuds +
+ "";
- updatesavedinfo();
+ updatesavedinfo();
}
// Boite indiquant si modifications non enregistrees ou non
function updatesavedinfo() {
- var g = document.getElementById('savedinfo');
- if (groups_unsaved) {
- g.innerHTML = 'modifications non enregistrées';
- g.style.visibility = 'visible';
- } else {
- g.innerHTML = '';
- g.style.visibility = 'hidden';
- }
- return true;
+ var g = document.getElementById("savedinfo");
+ if (groups_unsaved) {
+ g.innerHTML = "modifications non enregistrées";
+ g.style.visibility = "visible";
+ } else {
+ g.innerHTML = "";
+ g.style.visibility = "hidden";
+ }
+ return true;
}
-
$(function () {
- loadGroupes();
+ loadGroupes();
});
-
-/* debug:
-
-var g = new CGroupBox('G0', 'Toto');
-
-*/
\ No newline at end of file
diff --git a/app/templates/scolar/affect_groups.j2 b/app/templates/scolar/affect_groups.j2
index 1db702757f..51d7f599bd 100644
--- a/app/templates/scolar/affect_groups.j2
+++ b/app/templates/scolar/affect_groups.j2
@@ -2,6 +2,13 @@
{{ sco_header|safe }}
+
+ 👉💡 vous pourriez essayer le nouvel éditeur
+
+
Faites glisser les étudiants d'un groupe à l'autre. Les modifications ne
sont enregistrées que lorsque vous cliquez sur le bouton "Enregistrer ces groupes".
Vous pouvez créer de nouveaux groupes. Pour supprimer ou renommer
diff --git a/app/templates/scolar/partition_editor.j2 b/app/templates/scolar/partition_editor.j2
index 98c8cf71ce..d98d8dc196 100644
--- a/app/templates/scolar/partition_editor.j2
+++ b/app/templates/scolar/partition_editor.j2
@@ -59,6 +59,9 @@
document.querySelector("body").classList.add("loaded");
document.querySelector('.wait').style.display = "none";
+ {% if edit_partition %}
+ setEditMode();
+ {% endif %}
}
function fetchData(request) {
diff --git a/app/views/scolar.py b/app/views/scolar.py
index b8f1032329..da978bd3af 100644
--- a/app/views/scolar.py
+++ b/app/views/scolar.py
@@ -907,8 +907,12 @@ sco_publish(
@scodoc
@permission_required(Permission.ScoView)
@scodoc7func
-def partition_editor(formsemestre_id: int):
+def partition_editor(formsemestre_id: int, edit_partition=False):
+ """Page édition groupes et partitions
+ Si edit_partition, se met en mode édition des partitions.
+ """
formsemestre: FormSemestre = FormSemestre.query.get_or_404(formsemestre_id)
+ edit_partition = bool(int(edit_partition)) if edit_partition else False
formsemestre.setup_parcours_groups()
H = [
html_sco_header.sco_header(
@@ -928,6 +932,7 @@ def partition_editor(formsemestre_id: int):
read_only=not sco_groups.sco_permissions_check.can_change_groups(
formsemestre_id
),
+ edit_partition=edit_partition,
),
html_sco_header.sco_footer(),
]