radboy 0.0.663__py3-none-any.whl → 0.0.665__py3-none-any.whl

radboy/TasksMode/Tasks.py

@@ -455,7 +455,7 @@ class Formulae:
                         'exec':self.findAndUse2
                     }
                 for num,i in enumerate(self.options):
-                    if str(i) not in self.options[i]['cmds']:
+                    if str(num) not in self.options[i]['cmds']:
                         self.options[i]['cmds'].append(str(num))
                 options=copy(self.options)
 

radboy/__init__.py

@@ -1 +1 @@
-VERSION='0.0.663'
+VERSION='0.0.665'

radboy/preloader/preloader.py

@@ -333,10 +333,6 @@ def lc_frequency():
 	frequency=1/(decc(2*math.pi)*decc(math.sqrt(farads*inductance),cf=20))
 	return unit_registry.Quantity(frequency,"hertz")
 
-
-
-
-
 def area_of_circle_diameter():
 	'''
 A = πr²
@@ -447,23 +443,23 @@ Here:
 						'exec':lambda: Taxable.general_taxable(None),
 					},
 					f'{uuid1()}':{
-						'cmds':['price * rate',],
+						'cmds':['price * rate = tax',],
 						'desc':f'multiply a price times its tax rate ; {Fore.orange_red_1}Add this value to the price for the {Fore.light_steel_blue}Total{Style.reset}',
 						'exec':lambda: price_by_tax(total=False),
 					},
 					f'{uuid1()}':{
-						'cmds':['( price + crv ) * rate',],
+						'cmds':['( price + crv ) * rate = tax',],
 						'desc':f'multiply a (price+crv) times its tax rate ; {Fore.orange_red_1}Add this value to the price for the {Fore.light_steel_blue}Total{Style.reset}',
 						'exec':lambda: price_plus_crv_by_tax(total=False),
 					},
 					f'{uuid1()}':{
-						'cmds':['price * rate',],
+						'cmds':['(price * rate) + price = total',],
 						'desc':f'multiply a price times its tax rate + price return the total',
 						'exec':lambda: price_by_tax(total=True),
 					},
 					f'{uuid1()}':{
-						'cmds':['( price + crv ) * rate',],
-						'desc':f'multiply a (price+crv) times its tax rate + (price+crv) and return the total',
+						'cmds':['( price + crv ) + (( price + crv ) * rate) = total',],
+						'desc':f'multiply a (price+crv) times its tax rate plus (price+crv) and return the total',
 						'exec':lambda: price_plus_crv_by_tax(total=True),
 					},
 					f'{uuid1()}':{

{radboy-0.0.663.dist-info → radboy-0.0.665.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: radboy
-Version: 0.0.663
+Version: 0.0.665
 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.663.dist-info → radboy-0.0.665.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=KI7Jmf3MX0Zng_YUvcjVKN2siyUOhaMAHQGzpPuX8KQ,41373
 radboy/Run.py,sha256=JUoCTHnzQBv7n8PB2_i93ANdAC_iW__RkAge8esCnk4,76
-radboy/__init__.py,sha256=4lz5Qu4mfHGH4JNb0e4vCCeTIA8hOE6oclaB2dCnaWg,17
+radboy/__init__.py,sha256=JaZTGxBN1dPK9Tb_gAAXRe-Ty1yPBxy1ZHo8zys44vk,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
@@ -346,7 +346,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=mkV9zAZe0lfpu_3coMuIILEzh6PgCNi7g9lJ4yDUpYM,20596
-radboy/TasksMode/Tasks.py,sha256=6i8c3qFzDghuLIGVZEv5qF-izvqQ0uvek4mkZHxrWfQ,355150
+radboy/TasksMode/Tasks.py,sha256=T-5htmLa912moGD5dfkYtvUYg84FZRNWjYU9OuP1NWk,355152
 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
@@ -355,7 +355,7 @@ radboy/TasksMode/__pycache__/SetEntryNEU.cpython-312.pyc,sha256=pCdFj61aPKkHL6Sv
 radboy/TasksMode/__pycache__/SetEntryNEU.cpython-313.pyc,sha256=jMSrUX9pvEhf67uVwrPE2ZlBCems8V7tHJ1LcC15ovU,24603
 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=lnWIMHJjKXqvMW1dXrHBzJNV48wXnbqPgQj-17BPdcs,429557
+radboy/TasksMode/__pycache__/Tasks.cpython-313.pyc,sha256=INSBT7OsGawhX2J0zzG7KEhGich8fPXfPr3jVMV1kuA,429557
 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
@@ -402,7 +402,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=jfwQdkJ23RhjiDmsLNjDimZxTUIVdORDzkJJUu81DfU,165
+radboy/__pycache__/__init__.cpython-313.pyc,sha256=9BPV8JfNDIDUFknlN_SsvSNocceug9tZK80fe_8hPx0,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
@@ -412,7 +412,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=lrGR0JF0dkDM8N9ORGUKH_MucUFx1-PI38YsvqS-wgA,926
-radboy/preloader/preloader.py,sha256=3bq0dzo5KiZmK86DWCBZH4WmHoS01iLoUQ6BciL6BHU,14456
+radboy/preloader/preloader.py,sha256=vLZfFehbndvkV5O6TPlaZZRqOG-RpMQ5DseCpQpU4C8,14513
 radboy/preloader/preloader_func.py,sha256=-VYHHtmqe-oYhWj4AoqXy5IFuzw5yn5zyxty2tTyw6E,12501
 radboy/setCode/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 radboy/setCode/setCode.py,sha256=8UOf4okbx-Zane99odeoLAS_lfIt8pIaFomN7EtnnVA,5202
@@ -430,7 +430,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.663.dist-info/METADATA,sha256=fYLcc0iPqP6jE2t-DPsZ-qu7dQSfW3VD62aHQePXl8k,1891
-radboy-0.0.663.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-radboy-0.0.663.dist-info/top_level.txt,sha256=mlM0RWMUxGo1YHnlLmYrHOgGdK4XNRpr7nMFD5lR56c,7
-radboy-0.0.663.dist-info/RECORD,,
+radboy-0.0.665.dist-info/METADATA,sha256=sgT3KVxc3AeKAIqvpQz41tRUwHvR9aP2-Wm7BRooBTQ,1891
+radboy-0.0.665.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+radboy-0.0.665.dist-info/top_level.txt,sha256=mlM0RWMUxGo1YHnlLmYrHOgGdK4XNRpr7nMFD5lR56c,7
+radboy-0.0.665.dist-info/RECORD,,