radboy 0.0.732__tar.gz → 0.0.734__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: radboy
-Version: 0.0.732
+Version: 0.0.734
 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.732 → radboy-0.0.734}/STDOUT.TXT

@@ -9,3 +9,5 @@
 #USER INPUT# -> :"0.0.730"
 #USER INPUT# -> :"0.0.731"
 #USER INPUT# -> :"0.0.732"
+#USER INPUT# -> :"0.0.733"
+#USER INPUT# -> :"0.0.734"

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

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

{radboy-0.0.732 → radboy-0.0.734}/radboy/HealthLog/HealthLog.py

@@ -39,12 +39,21 @@ class HealthLogUi:
 				lai=session.query(HealthLog).filter(and_(HealthLog.LongActingInsulinName!=None,HealthLog.LongActingInsulinTaken!=None))
 				lai=orderQuery(lai,HealthLog.DTOE,inverse=True).first()
 				if lai:
-					print("Long Acting Insulin")
+					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]:
-							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}')
+							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}')
 					msg=f"{'|'.join(view)}"
 					print(std_colorize(msg,num,ct))
 				else:
@@ -53,7 +62,7 @@ class HealthLogUi:
 				sai=session.query(HealthLog).filter(and_(HealthLog.ShortActingInsulinName!=None,HealthLog.ShortActingInsulinTaken!=None))
 				sai=orderQuery(sai,HealthLog.DTOE,inverse=True).first()
 				if sai:
-					print("Short Acting Insulin")
+					print(f"Short Acting Insulin : HowLongAgo({datetime.now()-sai.DTOE})")
 					num=1
 					view=[]
 					for x in sai.__table__.columns:
@@ -67,7 +76,7 @@ class HealthLogUi:
 				last_carb=session.query(HealthLog).filter(and_(HealthLog.CarboHydrateIntake!=None,HealthLog.EntryName!=None))
 				last_carb=orderQuery(last_carb,HealthLog.DTOE,inverse=True).first()
 				if last_carb:
-					print("CarboHydrateIntake")
+					print(f"CarboHydrateIntake : HowLongAgo({datetime.now()-last_carb.DTOE})")
 					num=2					
 					view=[]
 					for x in last_carb.__table__.columns:
@@ -81,7 +90,7 @@ class HealthLogUi:
 				drug=session.query(HealthLog).filter(HealthLog.DrugQtyConsumed!=None)
 				drug=orderQuery(drug,HealthLog.DTOE,inverse=True).first()
 				if drug:
-					print("Last Drug Dose Taken")
+					print(f"Last Drug Dose Taken : HowLongAgo({datetime.now()-drug.DTOE})")
 					num=3
 					view=[]
 					for x in drug.__table__.columns:
@@ -96,7 +105,7 @@ class HealthLogUi:
 				glucose=session.query(HealthLog).filter(and_(HealthLog.BloodSugar!=None,))
 				glucose=orderQuery(glucose,HealthLog.DTOE,inverse=True).first()
 				if glucose:
-					print("Blood Sugar")
+					print(f"Blood Sugar : HowLongAgo({datetime.now()-glucose.DTOE})")
 					num=0
 					view=[]
 					for x in glucose.__table__.columns:
@@ -110,7 +119,7 @@ class HealthLogUi:
 				height=session.query(HealthLog).filter(and_(HealthLog.Height!=None,))
 				height=orderQuery(height,HealthLog.DTOE,inverse=True).first()
 				if height:
-					print("Height")
+					print(f"Height : HowLongAgo({datetime.now()-height.DTOE})")
 					num=0
 					view=[]
 					for x in height.__table__.columns:
@@ -124,7 +133,7 @@ class HealthLogUi:
 				weight=session.query(HealthLog).filter(and_(HealthLog.Weight!=None,))
 				weight=orderQuery(weight,HealthLog.DTOE,inverse=True).first()
 				if weight:
-					print("Weight")
+					print(f"Weight : HowLongAgo({datetime.now()-weight.DTOE})")
 					num=0
 					view=[]
 					for x in weight.__table__.columns:
@@ -138,7 +147,7 @@ class HealthLogUi:
 				heartRate=session.query(HealthLog).filter(and_(HealthLog.HeartRate!=None,))
 				heartRate=orderQuery(heartRate,HealthLog.DTOE,inverse=True).first()
 				if heartRate:
-					print("Heart Rate")
+					print(f"Heart Rate : HowLongAgo({datetime.now()-heartRate.DTOE})")
 					num=0
 					view=[]
 					for x in heartRate.__table__.columns:

radboy-0.0.734/radboy/__init__.py

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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: radboy
-Version: 0.0.732
+Version: 0.0.734
 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.732 → radboy-0.0.734}/setup.py

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

radboy-0.0.732/radboy/__init__.py

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