radboy 0.0.421__tar.gz → 0.0.423__tar.gz

{radboy-0.0.421 → radboy-0.0.423}/PKG-INFO

@@ -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.423/STDOUT.TXT

@@ -0,0 +1,184 @@
+#USER INPUT# -> :"t"
+#USER INPUT# -> :"neu"
+#USER INPUT# -> :"em"
+#USER INPUT# -> :"eaxpfs"
+#USER INPUT# -> :"h"
+#USER INPUT# -> :"eaxpf"
+#USER INPUT# -> :"laaf"
+#USER INPUT# -> :"mksl"
+#USER INPUT# -> :""
+#USER INPUT# -> :""
+#USER INPUT# -> :""
+#USER INPUT# -> :"test"
+#USER INPUT# -> :""
+#USER INPUT# -> :""
+#USER INPUT# -> :"qc"
+#USER INPUT# -> :"em"
+#USER INPUT# -> :"cf2e"
+#USER INPUT# -> :""
+#USER INPUT# -> :"0"
+#USER INPUT# -> :"reproduct"
+#USER INPUT# -> :"b"
+#USER INPUT# -> :"b"
+#USER INPUT# -> :"b"
+#USER INPUT# -> :"b"
+#USER INPUT# -> :"b"
+#USER INPUT# -> :"cf2e"
+#USER INPUT# -> :"test"
+#USER INPUT# -> :"60"
+#USER INPUT# -> :"p65"
+#USER INPUT# -> :"q"
+#USER INPUT# -> :"e"
+#USER INPUT# -> :"mksl"
+#USER INPUT# -> :""
+#USER INPUT# -> :""
+#USER INPUT# -> :""
+#USER INPUT# -> :"test"
+#USER INPUT# -> :""
+#USER INPUT# -> :""
+#USER INPUT# -> :"qc"
+#USER INPUT# -> :"em"
+#USER INPUT# -> :"cf2e"
+#USER INPUT# -> :"0"
+#USER INPUT# -> :"p65"
+#USER INPUT# -> :"b"
+#USER INPUT# -> :"ssf2e"
+#USER INPUT# -> :"0"
+#USER INPUT# -> :"p65"
+#USER INPUT# -> :"q"
+#USER INPUT# -> :"e"
+#USER INPUT# -> :"mksl"
+#USER INPUT# -> :""
+#USER INPUT# -> :""
+#USER INPUT# -> :""
+#USER INPUT# -> :"test"
+#USER INPUT# -> :""
+#USER INPUT# -> :""
+#USER INPUT# -> :"qc"
+#USER INPUT# -> :"em"
+#USER INPUT# -> :"cf2e"
+#USER INPUT# -> :"0"
+#USER INPUT# -> :"p65"
+#USER INPUT# -> :"b"
+#USER INPUT# -> :"q"
+#USER INPUT# -> :"e"
+#USER INPUT# -> :"mksl"
+#USER INPUT# -> :""
+#USER INPUT# -> :""
+#USER INPUT# -> :""
+#USER INPUT# -> :"test"
+#USER INPUT# -> :""
+#USER INPUT# -> :""
+#USER INPUT# -> :"qc"
+#USER INPUT# -> :"em"
+#USER INPUT# -> :"sf2e"
+#USER INPUT# -> :"0"
+#USER INPUT# -> :"b"
+#USER INPUT# -> :"ssf2e"
+#USER INPUT# -> :"0"
+#USER INPUT# -> :"comment"
+#USER INPUT# -> :"q"
+#USER INPUT# -> :"e"
+#USER INPUT# -> :"mksl"
+#USER INPUT# -> :""
+#USER INPUT# -> :""
+#USER INPUT# -> :""
+#USER INPUT# -> :"test"
+#USER INPUT# -> :""
+#USER INPUT# -> :""
+#USER INPUT# -> :"qc"
+#USER INPUT# -> :"em"
+#USER INPUT# -> :"ssf2e"
+#USER INPUT# -> :"0"
+#USER INPUT# -> :"comment"
+#USER INPUT# -> :""
+#USER INPUT# -> :"b"
+#USER INPUT# -> :"ssf2e"
+#USER INPUT# -> :"0"
+#USER INPUT# -> :"water"
+#USER INPUT# -> :"0"
+#USER INPUT# -> :"12"
+#USER INPUT# -> :"y"
+#USER INPUT# -> :"water"
+#USER INPUT# -> :"11"
+#USER INPUT# -> :"0"
+#USER INPUT# -> :"11"
+#USER INPUT# -> :"y"
+#USER INPUT# -> :"11"
+#USER INPUT# -> :"b"
+#USER INPUT# -> :"lu"
+#USER INPUT# -> :"0"
+#USER INPUT# -> :"ssf2e"
+#USER INPUT# -> :"0"
+#USER INPUT# -> :"water"
+#USER INPUT# -> :"b"
+#USER INPUT# -> :"cf2e"
+#USER INPUT# -> :"0"
+#USER INPUT# -> :"water"
+#USER INPUT# -> :"2"
+#USER INPUT# -> :"lu"
+#USER INPUT# -> :"0"
+#USER INPUT# -> :"b"
+#USER INPUT# -> :"b"
+#USER INPUT# -> :"b"
+#USER INPUT# -> :"q"
+#USER INPUT# -> :"e"
+#USER INPUT# -> :"0.0.422"
+#USER INPUT# -> :"mksl"
+#USER INPUT# -> :""
+#USER INPUT# -> :""
+#USER INPUT# -> :""
+#USER INPUT# -> :""
+#USER INPUT# -> :"set"
+#USER INPUT# -> :"y"
+#USER INPUT# -> :"-1"
+#USER INPUT# -> :"b"
+#USER INPUT# -> :"test"
+#USER INPUT# -> :""
+#USER INPUT# -> :""
+#USER INPUT# -> :"neu"
+#USER INPUT# -> :"set"
+#USER INPUT# -> :"2"
+#USER INPUT# -> :"b"
+#USER INPUT# -> :"b"
+#USER INPUT# -> :"qc"
+#USER INPUT# -> :"set"
+#USER INPUT# -> :"2"
+#USER INPUT# -> :"0"
+#USER INPUT# -> :"1.84"
+#USER INPUT# -> :"y"
+#USER INPUT# -> :"b"
+#USER INPUT# -> :"q"
+#USER INPUT# -> :"e"
+#USER INPUT# -> :"mksl"
+#USER INPUT# -> :"test"
+#USER INPUT# -> :""
+#USER INPUT# -> :""
+#USER INPUT# -> :"test"
+#USER INPUT# -> :""
+#USER INPUT# -> :""
+#USER INPUT# -> :"qc"
+#USER INPUT# -> :"set"
+#USER INPUT# -> :"2"
+#USER INPUT# -> :"0"
+#USER INPUT# -> :"1.84"
+#USER INPUT# -> :"y"
+#USER INPUT# -> :"b"
+#USER INPUT# -> :"set"
+#USER INPUT# -> :"2"
+#USER INPUT# -> :"0"
+#USER INPUT# -> :"1.84"
+#USER INPUT# -> :"y"
+#USER INPUT# -> :"0.0875"
+#USER INPUT# -> :"lu"
+#USER INPUT# -> :""
+#USER INPUT# -> :"esu"
+#USER INPUT# -> :"sas"
+#USER INPUT# -> :"test"
+#USER INPUT# -> :"b"
+#USER INPUT# -> :"b"
+#USER INPUT# -> :"b"
+#USER INPUT# -> :"b"
+#USER INPUT# -> :"q"
+#USER INPUT# -> :"e"
+#USER INPUT# -> :"0.0.423"

