slthcore 0.3.9__tar.gz → 0.4.1__tar.gz

{slthcore-0.3.9/slthcore.egg-info → slthcore-0.4.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: slthcore
-Version: 0.3.9
+Version: 0.4.1
 Summary: API generator based on yml file
 Home-page: https://github.com/brenokcc
 Author: Breno Silva

{slthcore-0.3.9 → slthcore-0.4.1}/setup.py

@@ -5,7 +5,7 @@ install_requires = []
 
 setup(
     name='slthcore',
-    version='0.3.9',
+    version='0.4.1',
     packages=find_packages(),
     install_requires=install_requires,
     include_package_data=True,

{slthcore-0.3.9 → slthcore-0.4.1}/slth/db/models.py

@@ -115,10 +115,16 @@ class TextField(TextField):
 class DateTimeField(DateTimeField):
 
     def get_db_prep_value(self, value, *args, **kwargs):
-        return pytz.timezone(timezone.get_current_timezone_name()).localize(value).astimezone(timezone.get_default_timezone()).replace(tzinfo=None) if value else None
+        return self.get_current_timezone().localize(value).astimezone(timezone.get_default_timezone()).replace(tzinfo=None) if value else None
     
     def from_db_value(self, value, *args, **kwargs):
-        return pytz.timezone(timezone.get_default_timezone_name()).localize(value).astimezone(timezone.get_current_timezone()).replace(tzinfo=None) if value else None
+        return pytz.timezone(timezone.get_default_timezone_name()).localize(value).astimezone(self.get_current_timezone()).replace(tzinfo=None) if value else None
+
+    def get_current_timezone(self):
+        current_timezone_name = timezone.get_current_timezone_name()
+        if current_timezone_name and current_timezone_name[0] in ('+', '-'):
+            current_timezone_name = "Etc/GMT{}".format(int(current_timezone_name))
+        return pytz.timezone(current_timezone_name)
 
 
 class TaskFied(TextField):

{slthcore-0.3.9 → slthcore-0.4.1}/slth/models.py

@@ -19,6 +19,7 @@ from django.core.mail import EmailMultiAlternatives
 from .notifications import send_push_web_notification
 from .components import HtmlContent
 from slth import APPLICATON
+from django.utils import timezone
 from django.contrib.auth.models import BaseUserManager
 
 
@@ -521,8 +522,9 @@ class TimeZone(models.Model):
     def __str__(self):
         return self.name
     
-    def localtime(self, datetime=None):
-        return datetime.astimezone(pytz.timezone(self.name)).replace(tzinfo=None)
+    def localtime(self, value):
+        value_in_default_time_zone = pytz.timezone(timezone.get_current_timezone_name()).localize(value).astimezone(timezone.get_default_timezone()).replace(tzinfo=None)
+        return value_in_default_time_zone.astimezone(pytz.timezone(self.name)).replace(tzinfo=None)
 
 
 class UserTimeZone(models.Model):

{slthcore-0.3.9 → slthcore-0.4.1/slthcore.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: slthcore
-Version: 0.3.9
+Version: 0.4.1
 Summary: API generator based on yml file
 Home-page: https://github.com/brenokcc
 Author: Breno Silva