radboy 0.0.544__py3-none-any.whl → 0.0.546__py3-none-any.whl

radboy/DB/Prompt.py

@@ -56,7 +56,9 @@ def std_colorize(m,n,c,start=f"[Prompt]{Back.black}{Fore.pale_turquoise_1} Start
         else:
             msg=f'{start}{Fore.light_cyan}{n}/{Fore.green_yellow}{n+1}{Fore.orange_red_1} of {c} {Fore.light_salmon_1}{m}{Style.reset}{end}'
         return msg
-
+'''Formula/Price menu options'''
+PRICE=['quick price','qprc','price','prc']
+FMLA=['fmlau','formulae-u','pre-formula','formulas']
 def timedout(ptext,htext='',timeout_returnable="timeout"):
     try:
         while True:
@@ -2261,7 +2263,8 @@ CMD's are not final until ended with {Fore.magenta}{hw_delim}{Style.reset}""")
 {Fore.grey_70}**{Fore.light_green}'codify','format code','fcode'{Fore.light_steel_blue} Format input text to look '{db.Entry.cfmt(None,"TESTTEXT")}{Style.reset}'
 {Fore.grey_70}**{Fore.light_green}'upcify str','upcify.str','upcify-str','format upc str','fupcs'{Fore.light_steel_blue} Format input text to look and use formatted text as input-text'{db.Entry.rebar(None,"TESTTEXTUPCA")}{Style.reset}'
 {Fore.grey_70}**{Fore.light_green}'codify str','codify.str','codify-str','format code str','fcodes'{Fore.light_steel_blue} Format input text to look and use formatted text as input-text'{db.Entry.cfmt(None,"TESTTEXT")}{Style.reset}'
-{Fore.grey_70}**{Fore.light_green}'quick price','qprc','price'{Fore.light_steel_blue} Calculate price information using user provided data for an arbitrary product who Data is not in the Entry table{Style.reset}
+{Fore.grey_70}**{Fore.light_green}{PRICE}{Fore.light_steel_blue} Calculate price information using user provided data for an arbitrary product who Data is not in the Entry table{Style.reset}
+{Fore.grey_70}**{Fore.light_green}{FMLA}{Fore.light_steel_blue} use some pre-built formulas for returning values to the prompt{Style.reset}
 {Fore.grey_70}**{Fore.light_green}'mksl','make shopping list','p-slq','prompt slq','set list qty','slqp','slq-p'{Fore.light_steel_blue} make a list using {Fore.green_3a}slq{Fore.light_steel_blue} from {Fore.orange_red_1}Tasks.{Fore.light_red}TasksMode{Style.reset}
 {Fore.grey_70}**{Fore.light_green}'ic2oc','input code to output code'{Fore.light_steel_blue} Convert an input code to its neighboring format for view or input use{Style.reset}
 {Fore.grey_70}**{Fore.light_green}'uniq-rcpt-id','uniq rcpt id','unique_reciept_id','urid','unique reciept id','unique-reciept-id'{Fore.light_steel_blue} Generate Relavent Receipt Id to be searchable in DayLogger{Style.reset}
@@ -2608,15 +2611,22 @@ degress fahrenheite - degF
                         return func(result,data)
                     elif cmd.lower() in ["bldls","build","buildls","build list","bld ls",'lsbld','list build','ls bld','bld']:
                         bldls()
-                    elif cmd.lower() in ['quick price','qprc','price']:
-                        t=TM.Tasks.pricing(None)
+                    elif cmd.lower() in PRICE:
+                        t=TM.Tasks.TasksMode(parent=self,engine=db.ENGINE,init_only=True).pricing()
+                        if t is not None:
+                            print("returned")
+                            try:
+                                return func(str(t),data)
+                            except:
+                                return func(t,data)
+                    elif cmd.lower() in FMLA:
+                        t=TM.Tasks.TasksMode(parent=self,engine=db.ENGINE,init_only=True).formulaeu()
                         if t is not None:
                             print("returned")
                             try:
                                 return func(str(t),data)
                             except:
                                 return func(t,data)
-                           
                     elif cmd.lower() in ["bldlse","builde","buildlse","build list export ","bld ls exp",'elsbld','export list build','exp ls bld','ebld']:
                         bldls(bldlse=True)
                     elif cmd.lower() in ['sbld','search build','search_build','scan build','scan_bld']:

radboy/HealthLog/HealthLog.py

@@ -815,7 +815,7 @@ class HealthLogUi:
 			'exec':lambda self=self:self.export_log_field(fields=['BloodSugar','BloodSugarUnitName','LongActingInsulinName','LongActingInsulinTaken','LongActingInsulinUnitName','ShortActingInsulinName','ShortActingInsulinTaken','ShortActingInsulinUnitName','HeartRate','HeartRateUnitName','DrugConsumed','DrugQtyConsumed','DrugQtyConsumedUnitName','CarboHydrateIntake','CarboHydrateIntakeUnitName','Comments',],not_none=['Comments',])
 			},
 			'xpt consumed':{
-				'cmds':['xptfd','xpt fd','xpt food','lfd','xpt fuel','xpt fl','xlfl'],
+				'cmds':['xptfd','xpt fd','xpt food','xpt-fd','xpt fuel','xpt fl','xlfl'],
 				'desc':'export food',
 				'exec':lambda self=self:self.export_log_field(
 					fields=["EntryBarcode",

radboy/TasksMode/Tasks.py

@@ -288,445 +288,596 @@ def td(time_string):
 def save(value):
     detectGetOrSet("InLineResult",value,setValue=True,literal=True)
 
-def pricing(self):
-    #needs to be refactored
-    
-    while True:
-        try:
-            default_taxrate=Decimal(detectGetOrSet("Tax Rate",0.0925,setValue=False,literal=True))
-            default_price=Decimal(detectGetOrSet("pricing default price",1,setValue=False,literal=True))
-            default_bottle_qty=Decimal(detectGetOrSet("pricing default bottle_qty",1,setValue=False,literal=True))
-            default_bottle_size=Decimal(detectGetOrSet("pricing default bottle_size",16.9,setValue=False,literal=True))
-            default_purchased_qty=Decimal(detectGetOrSet("pricing default purchased_qty",1,setValue=False,literal=True))
-            defaults_msg=f"""
-{Fore.orange_red_1}Default Settings [changeable under sysset]{Style.reset}
-{Fore.light_sea_green}default_taxrate=={Fore.turquoise_4}{default_taxrate},
-{Fore.grey_70}default_price=={Fore.light_yellow}{default_price},
-{Fore.light_sea_green}default_bottle_qty=={Fore.turquoise_4}{default_bottle_qty},
-{Fore.grey_70}default_bottle_size=={Fore.light_yellow}{default_bottle_size},
-{Fore.light_sea_green}default_purchased_qty=={Fore.turquoise_4}{default_purchased_qty}
-{Style.reset}"""
-            def timedecimal_to_ampm():
-                dayHours=Prompt.__init2__(None,func=FormBuilderMkText,ptext="How many hours in a day?: ",helpText="how many hours make a day? default is 24 ",data="dec.dec")
-                if dayHours is None:
-                    return
-                elif dayHours in ['d',]:
-                    dayHours=Decimal('24')
-                halfday=dayHours/2
+class Formulae:
+    def findAndUse2(self,options=None):
+        if options is None:
+            options=self.options
+        with Session(ENGINE) as session:
+            cmd=Prompt.__init2__(None,func=FormBuilderMkText,ptext=f"{Fore.light_red}[FindAndUse2]{Fore.light_yellow}what cmd are your looking for?",helpText="type the cmd",data="string")
+            if cmd in ['d',None]:
+                return
+            else:
+                options=copy(options)
+                
+                session.query(FindCmd).delete()
+                session.commit()
+                for num,k in enumerate(options):
+                    stage=0
+                    cmds=options[k]['cmds']
+                    l=[]
+                    l.extend(cmds)
+                    l.append(options[k]['desc'])
+                    cmdStr=' '.join(l)
+                    cmd_string=FindCmd(CmdString=cmdStr,CmdKey=k)
+                    session.add(cmd_string)
+                    if num % 50 == 0:
+                        session.commit()
+                session.commit()
+                session.flush()
 
-                result=None
-                time_Dec=Prompt.__init2__(None,func=FormBuilderMkText,ptext="Time Decimal: ",helpText="time of day as a decimal to convert to 12H ",data="dec.dec")
-                if time_Dec is None:
+                results=session.query(FindCmd).filter(FindCmd.CmdString.icontains(cmd)).all()
+
+
+                ct=len(results)
+                if ct == 0:
+                    print(f"No Cmd was found by {Fore.light_red}{cmd}{Style.reset}")
                     return
-                elif time_Dec in ['d',]:
-                    time_Dec=0.0
-                ampm='am'
-                if time_Dec >= 0 and time_Dec <= dayHours:
-                    if time_Dec <= halfday:
-                        hours=int(time_Dec)
-                    else:
-                        hours=int(time_Dec-halfday)
-                        ampm='pm'
-                    minutes=time_Dec-int(time_Dec)
-                    
+                for num,x in enumerate(results):
+                    msg=f"{Fore.light_yellow}{num}/{Fore.light_steel_blue}{num+1} of {Fore.light_red}{ct} -> {Fore.turquoise_4}{f'{Fore.light_yellow},{Style.reset}{Fore.turquoise_4}'.join(options[x.CmdKey]['cmds'])} - {Fore.green_yellow}{options[x.CmdKey]['desc']}"
+                    print(msg)
+                select=Prompt.__init2__(None,func=FormBuilderMkText,ptext="which index?",helpText="the number farthest to the left before the /",data="integer")
+                if select in [None,'d']:
+                    return
+                try:
+                    ee=options[results[select].CmdKey]['exec']
+                    if callable(ee):
+                        return ee()
+                except Exception as e:
+                    print(e)
+
+    def __init__(self):
+        pass
+    def formulaeu(self):
+        while True:
+            try:
+                def timedecimal_to_ampm():
+                    dayHours=Prompt.__init2__(None,func=FormBuilderMkText,ptext="How many hours in a day?: ",helpText="how many hours make a day? default is 24 ",data="dec.dec")
+                    if dayHours is None:
+                        return
+                    elif dayHours in ['d',]:
+                        dayHours=Decimal('24')
+                    halfday=dayHours/2
+
+                    result=None
+                    time_Dec=Prompt.__init2__(None,func=FormBuilderMkText,ptext="Time Decimal: ",helpText="time of day as a decimal to convert to 12H ",data="dec.dec")
+                    if time_Dec is None:
+                        return
+                    elif time_Dec in ['d',]:
+                        time_Dec=0.0
+                    ampm='am'
+                    if time_Dec >= 0 and time_Dec <= dayHours:
+                        if time_Dec <= halfday:
+                            hours=int(time_Dec)
+                        else:
+                            hours=int(time_Dec-halfday)
+                            ampm='pm'
+                        minutes=time_Dec-int(time_Dec)
+                        
+                        try:
+                            minutes=int(minutes*60)
+                        except Exception as e:
+                            print(e)
+                            minutes=0
+                        result=f"{hours}[12H]/{int(time_Dec)}[24]:{minutes} {ampm}"
+                        
+                        return result
+                    return result
+
+                def invert_value():
+                    result=None
+                    value=Prompt.__init2__(None,func=FormBuilderMkText,ptext="Value to Invert: ",helpText="make user provided value, or formula negative (value*-1='-value')",data="dec.dec")
+                    if value is None:
+                        return
+                    elif value in ['d',]:
+                        value=0
+                    result=value*-1
+                    return result
+
+                
+
+                self.options={
+                    f'{uuid1()}':{
+                        'cmds':['invert','-value','iv-val'],
+                        'desc':f'{Fore.light_yellow}value{Fore.medium_violet_red}is multiplied by -1 to make inverse{Style.reset}',
+                        'exec':invert_value
+                    },
+                    f'{uuid1()}':{
+                        'cmds':['time dec to clock','t2c','time to clock'],
+                        'desc':f'{Fore.light_yellow}value{Fore.medium_violet_red}convert decimal time to clock time{Style.reset}',
+                        'exec':timedecimal_to_ampm
+                    },
+                    f'{uuid1()}':{
+                        'cmds':['fcmd','findcmd','find cmd'],
+                        'desc':f'Find {Fore.light_yellow}cmd{Fore.medium_violet_red}and excute for return{Style.reset}',
+                        'exec':self.findAndUse2
+                    },
+                }
+                defaults_msg=f'''
+                '''
+                for num,i in enumerate(self.options):
+                    self.options[i]['cmds'].append(str(num))
+                options=copy(self.options)
+
+                while True:                
+                    helpText=[]
+                    for i in options:
+                        msg=f"{Fore.light_green}{options[i]['cmds']}{Fore.light_red} -> {options[i]['desc']}{Style.reset}"
+                        helpText.append(msg)
+                    helpText='\n'.join(helpText)
+                    print(helpText)
+                    print(defaults_msg)
+                    cmd=Prompt.__init2__(None,func=FormBuilderMkText,ptext="Quick Formulas|Do What?:",helpText=helpText,data="string")
+                    if cmd is None:
+                        return None
+                    result=None
+                    for i in options:
+                        els=[ii.lower() for ii in options[i]['cmds']]
+                        if cmd.lower() in els:
+                            result=options[i]['exec']()
+                            break
+                    print(f"{result}")
+                    returnResult=Prompt.__init2__(None,func=FormBuilderMkText,ptext="[Formula] Return Result?[y/n]",helpText=f"result to return is '{result}'",data="boolean")
+                    if returnResult in [True,]:
+                        if result is None:
+                            return None
+                        else:
+                            returnTypes=["float","Decimal","string","string"]
+                            returnActor=[lambda x:round(float(x),4),lambda x:Decimal(x).quantize(Decimal("0.0000")),lambda x: f"{x:.4f}",lambda x:str(x)]
+                            ct=len(returnTypes)
+                            returnType=None
+                            htext=[]
+                            strOnly=False
+                            for num,i in enumerate(returnTypes):
+                                try:
+                                    htext.append(std_colorize(f"{i} - {returnActor[num](result)} ",num,ct))
+                                except Exception as e:
+                                    strOnly=True
+                                    print(e)
+                            htext='\n'.join(htext)
+                            while returnType not in range(0,ct+1):
+                                print(htext)
+                                returnType=Prompt.__init2__(self,func=FormBuilderMkText,ptext="Return the value as?",helpText=f"{htext}\nwhich index?",data="integer")
+                                if returnType is None:
+                                    return None
+                                elif returnType in ['d',]:
+                                    if not strOnly:   
+                                        returnType=1
+                                    else:
+                                        returnType=-1
+                                        break
+                                        #return str(result)
+                            try:
+                                if returnTypes[returnType] == 'float':
+                                    try:
+                                        return returnActor[returnType](result)
+                                    except Exception as e:
+                                        print(e)
+                                        continue
+                                elif returnTypes[returnType] == 'Decimal':
+                                    try:
+                                        return returnActor[returnType](result)
+                                    except Exception as e:
+                                        print(e)
+                                        continue
+                                elif returnTypes[returnType] == 'string':
+                                    try:
+                                        return returnActor[returnType](result)
+                                    except Exception as e:
+                                        print(e)
+                                        continue
+                                else:
+                                    return result
+                            except Exception as e:
+                                print(e)
+                                print("returning as a string")
+                                return result
+                        return result                
+            except Exception as e:
+                print(e,str(e),repr(e))
+                return None
+            
+
+    def pricing(self):
+        """Price and Formulas whose values can be returned to the Prompt."""
+        while True:
+            try:
+                default_taxrate=Decimal(detectGetOrSet("Tax Rate",0.0925,setValue=False,literal=True))
+                default_price=Decimal(detectGetOrSet("pricing default price",1,setValue=False,literal=True))
+                default_bottle_qty=Decimal(detectGetOrSet("pricing default bottle_qty",1,setValue=False,literal=True))
+                default_bottle_size=Decimal(detectGetOrSet("pricing default bottle_size",16.9,setValue=False,literal=True))
+                default_purchased_qty=Decimal(detectGetOrSet("pricing default purchased_qty",1,setValue=False,literal=True))
+                defaults_msg=f"""
+    {Fore.orange_red_1}Default Settings [changeable under sysset]{Style.reset}
+    {Fore.light_sea_green}default_taxrate=={Fore.turquoise_4}{default_taxrate},
+    {Fore.grey_70}default_price=={Fore.light_yellow}{default_price},
+    {Fore.light_sea_green}default_bottle_qty=={Fore.turquoise_4}{default_bottle_qty},
+    {Fore.grey_70}default_bottle_size=={Fore.light_yellow}{default_bottle_size},
+    {Fore.light_sea_green}default_purchased_qty=={Fore.turquoise_4}{default_purchased_qty}
+    {Style.reset}"""
+
+                def tax_rate_decimal():
+                    result=None
+                    tax_percent=Prompt.__init2__(None,func=FormBuilderMkText,ptext="Tax Rate Percent: ",helpText="percent to convert to decimal (Percent/100=Rate)",data="dec.dec")
+                    if tax_percent is None:
+                        return
+                    elif tax_percent in ['d',]:
+                        tax_percent=default_taxrate/100
+                    result=tax_percent/100
+                    return result
+
+                def beverage_PTCRV_base():
+                    result=None
+                    print('Beverage Total Price+Tax+CRV of Size')
+                    price=Prompt.__init2__(None,func=FormBuilderMkText,ptext=f"Price ($)(default={default_price}):",helpText="A float or integer",data="float")
+                    if price is None:
+                        return None
+                    elif price in ['','d']:
+                        price=default_price
+
+
+                    bottle_size=Prompt.__init2__(None,func=FormBuilderMkText,ptext=f"Size in FlOz(or eqivalent,oz assumed if not specified({default_bottle_size})):",helpText="a value plus its unit",data="string")
+                    if bottle_size is None:
+                        return None
+                    elif bottle_size in ['d',]:
+                        bottle_size=default_bottle_size
                     try:
-                        minutes=int(minutes*60)
+                        bts=float(bottle_size)
+                        bottle_size=f"{bts} floz"
                     except Exception as e:
                         print(e)
-                        minutes=0
-                    result=f"{hours}[12H]/{int(time_Dec)}[24]:{minutes} {ampm}"
-                    
-                    return result
-                return result
+                    x=pint.UnitRegistry()
+                    xx=x(bottle_size)
+                    xxx=xx.to("floz")
+                    bottle_qty=Prompt.__init2__(None,func=FormBuilderMkText,ptext=f"Qty Of Containers({default_bottle_qty}):",helpText="A float or integer",data="float")
+                    if bottle_qty is None:
+                        return None
+                    elif bottle_qty in ['d',]:
+                        bottle_qty=default_bottle_qty
 
-            def tax_rate_decimal():
-                result=None
-                tax_percent=Prompt.__init2__(None,func=FormBuilderMkText,ptext="Tax Rate Percent: ",helpText="percent to convert to decimal (Percent/100=Rate)",data="dec.dec")
-                if tax_percent is None:
-                    return
-                elif tax_percent in ['d',]:
-                    tax_percent=default_taxrate/100
-                result=tax_percent/100
-                return result
+                    if xxx.magnitude < 24:
+                        crv=float(Decimal(0.05)*Decimal(bottle_qty))
+                    else:
+                        crv=float(Decimal(0.10)*Decimal(bottle_qty))
 
-            def invert_value():
-                result=None
-                value=Prompt.__init2__(None,func=FormBuilderMkText,ptext="Value to Invert: ",helpText="make user provided value, or formula negative (value*-1='-value')",data="dec.dec")
-                if value is None:
-                    return
-                elif value in ['d',]:
-                    value=0
-                result=value*-1
-                return result
+                    tax_rate=Prompt.__init2__(None,func=FormBuilderMkText,ptext=f"Tax Rate (0.01==1%(Default={default_taxrate})):",helpText="A float or integer",data="float")
+                    if tax_rate is None:
+                        return None
+                    elif tax_rate == 'd':
+                        tax_rate=default_taxrate
 
-            def beverage_PTCRV_base():
-                result=None
-                print('Beverage Total Price+Tax+CRV of Size')
-                price=Prompt.__init2__(None,func=FormBuilderMkText,ptext=f"Price ($)(default={default_price}):",helpText="A float or integer",data="float")
-                if price is None:
-                    return None
-                elif price in ['','d']:
-                    price=default_price
-
-
-                bottle_size=Prompt.__init2__(None,func=FormBuilderMkText,ptext=f"Size in FlOz(or eqivalent,oz assumed if not specified({default_bottle_size})):",helpText="a value plus its unit",data="string")
-                if bottle_size is None:
-                    return None
-                elif bottle_size in ['d',]:
-                    bottle_size=default_bottle_size
-                try:
-                    bts=float(bottle_size)
-                    bottle_size=f"{bts} floz"
-                except Exception as e:
-                    print(e)
-                x=pint.UnitRegistry()
-                xx=x(bottle_size)
-                xxx=xx.to("floz")
-                bottle_qty=Prompt.__init2__(None,func=FormBuilderMkText,ptext=f"Qty Of Containers({default_bottle_qty}):",helpText="A float or integer",data="float")
-                if bottle_qty is None:
-                    return None
-                elif bottle_qty in ['d',]:
-                    bottle_qty=default_bottle_qty
-
-                if xxx.magnitude < 24:
-                    crv=float(Decimal(0.05)*Decimal(bottle_qty))
-                else:
-                    crv=float(Decimal(0.10)*Decimal(bottle_qty))
+                    purchased_qty=Prompt.__init2__(None,func=FormBuilderMkText,ptext=f"Qty purchased({default_purchased_qty})?",helpText=f"how much is being purchased for {price}",data="float")
+                    if purchased_qty is None:
+                        return None
+                    elif purchased_qty in ['d',]:
+                        purchased_qty=default_purchased_qty
 
-                tax_rate=Prompt.__init2__(None,func=FormBuilderMkText,ptext=f"Tax Rate (0.01==1%(Default={default_taxrate})):",helpText="A float or integer",data="float")
-                if tax_rate is None:
-                    return None
-                elif tax_rate == 'd':
-                    tax_rate=default_taxrate
+                    price=(Decimal(price)*Decimal(purchased_qty))+Decimal(crv)
+                    tax=price*Decimal(tax_rate)
 
-                purchased_qty=Prompt.__init2__(None,func=FormBuilderMkText,ptext=f"Qty purchased({default_purchased_qty})?",helpText=f"how much is being purchased for {price}",data="float")
-                if purchased_qty is None:
-                    return None
-                elif purchased_qty in ['d',]:
-                    purchased_qty=default_purchased_qty
 
-                price=(Decimal(price)*Decimal(purchased_qty))+Decimal(crv)
-                tax=price*Decimal(tax_rate)
+                    result=(Decimal(price)+tax).quantize(Decimal('0.0000'))
+                    return result
 
+                def tax_with_crv():
+                    result=None
+                    print('Tax+CRV of Size')
+                    price=Prompt.__init2__(None,func=FormBuilderMkText,ptext=f"Price ($({default_price})):",helpText="A float or integer",data="float")
+                    if price is None:
+                        return None
+                    elif price in ['','d']:
+                        price=default_price
 
-                result=round(float(Decimal(price)+tax),prec)
-                return result
 
-            def tax_with_crv():
-                result=None
-                print('Tax+CRV of Size')
-                price=Prompt.__init2__(None,func=FormBuilderMkText,ptext=f"Price ($({default_price})):",helpText="A float or integer",data="float")
-                if price is None:
-                    return None
-                elif price in ['','d']:
-                    price=default_price
-
-
-                bottle_size=Prompt.__init2__(None,func=FormBuilderMkText,ptext=f"Size in FlOz(or eqivalent,oz assumed if not specified({default_bottle_size})):",helpText="a value plus its unit",data="string")
-                if bottle_size is None:
-                    return None
-                elif bottle_size in ['d',]:
-                    bottle_size=default_bottle_size
-                try:
-                    bts=float(bottle_size)
-                    bottle_size=f"{bts} floz"
-                except Exception as e:
-                    print(e)
-                x=pint.UnitRegistry()
-                xx=x(bottle_size)
-                xxx=xx.to("floz")
-                bottle_qty=Prompt.__init2__(None,func=FormBuilderMkText,ptext=f"Qty Of Containers({default_bottle_qty}):",helpText="A float or integer",data="float")
-                if bottle_qty is None:
-                    return None
-                elif bottle_qty in ['d',]:
-                    bottle_qty=default_bottle_qty
-
-                if xxx.magnitude < 24:
-                    crv=Decimal(0.05)*Decimal(bottle_qty)
-                else:
-                    crv=Decimal(0.10)*Decimal(bottle_qty)
+                    bottle_size=Prompt.__init2__(None,func=FormBuilderMkText,ptext=f"Size in FlOz(or eqivalent,oz assumed if not specified({default_bottle_size})):",helpText="a value plus its unit",data="string")
+                    if bottle_size is None:
+                        return None
+                    elif bottle_size in ['d',]:
+                        bottle_size=default_bottle_size
+                    try:
+                        bts=float(bottle_size)
+                        bottle_size=f"{bts} floz"
+                    except Exception as e:
+                        print(e)
+                    x=pint.UnitRegistry()
+                    xx=x(bottle_size)
+                    xxx=xx.to("floz")
+                    bottle_qty=Prompt.__init2__(None,func=FormBuilderMkText,ptext=f"Qty Of Containers({default_bottle_qty}):",helpText="A float or integer",data="float")
+                    if bottle_qty is None:
+                        return None
+                    elif bottle_qty in ['d',]:
+                        bottle_qty=default_bottle_qty
 
-                tax_rate=Prompt.__init2__(None,func=FormBuilderMkText,ptext=f"Tax Rate (0.01==1%(Default={default_taxrate})):",helpText="A float or integer",data="float")
-                if tax_rate is None:
-                    return None
-                elif tax_rate == 'd':
-                    tax_rate=default_taxrate
+                    if xxx.magnitude < 24:
+                        crv=Decimal(0.05)*Decimal(bottle_qty)
+                    else:
+                        crv=Decimal(0.10)*Decimal(bottle_qty)
 
-                purchased_qty=Prompt.__init2__(None,func=FormBuilderMkText,ptext=f"Qty purchased({default_purchased_qty})?",helpText=f"how much is being purchased for {price}",data="float")
-                if purchased_qty is None:
-                    return None
-                elif purchased_qty in ['d',]:
-                    purchased_qty=default_purchased_qty
+                    tax_rate=Prompt.__init2__(None,func=FormBuilderMkText,ptext=f"Tax Rate (0.01==1%(Default={default_taxrate})):",helpText="A float or integer",data="float")
+                    if tax_rate is None:
+                        return None
+                    elif tax_rate == 'd':
+                        tax_rate=default_taxrate
 
-                price=(Decimal(price)*Decimal(purchased_qty))+crv
-                tax=price*Decimal(tax_rate)
+                    purchased_qty=Prompt.__init2__(None,func=FormBuilderMkText,ptext=f"Qty purchased({default_purchased_qty})?",helpText=f"how much is being purchased for {price}",data="float")
+                    if purchased_qty is None:
+                        return None
+                    elif purchased_qty in ['d',]:
+                        purchased_qty=default_purchased_qty
 
-                result=tax
-                return result
+                    price=(Decimal(price)*Decimal(purchased_qty))+crv
+                    tax=price*Decimal(tax_rate)
 
-            def crv_total():
-                result=None
-                print('Total CRV for Qty of Size')
-                bottle_size=Prompt.__init2__(None,func=FormBuilderMkText,ptext=f"Size in FlOz(or eqivalent,oz assumed if not specified({default_bottle_size})):",helpText="a value plus its unit",data="string")
-                if bottle_size is None:
-                    return None
-                elif bottle_size in ['d',]:
-                    bottle_size=default_bottle_size
-                try:
-                    bts=float(bottle_size)
-                    bottle_size=f"{bts} floz"
-                except Exception as e:
-                    print(e)
-                x=pint.UnitRegistry()
-                xx=x(bottle_size)
-                xxx=xx.to("floz")
-                bottle_qty=Prompt.__init2__(None,func=FormBuilderMkText,ptext=f"Qty Of Containers({default_bottle_qty}):",helpText="A float or integer",data="float")
-                if bottle_qty is None:
-                    return None
-                elif bottle_qty in ['d',]:
-                    bottle_qty=default_bottle_qty
-
-                if xxx.magnitude < 24:
-                    crv=Decimal(0.05)*Decimal(bottle_qty)
-                else:
-                    crv=Decimal(0.10)*Decimal(bottle_qty)
+                    result=tax
+                    return result
 
-                
-                result=crv
-                return result
+                def crv_total():
+                    result=None
+                    print('Total CRV for Qty of Size')
+                    bottle_size=Prompt.__init2__(None,func=FormBuilderMkText,ptext=f"Size in FlOz(or eqivalent,oz assumed if not specified({default_bottle_size})):",helpText="a value plus its unit",data="string")
+                    if bottle_size is None:
+                        return None
+                    elif bottle_size in ['d',]:
+                        bottle_size=default_bottle_size
+                    try:
+                        bts=float(bottle_size)
+                        bottle_size=f"{bts} floz"
+                    except Exception as e:
+                        print(e)
+                    x=pint.UnitRegistry()
+                    xx=x(bottle_size)
+                    xxx=xx.to("floz")
+                    bottle_qty=Prompt.__init2__(None,func=FormBuilderMkText,ptext=f"Qty Of Containers({default_bottle_qty}):",helpText="A float or integer",data="float")
+                    if bottle_qty is None:
+                        return None
+                    elif bottle_qty in ['d',]:
+                        bottle_qty=default_bottle_qty
 
-            def price_tax():
-                result=None
-                print('Price+Tax')
-                price=Prompt.__init2__(None,func=FormBuilderMkText,ptext=f"Price ($({default_price})):",helpText="A float or integer",data="float")
-                if price is None:
-                    return None
-                elif price in ['','d']:
-                    price=default_price
+                    if xxx.magnitude < 24:
+                        crv=Decimal(0.05)*Decimal(bottle_qty)
+                    else:
+                        crv=Decimal(0.10)*Decimal(bottle_qty)
 
+                    
+                    result=crv
+                    return result
 
-                bottle_qty=Prompt.__init2__(None,func=FormBuilderMkText,ptext=f"Qty Of Containers/Product({default_bottle_qty}):",helpText="A float or integer",data="float")
-                if bottle_qty is None:
-                    return None
-                elif bottle_qty in ['d',]:
-                    bottle_qty=default_bottle_qty
+                def price_tax():
+                    result=None
+                    print('Price+Tax')
+                    price=Prompt.__init2__(None,func=FormBuilderMkText,ptext=f"Price ($({default_price})):",helpText="A float or integer",data="float")
+                    if price is None:
+                        return None
+                    elif price in ['','d']:
+                        price=default_price
 
-                tax_rate=Prompt.__init2__(None,func=FormBuilderMkText,ptext=f"Tax Rate (0.01==1%(Default={default_taxrate})):",helpText="A float or integer",data="float")
-                if tax_rate is None:
-                    return None
-                elif tax_rate == 'd':
-                    tax_rate=default_taxrate
 
-                price=Decimal(price)*Decimal(bottle_qty)
-                tax=price*Decimal(tax_rate)
+                    bottle_qty=Prompt.__init2__(None,func=FormBuilderMkText,ptext=f"Qty Of Containers/Product({default_bottle_qty}):",helpText="A float or integer",data="float")
+                    if bottle_qty is None:
+                        return None
+                    elif bottle_qty in ['d',]:
+                        bottle_qty=default_bottle_qty
 
-                result=(price+tax)
-                return result
+                    tax_rate=Prompt.__init2__(None,func=FormBuilderMkText,ptext=f"Tax Rate (0.01==1%(Default={default_taxrate})):",helpText="A float or integer",data="float")
+                    if tax_rate is None:
+                        return None
+                    elif tax_rate == 'd':
+                        tax_rate=default_taxrate
 
-            def tax_no_crv():
-                result=None
-                print('Tax without CRV')
-                price=Prompt.__init2__(None,func=FormBuilderMkText,ptext=f"Price ($({default_price})):",helpText="A float or integer",data="float")
-                if price is None:
-                    return None
-                elif price in ['','d']:
-                    price=default_price
+                    price=Decimal(price)*Decimal(bottle_qty)
+                    tax=price*Decimal(tax_rate)
 
+                    result=(price+tax)
+                    return result
 
-                bottle_qty=Prompt.__init2__(None,func=FormBuilderMkText,ptext=f"Qty Of Containers/Product({default_bottle_qty}):",helpText="A float or integer",data="float")
-                if bottle_qty is None:
-                    return None
-                elif bottle_qty in ['d',]:
-                    bottle_qty=default_bottle_qty
+                def tax_no_crv():
+                    result=None
+                    print('Tax without CRV')
+                    price=Prompt.__init2__(None,func=FormBuilderMkText,ptext=f"Price ($({default_price})):",helpText="A float or integer",data="float")
+                    if price is None:
+                        return None
+                    elif price in ['','d']:
+                        price=default_price
 
-                tax_rate=Prompt.__init2__(None,func=FormBuilderMkText,ptext=f"Tax Rate (0.01==1%(Default={default_taxrate})):",helpText="A float or integer",data="float")
-                if tax_rate is None:
-                    return None
-                elif tax_rate == 'd':
-                    tax_rate=default_taxrate
 
-                price=Decimal(price)*Decimal(bottle_qty)
-                tax=price*Decimal(tax_rate)
+                    bottle_qty=Prompt.__init2__(None,func=FormBuilderMkText,ptext=f"Qty Of Containers/Product({default_bottle_qty}):",helpText="A float or integer",data="float")
+                    if bottle_qty is None:
+                        return None
+                    elif bottle_qty in ['d',]:
+                        bottle_qty=default_bottle_qty
 
-                result=tax
-                return result
+                    tax_rate=Prompt.__init2__(None,func=FormBuilderMkText,ptext=f"Tax Rate (0.01==1%(Default={default_taxrate})):",helpText="A float or integer",data="float")
+                    if tax_rate is None:
+                        return None
+                    elif tax_rate == 'd':
+                        tax_rate=default_taxrate
 
-            def tax_rate_from_priceAndTax():
-                result=None
-                print('tax_rate_from_priceAndTax()')
-                price=Prompt.__init2__(None,func=FormBuilderMkText,ptext=f"Price ($({default_price})):",helpText="A float or integer",data="float")
-                if price is None:
-                    return None
-                elif price in ['','d']:
-                    price=default_price
+                    price=Decimal(price)*Decimal(bottle_qty)
+                    tax=price*Decimal(tax_rate)
 
+                    result=tax
+                    return result
 
-                taxed=Prompt.__init2__(None,func=FormBuilderMkText,ptext=f"Tax ($) (0.01==1%(Default={0})):",helpText="A float or integer",data="float")
-                if taxed is None:
-                    return None
-                elif taxed == 'd':
-                    taxed=0
+                def tax_rate_from_priceAndTax():
+                    result=None
+                    print('tax_rate_from_priceAndTax()')
+                    price=Prompt.__init2__(None,func=FormBuilderMkText,ptext=f"Price ($({default_price})):",helpText="A float or integer",data="float")
+                    if price is None:
+                        return None
+                    elif price in ['','d']:
+                        price=default_price
 
 
-                tax_rate=Decimal(taxed)/Decimal(price)
+                    taxed=Prompt.__init2__(None,func=FormBuilderMkText,ptext=f"Tax ($) (0.01==1%(Default={0})):",helpText="A float or integer",data="float")
+                    if taxed is None:
+                        return None
+                    elif taxed == 'd':
+                        taxed=0
 
-                result=tax_rate
-                return result
 
-            def tax_rate_from_oldPriceAndNewPrice():
-                result=None
-                print('tax_rate_from_oldPriceAndNewPrice()')
-                old_price=Prompt.__init2__(None,func=FormBuilderMkText,ptext=f"Old Price ($({default_price})):",helpText="A float or integer",data="float")
-                if old_price is None:
-                    return None
-                elif old_price in ['','d']:
-                    old_price=default_price
-
-                new_price=Prompt.__init2__(None,func=FormBuilderMkText,ptext=f"New Price ($({default_price})):",helpText="A float or integer",data="float")
-                if new_price is None:
-                    return None
-                elif new_price in ['','d']:
-                    new_price=default_price
-
-                taxed=Decimal(new_price)-Decimal(old_price)
-                tax_rate=taxed/Decimal(old_price)
-                tax_rate=tax_rate
-
-                result=tax_rate
-                return result
+                    tax_rate=Decimal(taxed)/Decimal(price)
 
-            
-            options={
-                f'{uuid1()}':{
-                    'cmds':['beverage price+tax+CRV','b-ptcrv',],
-                    'desc':f'{Fore.light_yellow}beverage Price+Tax+CRV{Fore.medium_violet_red} asking for base questions like bottle size and qty to get total cost with tax{Style.reset}',
-                    'exec':beverage_PTCRV_base
-                },
-                f'{uuid1()}':{
-                    'cmds':['price+tax','p+t',],
-                    'desc':f'{Fore.light_yellow}Price+Tax{Fore.medium_violet_red} asking questions like price and qty to get total cost with tax{Style.reset}',
-                    'exec':price_tax
-                },
-                f'{uuid1()}':{
-                    'cmds':['crvttl','crv total','crvtotal','crv_total',],
-                    'desc':f'{Fore.light_yellow}total crv{Fore.medium_violet_red} asking questions like price and qty to get total crv{Style.reset}',
-                    'exec':crv_total
-                },
-                f'{uuid1()}':{
-                    'cmds':['tax+crv','t+c','tax crv',],
-                    'desc':f'{Fore.light_yellow}tax+crv{Fore.medium_violet_red} asking questions like price and qty to get total crv{Style.reset}',
-                    'exec':tax_with_crv
-                },
-                f'{uuid1()}':{
-                    'cmds':['tax','tax no crv','tax 0 crv',],
-                    'desc':f'{Fore.light_yellow}tax w/o crv{Fore.medium_violet_red} asking questions like price and qty to get total tax without crv{Style.reset}',
-                    'exec':tax_no_crv
-                },
-                f'{uuid1()}':{
-                    'cmds':['trfpt','tax_rate_from_price_and_tax','tax rate from price and tax','taxRateFromPriceAndTax',],
-                    'desc':f'{Fore.light_yellow}tax rate{Fore.medium_violet_red} from price and tax as a decimal{Style.reset}',
-                    'exec':tax_rate_from_priceAndTax
-                },
-                f'{uuid1()}':{
-                    'cmds':['tax_rate_from_old_price_and_new_price','tax rate from old price and new price','taxRateFromOldPriceAndNewPrice','trfopnp',],
-                    'desc':f'{Fore.light_yellow}tax rate{Fore.medium_violet_red} from old price and new price{Style.reset}',
-                    'exec':tax_rate_from_oldPriceAndNewPrice
-                },
-                f'{uuid1()}':{
-                    'cmds':['tax decimal','taxdecimal'],
-                    'desc':f'{Fore.light_yellow}tax rate decimal{Fore.medium_violet_red} from percent{Style.reset}',
-                    'exec':tax_rate_decimal
-                },
-                f'{uuid1()}':{
-                    'cmds':['invert','-value','iv-val'],
-                    'desc':f'{Fore.light_yellow}value{Fore.medium_violet_red}is multiplied by -1 to make inverse{Style.reset}',
-                    'exec':invert_value
-                },
-                f'{uuid1()}':{
-                    'cmds':['time dec to clock','t2c','time to clock'],
-                    'desc':f'{Fore.light_yellow}value{Fore.medium_violet_red}convert decimal time to clock time{Style.reset}',
-                    'exec':timedecimal_to_ampm
-                },
-                }
-            for num,i in enumerate(options):
-                options[i]['cmds'].append(str(num))
-
-            while True:                
-                helpText=[]
-                for i in options:
-                    msg=f"{Fore.light_green}{options[i]['cmds']}{Fore.light_red} -> {options[i]['desc']}{Style.reset}"
-                    helpText.append(msg)
-                helpText='\n'.join(helpText)
-                print(helpText)
-                print(defaults_msg)
-                cmd=Prompt.__init2__(None,func=FormBuilderMkText,ptext="Pricing Analisys Tool|Do What?:",helpText=helpText,data="string")
-                if cmd is None:
-                    return None
-                result=None
-                for i in options:
-                    els=[ii.lower() for ii in options[i]['cmds']]
-                    if cmd.lower() in els:
-                        result=options[i]['exec']()
-                        break
-                print(f"{result}")
-                returnResult=Prompt.__init2__(None,func=FormBuilderMkText,ptext="Return Result?[y/n]",helpText=f"result to return is '{result}'",data="boolean")
-                if returnResult in [True,]:
-                    if result is None:
+                    result=tax_rate
+                    return result
+
+                def tax_rate_from_oldPriceAndNewPrice():
+                    result=None
+                    print('tax_rate_from_oldPriceAndNewPrice()')
+                    old_price=Prompt.__init2__(None,func=FormBuilderMkText,ptext=f"Old Price ($({default_price})):",helpText="A float or integer",data="float")
+                    if old_price is None:
                         return None
-                    else:
-                        returnTypes=["float","Decimal","string","string"]
-                        returnActor=[lambda x:round(float(x),4),lambda x:Decimal(x).quantize(Decimal("0.0000")),lambda x: f"{x:.4f}",lambda x:str(x)]
-                        ct=len(returnTypes)
-                        returnType=None
-                        htext=[]
-                        strOnly=False
-                        for num,i in enumerate(returnTypes):
-                            try:
-                                htext.append(std_colorize(f"{i} - {returnActor[num](result)} ",num,ct))
-                            except Exception as e:
-                                strOnly=True
-                                print(e)
-                        htext='\n'.join(htext)
-                        while returnType not in range(0,ct+1):
-                            print(htext)
-                            returnType=Prompt.__init2__(self,func=FormBuilderMkText,ptext="Return the value as?",helpText=f"{htext}\nwhich index?",data="integer")
-                            if returnType is None:
-                                return None
-                            elif returnType in ['d',]:
-                                if not strOnly:   
-                                    returnType=1
-                                else:
-                                    returnType=-1
-                                    break
-                                    #return str(result)
-                        try:
-                            if returnTypes[returnType] == 'float':
-                                try:
-                                    return returnActor[returnType](result)
-                                except Exception as e:
-                                    print(e)
-                                    continue
-                            elif returnTypes[returnType] == 'Decimal':
-                                try:
-                                    return returnActor[returnType](result)
-                                except Exception as e:
-                                    print(e)
-                                    continue
-                            elif returnTypes[returnType] == 'string':
+                    elif old_price in ['','d']:
+                        old_price=default_price
+
+                    new_price=Prompt.__init2__(None,func=FormBuilderMkText,ptext=f"New Price ($({default_price})):",helpText="A float or integer",data="float")
+                    if new_price is None:
+                        return None
+                    elif new_price in ['','d']:
+                        new_price=default_price
+
+                    taxed=Decimal(new_price)-Decimal(old_price)
+                    tax_rate=taxed/Decimal(old_price)
+                    tax_rate=tax_rate
+
+                    result=tax_rate
+                    return result
+
+                
+                self.options={
+                    f'{uuid1()}':{
+                        'cmds':['beverage price+tax+CRV','b-ptcrv',],
+                        'desc':f'{Fore.light_yellow}beverage Price+Tax+CRV{Fore.medium_violet_red} asking for base questions like bottle size and qty to get total cost with tax{Style.reset}',
+                        'exec':beverage_PTCRV_base
+                    },
+                    f'{uuid1()}':{
+                        'cmds':['price+tax','p+t',],
+                        'desc':f'{Fore.light_yellow}Price+Tax{Fore.medium_violet_red} asking questions like price and qty to get total cost with tax{Style.reset}',
+                        'exec':price_tax
+                    },
+                    f'{uuid1()}':{
+                        'cmds':['crvttl','crv total','crvtotal','crv_total',],
+                        'desc':f'{Fore.light_yellow}total crv{Fore.medium_violet_red} asking questions like price and qty to get total crv{Style.reset}',
+                        'exec':crv_total
+                    },
+                    f'{uuid1()}':{
+                        'cmds':['tax+crv','t+c','tax crv',],
+                        'desc':f'{Fore.light_yellow}tax+crv{Fore.medium_violet_red} asking questions like price and qty to get total crv{Style.reset}',
+                        'exec':tax_with_crv
+                    },
+                    f'{uuid1()}':{
+                        'cmds':['tax','tax no crv','tax 0 crv',],
+                        'desc':f'{Fore.light_yellow}tax w/o crv{Fore.medium_violet_red} asking questions like price and qty to get total tax without crv{Style.reset}',
+                        'exec':tax_no_crv
+                    },
+                    f'{uuid1()}':{
+                        'cmds':['trfpt','tax_rate_from_price_and_tax','tax rate from price and tax','taxRateFromPriceAndTax',],
+                        'desc':f'{Fore.light_yellow}tax rate{Fore.medium_violet_red} from price and tax as a decimal{Style.reset}',
+                        'exec':tax_rate_from_priceAndTax
+                    },
+                    f'{uuid1()}':{
+                        'cmds':['tax_rate_from_old_price_and_new_price','tax rate from old price and new price','taxRateFromOldPriceAndNewPrice','trfopnp',],
+                        'desc':f'{Fore.light_yellow}tax rate{Fore.medium_violet_red} from old price and new price{Style.reset}',
+                        'exec':tax_rate_from_oldPriceAndNewPrice
+                    },
+                    f'{uuid1()}':{
+                        'cmds':['tax decimal','taxdecimal'],
+                        'desc':f'{Fore.light_yellow}tax rate decimal{Fore.medium_violet_red} from percent{Style.reset}',
+                        'exec':tax_rate_decimal
+                    },
+                    f'{uuid1()}':{
+                        'cmds':['fcmd','findcmd','find cmd'],
+                        'desc':f'Find {Fore.light_yellow}cmd{Fore.medium_violet_red}and excute for return{Style.reset}',
+                        'exec':self.findAndUse2
+                    },
+                    }
+                for num,i in enumerate(self.options):
+                    self.options[i]['cmds'].append(str(num))
+                options=copy(self.options)
+                while True:                
+                    helpText=[]
+                    for i in options:
+                        msg=f"{Fore.light_green}{options[i]['cmds']}{Fore.light_red} -> {options[i]['desc']}{Style.reset}"
+                        helpText.append(msg)
+                    helpText='\n'.join(helpText)
+                    print(helpText)
+                    print(defaults_msg)
+                    cmd=Prompt.__init2__(None,func=FormBuilderMkText,ptext="Pricing Analisys Tool|Do What?:",helpText=helpText,data="string")
+                    if cmd is None:
+                        return None
+                    result=None
+                    for i in options:
+                        els=[ii.lower() for ii in options[i]['cmds']]
+                        if cmd.lower() in els:
+                            result=options[i]['exec']()
+                            break
+                    print(f"{result}")
+                    returnResult=Prompt.__init2__(None,func=FormBuilderMkText,ptext="Return Result?[y/n]",helpText=f"result to return is '{result}'",data="boolean")
+                    if returnResult in [True,]:
+                        if result is None:
+                            return None
+                        else:
+                            returnTypes=["float","Decimal","string","string"]
+                            returnActor=[lambda x:round(float(x),4),lambda x:Decimal(x).quantize(Decimal("0.0000")),lambda x: f"{x:.4f}",lambda x:str(x)]
+                            ct=len(returnTypes)
+                            returnType=None
+                            htext=[]
+                            strOnly=False
+                            for num,i in enumerate(returnTypes):
                                 try:
-                                    return returnActor[returnType](result)
+                                    htext.append(std_colorize(f"{i} - {returnActor[num](result)} ",num,ct))
                                 except Exception as e:
+                                    strOnly=True
                                     print(e)
-                                    continue
-                            else:
+                            htext='\n'.join(htext)
+                            while returnType not in range(0,ct+1):
+                                print(htext)
+                                returnType=Prompt.__init2__(self,func=FormBuilderMkText,ptext="Return the value as?",helpText=f"{htext}\nwhich index?",data="integer")
+                                if returnType is None:
+                                    return None
+                                elif returnType in ['d',]:
+                                    if not strOnly:   
+                                        returnType=1
+                                    else:
+                                        returnType=-1
+                                        break
+                                        #return str(result)
+                            try:
+                                if returnTypes[returnType] == 'float':
+                                    try:
+                                        return returnActor[returnType](result)
+                                    except Exception as e:
+                                        print(e)
+                                        continue
+                                elif returnTypes[returnType] == 'Decimal':
+                                    try:
+                                        return returnActor[returnType](result)
+                                    except Exception as e:
+                                        print(e)
+                                        continue
+                                elif returnTypes[returnType] == 'string':
+                                    try:
+                                        return returnActor[returnType](result)
+                                    except Exception as e:
+                                        print(e)
+                                        continue
+                                else:
+                                    return result
+                            except Exception as e:
+                                print(e)
+                                print("returning as a string")
                                 return result
-                        except Exception as e:
-                            print(e)
-                            print("returning as a string")
-                            return result
-                    return result                
-        except Exception as e:
-            print(e,str(e),repr(e))
+                        return result                
+            except Exception as e:
+                print(e,str(e),repr(e))
 
 class TasksMode:
     def set_inList(self):
@@ -937,8 +1088,6 @@ class TasksMode:
         else:
             return text
 
-    pricing=lambda x:pricing(None)
-
     Lookup=Lookup2
     #extra is for future expansion
     def exportList2Excel(self,fields=False,extra=[]):
@@ -4831,6 +4980,9 @@ where:
                 msg=f"{tmp}{color1_field}{k}{Style.reset} - {'|'.join([f'{cmd_alter}{i}{Style.reset}' for i in location_fields[k]])}"
                 print(msg)
 
+        self.formulae=Formulae()
+        self.formulaeu=self.formulae.formulaeu
+        self.pricing=self.formulae.pricing
         for entry in self.valid_fields:
             self.options[entry]={
                     'cmds':["#"+str(count),f"ls {entry}"],

radboy/__init__.py

@@ -1 +1 @@
-VERSION='0.0.544'
+VERSION='0.0.546'

{radboy-0.0.544.dist-info → radboy-0.0.546.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: radboy
-Version: 0.0.544
+Version: 0.0.546
 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.544.dist-info → radboy-0.0.546.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=yPpiYPBK90fk2N3yya3FR3e6KYU0Tx6U-wS9MlYOUtw,17
+radboy/__init__.py,sha256=M4GNJjPNUq8u7e8Sqq14tiWOGezP5HtZePM-xgWZTlk,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
@@ -84,7 +84,7 @@ radboy/DB/ExerciseTracker.py,sha256=OS9i8jGIZPj-6m1bB0-eKNHQ6vf2iv_AYPEc0s4bkBM,
 radboy/DB/PayDay.py,sha256=H2kPGvBCDkMOz7lbxQhYtUt_oAInpxi37Q6MFrah98I,8710
 radboy/DB/PayModels.py,sha256=hjwWxP7PL33hmfzQl5YTf0HqzaMxXJxFknPdxFJXJc8,3499
 radboy/DB/PrintLogging.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-radboy/DB/Prompt.py,sha256=5fwbxVNXwYDuX9s8slOdcnX_ixMOVbmmaVMN41Myv9Y,154476
+radboy/DB/Prompt.py,sha256=WCWuui0xKnIUkflX7XekWlm6PE8U6G1DpKX8BDXhy-s,155135
 radboy/DB/RandomStringUtil.py,sha256=eZCpR907WStgfbk4Evcghjv9hOkUDXH-iMXIq0-kXq8,24386
 radboy/DB/ResetTools.py,sha256=RbI-Ua7UlsN0S9qLqtEkTWvzyTZ6R-hHR3CW4NHlUPE,6660
 radboy/DB/SMLabelImporter.py,sha256=eUoBDxVUUEKGL2g_PwkASM67ZB7FmXtSnn4bCagskhY,4013
@@ -108,7 +108,7 @@ radboy/DB/__pycache__/FormBuilder.cpython-312.pyc,sha256=p1o-5SMRL8OXP_XQ5liUpf-
 radboy/DB/__pycache__/PrintLogging.cpython-312.pyc,sha256=pIAFqTi6OiQQORSc-oMH1zAbsdH7sY1TifxrN_QOvnU,148
 radboy/DB/__pycache__/Prompt.cpython-311.pyc,sha256=P2uPRpeqfLFtxieZ0JHBG3X_HZzWUCsFSLb_fpRqky0,6407
 radboy/DB/__pycache__/Prompt.cpython-312.pyc,sha256=6CcQ1gE2hcz3cKPjo4f6d7xNM2PTDnl8NzQG0Pme5BE,142886
-radboy/DB/__pycache__/Prompt.cpython-313.pyc,sha256=UqbcDnIcJtC848VBcX4-Ik3JzzEj_vKlc23dvp_S6HA,235023
+radboy/DB/__pycache__/Prompt.cpython-313.pyc,sha256=6-hov-d3xNlsB35U_aL1cfneJ4-z9FsJltT5ixfFmcg,236020
 radboy/DB/__pycache__/RandomStringUtil.cpython-312.pyc,sha256=TrbEY89MuLmNlvoo5d8vOE6Dyshh5_EMlTZvk8MDVN4,48597
 radboy/DB/__pycache__/RandomStringUtil.cpython-313.pyc,sha256=MCcgVwV2Y-9rAY2FVaJZCKcou3HDX70EZudoiCigT0o,49217
 radboy/DB/__pycache__/ResetTools.cpython-311.pyc,sha256=4Vyc57iAAF0yRPjjglnVKovnTn8OoFIi6Zok3Wpj_YM,9292
@@ -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=KjvGW2RMQta9ycAvDNjbG0iaVHbprXK7O28DPIhyJhk,34169
+radboy/HealthLog/HealthLog.py,sha256=OK4NPcQbIUJHeyJ1H6kWjspkcL_V5n79rUNEWYkGxfQ,34172
 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=7z2GOn50X_wv1djAtOH42fjtkBvzicSw6008H4EzoC4,53283
+radboy/HealthLog/__pycache__/HealthLog.cpython-313.pyc,sha256=KxkqwBgsOZ5rRRIWtwkq8Y0yd-fJcPOa4A2F8AV4diI,53286
 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=dHF9SiYdiG5kdV6pxsMuJ9xVXUN-o2ldn55EU76bjTw,330911
+radboy/TasksMode/Tasks.py,sha256=za4WwmXUtucq1kUjF3ncgFTHuQDtUns7ZAOShhsaUqs,340152
 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=QpGdmGuU2Zm-iuk7MtejxCmwoAqpWIUZtY7f74V8ZIg,403448
+radboy/TasksMode/__pycache__/Tasks.cpython-313.pyc,sha256=CqZ6fIaMnYj1chMZy1PjxJr_r0ERk3FkRjQipyujVCw,412318
 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=1zEpd0RqInh0ymTkHBdESXjY_YNCg_fuHIRjBfZFRMo,165
+radboy/__pycache__/__init__.cpython-313.pyc,sha256=iSo13-BDByUwtyCmbDxnkbRvJ2jF6rJo8uCn2ZP6gbE,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
@@ -422,7 +422,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.544.dist-info/METADATA,sha256=sBkxbz1vSfgT-S7T21I3tniT59zOhEa5W22AXATyGiE,1615
-radboy-0.0.544.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-radboy-0.0.544.dist-info/top_level.txt,sha256=mlM0RWMUxGo1YHnlLmYrHOgGdK4XNRpr7nMFD5lR56c,7
-radboy-0.0.544.dist-info/RECORD,,
+radboy-0.0.546.dist-info/METADATA,sha256=DrC6-7KyNXi-L76na-7dnPTq1T0VgxGE5slIVhNi_us,1615
+radboy-0.0.546.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+radboy-0.0.546.dist-info/top_level.txt,sha256=mlM0RWMUxGo1YHnlLmYrHOgGdK4XNRpr7nMFD5lR56c,7
+radboy-0.0.546.dist-info/RECORD,,