radboy 0.0.721__tar.gz → 0.0.722__tar.gz

{radboy-0.0.721 → radboy-0.0.722}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: radboy
-Version: 0.0.721
+Version: 0.0.722
 Summary: A Retail Calculator for Android/Linux
 Author: Carl Joseph Hirner III
 Author-email: Carl Hirner III <k.j.hirner.wisdom@gmail.com>

radboy-0.0.722/STDOUT.TXT

@@ -0,0 +1,7 @@
+#USER INPUT# -> :"hl"
+#USER INPUT# -> :"sch t"
+#USER INPUT# -> :"labor"
+#USER INPUT# -> :"ff"
+#USER INPUT# -> :"q"
+#USER INPUT# -> :"e"
+#USER INPUT# -> :"0.0.722"

{radboy-0.0.721 → radboy-0.0.722}/pyproject.toml

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

{radboy-0.0.721 → radboy-0.0.722}/radboy/HealthLog/HealthLog.py

@@ -57,6 +57,104 @@ class HealthLogUi:
 					session.refresh(hl)
 					print(std_colorize(f"Updated {hl}",0,1))
 
+	def search(self):
+		with localcontext() as CTX:
+			with Session(ENGINE) as session:
+				fields={
+				i.name:{
+				'default':None,
+				'type':str(i.type).lower()
+				} for i in HealthLog.__table__.columns
+				}
+				fd=FormBuilder(data=fields,passThruText="Your Search Terms `showkeys` and `gotoi` are useful.")
+				if fd is None:
+					return
+				FD={}
+				for i in fd:
+					if fd[i] is not None:
+						FD[i]=fd[i]
+				fd=FD
+				filte=[]
+				for i in fd:
+					if isinstance(fd[i],str):
+						filte.append(getattr(HealthLog,i).icontains(fd[i]))
+					else:
+						filte.append(getattr(HealthLog,i)==fd[i])
+				query=session.query(HealthLog).filter(and_(*filte))
+				ordered=orderQuery(query,HealthLog.DTOE)
+				lo={
+				'limit':{
+				'default':10,
+				'type':'integer',
+				},
+				'offset':{
+				'type':'integer',
+				'default':0,
+				}
+				}
+				lod=FormBuilder(data=lo,passThruText="Limit your results?")
+				if lod is None:
+					return
+
+				loq=limitOffset(query,lod['limit'],lod['offset'])
+				results=loq.all()
+				ct=len(results)
+				if len(results) < 1:
+					print("No Results!")
+					return
+				for num,i in enumerate(results):
+					view=[]
+					for x in i.__table__.columns:
+						if getattr(i,str(x.name)) not in [None]:
+							view.append(f'{Fore.green_3b}{Style.bold}{str(x.name)}{Fore.deep_sky_blue_1}={Fore.sea_green_2}{str(getattr(i,str(x.name)))}{Style.reset}')
+					msg=f"{'|'.join(view)}"
+					print(std_colorize(msg,num,ct))
+
+	def searchText(self):
+		filte=[]
+		with localcontext() as CTX:
+			with Session(ENGINE) as session:
+				query=session.query(HealthLog)
+				fields=[i for i in HealthLog.__table__.columns if str(i.type).lower() in ['string','varchar','char','text']]
+				
+				term=Control(func=FormBuilderMkText,ptext="What are you searching?",helpText="just text is searched.",data="string")
+				if term in [None,'NaN','d']:
+					return
+				else:
+					filte=[]
+					for i in fields:
+						filte.append((getattr(HealthLog,i.name).icontains(term)))
+
+				query=session.query(HealthLog).filter(or_(*filte))
+				ordered=orderQuery(query,HealthLog.DTOE)
+				lo={
+				'limit':{
+				'default':10,
+				'type':'integer',
+				},
+				'offset':{
+				'type':'integer',
+				'default':0,
+				}
+				}
+				lod=FormBuilder(data=lo,passThruText="Limit your results?")
+				if lod is None:
+					return
+
+				loq=limitOffset(query,lod['limit'],lod['offset'])
+				results=loq.all()
+				ct=len(results)
+				if len(results) < 1:
+					print("No Results!")
+					return
+				for num,i in enumerate(results):
+					view=[]
+					for x in i.__table__.columns:
+						if getattr(i,str(x.name)) not in [None]:
+							view.append(f'{Fore.green_3b}{Style.bold}{str(x.name)}{Fore.deep_sky_blue_1}={Fore.sea_green_2}{str(getattr(i,str(x.name)))}{Style.reset}')
+					msg=f"{'|'.join(view)}"
+					print(std_colorize(msg,num,ct))
+
 	def new_health_log(self):
 		with Session(ENGINE) as session:
 			hl=HealthLog()
