radboy 0.0.548__tar.gz → 0.0.550__tar.gz

{radboy-0.0.548 → radboy-0.0.550}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: radboy
-Version: 0.0.548
+Version: 0.0.550
 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.550/STDOUT.TXT

@@ -0,0 +1,9 @@
+#USER INPUT# -> :"hl"
+#USER INPUT# -> :"lsdrg"
+#USER INPUT# -> :""
+#USER INPUT# -> :""
+#USER INPUT# -> :""
+#USER INPUT# -> :""
+#USER INPUT# -> :"q"
+#USER INPUT# -> :"e"
+#USER INPUT# -> :"0.0.550"

{radboy-0.0.548 → radboy-0.0.550}/pyproject.toml

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

{radboy-0.0.548 → radboy-0.0.550}/radboy/HealthLog/HealthLog.py

@@ -26,6 +26,7 @@ import plotext as plt
 import pint_pandas
 import radboy.DB.ExerciseTracker as ET
 import zipfile
+from copy import copy
 
 class HealthLogUi:
 	def edit_hlid(self):
@@ -532,7 +533,8 @@ class HealthLogUi:
 				return True
 
 
-	def showAllField(self,fields=[],not_none=[]):
+	def showAllField(self,fields=[],not_none=[],total_drg=True,total_fd=False):
+		unit_registry=pint.UnitRegistry()
 		try:
 			useDateRange=Prompt.__init2__(None,func=FormBuilderMkText,ptext="use a date range?",helpText="yes or no",data="boolean")
 			if useDateRange is None:
@@ -581,9 +583,26 @@ class HealthLogUi:
 					if x is None:
 						return
 				
+				if total_drg or total_fd:
+					dummy={}
+
 				results=results.all()
 				ct=len(results)
 				for num,i in enumerate(results):
+					if total_drg or total_fd:
+						if total_drg:
+							if i.DrugConsumed in dummy:
+								#normalize the values first
+								old=unit_registry.Quantity(dummy[i.DrugConsumed].DrugQtyConsumed,dummy[i.DrugConsumed].DrugQtyConsumedUnitName)
+								new=unit_registry.Quantity(i.DrugQtyConsumed,i.DrugQtyConsumedUnitName)
+								f=old+new
+								dummy[i.DrugConsumed].DrugQtyConsumed=f.magnitude
+								dummy[i.DrugConsumed].DrugQtyConsumedUnitName=f.units
+							else:
+								dummy[i.DrugConsumed]=copy(i)
+						if total_fd:
+							pass
+							
 					view=[]
 					for x in fields:
 						if getattr(i,str(x.name)) == None:
@@ -595,6 +614,22 @@ class HealthLogUi:
 						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)
+				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):
+						i=dummy[i]
+						for x in fields:
+							if getattr(i,str(x.name)) == None:
+								color=f"{Fore.grey_15}"
+								color_date=f"{Fore.grey_15}"
+							else:
+								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)
 		except Exception as e:
 			print(e)
 

{radboy-0.0.548 → radboy-0.0.550}/radboy/TasksMode/Tasks.py

@@ -425,7 +425,8 @@ class Formulae:
                         'exec':self.findAndUse2
                     }
                 for num,i in enumerate(self.options):
-                    self.options[i]['cmds'].append(str(num))
+                    if str(i) not in self.options[i]['cmds']:
+                        self.options[i]['cmds'].append(str(num))
                 options=copy(self.options)
 
                 while True:                
@@ -806,7 +807,8 @@ class Formulae:
                         'exec':self.findAndUse2
                     }
                 for num,i in enumerate(self.options):
-                    self.options[i]['cmds'].append(str(num))
+                    if str(i) not in self.options[i]['cmds']:
+                        self.options[i]['cmds'].append(str(num))
                 options=copy(self.options)
                 while True:                
                     helpText=[]

radboy-0.0.550/radboy/__init__.py

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

{radboy-0.0.548 → radboy-0.0.550}/radboy/preloader/preloader.py

@@ -104,8 +104,8 @@ preloader={
 						'exec':volume_pint
 					},
 	f'{uuid1()}':{
-						'cmds':['inductance pint',],
-						'desc':f'find the inductance using pint to normalize the values for inductance=relative_permeability*(((turns**2)*area)/length)*1.26e-6',
+						'cmds':['self-inductance pint',],
+						'desc':f'find self-inductance using pint to normalize the values for self-inductance=relative_permeability*(((turns**2)*area)/length)*1.26e-6',
 						'exec':inductance_pint
 					},
 }

{radboy-0.0.548 → radboy-0.0.550}/radboy.egg-info/PKG-INFO

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

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

radboy-0.0.548/STDOUT.TXT

@@ -1,12 +0,0 @@
-#USER INPUT# -> :"t"
-#USER INPUT# -> :"fmlau"
-#USER INPUT# -> :"5"
-#USER INPUT# -> :"1"
-#USER INPUT# -> :"90"
-#USER INPUT# -> :"0.00152"
-#USER INPUT# -> :"0.042"
-#USER INPUT# -> :"y"
-#USER INPUT# -> :"3"
-#USER INPUT# -> :"q"
-#USER INPUT# -> :"e"
-#USER INPUT# -> :"0.0.548"

radboy-0.0.548/radboy/__init__.py

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