radboy 0.0.635__tar.gz → 0.0.637__tar.gz

{radboy-0.0.635 → radboy-0.0.637}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: radboy
-Version: 0.0.635
+Version: 0.0.637
 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.637/STDOUT.TXT

@@ -0,0 +1,10 @@
+#USER INPUT# -> :"t"
+#USER INPUT# -> :"bld"
+#USER INPUT# -> :""
+#USER INPUT# -> :""
+#USER INPUT# -> :""
+#USER INPUT# -> :""
+#USER INPUT# -> :""
+#USER INPUT# -> :"q"
+#USER INPUT# -> :"e"
+#USER INPUT# -> :"0.0.637"

{radboy-0.0.635 → radboy-0.0.637}/pyproject.toml

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

{radboy-0.0.635 → radboy-0.0.637}/radboy/DB/Prompt.py

@@ -34,9 +34,7 @@ from uuid import uuid1
 import zipfile,pydoc
 import math
 import enum
-
-
-
+from radboy.DB.types import *
 
 try:
     import resource
@@ -191,23 +189,23 @@ 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=Decimal("0.00")
-        master_total_crv=Decimal("0.00")
-        master_total_tax=Decimal("0.00")
-        master_total_tax_crv=Decimal("0.00")
+        master_total=decc("0.00",cf=ROUNDTO)
+        master_total_crv=decc("0.00",cf=ROUNDTO)
+        master_total_tax=decc("0.00",cf=ROUNDTO)
+        master_total_tax_crv=decc("0.00",cf=ROUNDTO)
         for num,i in enumerate(results):
-            total=Decimal("0.00")
-            crv=Decimal("0.00")
-            tax=Decimal("0.00")
-            tax_crv=Decimal("0.00")
-            i.Tax=Decimal(i.Tax)
-            i.CRV=Decimal(i.CRV)
-            i.Price=Decimal(i.Price)
+            total=decc("0.00",cf=ROUNDTO)
+            crv=decc("0.00",cf=ROUNDTO)
+            tax=decc("0.00",cf=ROUNDTO)
+            tax_crv=decc("0.00",cf=ROUNDTO)
+            i.Tax=decc(i.Tax,cf=ROUNDTO)
+            i.CRV=decc(i.CRV,cf=ROUNDTO)
+            i.Price=decc(i.Price,cf=ROUNDTO)
             session.commit()
             for n2,f in enumerate(location_fields):
                 try:
                     if getattr(i,f) > 0:
-                        total+=Decimal(getattr(i,f))
+                        total+=decc(getattr(i,f),cf=ROUNDTO)
                 except Exception as e:
                     print(e)
             
@@ -947,6 +945,7 @@ class Prompt(object):
             
 
     def __init2__(self,func,ptext='do what',helpText='',data={},noHistory=False,qc=None,replace_ptext=None,alt_input=None):
