@@ -230,6 +230,7 @@
let edit = {
"etat": etat,
"desc": desc,
+ "external_data": data.external_data
}
edit = setModuleImplId(edit, module);
diff --git a/app/templates/assiduites/widgets/tableau_justi.j2 b/app/templates/assiduites/widgets/tableau_justi.j2
index 301fcc654e..e9fef33715 100644
--- a/app/templates/assiduites/widgets/tableau_justi.j2
+++ b/app/templates/assiduites/widgets/tableau_justi.j2
@@ -102,7 +102,12 @@
td.textContent = `${e.prenom.capitalize()} ${e.nom.toUpperCase()}`;
}
else {
- td.textContent = `${justificatif[k]}`.capitalize()
+ if (justificatif[k] != null) {
+ td.textContent = `${justificatif[k]}`.capitalize()
+ }
+ else {
+ td.textContent = "";
+ }
}
row.appendChild(td)
@@ -295,7 +300,7 @@
`
- const desc = data.raison
+ const desc = data.raison == null ? "" : data.raison;
const fichier = data.fichier != null ? "Oui" : "Non";
@@ -304,7 +309,7 @@
const assiEdit = el.firstElementChild;
assiEdit.querySelector('#justi_etat').value = data.etat.toLowerCase();
- assiEdit.querySelector('#justi_raison').value = desc != null ? desc : "";
+ assiEdit.querySelector('#justi_raison').value = desc;
assiEdit.querySelector('#justi_date_debut').value = moment.tz(data.date_debut, TIMEZONE).format("YYYY-MM-DDTHH:MM")
assiEdit.querySelector('#justi_date_fin').value = moment.tz(data.date_fin, TIMEZONE).format("YYYY-MM-DDTHH:MM")
diff --git a/migrations/versions/45e0a855b8eb_assiduites_external_data.py b/migrations/versions/45e0a855b8eb_assiduites_external_data.py
new file mode 100644
index 0000000000..4b26e10264
--- /dev/null
+++ b/migrations/versions/45e0a855b8eb_assiduites_external_data.py
@@ -0,0 +1,33 @@
+"""assiduites_external_data
+
+Revision ID: 45e0a855b8eb
+Revises: 50f7e0b6229f
+Create Date: 2023-07-31 07:32:18.674345
+
+"""
+from alembic import op
+import sqlalchemy as sa
+
+
+# revision identifiers, used by Alembic.
+revision = "45e0a855b8eb"
+down_revision = "50f7e0b6229f"
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+ with op.batch_alter_table("assiduites", schema=None) as batch_op:
+ batch_op.add_column(sa.Column("external_data", sa.JSON(), nullable=True))
+
+ with op.batch_alter_table("justificatifs", schema=None) as batch_op:
+ batch_op.add_column(sa.Column("external_data", sa.JSON(), nullable=True))
+
+
+def downgrade():
+ # ### commands auto generated by Alembic - please adjust! ###
+ with op.batch_alter_table("justificatifs", schema=None) as batch_op:
+ batch_op.drop_column("external_data")
+
+ with op.batch_alter_table("assiduites", schema=None) as batch_op:
+ batch_op.drop_column("external_data")
diff --git a/tests/api/test_api_assiduites.py b/tests/api/test_api_assiduites.py
index cc0c3c5fe6..c8581d7454 100644
--- a/tests/api/test_api_assiduites.py
+++ b/tests/api/test_api_assiduites.py
@@ -33,6 +33,7 @@ ASSIDUITES_FIELDS = {
"entry_date": str,
"user_id": str,
"est_just": bool,
+ "external_data": dict,
}
CREATE_FIELD = {"assiduite_id": int}
@@ -56,10 +57,14 @@ def check_fields(data: dict, fields: dict = None):
fields = ASSIDUITES_FIELDS
assert set(data.keys()) == set(fields.keys())
for key in data:
- if key in ("moduleimpl_id", "desc", "user_id"):
- assert isinstance(data[key], fields[key]) or data[key] is None
+ if key in ("moduleimpl_id", "desc", "user_id", "external_data"):
+ assert (
+ isinstance(data[key], fields[key]) or data[key] is None
+ ), f"error [{key}:{type(data[key])}, {data[key]}, {fields[key]}]"
else:
- assert isinstance(data[key], fields[key])
+ assert isinstance(
+ data[key], fields[key]
+ ), f"error [{key}:{type(data[key])}, {data[key]}, {fields[key]}]"
def check_failure_get(path: str, headers: dict, err: str = None):
diff --git a/tests/api/test_api_justificatifs.py b/tests/api/test_api_justificatifs.py
index 33c3710159..53e1b37005 100644
--- a/tests/api/test_api_justificatifs.py
+++ b/tests/api/test_api_justificatifs.py
@@ -25,6 +25,7 @@ FAUX = 42069
JUSTIFICATIFS_FIELDS = {
"justif_id": int,
"etudid": int,
+ "code_nip": str,
"date_debut": str,
"date_fin": str,
"etat": str,
@@ -32,6 +33,7 @@ JUSTIFICATIFS_FIELDS = {
"entry_date": str,
"fichier": str,
"user_id": int,
+ "external_data": dict,
}
CREATE_FIELD = {"justif_id": int, "couverture": list}
@@ -53,10 +55,14 @@ def check_fields(data, fields: dict = None):
fields = JUSTIFICATIFS_FIELDS
assert set(data.keys()) == set(fields.keys())
for key in data:
- if key in ("raison", "fichier", "user_id"):
- assert isinstance(data[key], fields[key]) or data[key] is None
+ if key in ("raison", "fichier", "user_id", "external_data"):
+ assert (
+ isinstance(data[key], fields[key]) or data[key] is None
+ ), f"error [{key}:{type(data[key])}, {data[key]}, {fields[key]}]"
else:
- assert isinstance(data[key], fields[key])
+ assert isinstance(
+ data[key], fields[key]
+ ), f"error [{key}:{type(data[key])}, {data[key]}, {fields[key]}]"
def check_failure_get(path, headers, err=None):
diff --git a/tests/unit/test_assiduites.py b/tests/unit/test_assiduites.py
index 79f7d430b1..a9205659e6 100644
--- a/tests/unit/test_assiduites.py
+++ b/tests/unit/test_assiduites.py
@@ -648,7 +648,7 @@ def verifier_filtrage_justificatifs(etud: Identite, justificatifs: list[Justific
# Justifications des assiduites
- assert len(scass.justifies(justificatifs[2])) == 2, "Justifications mauvais"
+ assert len(scass.justifies(justificatifs[2])) == 1, "Justifications mauvais"
assert len(scass.justifies(justificatifs[0])) == 0, "Justifications mauvais"