radboy 0.0.421__py3-none-any.whl → 0.0.423__py3-none-any.whl

radboy/EntryExtras/Extras.py

@@ -465,7 +465,10 @@ class EntryDataExtrasMenu:
     'CBD Cannabinoids %':'0%',
     'CBD Cannabinoids mg':'0mg',
     'CBD Cannabinoids %(mg)':'0%(0mg)',
-
+    'GOVERNMENT WARNING | CANNABIS':'GOVERNMENT WARNING: THIS PACKAGE CONTAINS CANNABIS, A SCHEDULE I CONTROLLED SUBSTANCE. KEEP OUT OF REACH OF CHILDREN AND ANIMALS. CANNABIS MAY ONLY BE POSSESSED OR CONSUMED BY PERSONS 21 YEARS OF AGE OR OLDER UNLESS THE PERSON IS A QUALIFIED PATIENT. CANNABIS USE WHILE PREGNANT OR BREASTFEEDING MAY BE HARMFUL. CONSUMPTION OF CANNABIS IMPAIRS YOUR ABILITY TO DRIVE AND OPERATE MACHINERY. PLEASE USE EXTREME CAUTION.',
+    'P65 Warning':'Cancer and Reproductive Harm. See www.p65warnings.ca.gov',
+    'Use Disclaimer':'This product is meant to be vaped.',
+    'Battery/Power Source Disclaimer':'Battery sold separately.',
     'Manufactured By/Distributed By/Company':'SomeCorp inc., Mineapolis, MN 55440 USA',
     'Retailer':'',
     'Vendor':'',
@@ -1047,7 +1050,16 @@ class EntryDataExtrasMenu:
                                     return
                                 elif field_search in ['d',]:
                                     field_search=''
-                                query=session.query(EntryDataExtras).filter(EntryDataExtras.field_name.icontains(field_search))
+
+                                query=session.query(EntryDataExtras).filter(
+                                    and_(
+                                        not_(EntryDataExtras.field_name.icontains("[Updated on")),
+                                        or_(
+                                            EntryDataExtras.field_name.icontains(field_search),
+                                            EntryDataExtras.field_value.icontains(field_search),
+                                            )
+                                        )
+                                    )
                                 results_ede=query.group_by(EntryDataExtras.field_name,EntryDataExtras.field_type).all()
                                 if len(results_ede) < 1:
                                     continue
@@ -1075,7 +1087,7 @@ class EntryDataExtrasMenu:
                                 color=Fore.dark_cyan
                             else:
                                 color=Fore.light_blue
-                            msg_ede.append(f"{Fore.cyan}{num}/{Fore.light_yellow}{num+1} of {Fore.light_red}{ct}{Fore.grey_50} -> {color}{i.field_name}{Style.reset}:{i.field_type} ede_id={i.ede_id} doe={i.doe}")
+                            msg_ede.append(f"{Fore.cyan}{num}/{Fore.light_yellow}{num+1} of {Fore.light_red}{ct}{Fore.grey_50} -> {color}{i.field_name}[{i.field_type}]={Fore.light_steel_blue}{i.field_value}{Style.reset}:{i.field_type} ede_id={i.ede_id} doe={i.doe}")
                         msg_ede='\n'.join(msg_ede)
                         while True:
                             try:
@@ -1174,7 +1186,12 @@ class EntryDataExtrasMenu:
                         return
                     elif field_search in ['d',]:
                         field_search=''
-                    query=session.query(EntryDataExtras).filter(EntryDataExtras.field_name.icontains(field_search))
+                    query=session.query(EntryDataExtras).filter(
+                        or_(
+                            EntryDataExtras.field_name.icontains(field_search),
+                            EntryDataExtras.field_value.icontains(field_search)
+                            )
+                        )
                     results_ede=query.group_by(EntryDataExtras.field_name,EntryDataExtras.field_type,EntryDataExtras.field_value).all()
                     if len(results_ede) < 1:
                         continue
@@ -1202,7 +1219,7 @@ class EntryDataExtrasMenu:
                     color=Fore.dark_cyan
                 else:
                     color=Fore.light_blue
