radboy 0.0.552__tar.gz → 0.0.553__tar.gz

{radboy-0.0.552 → radboy-0.0.553}/PKG-INFO

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

@@ -1,9 +1,10 @@
 #USER INPUT# -> :"hl"
-#USER INPUT# -> :"lsdrg"
-#USER INPUT# -> :""
-#USER INPUT# -> :""
+#USER INPUT# -> :"lsfd"
+#USER INPUT# -> :"n"
 #USER INPUT# -> :""
+#USER INPUT# -> :"lsdrg"
+#USER INPUT# -> :"n"
 #USER INPUT# -> :""
 #USER INPUT# -> :"q"
 #USER INPUT# -> :"e"
-#USER INPUT# -> :"0.0.552"
+#USER INPUT# -> :"0.0.553"

{radboy-0.0.552 → radboy-0.0.553}/pyproject.toml

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

{radboy-0.0.552 → radboy-0.0.553}/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")
@@ -601,10 +601,37 @@ class HealthLogUi:
 									dummy[i.DrugConsumed].DrugQtyConsumedUnitName=f.units
 								except Exception as e:
 									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:
@@ -727,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'],
@@ -788,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-0.0.553/radboy/__init__.py

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

{radboy-0.0.552 → radboy-0.0.553}/radboy.egg-info/PKG-INFO

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

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

radboy-0.0.552/radboy/__init__.py

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