radboy 0.0.379__tar.gz → 0.0.381__tar.gz

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

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

{radboy-0.0.379 → radboy-0.0.381}/STDOUT.TXT

@@ -195,3 +195,5 @@
 #USER INPUT# -> :"q"
 #USER INPUT# -> :"e"
 #USER INPUT# -> :"0.0.379"
+#USER INPUT# -> :"0.0.380"
+#USER INPUT# -> :"0.0.381"

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

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

{radboy-0.0.379 → radboy-0.0.381}/radboy/DayLog/BhTrSa/bhtrsaa.py

@@ -13,7 +13,7 @@ class BhTrSa_Gui:
 			q=[]
 			if stext != 'd':
 				for i in sfields:
-					q.append([or_(getattr(Scheduled_And_Appointments,i).icontains(stext)),and_(getattr(Scheduled_And_Appointments,i).icontains(stext))])
+					q.append([or_(getattr(Scheduled_And_Appointments,i).icontains(stext))])
 				squery=query.filter(*q)
 			else:
 				squery=query
@@ -22,31 +22,31 @@ class BhTrSa_Gui:
 			else:
 				sorted_query=squery.order_by(Scheduled_And_Appointments.DTOE.desc())
 
-		results=sorted_query.all()
-		ct=len(results)
-		htext=[]
-		if ct == 0:
-			print("No Results were found")
-			return
-		for num,i in enumerate(results):
-			htext.append(i.colorize(i,num,ct))
-		htext='\n'.join(htext)
-		print(htext)
-		if returnable:
-			while True:
-				try:
-					which=Prompt.__init2__(None,func=FormBuilderMkText,ptext="which index(es) to yield?",helpText=htext,data="list")
-					if which in [None,'d']:
-						return
-					for i in which:
-						try:
-							index=int(i)
-							yield results[index].saa_id
-						except Exception as e:
-							print(e)
-					break
-				except Exception as e:
-					print(e)
+			results=sorted_query.all()
+			ct=len(results)
+			htext=[]
+			if ct == 0:
+				print("No Results were found")
+				return
+			for num,i in enumerate(results):
+				htext.append(i.colorize(i,num,ct))
+			htext='\n'.join(htext)
+			print(htext)
+			if returnable:
+				while True:
+					try:
+						which=Prompt.__init2__(None,func=FormBuilderMkText,ptext="which index(es) to yield?",helpText=htext,data="list")
+						if which in [None,'d']:
+							return
+						for i in which:
+							try:
+								index=int(i)
+								yield results[index].saa_id
+							except Exception as e:
+								print(e)
+						break
+					except Exception as e:
+						print(e)
 
 	def search_business_hours(self,returnable=False):
 		stext=Prompt.__init2__(None,func=FormBuilderMkText,ptext="What are you looking for?",helpText="a textwise search",data="string")
@@ -60,8 +60,8 @@ class BhTrSa_Gui:
 			q=[]
 			if stext != 'd':
 				for i in sfields:
-					q.append([or_(getattr(BusinessHours,i).icontains(stext)),and_(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:	
@@ -69,31 +69,31 @@ class BhTrSa_Gui:
 			else:
 				sorted_query=squery.order_by(BusinessHours.DTOE.desc())
 
-		results=sorted_query.all()
-		ct=len(results)
-		htext=[]
-		if ct == 0:
-			print("No Results were found")
-			return
-		for num,i in enumerate(results):
-			htext.append(i.colorize(i,num,ct))
-		htext='\n'.join(htext)
-		print(htext)
-		if returnable:
-			while True:
-				try:
-					which=Prompt.__init2__(None,func=FormBuilderMkText,ptext="which index(es) to yield?",helpText=htext,data="list")
-					if which in [None,'d']:
-						return
-					for i in which:
-						try:
-							index=int(i)
-							yield results[index].bhid
-						except Exception as e:
-							print(e)
-					break
-				except Exception as e:
-					print(e)
+			results=sorted_query.all()
+			ct=len(results)
+			htext=[]
+			if ct == 0:
+				print("No Results were found")
+				return
+			for num,i in enumerate(results):
+				htext.append(i.colorize(i,num,ct))
+			htext='\n'.join(htext)
+			print(htext)
+			if returnable:
+				while True:
+					try:
+						which=Prompt.__init2__(None,func=FormBuilderMkText,ptext="which index(es) to yield?",helpText=htext,data="list")
+						if which in [None,'d']:
+							return
+						for i in which:
+							try:
+								index=int(i)
+								yield results[index].bhid
+							except Exception as e:
+								print(e)
+						break
+					except Exception as e:
+						print(e)
 
 	def search_taxrates(self,returnable=False):
 		stext=Prompt.__init2__(None,func=FormBuilderMkText,ptext="What are you looking for?",helpText="a textwise search",data="string")
@@ -107,7 +107,7 @@ class BhTrSa_Gui:
 			q=[]
 			if stext != 'd':
 				for i in sfields:
-					q.append([or_(getattr(TaxRates,i).icontains(stext)),and_(getattr(TaxRates,i).icontains(stext))])
+					q.append([or_(getattr(TaxRates,i).icontains(stext)),])
 				squery=query.filter(*q)
 			else:
 				squery=query
@@ -116,31 +116,31 @@ class BhTrSa_Gui:
 			else:
 				sorted_query=squery.order_by(TaxRates.DTOE.desc())
 
-		results=sorted_query.all()
-		ct=len(results)
-		htext=[]
-		if ct == 0:
-			print("No Results were found")
-			return
-		for num,i in enumerate(results):
-			htext.append(i.colorize(i,num,ct))
-		htext='\n'.join(htext)
-		print(htext)
-		if returnable:
-			while True:
-				try:
-					which=Prompt.__init2__(None,func=FormBuilderMkText,ptext="which index(es) to yield?",helpText=htext,data="list")
-					if which in [None,'d']:
-						return
-					for i in which:
-						try:
-							index=int(i)
-							yield results[index].trid
-						except Exception as e:
-							print(e)
-					break
-				except Exception as e:
-					print(e)
+			results=sorted_query.all()
+			ct=len(results)
+			htext=[]
+			if ct == 0:
+				print("No Results were found")
+				return
+			for num,i in enumerate(results):
+				htext.append(i.colorize(i,num,ct))
+			htext='\n'.join(htext)
+			print(htext)
+			if returnable:
+				while True:
+					try:
+						which=Prompt.__init2__(None,func=FormBuilderMkText,ptext="which index(es) to yield?",helpText=htext,data="list")
+						if which in [None,'d']:
+							return
+						for i in which:
+							try:
+								index=int(i)
+								yield results[index].trid
+							except Exception as e:
+								print(e)
+						break
+					except Exception as e:
+						print(e)
 
 	def edit_taxrates(self):
 		excludes=['trid','DTOE']

radboy-0.0.381/radboy/__init__.py

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

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

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

{radboy-0.0.379 → radboy-0.0.381}/setup.py

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

radboy-0.0.379/radboy/__init__.py

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