radboy 0.0.563__tar.gz → 0.0.564__tar.gz

{radboy-0.0.563 → radboy-0.0.564}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: radboy
-Version: 0.0.563
+Version: 0.0.564
 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.563 → radboy-0.0.564}/STDOUT.TXT

@@ -3,10 +3,7 @@
 #USER INPUT# -> :""
 #USER INPUT# -> :""
 #USER INPUT# -> :""
-#USER INPUT# -> :"jtu"
-#USER INPUT# -> :""
-#USER INPUT# -> :"jcu"
-#USER INPUT# -> :""
 #USER INPUT# -> :"q"
 #USER INPUT# -> :"e"
 #USER INPUT# -> :"0.0.563"
+#USER INPUT# -> :"0.0.564"

{radboy-0.0.563 → radboy-0.0.564}/pyproject.toml

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

{radboy-0.0.563 → radboy-0.0.564}/radboy/DB/Prompt.py

@@ -191,14 +191,14 @@ def getSuperTotal(results,location_fields,colormapped):
             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"))
+            i.Tax=Decimal(i.Tax)
+            i.CRV=Decimal(i.CRV)
+            i.Price=Decimal(i.Price)
             session.commit()
             for n2,f in enumerate(location_fields):
                 try:
                     if getattr(i,f) > 0:
-                        total+=Decimal(getattr(i,f)).quantize(Decimal("0.00"))
+                        total+=Decimal(getattr(i,f))
                 except Exception as e:
                     print(e)
             
@@ -1098,12 +1098,12 @@ class Prompt(object):
                         crv=Decimal("0.0000")
                         tax=Decimal("0.0000")
                         tax_crv=Decimal("0.0000")
-                        i.Tax=Decimal(i.Tax).quantize(Decimal("0.0000"))
-                        i.CRV=Decimal(i.CRV).quantize(Decimal("0.0000"))
-                        i.Price=Decimal(i.Price).quantize(Decimal("0.0000"))
+                        i.Tax=Decimal(i.Tax)
+                        i.CRV=Decimal(i.CRV)
+                        i.Price=Decimal(i.Price)
                         try:
                             if (i.Price+i.CRV) > 0:
-                                taxRate=Decimal(i.Tax/(i.Price+i.CRV)).quantize(Decimal("0.0000"))
+                                taxRate=Decimal(i.Tax/(i.Price+i.CRV))
                             else:
                                 taxRate=Decimal('0.00000')
 
@@ -1120,12 +1120,12 @@ class Prompt(object):
                             for n2,f in enumerate(location_fields):
                                 try:
                                     if getattr(i,f) > 0:
-                                        total+=Decimal(getattr(i,f)).quantize(Decimal("0.0000"))
+                                        total+=Decimal(getattr(i,f))
                                 except Exception as e:
                                     print(e)
                             for n2,f in enumerate(location_fields):
                                 if getattr(i,f) > 0:
-                                    msg2=f'{colormapped[n2]}{f} = {Decimal(getattr(i,f)).quantize(Decimal("0.0000"))}{Style.reset}'
+                                    msg2=f'{colormapped[n2]}{f} = {Decimal(getattr(i,f))}{Style.reset}'
                                     if n2 < len(location_fields):
                                         msg2+=","
                                     msg+=msg2
@@ -1133,19 +1133,19 @@ class Prompt(object):
                             for n2,f in enumerate(location_fields):
                                 try:
                                     if getattr(i,f) != 0:
-                                        total+=Decimal(getattr(i,f)).quantize(Decimal("0.0000"))
+                                        total+=Decimal(getattr(i,f))
                                 except Exception as e:
                                     print(e)
                             for n2,f in enumerate(location_fields):
                                 if getattr(i,f) != 0:
-                                    msg2=f'{colormapped[n2]}{f} = {Decimal(str(getattr(i,f))).quantize(Decimal("0.0000"))}{Style.reset}'
+                                    msg2=f'{colormapped[n2]}{f} = {Decimal(str(getattr(i,f)))}{Style.reset}'
                                     if n2 < len(location_fields):
                                         msg2+=","
                                     msg+=msg2
-                        master_total+=total*Decimal(i.Price).quantize(Decimal("0.0000"))
+                        master_total+=total*Decimal(i.Price)
 
-                        crv+=(Decimal(i.CRV).quantize(Decimal("0.0000"))*total)
-                        tax+=(Decimal(i.Tax).quantize(Decimal("0.0000"))*total)
+                        crv+=(Decimal(i.CRV)*total)
+                        tax+=(Decimal(i.Tax)*total)
 
                         tax_crv=(crv+tax)
                         master_total_tax+=tax
@@ -1153,38 +1153,38 @@ class Prompt(object):
                         master_total_tax_crv+=tax_crv
                         #print("#exegen",type(total),type(tax_crv))
                         try:
-                            #print((total*Decimal(i.Price).quantize(Decimal("0.00"))+tax_crv),"s1")
+                            #print((total*Decimal(i.Price)+tax_crv),"s1")
                             #print(Decimal(getSuperTotal(results,location_fields,colormapped)['final total']).quantize(Decimal("00.00")),"s2")
                             #print(tax_crv,"s3")
                             #super_total=(round(round(round(total*i.Price,ROUNDTO)+tax_crv,ROUNDTO)/getSuperTotal(results,location_fields,colormapped)['final total'],ROUNDTO))*100
-                            if (total*Decimal(i.Price).quantize(Decimal("0.0000"))+tax+crv) > 0:
-                                super_total=(total*Decimal(i.Price).quantize(Decimal("0.0000"))+tax+crv)/Decimal(getSuperTotal(results,location_fields,colormapped)['final total']).quantize(Decimal("00.0000"))
+                            if (total*Decimal(i.Price)+tax+crv) > 0:
+                                super_total=(total*Decimal(i.Price)+tax+crv)/Decimal(getSuperTotal(results,location_fields,colormapped)['final total'])
                                 super_total=super_total*100
                             else:
                                 super_total=0
                         except Exception as e:
-                            p1=total*Decimal(i.Price).quantize(Decimal("0.0000"))+tax_crv
-                            p2=Decimal(getSuperTotal(results,location_fields,colormapped)['final total']).quantize(Decimal("0.0000"))
+                            p1=total*Decimal(i.Price)+tax_crv
+                            p2=Decimal(getSuperTotal(results,location_fields,colormapped)['final total'])
                             print(e)
                             print(p1,"p1")
                             print(p2,"p2")
                             super_total=0
                         #print("#exegen2")
-                        super_total=Decimal(super_total).quantize(Decimal("0.0000"))
+                        super_total=Decimal(super_total)
                         #print(super_total)
                         msg+=f"""{Fore.light_magenta} |-|{Fore.light_green} Total = {Fore.light_sea_green}{total}
-{Fore.light_magenta}Price({Decimal(i.Price).quantize(Decimal("0.0000"))}){Fore.medium_violet_red}*{Fore.light_slate_blue}Total({total}):{Decimal(i.Price).quantize(Decimal("0.0000"))*total}
-{Fore.grey_70}+CRV({Decimal(i.CRV).quantize(Decimal("0.0000"))})*Total({total.quantize(Decimal("0.0000"))}){Fore.slate_blue_1}
- {Fore.medium_spring_green}= {Fore.slate_blue_1}TotalCRV({crv})+TotalPrice({total*Decimal(i.Price).quantize(Decimal("0.0000"))})
- {Fore.medium_spring_green}= {Fore.green_3a}NetPrice({total*Decimal(i.Price).quantize(Decimal("0.0000"))+crv}){Style.reset}
-{Fore.grey_70}+Tax({Decimal(i.Tax).quantize(Decimal("0.0000"))}) w/o CRV({Decimal(i.CRV).quantize(Decimal("0.0000"))})*Total({total}){Fore.slate_blue_1}
- {Fore.medium_spring_green}= {Fore.slate_blue_1}TaxNoCRVTotal({tax})+TotalPrice({total*i.Price})
- {Fore.medium_spring_green}= {Fore.green_3a}NetPrice({total*Decimal(i.Price).quantize(Decimal("0.0000"))+tax}){Style.reset}
-{Fore.grey_70}+Tax({Decimal(i.Tax).quantize(Decimal("0.0000"))}) w/ CRV({Decimal(i.CRV).quantize(Decimal("0.0000"))})*Total({total}){Fore.slate_blue_1}
- {Fore.medium_spring_green}= {Fore.slate_blue_1}TaxCRVTotal({tax_crv})+TotalPrice({total*i.Price})
- {Fore.medium_spring_green}= {Fore.green_3a}NetPrice({total*Decimal(i.Price).quantize(Decimal("0.0000"))+tax+crv}){Style.reset}
-{Fore.medium_violet_red}PercentOfTotal({super_total}%) of FinalTotal({getSuperTotal(results,location_fields,colormapped)['final total']})
-{Fore.orange_red_1}TaxRate({taxRate})={Decimal(taxRate*100).quantize(Decimal("0.0000"))}%{Style.reset}
+{Fore.light_magenta}Price({Decimal(i.Price):.{getcontext().prec}f}){Fore.medium_violet_red}*{Fore.light_slate_blue}Total({total}):{Decimal(i.Price)*total:.{getcontext().prec}f}
+{Fore.grey_70}+CRV({Decimal(i.CRV):.{getcontext().prec}f})*Total({total}){Fore.slate_blue_1}
+ {Fore.medium_spring_green}= {Fore.slate_blue_1}TotalCRV({crv:.{getcontext().prec}f})+TotalPrice({total*Decimal(i.Price):.{getcontext().prec}f})
+ {Fore.medium_spring_green}= {Fore.green_3a}NetPrice({total*Decimal(i.Price)+crv:.{getcontext().prec}f}){Style.reset}
+{Fore.grey_70}+Tax({Decimal(i.Tax):.{getcontext().prec}f}) w/o CRV({Decimal(i.CRV):.{getcontext().prec}f})*Total({total}){Fore.slate_blue_1}
+ {Fore.medium_spring_green}= {Fore.slate_blue_1}TaxNoCRVTotal({tax:.{getcontext().prec}f})+TotalPrice({total*i.Price:.{getcontext().prec}f})
+ {Fore.medium_spring_green}= {Fore.green_3a}NetPrice({total*Decimal(i.Price)+tax:.{getcontext().prec}f}){Style.reset}
+{Fore.grey_70}+Tax({Decimal(i.Tax):.{getcontext().prec}f}) w/ CRV({Decimal(i.CRV):.{getcontext().prec}f})*Total({total}){Fore.slate_blue_1}
+ {Fore.medium_spring_green}= {Fore.slate_blue_1}TaxCRVTotal({tax_crv:.{getcontext().prec}f})+TotalPrice({total*i.Price:.{getcontext().prec}f})
+ {Fore.medium_spring_green}= {Fore.green_3a}NetPrice({total*Decimal(i.Price)+tax+crv:.{getcontext().prec}f}){Style.reset}
+{Fore.medium_violet_red}PercentOfTotal({super_total:.{getcontext().prec}f}%) of FinalTotal({getSuperTotal(results,location_fields,colormapped)['final total']})
+{Fore.orange_red_1}TaxRate({taxRate:.{getcontext().prec}f})={Decimal(taxRate*100):.{getcontext().prec}f}%{Style.reset}
 {'*'*os.get_terminal_size().columns}{Style.reset}"""
                         if bldlse:
                             db.logInput(msg,user=False,filter_colors=True,maxed_hfl=False,ofile=Prompt.bld_file)
