radboy 0.0.624__py3-none-any.whl → 0.0.625__py3-none-any.whl

radboy/DB/OrderedAndRxd.py

@@ -286,7 +286,7 @@ except Exception as e:
     OrderedAndRecieved.metadata.create_all(ENGINE) 
  
 class OrderAndRxdUi():
-    def between_dates(self,paged=False,limit=False,short_display=False):
+    def between_dates(self,query):
         '''list everything between start and end
         paged=True -> page results and use menu to edit/delete/stop paging
         paged=False -> print all at once
@@ -294,9 +294,27 @@ class OrderAndRxdUi():
         limit=False -> everything is printed
         short_display=True -> display less information
         '''
-        with Session(ENGINE) as session:
-            start=None
-            end=None
+        start=Control(func=FormBuilderMkText,ptext="Start DateTime: ",helpText="starting datetime",data="datetime")
+        if start is None:
+            return
+        elif not isinstance(start,datetime):
+            return
+
+        end=Control(func=FormBuilderMkText,ptext="End DateTime: ",helpText="ending datetime",data="datetime")
+        if end is None:
+            return
+        elif not isinstance(end,datetime):
+            return
+        print(f""""
+{Fore.orange_red_1}Results are for dates between
+{Fore.light_green}Start: {start}
+{Fore.light_red}End: {end}
+{'-'*(os.get_terminal_size().columns-len(Style.reset))}{Style.reset}
+            """)
+        return orderQuery(query.filter(and_(
+            OrderedAndRecieved.dtoe >= start,
+            OrderedAndRecieved.dtoe <= end))
+        ,OrderedAndRecieved.dtoe,inverse=True)
 
     def fixtable(self):
         OrderedAndRecieved.__table__.drop(ENGINE)
@@ -323,7 +341,7 @@ class OrderAndRxdUi():
         #uncomment these to troubleshoot
         #print('x3',and_(*filte))
         #print('x4')
-        return and_(*filte)
+
 
     def OrderedAndRecieved_as(self,_exlcudes=[],as_=None,item=None):
         excludes=['oarid',]
@@ -417,33 +435,43 @@ class OrderAndRxdUi():
                             continue
                 
 
-        if terms is not None:
-            with Session(ENGINE) as session:
-                query=session.query(OrderedAndRecieved).filter(terms)
-                query=orderQuery(query,OrderedAndRecieved.dtoe)
-                results=query.all()
-                ct=len(results)
-                plural=''
-                if ct > 1:
-                    plural="s"
-                print(f"{ct} result{plural}!")
-                zebra=0
-                    
-
-                if selector:
-                    #for returning a list of OrderedAndRecieved
-                    selectortext(resuls)
-                    zebra+=1
-                    pass
-                if menu:
-                    #for paged edit/delete of OrderedAndRecieved and returns None
-                    selectortext(results,page=True)
-                    zebra+=1
-                    pass
-
-                if not(zebra > 0):
-                    for num,i in enumerate(results):
-                            print(std_colorize(i,num,ct))
+        
+        with Session(ENGINE) as session:
+            query=session.query(OrderedAndRecieved)
+            if terms is not None:
+                query=query.filter(terms)
+            query=orderQuery(query,OrderedAndRecieved.dtoe)
+            between_dates=Control(func=FormBuilderMkText,ptext="Between dates? y/n",helpText="values between two dates",data="boolean")
+            if between_dates is None:
+                return None
+            if between_dates in ['d',False]:
+                pass
+            else:
+                query=self.between_dates(query)
+
+            results=query.all()
+            ct=len(results)
+            plural=''
+            if ct > 1:
+                plural="s"
+            print(f"{ct} result{plural}!")
+            zebra=0
+                
+
+            if selector:
+                #for returning a list of OrderedAndRecieved
+                selectortext(resuls)
+                zebra+=1
+                pass
+            if menu:
+                #for paged edit/delete of OrderedAndRecieved and returns None
+                selectortext(results,page=True)
+                zebra+=1
+                pass
+
+            if not(zebra > 0):
+                for num,i in enumerate(results):
+                        print(std_colorize(i,num,ct))
 
 
     def __init__(self,*args,**kwargs):
