radboy 0.0.548__py3-none-any.whl → 0.0.550__py3-none-any.whl

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/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/__init__.py

@@ -1 +1 @@
-VERSION='0.0.548'
+VERSION='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.dist-info → radboy-0.0.550.dist-info}/METADATA

@@ -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.dist-info → radboy-0.0.550.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=Lt2reA6xchq3U7Y08DvkrHboZ25i1ts7X2E9gSIwcVg,41101
 radboy/Run.py,sha256=JUoCTHnzQBv7n8PB2_i93ANdAC_iW__RkAge8esCnk4,76
-radboy/__init__.py,sha256=8jLXIl3s2jzZtRPRSTQUrWq3V3oh8n97Q2-j6TsuGw8,17
+radboy/__init__.py,sha256=Uo0ml8ON2c3PWo3XJ2QFVH1x9bFF1N5J1QCKP8rn-88,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
@@ -209,10 +209,10 @@ 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=OK4NPcQbIUJHeyJ1H6kWjspkcL_V5n79rUNEWYkGxfQ,34172
+radboy/HealthLog/HealthLog.py,sha256=yiebZ60BC69NY3zpaYOHHCqKXqVQ8P3g8hknGseHyL0,35512
 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=KxkqwBgsOZ5rRRIWtwkq8Y0yd-fJcPOa4A2F8AV4diI,53286
+radboy/HealthLog/__pycache__/HealthLog.cpython-313.pyc,sha256=5djdCx7nxK0Ks0S5XBRd9gE3PEA1KhW-CPXLLDaLOLE,55402
 radboy/HealthLog/__pycache__/__init__.cpython-312.pyc,sha256=yZrYKBk31pGSjCRqmqzpX409iw-muC1zsNO2ObqkGlY,272
 radboy/HealthLog/__pycache__/__init__.cpython-313.pyc,sha256=cqdZbEJKq9XVoVqDAwsW0pwwBBGSerJNWGlST3YVR3g,151
 radboy/InListRestore/ILR.py,sha256=s8fbbHLKQSVJX1VaeyGE-vdIUGBEbOPX29kRIG2j2WY,16847
@@ -341,7 +341,7 @@ radboy/SystemSettings/__pycache__/__init__.cpython-312.pyc,sha256=aIzp4Po0t8EhSA
 radboy/SystemSettings/__pycache__/__init__.cpython-313.pyc,sha256=QFDuoidxMWsGVLsy5lN-rDs6TP8nKJ4yyCyiamNOhwo,156
 radboy/TasksMode/ReFormula.py,sha256=REDRJYub-OEOE6g14oRQOLOQwv8pHqVJy4NQk3CCM90,2255
 radboy/TasksMode/SetEntryNEU.py,sha256=Gu0Z677tjpc7-9AQtLbIr7yzPx6ZJXGK33lOIgU0IRM,17432
-radboy/TasksMode/Tasks.py,sha256=VsQOT0FMSvY5UOVKoCUMVT3uK049NgSgxvQGQNcYJn8,340468
+radboy/TasksMode/Tasks.py,sha256=me0qkVVgzjdhUbGQ0CAU_fR1MhzHaHGh6Ll4s5slgMU,340600
 radboy/TasksMode/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 radboy/TasksMode/__pycache__/ReFormula.cpython-311.pyc,sha256=QEG3PwVw-8HTd_Mf9XbVcxU56F1fC9yBqWXYPLC39DU,4865
 radboy/TasksMode/__pycache__/ReFormula.cpython-312.pyc,sha256=aX7BWm2PPjCTnxsbGUitR-2h9hq4AjaBiHMrUXvIl0Y,3967
