radboy 0.0.408__tar.gz → 0.0.410__tar.gz

{radboy-0.0.408 → radboy-0.0.410}/PKG-INFO

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

radboy-0.0.410/STDOUT.TXT

@@ -0,0 +1,31 @@
+#USER INPUT# -> :"t"
+#USER INPUT# -> :"mksl"
+#USER INPUT# -> :""
+#USER INPUT# -> :""
+#USER INPUT# -> :""
+#USER INPUT# -> :"ph"
+#USER INPUT# -> :"use"
+#USER INPUT# -> :"b"
+#USER INPUT# -> :"b"
+#USER INPUT# -> :"lsbld"
+#USER INPUT# -> :"n"
+#USER INPUT# -> :""
+#USER INPUT# -> :"842595106596"
+#USER INPUT# -> :"qc"
+#USER INPUT# -> :"set"
+#USER INPUT# -> :"2"
+#USER INPUT# -> :"0"
+#USER INPUT# -> :"2.49"
+#USER INPUT# -> :"y"
+#USER INPUT# -> :""
+#USER INPUT# -> :"lsbld"
+#USER INPUT# -> :""
+#USER INPUT# -> :""
+#USER INPUT# -> :"q"
+#USER INPUT# -> :"e"
+#USER INPUT# -> :"lsbld"
+#USER INPUT# -> :""
+#USER INPUT# -> :""
+#USER INPUT# -> :"q"
+#USER INPUT# -> :"e"
+#USER INPUT# -> :"0.0.410"

{radboy-0.0.408 → radboy-0.0.410}/pyproject.toml

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

{radboy-0.0.408 → radboy-0.0.410}/radboy/DB/Prompt.py

@@ -67,44 +67,41 @@ def getExtras(entryId,extras):
 def getSuperTotal(results,location_fields,colormapped):
     with db.Session(db.ENGINE) as session:
         ROUNDTO=int(db.detectGetOrSet("lsbld ROUNDTO default",3,setValue=False,literal=True))
-        master_total=0
-        master_total_crv=0
-        master_total_tax=0
-        master_total_tax_crv=0
+        master_total=Decimal("0.00")
+        master_total_crv=Decimal("0.00")
+        master_total_tax=Decimal("0.00")
+        master_total_tax_crv=Decimal("0.00")
         for num,i in enumerate(results):
-            total=0
-            crv=0
-            tax=0
-            tax_crv=0
-            i.Tax=round(i.Tax,ROUNDTO)
-            i.CRV=round(i.CRV,ROUNDTO)
-            i.Price=round(i.Price,ROUNDTO)
+            total=Decimal("0.00")
+            crv=Decimal("0.00")
+            tax=Decimal("0.00")
+            tax_crv=Decimal("0.00")
+            i.Tax=Decimal(i.Tax).quantize(Decimal("0.00"))
+            i.CRV=Decimal(i.CRV).quantize(Decimal("0.00"))
+            i.Price=Decimal(i.Price).quantize(Decimal("0.00"))
             session.commit()
             for n2,f in enumerate(location_fields):
                 try:
                     if getattr(i,f) > 0:
-                        total+=getattr(i,f)
+                        total+=Decimal(getattr(i,f)).quantize(Decimal("0.00"))
                 except Exception as e:
                     print(e)
             
-            master_total+=total*round(i.Price,ROUNDTO)
-
-            crv+=(round(i.CRV,ROUNDTO)*total)
-            tax+=(round(i.Tax,ROUNDTO)*total)
+            master_total+=(total*i.Price)
+            #print("exegen 01")
+            crv+=(i.CRV*total)
+            tax+=(i.Tax*total)
             if tax == 0 and crv > 0:
-                tax_crv=(round(i.CRV,ROUNDTO)*total)
+                tax_crv=(i.CRV*total)
             else:
-                tax_crv+=((round(i.Tax,ROUNDTO)*total)+(round(i.CRV,ROUNDTO)*total))
+                #print("exegen 011")
+                tax_crv+=((i.Tax*total)+(i.CRV*total))
             master_total_tax+=tax
             master_total_crv+=crv
             master_total_tax_crv+=tax_crv
-            tax_crv=round(tax_crv,ROUNDTO)
+            tax_crv=tax_crv
 