@@ -1215,10 +1215,10 @@ class Prompt(object):
                                 cse(i.Barcode)
                                 continue
 
-                    master_total=Decimal(str(master_total)).quantize(Decimal("0.0000"))
-                    master_total_crv=Decimal(str(master_total_crv)).quantize(Decimal("0.0000"))
-                    master_total_tax=Decimal(str(master_total_tax)).quantize(Decimal("0.0000"))
-                    master_total_tax_crv=Decimal(str(master_total_tax_crv)).quantize(Decimal("0.0000"))
+                    master_total=Decimal(str(master_total))
+                    master_total_crv=Decimal(str(master_total_crv))
+                    master_total_tax=Decimal(str(master_total_tax))
+                    master_total_tax_crv=Decimal(str(master_total_tax_crv))
 
                     actual=(master_total_crv+master_total)+master_total_tax
                         
@@ -2717,6 +2717,9 @@ which will result in a cmd of 'ls Shelf'{Style.reset}
                         bldls()
                     elif cmd.lower() in ['jcu','just count','just-count','just_count']:
                         bldls(justCount=True)
+                    elif cmd.lower() in ['set prec','sprec']:
+                        t=TM.Tasks.TasksMode(parent=self,engine=db.ENGINE,init_only=True).setPrec()
+                        continue
                     elif cmd.lower() in ['jcu-','just count -','just-count -','just_count -','just count minus','just-count minus','just_count minus']:
                         bldls(justCount=True,minus=True)
                     elif cmd.lower() in ['jtu','just total','just-total','just_total']:

{radboy-0.0.563 → radboy-0.0.564}/radboy/DB/db.py

@@ -48,7 +48,10 @@ from barcode import Code128
 from barcode.writer import ImageWriter
 import hashlib
 import base64
-from decimal import Decimal as TDecimal
+from decimal import Decimal as TDecimal,getcontext
+
+getcontext().prec=4
+
 import scipy
 class decc(TDecimal):
     ''' defines a decimal of 'cf\''''

{radboy-0.0.563 → radboy-0.0.564}/radboy/TasksMode/Tasks.py

@@ -888,6 +888,15 @@ class Formulae:
                 print(e,str(e),repr(e))
 
 class TasksMode:
+    def setPrec(self):
+        print("WAS: ",getcontext().prec)
+        operator=Prompt.__init2__(None,func=FormBuilderMkText,ptext="How many decimals?",helpText="how many places behind the decimal floating point",data="integer")
+        if operator is None:
+            return
+        elif operator in ['d',]:
+            return
+        getcontext().prec=operator
+        print("NOW IS:",operator)
     def set_inList(self):
         h=[]
         ct=len(self.locationFields)

radboy-0.0.564/radboy/__init__.py

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

{radboy-0.0.563 → radboy-0.0.564}/radboy.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: radboy
-Version: 0.0.563
+Version: 0.0.564
 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.563 → radboy-0.0.564}/setup.py

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

radboy-0.0.563/radboy/__init__.py

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