-                msg_ede.append(f"{Fore.cyan}{num}/{Fore.light_yellow}{num+1} of {Fore.light_red}{ct}{Fore.grey_50} -> {color}{i.field_name}{Style.reset}:{i.field_type}={Fore.light_yellow}{i.field_value}{Style.reset} ede_id={i.ede_id} doe={i.doe}")
+                msg_ede.append(f"{Fore.cyan}{num}/{Fore.light_yellow}{num+1} of {Fore.light_red}{ct}{Fore.grey_50} -> {color}{i.field_name}[{i.field_type}]={Fore.light_steel_blue}{i.field_value}{Style.reset}:{i.field_type}={Fore.light_yellow}{i.field_value}{Style.reset} ede_id={i.ede_id} doe={i.doe}")
             msg_ede='\n'.join(msg_ede)
             while True:
                 try:

radboy/TasksMode/SetEntryNEU.py

@@ -322,8 +322,8 @@ class NEUSetter:
                                 ROUNDTO=int(db.detectGetOrSet("lsbld ROUNDTO default",3,setValue=False,literal=True))
                                 default_taxrate=round(float(db.detectGetOrSet("Tax Rate",0.0925,setValue=False,literal=True)),4)
                                 tax_rate=Prompt.__init2__(None,func=FormBuilderMkText,ptext=f"Tax({default_taxrate}): ",helpText=f"What is the tax rate, default is {default_taxrate}.",data="float")
-                                if tax_rate is None:
-                                    return tax,crv
+                                if tax_rate in [None,]:
+                                    return selected.Tax,selected.CRV
                                 elif tax_rate in ['d',]:
                                     tax_rate=default_taxrate
 

radboy/__init__.py

@@ -1 +1 @@
-VERSION='0.0.421'
+VERSION='0.0.423'

