django-restit 4.2.135__tar.gz → 4.2.137__tar.gz

{django_restit-4.2.135 → django_restit-4.2.137}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: django-restit
-Version: 4.2.135
+Version: 4.2.137
 Summary: A Rest Framework for DJANGO
 License: MIT
 Author: Ian Starnes

{django_restit-4.2.135 → django_restit-4.2.137}/account/models/group.py

@@ -134,6 +134,7 @@ class Group(models.Model, RestModel, MetaDataModel):
 
     _tz_long = None
     _tz_short = None
+    _eod_hour = None
 
     @property
     def timezone(self):
@@ -147,6 +148,12 @@ class Group(models.Model, RestModel, MetaDataModel):
             self._tz_short = rh.getShortTZ(self.timezone)
         return self._tz_short
 
+    @property
+    def end_of_day_hour(self):
+        if self._eod_hour is None:
+            self._eod_hour = self.getParentProperty("eod", 0, field_type=int)
+        return self._eod_hour
+
     @property
     def file_safe_name(self):
         return re.sub("[^0-9a-zA-Z]+", "_", self.name.lower())
@@ -361,34 +368,27 @@ class Group(models.Model, RestModel, MetaDataModel):
         return default
 
     def getLocalTime(self, when=None, tz_aware=False):
-        zone = self.getParentProperty("timezone", "America/Los_Angeles")
-        return rh.convertToLocalTime(zone, when, tz_aware)
+        return rh.convertToLocalTime(self.timezone, when, tz_aware)
 
     def getUTC(self, when):
-        zone = self.getParentProperty("timezone", "America/Los_Angeles")
-        return rh.convertToUTC(zone, when)
+        return rh.convertToUTC(self.timezone, when)
 
     def getBusinessDay(self, start=None, end=None, kind="day"):
-        zone = self.getParentProperty("timezone", "America/Los_Angeles")
-        eod = self.getParentProperty("eod", 0, field_type=int)
-        return rh.getDateRange(start, end, kind, zone, hour=eod)
+        return rh.getDateRange(start, end, kind, self.timezone, hour=self.end_of_day_hour)
 
     def getOperatingHours(self, start=None, end=None, kind="day"):
         # deprecate this, operating hours is deceptive
-        zone = self.getParentProperty("timezone", "America/Los_Angeles")
-        eod = self.getParentProperty("eod", 0, field_type=int)
-        return rh.getDateRange(start, end, kind, zone, hour=eod)
+        return rh.getDateRange(start, end, kind, self.timezone, hour=self.end_of_day_hour)
 
     def getTimeZoneOffset(self, when=None, hour=None):
-        zone = self.getParentProperty("timezone", "America/Los_Angeles")
-        return rh.getTimeZoneOffset(zone, when, hour=hour)
+        return rh.getTimeZoneOffset(self.timezone, when, hour=hour)
 
     def getEOD(self, eod=None, onday=None, in_local=False):
         if eod is None:
-            eod = self.getParentProperty("eod", 0, field_type=int)
+            eod = self.end_of_day_hour
             if in_local:
                 return eod
-        offset = self.getTimeZoneOffset(onday, hour=eod)
+        offset = self.getTimeZoneOffset(onday, hour=self.end_of_day_hour)
         return offset
 
     def updateUUID(self):

{django_restit-4.2.135 → django_restit-4.2.137}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "django-restit"
-version = "4.2.135"
+version = "4.2.137"
 description = "A Rest Framework for DJANGO"
 authors = ["Ian Starnes <ians@311labs.com>"]
 license = "MIT"

{django_restit-4.2.135 → django_restit-4.2.137}/rest/__init__.py

@@ -1,4 +1,4 @@
 from .uberdict import UberDict  # noqa: F401
 from .settings_helper import settings  # noqa: F401
 
-__version__ = "4.2.135"
+__version__ = "4.2.137"

{django_restit-4.2.135 → django_restit-4.2.137}/rest/datem.py

@@ -394,3 +394,18 @@ def convert_to_epoch_range(start, end=None):
         raise ValueError("Start parameter must be an int, datetime object, or a string representing a timedelta.")
 
     return start_epoch, end_epoch
+
+
+def updateTimeFromString(dt, time_string):
+    # Check if the time_string is in "hour" format (e.g., "13") or 
+    # "hour:minute" format (e.g., "1:32")
+    if ':' in time_string:
+        # Parse hour and minute
+        hour, minute = map(int, time_string.split(':'))
+    else:
+        # Only hour is provided
+        hour = int(time_string)
+        minute = 0
+    # Update the datetime object with the new hour and minute
+    updated_dt = dt.replace(hour=hour, minute=minute, second=0, microsecond=0)
+    return updated_dt

{django_restit-4.2.135 → django_restit-4.2.137}/rest/models/base.py

@@ -1021,6 +1021,12 @@ class RestModel(object):
                 if dr_offset > 0:
                     dr_start = dr_start + timedelta(minutes=dr_offset)
                     dr_end = dr_end + timedelta(minutes=dr_offset)
+            tr_start = request.DATA.get("tr_start")
+            if tr_start is not None:
+                tr_start = rh.updateTimeFromString(dr_start, tr_start)
+            tr_end = request.DATA.get("tr_end")
+            if tr_end is not None:
+                tr_end = rh.updateTimeFromString(dr_end, tr_end)
             dr_field = request.DATA.get("dr_field", getattr(cls.RestMeta, "DATE_RANGE_FIELD", "created"))
             q = dict()
             q["{}__gte".format(dr_field)] = dr_start