-        master_total=round(master_total,ROUNDTO)
-        master_total_crv=round(master_total_crv,ROUNDTO)
-        master_total_tax=round(master_total_tax,ROUNDTO)
-        master_total_tax_crv=round(master_total_tax_crv,ROUNDTO)
-        return {'final total':round(master_total_tax_crv+master_total,ROUNDTO),'master_total_tax_crv':master_total_tax_crv,'master_total_tax':master_total_tax,'master_total_crv':master_total_crv,'sub_total':master_total}
+        return {'final total':master_total_tax_crv+master_total,'master_total_tax_crv':master_total_tax_crv,'master_total_tax':master_total_tax,'master_total_crv':master_total_crv,'sub_total':master_total}
 
 
 class Obfuscate:
@@ -888,10 +885,10 @@ class Prompt(object):
                     return
                 #start
                 ROUNDTO=int(db.detectGetOrSet("lsbld ROUNDTO default",3,setValue=False,literal=True))
-                master_total=0
-                master_total_crv=0
-                master_total_tax=0
-                master_total_tax_crv=0
+                master_total=Decimal("0.00")
+                master_total_crv=Decimal("0.00")
+                master_total_tax=Decimal("0.00")
+                master_total_tax_crv=Decimal("0.00")
 
                 for num,i in enumerate(results):
                     getExtras(i.EntryId,extras)
@@ -915,24 +912,25 @@ class Prompt(object):
                     Fore.deep_pink_4c,
                     Fore.orange_3,
                     ]
-                    total=0
-                    crv=0
-                    tax=0
-                    tax_crv=0
-                    i.Tax=round(i.Tax,ROUNDTO)
-                    i.CRV=round(i.CRV,ROUNDTO)
-                    i.Price=round(i.Price,ROUNDTO)
-                    session.commit()
+                    #print("#0")
+                    total=Decimal("0.00")
+                    crv=Decimal("0.00")
+                    tax=Decimal("0.0000")
+                    tax_crv=Decimal("0.00")
+                    i.Tax=Decimal(i.Tax).quantize(Decimal("0.00"))
+                    i.CRV=Decimal(i.CRV).quantize(Decimal("0.00"))
+                    i.Price=Decimal(i.Price).quantize(Decimal("0.00"))
+                    #print("#1")
                     if not minus:
                         for n2,f in enumerate(location_fields):
                             try:
                                 if getattr(i,f) > 0:
-                                    total+=getattr(i,f)
+                                    total+=Decimal(getattr(i,f)).quantize(Decimal("0.00"))
                             except Exception as e:
                                 print(e)
                         for n2,f in enumerate(location_fields):
                             if getattr(i,f) > 0:
-                                msg2=f'{colormapped[n2]}{f} = {round(getattr(i,f),ROUNDTO)}{Style.reset}'
+                                msg2=f'{colormapped[n2]}{f} = {Decimal(getattr(i,f)).quantize(Decimal("0.00"))}{Style.reset}'
                                 if n2 < len(location_fields):
                                     msg2+=","
                                 msg+=msg2
@@ -945,52 +943,54 @@ class Prompt(object):
                                 print(e)
                         for n2,f in enumerate(location_fields):
                             if getattr(i,f) != 0:
-                                msg2=f'{colormapped[n2]}{f} = {round(getattr(i,f),3)}{Style.reset}'
+                                msg2=f'{colormapped[n2]}{f} = {Decimal(str(getattr(i,f))).quantize(Decimal("0.00"))}{Style.reset}'
                                 if n2 < len(location_fields):
                                     msg2+=","
                                 msg+=msg2
-                    master_total+=total*round(i.Price,ROUNDTO)
+                    master_total+=total*Decimal(i.Price).quantize(Decimal("0.00"))
 
-                    crv+=(round(i.CRV,ROUNDTO)*total)
-                    tax+=(round(i.Tax,ROUNDTO)*total)
+                    crv+=(Decimal(i.CRV).quantize(Decimal("0.00"))*total)
+                    tax+=(Decimal(i.Tax).quantize(Decimal("0.00"))*total)
                     if tax == 0 and crv > 0:
-                        tax_crv=(round(i.CRV,ROUNDTO)*total)
+                        tax_crv=(Decimal(i.CRV).quantize(Decimal("0.00"))*total)
                     else:
