radboy 0.0.551__py3-none-any.whl → 0.0.553__py3-none-any.whl

radboy/HealthLog/HealthLog.py

@@ -533,7 +533,7 @@ class HealthLogUi:
 				return True
 
 
-	def showAllField(self,fields=[],not_none=[],total_drg=True,total_fd=False):
+	def showAllField(self,fields=[],not_none=[],total_drg=True,total_fd=True):
 		unit_registry=pint.UnitRegistry()
 		try:
 			useDateRange=Prompt.__init2__(None,func=FormBuilderMkText,ptext="use a date range?",helpText="yes or no",data="boolean")
@@ -600,11 +600,38 @@ class HealthLogUi:
 									dummy[i.DrugConsumed].DrugQtyConsumed=f.magnitude
 									dummy[i.DrugConsumed].DrugQtyConsumedUnitName=f.units
 								except Exception as e:
-									print(e,"processing will not include this value")
+									print(e,"processing will not include this")
+									print(f"{Back.grey_11}{i}{Style.reset}")
 							else:
 								dummy[i.DrugConsumed]=copy(i)
 						if total_fd:
-							pass
+							if 'total_fd' in dummy:
+								for x in fields:
+									includes=[
+											"CarboHydrateIntake",
+										    "ProtienIntake",
+										    "FiberIntake",
+										    "TotalFat",
+										    "SodiumIntake",
+										    "CholesterolIntake",
+											]
+									if x.name not in includes:
+										continue
+									if getattr(dummy['total_fd'],x.name) is None:
+										setattr(dummy['total_fd'],x.name,0)
+									else:
+										try:
+											uname=x.name+"UnitName"
+											old=unit_registry.Quantity(getattr(dummy['total_fd'],x.name),getattr(dummy['total_fd'],uname))
+											new=unit_registry.Quantity(getattr(i,x.name),getattr(i,uname))
+											f=old+new
+											setattr(dummy['total_fd'],x.name,f.magnitude)
+											setattr(dummy['total_fd'],uname,f.units)
+										except Exception as e:
+											print(e,"processing will not include this value")
+											print(f"{Back.grey_11}{i}{Style.reset}")
+							else:
+								dummy['total_fd']=copy(i)
 							
 					view=[]
 					for x in fields:
@@ -620,8 +647,9 @@ class HealthLogUi:
 				if total_drg or total_fd:
 					print(f"{Fore.orange_red_1}Broken into Totals{Style.reset}")
 					ct=len(dummy)
-					view=[]
+					
 					for num,i in enumerate(dummy):
+						view=[]
 						i=dummy[i]
 						for x in fields:
 							if getattr(i,str(x.name)) == None:
@@ -631,8 +659,8 @@ class HealthLogUi:
 								color=f"{Fore.sea_green_2}"
 								color_date=f"{Fore.green_3b}"
 							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)
+						msg=f"{Fore.light_green}{num}{Fore.light_yellow}/{num+1} of {Fore.light_red}{ct} ->{'|'.join(view)}"
+						print(msg)
 		except Exception as e:
 			print(e)
 
@@ -726,7 +754,7 @@ class HealthLogUi:
 			'lsdrug':{
 			'cmds':['ls drug','ls dg','list drug','lsdrug','lsdrg'],
 			'desc':'list drug data',
-			'exec':lambda self=self:self.showAllField(fields=['EntryBarcode','EntryName','DrugConsumed','DrugQtyConsumed','DrugQtyConsumedUnitName'],not_none=['DrugQtyConsumed',])
+			'exec':lambda self=self:self.showAllField(total_fd=False,total_drg=True,fields=['EntryBarcode','EntryName','DrugConsumed','DrugQtyConsumed','DrugQtyConsumedUnitName'],not_none=['DrugQtyConsumed',])
 			},
 			'xpt drug':{
 			'cmds':['xpt drug','xpt dg','export drug','xptdrug','xptdrg'],
@@ -787,7 +815,7 @@ class HealthLogUi:
 			'ls consumed':{
 				'cmds':['lsfd','ls fd','ls food','lfd','ls fuel','ls fl','lfl'],
 				'desc':'list food',
-				'exec':lambda self=self:self.showAllField(
+				'exec':lambda self=self:self.showAllField(total_fd=True,total_drg=False,
 					fields=["EntryBarcode",
 								"EntryName",
 								"CarboHydrateIntake",

radboy/__init__.py

@@ -1 +1 @@
-VERSION='0.0.551'
+VERSION='0.0.553'

{radboy-0.0.551.dist-info → radboy-0.0.553.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: radboy
-Version: 0.0.551
+Version: 0.0.553
 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.551.dist-info → radboy-0.0.553.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=Lt2reA6xchq3U7Y08DvkrHboZ25i1ts7X2E9gSIwcVg,41101
 radboy/Run.py,sha256=JUoCTHnzQBv7n8PB2_i93ANdAC_iW__RkAge8esCnk4,76
-radboy/__init__.py,sha256=PIJbYl6wnTn9jqaMth8hb0BsRaUmW0SLQ5SLb34KqGA,17
+radboy/__init__.py,sha256=25cPvUc0ze2IOhrRLsgwIILqGCvaN64eH9-NBDJ8xCI,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
@@ -209,10 +209,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=GzHAFTPk_DfLrh4zS_S8rSa3hVLOPRIOLJmSssYgNIs,35621
+radboy/HealthLog/HealthLog.py,sha256=gkG3PnbVDOZDJhPbnT8YhJ6YPVmOHpvKUOTLcAlQtKU,36718
 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=5djdCx7nxK0Ks0S5XBRd9gE3PEA1KhW-CPXLLDaLOLE,55402
+radboy/HealthLog/__pycache__/HealthLog.cpython-313.pyc,sha256=QLMHj7pQb9_uk1ov7BYYcn9Mf0l-ySFBh8UpQAMwD5c,57024
 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
@@ -397,7 +397,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=Fxe_JraZXdPlwX528vc-noCVEEPh-sy-Nk9OAkON5nQ,165
+radboy/__pycache__/__init__.cpython-313.pyc,sha256=5NziDqmJdgwzFXPSZWiOGOCobFnI7_UWNNE9v8jH_qI,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
@@ -424,7 +424,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.551.dist-info/METADATA,sha256=k-TdMX3kROrpdLk7p8gYk9i2aGFLw7Tn_dUgcttdCIc,1615
-radboy-0.0.551.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-radboy-0.0.551.dist-info/top_level.txt,sha256=mlM0RWMUxGo1YHnlLmYrHOgGdK4XNRpr7nMFD5lR56c,7
-radboy-0.0.551.dist-info/RECORD,,
+radboy-0.0.553.dist-info/METADATA,sha256=vPxv2-uATR9P1PzJhSivUUGQAsHeoDPsCsWVkJeiL2M,1615
+radboy-0.0.553.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+radboy-0.0.553.dist-info/top_level.txt,sha256=mlM0RWMUxGo1YHnlLmYrHOgGdK4XNRpr7nMFD5lR56c,7
+radboy-0.0.553.dist-info/RECORD,,