radboy 0.0.380__py3-none-any.whl → 0.0.383__py3-none-any.whl

radboy/DayLog/BhTrSa/bhtrsaa.py

@@ -2,26 +2,36 @@ from . import *
 import uuid
 class BhTrSa_Gui:
 	def search_saa(self,returnable=False):
+		display_past_due=Prompt.__init2__(None,func=FormBuilderMkText,ptext="Display past due SAA's[False==Default]?",helpText="boolean yes or no[default]",data="boolean")
+		if display_past_due is None:
+			return
+		elif display_past_due in ['d',False]:
+			display_past_due=False
+		else:
+			display_past_due=True
+
 		stext=Prompt.__init2__(None,func=FormBuilderMkText,ptext="What are you looking for?",helpText="a textwise search",data="string")
 		if stext in  [None,]:
 			return
 		lu_state=db.detectGetOrSet('list maker lookup order',False,setValue=False,literal=False)
 		includes=["varchar","string","str","text"]
-		sfields=[str(i.name) for i in BusinessHours.__table__.columns if str(i.type) in includes]
+		sfields=[str(i.name) for i in BusinessHours.__table__.columns if str(i.type).lower() in includes]
 		with Session(ENGINE) as session:
 			query=session.query(Scheduled_And_Appointments)
 			q=[]
 			if stext != 'd':
 				for i in sfields:
-					q.append([or_(getattr(Scheduled_And_Appointments,i).icontains(stext))])
-				squery=query.filter(*q)
+					q.append(getattr(Scheduled_And_Appointments,i).icontains(stext))
+				squery=query.filter(or_(*q))
 			else:
 				squery=query
 			if lu_state:	
 				sorted_query=squery.order_by(Scheduled_And_Appointments.DTOE.asc())
 			else:
 				sorted_query=squery.order_by(Scheduled_And_Appointments.DTOE.desc())
-
+			now=datetime.now()
+			if not display_past_due:
+				sorted_query.filter(Scheduled_And_Appointments.StartDate>date(now.year,now.month,now.day))
 			results=sorted_query.all()
 			ct=len(results)
 			htext=[]
@@ -54,16 +64,18 @@ class BhTrSa_Gui:
 			return
 		lu_state=db.detectGetOrSet('list maker lookup order',False,setValue=False,literal=False)
 		includes=["varchar","string","str","text"]
-		sfields=[str(i.name) for i in BusinessHours.__table__.columns if str(i.type) in includes]
+		sfields=[str(i.name) for i in BusinessHours.__table__.columns if str(i.type).lower() in includes]
 		with Session(ENGINE) as session:
 			query=session.query(BusinessHours)
 			q=[]
+			print(stext)
 			if stext != 'd':
 				for i in sfields:
-					q.append([or_(getattr(BusinessHours,i).icontains(stext)),])
-				squery=query.filter(*q)
+					q.append(getattr(BusinessHours,i).icontains(stext))
+				squery=query.filter(or_(*q))
 			else:
 				squery=query
+
 			if lu_state:	
 				sorted_query=squery.order_by(BusinessHours.DTOE.asc())
 			else:
@@ -101,14 +113,14 @@ class BhTrSa_Gui:
 			return
 		lu_state=db.detectGetOrSet('list maker lookup order',False,setValue=False,literal=False)
 		includes=["varchar","string","str","text"]
-		sfields=[str(i.name) for i in TaxRates.__table__.columns if str(i.type) in includes]
+		sfields=[str(i.name) for i in TaxRates.__table__.columns if str(i.type).lower() in includes]
 		with Session(ENGINE) as session:
 			query=session.query(TaxRates)
 			q=[]
 			if stext != 'd':
 				for i in sfields:
-					q.append([or_(getattr(TaxRates,i).icontains(stext)),])
-				squery=query.filter(*q)
+					q.append(getattr(TaxRates,i).icontains(stext))
+				squery=query.filter(or_(*q))
 			else:
 				squery=query
 			if lu_state:	

