radboy 0.0.509__py3-none-any.whl → 0.0.511__py3-none-any.whl

radboy/DB/Prompt.py

@@ -2513,9 +2513,14 @@ degress fahrenheite - degF
                     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.TasksMode.pricing(None)
+                        t=TM.Tasks.pricing(None)
                         if t is not None:
-                            return func(str(t),data)
+                            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

@@ -417,12 +417,35 @@ class HealthLogUi:
 
 	def showAllField(self,fields=[],not_none=[]):
 		try:
+			useDateRange=Prompt.__init2__(None,func=FormBuilderMkText,ptext="use a date range?",helpText="yes or no",data="boolean")
+			if useDateRange is None:
+				return
+			elif useDateRange in ['d',]:
+				useDateRange=True
+
 			gf=fields
 			fields.extend(["DTOE","HLID","Comments"])
 			fields=[i for i in HealthLog.__table__.columns if str(i.name) in fields]
 			not_none=[i for i in HealthLog.__table__.columns if str(i.name) in not_none]
 			with Session(ENGINE) as session:
 				results=session.query(HealthLog).filter(or_(*[i!=None for i in not_none]))
+				if useDateRange:
+					default_sd=datetime.now()-timedelta(days=30)
+					start_date=Prompt.__init2__(None,func=FormBuilderMkText,ptext=f"Start Date(default = {default_sd}):",helpText="start date",data="datetime")
+					if start_date is None:
+						return
+					elif start_date in ['d',]:
+						start_date=default_sd
+
+					default_ed=datetime.now()
+					end_date=Prompt.__init2__(None,func=FormBuilderMkText,ptext=f"End Date(default = {default_ed}):",helpText="end date",data="datetime")
+					if end_date is None:
+						return
+					elif end_date in ['d',]:
+						end_date=default_ed
+
+					results=results.filter(and_(HealthLog.DTOE>=start_date,HealthLog.DTOE<=end_date))
+
 				results=orderQuery(results,HealthLog.DTOE)
 				
 				graph_it=Prompt.__init2__(None,func=FormBuilderMkText,ptext="Graph Results (if possible)[y/N]:",helpText="yes or no; default is No.",data="boolean")

radboy/TasksMode/Tasks.py

@@ -288,7 +288,358 @@ 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 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))
+
+                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
+
+                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=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)
+
+                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
+
+                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))+crv
+                tax=price*Decimal(tax_rate)
 
+                result=tax
+                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
+
+                if xxx.magnitude < 24:
+                    crv=Decimal(0.05)*Decimal(bottle_qty)
+                else:
+                    crv=Decimal(0.10)*Decimal(bottle_qty)
+
+                
+                result=crv
+                return result
+
+            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
+
+
+                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
+
+                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)
+
+                result=(price+tax)
+                return result
+
+            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
+
+
+                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
+
+                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)
+
+                result=tax
+                return result
+
+            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
+
+
+                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
+
+
+                tax_rate=Decimal(taxed)/Decimal(price)
+
+                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
+
+            
+            options={
+                '0':{
+                    'cmds':['beverage price+tax+CRV','b-ptcrv','0'],
+                    '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
+                },
+                '1':{
+                    'cmds':['price+tax','p+t','1'],
+                    '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
+                },
+                '2':{
+                    'cmds':['crvttl','crv total','crvtotal','crv_total','2'],
+                    '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
+                },
+                '3':{
+                    'cmds':['tax+crv','t+c','tax crv','3'],
+                    '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
+                },
+                '4':{
+                    'cmds':['tax','tax no crv','tax 0 crv','4'],
+                    '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
+                },
+                '5':{
+                    'cmds':['trfpt','tax_rate_from_price_and_tax','tax rate from price and tax','taxRateFromPriceAndTax','5'],
+                    '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
+                },
+                '6':{
+                    'cmds':['tax_rate_from_old_price_and_new_price','tax rate from old price and new price','taxRateFromOldPriceAndNewPrice','trfopnp','6'],
+                    'desc':f'{Fore.light_yellow}tax rate{Fore.medium_violet_red} from old price and new price{Style.reset}',
+                    'exec':tax_rate_from_oldPriceAndNewPrice
+                },
+                }
+            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:.4f}")
+                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"]
+                        returnActor=[lambda x:round(float(x),4),lambda x:Decimal(x).quantize(Decimal("0.0000")),lambda x: f"{x:.4f}"]
+                        ct=len(returnTypes)
+                        returnType=None
+                        htext='\n'.join([std_colorize(f"{i} - {returnActor[num](result)} ",num,ct) for num,i in enumerate(returnTypes)])
+                        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',]:
+                                returnType=1
+
+                        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
+                    return result                
+        except Exception as e:
+            print(e,str(e),repr(e))
 
 class TasksMode:
     def set_inList(self):