-                        tax_crv+=((round(i.Tax,ROUNDTO)*total)+(round(i.CRV,ROUNDTO)*total))
+                        tax_crv+=(Decimal(i.Tax).quantize(Decimal("0.00"))*total)+(Decimal(i.CRV).quantize(Decimal("0.00")*total))
                     master_total_tax+=tax
                     master_total_crv+=crv
                     master_total_tax_crv+=tax_crv
-                    tax_crv=round(tax_crv,ROUNDTO)
+                    #print("#exegen",type(total),type(tax_crv))
                     try:
-                        super_total=(round(round(round(total*i.Price,ROUNDTO)+tax_crv,ROUNDTO)/getSuperTotal(results,location_fields,colormapped)['final total'],ROUNDTO))*100
+                        #super_total=(round(round(round(total*i.Price,ROUNDTO)+tax_crv,ROUNDTO)/getSuperTotal(results,location_fields,colormapped)['final total'],ROUNDTO))*100
+                        super_total=(total*Decimal(i.Price).quantize(Decimal("0.00"))+tax_crv)/Decimal(getSuperTotal(results,location_fields,colormapped)['final total']*100).quantize(Decimal("100.1500"))
                     except Exception as e:
-                        p1=round(round(round(total*i.Price,ROUNDTO)+tax_crv,ROUNDTO))
-                        p2=getSuperTotal(results,location_fields,colormapped)['final total']
+                        p1=total*Decimal(i.Price).quantize(Decimal("0.00"))+tax_crv
+                        p2=Decimal(getSuperTotal(results,location_fields,colormapped)['final total']).quantize(Decimal("0.00"))
                         print(e)
                         print(p1,"p1")
                         print(p2,"p2")
                         super_total=0
