From 3ad7d911b19660fdbb6f7be401cc39597bea0ac5 Mon Sep 17 00:00:00 2001
From: Antonio de la Rosa <antonio.delarosa@salirdelhoyo.com>
Date: Mon, 22 Mar 2021 00:09:30 +0100
Subject: [PATCH] Fixzes in models

---
 paramecio/citoplasma/datetime.py               |  6 +++---
 paramecio/citoplasma/sessions.py               |  6 +++++-
 paramecio/cromosoma/databases/sqlalchemy.py    |  4 +++-
 .../cromosoma/extrafields/datetimefield.py     | 18 +++++++++++-------
 paramecio/cromosoma/extrafields/dictfield.py   |  6 +++++-
 paramecio/cromosoma/webmodel.py                |  3 ++-
 6 files changed, 29 insertions(+), 14 deletions(-)

diff --git a/paramecio/citoplasma/datetime.py b/paramecio/citoplasma/datetime.py
index 0305d80..c06b954 100644
--- a/paramecio/citoplasma/datetime.py
+++ b/paramecio/citoplasma/datetime.py
@@ -151,10 +151,10 @@ def obtain_timestamp(timeform, local=False, tz=''):
             
             t=arrow.arrow.Arrow(y, m, d, h, mi, s).to(tz)
             
-            timestamp=t.timestamp
+            timestamp=t.timestamp()
             
         else:
-            timestamp=arrow.arrow.Arrow(y, m, d, h, mi, s).timestamp
+            timestamp=arrow.arrow.Arrow(y, m, d, h, mi, s).timestamp()
          
         return timestamp
         
@@ -425,7 +425,7 @@ class TimeClass:
         
         if checkdatetime(y, m, d, h, mi, s):
             
-            timestamp=arrow.arrow.Arrow(y, m, d, h, mi, s).timestamp                
+            timestamp=arrow.arrow.Arrow(y, m, d, h, mi, s).timestamp()                
             
             return timestamp
             
diff --git a/paramecio/citoplasma/sessions.py b/paramecio/citoplasma/sessions.py
index 274f35d..3d41064 100644
--- a/paramecio/citoplasma/sessions.py
+++ b/paramecio/citoplasma/sessions.py
@@ -18,7 +18,11 @@ except:
 from itsdangerous import JSONWebSignatureSerializer
 from bottle import request, response
 import os
-import json
+try:
+    import ujson as json
+except:
+    import json
+
 import fcntl
 import errno
 import time
diff --git a/paramecio/cromosoma/databases/sqlalchemy.py b/paramecio/cromosoma/databases/sqlalchemy.py
index 83ef321..713b24d 100644
--- a/paramecio/cromosoma/databases/sqlalchemy.py
+++ b/paramecio/cromosoma/databases/sqlalchemy.py
@@ -29,6 +29,7 @@ class SqlClass:
         self.connected=False
         self.pool_recycle=3600
         self.connect()
+        self.last_query=''
         
         
     def connect(self):
@@ -138,7 +139,8 @@ class SqlClass:
         try:
             
             cursor.execute(sql_query, arguments)
-            self.conn.commit()            
+            self.conn.commit()   
+            self.last_query=cursor._last_executed 
             return cursor
 
         except:
diff --git a/paramecio/cromosoma/extrafields/datetimefield.py b/paramecio/cromosoma/extrafields/datetimefield.py
index 089291f..8c7fa35 100644
--- a/paramecio/cromosoma/extrafields/datetimefield.py
+++ b/paramecio/cromosoma/extrafields/datetimefield.py
@@ -24,13 +24,13 @@ class DateTimeField(PhangoField):
 
             self.error=True
             self.txt_error=self.error_default
-            return ''
+            return None
         
         if value==False:
             
             self.error=True
             self.txt_error=self.error_default
-            return ''
+            return None
         else:
             
             """
@@ -46,10 +46,14 @@ class DateTimeField(PhangoField):
     def show_formatted(self, value):
         
         # Convert to paramecio value
-        value=str(value)
-        value=value.replace('-', '').replace(':', '').replace(' ', '')
-        
-        return datetime.format_date(value)
+        if value!=None:
+            value=str(value)
+            value=value.replace('-', '').replace(':', '').replace(' ', '')
+            
+            return datetime.format_date(value)
+
+        else:
+            return ''
 
     def get_type_sql(self):
         
@@ -57,4 +61,4 @@ class DateTimeField(PhangoField):
 
         """
 
-        return 'DATETIME NOT NULL'
+        return 'DATETIME NULL'
diff --git a/paramecio/cromosoma/extrafields/dictfield.py b/paramecio/cromosoma/extrafields/dictfield.py
index f68863a..1ef816e 100644
--- a/paramecio/cromosoma/extrafields/dictfield.py
+++ b/paramecio/cromosoma/extrafields/dictfield.py
@@ -1,5 +1,9 @@
 from paramecio.cromosoma.webmodel import WebModel, PhangoField
-import json
+
+try:
+    import ujson as json
+except:
+    import json
 
 class DictField(PhangoField):
     
diff --git a/paramecio/cromosoma/webmodel.py b/paramecio/cromosoma/webmodel.py
index d6801da..8176346 100644
--- a/paramecio/cromosoma/webmodel.py
+++ b/paramecio/cromosoma/webmodel.py
@@ -471,7 +471,8 @@ class WebModel:
         except: 
             self.query_error='Cannot insert the new row'
             print(sys.exc_info()[0])
-            return False
+            raise
+            #return False
         
         c=len(values)