@@ -504,7 +532,7 @@ class OrderAndRxdUi():
                 elif i in self.registry:
                     self.cmds[cmd]['cmds'].pop(self.cmds[cmd]['cmds'].index(i))
             htext.append(std_colorize(f"{self.cmds[cmd]['cmds']} - {self.cmds[cmd]['desc']}",xnum,ct))
-        htext=''.join(htext)
+        htext='\n'.join(htext)
         print(htext)
         while True:
             doWhat=Control(func=FormBuilderMkText,ptext=f"{self.__class__.__name__}:Do What what",helpText=htext,data="string")
@@ -538,6 +566,6 @@ class OrderAndRxdUi():
                 for k in fd:
                     setattr(t,k,fd[k])
                 session.commit()
-            session.refresh(t)
-        
-            print(t)
+                session.refresh(t)
+            
+                print(t)

radboy/__init__.py

@@ -1 +1 @@
-VERSION='0.0.624'
+VERSION='0.0.625'

{radboy-0.0.624.dist-info → radboy-0.0.625.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: radboy
-Version: 0.0.624
+Version: 0.0.625
 Summary: A Retail Calculator for Android/Linux
 Author: Carl Joseph Hirner III
 Author-email: Carl Hirner III <k.j.hirner.wisdom@gmail.com>

{radboy-0.0.624.dist-info → radboy-0.0.625.dist-info}/RECORD

@@ -5,7 +5,7 @@ radboy/Holidays.txt,sha256=y-JZPihh5iaWKxMIHNXD39yVuVmf1vMs4FdNDcg0f1Y,3114
 radboy/InventoryGlossary.txt,sha256=018-Yqca6DFb10jPdkUY-5qhkRlQN1k3rxoTaERQ-LA,91008
 radboy/RecordMyCodes.py,sha256=Lt2reA6xchq3U7Y08DvkrHboZ25i1ts7X2E9gSIwcVg,41101
 radboy/Run.py,sha256=JUoCTHnzQBv7n8PB2_i93ANdAC_iW__RkAge8esCnk4,76
-radboy/__init__.py,sha256=zsaFEMBLbBD9s1uLpdqx4u15pKazpCbSGLadHmQMhTA,17
+radboy/__init__.py,sha256=kM9c_XEi4wIBSRbfAb3gaCSwns39NLVMpTKPwRCr7FI,17
 radboy/api_key,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 radboy/case-export-2024-05-14-13-10-00.672971.xlsx,sha256=Wd592d_VLFmfUI9KKKSVjNwjV91euc1T7ATyvwvUhlg,5431
 radboy/case-export-2024-05-14-13-13-22.540614.xlsx,sha256=OnGrhmScHfGp_mVaWW-LNMsqrQgyZDpiU3wV-2s3U5Q,5556
@@ -83,7 +83,7 @@ radboy/DB/DatePicker.py,sha256=B75mDtXQrkHRCpoU9TJsaBVvkK37ykMaJyaiqGOo4dM,18334
 radboy/DB/DisplayItemDb.py,sha256=uVvrNyFyBuKvrw-BEPXKYvfa-QWyFN5ahESi2l6vUUA,52046
 radboy/DB/EstimatedPayCalendarWorkSheet.txt,sha256=GOjRSmGxFoNTdAnpPe2kGv7CkXDrh0Mee01HslamGbo,17173
 radboy/DB/ExerciseTracker.py,sha256=OS9i8jGIZPj-6m1bB0-eKNHQ6vf2iv_AYPEc0s4bkBM,27809
-radboy/DB/OrderedAndRxd.py,sha256=cGkArh68IUezdjmIUW7SyyMmlqc9I0nUk5tO97sD4FQ,22021
+radboy/DB/OrderedAndRxd.py,sha256=PZ_Rbm0H3DFhHuN1SZEnd1RhEnKOU_L0X0MHXwYN3-s,23004
 radboy/DB/PayDay.py,sha256=H2kPGvBCDkMOz7lbxQhYtUt_oAInpxi37Q6MFrah98I,8710
 radboy/DB/PayModels.py,sha256=hjwWxP7PL33hmfzQl5YTf0HqzaMxXJxFknPdxFJXJc8,3499
 radboy/DB/PrintLogging.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -401,7 +401,7 @@ radboy/__pycache__/Run.cpython-311.pyc,sha256=G_UEfMtkLRjR6ZpGA_BJzGenuaCcP469Y9
 radboy/__pycache__/Run.cpython-312.pyc,sha256=v4xolc3mHyla991XhpYBUbBHYT0bnJ1gE-lkFoQ4GFA,241
 radboy/__pycache__/__init__.cpython-311.pyc,sha256=R-DVbUioMOW-Fnaq7FpT5F1a5p0q3b_RW-HpLRArCAY,242
 radboy/__pycache__/__init__.cpython-312.pyc,sha256=FsFzLXOlTK8_7ixoPZzakkR8Wibt-DvXLFh-oG2QlPw,164
-radboy/__pycache__/__init__.cpython-313.pyc,sha256=XjG6Qxfo2bHdj0vNthHIleAvFa_xcrEFqDO9aFUs-Oo,165
+radboy/__pycache__/__init__.cpython-313.pyc,sha256=PwghP7D7Hp6F0l9WfJ7UFwhWxDfCE2OFMs8I41QaQcI,165
 radboy/__pycache__/__init__.cpython-39.pyc,sha256=D48T6x6FUeKPfubo0sdS_ZUut3FmBvPMP7qT6rYBZzU,275
 radboy/__pycache__/possibleCode.cpython-311.pyc,sha256=zFiHyzqD8gUnIWu4vtyMYIBposiRQqaRXfcT_fOl4rU,20882
 radboy/__pycache__/possibleCode.cpython-312.pyc,sha256=tk_CO-AcsO3YZj5j6vEsw3g37UmEzWc5YgeWEoJEUg4,27922
@@ -429,7 +429,7 @@ radboy/tkGui/Images/__pycache__/__init__.cpython-311.pyc,sha256=tXBYpqbOlZ24B1BI
 radboy/tkGui/__pycache__/BeginnersLuck.cpython-311.pyc,sha256=xLQOnV1wuqHGaub16mPX0dDMGU9ryCeLtNz5e517_GE,3004
 radboy/tkGui/__pycache__/Review.cpython-311.pyc,sha256=wKq24iM6Xe2OampgZ7-8U6Nvmgs2y-qWOrGwtWhc75k,4047
 radboy/tkGui/__pycache__/__init__.cpython-311.pyc,sha256=BX7DBn5qbvKTvlrKOP5gzTBPBTeTgSMjBW6EMl7N8e0,230
-radboy-0.0.624.dist-info/METADATA,sha256=2qMfXoCVvw_dfSXrwBsTReyiJ9dlrCMO7Q3G2WIhg2w,1662
-radboy-0.0.624.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-radboy-0.0.624.dist-info/top_level.txt,sha256=mlM0RWMUxGo1YHnlLmYrHOgGdK4XNRpr7nMFD5lR56c,7
-radboy-0.0.624.dist-info/RECORD,,
+radboy-0.0.625.dist-info/METADATA,sha256=uRMe1S_9LCWLpD_c1OZFyGJQfnrw_ANTLHcKBTrAAns,1662
+radboy-0.0.625.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+radboy-0.0.625.dist-info/top_level.txt,sha256=mlM0RWMUxGo1YHnlLmYrHOgGdK4XNRpr7nMFD5lR56c,7
+radboy-0.0.625.dist-info/RECORD,,