martin.murzeau/ScoDocMM
1
0
Fork 0
forked from ScoDoc/ScoDoc
Code Issues Pull Requests Projects Releases Wiki Activity

details cosmétiques

Browse Source
This commit is contained in:
Emmanuel Viennet 2021-11-13 09:43:13 +01:00
parent 477c2efac9
commit 459e75db89
4 changed files with 23 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/static/css/table_editor.css
View File

@ -35,7 +35,7 @@ body {
.modifying{ outline: 2px dashed #c09; } .modifying{ outline: 2px dashed #c09; }
.wait{ outline: 2px solid #c90; } .wait{ outline: 2px solid #c90; }
.good{ outline: 2px solid #9c0; } .good{ outline: 2px solid #9c0; }
.modified { font-weight: bold; color:indigo}
/***************************/ /***************************/
/* Message */ /* Message */
/***************************/ /***************************/

3
app/static/js/table_editor.js
View File

@ -19,6 +19,7 @@ function build_table(data) {
data-nbX="${cellule.nbX || 1}" data-nbX="${cellule.nbX || 1}"
data-nbY="${cellule.nbY || 1}" data-nbY="${cellule.nbY || 1}"
data-data="${cellule.data}" data-data="${cellule.data}"
data-orig="${cellule.data}"
style=" style="
--x:${cellule.x}; --x:${cellule.x};
--y:${cellule.y}; --y:${cellule.y};
@ -79,7 +80,7 @@ function modifCell(obj) {
function key(event) { function key(event) {
switch (event.key) { switch (event.key) {
case "Enter": modifCell(document.querySelector(".selected")); event.preventDefault(); break; case "Enter": modifCell(document.querySelector(".selected")); event.preventDefault(); ArrowMove(1, 0); break;
case "ArrowRight": ArrowMove(1, 0); break; case "ArrowRight": ArrowMove(1, 0); break;
case "ArrowLeft": ArrowMove(-1, 0); break; case "ArrowLeft": ArrowMove(-1, 0); break;
case "ArrowUp": ArrowMove(0, -1); break; case "ArrowUp": ArrowMove(0, -1); break;

36
app/templates/pn/form_modules_ue_coefs.html
View File

@ -28,7 +28,7 @@
if (value.length == 0) { if (value.length == 0) {
value = "0"; value = "0";
} }
if (!/^\d+$/.test(value)) { if (!/^[\d.,]+$/.test(value)) {
message("Il est attendu un nombre"); message("Il est attendu un nombre");
return false; return false;
} }
@ -38,28 +38,30 @@
obj.dataset.data = value; obj.dataset.data = value;
obj.classList.add("wait"); obj.classList.add("wait");
// XXX DEBUG // XXX DEBUG
console.log(` // console.log(`
x : ${getComputedStyle(obj).getPropertyValue("--x")} // x : ${getComputedStyle(obj).getPropertyValue("--x")}
y : ${getComputedStyle(obj).getPropertyValue("--y")} // y : ${getComputedStyle(obj).getPropertyValue("--y")}
data : ${value} // data : ${value}
ue_id: ${obj.dataset.ue_id} // ue_id: ${obj.dataset.ue_id}
module_id : ${obj.dataset.module_id} // module_id : ${obj.dataset.module_id}
`); // `);
$.post("{{data_save}}", $.post("{{data_save}}",
{ {
module_id: `${obj.dataset.module_id}`, module_id: obj.dataset.module_id,
ue_id: `${obj.dataset.ue_id}`, ue_id: obj.dataset.ue_id,
coef: `${value}` coef: value
}, },
function (result) { function (result) {
console.log("enregistré"); // XXX
obj.classList.remove("wait"); obj.classList.remove("wait");
obj.classList.add("good"); if (obj.dataset.orig != value)
// Lorsque les données sont bien enregistrés, on enlève obj.classList.add("modified");
else
obj.classList.remove("modified");
// Lorsque les données sont bien enregistrées, on enlève
// l'indication que c'est bon au bout d'un temps // l'indication que c'est bon au bout d'un temps
setTimeout(() => { //setTimeout(() => {
obj.classList.remove("good"); // obj.classList.remove("modified");
}, 1000); //}, 1000);
} }
); );
} }

4
app/views/pn_modules.py
View File

@ -93,8 +93,6 @@ def table_modules_ue_coefs(formation_id):
{ {
"x": col, "x": col,
"y": 1, # 1ere ligne "y": 1, # 1ere ligne
"nbX": 1,
"nbY": 1,
"style": "title_ue", "style": "title_ue",
"data": ue.acronyme, "data": ue.acronyme,
"title": ue.titre, "title": ue.titre,
@ -110,7 +108,7 @@ def table_modules_ue_coefs(formation_id):
"x": col, "x": col,
"y": row, "y": row,
"style": "champs", "style": "champs",
"data": df[ue.id][mod.id], "data": df[ue.id][mod.id] or "",
"editable": True, "editable": True,
"module_id": mod.id, "module_id": mod.id,
"ue_id": ue.id, "ue_id": ue.id,