radboy/__init__.py

@@ -1 +1 @@
-VERSION='0.0.380'
+VERSION='0.0.383'

{radboy-0.0.380.dist-info → radboy-0.0.383.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: radboy
-Version: 0.0.380
+Version: 0.0.383
 Summary: A small example package
 Author: Carl Joseph Hirner III
 Author-email: Carl Hirner III <k.j.hirner.wisdom@gmail.com>

{radboy-0.0.380.dist-info → radboy-0.0.383.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=XXy-o5Z_yOgrgHNju4iqM3h7xhRBkNIoHG1qePtBnGY,41316
 radboy/Run.py,sha256=JUoCTHnzQBv7n8PB2_i93ANdAC_iW__RkAge8esCnk4,76
-radboy/__init__.py,sha256=0__JNgejIJEDNEFHP_MCjMXpR_9eSbVtldf_UYfOkgw,17
+radboy/__init__.py,sha256=B-JRL-UpvO9ObN5eJE9MdVi5Y2Zn6C3nXiHTjFCQO5M,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
@@ -139,7 +139,7 @@ radboy/DayLog/TaxiFares.py,sha256=3slYjtBcTnRe8IeneJ-_iZJJ3E7alW09f6GWYXPxhOo,10
 radboy/DayLog/Wavelength4Freq.py,sha256=MfN2EATrN3bbEDgP1qOPjV1Fk8sVnkc_4tgX6sKfSE0,2054
 radboy/DayLog/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 radboy/DayLog/BhTrSa/__init__.py,sha256=q6xDsXAiWpQR2QWILKZKf--D3apR_KOE1CRbZaP7Vq4,976
-radboy/DayLog/BhTrSa/bhtrsaa.py,sha256=sJGWFNug3cNeIvO6AFwQyynvW__S-r3OYZxB--iczjk,13473
+radboy/DayLog/BhTrSa/bhtrsaa.py,sha256=RhM0PVmmtp7dAai-fdjlgp8SVeCQq0C7JUtpgkuHNXE,13957
 radboy/DayLog/__pycache__/DayLogger.cpython-311.pyc,sha256=TmRnRZHp5tMTokSEB8hWTxnasi-iJdh6TmYcb_nXGoY,29557
 radboy/DayLog/__pycache__/DayLogger.cpython-312.pyc,sha256=bfDCQZrIhgQYzoUle7roicRE_bhGPYZtIbCRIiDrsxU,68240
 radboy/DayLog/__pycache__/DayLogger.cpython-313.pyc,sha256=L3BYIw7SMXTsTK64KnTRg0mn-CRZn2Eq-4rjh75JXcs,151046
@@ -388,7 +388,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=MrAaEitcrgyuQPToBuM0nJvlm0PzFNUjkdfUMDSqg24,165
+radboy/__pycache__/__init__.cpython-313.pyc,sha256=LwVZvhb65m80I9S3EXEKhCY5UWKh_nm7oXCpGSpEeBE,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
@@ -413,7 +413,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.380.dist-info/METADATA,sha256=IlahHGfQDZs4z_Cuxf4btCRShR9-s6egt04svOMsgSc,794
-radboy-0.0.380.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-radboy-0.0.380.dist-info/top_level.txt,sha256=mlM0RWMUxGo1YHnlLmYrHOgGdK4XNRpr7nMFD5lR56c,7
-radboy-0.0.380.dist-info/RECORD,,
+radboy-0.0.383.dist-info/METADATA,sha256=65kSSnMzrNkObTvcEqlYPzVfuMdif2oMOfQyHyYHfnk,794
+radboy-0.0.383.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+radboy-0.0.383.dist-info/top_level.txt,sha256=mlM0RWMUxGo1YHnlLmYrHOgGdK4XNRpr7nMFD5lR56c,7
+radboy-0.0.383.dist-info/RECORD,,