radboy 0.0.385__py3-none-any.whl → 0.0.386__py3-none-any.whl

radboy/DayLog/BhTrSa/bhtrsaa.py

@@ -10,29 +10,75 @@ class BhTrSa_Gui:
 		else:
 			display_past_due=True
 
-		stext=Prompt.__init2__(None,func=FormBuilderMkText,ptext="What are you looking for?",helpText="a textwise search",data="string")
+		most_recent_x=Prompt.__init2__(None,func=FormBuilderMkText,ptext=f"Limit to First, or Last, of Results by X(default={sys.maxsize}):",helpText="an integer",data="integer")
+		if most_recent_x is None:
+			return
+		elif most_recent_x in ['d']:
+			most_recent_x=sys.maxsize
+		
+		offset=Prompt.__init2__(None,func=FormBuilderMkText,ptext=f"Offset to First, or Last, of Results by X(default=0):",helpText="an integer",data="integer")
+		if offset is None:
+			return
+		elif offset in ['d']:
+			offset=0
+
+		stext=Prompt.__init2__(None,func=FormBuilderMkText,ptext="What are you looking for?",helpText="a textwise search, but may include saa_id",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).lower() in includes]
 		with Session(ENGINE) as session:
+			def mquery(lu_state,display_past_due,squery,offset,most_recent_x):
+				if lu_state:	
+					sorted_query=squery.order_by(Scheduled_And_Appointments.StartDate.asc(),Scheduled_And_Appointments.StartDateTime.asc(),Scheduled_And_Appointments.DTOE.asc())
+				else:
+					sorted_query=squery.order_by(Scheduled_And_Appointments.StartDate.desc(),Scheduled_And_Appointments.StartDateTime.desc(),Scheduled_And_Appointments.DTOE.desc())
+				now=datetime.now()
+				if not display_past_due:
+					sorted_query=sorted_query.filter(or_(
+						and_(Scheduled_And_Appointments.StartDate!=None,Scheduled_And_Appointments.StartDate>=date(now.year,now.month,now.day)),
+						and_(Scheduled_And_Appointments.StartDateTime !=None,Scheduled_And_Appointments.StartDateTime>=datetime(now.year,now.month,now.day))
+						)
+					)
+				else:
+					sorted_query=sorted_query.filter(or_(
+						and_(Scheduled_And_Appointments.StartDate!=None,Scheduled_And_Appointments.StartDate<=date(now.year,now.month,now.day)),
+						and_(Scheduled_And_Appointments.StartDateTime !=None,Scheduled_And_Appointments.StartDateTime<=datetime(now.year,now.month,now.day))
+						)
+					)
+				limited_query=sorted_query.offset(offset).limit(most_recent_x)
+				
+				return limited_query
+
 			query=session.query(Scheduled_And_Appointments)
-			q=[]
-			if stext != 'd':
-				for i in sfields:
-					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=sorted_query.filter(Scheduled_And_Appointments.StartDate>date(now.year,now.month,now.day))
-			results=sorted_query.all()
+			
+			def stage2(query,sfields,stext):
+				q=[]
+				if stext != 'd':
+					for i in sfields:
+						q.append(getattr(Scheduled_And_Appointments,i).icontains(stext))
+					squery=query.filter(or_(*q))
+				else:
+					squery=query
+				return squery
+
+			try:
+				print(stext)
+				if stext != 'd':
+					print(stext)
+					SAA_id=int(stext)
+					squery=query.filter(Scheduled_And_Appointments.saa_id==SAA_id)
+				else:
+					squery=stage2(query,sfields,stext)
+					squery=mquery(lu_state,display_past_due,squery,offset,most_recent_x)
+			except Exception as e:
+				print(f"{Fore.light_red}could not use '{stext}' as saa_id{Fore.light_steel_blue} this is not a failure{Style.reset}",e,repr(e))
+				squery=stage2(query,sfields,stext)
+				squery=mquery(lu_state,display_past_due,squery,offset,most_recent_x)
+			
+			results=squery.all()	
+			#sorted_query.all()
 			ct=len(results)
 			htext=[]
 			if ct == 0:

radboy/__init__.py

@@ -1 +1 @@
-VERSION='0.0.385'
+VERSION='0.0.386'

{radboy-0.0.385.dist-info → radboy-0.0.386.dist-info}/METADATA

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

{radboy-0.0.385.dist-info → radboy-0.0.386.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=eMJ_j4wKQLDuoOm_YEgC3q9tpmDHY5SL-p_P4-3H21g,17
+radboy/__init__.py,sha256=MO1KiVymotj1qsEJvZr8Yi4x-WdnLmyK9Fwh6hJdFnA,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=uRAHMHPihyOpwCvT1hd_VYvFReAWXXvXRaPmK4UBE4U,13975
+radboy/DayLog/BhTrSa/bhtrsaa.py,sha256=9zEPvLOyf7hZvrBE867yTUNAIVE_OZQp7CAaXdLbpRQ,16039
 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=ygM5sZQQWeeFUaGoCymw9BaoubJhddD6gOISCLio2aI,165
+radboy/__pycache__/__init__.cpython-313.pyc,sha256=pOoMOpj2gNP83Kq-8l6vPzRD39uZ2eWtBOQbqCRVXIQ,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.385.dist-info/METADATA,sha256=0Kqja2tEl8KXG_UpyMI5IAHvvhl-530bDWkGTVSzcRY,794
-radboy-0.0.385.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-radboy-0.0.385.dist-info/top_level.txt,sha256=mlM0RWMUxGo1YHnlLmYrHOgGdK4XNRpr7nMFD5lR56c,7
-radboy-0.0.385.dist-info/RECORD,,
+radboy-0.0.386.dist-info/METADATA,sha256=zIZN0-nLK610SL_h1HA_RCKZbpT1orEfzuTd-O1RLe4,794
+radboy-0.0.386.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+radboy-0.0.386.dist-info/top_level.txt,sha256=mlM0RWMUxGo1YHnlLmYrHOgGdK4XNRpr7nMFD5lR56c,7
+radboy-0.0.386.dist-info/RECORD,,