{radboy-0.0.421 → radboy-0.0.423}/pyproject.toml

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

{radboy-0.0.421 → radboy-0.0.423}/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-0.0.421 → radboy-0.0.423}/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-0.0.423/radboy/__init__.py

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

{radboy-0.0.421 → radboy-0.0.423}/radboy.egg-info/PKG-INFO

@@ -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 → radboy-0.0.423}/setup.py

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

radboy-0.0.421/STDOUT.TXT

@@ -1,19 +0,0 @@
-#USER INPUT# -> :"t"
-#USER INPUT# -> :"loads"
-#USER INPUT# -> :""
-#USER INPUT# -> :"q"
-#USER INPUT# -> :"e"
-#USER INPUT# -> :"h"
-#USER INPUT# -> :"orddts"
-#USER INPUT# -> :""
-#USER INPUT# -> :"orddts all"
-#USER INPUT# -> :""
-#USER INPUT# -> :"h"
-#USER INPUT# -> :"q"
-#USER INPUT# -> :"e"
-#USER INPUT# -> :"h"
-#USER INPUT# -> :"lds mlk"
-#USER INPUT# -> :""
-#USER INPUT# -> :"q"
-#USER INPUT# -> :"e"
-#USER INPUT# -> :"0.0.421"

radboy-0.0.421/radboy/__init__.py

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