parouby
/
Pamhyr2
mirror of https://gitlab.com/pamhyr/pamhyr2
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

tables load fixed

adists_release
Youcef AOUAD 2024-10-16 11:15:27 +02:00
parent c7eb10884a
commit 5047dbc85e
4 changed files with 75 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
src/Model/D90AdisTS/D90AdisTSSpec.py
View File

@ -89,28 +89,29 @@ class D90AdisTSSpec(SQLSubModel):
f"WHERE d90_default = {data['d90_default_id']} " f"WHERE d90_default = {data['d90_default_id']} "
) )
for row in table: if table is not None:
id = row[0] for row in table:
name = row[2] id = row[0]
reach = row[3] name = row[2]
start_rk = row[4] reach = row[3]
end_rk = row[5] start_rk = row[4]
d90 = row[6] end_rk = row[5]
enabled = (row[7] == 1) d90 = row[6]
enabled = (row[7] == 1)
new_spec = cls( new_spec = cls(
id=id, id=id,
name=name, name=name,
status=data['status'] status=data['status']
) )
new_spec.reach = reach new_spec.reach = reach
new_spec.start_rk = start_rk new_spec.start_rk = start_rk
new_spec.end_rk = end_rk new_spec.end_rk = end_rk
new_spec.d90 = d90 new_spec.d90 = d90
new_spec.enabled = enabled new_spec.enabled = enabled
new.append(new_spec) new.append(new_spec)
return new return new

47
src/Model/DIFAdisTS/DIFAdisTSSpec.py
View File

@ -93,32 +93,33 @@ class DIFAdisTSSpec(SQLSubModel):
f"WHERE dif_default = {data['dif_default_id']} " f"WHERE dif_default = {data['dif_default_id']} "
) )
for row in table: if table is not None:
id = row[0] for row in table:
method = row[2] id = row[0]
reach = row[3] method = row[2]
start_rk = row[4] reach = row[3]
end_rk = row[5] start_rk = row[4]
dif = row[6] end_rk = row[5]
b = row[7] dif = row[6]
c = row[8] b = row[7]
enabled = (row[9] == 1) c = row[8]
enabled = (row[9] == 1)
new_spec = cls( new_spec = cls(
id=id, id=id,
method=method, method=method,
status=data['status'] status=data['status']
) )
new_spec.reach = reach new_spec.reach = reach
new_spec.start_rk = start_rk new_spec.start_rk = start_rk
new_spec.end_rk = end_rk new_spec.end_rk = end_rk
new_spec.dif = dif new_spec.dif = dif
new_spec.b = b new_spec.b = b
new_spec.c = c new_spec.c = c
new_spec.enabled = enabled new_spec.enabled = enabled
new.append(new_spec) new.append(new_spec)
return new return new

2
src/Model/InitialConditionsAdisTS/InitialConditionsAdisTS.py
View File

@ -80,7 +80,7 @@ class InitialConditionsAdisTS(SQLSubModel):
@classmethod @classmethod
def _db_update(cls, execute, version): def _db_update(cls, execute, version):
major, minor, release = version.strip().split(".") major, minor, release = version.strip().split(".")
if major == minor == "0": if major == 0 and minor < 1:
if int(release) < 6: if int(release) < 6:
cls._db_create(execute) cls._db_create(execute)

59
src/Model/InitialConditionsAdisTS/InitialConditionsAdisTSSpec.py
View File

@ -80,7 +80,7 @@ class ICAdisTSSpec(SQLSubModel):
@classmethod @classmethod
def _db_update(cls, execute, version): def _db_update(cls, execute, version):
major, minor, release = version.strip().split(".") major, minor, release = version.strip().split(".")
if major == minor == "0": if major == 0 and minor < 1:
if int(release) < 6: if int(release) < 6:
cls._db_create(execute) cls._db_create(execute)
@ -97,38 +97,39 @@ class ICAdisTSSpec(SQLSubModel):
f"WHERE ic_default = {data['ic_default_id']} " f"WHERE ic_default = {data['ic_default_id']} "
) )
for row in table: if table is not None:
id = row[0] for row in table:
name = row[2] id = row[0]
reach = row[3] name = row[2]
start_rk = row[4] reach = row[3]
end_rk = row[5] start_rk = row[4]
concentration = row[6] end_rk = row[5]
eg = row[7] concentration = row[6]
em = row[8] eg = row[7]
ed = row[9] em = row[8]
rate = row[10] ed = row[9]
enabled = (row[11] == 1) rate = row[10]
enabled = (row[11] == 1)
#new_spec = [name, reach, start_rk, end_rk, concentration, eg, em, ed, rate, enabled] #new_spec = [name, reach, start_rk, end_rk, concentration, eg, em, ed, rate, enabled]
new_spec = cls( new_spec = cls(
id=id, id=id,
name=name, name=name,
status=data['status'] status=data['status']
) )
new_spec.reach = reach new_spec.reach = reach
new_spec.start_rk = start_rk new_spec.start_rk = start_rk
new_spec.end_rk = end_rk new_spec.end_rk = end_rk
new_spec.concentration = concentration new_spec.concentration = concentration
new_spec.eg = eg new_spec.eg = eg
new_spec.em = em new_spec.em = em
new_spec.ed = ed new_spec.ed = ed
new_spec.rate = rate new_spec.rate = rate
new_spec.enabled = enabled new_spec.enabled = enabled
new.append(new_spec) new.append(new_spec)
return new return new