radboy 0.0.385__tar.gz → 0.0.386__tar.gz

{radboy-0.0.385 → radboy-0.0.386}/PKG-INFO

@@ -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.386/STDOUT.TXT

@@ -0,0 +1,135 @@
+#USER INPUT# -> :"dl"
+#USER INPUT# -> :"bhtrsa"
+#USER INPUT# -> :"ssaa"
+#USER INPUT# -> :"true"
+#USER INPUT# -> :""
+#USER INPUT# -> :""
+#USER INPUT# -> :""
+#USER INPUT# -> :"q"
+#USER INPUT# -> :"e"
+#USER INPUT# -> :"dlu"
+#USER INPUT# -> :"bhtrsa"
+#USER INPUT# -> :"ssaa"
+#USER INPUT# -> :"true"
+#USER INPUT# -> :""
+#USER INPUT# -> :""
+#USER INPUT# -> :""
+#USER INPUT# -> :"q"
+#USER INPUT# -> :"e"
+#USER INPUT# -> :"dlu"
+#USER INPUT# -> :"bhtrsa"
+#USER INPUT# -> :"ssaa"
+#USER INPUT# -> :"true"
+#USER INPUT# -> :""
+#USER INPUT# -> :""
+#USER INPUT# -> :""
+#USER INPUT# -> :"ssaa"
+#USER INPUT# -> :"2"
+#USER INPUT# -> :""
+#USER INPUT# -> :""
+#USER INPUT# -> :""
+#USER INPUT# -> :"q"
+#USER INPUT# -> :"e"
+#USER INPUT# -> :"dlu"
+#USER INPUT# -> :"bhtrsa"
+#USER INPUT# -> :"ssaa"
+#USER INPUT# -> :"true"
+#USER INPUT# -> :""
+#USER INPUT# -> :""
+#USER INPUT# -> :"2"
+#USER INPUT# -> :"ssaa"
+#USER INPUT# -> :"t"
+#USER INPUT# -> :""
+#USER INPUT# -> :""
+#USER INPUT# -> :""
+#USER INPUT# -> :"q"
+#USER INPUT# -> :"e"
+#USER INPUT# -> :"dlu"
+#USER INPUT# -> :"bhtrsa"
+#USER INPUT# -> :"ssaa"
+#USER INPUT# -> :"true"
+#USER INPUT# -> :""
+#USER INPUT# -> :""
+#USER INPUT# -> :"2"
+#USER INPUT# -> :"q"
+#USER INPUT# -> :"e"
+#USER INPUT# -> :"dlu"
+#USER INPUT# -> :"bhtrsa"
+#USER INPUT# -> :"ssaa"
+#USER INPUT# -> :"t"
+#USER INPUT# -> :""
+#USER INPUT# -> :""
+#USER INPUT# -> :"2"
+#USER INPUT# -> :"q"
+#USER INPUT# -> :"e"
+#USER INPUT# -> :"dlu"
+#USER INPUT# -> :"bhtrsa"
+#USER INPUT# -> :"ssaa"
+#USER INPUT# -> :"t"
+#USER INPUT# -> :""
+#USER INPUT# -> :""
+#USER INPUT# -> :"2"
+#USER INPUT# -> :"q"
+#USER INPUT# -> :"e"
+#USER INPUT# -> :"dlu"
+#USER INPUT# -> :"bhtrsa"
+#USER INPUT# -> :"ssaa"
+#USER INPUT# -> :"true"
+#USER INPUT# -> :""
+#USER INPUT# -> :""
+#USER INPUT# -> :"2"
+#USER INPUT# -> :"q"
+#USER INPUT# -> :"e"
+#USER INPUT# -> :"dlu"
+#USER INPUT# -> :"bhtrsa"
+#USER INPUT# -> :"ssaa"
+#USER INPUT# -> :"true"
+#USER INPUT# -> :""
+#USER INPUT# -> :""
+#USER INPUT# -> :"2"
+#USER INPUT# -> :"q"
+#USER INPUT# -> :"e"
+#USER INPUT# -> :"dlu"
+#USER INPUT# -> :"bhtrsa"
+#USER INPUT# -> :"ssaa"
+#USER INPUT# -> :""
+#USER INPUT# -> :""
+#USER INPUT# -> :""
+#USER INPUT# -> :"2"
+#USER INPUT# -> :"q"
+#USER INPUT# -> :"e"
+#USER INPUT# -> :"dlu"
+#USER INPUT# -> :"bhtrsa"
+#USER INPUT# -> :""
+#USER INPUT# -> :"ssaa"
+#USER INPUT# -> :"true"
+#USER INPUT# -> :""
+#USER INPUT# -> :""
+#USER INPUT# -> :"2"
+#USER INPUT# -> :"q"
+#USER INPUT# -> :"e"
+#USER INPUT# -> :"dlu"
+#USER INPUT# -> :"bhtrsa"
+#USER INPUT# -> :"ssaa"
+#USER INPUT# -> :"true"
+#USER INPUT# -> :""
+#USER INPUT# -> :""
+#USER INPUT# -> :"2"
+#USER INPUT# -> :"ssaa"
+#USER INPUT# -> :"true"
+#USER INPUT# -> :""
+#USER INPUT# -> :""
+#USER INPUT# -> :"not available"
+#USER INPUT# -> :"ssaa"
+#USER INPUT# -> :""
+#USER INPUT# -> :"1"
+#USER INPUT# -> :""
+#USER INPUT# -> :""
+#USER INPUT# -> :"ssaa"
+#USER INPUT# -> :""
+#USER INPUT# -> :"2"
+#USER INPUT# -> :""
+#USER INPUT# -> :""
+#USER INPUT# -> :"q"
+#USER INPUT# -> :"e"
+#USER INPUT# -> :"0.0.386"