-                    msg+=f"""{Fore.light_magenta} |-|{Fore.light_green} Total = {Fore.light_sea_green}{round(total,ROUNDTO)}
-{Fore.light_magenta}Price({i.Price}){Fore.medium_violet_red}*{Fore.light_slate_blue}Total({round(total,ROUNDTO)}):{round(i.Price*total,ROUNDTO)}
-{Fore.grey_70}+CRV({i.CRV})*Total({round(total,ROUNDTO)}){Fore.slate_blue_1}\n=TotalCRV({crv})+TotalPrice({round(total*i.Price,ROUNDTO)})=NetPrice({round(total*i.Price,ROUNDTO)+crv})
-{Fore.grey_70}+Tax({i.Tax}) w/o CRV({i.CRV})*Total({round(total,ROUNDTO)}){Fore.slate_blue_1}\n=TaxNoCRVTotal({tax})+TotalPrice({round(total*i.Price,ROUNDTO)})=NetPrice({round(round(total*i.Price,ROUNDTO)+tax,ROUNDTO)})
-{Fore.grey_70}+Tax({i.Tax}) w/ CRV({i.CRV})*Total({round(total,ROUNDTO)}){Fore.slate_blue_1}\n=TaxCRVTotal({tax_crv})+TotalPrice({round(total*i.Price,ROUNDTO)})=NetPrice({round(round(total*i.Price,ROUNDTO)+tax_crv,ROUNDTO)})
-{Fore.medium_violet_red}PercentOfTotal({round(super_total,ROUNDTO)}) of Total({getSuperTotal(results,location_fields,colormapped)['final total']})
+                    #print("#exegen2")
+                    msg+=f"""{Fore.light_magenta} |-|{Fore.light_green} Total = {Fore.light_sea_green}{total}
+{Fore.light_magenta}Price({Decimal(i.Price).quantize(Decimal("0.00"))}){Fore.medium_violet_red}*{Fore.light_slate_blue}Total({total}):{Decimal(i.Price).quantize(Decimal("0.00"))*total}
+{Fore.grey_70}+CRV({Decimal(i.CRV).quantize(Decimal("0.00"))})*Total({round(total,ROUNDTO)}){Fore.slate_blue_1}\n=TotalCRV({crv})+TotalPrice({total*Decimal(i.Price).quantize(Decimal("0.00"))})=NetPrice({total*Decimal(i.Price).quantize(Decimal("0.00"))+crv})
+{Fore.grey_70}+Tax({Decimal(i.Tax).quantize(Decimal("0.00"))}) w/o CRV({Decimal(i.CRV).quantize(Decimal("0.00"))})*Total({total}){Fore.slate_blue_1}\n=TaxNoCRVTotal({tax})+TotalPrice({round(total*i.Price,ROUNDTO)})=NetPrice({total*Decimal(i.Price).quantize(Decimal("0.00"))+tax})
+{Fore.grey_70}+Tax({Decimal(i.Tax).quantize(Decimal("0.00"))}) w/ CRV({Decimal(i.CRV).quantize(Decimal("0.00"))})*Total({total}){Fore.slate_blue_1}\n=TaxCRVTotal({tax_crv})+TotalPrice({round(total*i.Price,ROUNDTO)})=NetPrice({total*Decimal(i.Price).quantize(Decimal("0.00"))+tax_crv})
+{Fore.medium_violet_red}PercentOfTotal({super_total}) of Total({getSuperTotal(results,location_fields,colormapped)['final total']})
 {'*'*os.get_terminal_size().columns}{Style.reset}"""
                     if bldlse:
                         db.logInput(msg,user=False,filter_colors=True,maxed_hfl=False,ofile=Prompt.bld_file)
                     print(msg)
-                master_total=round(master_total,ROUNDTO)
-                master_total_crv=round(master_total_crv,ROUNDTO)
-                master_total_tax=round(master_total_tax,ROUNDTO)
-                master_total_tax_crv=round(master_total_tax_crv,ROUNDTO)
+                master_total=Decimal(str(master_total)).quantize(Decimal("0.00"))
+                master_total_crv=Decimal(str(master_total_crv)).quantize(Decimal("0.00"))
+                master_total_tax=Decimal(str(master_total_tax)).quantize(Decimal("0.00"))
+                master_total_tax_crv=Decimal(str(master_total_tax_crv)).quantize(Decimal("0.00"))
 
-                actual=master_total_crv+master_total+master_total_tax
+                actual=(master_total_crv+master_total)+master_total_tax
                 
-                msg=f"""{Fore.light_green}Total Product Value:{Fore.slate_blue_1}{round(master_total,ROUNDTO)}
-{Fore.light_green}Total Product Value w/CRV({master_total_crv}):{Fore.slate_blue_1}{round(master_total_crv+master_total,ROUNDTO)}
-{Fore.light_green}Total Product Value Taxed w/o CRV({master_total_tax}):{Fore.slate_blue_1}{round(master_total_tax+master_total,ROUNDTO)}
-{Fore.light_green}Total Product Value Taxed w/ CRV({master_total_tax_crv}):{Fore.slate_blue_1}{Decimal(str(actual)).quantize(Decimal("0.00"))}
+                msg=f"""{Fore.light_green}Total Product Value:{Fore.slate_blue_1}{master_total}
+{Fore.light_green}Total Product Value w/CRV({master_total_crv}):{Fore.slate_blue_1}{master_total_crv+master_total}
+{Fore.light_green}Total Product Value Taxed w/o CRV({master_total_tax}):{Fore.slate_blue_1}{master_total_tax+master_total}
+{Fore.light_green}Total Product Value Taxed w/ CRV({master_total_tax_crv}):{Fore.slate_blue_1}{actual}
                 {Style.reset}"""
                 if bldlse:
                     db.logInput(msg,user=False,filter_colors=True,maxed_hfl=False,ofile=Prompt.bld_file)

radboy-0.0.410/radboy/__init__.py

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

{radboy-0.0.408 → radboy-0.0.410}/radboy.egg-info/PKG-INFO

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

{radboy-0.0.408 → radboy-0.0.410}/setup.py

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

radboy-0.0.408/STDOUT.TXT

@@ -1,13 +0,0 @@
-#USER INPUT# -> :"t"
-#USER INPUT# -> :"i"
-#USER INPUT# -> :"fcmd"
-#USER INPUT# -> :"q"
-#USER INPUT# -> :"e"
-#USER INPUT# -> :"0.0.403"
-#USER INPUT# -> :"q"
-#USER INPUT# -> :"e"
-#USER INPUT# -> :"0.0.404"
-#USER INPUT# -> :"0.0.405"
-#USER INPUT# -> :"0.0.406"
-#USER INPUT# -> :"0.0.407"
-#USER INPUT# -> :"0.0.408"

radboy-0.0.408/radboy/__init__.py

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