radboy 0.0.721__py3-none-any.whl → 0.0.723__py3-none-any.whl

radboy/HealthLog/HealthLog.py

@@ -57,6 +57,127 @@ class HealthLogUi:
 					session.refresh(hl)
 					print(std_colorize(f"Updated {hl}",0,1))
 
+	def search(self):
+		page=Prompt.__init2__(None,func=FormBuilderMkText,ptext="page?",helpText="page/display one at a time y/n",data="boolean")
+		if page in ['None',]:
+			return None
+		elif page in [True,'d']:
+			page=True
+		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))
+					if page:
+						n=Prompt.__init2__(None,func=FormBuilderMkText,ptext="Next?",helpText="next, anything else is goes next, just b/q that diff",data="boolean")
+						if n in ['None',]:
+							return None
+						else:
+							continue
+
+
+	def searchText(self):
+		page=Prompt.__init2__(None,func=FormBuilderMkText,ptext="page?",helpText="page/display one at a time y/n",data="boolean")
+		if page in ['None',]:
+			return None
+		elif page in [True,'d']:
+			page=True
+		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))
+					if page:
+						n=Prompt.__init2__(None,func=FormBuilderMkText,ptext="Next?",helpText="next, anything else is goes next, just b/q that diff",data="boolean")
+						if n in ['None',]:
+							return None
+						else:
+							continue
+
 	def new_health_log(self):
 		with Session(ENGINE) as session:
 			hl=HealthLog()
@@ -572,6 +693,11 @@ class HealthLogUi:
 
 
 	def showAllField(self,fields=[],not_none=[],total_drg=False,total_fd=False):
+		page=Prompt.__init2__(None,func=FormBuilderMkText,ptext="page?",helpText="page/display one at a time y/n",data="boolean")
+		if page in ['None',]:
+			return None
+		elif page in [True,'d']:
+			page=True
 		unit_registry=pint.UnitRegistry()
 		try:
 			useDateRange=Prompt.__init2__(None,func=FormBuilderMkText,ptext="use a date range?",helpText="yes or no",data="boolean")
@@ -682,6 +808,12 @@ class HealthLogUi:
 						view.append(f'{color_date}{Style.bold}{str(x.name)}{Fore.deep_sky_blue_1}={color}{str(getattr(i,str(x.name)))}{Style.reset}')
 					msg=f"{Fore.light_green}{num}{Fore.light_yellow}/{num+1} of {Fore.light_red}{ct} ->{'|'.join(view)}"
 					print(msg)
+					if page:
+						n=Prompt.__init2__(None,func=FormBuilderMkText,ptext="Next?",helpText="next, anything else is goes next, just b/q that diff",data="boolean")
+						if n in ['None',]:
+							return None
+						else:
+							continue
 				if total_drg or total_fd:
 					print(f"{Fore.orange_red_1}Broken into Totals{Style.reset}")
 					ct=len(dummy)
@@ -699,6 +831,12 @@ class HealthLogUi:
 							view.append(f'{color_date}{Style.bold}{str(x.name)}{Fore.deep_sky_blue_1}={color}{str(getattr(i,str(x.name)))}{Style.reset}')
 						msg=f"{Fore.light_green}{num}{Fore.light_yellow}/{num+1} of {Fore.light_red}{ct} ->{'|'.join(view)}"
 						print(msg)
+						if page:
+							n=Prompt.__init2__(None,func=FormBuilderMkText,ptext="Next?",helpText="next, anything else is goes next, just b/q that diff",data="boolean")
+							if n in ['None',]:
+								return None
+							else:
+								continue
 		except Exception as e:
 			print(e)
 
@@ -919,6 +1057,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/__init__.py

@@ -1 +1 @@
-VERSION='0.0.721'
+VERSION='0.0.723'