{radboy-0.0.385 → radboy-0.0.386}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "radboy"
-version = "0.0.385"
+version = "0.0.386"
 authors = [
   { name="Carl Hirner III", email="k.j.hirner.wisdom@gmail.com" },
 ]

{radboy-0.0.385 → radboy-0.0.386}/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-0.0.386/radboy/__init__.py

@@ -0,0 +1 @@
+VERSION='0.0.386'

{radboy-0.0.385 → radboy-0.0.386}/radboy.egg-info/PKG-INFO

@@ -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 → radboy-0.0.386}/setup.py

@@ -1,7 +1,7 @@
 from setuptools import setup,find_packages
 from datetime import datetime
 from pathlib import Path
-VERSION="0.0.385"
+VERSION="0.0.386"
 long_description=Path('README.md')
 if long_description.exists():
   long_description=long_description.open("r").read()

radboy-0.0.385/STDOUT.TXT

@@ -1,65 +0,0 @@
-#USER INPUT# -> :"dl"
-#USER INPUT# -> :"bhtrsa"
-#USER INPUT# -> :"nsaa"
-#USER INPUT# -> :"gotok"
-#USER INPUT# -> :"StartTime"
-#USER INPUT# -> :"11:15:00"
-#USER INPUT# -> :"q"
-#USER INPUT# -> :"e"
-#USER INPUT# -> :"dlu"
-#USER INPUT# -> :"bhtrsa"
-#USER INPUT# -> :"nsaa"
-#USER INPUT# -> :"gotok"
-#USER INPUT# -> :"StartTime"
-#USER INPUT# -> :"11:15:00"
-#USER INPUT# -> :"q"
-#USER INPUT# -> :"e"
-#USER INPUT# -> :"dlu"
-#USER INPUT# -> :"bhtrsa"
-#USER INPUT# -> :"nsaa"
-#USER INPUT# -> :"gotok"
-#USER INPUT# -> :"StartTime"
-#USER INPUT# -> :"11:15:00"
-#USER INPUT# -> :"p"
-#USER INPUT# -> :"q"
-#USER INPUT# -> :"e"
-#USER INPUT# -> :"dlu"
-#USER INPUT# -> :"bhtrsa"
-#USER INPUT# -> :"nsaa"
-#USER INPUT# -> :"gotok"
-#USER INPUT# -> :"StartTime"
-#USER INPUT# -> :"11:15:00"
-#USER INPUT# -> :"q"
-#USER INPUT# -> :"e"
-#USER INPUT# -> :"dlu"
-#USER INPUT# -> :"bhtrsa"
-#USER INPUT# -> :"nsaa"
-#USER INPUT# -> :"gotok"
-#USER INPUT# -> :"StartTime"
-#USER INPUT# -> :"11:15:00"
-#USER INPUT# -> :"q"
-#USER INPUT# -> :"e"
-#USER INPUT# -> :"dlu"
-#USER INPUT# -> :"bhtrsa"
-#USER INPUT# -> :"nsaa"
-#USER INPUT# -> :"gotok"
-#USER INPUT# -> :"StartTime"
-#USER INPUT# -> :"11:00:00"
-#USER INPUT# -> :"q"
-#USER INPUT# -> :"e"
-#USER INPUT# -> :"dlu"
-#USER INPUT# -> :"bhtrsa"
-#USER INPUT# -> :"nsaa"
-#USER INPUT# -> :"gotok"
-#USER INPUT# -> :"StartTime"
-#USER INPUT# -> :"11:00:00"
-#USER INPUT# -> :"p"
-#USER INPUT# -> :"m"
-#USER INPUT# -> :"12:00:00"
-#USER INPUT# -> :"6/18/2025"
-#USER INPUT# -> :"6/18/25"
-#USER INPUT# -> :"f"
-#USER INPUT# -> :"f"
-#USER INPUT# -> :"q"
-#USER INPUT# -> :"e"
-#USER INPUT# -> :"0.0.385"

radboy-0.0.385/radboy/__init__.py

@@ -1 +0,0 @@
-VERSION='0.0.385'