@@ -499,321 +850,7 @@ class TasksMode:
         else:
             return text
 
-    def pricing(self):
-        prec=int(detectGetOrSet("Price/Tax/CRV Calculator Precision",4,setValue=False,literal=True))
-        getcontext().prec=prec
-        while True:
-            try:
-                default_taxrate=float(Decimal(detectGetOrSet("Tax Rate",0.0925,setValue=False,literal=True)))
-                default_price=float(Decimal(detectGetOrSet("pricing default price",1,setValue=False,literal=True)))
-                default_bottle_qty=float(Decimal(detectGetOrSet("pricing default bottle_qty",1,setValue=False,literal=True)))
-                default_bottle_size=float(Decimal(detectGetOrSet("pricing default bottle_size",16.9,setValue=False,literal=True)))
-                default_purchased_qty=float(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}
-{Fore.grey_70}Price/Tax/CRV Calculator Precision=={Fore.light_yellow}{prec}{Style.reset}"""
-
-                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))
-
-                    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
-
-                    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=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)
-
-                    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
-
-                    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(Decimal(price)*Decimal(purchased_qty))+crv
-                    tax=price*Decimal(tax_rate)
-
-                    result=round(float(tax),prec)
-                    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
-
-                    if xxx.magnitude < 24:
-                        crv=Decimal(0.05)*Decimal(bottle_qty)
-                    else:
-                        crv=Decimal(0.10)*Decimal(bottle_qty)
-
-                    
-                    result=round(float(crv),prec)
-                    return result
-
-                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
-
-
-                    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
-
-                    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)
-
-                    result=round(float(price+tax),3)
-                    return result
-
-                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
-
-
-                    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
-
-                    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)
-
-                    result=round(float(tax),prec)
-                    return result
-
-                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
-
-
-                    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
-
-
-                    tax_rate=Decimal(taxed)/Decimal(price)
-
-                    result=round(float(tax_rate),prec)
-                    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=round(float(tax_rate),prec)
-
-                    result=tax_rate
-                    return result
-
-                while True:
-                    options={
-                    '0':{
-                        'cmds':['beverage price+tax+CRV','b-ptcrv','0'],
-                        '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
-                    },
-                    '1':{
-                        'cmds':['price+tax','p+t','1'],
-                        '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
-                    },
-                    '2':{
-                        'cmds':['crvttl','crv total','crvtotal','crv_total','2'],
-                        '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
-                    },
-                    '3':{
-                        'cmds':['tax+crv','t+c','tax crv','3'],
-                        '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
-                    },
-                    '4':{
-                        'cmds':['tax','tax no crv','tax 0 crv','4'],
-                        '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
-                    },
-                    '5':{
-                        'cmds':['trfpt','tax_rate_from_price_and_tax','tax rate from price and tax','taxRateFromPriceAndTax','5'],
-                        '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
-                    },
-                    '6':{
-                        'cmds':['tax_rate_from_old_price_and_new_price','tax rate from old price and new price','taxRateFromOldPriceAndNewPrice','trfopnp','6'],
-                        'desc':f'{Fore.light_yellow}tax rate{Fore.medium_violet_red} from old price and new price{Style.reset}',
-                        'exec':tax_rate_from_oldPriceAndNewPrice
-                    },
-                    }
-                    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(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,]:
-                        return result
-            except Exception as e:
-                print(e,str(e),repr(e))
+    pricing=lambda x:pricing(None)
 
     Lookup=Lookup2
     #extra is for future expansion

radboy/__init__.py

@@ -1 +1 @@
-VERSION='0.0.509'
+VERSION='0.0.511'

{radboy-0.0.509.dist-info → radboy-0.0.511.dist-info}/METADATA

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

{radboy-0.0.509.dist-info → radboy-0.0.511.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=5SFcglufx8WX4ui1Pqz-e1Gwv-liL1K2f-RmQAWBJ3Q,17
+radboy/__init__.py,sha256=0bYqvxXNH-_PZLqmeCvb3zEhxhRySRS2pQWv7FAdRQM,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
@@ -85,7 +85,7 @@ radboy/DB/ExerciseTracker.py,sha256=CZ8jdKJiAE_QTAiJTRXi8ZOnS1NUiSvWVSKLHLpYVGk,
 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=Q0KWXkWDH1meNEASMRzZGhdLRLYNiuE4U7W75mYeEuo,148951
+radboy/DB/Prompt.py,sha256=1FeELafoUmliQy8ywkjoFFDFH_rFVlgRktqBHsvP42g,149140
 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
@@ -109,7 +109,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=OOjphTJL4QlfPMjT2RTN64o48ha7NE6-OU_YjJFQ5g8,225514
+radboy/DB/__pycache__/Prompt.cpython-313.pyc,sha256=UABt9gvRQJamABeYQsZwKB1TTEECTRH7xDFpKk0FITQ,225622
 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
@@ -210,10 +210,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=9tCpmi6u7N1zSCGCTf1f5NxKl0ht-lvHmUSVqnk8zh4,26664
+radboy/HealthLog/HealthLog.py,sha256=2bj25RV5OnsctAnmNdWuczZywqSd2nFEofrqpqKIw-Q,27554
 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=tAS1OoGfGi-opNhHAI5Nn5YhiMPScE3ZqNj-H1jJkvs,42836
+radboy/HealthLog/__pycache__/HealthLog.cpython-313.pyc,sha256=ecA8q5T7_ysyMNJM2jkecZYQv2Q_UekX6lKDog3NFxQ,43896
 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
@@ -342,7 +342,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=u7BTI3Mvcqf8eTfMjq1KCejsgGMbQjNriQ1XktpQ6QA,322012
+radboy/TasksMode/Tasks.py,sha256=SkJO-5i7TRS06GPc81JJpmkI9AuKvbN-ccde08KDAdw,322682
 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
@@ -351,7 +351,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=u-cXjtxGpPcMLZxxKssnP9ywRrno26j7s_1Fs7qgK50,394855
+radboy/TasksMode/__pycache__/Tasks.cpython-313.pyc,sha256=aW65VhVJpNzQlJERYQICBfvuPUkMuT2O8Gm6oRSivJQ,396024
 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
@@ -398,7 +398,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=8wvywsmXQr6G-Rv4NRNgGIutOR2Aqj-g907osbWTdEM,165
+radboy/__pycache__/__init__.cpython-313.pyc,sha256=jGp54ci4ysdNJGXJt7Earfh7T7ZP4927RWZlQpfu28w,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
@@ -423,7 +423,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.509.dist-info/METADATA,sha256=m2UAppFNyzV_J7Q8p6CBekgV78DfLdfnu12ByUysDdU,1601
-radboy-0.0.509.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-radboy-0.0.509.dist-info/top_level.txt,sha256=mlM0RWMUxGo1YHnlLmYrHOgGdK4XNRpr7nMFD5lR56c,7
-radboy-0.0.509.dist-info/RECORD,,
+radboy-0.0.511.dist-info/METADATA,sha256=OJdSC4LnPUMeMIhHyT15jU33UXvgoYpknX9FXGhQhGg,1601
+radboy-0.0.511.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+radboy-0.0.511.dist-info/top_level.txt,sha256=mlM0RWMUxGo1YHnlLmYrHOgGdK4XNRpr7nMFD5lR56c,7
+radboy-0.0.511.dist-info/RECORD,,