radboy 0.0.381__tar.gz → 0.0.383__tar.gz

{radboy-0.0.381 → radboy-0.0.383}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: radboy
-Version: 0.0.381
+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.381 → radboy-0.0.383}/STDOUT.TXT

@@ -197,3 +197,35 @@
 #USER INPUT# -> :"0.0.379"
 #USER INPUT# -> :"0.0.380"
 #USER INPUT# -> :"0.0.381"
+#USER INPUT# -> :"dlu"
+#USER INPUT# -> :"bhtrsa"
+#USER INPUT# -> :"sbh"
+#USER INPUT# -> :"kelly"
+#USER INPUT# -> :"nbh"
+#USER INPUT# -> :"f"
+#USER INPUT# -> :"f"
+#USER INPUT# -> :"sbh"
+#USER INPUT# -> :"kelly"
+#USER INPUT# -> :"q"
+#USER INPUT# -> :"e"
+#USER INPUT# -> :"dlu"
+#USER INPUT# -> :"bhtrsa"
+#USER INPUT# -> :"sbh"
+#USER INPUT# -> :"kell"
+#USER INPUT# -> :"sb"
+#USER INPUT# -> :"sbh"
+#USER INPUT# -> :""
+#USER INPUT# -> :"q"
+#USER INPUT# -> :"e"
+#USER INPUT# -> :"dlu"
+#USER INPUT# -> :"bhtrsa"
+#USER INPUT# -> :"sbh"
+#USER INPUT# -> :""
+#USER INPUT# -> :"sbh"
+#USER INPUT# -> :"tr"
+#USER INPUT# -> :"ssaa"
+#USER INPUT# -> :""
+#USER INPUT# -> :"q"
+#USER INPUT# -> :"e"
+#USER INPUT# -> :"0.0.382"
+#USER INPUT# -> :"0.0.383"

{radboy-0.0.381 → radboy-0.0.383}/pyproject.toml

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

{radboy-0.0.381 → radboy-0.0.383}/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(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-0.0.383/radboy/__init__.py

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

{radboy-0.0.381 → radboy-0.0.383}/radboy.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: radboy
-Version: 0.0.381
+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.381 → radboy-0.0.383}/setup.py

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

radboy-0.0.381/radboy/__init__.py

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