Skip to content
Extraits de code Groupes Projets
Valider 38418e9b rédigé par Juliana's avatar Juliana
Parcourir les fichiers

Add type format

parent 7312bfb8
Aucune branche associée trouvée
Aucune étiquette associée trouvée
Aucune requête de fusion associée trouvée
...@@ -45,18 +45,30 @@ class Base(models.AbstractModel): ...@@ -45,18 +45,30 @@ class Base(models.AbstractModel):
# Field One2many / Many2many # Field One2many / Many2many
# Construction de l'entrée json sous forme: # Construction de l'entrée json sous forme:
# En entrée: ('O2m/M2m', type, ['field1', ('field2', ['subfield2']), 'field3']) # En entrée: ('O2m/M2m', type, ['field1', ('field2', ['subfield2']), 'field3'])
# En sortie: # En sortie:
# si type=LIST: ##LIST_O2m/M2m##: ['field1, subfiled2, field3', 'field1, subfiled2, field3',...] # si type=LIST: ##LIST_O2m/M2m##: ['field1, subfield2, field3', 'field1, subfield2, field3',...]
# si type=TAB: ##MAP_O2m/M2m##: [['field1', 'subfiled2', 'field3'], ['field1', 'subfiled2', 'field3'],...] # si type=TAB: ##MAP_O2m/M2m##: [['field1', 'subfiled2', 'field3'], ['field1', 'subfiled2', 'field3'],...]
# si type=ENUM: ##MAP_O2m/M2m##: 'field1 subfiled2, field3, field1, subfiled2, field3,... # si type=ENUM: ##MAP_O2m/M2m##: 'field1 subfield2, field3, field1, subfield2, field3,...
# si type=MULTI: ##MAP_O2m/M2m##: ['field1, subfield2, field3'], ['field1, subfield2, field3']...
if field_type in ('one2many', 'many2many'): if field_type in ('one2many', 'many2many'):
if subparser.get('type_data') == "LIST": if subparser.get('type_data') == "LIST":
sub_res = rec[field_name].json_build(subparser.get('fields')) sub_res = rec[field_name].json_build(subparser.get('fields'))
# json_key = '##' + json_key + '##'
res[json_key] = [] res[json_key] = []
for sub in sub_res: for sub in sub_res:
for ressub in sub.values(): for ressub in sub.values():
res[json_key].append(ressub) res[json_key].append(ressub)
elif subparser.get('type_data') == "MULTI":
sub_res = rec[field_name].json_build(subparser.get('fields'))
res[json_key] = []
for sub in sub_res:
each_res = ""
for ressub in sub.values():
if each_res:
each_res += ', ' + ressub
else:
each_res += ressub
res[json_key].append(each_res)
elif subparser.get('type_data') == "ENUM": elif subparser.get('type_data') == "ENUM":
sub_res = rec[field_name].json_build(subparser.get('fields')) sub_res = rec[field_name].json_build(subparser.get('fields'))
res[json_key] = "" res[json_key] = ""
...@@ -69,7 +81,6 @@ class Base(models.AbstractModel): ...@@ -69,7 +81,6 @@ class Base(models.AbstractModel):
res[json_key] += ressub res[json_key] += ressub
elif subparser.get('type_data') == "TAB": elif subparser.get('type_data') == "TAB":
sub_res = rec[field_name].json_build(subparser.get('fields')) sub_res = rec[field_name].json_build(subparser.get('fields'))
# json_key = '##' + json_key + '##'
res[json_key] = [] res[json_key] = []
for sub in sub_res: for sub in sub_res:
res_tab = [] res_tab = []
...@@ -86,7 +97,8 @@ class Base(models.AbstractModel): ...@@ -86,7 +97,8 @@ class Base(models.AbstractModel):
sub_res = rec[field_name].json_build(subparser)[0] sub_res = rec[field_name].json_build(subparser)[0]
res[json_key] = "" res[json_key] = ""
for sub in sub_res.values(): for sub in sub_res.values():
if sub != False: # if sub != False or sub != None:
if sub:
if res[json_key]: if res[json_key]:
res[json_key] += ', ' + sub res[json_key] += ', ' + sub
else: else:
...@@ -102,7 +114,7 @@ class Base(models.AbstractModel): ...@@ -102,7 +114,7 @@ class Base(models.AbstractModel):
if value is False and field_type != 'boolean': if value is False and field_type != 'boolean':
value = None value = None
elif field_type == "date": elif field_type == "date":
value = fields.Date.to_date(value).isoformat() value = fields.Date.to_date(value).strftime('%d/%m/%Y')
elif field_type == "datetime": elif field_type == "datetime":
value = fields.Datetime.to_datetime(value) value = fields.Datetime.to_datetime(value)
value = fields.Datetime.context_timestamp(rec, value) value = fields.Datetime.context_timestamp(rec, value)
......
0% Chargement en cours ou .
You are about to add 0 people to the discussion. Proceed with caution.
Veuillez vous inscrire ou vous pour commenter