+        ROUNDTO=int(db.detectGetOrSet("TotalSpent ROUNDTO default",4,setValue=False,literal=True))
         '''
         lsbld - bldls()
         lsbld- - bldls(minus=True)
@@ -1136,10 +1135,12 @@ class Prompt(object):
                         return
                     #start
                     ROUNDTO=int(db.detectGetOrSet("lsbld ROUNDTO default",3,setValue=False,literal=True))
-                    master_total=Decimal("0.0000")
-                    master_total_crv=Decimal("0.00")
-                    master_total_tax=Decimal("0.0000")
-                    master_total_tax_crv=Decimal("0.0000")
+
+                    master_total=decc("0.0000",cf=ROUNDTO)
+                    master_total_crv=decc("0.00",cf=ROUNDTO)
+                    master_total_tax=decc("0.0000",cf=ROUNDTO)
+                    master_total_tax_crv=decc("0.0000",cf=ROUNDTO)
+
                     reRunRequired=False
                     for num,i in enumerate(results):
                         getExtras(i.EntryId,extras)
@@ -1171,38 +1172,39 @@ class Prompt(object):
                         Fore.orange_3,
                         ]
                         #print("#0")
-                        total=Decimal("0.0000")
-                        crv=Decimal("0.0000")
-                        tax=Decimal("0.0000")
-                        tax_crv=Decimal("0.0000")
-                        i.Tax=Decimal(i.Tax)
-                        i.CRV=Decimal(i.CRV)
-                        i.Price=Decimal(i.Price)
+                        total=decc("0.0000",cf=ROUNDTO)
+                        crv=decc("0.0000",cf=ROUNDTO)
+                        tax=decc("0.0000",cf=ROUNDTO)
+                        tax_crv=decc("0.0000",cf=ROUNDTO)
+                        i.Tax=decc(i.Tax,cf=ROUNDTO)
+                        i.CRV=decc(i.CRV,cf=ROUNDTO)
+                        i.Price=decc(i.Price,cf=ROUNDTO)
                         try:
                             if (i.Price+i.CRV) > 0:
-                                taxRate=Decimal(i.Tax/(i.Price+i.CRV))
+                                taxRate=decc(i.Tax/(i.Price+i.CRV),cf=ROUNDTO)
                             else:
-                                taxRate=Decimal('0.00000')
+                                taxRate=decc('0.00000',cf=ROUNDTO)
 
                         except Exception as e:
-                            taxRate=Decimal('0.00000')
-                            i.Tax=Decimal('0.0000')
-                            i.Price=Decimal('0.0000')
-                            i.CRV=Decimal('0.0000')
+                            taxRate=decc('0.00000',cf=ROUNDTO)
+                            i.Tax=decc('0.0000',cf=ROUNDTO)
+                            i.Price=decc('0.0000',cf=ROUNDTO)
+                            i.CRV=decc('0.0000',cf=ROUNDTO)
                             session.commit()
                             session.refresh(i)
 
                         #print("#1")
+
                         if not minus:
                             for n2,f in enumerate(location_fields):
                                 try:
                                     if getattr(i,f) > 0:
-                                        total+=Decimal(getattr(i,f))
+                                        total+=decc(getattr(i,f),cf=ROUNDTO)
                                 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))}{Style.reset}'
+                                    msg2=f'{colormapped[n2]}{f} = {decc(getattr(i,f),cf=ROUNDTO)}{Style.reset}'
                                     if n2 < len(location_fields):
                                         msg2+=","
                                     msg+=msg2
@@ -1210,19 +1212,20 @@ class Prompt(object):
                             for n2,f in enumerate(location_fields):
                                 try:
                                     if getattr(i,f) != 0:
-                                        total+=Decimal(getattr(i,f))
+                                        total+=decc(getattr(i,f),cf=ROUNDTO)
                                 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)))}{Style.reset}'
+                                    msg2=f'{colormapped[n2]}{f} = {decc(str(getattr(i,f)),cf=ROUNDTO)}{Style.reset}'
                                     if n2 < len(location_fields):
                                         msg2+=","
                                     msg+=msg2
-                        master_total+=total*Decimal(i.Price)
 
-                        crv+=(Decimal(i.CRV)*total)
-                        tax+=(Decimal(i.Tax)*total)
+                        master_total+=total*decc(i.Price,cf=ROUNDTO)
+
+                        crv+=(decc(i.CRV,cf=ROUNDTO)*total)
+                        tax+=(decc(i.Tax,cf=ROUNDTO)*total)
 
                         tax_crv=(crv+tax)
                         master_total_tax+=tax
@@ -1230,42 +1233,43 @@ class Prompt(object):
                         master_total_tax_crv+=tax_crv
                         #print("#exegen",type(total),type(tax_crv))
                         try:
-                            #print((total*Decimal(i.Price)+tax_crv),"s1")
-                            #print(Decimal(getSuperTotal(results,location_fields,colormapped)['final total']).quantize(Decimal("00.00")),"s2")
+                            #print((total*decc(i.Price)+tax_crv),"s1")
+                            #print(decc(getSuperTotal(results,location_fields,colormapped)['final total']).quantize(decc("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)+tax+crv) > 0:
-                                super_total=(total*Decimal(i.Price)+tax+crv)/Decimal(getSuperTotal(results,location_fields,colormapped)['final total'])
+                            if (total*decc(i.Price,cf=ROUNDTO)+tax+crv) > 0:
+                                super_total=(total*decc(i.Price)+tax+crv)/decc(getSuperTotal(results,location_fields,colormapped)['final total'],cf=ROUNDTO)
                                 super_total=super_total*100
                             else:
                                 super_total=0
                         except Exception as e:
-                            p1=total*Decimal(i.Price)+tax_crv
-                            p2=Decimal(getSuperTotal(results,location_fields,colormapped)['final total'])
+                            p1=total*decc(i.Price,cf=ROUNDTO)+tax_crv
+                            p2=decc(getSuperTotal(results,location_fields,colormapped)['final total'],cf=ROUNDTO)
                             print(e)
                             print(p1,"p1")
                             print(p2,"p2")
                             super_total=0
                         #print("#exegen2")
-                        super_total=Decimal(super_total)
+                        super_total=decc(super_total,cf=ROUNDTO)
                         #print(super_total)
+
                         if simple:
                             msg+=f""" Total = {total}"""
                             print(db.strip_colors(msg))
                         else:
                             msg+=f"""{Fore.light_magenta} |-|{Fore.light_green} Total = {Fore.light_sea_green}{total}
-{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.light_magenta}Price({decc(i.Price):.{getcontext().prec}f}){Fore.medium_violet_red}*{Fore.light_slate_blue}Total({total}):{decc(i.Price)*total:.{getcontext().prec}f}
+{Fore.grey_70}+CRV({decc(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*decc(i.Price):.{getcontext().prec}f})
+{Fore.medium_spring_green}= {Fore.green_3a}NetPrice({total*decc(i.Price)+crv:.{getcontext().prec}f}){Style.reset}
+{Fore.grey_70}+Tax({decc(i.Tax):.{getcontext().prec}f}) w/o CRV({decc(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.green_3a}NetPrice({total*decc(i.Price)+tax:.{getcontext().prec}f}){Style.reset}
+{Fore.grey_70}+Tax({decc(i.Tax):.{getcontext().prec}f}) w/ CRV({decc(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_spring_green}= {Fore.green_3a}NetPrice({total*decc(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}
+{Fore.orange_red_1}TaxRate({taxRate:.{getcontext().prec}f})={decc(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)
@@ -1297,10 +1301,11 @@ class Prompt(object):
                                 cse(i.Barcode)
                                 continue
 
-                    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))
+                    #exit(f"here {master_total} {master_total_crv} {master_total_tax} {master_total_tax_crv}")
+                    master_total=decc(str(master_total),cf=ROUNDTO)
+                    master_total_crv=decc(str(master_total_crv),cf=ROUNDTO)
+                    master_total_tax=decc(str(master_total_tax),cf=ROUNDTO)
+                    master_total_tax_crv=decc(str(master_total_tax_crv),cf=ROUNDTO)
 
                     actual=(master_total_crv+master_total)+master_total_tax
                         

{radboy-0.0.635 → radboy-0.0.637}/radboy/DB/types.py

@@ -1,5 +1,5 @@
 from decimal import Decimal as TDecimal,getcontext
-import string,random
+import string,random,re
 class decc(TDecimal):
     ''' defines a decimal of 'cf\''''
     def __new__(self,value,cf=3):
