django-restit 4.2.135__py3-none-any.whl → 4.2.137__py3-none-any.whl

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.dist-info → django_restit-4.2.137.dist-info}/METADATA

@@ -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.dist-info → django_restit-4.2.137.dist-info}/RECORD

@@ -28,7 +28,7 @@ account/migrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuF
 account/models/__init__.py,sha256=cV_lMnT2vL_mjiYtT4hlcIHo52ocFbGSNVkOIHHLXZY,385
 account/models/device.py,sha256=0AFeLMGk4im4KZVd3eGSyRbK4eQEXiFM2cdY8GUzihs,5934
 account/models/feeds.py,sha256=vI7fG4ASY1M0Zjke24RdnfDcuWeATl_yR_25jPmT64g,2011
-account/models/group.py,sha256=gsCze5dxTBcDayNalujAA-v8gKx3vC2cQwuUH6Jg9Tg,23100
+account/models/group.py,sha256=N9Ow7AtV4xN5zSE9E5-msthJy0G5-3DEr2MTmvFO1kU,22887
 account/models/legacy.py,sha256=zYdtv4LC0ooxPVqWM-uToPwV-lYWQLorSE6p6yn1xDw,2720
 account/models/member.py,sha256=FvVUoc_n7PgqxXduQRF-S4VJcl8aER5tMBxM5xsgswU,54682
 account/models/membership.py,sha256=90EpAhOsGaqphDAkONP6j_qQ0OWSRaQsI8H7E7fgMkE,9249
@@ -377,14 +377,14 @@ pushit/utils.py,sha256=IeTCGa-164nmB1jIsK1lu1O1QzUhS3BKfuXHGjCW-ck,2121
 rest/.gitignore,sha256=TbEvWRMnAiajCTOdhiNrd9eeCAaIjRp9PRjE_VkMM5g,118
 rest/README.md,sha256=V3ETc-cJu8PZIbKr9xSe_pA4JEUpC8Dhw4bQeVCDJPw,5460
 rest/RemoteEvents.py,sha256=nL46U7AuxIrlw2JunphR1tsXyqi-ep_gD9CYGpYbNgE,72
-rest/__init__.py,sha256=jvMDmcVTsAQ0iA0xPSbOztX_yr1rfxCPVRM4H93ysos,122
+rest/__init__.py,sha256=PSWIfpDjtvbPEOyM64myB5msZj0BE25NqYDa501DmEs,122
 rest/arc4.py,sha256=y644IbF1ec--e4cUJ3KEYsewTCITK0gmlwa5mJruFC0,1967
 rest/cache.py,sha256=1Qg0rkaCJCaVP0-l5hZg2CIblTdeBSlj_0fP6vlKUpU,83
 rest/crypto/__init__.py,sha256=Tl0U11rgj1eBYqd6OXJ2_XSdNLumW_JkBZnaJqI6Ldw,72
 rest/crypto/aes.py,sha256=NOVRBRSHCV-om68YpGySWWG-4kako3iEVjq8hxZWPUU,4372
 rest/crypto/privpub.py,sha256=_FioylVcbMmDP80yPYjURmafEiDmEAMkskbc7WF10ac,4082
 rest/crypto/util.py,sha256=agFN2OCPHC70tHNGWrMkkZX4Tt_Ty6imoKEMdTkZpKA,4514
-rest/datem.py,sha256=hX6bTbl5mQSg0x2hDK5P1TynkZFUfVTDwYkTuFObgbw,12626
+rest/datem.py,sha256=qbkgDpTVbxpnS4hRm_GnyRo9Gk7nRJbH-tJqxm172mo,13152
 rest/decorators.py,sha256=AuB4agpog587CUsF8HkAZiHDfs_pueb2rdxXZD7dUUE,15327
 rest/encryption.py,sha256=x6Kiez0tVqfxK26MSsRL3k8OS05ni1gEX2aj3I0S9V0,788
 rest/errors.py,sha256=uKwG9OkLme36etabqK54DMjMQc1fgEoUIAUxXa7WFQw,612
@@ -410,7 +410,7 @@ rest/middleware/request.py,sha256=JchRNy5L-bGd-7h-KFYekGRvREe2eCkZXKOYqIkP2hI,41
 rest/middleware/session.py,sha256=zHSoQpIzRLmpqr_JvW406wzpvU3W3gDbm5JhtzLAMlE,10240
 rest/middleware/session_store.py,sha256=1nSdeXK8PyuYgGgIufqrS6j6QpIrQ7zbMNT0ol75e6U,1901
 rest/models/__init__.py,sha256=M8pvFDq-WCF-QcM58X7pMufYYe0aaQ3U0PwGe9TKbbY,130
-rest/models/base.py,sha256=asj1ehoq_LLcm99PbyICGG9I_GQikxilrc52tTs2YBY,71301
+rest/models/base.py,sha256=soIYiW71wZdUPmYf-JPPcnHx79CrA9B-hGNFt_WlRCI,71609
 rest/models/cacher.py,sha256=eKz8TINVhWEqKhJGMsRkKZTtBUIv5rN3NHbZwOC56Uk,578
 rest/models/metadata.py,sha256=1nQ7CYo9bJHoaXE_hVNaj1-Y7yqhHlf2ZlaD1IfTzic,12904
 rest/net.py,sha256=LcB2QV6VNRtsSdmiQvYZgwQUDwOPMn_VBdRiZ6OpI-I,2974
@@ -513,7 +513,7 @@ ws4redis/servers/uwsgi.py,sha256=VyhoCI1DnVFqBiJYHoxqn5Idlf6uJPHvfBKgkjs34mo,172
 ws4redis/settings.py,sha256=K0yBiLUuY81iDM4Yr-k8hbvjn5VVHu5zQhmMK8Dtz0s,1536
 ws4redis/utf8validator.py,sha256=S0OlfjeGRP75aO6CzZsF4oTjRQAgR17OWE9rgZdMBZA,5122
 ws4redis/websocket.py,sha256=R0TUyPsoVRD7Y_oU7w2I6NL4fPwiz5Vl94-fUkZgLHA,14848
-django_restit-4.2.135.dist-info/LICENSE.md,sha256=VHN4hhEeVOoFjtG-5fVv4jesA4SWi0Z-KgOzzN6a1ps,1068
-django_restit-4.2.135.dist-info/METADATA,sha256=y5BF4iNU-96HCWsE7bLYHz9-lOK6htULuY729Hs6NwI,7663
-django_restit-4.2.135.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-django_restit-4.2.135.dist-info/RECORD,,
+django_restit-4.2.137.dist-info/LICENSE.md,sha256=VHN4hhEeVOoFjtG-5fVv4jesA4SWi0Z-KgOzzN6a1ps,1068
+django_restit-4.2.137.dist-info/METADATA,sha256=kG5p8Bv4ZpfqyPukB-PQ6uzRwk-42-83MtyOIk70iRY,7663
+django_restit-4.2.137.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+django_restit-4.2.137.dist-info/RECORD,,

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"

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

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