radboy 0.0.734__py3-none-any.whl → 0.0.736__py3-none-any.whl

radboy/HealthLog/HealthLog.py

@@ -42,18 +42,7 @@ class HealthLogUi:
 					print(f"Long Acting Insulin : HowLongAgo({datetime.now()-lai.DTOE})")
 					num=0
 					view=[]
-					for x in lai.__table__.columns:
-						forbidden=[]
-						if getattr(lai,str(x.name)) is None:
-							try:
-								forbidden.append(str(x.name))
-								un="UnitName"
-								forbidden.append(f"{str(x.name)}{un}")
-							except Exception as e:
-								print(e)
-						if getattr(lai,str(x.name)) not in [None]:
-							if str(x.name) not in forbidden:
-								view.append(f'{Fore.green_3b}{Style.bold}{str(x.name)}{Fore.deep_sky_blue_1}={Fore.sea_green_2}{str(getattr(lai,str(x.name)))}{Style.reset}')
+					view.append(f"Name: '{lai.LongActingInsulinName}' Taken: {lai.LongActingInsulinTaken} Unit: {lai.LongActingInsulinUnitName} HLID: {lai.HLID} DTOE:{lai.DTOE}")
 					msg=f"{'|'.join(view)}"
 					print(std_colorize(msg,num,ct))
 				else:
@@ -65,9 +54,8 @@ class HealthLogUi:
 					print(f"Short Acting Insulin : HowLongAgo({datetime.now()-sai.DTOE})")
 					num=1
 					view=[]
-					for x in sai.__table__.columns:
-						if getattr(sai,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(sai,str(x.name)))}{Style.reset}')
+					view.append(f"Name: '{sai.ShortActingInsulinName}' Taken: {sai.ShortActingInsulinTaken} Unit: {sai.ShortActingInsulinUnitName} HLID: {sai.HLID} DTOE:{sai.DTOE}")
+
 					msg=f"{'|'.join(view)}"
 					print(std_colorize(msg,num,ct))
 				else:
@@ -81,7 +69,7 @@ class HealthLogUi:
 					view=[]
 					for x in last_carb.__table__.columns:
 						if getattr(last_carb,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(last_carb,str(x.name)))}{Style.reset}')
+							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))
 				else:
@@ -93,9 +81,7 @@ class HealthLogUi:
 					print(f"Last Drug Dose Taken : HowLongAgo({datetime.now()-drug.DTOE})")
 					num=3
 					view=[]
-					for x in drug.__table__.columns:
-						if getattr(drug,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(drug,str(x.name)))}{Style.reset}')
+					view.append(f"Name:{drug.EntryName} Barcode:{drug.EntryBarcode} Drug Name: '{drug.DrugConsumed}' Taken: {lai.DrugQtyConsumed} Unit: {drug.DrugQtyConsumedUnitName} HLID: {lai.HLID} DTOE:{lai.DTOE}")
 					msg=f"{'|'.join(view)}"
 					print(std_colorize(msg,num,ct))
 				else:
@@ -108,9 +94,8 @@ class HealthLogUi:
 					print(f"Blood Sugar : HowLongAgo({datetime.now()-glucose.DTOE})")
 					num=0
 					view=[]
-					for x in glucose.__table__.columns:
-						if getattr(glucose,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(glucose,str(x.name)))}{Style.reset}')
+					view.append(f"Blood Sugar/Glucose No. : {glucose.BloodSugar} Unit:{glucose.BloodSugarUnitName} HLID: {glucose.HLID} DTOE: {glucose.DTOE}")
+
 					msg=f"{'|'.join(view)}"
 					print(std_colorize(msg,num,ct))
 				else:
@@ -122,9 +107,8 @@ class HealthLogUi:
 					print(f"Height : HowLongAgo({datetime.now()-height.DTOE})")
 					num=0
 					view=[]
-					for x in height.__table__.columns:
-						if getattr(height,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(height,str(x.name)))}{Style.reset}')
+					view.append(f"Height : {height.Height} Unit:{height.HeightUnitName} HLID: {height.HLID} DTOE: {height.DTOE}")
+
 					msg=f"{'|'.join(view)}"
 					print(std_colorize(msg,num,ct))
 				else:
@@ -136,9 +120,7 @@ class HealthLogUi:
 					print(f"Weight : HowLongAgo({datetime.now()-weight.DTOE})")
 					num=0
 					view=[]
-					for x in weight.__table__.columns:
-						if getattr(weight,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(weight,str(x.name)))}{Style.reset}')
+					view.append(f"Weight : {weight.Weight} Unit:{weight.WeightUnitName} HLID: {weight.HLID} DTOE: {weight.DTOE}")
 					msg=f"{'|'.join(view)}"
 					print(std_colorize(msg,num,ct))
 				else:
@@ -150,9 +132,7 @@ class HealthLogUi:
 					print(f"Heart Rate : HowLongAgo({datetime.now()-heartRate.DTOE})")
 					num=0
 					view=[]
-					for x in heartRate.__table__.columns:
-						if getattr(heartRate,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(heartRate,str(x.name)))}{Style.reset}')
+					view.append(f"HeartRate : {heartRate.HeartRate} Unit:{heartRate.HeartRateUnitName} HLID: {heartRate.HLID} DTOE: {heartRate.DTOE}")
 					msg=f"{'|'.join(view)}"
 					print(std_colorize(msg,num,ct))
 				else:

radboy/__init__.py

@@ -1 +1 @@
-VERSION='0.0.734'
+VERSION='0.0.736'

{radboy-0.0.734.dist-info → radboy-0.0.736.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: radboy
-Version: 0.0.734
+Version: 0.0.736
 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.734.dist-info → radboy-0.0.736.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=uDvbVu638ZAh0PjFWOMpj0MjokVHfdzX9c_LnUEpQAo,17
+radboy/__init__.py,sha256=z2RY-YdATpZOrzAHtUf1QWTSSN8hJ4Vdg9_S1bbgv84,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,7 +218,7 @@ 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=vQcU-E8FTyDxkiXXXtsIzBKAM55BoxCEljemVjTZAHA,48039
+radboy/HealthLog/HealthLog.py,sha256=iXZYVUjsFYnLAKpTbTfqLUq41WV63WHCdWmZ1c0wI5Y,47113
 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=-doD_xALYWmcKT_tSVY_9LpWu4vdoWB169p07eWfxEo,72671
@@ -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=L50CEEq5axbp3CnnrOhHXEb2r2Qdkf2PYlm3eiZrs7k,165
+radboy/__pycache__/__init__.cpython-313.pyc,sha256=5Q5iSb6xxZXDIcetwd6d5lIad-WIWZhmo6EF1NPa0OE,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.734.dist-info/METADATA,sha256=u_jtxwuYLVi6TqD3e-8H7ebpeOUu2mcxLzlsChaIa4A,1891
-radboy-0.0.734.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-radboy-0.0.734.dist-info/top_level.txt,sha256=mlM0RWMUxGo1YHnlLmYrHOgGdK4XNRpr7nMFD5lR56c,7
-radboy-0.0.734.dist-info/RECORD,,
+radboy-0.0.736.dist-info/METADATA,sha256=-pEItrvSenN2LMyEbrYv6XlFs5gINSUiJ3-iHQ04mpM,1891
+radboy-0.0.736.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+radboy-0.0.736.dist-info/top_level.txt,sha256=mlM0RWMUxGo1YHnlLmYrHOgGdK4XNRpr7nMFD5lR56c,7
+radboy-0.0.736.dist-info/RECORD,,