radboy 0.0.734__tar.gz → 0.0.736__tar.gz

{radboy-0.0.734 → radboy-0.0.736}/PKG-INFO

@@ -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 → radboy-0.0.736}/STDOUT.TXT

@@ -11,3 +11,5 @@
 #USER INPUT# -> :"0.0.732"
 #USER INPUT# -> :"0.0.733"
 #USER INPUT# -> :"0.0.734"
+#USER INPUT# -> :"0.0.735"
+#USER INPUT# -> :"0.0.736"

{radboy-0.0.734 → radboy-0.0.736}/pyproject.toml

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

{radboy-0.0.734 → radboy-0.0.736}/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-0.0.736/radboy/__init__.py

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

{radboy-0.0.734 → radboy-0.0.736}/radboy.egg-info/PKG-INFO

@@ -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 → radboy-0.0.736}/setup.py

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

radboy-0.0.734/radboy/__init__.py

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