From e5262a9cd5a218bad68bb3dc6e53d735cb3aee01 Mon Sep 17 00:00:00 2001 From: Antonio de la Rosa Date: Fri, 3 Jan 2020 17:55:18 +0100 Subject: [PATCH] Fixes in time --- paramecio/citoplasma/datetime.py | 4 +++- paramecio/cromosoma/databases/sqlalchemy.py | 2 +- paramecio/cromosoma/webmodel.py | 4 ++-- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/paramecio/citoplasma/datetime.py b/paramecio/citoplasma/datetime.py index 4964f1b..0305d80 100644 --- a/paramecio/citoplasma/datetime.py +++ b/paramecio/citoplasma/datetime.py @@ -118,7 +118,9 @@ def now(utc=False, tz=''): if tz=='': actual=arrow.now().format(sql_format_time) else: - actual=arrow.to(tz).now().format(sql_format_time) + #actual=arrow.to(tz).now().format(sql_format_time) + utc=arrow.utcnow() + actual=utc.to(tz).format(sql_format_time) else: actual=arrow.utcnow().format(sql_format_time) diff --git a/paramecio/cromosoma/databases/sqlalchemy.py b/paramecio/cromosoma/databases/sqlalchemy.py index c935408..83ef321 100644 --- a/paramecio/cromosoma/databases/sqlalchemy.py +++ b/paramecio/cromosoma/databases/sqlalchemy.py @@ -16,11 +16,11 @@ class SqlClass: cursors_connect=None disable_pool=False pymysql_install=False + pool_size=15 def __init__(self, connection): self.max_overflow=-1 - self.pool_size=5 self.error_connection="" # Data of connection self.connection=connection diff --git a/paramecio/cromosoma/webmodel.py b/paramecio/cromosoma/webmodel.py index d54ebec..b062471 100644 --- a/paramecio/cromosoma/webmodel.py +++ b/paramecio/cromosoma/webmodel.py @@ -737,8 +737,8 @@ class WebModel: row=False else: if self.show_formatted: - for k, col in row.items(): - row[k]=self.fields[k].show_formatted(col) + #for k, col in row.items(): + row[k]={k:self.fields[k].show_formatted(col) for k,col in row.items()} return row