opolka/ScoDoc
1
0
Fork 0
forked from ScoDoc/ScoDoc
Code Issues Pull Requests Activity

Update opolka/ScoDoc from ScoDoc/ScoDoc #2

Merged
opolka merged 1272 commits from ScoDoc/ScoDoc:master into master 2024-05-27 09:11:04 +02:00
Conversation 0 Commits 1272 Files Changed 656 +2 -8
2 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 5894c6f952 - Show all commits

4
app/scodoc/sco_find_etud.py
View File

@ -301,7 +301,7 @@ def search_etud_by_name(term: str) -> list:
FROM identite FROM identite
WHERE WHERE
dept_id = %(dept_id)s dept_id = %(dept_id)s
AND code_nip LIKE %(beginning)s AND code_nip ILIKE %(beginning)s
ORDER BY nom ORDER BY nom
""", """,
{"beginning": term + "%", "dept_id": g.scodoc_dept_id}, {"beginning": term + "%", "dept_id": g.scodoc_dept_id},
@ -320,7 +320,7 @@ def search_etud_by_name(term: str) -> list:
FROM identite FROM identite
WHERE WHERE
dept_id = %(dept_id)s dept_id = %(dept_id)s
AND nom LIKE %(beginning)s AND nom ILIKE %(beginning)s
ORDER BY nom ORDER BY nom
""", """,
{"beginning": term + "%", "dept_id": g.scodoc_dept_id}, {"beginning": term + "%", "dept_id": g.scodoc_dept_id},

6
app/static/js/scodoc.js
View File

@ -185,7 +185,6 @@ $(function () {
if (x) { if (x) {
try { try {
let order_info = JSON.parse(x); let order_info = JSON.parse(x);
console.log("set order=" + order_info);
table_options.order = order_info; table_options.order = order_info;
} catch (error) { } catch (error) {
console.error(error); console.error(error);
@ -248,11 +247,6 @@ class ScoFieldEditor {
return true; // Aucune modification, pas d'enregistrement mais on continue normalement return true; // Aucune modification, pas d'enregistrement mais on continue normalement
} }
obj.classList.add("sco_wait"); obj.classList.add("sco_wait");
// DEBUG
// console.log(`
// data : ${value},
// id: ${obj.dataset.oid}
// `);
$.post( $.post(
this.save_url, this.save_url,