@@ -350,7 +350,7 @@ radboy/TasksMode/__pycache__/SetEntryNEU.cpython-312.pyc,sha256=pCdFj61aPKkHL6Sv
 radboy/TasksMode/__pycache__/SetEntryNEU.cpython-313.pyc,sha256=UExwr8dN2STFEDE5t_YnQFMUX-wGv7JH10I1OyBDRtM,20212
 radboy/TasksMode/__pycache__/Tasks.cpython-311.pyc,sha256=6QOTJnLiXSKdF81hkhy3vyrz49PPhS20s5_0X52g3Hw,131120
 radboy/TasksMode/__pycache__/Tasks.cpython-312.pyc,sha256=hyJwdaYaaRLdcrNxgg36diJ5iijX5_3I0UAORsj-6LU,310295
-radboy/TasksMode/__pycache__/Tasks.cpython-313.pyc,sha256=FQZb2bnNeOwp2lJQ9475NTDO7bIqDX0wuRF0Jfmwiec,412609
+radboy/TasksMode/__pycache__/Tasks.cpython-313.pyc,sha256=zgkkNv2h0YE7l3Sgb3039ESkwrZ_hAG5Lr7Klbm8D_g,412809
 radboy/TasksMode/__pycache__/__init__.cpython-311.pyc,sha256=PKV1JbihEacm639b53bZozRQvcllSkjGP3q8STVMxF4,234
 radboy/TasksMode/__pycache__/__init__.cpython-312.pyc,sha256=ERgnEvRMiGSecWp1BpNzLdSq_SdKw7GvFWUvUM7bLVw,272
 radboy/TasksMode/__pycache__/__init__.cpython-313.pyc,sha256=lvsTxukyvGKB3C0rdF9dQi_bvVh6ceDVINfwcuIsd0s,151
@@ -397,7 +397,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=dJFADgfGgiqxQDfWTiDkz7W7NP1BUKnj8VSlD6wj5rE,165
+radboy/__pycache__/__init__.cpython-313.pyc,sha256=JN7XVSYpMEm6MhCXLwNc5sqUwalfEbFKvEC-N2WOElQ,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
@@ -407,7 +407,7 @@ radboy/__pycache__/t.cpython-311.pyc,sha256=bVszNkmfiyoNLd0WUc8aBJc2geGseW4O28cq
 radboy/__pycache__/te.cpython-311.pyc,sha256=vI8eNUE5VVrfCQvnrJ7WuWpoKcLz-vVK3ifdUZ4UNhk,592
 radboy/__pycache__/x.cpython-311.pyc,sha256=3jIvWoO5y5WqrL_hRmXNK8O0vO7DwJ4gufjm2b0V7VI,1963
 radboy/preloader/__init__.py,sha256=m7oQ0G4gRuB1c2FvrDJ51-euecvuSz5t6uAWkMOXAAg,895
-radboy/preloader/preloader.py,sha256=hDBCTDfEcpnm14AK7VAHU6jTntoyk9ODMX69ERRPMnM,3816
+radboy/preloader/preloader.py,sha256=CioNJg9jiUI4kJtmq9pZAlSscj2tMBe1e8n35PzfiBs,3827
 radboy/setCode/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 radboy/setCode/setCode.py,sha256=8UOf4okbx-Zane99odeoLAS_lfIt8pIaFomN7EtnnVA,5202
 radboy/setCode/__pycache__/__init__.cpython-311.pyc,sha256=cJuP5rve6Wn7ZO789tixyOlyrHZQWsBxDn9oZGoG5WE,232
@@ -424,7 +424,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.548.dist-info/METADATA,sha256=O2Ee5v32wcxMNFowIqvJhks_RzabluFBvftwq-Prku0,1615
-radboy-0.0.548.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-radboy-0.0.548.dist-info/top_level.txt,sha256=mlM0RWMUxGo1YHnlLmYrHOgGdK4XNRpr7nMFD5lR56c,7
-radboy-0.0.548.dist-info/RECORD,,
+radboy-0.0.550.dist-info/METADATA,sha256=9FQaDQX1miON3qP6X7h_oSRdxjkC9vccbEQvSYWDMJc,1615
+radboy-0.0.550.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+radboy-0.0.550.dist-info/top_level.txt,sha256=mlM0RWMUxGo1YHnlLmYrHOgGdK4XNRpr7nMFD5lR56c,7
+radboy-0.0.550.dist-info/RECORD,,