@@ -919,6 +1017,16 @@ class HealthLogUi:
 			'exec':lambda self=self:self.export_log_field(fields=['BloodSugar','BloodSugarUnitName','LongActingInsulinName','LongActingInsulinTaken','LongActingInsulinUnitName','ShortActingInsulinName','ShortActingInsulinTaken','ShortActingInsulinUnitName','HeartRate','HeartRateUnitName','DrugConsumed','DrugQtyConsumed','DrugQtyConsumedUnitName','CarboHydrateIntake','CarboHydrateIntakeUnitName','Comments',],not_none=['Comments',])
 			},
 			str(uuid1()):{
+			'cmds':generate_cmds(startcmd=['sch','search'],endCmd=['specific','spec','spcfc','finer']),
+			'desc':'search with formbuilder with just equals/icontains',
+			'exec':lambda self=self:self.search()
+			},
+			str(uuid1()):{
+			'cmds':generate_cmds(startcmd=['sch','search'],endCmd=['text','txt','str','t']),
+			'desc':'search with text only fields by term',
+			'exec':lambda self=self:self.searchText()
+			},
+			str(uuid1()):{
 			'cmds':['ordered and recieved','oar','ordered and rxd','ordered & rxd','ordered & recieved','o&r'],
 			'desc':'ordered and recieved journal',
 			'exec':lambda self=self:OrderAndRxdUi()

radboy-0.0.722/radboy/__init__.py

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

{radboy-0.0.721 → radboy-0.0.722}/radboy.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: radboy
-Version: 0.0.721
+Version: 0.0.722
 Summary: A Retail Calculator for Android/Linux
 Author: Carl Joseph Hirner III
 Author-email: Carl Hirner III <k.j.hirner.wisdom@gmail.com>

{radboy-0.0.721 → radboy-0.0.722}/setup.py

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

radboy-0.0.721/STDOUT.TXT

@@ -1,33 +0,0 @@
-#USER INPUT# -> :"t"
-#USER INPUT# -> :"fmlau"
-#USER INPUT# -> :"31"
-#USER INPUT# -> :"6,9,1,2,4,5,8,3,7"
-#USER INPUT# -> :"5,3,8,9,6,7,1,2,0"
-#USER INPUT# -> :"4,2,7,8,0,0,0,0,4"
-#USER INPUT# -> :"0,6,0,0,9,0,0,7,0"
-#USER INPUT# -> :"0,0,0,6,7,4,0,0,0"
-#USER INPUT# -> :"0,4,0,0,1,0,0,9,0"
-#USER INPUT# -> :"8,0,0,0,0,3,2,4,0"
-#USER INPUT# -> :"0,0,5,0,2,9,0,8,0"
-#USER INPUT# -> :"4,0,0,1,0,0,7,0,0"
-#USER INPUT# -> :"ff"
-#USER INPUT# -> :"b"
-#USER INPUT# -> :"b"
-#USER INPUT# -> :"0"
-#USER INPUT# -> :"31"
-#USER INPUT# -> :"b"
-#USER INPUT# -> :"n"
-#USER INPUT# -> :"31"
-#USER INPUT# -> :"6,9,1,2,4,5,8,3,7"
-#USER INPUT# -> :"5,3,8,9,6,7,1,2,0"
-#USER INPUT# -> :"4,2,7,8,0,0,0,0,4"
-#USER INPUT# -> :"0,6,0,0,9,0,0,7,0"
-#USER INPUT# -> :"0,0,0,6,7,4,0,0,0"
-#USER INPUT# -> :"0,4,0,0,1,0,0,9,0"
-#USER INPUT# -> :"8,0,0,0,0,3,2,4,0"
-#USER INPUT# -> :"0,0,5,0,2,9,0,8,0"
-#USER INPUT# -> :"4,0,0,1,0,0,7,0,0"
-#USER INPUT# -> :"ff"
-#USER INPUT# -> :"q"
-#USER INPUT# -> :"e"
-#USER INPUT# -> :"0.0.721"

radboy-0.0.721/radboy/__init__.py

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