{radboy-0.0.421.dist-info → radboy-0.0.423.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: radboy
-Version: 0.0.421
+Version: 0.0.423
 Summary: A small example package
 Author: Carl Joseph Hirner III
 Author-email: Carl Hirner III <k.j.hirner.wisdom@gmail.com>

{radboy-0.0.421.dist-info → radboy-0.0.423.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=0qFnt3gEk58-8S1uCmVBbtOItFJ0zp0Yt7RqXsF0ksY,41364
 radboy/Run.py,sha256=JUoCTHnzQBv7n8PB2_i93ANdAC_iW__RkAge8esCnk4,76
-radboy/__init__.py,sha256=IOMAKXq4cD3KfVZn5Ch0ovSHfwEc1-a6rALv8JtVzCw,17
+radboy/__init__.py,sha256=goKCE0XUuzjUP-iqrTj9V7fmp_4S4yzjySaOU5zFy6U,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
@@ -146,10 +146,10 @@ radboy/DayLog/__pycache__/DayLogger.cpython-313.pyc,sha256=L3BYIw7SMXTsTK64KnTRg
 radboy/DayLog/__pycache__/__init__.cpython-311.pyc,sha256=Z5Y4DdVF77LZf6-Of92MDGFdi-IXik1ASQd4AdLNNfQ,231
 radboy/DayLog/__pycache__/__init__.cpython-312.pyc,sha256=lP_GHzSPt5JTrT1jLWiRMFGPmSdJYBn4eRV__OxgJ6s,269
 radboy/DayLog/__pycache__/__init__.cpython-313.pyc,sha256=UQw5v4r7yismC9qcqP0dEme6h-lawbOA5pXYpkqUwFk,148
-radboy/EntryExtras/Extras.py,sha256=7P3hIjOa55SuhxAStd4Hvqprpd-Y9C0gKHP7yYQBe64,74350
+radboy/EntryExtras/Extras.py,sha256=EpXxXh1FhRuWzjvyDWbRqG9swuR-EOX5enJTwesEQmY,75767
 radboy/EntryExtras/__init__.py,sha256=K76Ku7o2DwTZU-Ya2mifH856KAcxb8MXdSaQMQLhu84,902
 radboy/EntryExtras/__pycache__/Extras.cpython-312.pyc,sha256=eHkeyKblMtG37lDhl38OEGQbvvKxXMriKK49kj2mg8o,34768
-radboy/EntryExtras/__pycache__/Extras.cpython-313.pyc,sha256=3Jg_6u-1JismQFHgL0CtTSXKpGu0It93uuqXgdb_7XY,96091
+radboy/EntryExtras/__pycache__/Extras.cpython-313.pyc,sha256=-TSNmMqcrbTtqutnKK-ETDdRyGEDJ3jQmw6jDfPhChE,97525
 radboy/EntryExtras/__pycache__/__init__.cpython-312.pyc,sha256=0bBwhp_9PYvL-Nm_J0gsYf9yfKAFJMiMdpc6XzZrPzU,829
 radboy/EntryExtras/__pycache__/__init__.cpython-313.pyc,sha256=PqXXfBeREZI2pZc22BayKH7daLXbO7p3NozaXpnA3cQ,829
 radboy/EntryExtras/__pycache__/db.cpython-312.pyc,sha256=Qcqix5yi9h7fbsmGhJOWYdLHbHMTWixwolRRQYg8ISk,1781
@@ -333,14 +333,14 @@ radboy/SystemSettings/__pycache__/SystemSettings.cpython-313.pyc,sha256=MQSsEgiC
 radboy/SystemSettings/__pycache__/__init__.cpython-312.pyc,sha256=aIzp4Po0t8EhSAE8ytO-tJlNuKnEzAWPi1fzEIoGesI,277
 radboy/SystemSettings/__pycache__/__init__.cpython-313.pyc,sha256=QFDuoidxMWsGVLsy5lN-rDs6TP8nKJ4yyCyiamNOhwo,156
 radboy/TasksMode/ReFormula.py,sha256=REDRJYub-OEOE6g14oRQOLOQwv8pHqVJy4NQk3CCM90,2255
-radboy/TasksMode/SetEntryNEU.py,sha256=3nUNDUNyxq4zeMtmUQ7aS1o23P7KhDIMdUPNqPnYbRk,17343
+radboy/TasksMode/SetEntryNEU.py,sha256=TTzlAT5rNXvXUAy16BHBq0hJOKhONYpPhdAfQKdTfGw,17364
 radboy/TasksMode/Tasks.py,sha256=lMI6NUjUGvIJ8CzGwojIVX3n576jwrZypRiNrc5yQxc,306978
 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
 radboy/TasksMode/__pycache__/ReFormula.cpython-313.pyc,sha256=BfNrg6vlQn5f2asq3gT7JVYC0sOLmYqQyuBPTGJXPNk,3901
 radboy/TasksMode/__pycache__/SetEntryNEU.cpython-312.pyc,sha256=pCdFj61aPKkHL6SvZZ4jUfWJulvDbKue4HGFTIeteOU,17671
-radboy/TasksMode/__pycache__/SetEntryNEU.cpython-313.pyc,sha256=leIelDzPrZE_YgKs0B99osmhyENYtYgi3ErgS2XqSPs,20088
+radboy/TasksMode/__pycache__/SetEntryNEU.cpython-313.pyc,sha256=eSWkYvfm5RuRE5rbO5wI7XxzFyKnp6KlbphSqPAF2z4,20133
 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=uD-IBoUwEwGcqayy9z5oPJqazzmr-p_wsjHS23egCUg,377020
@@ -390,7 +390,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=oxDY7i1NoRXJwIOXrl0vUYFHZzuHt1bDEFnVKXB3j1w,165
+radboy/__pycache__/__init__.cpython-313.pyc,sha256=Zl8dh4Nu5eXMEFIFi8f_E7kBVuOOYzgTAUPCPD3RT3A,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
@@ -415,7 +415,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.421.dist-info/METADATA,sha256=MQ43Xb0MrCKwBDOyv2lp460uXqpR_xZMl8Bq8atVtkA,794
-radboy-0.0.421.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-radboy-0.0.421.dist-info/top_level.txt,sha256=mlM0RWMUxGo1YHnlLmYrHOgGdK4XNRpr7nMFD5lR56c,7
-radboy-0.0.421.dist-info/RECORD,,
+radboy-0.0.423.dist-info/METADATA,sha256=FtWWQFossbx9I91gwMzUrl8IBGF7lVbQjUP7tCSDAis,794
+radboy-0.0.423.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+radboy-0.0.423.dist-info/top_level.txt,sha256=mlM0RWMUxGo1YHnlLmYrHOgGdK4XNRpr7nMFD5lR56c,7
+radboy-0.0.423.dist-info/RECORD,,