@@ -14,8 +14,23 @@ class decc(TDecimal):
         value=f"{value:.{cf}f}"
         print(value)
         '''
-
-        value=f"{value:.{cf}f}"
+        print(value,type(value))
+        if isinstance(value,str):
+            scientific=re.findall(r'[-+]?[0-9]+\.?[0-9]*[Ee](?:\ *[-+]?\ *[0-9]+)?',value)
+            if len(scientific) < 1:
+                try:
+                    whole,part=value.split(".")
+                except Exception as e:
+                    whole,part=value,"0"*cf
+                if len(part) > cf:
+                    part=part[:cf-1]
+                    value=f"{whole}.{part}"
+                    print(value)
+            else:
+                pass
+            
+        else:
+            value=f"{value:.{cf}f}"
         return super().__new__(self,value)
 
 class dec3(TDecimal):

{radboy-0.0.635 → radboy-0.0.637}/radboy/DayLog/DayLogger.py

@@ -1097,19 +1097,19 @@ fxtbl - update table with correct columns
                 try:
                     if i.EntryId not in totals:
                         #total from fields not occurances
-                        totals[i.EntryId]=0
-                        totals_dl[i.EntryId]=i
+                        totals[i.EntryId]=decc(0,cf=ROUNDTO)
+                        totals_dl[i.EntryId]=decc(i,cf=ROUNDTO)
                         
-                        total_crv[i.EntryId]=i.CRV*0
-                        total_tax[i.EntryId]=i.Tax*0
-                        total_price[i.EntryId]=i.Price*0
+                        total_crv[i.EntryId]=decc(i.CRV)*decc(0,cf=ROUNDTO)
+                        total_tax[i.EntryId]=decc(i.Tax)*decc(0,cf=ROUNDTO)
+                        total_price[i.EntryId]=decc(i.Price)*decc(0,cf=ROUNDTO)
                     for x in fields_for_total:
                         try:
                             
-                            totals[i.EntryId]+=round(getattr(i,x),ROUNDTO)
-                            crv=round(i.CRV*getattr(i,x),ROUNDTO)
-                            tax=round(i.Tax*getattr(i,x),ROUNDTO)
-                            price=round(i.Price*getattr(i,x),ROUNDTO)
+                            totals[i.EntryId]+=decc(getattr(i,x),cf=ROUNDTO)
+                            crv=decc(i.CRV*getattr(i,x),cf=ROUNDTO)
+                            tax=decc(i.Tax*getattr(i,x),cf=ROUNDTO)
+                            price=decc(i.Price*getattr(i,x),cf=ROUNDTO)
                             msg=f"{num}/{num+1} of {len(query)}{i.seeShort()}\t{Fore.light_sea_green}CRV:{Fore.light_steel_blue}{crv}\n\t{Fore.light_sea_green}TAX:{Fore.light_steel_blue}{tax}\n\t{Fore.light_sea_green}Price:{Fore.light_steel_blue}{price}\n\t{Fore.light_green}Total:{Fore.light_steel_blue}{round(crv+tax+price,ROUNDTO)}\n{Fore.light_sea_green}For Date:{Fore.dark_goldenrod}{i.DayLogDate}({datetime(i.DayLogDate.year,i.DayLogDate.month,i.DayLogDate.day).strftime('%B[Mnth]/%A[DayNm]/%V[WK#]')}){Style.reset}"
                             print(msg)
                             if export:
@@ -1121,15 +1121,13 @@ fxtbl - update table with correct columns
                                 logInput(msg2,user=False,filter_colors=True,maxed_hfl=False,ofile=text_cr_export)
 
                             total_crv[i.EntryId]+=crv
-                            total_crv[i.EntryId]=round(total_crv[i.EntryId],ROUNDTO)
                             
                             total_tax[i.EntryId]+=tax
-                            total_tax[i.EntryId]=round(total_tax[i.EntryId],ROUNDTO)
                             
                             total_price[i.EntryId]+=price
-                            total_price[i.EntryId]=round(total_price[i.EntryId],ROUNDTO)
+
                             total_expense+=(tax+price+crv)
-                            total_expense=round(total_expense,ROUNDTO)
+                            total_expense=decc(total_expense,cf=ROUNDTO)
                         except Exception as ee:
                             print(ee,repr(ee),x,i.seeShort())
                 except Exception as e:

radboy-0.0.637/radboy/__init__.py

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

{radboy-0.0.635 → radboy-0.0.637}/radboy.egg-info/PKG-INFO

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

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

radboy-0.0.635/STDOUT.TXT

@@ -1,9 +0,0 @@
-#USER INPUT# -> :"t"
-#USER INPUT# -> :"esu"
-#USER INPUT# -> :"c4%bomb"
-#USER INPUT# -> :""
-#USER INPUT# -> :"sas"
-#USER INPUT# -> :"c4%bomb"
-#USER INPUT# -> :"q"
-#USER INPUT# -> :"e"
-#USER INPUT# -> :"0.0.635"

radboy-0.0.635/radboy/__init__.py

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