Fixes in json and dashboard

This commit is contained in:
Antonio de la Rosa 2021-06-27 12:18:56 +02:00
parent fa8b8be4f5
commit 8c2bcdc74a
5 changed files with 148 additions and 4 deletions

View file

@ -217,7 +217,7 @@ def obtain_timestamp(timeform):
# timestamp is gmt time, convert in normal time
def timestamp_to_datetime(timestamp):
def timestamp_to_datetime(timestamp, sql_format_time=sql_format_time):
"""Turn datetime in YYYYMMDDHHmmss format.
@ -233,7 +233,7 @@ def timestamp_to_datetime(timestamp):
# Get a utc timestamp and convert to local
def timestamp_to_datetime_local(timestamp, tz=''):
def timestamp_to_datetime_local(timestamp, tz='', sql_format_time=sql_format_time):
"""Get a utc timestamp and convert to timezone datetime in YYYYMMDDHHmmss format.
Args:

View file

@ -0,0 +1,84 @@
from paramecio2.libraries.db.webmodel import WebModel, PhangoField
try:
import ujson as json
except:
import json
class JsonField(PhangoField):
def __init__(self, name, field_type, required=False):
super().__init__(name, required)
self.field_type=field_type
self.error_default='Sorry, the json dict is invalid'
self.set_default='NOT NULL'
def check(self, value):
if type(value).__name__=='str':
try:
value=json.loads(value)
except json.JSONDecodeError:
value={}
self.error=True
self.txt_error=self.error_default
elif type(value).__name__!='dict':
value={}
self.error=True
self.txt_error=self.error_default
for k,v in value.items():
value[k]=self.field_type.check(v)
final_value=json.dumps(value)
#final_value=WebModel.escape_sql(final_value)
return final_value
def get_type_sql(self):
return 'LONGTEXT '+self.set_default
def show_formatted(self, value):
return ", ".join(value)
# You need check the values previously.
class JsonValueField(PhangoField):
def __init__(self, name, required=False):
super().__init__(name, required)
self.error_default='Sorry, the json dict is invalid'
#self.set_default='NOT NULL'
def get_type_sql(self):
return 'JSON'
def check(self, value):
try:
final_value=json.dumps(value)
except json.JSONDecodeError:
value={}
self.error=True
self.txt_error=self.error_default
return final_value