{radboy-0.0.721.dist-info → radboy-0.0.723.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: radboy
-Version: 0.0.721
+Version: 0.0.723
 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.dist-info → radboy-0.0.723.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=KI7Jmf3MX0Zng_YUvcjVKN2siyUOhaMAHQGzpPuX8KQ,41373
 radboy/Run.py,sha256=JUoCTHnzQBv7n8PB2_i93ANdAC_iW__RkAge8esCnk4,76
-radboy/__init__.py,sha256=4O88k8mFIYsjET9qpt_POXkjh7WzptHdy5JBHPOlOmc,17
+radboy/__init__.py,sha256=KzukZQkFagF6sdE47blFXa_Jr96kiH_1YzOgExeX7G0,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
@@ -218,10 +218,10 @@ radboy/GeoTools/__pycache__/GeoClass.cpython-313.pyc,sha256=eZ6hpLKoic1XCb7BKKg-
 radboy/GeoTools/__pycache__/OSMClass.cpython-312.pyc,sha256=5RoT8_wiI8R7yb_B9FWIC7mALdGNoqyWtkzsjM2pbh0,40387
 radboy/GeoTools/__pycache__/__init__.cpython-312.pyc,sha256=Y7Xtrzwm44-xuY_4NK8aDjYfVmXIzUFWOyexJu9le8A,1238
 radboy/GeoTools/__pycache__/__init__.cpython-313.pyc,sha256=-bk9eEIxWZgHYZHtNJbrpubDRWkbdYNkGr5J7sVhyIE,1238
-radboy/HealthLog/HealthLog.py,sha256=kab1O3Pb_gwwCXzEHPUetq99cR-nf0ueSISqjL29Z4Y,37763
+radboy/HealthLog/HealthLog.py,sha256=a1G8tT9NNyEJ0m9SN4AfJ5xRBAr48EY7rmoaxVor65A,42547
 radboy/HealthLog/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 radboy/HealthLog/__pycache__/HealthLog.cpython-312.pyc,sha256=hTo4o7jo9L2yqPZgzuKUw_kon_PVcCuTRguELTuLrIo,27946
-radboy/HealthLog/__pycache__/HealthLog.cpython-313.pyc,sha256=OQ-NlyGzqyvleIjFdnm-lVEmIoM0B0nXDVV9gD_7EUE,58838
+radboy/HealthLog/__pycache__/HealthLog.cpython-313.pyc,sha256=tCVpsQ3q0fxzKrH2Ipj5pYC_h3F4uPedFZ0Jzyo4seg,67005
 radboy/HealthLog/__pycache__/__init__.cpython-312.pyc,sha256=yZrYKBk31pGSjCRqmqzpX409iw-muC1zsNO2ObqkGlY,272
 radboy/HealthLog/__pycache__/__init__.cpython-313.pyc,sha256=cqdZbEJKq9XVoVqDAwsW0pwwBBGSerJNWGlST3YVR3g,151
 radboy/InListRestore/ILR.py,sha256=s8fbbHLKQSVJX1VaeyGE-vdIUGBEbOPX29kRIG2j2WY,16847
@@ -406,7 +406,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=iVg1iZ45VdgL347nqfh5Lynu5SM02Sf3-4PQSqbxuBY,165
+radboy/__pycache__/__init__.cpython-313.pyc,sha256=tIH_ZLvJR0hxsMsnUCGIQ2rx4uD5pey0vrkYcbzSguE,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
@@ -434,7 +434,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.721.dist-info/METADATA,sha256=ErdHTnvy4AvvBnw2U7uaQEtZwKyr7YxwUoiSDtnzwcY,1891
-radboy-0.0.721.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-radboy-0.0.721.dist-info/top_level.txt,sha256=mlM0RWMUxGo1YHnlLmYrHOgGdK4XNRpr7nMFD5lR56c,7
-radboy-0.0.721.dist-info/RECORD,,
+radboy-0.0.723.dist-info/METADATA,sha256=ZJvP1s6QlOkvdRshU356X_cpye583EEoseTVbxJtxX0,1891
+radboy-0.0.723.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+radboy-0.0.723.dist-info/top_level.txt,sha256=mlM0RWMUxGo1YHnlLmYrHOgGdK4XNRpr7nMFD5lR56c,7
+radboy-0.0.723.dist-info/RECORD,,