diff --git a/management/commands/import_nk15.py b/management/commands/import_nk15.py
index 1a85d0bc0a873a429713430874783d671d51656d..e79f67677d09a72a7cd149ba1bd14f3ac77b8bd7 100644
--- a/management/commands/import_nk15.py
+++ b/management/commands/import_nk15.py
@@ -8,6 +8,7 @@ import psycopg2.extras as pge
from django.db import transaction
import collections
+from datetime import timedelta
from django.core.exceptions import ValidationError
from django.utils.timezone import make_aware
@@ -28,6 +29,10 @@ TODO: import activite
TODO: import ...
"""
+M_DURATION = timedelta(days=396)
+M_START = timedelta(days=213)
+M_END = timedelta(days=273)
+
@transaction.atomic
def import_special(cur):
cur.execute("SELECT * FROM comptes WHERE idbde <0 ORDER BY idbde;")
@@ -45,17 +50,17 @@ def import_special(cur):
clubBde, c = Club.objects.get_or_create(pk = 1,
name = "Bde",
email = "bureau.bde@lists.crans.org",
- membership_duration = "396 00:00:00",
- membership_start = "213 00:00:00",
- membership_end = "273 00:00:00",
+ membership_duration = M_DURATION,
+ membership_start = M_START,
+ membership_end = M_END,
membership_fee = 5,
)
clubKfet, c = Club.objects.get_or_create(pk = 2,
name = "Kfet",
email = "tresorerie.bde@lists.crans.org",
- membership_duration = "396 00:00:00",
- membership_start = "213 00:00:00",
- membership_end = "273 00:00:00",
+ membership_duration = M_DURATION,
+ membership_start = M_START,
+ membership_end = M_END,
membership_fee = 35,
)
clubBde.save()
@@ -93,15 +98,12 @@ def import_comptes(cur,map_idbde):
user = User.objects.create(**obj_dict)
else:
raise(e)
- else:
- pass
- obj_dict ={
- "phone_number": row["tel"],
- "address": row["adresse"],
- "paid": row["normalien"],
- "user": user,
- }
- profile = Profile.objects.create(**obj_dict)
+ # profile and note created via signal.
+ profile = user.profile
+ profile.phone_number = row["tel"]
+ profile.address = row["adresse"]
+ profile.paid = row["normalien"]
+
note = user.note
date = row.get("last_negatif",None)
if date != None:
@@ -113,9 +115,9 @@ def import_comptes(cur,map_idbde):
"pk":pkclub,
"name": row["pseudo"],
"email": row["mail"],
- "membership_duration": "396 00:00:00",
- "membership_start": "213 00:00:00",
- "membership_end": "273 00:00:00",
+ "membership_duration": M_DURATION,
+ "membership_start": M_START,
+ "membership_end": M_END,
"membership_fee": 0,
}
club,c = Club.objects.get_or_create(**obj_dict)
@@ -125,7 +127,7 @@ def import_comptes(cur,map_idbde):
obj_list = [club,note]
for obj in obj_list:
obj.save()
- map_idbde[row["idbde"]] = note.pk
+ map_idbde[row["idbde"]] = note.pk
return map_idbde
@@ -184,9 +186,9 @@ def import_transaction(cur, map_idbde):
transac = TemplateTransaction.objects.create(**obj_dict)
transac.save()
elif row["type"] == "adhésion":
-
+ print("adhesion not supported yet")
else:
-
+ print("other type not supported yet")
@transaction.atomic